Merge pull request #519 from provokateurin/fix/dynamite-duplicate-types

fix(dynamite): Skip comparing nullable in type results

packages/dynamite/dynamite/lib/src/openapi_builder.dart

@@ -936,7 +936,11 @@ TypeResult resolveObject(
   final bool nullable = false,
   final bool isHeader = false,
 }) {
-  if (state.resolvedTypes.add(TypeResultObject('${state.prefix}$identifier'))) {
+  final result = TypeResultObject(
+    '${state.prefix}$identifier',
+    nullable: nullable,
+  );
+  if (state.resolvedTypes.add(result)) {
     state.output.add(
       Class(
         (final b) {
@@ -1230,10 +1234,7 @@ TypeResult resolveObject(
       );
     }
   }
-  return TypeResultObject(
+  return result;
-    '${state.prefix}$identifier',
-    nullable: nullable,
-  );
 }
 
 TypeResult resolveType(
@@ -1263,7 +1264,11 @@ TypeResult resolveType(
       nullable: nullable,
     );
   } else if (schema.ofs != null) {
-    if (state.resolvedTypes.add(TypeResultObject('${state.prefix}$identifier'))) {
+    result = TypeResultObject(
+      '${state.prefix}$identifier',
+      nullable: nullable,
+    );
+    if (state.resolvedTypes.add(result)) {
       final results = schema.ofs!
           .map(
             (final s) => resolveType(
@@ -1523,11 +1528,6 @@ TypeResult resolveType(
         ),
       ]);
     }
-
-    result = TypeResultObject(
-      '${state.prefix}$identifier',
-      nullable: nullable,
-    );
   } else if (schema.isContentString) {
     final subResult = resolveType(
       spec,

packages/dynamite/dynamite/lib/src/type_result/enum.dart

@@ -34,12 +34,8 @@ class TypeResultEnum extends TypeResult {
 
   @override
   bool operator ==(final Object other) =>
-      other is TypeResultEnum &&
+      other is TypeResultEnum && other.className == className && other.generics == generics && other.subType == subType;
-      other.className == className &&
-      other.generics == generics &&
-      other.nullable == nullable &&
-      other.subType == subType;
 
   @override
-  int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode;
+  int get hashCode => className.hashCode + generics.hashCode + subType.hashCode;
 }

packages/dynamite/dynamite/lib/src/type_result/list.dart

@@ -34,12 +34,8 @@ class TypeResultList extends TypeResult {
 
   @override
   bool operator ==(final Object other) =>
-      other is TypeResultList &&
+      other is TypeResultList && other.className == className && other.generics == generics && other.subType == subType;
-      other.className == className &&
-      other.generics == generics &&
-      other.nullable == nullable &&
-      other.subType == subType;
 
   @override
-  int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode;
+  int get hashCode => className.hashCode + generics.hashCode + subType.hashCode;
 }

packages/dynamite/dynamite/lib/src/type_result/map.dart

@@ -21,12 +21,8 @@ class TypeResultMap extends TypeResult {
 
   @override
   bool operator ==(final Object other) =>
-      other is TypeResultMap &&
+      other is TypeResultMap && other.className == className && other.generics == generics && other.subType == subType;
-      other.className == className &&
-      other.generics == generics &&
-      other.nullable == nullable &&
-      other.subType == subType;
 
   @override
-  int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode;
+  int get hashCode => className.hashCode + generics.hashCode + subType.hashCode;
 }

packages/dynamite/dynamite/lib/src/type_result/type_result.dart

@@ -101,8 +101,8 @@ abstract class TypeResult {
 
   @override
   bool operator ==(final Object other) =>
-      other is TypeResult && other.className == className && other.generics == generics && other.nullable == nullable;
+      other is TypeResult && other.className == className && other.generics == generics;
 
   @override
-  int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode;
+  int get hashCode => className.hashCode + generics.hashCode;
 }