fix: wrap arrayExpression in z.array()

Author: Joshua-hypt

packages/openapi-ts-tests/test/__snapshots__/3.0.x/plugins/zod/default/zod.gen.ts

@@ -170,14 +170,14 @@ export const zArrayWithProperties = z.array(z.object({
 /**
  * This is a simple array with any of properties
  */
-export const zArrayWithAnyOfProperties = z.union([
+export const zArrayWithAnyOfProperties = z.array(z.union([
     z.object({
         foo: z.string().optional().default('test')
     }),
     z.object({
         bar: z.string().optional()
     })
-]);
+]));
 
 export const zAnyOfAnyAndNull = z.object({
     data: z.unknown().optional()
@@ -187,14 +187,14 @@ export const zAnyOfAnyAndNull = z.object({
  * This is a simple array with any of properties
  */
 export const zAnyOfArrays = z.object({
-    results: z.union([
+    results: z.array(z.union([
         z.object({
             foo: z.string().optional()
         }),
         z.object({
             bar: z.string().optional()
         })
-    ]).optional()
+    ])).optional()
 });
 
 /**
@@ -522,10 +522,10 @@ export const zConstValue = z.enum([
  */
 export const zCompositionWithNestedAnyOfAndNull = z.object({
     propA: z.union([
-        z.union([
+        z.array(z.union([
             z3eNum1Период,
             zConstValue
-        ]),
+        ])),
         z.null()
     ]).optional()
 });
@@ -748,10 +748,10 @@ export const zModelWithAdditionalPropertiesEqTrue = z.object({
 
 export const zNestedAnyOfArraysNullable = z.object({
     nullableArray: z.union([
-        z.union([
+        z.array(z.union([
             z.string(),
             z.boolean()
-        ]),
+        ])),
         z.null()
     ]).optional()
 });
@@ -853,11 +853,11 @@ export const zModelWithConstantSizeArray = z.unknown();
 
 export const zModelWithAnyOfConstantSizeArray = z.unknown();
 
-export const zModelWithPrefixItemsConstantSizeArray = z.union([
+export const zModelWithPrefixItemsConstantSizeArray = z.array(z.union([
     zModelWithInteger,
     z.number(),
     z.string()
-]);
+]));
 
 export const zModelWithAnyOfConstantSizeArrayNullable = z.unknown();
 

packages/openapi-ts-tests/test/__snapshots__/3.1.x/plugins/zod/default/zod.gen.ts

@@ -170,14 +170,14 @@ export const zArrayWithProperties = z.array(z.object({
 /**
  * This is a simple array with any of properties
  */
-export const zArrayWithAnyOfProperties = z.union([
+export const zArrayWithAnyOfProperties = z.array(z.union([
     z.object({
         foo: z.string().optional().default('test')
     }),
     z.object({
         bar: z.string().optional()
     })
-]);
+]));
 
 export const zAnyOfAnyAndNull = z.object({
     data: z.union([
@@ -190,14 +190,14 @@ export const zAnyOfAnyAndNull = z.object({
  * This is a simple array with any of properties
  */
 export const zAnyOfArrays = z.object({
-    results: z.union([
+    results: z.array(z.union([
         z.object({
             foo: z.string().optional()
         }),
         z.object({
             bar: z.string().optional()
         })
-    ]).optional()
+    ])).optional()
 });
 
 /**
@@ -500,14 +500,14 @@ export const zCompositionWithAnyOfAnonymous = z.object({
  */
 export const zCompositionWithNestedAnyAndTypeNull = z.object({
     propA: z.union([
-        z.union([
+        z.array(z.union([
             zModelWithDictionary,
             z.null()
-        ]),
-        z.union([
+        ])),
+        z.array(z.union([
             zModelWithArray,
             z.null()
-        ])
+        ]))
     ]).optional()
 });
 
@@ -523,10 +523,10 @@ export const zConstValue = z.literal('ConstValue');
  */
 export const zCompositionWithNestedAnyOfAndNull = z.object({
     propA: z.union([
-        z.union([
+        z.array(z.union([
             z3eNum1Период,
             zConstValue
-        ]),
+        ])),
         z.null()
     ]).optional()
 });
@@ -745,10 +745,10 @@ export const zModelWithAdditionalPropertiesEqTrue = z.object({
 
 export const zNestedAnyOfArraysNullable = z.object({
     nullableArray: z.union([
-        z.union([
+        z.array(z.union([
             z.string(),
             z.boolean()
-        ]),
+        ])),
         z.null()
     ]).optional()
 });

packages/openapi-ts/src/plugins/zod/plugin.ts

@@ -100,13 +100,32 @@ const arrayTypeToZodSchema = ({
       arrayExpression = compiler.callExpression({
         functionName: compiler.propertyAccessExpression({
           expression: zIdentifier,
-          name: unionIdentifier,
+          name: compiler.identifier({ text: 'array' }),
         }),
         parameters: [
-          compiler.arrayLiteralExpression({
-            elements: itemExpressions,
+          compiler.callExpression({
+            functionName: compiler.propertyAccessExpression({
+              expression: zIdentifier,
+              name: unionIdentifier,
+            }),
+            parameters: [
+              compiler.arrayLiteralExpression({
+                elements: itemExpressions,
+              }),
+            ],
           }),
         ],
+
+        // compiler.callExpression({
+        //   functionName: compiler.propertyAccessExpression({
+        //     expression: zIdentifier,
+        //     name: unionIdentifier,
+        //   }),
+        //   parameters: [
+        //     compiler.arrayLiteralExpression({
+        //       elements: itemExpressions,
+        //     }),
+        //   ],
       });
     }
   }