From 457b0675f402564e9649d4431bffe75f3657a1f1 Mon Sep 17 00:00:00 2001 From: Matej Valenta Date: Wed, 15 Jan 2025 15:20:44 +0100 Subject: [PATCH] chore: include examples in workspace, fix generations/parse errors --- examples/drift/pubspec.yaml | 1 + examples/example/pubspec.yaml | 1 + examples/freezed/pubspec.yaml | 1 + examples/injectable/pubspec.yaml | 1 + examples/json_serializable/pubspec.yaml | 1 + packages/auto_mappr/example/pubspec.yaml | 1 + .../lib/src/builder/map_model_body_method_builder.dart | 4 +++- .../test/integration/fixture/mapping_from_source.dart | 6 ++++-- packages/auto_mappr_annotation/example/pubspec.yaml | 1 + pubspec.yaml | 7 +++++++ 10 files changed, 21 insertions(+), 3 deletions(-) diff --git a/examples/drift/pubspec.yaml b/examples/drift/pubspec.yaml index 2eb01ab..4b7e6d9 100644 --- a/examples/drift/pubspec.yaml +++ b/examples/drift/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/examples/example/pubspec.yaml b/examples/example/pubspec.yaml index bae8091..f6f029a 100644 --- a/examples/example/pubspec.yaml +++ b/examples/example/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/examples/freezed/pubspec.yaml b/examples/freezed/pubspec.yaml index b85832c..12bc4ef 100644 --- a/examples/freezed/pubspec.yaml +++ b/examples/freezed/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/examples/injectable/pubspec.yaml b/examples/injectable/pubspec.yaml index 5dc66ed..d7ee72e 100644 --- a/examples/injectable/pubspec.yaml +++ b/examples/injectable/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/examples/json_serializable/pubspec.yaml b/examples/json_serializable/pubspec.yaml index 87b4ffb..342fbd9 100644 --- a/examples/json_serializable/pubspec.yaml +++ b/examples/json_serializable/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/packages/auto_mappr/example/pubspec.yaml b/packages/auto_mappr/example/pubspec.yaml index 5d1deab..0c6a6b3 100644 --- a/packages/auto_mappr/example/pubspec.yaml +++ b/packages/auto_mappr/example/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart b/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart index 39cbbef..698d788 100644 --- a/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart +++ b/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart @@ -70,7 +70,9 @@ class MapModelBodyMethodBuilder { ? mapping.whenSourceIsNullExpression!.returned : refer('Exception').newInstance([ refer( - "r'Mapping $mapping failed because ${mapping.source} was null, and no default value was provided. \n Consider setting the whenSourceIsNull parameter on the MapType<${mapping.source}, ${mapping.target}> to handle null values during mapping.'", + // ignore: avoid-adjacent-strings, to avoid parsing the errors in tests + "r'Mapping $mapping failed because ${mapping.source} was null, and no default value was provided. '\n" + "r'Consider setting the whenSourceIsNull parameter on the MapType<${mapping.source}, ${mapping.target}> to handle null values during mapping.'", ), ]).thrown; diff --git a/packages/auto_mappr/test/integration/fixture/mapping_from_source.dart b/packages/auto_mappr/test/integration/fixture/mapping_from_source.dart index 850f5ab..30c988e 100644 --- a/packages/auto_mappr/test/integration/fixture/mapping_from_source.dart +++ b/packages/auto_mappr/test/integration/fixture/mapping_from_source.dart @@ -1,3 +1,5 @@ +// ignore_for_file: prefer-abstract-final-static-class + import 'package:auto_mappr_annotation/auto_mappr_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -41,13 +43,13 @@ class InstanceGetter { set value(int value) => _value = value; } -abstract final class StaticField { +class StaticField { // ignore: avoid-global-state, for testing static int value = 666; static const String secondValue = 'test 3'; } -abstract final class StaticGetter { +class StaticGetter { static int? _value; static int get value => _value ?? 0; diff --git a/packages/auto_mappr_annotation/example/pubspec.yaml b/packages/auto_mappr_annotation/example/pubspec.yaml index 88ceec9..e157f88 100644 --- a/packages/auto_mappr_annotation/example/pubspec.yaml +++ b/packages/auto_mappr_annotation/example/pubspec.yaml @@ -5,6 +5,7 @@ publish_to: none environment: sdk: ^3.6.0 +resolution: workspace dependencies: auto_mappr_annotation: ^2.3.0 diff --git a/pubspec.yaml b/pubspec.yaml index 72fd0cd..07f0631 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,6 +4,13 @@ publish_to: "none" workspace: - packages/auto_mappr - packages/auto_mappr_annotation + - packages/auto_mappr/example + - packages/auto_mappr_annotation/example + - examples/drift + - examples/example + - examples/freezed + - examples/injectable + - examples/json_serializable environment: sdk: ^3.6.0