Fix array iteration output

hey-api · Jun 13, 2024 · 37c9a2a · 37c9a2a
1 parent 44aaaa1
commit 37c9a2a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/packages/openapi-ts/src/compiler/transform.ts b/packages/openapi-ts/src/compiler/transform.ts
@@ -91,7 +91,16 @@ export const createArrayTransformMutation = ({
               ts.factory.createArrowFunction(
                 undefined,
                 undefined,
-                [],
+                [
+                  ts.factory.createParameterDeclaration(
+                    undefined,
+                    undefined,
+                    ts.factory.createIdentifier('item'),
+                    undefined,
+                    undefined,
+                    undefined,
+                  ),
+                ],
                 undefined,
                 ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
                 ts.factory.createBlock(statements, true),

diff --git a/packages/openapi-ts/src/utils/write/types.ts b/packages/openapi-ts/src/utils/write/types.ts
@@ -219,22 +219,37 @@ const generateTransform = (client: Client, model: Model, onNode: OnNode) => {
     };
 
     function generateForArray(localPath: string[], localModel: Model) {
-      const statements = mapTypeToTransformStatements(
-        localPath,
-        localModel,
-        true,
-      );
+      if (localModel.export !== 'array') {
+        throw new Error(
+          'generateForArray should only be called with array models',
+        );
+      }
 
-      if (statements.length === 0) {
-        return [];
+      if (localModel.$refs.length === 1) {
+        const nextModel = client.models.find(
+          (m) => m.meta!.name === localModel.type,
+        );
+        if (!nextModel) {
+          throw new Error(
+            `Model ${localModel.type} could not be founded when building array transform`,
+          );
+        }
+
+        const statements = mapTypeToTransformStatements(['item'], nextModel);
+
+        if (statements.length === 0) {
+          return [];
+        }
+
+        return [
+          compiler.transform.arrayTransformMutation({
+            path: localPath,
+            statements,
+          }),
+        ];
       }
 
-      return [
-        compiler.transform.arrayTransformMutation({
-          path: localPath,
-          statements,
-        }),
-      ];
+      throw new Error('Unsupported array type');
     }
 
     function generateTransformStatements(