Allow generics in Map type for @convertJsMapProp props

Author: greglittlefield-wf

lib/src/builder/codegen/accessors_generator.dart

@@ -469,15 +469,22 @@ PropConversionConfig? parseConversionConfig({
     final convertJsRefProp =
         getConstantAnnotation(field, 'convertJsRefProp', annotations.convertJsRefProp);
     if (convertJsMapProp != null) {
+      const allowedConvertedTypes = {
+        'Map?',
+        'Map<dynamic, dynamic>?',
+      };
       conversionConfig = PropConversionConfig(
         rawType: 'JsMap?',
         convertedType: 'Map?',
         setter: 'jsifyMapProp',
         getter: 'unjsifyMapProp',
       );
-      if (conversionConfig.convertedType != typeSource) {
+      assert(allowedConvertedTypes.contains(conversionConfig.convertedType));
+      if (!allowedConvertedTypes.contains(typeSource)) {
         handleAnnotationError(
-            'A prop annotated with `@convertJsMapProp` should be typed as `Map?`.', field);
+            'A prop annotated with `@convertJsMapProp` must be typed as one of: '
+            '${allowedConvertedTypes.map((t) => '`$t`').join(', ')}',
+            field);
         return null;
       }
     } else if (convertJsRefProp != null) {
@@ -489,7 +496,7 @@ PropConversionConfig? parseConversionConfig({
       );
       if (conversionConfig.convertedType != typeSource) {
         handleAnnotationError(
-            'A prop annotated with `@convertJsRefProp` should be typed as `dynamic`.', field);
+            'A prop annotated with `@convertJsRefProp` must be typed as `dynamic`.', field);
         return null;
       }
     }

test/vm_tests/builder/codegen_test.dart

@@ -1200,7 +1200,7 @@ main() {
               late String foo;''';
 
             setUpAndGenerate(OverReactSrc.abstractProps(backwardsCompatible: false, body: body).source);
-            verify(() => logger.severe(contains('Unsupported prop annotation combination for prop \'foo\': A prop annotated with `@convertJsMapProp` should be typed as `Map?`.')));
+            verify(() => logger.severe(contains('Unsupported prop annotation combination for prop \'foo\': A prop annotated with `@convertJsMapProp` must be typed as one of: `Map?`, `Map<dynamic, dynamic>?`')));
           });
 
           test('@convertJsRefProp of the wrong prop type', () {
@@ -1209,7 +1209,7 @@ main() {
               Map? foo;''';
 
             setUpAndGenerate(OverReactSrc.abstractProps(backwardsCompatible: false, body: body).source);
-            verify(() => logger.severe(contains('Unsupported prop annotation combination for prop \'foo\': A prop annotated with `@convertJsRefProp` should be typed as `dynamic`.')));
+            verify(() => logger.severe(contains('Unsupported prop annotation combination for prop \'foo\': A prop annotated with `@convertJsRefProp` must be typed as `dynamic`.')));
           });
         });
       });