fix converting additional properties of type array.

hpoul · Jan 29, 2025 · ba2864d · ba2864d
1 parent d357830
commit ba2864d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 64 deletions.
diff --git a/packages/openapi_code_builder/CHANGELOG.md b/packages/openapi_code_builder/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.6.0-dev.3
+## 1.6.0-dev.4
 
 * Support for restricted `additionalProperties`
 

diff --git a/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.dart b/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.dart
diff --git a/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.g.dart b/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.g.dart
diff --git a/packages/openapi_code_builder/lib/src/openapi_code_builder.dart b/packages/openapi_code_builder/lib/src/openapi_code_builder.dart
@@ -1005,6 +1005,11 @@ class OpenApiLibraryGenerator {
     final componentName =
         _componentNameFromReferenceUri(uri) ?? _classNameForComponent(key);
 
+    if (createdSchema[schemaObject] case final ref?) {
+      _logger.finest('Found already created for this schema reference.');
+      return ref;
+    }
+
     final found = createdSchema.values
         .firstWhereOrNull((element) => element.symbol == componentName);
     if (found != null) {
@@ -1409,20 +1414,23 @@ class OpenApiLibraryGenerator {
       APIType.integer => expression.asA(_typeInteger),
       APIType.boolean => expression.asA(refer('bool')),
       APIType.array => switch (schema.items) {
-          final itemSchema? => expression.property('map')([
-              Method(
-                (mb) => mb
-                  ..lambda = true
-                  ..requiredParameters.add(Parameter((pb) => pb..name = 'e'))
-                  ..body = _parseJson(
-                          parentName: '${parentName}ListItem',
-                          schema: itemSchema,
-                          type:
-                              _toDartType('${parentName}ListItem', itemSchema),
-                          expression: refer('e'))
-                      .code,
-              ).closure
-            ]),
+          final itemSchema? => expression
+              .asA(_referType('List', generics: [refer('dynamic')]))
+              .property('map')([
+                Method(
+                  (mb) => mb
+                    ..lambda = true
+                    ..requiredParameters.add(Parameter((pb) => pb..name = 'e'))
+                    ..body = _parseJson(
+                            parentName: '${parentName}ListItem',
+                            schema: itemSchema,
+                            type: _toDartType(
+                                '${parentName}ListItem', itemSchema),
+                            expression: refer('e'))
+                        .code,
+                ).closure
+              ])
+              .property('toList')([]),
           null => throw UnimplementedError(),
         },
       APIType.object => type.property('fromJson')([expression]),

diff --git a/packages/openapi_code_builder/pubspec.yaml b/packages/openapi_code_builder/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openapi_code_builder
 description: Generate Dtos, client and server scaffolds for openapi specs.
-version: 1.6.0-dev.3
+version: 1.6.0-dev.4
 homepage: https://github.com/hpoul/openapi_dart/tree/master/packages/openapi_code_builder
 
 environment: