fix(dynamite): recursively use for generic in TypeResult.dartType

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
nextcloud · Apr 8, 2024 · fb14a15 · fb14a15
1 parent 563efef
commit fb14a15
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 7 deletions.
diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/enum.dart b/packages/dynamite/dynamite/lib/src/models/type_result/enum.dart
@@ -15,9 +15,16 @@ class TypeResultEnum extends TypeResult {
   String? get _builderFactory => null;
 
   @override
-  bool operator ==(Object other) =>
-      other is TypeResultEnum && other.className == className && other.generics == generics && other.subType == subType;
+  TypeResultEnum get dartType => TypeResultEnum(
+        className,
+        subType.dartType,
+        nullable: nullable,
+        isTypeDef: isTypeDef,
+      );
 
   @override
-  int get hashCode => className.hashCode + generics.hashCode + subType.hashCode;
+  bool operator ==(Object other) => other is TypeResultEnum && other.className == className && other.subType == subType;
+
+  @override
+  int get hashCode => className.hashCode + subType.hashCode;
 }
diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/list.dart b/packages/dynamite/dynamite/lib/src/models/type_result/list.dart
@@ -16,7 +16,7 @@ class TypeResultList extends TypeResult {
   String? get _serializer => null;
 
   @override
-  TypeResultList get dartType => TypeResultList('List', subType, nullable: nullable);
+  TypeResultList get dartType => TypeResultList('List', subType.dartType, nullable: nullable);
 
   @override
   bool operator ==(Object other) =>

diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/map.dart b/packages/dynamite/dynamite/lib/src/models/type_result/map.dart
@@ -16,7 +16,7 @@ class TypeResultMap extends TypeResult {
   String? get _serializer => null;
 
   @override
-  TypeResultMap get dartType => TypeResultMap('Map', subType, nullable: nullable);
+  TypeResultMap get dartType => TypeResultMap('Map', subType.dartType, nullable: nullable);
 
   @override
   bool operator ==(Object other) =>

diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/object.dart b/packages/dynamite/dynamite/lib/src/models/type_result/object.dart
@@ -26,4 +26,18 @@ class TypeResultObject extends TypeResult {
 
     return super.encode(object, mimeType: mimeType);
   }
+
+  @override
+  TypeResultObject get dartType {
+    if (generics.isEmpty) {
+      return this;
+    }
+
+    return TypeResultObject(
+      className,
+      generics: BuiltList(generics.map((type) => type.dartType)),
+      nullable: nullable,
+      isTypeDef: isTypeDef,
+    );
+  }
 }
diff --git a/packages/dynamite/dynamite/lib/src/models/type_result/type_result.dart b/packages/dynamite/dynamite/lib/src/models/type_result/type_result.dart
@@ -151,8 +151,7 @@ sealed class TypeResult {
   String get nullableName => nullable ? '$name?' : name;
 
   /// Native dart type equivalent
-  // ignore: avoid_returning_this
-  TypeResult get dartType => this;
+  TypeResult get dartType;
 
   /// Returns `this` with a `true` value for [isTypeDef].
   TypeResult get asTypeDef {

diff --git a/packages/dynamite/dynamite/test/type_result_test.dart b/packages/dynamite/dynamite/test/type_result_test.dart
@@ -232,4 +232,54 @@ specifiedType: const FullType(String),
       expect(type1.hashCode, type2.hashCode);
     });
   });
+
+  test('dartType', () {
+    final jsonObjectType = TypeResultBase('JsonObject');
+    expect(
+      jsonObjectType.dartType,
+      TypeResultBase('dynamic'),
+    );
+
+    TypeResult type = TypeResultBase('String');
+    expect(
+      type.dartType,
+      TypeResultBase('String'),
+    );
+
+    type = TypeResultEnum('EnumClass', jsonObjectType);
+    expect(
+      type.dartType,
+      TypeResultEnum('EnumClass', TypeResultBase('dynamic')),
+    );
+
+    type = TypeResultList('BuiltList', jsonObjectType);
+    expect(
+      type.dartType,
+      TypeResultList('List', TypeResultBase('dynamic')),
+    );
+
+    type = TypeResultMap('BuiltMap', jsonObjectType);
+    expect(
+      type.dartType,
+      TypeResultMap('Map', TypeResultBase('dynamic')),
+    );
+
+    type = TypeResultObject(
+      'BuiltClass',
+      generics: BuiltList([
+        jsonObjectType,
+        TypeResultMap('BuiltList', jsonObjectType),
+      ]),
+    );
+    expect(
+      type.dartType,
+      TypeResultObject(
+        'BuiltClass',
+        generics: BuiltList([
+          TypeResultBase('dynamic'),
+          TypeResultMap('Map', TypeResultBase('dynamic')),
+        ]),
+      ),
+    );
+  });
 }