Address review feedback: fix v3 plugin, remove duplicate tests, use YAML for all specs

Co-authored-by: mrlubos <[email protected]>

Author: Copilot

packages/openapi-ts-tests/specs/2.0.x/array-items-all-of.json

@@ -0,0 +1,40 @@
+swagger: '2.0'
+info:
+  title: OpenAPI 2.0 array items allOf example
+  version: '1'
+definitions:
+  ArrayWithAllOfObjects:
+    type: array
+    items:
+      allOf:
+        - type: object
+          properties:
+            id:
+              type: integer
+        - type: object
+          properties:
+            name:
+              type: string
+  ArrayWithAllOfPrimitives:
+    type: array
+    items:
+      allOf:
+        - type: number
+        - type: string
+  ArrayWithAllOfRefs:
+    type: array
+    items:
+      allOf:
+        - $ref: '#/definitions/BaseModel'
+        - type: object
+          properties:
+            extra:
+              type: string
+  BaseModel:
+    type: object
+    properties:
+      id:
+        type: integer
+      createdAt:
+        type: string
+        format: date-time

packages/openapi-ts-tests/specs/2.0.x/array-items-all-of.yaml

@@ -2,28 +2,19 @@
 
 import { z } from 'zod';
 
-export const zArrayWithAllOfObjects = z.array(z.union([
-    z.object({
-        id: z.number().int().optional()
-    }),
-    z.object({
-        name: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.number().int().optional()
+}).and(z.object({
+    name: z.string().optional()
+})));
 
-export const zArrayWithAllOfPrimitives = z.array(z.union([
-    z.number(),
-    z.string()
-]));
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
 
 export const zBaseModel = z.object({
     id: z.number().int().optional(),
     createdAt: z.string().datetime().optional()
 });
 
-export const zArrayWithAllOfRefs = z.array(z.union([
-    zBaseModel,
-    z.object({
-        extra: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v3/array-items-all-of/zod.gen.ts

@@ -2,28 +2,19 @@
 
 import { z } from 'zod';
 
-export const zArrayWithAllOfObjects = z.array(z.union([
-    z.object({
-        id: z.number().int().optional()
-    }),
-    z.object({
-        name: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.number().int().optional()
+}).and(z.object({
+    name: z.string().optional()
+})));
 
-export const zArrayWithAllOfPrimitives = z.array(z.union([
-    z.number(),
-    z.string()
-]));
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
 
 export const zBaseModel = z.object({
     id: z.number().int().optional(),
     createdAt: z.string().datetime().optional()
 });
 
-export const zArrayWithAllOfRefs = z.array(z.union([
-    zBaseModel,
-    z.object({
-        extra: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/array-items-all-of/zod.gen.ts

@@ -2,28 +2,19 @@
 
 import { z } from 'zod';
 
-export const zArrayWithAllOfObjects = z.array(z.union([
-    z.object({
-        id: z.number().int().optional()
-    }),
-    z.object({
-        name: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.number().int().optional()
+}).and(z.object({
+    name: z.string().optional()
+})));
 
-export const zArrayWithAllOfPrimitives = z.array(z.union([
-    z.number(),
-    z.string()
-]));
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
 
 export const zBaseModel = z.object({
     id: z.number().int().optional(),
     createdAt: z.string().datetime().optional()
 });
 
-export const zArrayWithAllOfRefs = z.array(z.union([
-    zBaseModel,
-    z.object({
-        extra: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/array-items-all-of/zod.gen.ts

@@ -34,14 +34,6 @@ for (const zodVersion of zodVersions) {
     });
 
     const scenarios = [
-      {
-        config: createConfig({
-          input: 'array-items-all-of.yaml',
-          output: 'array-items-all-of',
-        }),
-        description:
-          'generates correct array when items use allOf (intersection)',
-      },
       {
         config: createConfig({
           input: 'array-items-one-of-length-1.yaml',

packages/openapi-ts-tests/zod/v3/test/3.0.x.test.ts

@@ -34,14 +34,6 @@ for (const zodVersion of zodVersions) {
     });
 
     const scenarios = [
-      {
-        config: createConfig({
-          input: 'array-items-all-of.yaml',
-          output: 'array-items-all-of',
-        }),
-        description:
-          'generates correct array when items use allOf (intersection)',
-      },
       {
         config: createConfig({
           input: 'array-items-one-of-length-1.yaml',

packages/openapi-ts-tests/zod/v3/test/3.1.x.test.ts

@@ -37,8 +37,7 @@ for (const version of versions) {
       const scenarios = [
         {
           config: createConfig({
-            input:
-              'array-items-all-of.' + (version === '2.0.x' ? 'json' : 'yaml'),
+            input: 'array-items-all-of.yaml',
             output: 'array-items-all-of',
           }),
           description:

packages/openapi-ts-tests/zod/v3/test/openapi.test.ts

@@ -2,28 +2,19 @@
 
 import { z } from 'zod/v3';
 
-export const zArrayWithAllOfObjects = z.array(z.union([
-    z.object({
-        id: z.number().int().optional()
-    }),
-    z.object({
-        name: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.number().int().optional()
+}).and(z.object({
+    name: z.string().optional()
+})));
 
-export const zArrayWithAllOfPrimitives = z.array(z.union([
-    z.number(),
-    z.string()
-]));
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
 
 export const zBaseModel = z.object({
     id: z.number().int().optional(),
     createdAt: z.string().datetime().optional()
 });
 
-export const zArrayWithAllOfRefs = z.array(z.union([
-    zBaseModel,
-    z.object({
-        extra: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/array-items-all-of/zod.gen.ts

@@ -2,28 +2,19 @@
 
 import { z } from 'zod/v3';
 
-export const zArrayWithAllOfObjects = z.array(z.union([
-    z.object({
-        id: z.number().int().optional()
-    }),
-    z.object({
-        name: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.number().int().optional()
+}).and(z.object({
+    name: z.string().optional()
+})));
 
-export const zArrayWithAllOfPrimitives = z.array(z.union([
-    z.number(),
-    z.string()
-]));
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
 
 export const zBaseModel = z.object({
     id: z.number().int().optional(),
     createdAt: z.string().datetime().optional()
 });
 
-export const zArrayWithAllOfRefs = z.array(z.union([
-    zBaseModel,
-    z.object({
-        extra: z.string().optional()
-    })
-]));
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));