chore: include examples in workspace, fix generations/parse errors

netglade · Jan 15, 2025 · 457b067 · 457b067
1 parent dce2758
commit 457b067
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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