Merge pull request #2736 from hey-api/copilot/fix-2110710e-8174-470d-8162-ec3f601f9ba9

Author: mrlubos

.changeset/mighty-paws-design.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+fix(zod): allOf in array items being generated as union instead of intersection

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

@@ -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/3.0.x/array-items-all-of.yaml

@@ -0,0 +1,44 @@
+openapi: 3.0.2
+info:
+  title: OpenAPI 3.0.2 array items allOf example
+  version: '1'
+components:
+  schemas:
+    # Test case 1: Array with allOf of object schemas
+    ArrayWithAllOfObjects:
+      type: array
+      items:
+        allOf:
+          - type: object
+            properties:
+              id:
+                type: integer
+          - type: object
+            properties:
+              name:
+                type: string
+    # Test case 2: Array with allOf of primitives
+    ArrayWithAllOfPrimitives:
+      type: array
+      items:
+        allOf:
+          - type: number
+          - type: string
+    # Test case 3: Array with allOf including refs
+    ArrayWithAllOfRefs:
+      type: array
+      items:
+        allOf:
+          - $ref: '#/components/schemas/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/3.1.x/array-items-all-of.yaml

@@ -0,0 +1,44 @@
+openapi: 3.1.0
+info:
+  title: OpenAPI 3.1.0 array items allOf example
+  version: '1'
+components:
+  schemas:
+    # Test case 1: Array with allOf of object schemas
+    ArrayWithAllOfObjects:
+      type: array
+      items:
+        allOf:
+          - type: object
+            properties:
+              id:
+                type: integer
+          - type: object
+            properties:
+              name:
+                type: string
+    # Test case 2: Array with allOf of primitives
+    ArrayWithAllOfPrimitives:
+      type: array
+      items:
+        allOf:
+          - type: number
+          - type: string
+    # Test case 3: Array with allOf including refs
+    ArrayWithAllOfRefs:
+      type: array
+      items:
+        allOf:
+          - $ref: '#/components/schemas/BaseModel'
+          - type: object
+            properties:
+              extra:
+                type: string
+    BaseModel:
+      type: object
+      properties:
+        id:
+          type: integer
+        createdAt:
+          type: string
+          format: date-time

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as z from 'zod/v4-mini';
+
+export const zArrayWithAllOfObjects = z.array(z.intersection(z.object({
+    id: z.optional(z.int())
+}), z.object({
+    name: z.optional(z.string())
+})));
+
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
+
+export const zBaseModel = z.object({
+    id: z.optional(z.int()),
+    createdAt: z.optional(z.iso.datetime())
+});
+
+export const zArrayWithAllOfRefs = z.array(z.intersection(zBaseModel, z.object({
+    extra: z.optional(z.string())
+})));

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+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.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(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod/v4';
+
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.optional(z.int())
+}).and(z.object({
+    name: z.optional(z.string())
+})));
+
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
+
+export const zBaseModel = z.object({
+    id: z.optional(z.int()),
+    createdAt: z.optional(z.iso.datetime())
+});
+
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.optional(z.string())
+})));

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as z from 'zod/v4-mini';
+
+export const zArrayWithAllOfObjects = z.array(z.intersection(z.object({
+    id: z.optional(z.int())
+}), z.object({
+    name: z.optional(z.string())
+})));
+
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
+
+export const zBaseModel = z.object({
+    id: z.optional(z.int()),
+    createdAt: z.optional(z.iso.datetime())
+});
+
+export const zArrayWithAllOfRefs = z.array(z.intersection(zBaseModel, z.object({
+    extra: z.optional(z.string())
+})));

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+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.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(zBaseModel.and(z.object({
+    extra: z.string().optional()
+})));

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

@@ -0,0 +1,20 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod/v4';
+
+export const zArrayWithAllOfObjects = z.array(z.object({
+    id: z.optional(z.int())
+}).and(z.object({
+    name: z.optional(z.string())
+})));
+
+export const zArrayWithAllOfPrimitives = z.array(z.intersection(z.number(), z.string()));
+
+export const zBaseModel = z.object({
+    id: z.optional(z.int()),
+    createdAt: z.optional(z.iso.datetime())
+});
+
+export const zArrayWithAllOfRefs = z.array(zBaseModel.and(z.object({
+    extra: z.optional(z.string())
+})));