[native_assets_cli] Refactor overrides in syntax classes (#2160)

This PR refactors field overrides in the syntax generator.

The analysis of overrides is now done on the `PropertyInfo` and `DartType` rather than on the `JsonSchema`.

If a field is overridden with a more specific type, generate the more specific type in the default constructor and pass it to the more general parameter in the super constructor invocation. (See the single change in the generated file.)

Author: dcharkes

pkgs/json_syntax_generator/lib/src/generator/normal_class_generator.dart

@@ -142,9 +142,19 @@ static const ${tagProperty}Value = '$tagValue';
       final thisClassProperty = classInfo.getProperty(propertyName);
 
       if (superClassProperty != null) {
-        if (!classInfo.isTaggedUnion) {
-          final propertyName = superClassProperty.name;
-          result.add('required super.$propertyName');
+        if (propertyName != classInfo.superclass?.taggedUnionProperty) {
+          if (thisClassProperty != null &&
+              superClassProperty.type != thisClassProperty.type) {
+            // More specific type on this class so emit normal parameter.
+            // Must be passed to super constructor call.
+            final dartType = thisClassProperty.type;
+            final propertyName = thisClassProperty.name;
+            result.add('required $dartType $propertyName');
+          } else {
+            // Same type on this class, emit super parameter.
+            final propertyName = superClassProperty.name;
+            result.add('required super.$propertyName');
+          }
         }
       } else {
         final dartType = thisClassProperty!.type;
@@ -155,15 +165,40 @@ static const ${tagProperty}Value = '$tagValue';
     return result;
   }
 
-  /// The only super constructor call parameter is for tagged unions.
+  /// Generates super constructor calls.
+  ///
+  /// * For tagged unions, the tagged union value.
+  /// * For parameters that have a more specific type in the subclass a simple
+  ///   forwarding.
   ///
   /// All other parameters are already set by `super.paramName`.
   List<String> _generateDefaultConstructorSuperArguments() {
-    if (!classInfo.isTaggedUnion || classInfo.superclass == null) return [];
+    final superclass = classInfo.superclass;
+    if (superclass == null) return [];
 
-    final taggedUnionProperty = classInfo.superclass!.taggedUnionProperty;
+    final result = <String>[];
+
+    final taggedUnionProperty = superclass.taggedUnionProperty;
     final taggedUnionValue = classInfo.taggedUnionValue;
-    return ["$taggedUnionProperty: '$taggedUnionValue'"];
+    if (taggedUnionValue != null && taggedUnionProperty != null) {
+      result.add("$taggedUnionProperty: '$taggedUnionValue'");
+    }
+
+    final propertyNames = _getAllPropertyNames();
+    for (final propertyName in propertyNames) {
+      final superClassProperty = superclass.getProperty(propertyName);
+      final thisClassProperty = classInfo.getProperty(propertyName);
+
+      if (propertyName != classInfo.superclass?.taggedUnionProperty) {
+        if (thisClassProperty != null &&
+            superClassProperty != null &&
+            superClassProperty.type != thisClassProperty.type) {
+          final propertyName = thisClassProperty.name;
+          result.add('$propertyName: $propertyName');
+        }
+      }
+    }
+    return result;
   }
 
   /// Generates the setter calls for both [_generateDefaultConstructor] and

pkgs/json_syntax_generator/lib/src/model/dart_type.dart

@@ -15,6 +15,14 @@ sealed class DartType {
     return isNullable ? '$typeString?' : typeString;
   }
 
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DartType && isNullable == other.isNullable;
+
+  @override
+  int get hashCode => isNullable.hashCode;
+
   String toNonNullableString();
 }
 
@@ -28,22 +36,53 @@ sealed class SimpleDartType extends DartType {
 
   @override
   String toNonNullableString() => typeName;
+
+  @override
+  bool operator ==(Object other) =>
+      super == other && other is SimpleDartType && typeName == other.typeName;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, typeName);
 }
 
 class StringDartType extends SimpleDartType {
   const StringDartType({required super.isNullable}) : super(typeName: 'String');
+
+  @override
+  bool operator ==(Object other) => super == other && other is StringDartType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, 'String');
 }
 
 class IntDartType extends SimpleDartType {
   const IntDartType({required super.isNullable}) : super(typeName: 'int');
+
+  @override
+  bool operator ==(Object other) => super == other && other is IntDartType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, 'int');
 }
 
 class BoolDartType extends SimpleDartType {
   const BoolDartType({required super.isNullable}) : super(typeName: 'bool');
+
+  @override
+  bool operator ==(Object other) => super == other && other is BoolDartType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, 'bool');
 }
 
 class ObjectDartType extends SimpleDartType {
   const ObjectDartType({required super.isNullable}) : super(typeName: 'Object');
+
+  @override
+  bool operator ==(Object other) => super == other && other is ObjectDartType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, 'Object');
 }
 
 class ClassDartType extends DartType {
@@ -53,6 +92,13 @@ class ClassDartType extends DartType {
 
   @override
   String toNonNullableString() => classInfo.name;
+
+  @override
+  bool operator ==(Object other) =>
+      super == other && other is ClassDartType && classInfo == other.classInfo;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, classInfo);
 }
 
 /// The [ClassInfo] for the `JsonObject` base class.
@@ -65,6 +111,13 @@ class ListDartType extends DartType {
 
   @override
   String toNonNullableString() => 'List<$itemType>';
+
+  @override
+  bool operator ==(Object other) =>
+      super == other && other is ListDartType && itemType == other.itemType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, itemType);
 }
 
 class MapDartType extends DartType {
@@ -79,11 +132,27 @@ class MapDartType extends DartType {
 
   @override
   String toNonNullableString() => 'Map<$keyType, $valueType>';
+
+  @override
+  bool operator ==(Object other) =>
+      super == other &&
+      other is MapDartType &&
+      keyType == other.keyType &&
+      valueType == other.valueType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, keyType, valueType);
 }
 
 class UriDartType extends DartType {
   const UriDartType({required super.isNullable});
 
   @override
   String toNonNullableString() => 'Uri';
+
+  @override
+  bool operator ==(Object other) => super == other && other is UriDartType;
+
+  @override
+  int get hashCode => Object.hash(super.hashCode, 'Uri');
 }

pkgs/json_syntax_generator/lib/src/parser/schema_analyzer.dart

@@ -142,7 +142,6 @@ class SchemaAnalyzer {
         superclass = _classes[superClassName] as NormalClassInfo;
       }
     }
-    final superSchemas = schemas.superClassSchemas;
     final propertyKeys = schemas.propertyKeys;
     final settersPrivate = !publicSetters.contains(typeName);
 
@@ -151,21 +150,16 @@ class SchemaAnalyzer {
       final propertySchemas = schemas.property(propertyKey);
       final required = schemas.propertyRequired(propertyKey);
       final allowEnum = !schemas.generateSubClasses;
-      final parentPropertySchemas = superSchemas?.property(propertyKey);
       final dartType = _analyzeDartType(
         propertyKey,
         propertySchemas,
         required,
         allowEnum: allowEnum,
       );
       final fieldName = _snakeToCamelCase(propertyKey);
-      final isOverride =
-          parentPropertySchemas != null &&
-          (parentPropertySchemas?.type != null ||
-              propertySchemas.className != null);
-      if (parentPropertySchemas == null ||
-          parentPropertySchemas.className != propertySchemas.className ||
-          propertySchemas.type != parentPropertySchemas.type) {
+      final parentDartType = superclass?.getProperty(fieldName)?.type;
+      final isOverride = parentDartType != null;
+      if (parentDartType == null || parentDartType != dartType) {
         properties.add(
           PropertyInfo(
             name: fieldName,

pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart

@@ -98,15 +98,15 @@ class BuildInput extends HookInput {
   BuildInput.fromJson(super.json, {super.path}) : super.fromJson();
 
   BuildInput({
-    required super.config,
+    required BuildConfig config,
     required Map<String, Map<String, Object?>>? dependencyMetadata,
     required super.outDir,
     required super.outDirShared,
     required super.outFile,
     required super.packageName,
     required super.packageRoot,
     required super.version,
-  }) : super() {
+  }) : super(config: config) {
     _dependencyMetadata = dependencyMetadata;
     json.sortOnKey();
   }