+5

.changeset/fix-zod-union-deduplication.md

reviewed

··· 1 1 + --- 2 2 + "@hey-api/openapi-ts": patch 3 3 + --- 4 4 + 5 5 + fix(parser): expand schema deduplication by including validation constraints in type ID

+27

packages/openapi-ts-tests/specs/3.1.x/validators-string-constraints-union.json

reviewed

··· 1 1 + { 2 2 + "openapi": "3.1.0", 3 3 + "info": { 4 4 + "title": "String Constraints Union Test", 5 5 + "version": "1.0.0" 6 6 + }, 7 7 + "components": { 8 8 + "schemas": { 9 9 + "LocaleOrLanguage": { 10 10 + "anyOf": [ 11 11 + { 12 12 + "type": "string", 13 13 + "minLength": 5, 14 14 + "maxLength": 5, 15 15 + "description": "Combination of ISO 639-1 and ISO 3166-1 alpha-2 separated by a hyphen." 16 16 + }, 17 17 + { 18 18 + "type": "string", 19 19 + "minLength": 2, 20 20 + "maxLength": 2, 21 21 + "description": "ISO 639-1 language code." 22 22 + } 23 23 + ] 24 24 + } 25 25 + } 26 26 + } 27 27 + }

+8

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import * as z from 'zod/v4-mini'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().check(z.length(5)), 7 7 + z.string().check(z.length(2)) 8 8 + ]);

+8

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import { z } from 'zod'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().length(5), 7 7 + z.string().length(2) 8 8 + ]);

+8

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import { z } from 'zod/v4'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().length(5), 7 7 + z.string().length(2) 8 8 + ]);

+7

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

reviewed

··· 138 138 description: 139 139 "validator schemas with merged unions (can't use .merge())", 140 140 }, 141 141 + { 142 142 + config: createConfig({ 143 143 + input: 'validators-string-constraints-union.json', 144 144 + output: 'validators-string-constraints-union', 145 145 + }), 146 146 + description: 'validator schemas with string constraints union', 147 147 + }, 141 148 ]; 142 149 143 150 it.each(scenarios)('$description', async ({ config }) => {

+8

packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import * as z from 'zod/mini'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().check(z.length(5)), 7 7 + z.string().check(z.length(2)) 8 8 + ]);

+8

packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import { z } from 'zod/v3'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().length(5), 7 7 + z.string().length(2) 8 8 + ]);

+8

packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-string-constraints-union/zod.gen.ts

reviewed

··· 1 1 + // This file is auto-generated by @hey-api/openapi-ts 2 2 + 3 3 + import { z } from 'zod'; 4 4 + 5 5 + export const zLocaleOrLanguage = z.union([ 6 6 + z.string().length(5), 7 7 + z.string().length(2) 8 8 + ]);

+7

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

reviewed

··· 138 138 description: 139 139 "validator schemas with merged unions (can't use .merge())", 140 140 }, 141 141 + { 142 142 + config: createConfig({ 143 143 + input: 'validators-string-constraints-union.json', 144 144 + output: 'validators-string-constraints-union', 145 145 + }), 146 146 + description: 'validator schemas with string constraints union', 147 147 + }, 141 148 ]; 142 149 143 150 it.each(scenarios)('$description', async ({ config }) => {

+19 -1

packages/openapi-ts/src/ir/schema.ts

reviewed

··· 42 42 item.format !== undefined && detectFormat 43 43 ? `format-${item.format}` 44 44 : ''; 45 45 - const typeId = `${item.$ref ?? ''}${item.type ?? ''}${constant}${format}`; 45 45 + 46 46 + // Include validation constraints in the type ID to avoid incorrect deduplication 47 47 + const constraints = [ 48 48 + item.minLength !== undefined ? `minLength-${item.minLength}` : '', 49 49 + item.maxLength !== undefined ? `maxLength-${item.maxLength}` : '', 50 50 + item.minimum !== undefined ? `minimum-${item.minimum}` : '', 51 51 + item.maximum !== undefined ? `maximum-${item.maximum}` : '', 52 52 + item.exclusiveMinimum !== undefined 53 53 + ? `exclusiveMinimum-${item.exclusiveMinimum}` 54 54 + : '', 55 55 + item.exclusiveMaximum !== undefined 56 56 + ? `exclusiveMaximum-${item.exclusiveMaximum}` 57 57 + : '', 58 58 + item.minItems !== undefined ? `minItems-${item.minItems}` : '', 59 59 + item.maxItems !== undefined ? `maxItems-${item.maxItems}` : '', 60 60 + item.pattern !== undefined ? `pattern-${item.pattern}` : '', 61 61 + ].join(''); 62 62 + 63 63 + const typeId = `${item.$ref ?? ''}${item.type ?? ''}${constant}${format}${constraints}`; 46 64 if (!typeIds.includes(typeId)) { 47 65 typeIds.push(typeId); 48 66 uniqueItems.push(item);