@gabrielbryk/json-schema-to-zod 2.10.0 → 2.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/AGENTS.md +44 -0
  2. package/CHANGELOG.md +35 -0
  3. package/README.md +6 -33
  4. package/check-types-lift.sh +23 -0
  5. package/check-types.sh +20 -0
  6. package/dist/{esm/cli.js → cli.js} +0 -6
  7. package/dist/{esm/core → core}/analyzeSchema.js +4 -5
  8. package/dist/core/emitZod.js +263 -0
  9. package/dist/{esm/generators → generators}/generateBundle.js +225 -67
  10. package/dist/{esm/index.js → index.js} +6 -0
  11. package/dist/jsonSchemaToZod.js +17 -0
  12. package/dist/parsers/parseAllOf.js +125 -0
  13. package/dist/parsers/parseAnyOf.js +28 -0
  14. package/dist/{esm/parsers → parsers}/parseArray.js +27 -11
  15. package/dist/parsers/parseBoolean.js +4 -0
  16. package/dist/parsers/parseConst.js +22 -0
  17. package/dist/parsers/parseEnum.js +35 -0
  18. package/dist/{esm/parsers → parsers}/parseIfThenElse.js +11 -7
  19. package/dist/parsers/parseMultipleType.js +10 -0
  20. package/dist/parsers/parseNot.js +14 -0
  21. package/dist/parsers/parseNull.js +4 -0
  22. package/dist/parsers/parseNullable.js +12 -0
  23. package/dist/{esm/parsers → parsers}/parseNumber.js +4 -1
  24. package/dist/{esm/parsers → parsers}/parseObject.js +168 -29
  25. package/dist/parsers/parseOneOf.js +365 -0
  26. package/dist/{esm/parsers → parsers}/parseSchema.js +56 -110
  27. package/dist/parsers/parseSimpleDiscriminatedOneOf.js +24 -0
  28. package/dist/{esm/parsers → parsers}/parseString.js +29 -18
  29. package/dist/types/Types.d.ts +32 -4
  30. package/dist/types/core/analyzeSchema.d.ts +3 -2
  31. package/dist/types/generators/generateBundle.d.ts +0 -2
  32. package/dist/types/index.d.ts +6 -0
  33. package/dist/types/parsers/parseAllOf.d.ts +2 -2
  34. package/dist/types/parsers/parseAnyOf.d.ts +2 -2
  35. package/dist/types/parsers/parseArray.d.ts +2 -2
  36. package/dist/types/parsers/parseBoolean.d.ts +2 -1
  37. package/dist/types/parsers/parseConst.d.ts +2 -2
  38. package/dist/types/parsers/parseDefault.d.ts +2 -2
  39. package/dist/types/parsers/parseEnum.d.ts +2 -2
  40. package/dist/types/parsers/parseIfThenElse.d.ts +2 -2
  41. package/dist/types/parsers/parseMultipleType.d.ts +2 -2
  42. package/dist/types/parsers/parseNot.d.ts +2 -2
  43. package/dist/types/parsers/parseNull.d.ts +2 -1
  44. package/dist/types/parsers/parseNullable.d.ts +2 -2
  45. package/dist/types/parsers/parseNumber.d.ts +2 -2
  46. package/dist/types/parsers/parseObject.d.ts +2 -2
  47. package/dist/types/parsers/parseOneOf.d.ts +2 -2
  48. package/dist/types/parsers/parseSchema.d.ts +2 -2
  49. package/dist/types/parsers/parseSimpleDiscriminatedOneOf.d.ts +2 -2
  50. package/dist/types/parsers/parseString.d.ts +2 -2
  51. package/dist/types/utils/anyOrUnknown.d.ts +5 -4
  52. package/dist/types/utils/esmEmitter.d.ts +29 -0
  53. package/dist/types/utils/extractInlineObject.d.ts +15 -0
  54. package/dist/types/utils/liftInlineObjects.d.ts +21 -0
  55. package/dist/types/utils/namingService.d.ts +21 -0
  56. package/dist/types/utils/resolveRef.d.ts +7 -0
  57. package/dist/types/utils/schemaRepresentation.d.ts +71 -0
  58. package/dist/utils/anyOrUnknown.js +13 -0
  59. package/dist/{esm/utils → utils}/buildRefRegistry.js +4 -0
  60. package/dist/utils/esmEmitter.js +87 -0
  61. package/dist/utils/extractInlineObject.js +119 -0
  62. package/dist/utils/liftInlineObjects.js +476 -0
  63. package/dist/utils/namingService.js +58 -0
  64. package/dist/utils/resolveRef.js +92 -0
  65. package/dist/utils/schemaRepresentation.js +569 -0
  66. package/docs/IMPROVEMENT-PLAN.md +243 -0
  67. package/docs/ZOD-V4-RECURSIVE-TYPE-LIMITATIONS.md +292 -0
  68. package/docs/proposals/bundle-refactor.md +1 -1
  69. package/docs/proposals/discriminated-union-with-default.md +248 -0
  70. package/docs/proposals/inline-object-lifting.md +77 -0
  71. package/eslint.config.js +4 -2
  72. package/jest.config.mjs +19 -0
  73. package/package.json +17 -20
  74. package/scripts/generateWorkflowSchema.ts +0 -1
  75. package/dist/cjs/Types.js +0 -2
  76. package/dist/cjs/cli.js +0 -70
  77. package/dist/cjs/core/analyzeSchema.js +0 -62
  78. package/dist/cjs/core/emitZod.js +0 -141
  79. package/dist/cjs/generators/generateBundle.js +0 -365
  80. package/dist/cjs/index.js +0 -50
  81. package/dist/cjs/jsonSchemaToZod.js +0 -10
  82. package/dist/cjs/package.json +0 -1
  83. package/dist/cjs/parsers/parseAllOf.js +0 -46
  84. package/dist/cjs/parsers/parseAnyOf.js +0 -18
  85. package/dist/cjs/parsers/parseArray.js +0 -90
  86. package/dist/cjs/parsers/parseBoolean.js +0 -5
  87. package/dist/cjs/parsers/parseConst.js +0 -7
  88. package/dist/cjs/parsers/parseDefault.js +0 -8
  89. package/dist/cjs/parsers/parseEnum.js +0 -21
  90. package/dist/cjs/parsers/parseIfThenElse.js +0 -35
  91. package/dist/cjs/parsers/parseMultipleType.js +0 -10
  92. package/dist/cjs/parsers/parseNot.js +0 -12
  93. package/dist/cjs/parsers/parseNull.js +0 -5
  94. package/dist/cjs/parsers/parseNullable.js +0 -12
  95. package/dist/cjs/parsers/parseNumber.js +0 -116
  96. package/dist/cjs/parsers/parseObject.js +0 -315
  97. package/dist/cjs/parsers/parseOneOf.js +0 -53
  98. package/dist/cjs/parsers/parseSchema.js +0 -411
  99. package/dist/cjs/parsers/parseSimpleDiscriminatedOneOf.js +0 -21
  100. package/dist/cjs/parsers/parseString.js +0 -317
  101. package/dist/cjs/utils/anyOrUnknown.js +0 -14
  102. package/dist/cjs/utils/buildRefRegistry.js +0 -56
  103. package/dist/cjs/utils/cliTools.js +0 -108
  104. package/dist/cjs/utils/cycles.js +0 -113
  105. package/dist/cjs/utils/half.js +0 -7
  106. package/dist/cjs/utils/jsdocs.js +0 -20
  107. package/dist/cjs/utils/omit.js +0 -11
  108. package/dist/cjs/utils/resolveUri.js +0 -16
  109. package/dist/cjs/utils/withMessage.js +0 -21
  110. package/dist/cjs/zodToJsonSchema.js +0 -89
  111. package/dist/esm/core/emitZod.js +0 -137
  112. package/dist/esm/jsonSchemaToZod.js +0 -6
  113. package/dist/esm/package.json +0 -1
  114. package/dist/esm/parsers/parseAllOf.js +0 -43
  115. package/dist/esm/parsers/parseAnyOf.js +0 -14
  116. package/dist/esm/parsers/parseBoolean.js +0 -1
  117. package/dist/esm/parsers/parseConst.js +0 -3
  118. package/dist/esm/parsers/parseEnum.js +0 -17
  119. package/dist/esm/parsers/parseMultipleType.js +0 -6
  120. package/dist/esm/parsers/parseNot.js +0 -8
  121. package/dist/esm/parsers/parseNull.js +0 -1
  122. package/dist/esm/parsers/parseNullable.js +0 -8
  123. package/dist/esm/parsers/parseOneOf.js +0 -49
  124. package/dist/esm/parsers/parseSimpleDiscriminatedOneOf.js +0 -17
  125. package/dist/esm/utils/anyOrUnknown.js +0 -10
  126. package/jest.config.cjs +0 -4
  127. package/postcjs.cjs +0 -1
  128. package/postesm.cjs +0 -1
  129. /package/dist/{esm/Types.js → Types.js} +0 -0
  130. /package/dist/{esm/parsers → parsers}/parseDefault.js +0 -0
  131. /package/dist/{esm/utils → utils}/cliTools.js +0 -0
  132. /package/dist/{esm/utils → utils}/cycles.js +0 -0
  133. /package/dist/{esm/utils → utils}/half.js +0 -0
  134. /package/dist/{esm/utils → utils}/jsdocs.js +0 -0
  135. /package/dist/{esm/utils → utils}/omit.js +0 -0
  136. /package/dist/{esm/utils → utils}/resolveUri.js +0 -0
  137. /package/dist/{esm/utils → utils}/withMessage.js +0 -0
  138. /package/dist/{esm/zodToJsonSchema.js → zodToJsonSchema.js} +0 -0
@@ -1,141 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.emitZod = void 0;
4
- const parseSchema_js_1 = require("../parsers/parseSchema.js");
5
- const jsdocs_js_1 = require("../utils/jsdocs.js");
6
- const orderDeclarations = (entries, dependencies) => {
7
- const valueByName = new Map(entries);
8
- const depGraph = new Map();
9
- for (const [from, set] of dependencies.entries()) {
10
- const onlyKnown = new Set();
11
- for (const dep of set) {
12
- if (valueByName.has(dep) && dep !== from) {
13
- onlyKnown.add(dep);
14
- }
15
- }
16
- if (onlyKnown.size)
17
- depGraph.set(from, onlyKnown);
18
- }
19
- const names = Array.from(valueByName.keys());
20
- for (const [name, value] of entries) {
21
- const deps = depGraph.get(name) ?? new Set();
22
- for (const candidate of names) {
23
- if (candidate === name)
24
- continue;
25
- const matcher = new RegExp(`\\b${candidate}\\b`);
26
- if (matcher.test(value)) {
27
- deps.add(candidate);
28
- }
29
- }
30
- if (deps.size)
31
- depGraph.set(name, deps);
32
- }
33
- const ordered = [];
34
- const perm = new Set();
35
- const temp = new Set();
36
- const visit = (name) => {
37
- if (perm.has(name))
38
- return;
39
- if (temp.has(name)) {
40
- temp.delete(name);
41
- perm.add(name);
42
- ordered.push(name);
43
- return;
44
- }
45
- temp.add(name);
46
- const deps = depGraph.get(name);
47
- if (deps) {
48
- for (const dep of deps) {
49
- if (valueByName.has(dep)) {
50
- visit(dep);
51
- }
52
- }
53
- }
54
- temp.delete(name);
55
- perm.add(name);
56
- ordered.push(name);
57
- };
58
- for (const name of valueByName.keys()) {
59
- visit(name);
60
- }
61
- const unique = [];
62
- const seen = new Set();
63
- for (const name of ordered) {
64
- if (!seen.has(name)) {
65
- seen.add(name);
66
- unique.push(name);
67
- }
68
- }
69
- return unique.map((name) => [name, valueByName.get(name)]);
70
- };
71
- const emitZod = (analysis) => {
72
- const { schema, options, refNameByPointer, usedNames, cycleRefNames, cycleComponentByName, } = analysis;
73
- const { module, name, type, noImport, exportRefs, withMeta, ...rest } = options;
74
- const declarations = new Map();
75
- const dependencies = new Map();
76
- const parsedSchema = (0, parseSchema_js_1.parseSchema)(schema, {
77
- module,
78
- name,
79
- path: [],
80
- seen: new Map(),
81
- declarations,
82
- dependencies,
83
- inProgress: new Set(),
84
- refNameByPointer,
85
- usedNames,
86
- root: schema,
87
- currentSchemaName: name,
88
- cycleRefNames,
89
- cycleComponentByName,
90
- refRegistry: analysis.refRegistry,
91
- rootBaseUri: analysis.rootBaseUri,
92
- ...rest,
93
- withMeta,
94
- });
95
- const declarationBlock = declarations.size
96
- ? orderDeclarations(Array.from(declarations.entries()), dependencies)
97
- .map(([refName, value]) => {
98
- const shouldExport = exportRefs && module === "esm";
99
- const decl = `${shouldExport ? "export " : ""}const ${refName} = ${value}`;
100
- return decl;
101
- })
102
- .join("\n")
103
- : "";
104
- const jsdocs = rest.withJsdocs && typeof schema === "object" && schema !== null && "description" in schema
105
- ? (0, jsdocs_js_1.expandJsdocs)(String(schema.description ?? ""))
106
- : "";
107
- const lines = [];
108
- if (module === "cjs" && !noImport) {
109
- lines.push(`const { z } = require("zod")`);
110
- }
111
- if (module === "esm" && !noImport) {
112
- lines.push(`import { z } from "zod"`);
113
- }
114
- if (declarationBlock) {
115
- lines.push(declarationBlock);
116
- }
117
- if (module === "cjs") {
118
- const payload = name ? `{ ${JSON.stringify(name)}: ${parsedSchema} }` : parsedSchema;
119
- lines.push(`${jsdocs}module.exports = ${payload}`);
120
- }
121
- else if (module === "esm") {
122
- const exportLine = `${jsdocs}export ${name ? `const ${name} =` : `default`} ${parsedSchema}`;
123
- lines.push(exportLine);
124
- }
125
- else if (name) {
126
- lines.push(`${jsdocs}const ${name} = ${parsedSchema}`);
127
- }
128
- else {
129
- lines.push(`${jsdocs}${parsedSchema}`);
130
- }
131
- let typeLine;
132
- if (type && name) {
133
- const typeName = typeof type === "string" ? type : `${name[0].toUpperCase()}${name.substring(1)}`;
134
- typeLine = `export type ${typeName} = z.infer<typeof ${name}>`;
135
- }
136
- const joined = lines.filter(Boolean).join("\n\n");
137
- const combined = typeLine ? `${joined}\n${typeLine}` : joined;
138
- const shouldEndWithNewline = module === "esm" || module === "cjs";
139
- return `${combined}${shouldEndWithNewline ? "\n" : ""}`;
140
- };
141
- exports.emitZod = emitZod;
@@ -1,365 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.generateSchemaBundle = void 0;
4
- const analyzeSchema_js_1 = require("../core/analyzeSchema.js");
5
- const emitZod_js_1 = require("../core/emitZod.js");
6
- const generateSchemaBundle = (schema, options = {}) => {
7
- const module = options.module ?? "esm";
8
- if (!schema || typeof schema !== "object") {
9
- throw new Error("generateSchemaBundle requires an object schema");
10
- }
11
- const defs = schema.$defs || {};
12
- const definitions = schema.definitions || {};
13
- const defNames = Object.keys(defs);
14
- const { rootName, rootTypeName, defInfoMap } = buildBundleContext(defNames, defs, options);
15
- const files = [];
16
- const targets = planBundleTargets(schema, defs, definitions, defNames, options, rootName, rootTypeName);
17
- for (const target of targets) {
18
- const usedRefs = target.usedRefs;
19
- const analysis = (0, analyzeSchema_js_1.analyzeSchema)(target.schemaWithDefs, {
20
- ...options,
21
- module,
22
- name: target.schemaName,
23
- type: target.typeName,
24
- parserOverride: createRefHandler(target.defName, defInfoMap, usedRefs, {
25
- ...(target.schemaWithDefs.$defs || {}),
26
- ...(target.schemaWithDefs.definitions || {}),
27
- }, options),
28
- });
29
- const zodSchema = (0, emitZod_js_1.emitZod)(analysis);
30
- const finalSchema = buildSchemaFile(zodSchema, usedRefs, defInfoMap, module);
31
- files.push({ fileName: target.fileName, contents: finalSchema });
32
- }
33
- // Nested types extraction (optional)
34
- const nestedTypesEnabled = options.nestedTypes?.enable;
35
- if (nestedTypesEnabled) {
36
- const nestedTypes = collectNestedTypes(schema, defs, defNames, rootTypeName ?? rootName);
37
- if (nestedTypes.length > 0) {
38
- const nestedFileName = options.nestedTypes?.fileName ?? "nested-types.ts";
39
- const nestedContent = generateNestedTypesFile(nestedTypes);
40
- files.push({ fileName: nestedFileName, contents: nestedContent });
41
- }
42
- }
43
- return { files, defNames };
44
- };
45
- exports.generateSchemaBundle = generateSchemaBundle;
46
- // ---------------------------------------------------------------------------
47
- // Internals
48
- // ---------------------------------------------------------------------------
49
- const toPascalCase = (str) => str
50
- .split(/[-_]/)
51
- .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
52
- .join("");
53
- const buildDefInfoMap = (defNames, defs, options) => {
54
- const map = new Map();
55
- for (const defName of defNames) {
56
- const dependencies = findRefDependencies(defs[defName], defNames);
57
- const pascalName = toPascalCase(defName);
58
- const schemaName = options.splitDefs?.schemaName?.(defName, { isRoot: false }) ?? `${pascalName}Schema`;
59
- const typeName = options.splitDefs?.typeName?.(defName, { isRoot: false }) ?? pascalName;
60
- map.set(defName, {
61
- name: defName,
62
- pascalName,
63
- schemaName,
64
- typeName,
65
- dependencies,
66
- hasCycle: false,
67
- });
68
- }
69
- return map;
70
- };
71
- const buildBundleContext = (defNames, defs, options) => {
72
- const defInfoMap = buildDefInfoMap(defNames, defs, options);
73
- const cycles = detectCycles(defInfoMap);
74
- for (const defName of cycles) {
75
- const info = defInfoMap.get(defName);
76
- if (info)
77
- info.hasCycle = true;
78
- }
79
- const rootName = options.splitDefs?.rootName ?? options.name ?? "RootSchema";
80
- const rootTypeName = typeof options.type === "string"
81
- ? options.type
82
- : options.splitDefs?.rootTypeName ?? (typeof options.type === "boolean" && options.type ? rootName : undefined);
83
- return { defInfoMap, rootName, rootTypeName };
84
- };
85
- const createRefHandler = (currentDefName, defInfoMap, usedRefs, allDefs, options) => {
86
- const useLazyCrossRefs = options.refResolution?.lazyCrossRefs ?? true;
87
- return (schema, refs) => {
88
- if (typeof schema["$ref"] === "string") {
89
- const refPath = schema["$ref"];
90
- const match = refPath.match(/^#\/(?:\$defs|definitions)\/(.+)$/);
91
- if (match) {
92
- const refName = match[1];
93
- // Only intercept top-level def refs (no nested path like a/$defs/x)
94
- if (refName.includes("/")) {
95
- return undefined;
96
- }
97
- const refInfo = defInfoMap.get(refName);
98
- if (refInfo) {
99
- // Track imports when referencing other defs
100
- if (refName !== currentDefName) {
101
- usedRefs.add(refName);
102
- }
103
- const isCycle = refName === currentDefName || (refInfo.hasCycle && !!currentDefName);
104
- const resolved = options.refResolution?.onRef?.({
105
- ref: refPath,
106
- refName,
107
- currentDef: currentDefName,
108
- path: refs.path,
109
- isCycle,
110
- });
111
- if (resolved)
112
- return resolved;
113
- if (isCycle && useLazyCrossRefs) {
114
- return `z.lazy(() => ${refInfo.schemaName})`;
115
- }
116
- return refInfo.schemaName;
117
- }
118
- // If the ref points to a local/inline $def (not part of top-level defs),
119
- // let the default parser resolve it normally.
120
- if (allDefs && Object.prototype.hasOwnProperty.call(allDefs, refName)) {
121
- return undefined;
122
- }
123
- }
124
- const unknown = options.refResolution?.onUnknownRef?.({ ref: refPath, currentDef: currentDefName });
125
- if (unknown)
126
- return unknown;
127
- return options.useUnknown ? "z.unknown()" : "z.any()";
128
- }
129
- return undefined;
130
- };
131
- };
132
- const buildSchemaFile = (zodCode, usedRefs, defInfoMap, module) => {
133
- if (module !== "esm")
134
- return zodCode;
135
- const imports = [];
136
- for (const refName of [...usedRefs].sort()) {
137
- const refInfo = defInfoMap.get(refName);
138
- if (refInfo) {
139
- imports.push(`import { ${refInfo.schemaName} } from './${refName}.schema.js';`);
140
- }
141
- }
142
- if (!imports.length)
143
- return zodCode;
144
- return zodCode.replace('import { z } from "zod"', `import { z } from "zod"\n${imports.join("\n")}`);
145
- };
146
- const planBundleTargets = (rootSchema, defs, definitions, defNames, options, rootName, rootTypeName) => {
147
- const targets = [];
148
- for (const defName of defNames) {
149
- const defSchema = defs[defName];
150
- const defSchemaWithDefs = {
151
- ...defSchema,
152
- $defs: { ...defs, ...defSchema?.$defs },
153
- definitions: {
154
- ...defSchema.definitions,
155
- ...definitions,
156
- },
157
- };
158
- const pascalName = toPascalCase(defName);
159
- const schemaName = options.splitDefs?.schemaName?.(defName, { isRoot: false }) ?? `${pascalName}Schema`;
160
- const typeName = options.splitDefs?.typeName?.(defName, { isRoot: false }) ?? pascalName;
161
- const fileName = options.splitDefs?.fileName?.(defName, { isRoot: false }) ?? `${defName}.schema.ts`;
162
- targets.push({
163
- defName,
164
- schemaWithDefs: defSchemaWithDefs,
165
- schemaName,
166
- typeName,
167
- fileName,
168
- usedRefs: new Set(),
169
- isRoot: false,
170
- });
171
- }
172
- if (options.splitDefs?.includeRoot ?? true) {
173
- const rootFile = options.splitDefs?.fileName?.("root", { isRoot: true }) ?? "workflow.schema.ts";
174
- targets.push({
175
- defName: null,
176
- schemaWithDefs: {
177
- ...rootSchema,
178
- definitions: {
179
- ...rootSchema.definitions,
180
- ...definitions,
181
- },
182
- },
183
- schemaName: rootName,
184
- typeName: rootTypeName,
185
- fileName: rootFile,
186
- usedRefs: new Set(),
187
- isRoot: true,
188
- });
189
- }
190
- return targets;
191
- };
192
- const findRefDependencies = (schema, validDefNames) => {
193
- const deps = new Set();
194
- function traverse(obj) {
195
- if (obj === null || typeof obj !== "object")
196
- return;
197
- if (Array.isArray(obj)) {
198
- obj.forEach(traverse);
199
- return;
200
- }
201
- const record = obj;
202
- if (typeof record["$ref"] === "string") {
203
- const ref = record["$ref"];
204
- const match = ref.match(/^#\/(?:\$defs|definitions)\/(.+)$/);
205
- if (match && validDefNames.includes(match[1])) {
206
- deps.add(match[1]);
207
- }
208
- }
209
- for (const value of Object.values(record)) {
210
- traverse(value);
211
- }
212
- }
213
- traverse(schema);
214
- return deps;
215
- };
216
- const detectCycles = (defInfoMap) => {
217
- const cycleNodes = new Set();
218
- const visited = new Set();
219
- const recursionStack = new Set();
220
- function dfs(node, path) {
221
- if (recursionStack.has(node)) {
222
- const cycleStart = path.indexOf(node);
223
- for (let i = cycleStart; i < path.length; i++) {
224
- cycleNodes.add(path[i]);
225
- }
226
- cycleNodes.add(node);
227
- return true;
228
- }
229
- if (visited.has(node))
230
- return false;
231
- visited.add(node);
232
- recursionStack.add(node);
233
- const info = defInfoMap.get(node);
234
- if (info) {
235
- for (const dep of info.dependencies) {
236
- dfs(dep, [...path, node]);
237
- }
238
- }
239
- recursionStack.delete(node);
240
- return false;
241
- }
242
- for (const defName of defInfoMap.keys()) {
243
- if (!visited.has(defName)) {
244
- dfs(defName, []);
245
- }
246
- }
247
- return cycleNodes;
248
- };
249
- const collectNestedTypes = (rootSchema, defs, defNames, rootTypeName) => {
250
- const allNestedTypes = [];
251
- for (const defName of defNames) {
252
- const defSchema = defs[defName];
253
- const parentTypeName = toPascalCase(defName);
254
- const nestedTypes = findNestedTypesInSchema(defSchema, parentTypeName, defNames);
255
- for (const nested of nestedTypes) {
256
- nested.file = defName;
257
- nested.parentType = parentTypeName;
258
- allNestedTypes.push(nested);
259
- }
260
- }
261
- const workflowNestedTypes = findNestedTypesInSchema({ properties: rootSchema.properties, required: rootSchema.required }, rootTypeName, defNames);
262
- for (const nested of workflowNestedTypes) {
263
- nested.file = "workflow";
264
- nested.parentType = rootTypeName;
265
- allNestedTypes.push(nested);
266
- }
267
- const uniqueNestedTypes = new Map();
268
- for (const nested of allNestedTypes) {
269
- if (!uniqueNestedTypes.has(nested.typeName) && nested.propertyPath.length > 0) {
270
- uniqueNestedTypes.set(nested.typeName, nested);
271
- }
272
- }
273
- return [...uniqueNestedTypes.values()];
274
- };
275
- const findNestedTypesInSchema = (schema, parentTypeName, defNames, currentPath = []) => {
276
- const nestedTypes = [];
277
- if (schema === null || typeof schema !== "object")
278
- return nestedTypes;
279
- const record = schema;
280
- if (record.title && typeof record.title === "string") {
281
- const title = record.title;
282
- if (title !== parentTypeName && !defNames.map((d) => toPascalCase(d)).includes(title)) {
283
- nestedTypes.push({
284
- typeName: title,
285
- parentType: parentTypeName,
286
- propertyPath: [...currentPath],
287
- file: "",
288
- });
289
- }
290
- }
291
- // inline $defs
292
- if (record.$defs && typeof record.$defs === "object") {
293
- for (const [, defSchema] of Object.entries(record.$defs)) {
294
- nestedTypes.push(...findNestedTypesInSchema(defSchema, parentTypeName, defNames, currentPath));
295
- }
296
- }
297
- if (record.properties && typeof record.properties === "object") {
298
- for (const [propName, propSchema] of Object.entries(record.properties)) {
299
- nestedTypes.push(...findNestedTypesInSchema(propSchema, parentTypeName, defNames, [...currentPath, propName]));
300
- }
301
- }
302
- if (Array.isArray(record.allOf)) {
303
- for (const item of record.allOf) {
304
- nestedTypes.push(...findNestedTypesInSchema(item, parentTypeName, defNames, currentPath));
305
- }
306
- }
307
- if (record.items) {
308
- nestedTypes.push(...findNestedTypesInSchema(record.items, parentTypeName, defNames, [...currentPath, "items"]));
309
- }
310
- if (record.additionalProperties && typeof record.additionalProperties === "object") {
311
- nestedTypes.push(...findNestedTypesInSchema(record.additionalProperties, parentTypeName, defNames, [...currentPath, "additionalProperties"]));
312
- }
313
- return nestedTypes;
314
- };
315
- const generateNestedTypesFile = (nestedTypes) => {
316
- const lines = [
317
- "/**",
318
- " * Auto-generated nested type exports",
319
- " * ",
320
- " * These types are inline within parent schemas but commonly needed separately.",
321
- " * They are extracted using TypeScript indexed access types.",
322
- " */",
323
- "",
324
- ];
325
- const byParent = new Map();
326
- for (const info of nestedTypes) {
327
- if (!byParent.has(info.parentType)) {
328
- byParent.set(info.parentType, []);
329
- }
330
- byParent.get(info.parentType).push(info);
331
- }
332
- const imports = new Map(); // file -> type name
333
- for (const info of nestedTypes) {
334
- if (!imports.has(info.file)) {
335
- imports.set(info.file, info.parentType);
336
- }
337
- }
338
- for (const [file, typeName] of [...imports.entries()].sort()) {
339
- lines.push(`import type { ${typeName} } from './${file}.schema.js';`);
340
- }
341
- lines.push("");
342
- const buildAccessExpr = (parentType, propertyPath) => {
343
- let accessExpr = parentType;
344
- for (const prop of propertyPath) {
345
- const accessor = prop === "items"
346
- ? "[number]"
347
- : typeof prop === "number"
348
- ? `[${prop}]`
349
- : `[${JSON.stringify(prop)}]`;
350
- accessExpr = `NonNullable<${accessExpr}${accessor}>`;
351
- }
352
- return accessExpr;
353
- };
354
- for (const [parentType, types] of [...byParent.entries()].sort()) {
355
- lines.push(`// From ${parentType}`);
356
- for (const info of types.sort((a, b) => a.typeName.localeCompare(b.typeName))) {
357
- if (info.propertyPath.length > 0) {
358
- const accessExpr = buildAccessExpr(parentType, info.propertyPath);
359
- lines.push(`export type ${info.typeName} = ${accessExpr};`);
360
- }
361
- }
362
- lines.push("");
363
- }
364
- return lines.join("\n");
365
- };
package/dist/cjs/index.js DELETED
@@ -1,50 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- __exportStar(require("./Types.js"), exports);
18
- __exportStar(require("./core/analyzeSchema.js"), exports);
19
- __exportStar(require("./core/emitZod.js"), exports);
20
- __exportStar(require("./generators/generateBundle.js"), exports);
21
- __exportStar(require("./jsonSchemaToZod.js"), exports);
22
- __exportStar(require("./parsers/parseAllOf.js"), exports);
23
- __exportStar(require("./parsers/parseAnyOf.js"), exports);
24
- __exportStar(require("./parsers/parseArray.js"), exports);
25
- __exportStar(require("./parsers/parseBoolean.js"), exports);
26
- __exportStar(require("./parsers/parseConst.js"), exports);
27
- __exportStar(require("./parsers/parseDefault.js"), exports);
28
- __exportStar(require("./parsers/parseEnum.js"), exports);
29
- __exportStar(require("./parsers/parseIfThenElse.js"), exports);
30
- __exportStar(require("./parsers/parseMultipleType.js"), exports);
31
- __exportStar(require("./parsers/parseNot.js"), exports);
32
- __exportStar(require("./parsers/parseNull.js"), exports);
33
- __exportStar(require("./parsers/parseNullable.js"), exports);
34
- __exportStar(require("./parsers/parseNumber.js"), exports);
35
- __exportStar(require("./parsers/parseObject.js"), exports);
36
- __exportStar(require("./parsers/parseOneOf.js"), exports);
37
- __exportStar(require("./parsers/parseSchema.js"), exports);
38
- __exportStar(require("./parsers/parseSimpleDiscriminatedOneOf.js"), exports);
39
- __exportStar(require("./parsers/parseString.js"), exports);
40
- __exportStar(require("./utils/anyOrUnknown.js"), exports);
41
- __exportStar(require("./utils/buildRefRegistry.js"), exports);
42
- __exportStar(require("./utils/cycles.js"), exports);
43
- __exportStar(require("./utils/half.js"), exports);
44
- __exportStar(require("./utils/jsdocs.js"), exports);
45
- __exportStar(require("./utils/omit.js"), exports);
46
- __exportStar(require("./utils/resolveUri.js"), exports);
47
- __exportStar(require("./utils/withMessage.js"), exports);
48
- __exportStar(require("./zodToJsonSchema.js"), exports);
49
- const jsonSchemaToZod_js_1 = require("./jsonSchemaToZod.js");
50
- exports.default = jsonSchemaToZod_js_1.jsonSchemaToZod;
@@ -1,10 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.jsonSchemaToZod = void 0;
4
- const analyzeSchema_js_1 = require("./core/analyzeSchema.js");
5
- const emitZod_js_1 = require("./core/emitZod.js");
6
- const jsonSchemaToZod = (schema, options = {}) => {
7
- const analysis = (0, analyzeSchema_js_1.analyzeSchema)(schema, options);
8
- return (0, emitZod_js_1.emitZod)(analysis);
9
- };
10
- exports.jsonSchemaToZod = jsonSchemaToZod;
@@ -1 +0,0 @@
1
- {"type":"commonjs"}
@@ -1,46 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parseAllOf = parseAllOf;
4
- const parseSchema_js_1 = require("./parseSchema.js");
5
- const half_js_1 = require("../utils/half.js");
6
- const originalIndexKey = "__originalIndex";
7
- const ensureOriginalIndex = (arr) => {
8
- const newArr = [];
9
- for (let i = 0; i < arr.length; i++) {
10
- const item = arr[i];
11
- if (typeof item === "boolean") {
12
- newArr.push(item ? { [originalIndexKey]: i } : { [originalIndexKey]: i, not: {} });
13
- }
14
- else if (typeof item === "object" &&
15
- item !== null &&
16
- originalIndexKey in item) {
17
- return arr;
18
- }
19
- else {
20
- newArr.push({ ...item, [originalIndexKey]: i });
21
- }
22
- }
23
- return newArr;
24
- };
25
- function parseAllOf(schema, refs) {
26
- if (schema.allOf.length === 0) {
27
- return "z.never()";
28
- }
29
- else if (schema.allOf.length === 1) {
30
- const item = schema.allOf[0];
31
- return (0, parseSchema_js_1.parseSchema)(item, {
32
- ...refs,
33
- path: [
34
- ...refs.path,
35
- "allOf",
36
- item[originalIndexKey] ?? 0,
37
- ],
38
- });
39
- }
40
- else {
41
- const [left, right] = (0, half_js_1.half)(ensureOriginalIndex(schema.allOf));
42
- return `z.intersection(${parseAllOf({ allOf: left }, refs)}, ${parseAllOf({
43
- allOf: right,
44
- }, refs)})`;
45
- }
46
- }
@@ -1,18 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parseAnyOf = void 0;
4
- const parseSchema_js_1 = require("./parseSchema.js");
5
- const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
6
- const parseAnyOf = (schema, refs) => {
7
- return schema.anyOf.length
8
- ? schema.anyOf.length === 1
9
- ? (0, parseSchema_js_1.parseSchema)(schema.anyOf[0], {
10
- ...refs,
11
- path: [...refs.path, "anyOf", 0],
12
- })
13
- : `z.union([${schema.anyOf
14
- .map((schema, i) => (0, parseSchema_js_1.parseSchema)(schema, { ...refs, path: [...refs.path, "anyOf", i] }))
15
- .join(", ")}])`
16
- : (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
17
- };
18
- exports.parseAnyOf = parseAnyOf;