@sdk-it/core 0.43.0 → 0.45.0

package/dist/lib/spec-json.d.ts

@@ -0,0 +1,23 @@
+declare global {
+    interface JSON {
+        /**
+         * TC39 "JSON.parse source access" proposal, shipped in Node 21+ and
+         * evergreen browsers. TypeScript 6 does not ship lib types for it yet.
+         */
+        rawJSON(text: string): {
+            rawJSON: string;
+        };
+        isRawJSON(value: unknown): value is {
+            rawJSON: string;
+        };
+    }
+}
+/**
+ * Spec objects produced by the analyzers carry real bigint values for int64
+ * defaults and bounds. JSON.stringify throws on bigint; this replacer writes
+ * them as bare JSON numbers instead — lossless on disk (JSON's grammar allows
+ * arbitrary-precision numbers) and valid against `type: integer` schemas.
+ */
+export declare function specJsonReplacer(_key: string, value: unknown): unknown;
+export declare function stringifySpec(spec: unknown, space?: string | number): string;
+//# sourceMappingURL=spec-json.d.ts.map

package/dist/lib/spec-json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-json.d.ts","sourceRoot":"","sources":["../../src/lib/spec-json.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,IAAI;QACZ;;;WAGG;QACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3C,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;KACzD;CACF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAEtE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE5E"}

package/dist/lib/spec-json.js

@@ -0,0 +1,11 @@
+function specJsonReplacer(_key, value) {
+  return typeof value === "bigint" ? JSON.rawJSON(value.toString()) : value;
+}
+function stringifySpec(spec, space) {
+  return JSON.stringify(spec, specJsonReplacer, space);
+}
+export {
+  specJsonReplacer,
+  stringifySpec
+};
+//# sourceMappingURL=spec-json.js.map

package/dist/lib/spec-json.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/lib/spec-json.ts"],
+  "sourcesContent": ["declare global {\n  interface JSON {\n    /**\n     * TC39 \"JSON.parse source access\" proposal, shipped in Node 21+ and\n     * evergreen browsers. TypeScript 6 does not ship lib types for it yet.\n     */\n    rawJSON(text: string): { rawJSON: string };\n    isRawJSON(value: unknown): value is { rawJSON: string };\n  }\n}\n\n/**\n * Spec objects produced by the analyzers carry real bigint values for int64\n * defaults and bounds. JSON.stringify throws on bigint; this replacer writes\n * them as bare JSON numbers instead \u2014 lossless on disk (JSON's grammar allows\n * arbitrary-precision numbers) and valid against `type: integer` schemas.\n */\nexport function specJsonReplacer(_key: string, value: unknown): unknown {\n  return typeof value === 'bigint' ? JSON.rawJSON(value.toString()) : value;\n}\n\nexport function stringifySpec(spec: unknown, space?: string | number): string {\n  return JSON.stringify(spec, specJsonReplacer, space);\n}\n"],
+  "mappings": "AAiBO,SAAS,iBAAiB,MAAc,OAAyB;AACtE,SAAO,OAAO,UAAU,WAAW,KAAK,QAAQ,MAAM,SAAS,CAAC,IAAI;AACtE;AAEO,SAAS,cAAc,MAAe,OAAiC;AAC5E,SAAO,KAAK,UAAU,MAAM,kBAAkB,KAAK;AACrD;",
+  "names": []
+}

package/dist/lib/zod-jsonschema.d.ts

@@ -1,6 +1,7 @@
 export type InjectImport = {
     import: string;
     from: string;
+    property?: string;
 };
 export declare function evalZod(schema: string, imports?: InjectImport[]): Promise<any>;
 //# sourceMappingURL=zod-jsonschema.d.ts.map

package/dist/lib/zod-jsonschema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-jsonschema.d.ts","sourceRoot":"","sources":["../../src/lib/zod-jsonschema.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAUF,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAY,EAAO,gBAgRzE"}
+{"version":3,"file":"zod-jsonschema.d.ts","sourceRoot":"","sources":["../../src/lib/zod-jsonschema.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAUF,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAY,EAAO,gBA0mBzE"}

package/dist/lib/zod-jsonschema.js

@@ -7,57 +7,81 @@ async function evalZod(schema, imports = []) {
     `const filename = "${import.meta.url}";`,
     `const require = createRequire(filename);`,
     `const z = require("zod");`,
-    ...imports.map((imp) => `const ${imp.import} = require('${imp.from}');`),
-    `const {zodToJsonSchema, ignoreOverride} = require('zod-to-json-schema');`,
+    // zod 4 removed ZodString.ip/.cidr; restore them for analyzed user source
+    // that still uses the v3 spellings.
+    `const stringProto = Object.getPrototypeOf(z.string());
+    const installedShims = [];
+    function withReceiverChecks(receiver, format) {
+      return (receiver._zod.def.checks ?? []).length
+        ? z.intersection(receiver, format)
+        : format;
+    }
+    if (!stringProto.ip) {
+      installedShims.push('ip');
+      stringProto.ip = function (options) {
+        if (options?.version === 'v4') return withReceiverChecks(this, z.ipv4());
+        if (options?.version === 'v6') return withReceiverChecks(this, z.ipv6());
+        return withReceiverChecks(this, z.union([z.ipv4(), z.ipv6()]));
+      };
+    }
+    if (!stringProto.cidr) {
+      installedShims.push('cidr');
+      stringProto.cidr = function (options) {
+        if (options?.version === 'v4') return withReceiverChecks(this, z.cidrv4());
+        if (options?.version === 'v6') return withReceiverChecks(this, z.cidrv6());
+        return withReceiverChecks(this, z.union([z.cidrv4(), z.cidrv6()]));
+      };
+    }`,
+    ...imports.map(
+      (imp) => `const ${imp.import} = require(${JSON.stringify(imp.from)})${imp.property ? `[${JSON.stringify(imp.property)}]` : ""};`
+    ),
     `let optional = false;`,
+    `const WRAPPER_TYPES = new Set([
+      'optional',
+      'nullable',
+      'default',
+      'prefault',
+      'catch',
+      'readonly',
+      'nonoptional',
+    ]);`,
     `function unwrapSchemaDef(def) {
       while (def) {
-        if (
-          def.typeName === 'ZodOptional' ||
-          def.typeName === 'ZodDefault' ||
-          def.typeName === 'ZodNullable' ||
-          def.typeName === 'ZodCatch' ||
-          def.typeName === 'ZodBranded' ||
-          def.typeName === 'ZodReadonly'
-        ) {
-          def = def.innerType?._def;
-          continue;
-        }
-        if (def.typeName === 'ZodEffects') {
-          def = def.schema?._def;
+        if (WRAPPER_TYPES.has(def.type)) {
+          def = def.innerType?._zod?.def;
           continue;
         }
-        if (def.typeName === 'ZodPipeline') {
-          def = def.in?._def;
+        if (def.type === 'pipe') {
+          def = def.in?._zod?.def;
           continue;
         }
         return def;
       }
       return def;
     }`,
-    `function matchesDefType(schema, typeName) {
+    `function matchesDefType(schema, defType) {
       if (!schema || typeof schema !== 'object') return false;
-      if (typeName === 'ZodNumber') {
+      if (defType === 'number') {
         return schema.type === 'number' || schema.type === 'integer';
       }
-      if (typeName === 'ZodBigInt') {
+      if (defType === 'bigint') {
         return schema.type === 'integer';
       }
-      if (typeName === 'ZodString') {
+      if (defType === 'string') {
         return schema.type === 'string';
       }
-      if (typeName === 'ZodBoolean') {
+      if (defType === 'boolean') {
         return schema.type === 'boolean';
       }
-      if (typeName === 'ZodDate') {
+      if (defType === 'date') {
         return schema.type === 'string' && schema.format === 'date-time';
       }
       return typeof schema.type === 'string';
     }`,
-    `function applyZodType(schema, zodType, typeName) {
+    `function applyZodType(schema, zodType, defType) {
       if (!schema || typeof schema !== 'object') return false;
       if (schema['x-zod-type']) return true;
-      if (matchesDefType(schema, typeName)) {
+      if (matchesDefType(schema, defType)) {
         schema['x-zod-type'] = zodType;
         return true;
       }
@@ -66,17 +90,94 @@ async function evalZod(schema, imports = []) {
         const candidates = schema[key].filter(
           (candidate) => candidate && candidate.type !== 'null',
         );
-        if (candidates.length === 1 && applyZodType(candidates[0], zodType, typeName)) {
+        if (candidates.length === 1 && applyZodType(candidates[0], zodType, defType)) {
           return true;
         }
         for (const candidate of candidates) {
-          if (applyZodType(candidate, zodType, typeName)) {
+          if (applyZodType(candidate, zodType, defType)) {
             return true;
           }
         }
       }
       return false;
     }`,
+    `const BIGINT_SENTINEL = '__sdkit_bigint__';`,
+    // zod v4 JSON-round-trips default values before the override callback
+    // runs, which throws on bigint. Mask them as sentinel strings up front
+    // and restore after conversion.
+    `function maskBigIntDefaults(schema, seen = new Set()) {
+      if (!schema || !schema._zod || seen.has(schema)) return;
+      seen.add(schema);
+      const def = schema._zod.def;
+      if (
+        (def.type === 'default' || def.type === 'prefault') &&
+        typeof def.defaultValue === 'bigint'
+      ) {
+        Object.defineProperty(def, 'defaultValue', {
+          value: BIGINT_SENTINEL + def.defaultValue.toString(),
+          configurable: true,
+        });
+      }
+      for (const key of ['innerType', 'in', 'out', 'element', 'valueType', 'keyType', 'left', 'right', 'catchall', 'rest']) {
+        if (def[key]) maskBigIntDefaults(def[key], seen);
+      }
+      if (typeof def.getter === 'function') {
+        const inner = def.getter();
+        maskBigIntDefaults(inner, seen);
+        Object.defineProperty(def, 'getter', {
+          value: () => inner,
+          configurable: true,
+        });
+      }
+      if (def.shape) {
+        for (const value of Object.values(def.shape)) maskBigIntDefaults(value, seen);
+      }
+      if (Array.isArray(def.options)) {
+        for (const option of def.options) maskBigIntDefaults(option, seen);
+      }
+      if (Array.isArray(def.items)) {
+        for (const item of def.items) maskBigIntDefaults(item, seen);
+      }
+    }`,
+    // int64 is a plain number in sdk-it, so masked bigint defaults unmask to
+    // JS numbers — the spec stays plain JSON with no bigint values to trip up
+    // JSON.stringify.
+    `function unmaskBigIntDefaults(schema) {
+      if (!schema || typeof schema !== 'object') return;
+      for (const [key, value] of Object.entries(schema)) {
+        if (typeof value === 'string' && value.startsWith(BIGINT_SENTINEL)) {
+          schema[key] = Number(value.slice(BIGINT_SENTINEL.length));
+        } else if (Array.isArray(value)) {
+          value.forEach(unmaskBigIntDefaults);
+        } else if (value && typeof value === 'object') {
+          unmaskBigIntDefaults(value);
+        }
+      }
+    }`,
+    `function hasExplicitRegexCheck(def) {
+      return (def.checks ?? []).some(
+        (check) => check._zod?.def?.format === 'regex',
+      );
+    }`,
+    `const STANDARD_STRING_FORMATS = new Set([
+      'email',
+      'uri',
+      'url',
+      'uuid',
+      'guid',
+      'date-time',
+      'date',
+      'time',
+      'duration',
+      'ipv4',
+      'ipv6',
+      'hostname',
+      'binary',
+    ]);`,
+    // Nonstandard formats that sdk-it's own converters map to semantic zod
+    // validators. Keep both keys: format for our converters, pattern for
+    // third-party validators that do not recognize the format.
+    `const MAPPED_NONSTANDARD_FORMATS = new Set(['cidrv4', 'cidrv6']);`,
     `function normalizeDefaultValue(value) {
       return value instanceof Date ? value.toISOString() : value;
     }`,
@@ -133,6 +234,13 @@ async function evalZod(schema, imports = []) {
     `function mergePrimitiveSchemas(schemas) {
       const merged = {};
       for (const schema of schemas) {
+        if (
+          schema &&
+          typeof schema === 'object' &&
+          Object.keys(schema).length === 0
+        ) {
+          continue;
+        }
         if (!isMergeablePrimitiveSchema(schema)) {
           return null;
         }
@@ -185,7 +293,7 @@ async function evalZod(schema, imports = []) {
       }
       return merged;
     }`,
-    `function normalizeSchema(schema) {
+    `function normalizeSchema(schema, isIntersectionMember = false) {
       if (!schema || typeof schema !== 'object') {
         return schema;
       }
@@ -215,7 +323,55 @@ async function evalZod(schema, imports = []) {
 
       for (const key of ['anyOf', 'oneOf', 'allOf']) {
         if (!Array.isArray(schema[key])) continue;
-        schema[key] = schema[key].map((candidate) => normalizeSchema(candidate));
+        schema[key] = schema[key].map((candidate) =>
+          normalizeSchema(candidate, key === 'allOf'),
+        );
+      }
+
+      if (Array.isArray(schema.oneOf) && !schema.anyOf) {
+        schema.anyOf = schema.oneOf;
+        delete schema.oneOf;
+      }
+
+      if (
+        Array.isArray(schema.anyOf) &&
+        schema.anyOf.every(
+          (member) =>
+            member &&
+            typeof member === 'object' &&
+            Object.keys(member).length === 1 &&
+            typeof member.type === 'string',
+        )
+      ) {
+        const { anyOf, ...rest } = schema;
+        schema = { ...rest, type: anyOf.map((member) => member.type) };
+      }
+
+      if (
+        schema.type === 'object' &&
+        schema.properties &&
+        schema.additionalProperties === undefined &&
+        !isIntersectionMember
+      ) {
+        schema.additionalProperties = false;
+      }
+
+      if (
+        schema.type === 'object' &&
+        schema.propertyNames &&
+        JSON.stringify(schema.propertyNames) === '{"type":"string"}'
+      ) {
+        delete schema.propertyNames;
+      }
+
+      if (
+        typeof schema.$ref === 'string' &&
+        !schema.$ref.startsWith('#/components/schemas')
+      ) {
+        schema.$ref =
+          schema.$ref === '#'
+            ? '#/components/schemas'
+            : schema.$ref.replace(/^#\\//, '#/components/schemas/');
       }
 
       if (Array.isArray(schema.allOf)) {
@@ -224,43 +380,230 @@ async function evalZod(schema, imports = []) {
           const { allOf, ...rest } = schema;
           return { ...rest, ...merged };
         }
+        if (schema.allOf.length === 1 && Object.keys(schema).length === 1) {
+          return schema.allOf[0];
+        }
       }
 
       return schema;
     }`,
+    `function escapePointerSegment(segment) {
+      return String(segment).replaceAll('~', '~0').replaceAll('/', '~1');
+    }`,
+    `function componentPointer(path) {
+      return ['#', 'components', 'schemas', ...path.map(escapePointerSegment)].join('/');
+    }`,
+    // Nested toJsonSchema passes (set/map values, pipe outputs) return
+    // self-contained draft-7 documents whose '#' and '#/definitions/*' refs
+    // are relative to the embedded document root, not the outer schema.
+    // Resolve them to outer-root structural pointers before the outer
+    // definitions/normalize passes rewrite them into dangling refs.
+    `function resolveEmbeddedDocs(root) {
+      function process(node, path, docRoot) {
+        if (!node || typeof node !== 'object') return;
+        if (Array.isArray(node)) {
+          node.forEach((item, index) => process(item, [...path, index], docRoot));
+          return;
+        }
+        if (node['x-sdkit-embedded-root']) {
+          delete node['x-sdkit-embedded-root'];
+          const defs = node.definitions ?? Object.create(null);
+          delete node.definitions;
+          docRoot = { path, defs, firstSite: Object.create(null) };
+        }
+        if (docRoot && typeof node.$ref === 'string') {
+          if (node.$ref === '#') {
+            node.$ref = componentPointer(docRoot.path);
+            return;
+          }
+          const match = node.$ref.match(/^#\\/definitions\\/(.+)$/);
+          if (match) {
+            const name = match[1];
+            if (name in docRoot.firstSite) {
+              node.$ref = docRoot.firstSite[name];
+              return;
+            }
+            docRoot.firstSite[name] = componentPointer(path);
+            delete node.$ref;
+            Object.assign(node, docRoot.defs[name]);
+          }
+        }
+        for (const [key, value] of Object.entries(node)) {
+          process(value, [...path, key], docRoot);
+        }
+      }
+      process(root, [], null);
+      return root;
+    }`,
+    // zod v4 breaks non-root cycles with a draft-7 definitions block plus
+    // #/definitions/* refs, which OpenAPI consumers cannot resolve. Inline
+    // each definition at its first use site and point the remaining
+    // (recursive) refs structurally at that site, mirroring the v3
+    // $refStrategy: 'root' output.
+    `function inlineDefinitions(root) {
+      const defs = root.definitions;
+      if (!defs || typeof defs !== 'object') return root;
+      delete root.definitions;
+      const firstSite = Object.create(null);
+      function walk(node, path) {
+        if (!node || typeof node !== 'object') return;
+        if (Array.isArray(node)) {
+          node.forEach((item, index) => walk(item, [...path, index]));
+          return;
+        }
+        const match =
+          typeof node.$ref === 'string' &&
+          node.$ref.match(/^#\\/definitions\\/(.+)$/);
+        if (match) {
+          const name = match[1];
+          if (name in firstSite) {
+            node.$ref = firstSite[name];
+            return;
+          }
+          firstSite[name] = componentPointer(path);
+          delete node.$ref;
+          Object.assign(node, defs[name]);
+        }
+        for (const [key, value] of Object.entries(node)) {
+          walk(value, [...path, key]);
+        }
+      }
+      walk(root, []);
+      return root;
+    }`,
+    // Wraps nested conversions: when the embedded document carries refs or a
+    // definitions block, tag its root so resolveEmbeddedDocs can rebase them.
+    `function convertEmbedded(schema) {
+      const { $schema: _ignored, ...doc } = toJsonSchema(schema);
+      if (doc.definitions || JSON.stringify(doc).includes('"$ref"')) {
+        doc['x-sdkit-embedded-root'] = true;
+      }
+      return doc;
+    }`,
     `function toJsonSchema(schema) {
-      return zodToJsonSchema(schema, {
-        $refStrategy: 'root',
-        basePath: ['#', 'components', 'schemas'],
-        target: 'jsonSchema7',
-        base64Strategy: 'format:binary',
-        effectStrategy: 'input',
-        override: (def) => {
-          if (def.typeName === 'ZodOptional') {
-						optional = true;
-						const { $schema, ...result } = toJsonSchema(def.innerType);
-            if (def.description) { result.description = def.description; }
-            return result;
+      return z.toJSONSchema(schema, {
+        target: 'draft-7',
+        io: 'input',
+        unrepresentable: 'any',
+        override(ctx) {
+          const def = ctx.zodSchema._zod.def;
+          const json = ctx.jsonSchema;
+          if (def.type === 'optional') {
+            optional = true;
+          }
+          if (def.type === 'catch') {
+            delete json.default;
           }
-          if (def.typeName === 'ZodDate') {
-            return {
-              type: 'string',
-              format: 'date-time',
-              'x-zod-type': def.coerce ? 'coerce-date' : 'date',
-              ...(def.description ? { description: def.description } : {}),
+          if (def.type === 'date') {
+            json.type = 'string';
+            json.format = 'date-time';
+            json['x-zod-type'] = def.coerce ? 'coerce-date' : 'date';
+          }
+          if (def.type === 'bigint') {
+            json.type = 'integer';
+            // z.bigint() carries no format; treat it as int64.
+            json.format = ctx.zodSchema._zod.bag.format ?? 'int64';
+            if (def.coerce) {
+              json['x-zod-type'] = 'coerce-bigint';
+            }
+          }
+          if (def.type === 'set') {
+            json.type = 'array';
+            json.uniqueItems = true;
+            json.items = convertEmbedded(def.valueType);
+          }
+          if (def.type === 'map') {
+            json.type = 'array';
+            json.items = {
+              type: 'array',
+              items: [convertEmbedded(def.keyType), convertEmbedded(def.valueType)],
+              minItems: 2,
+              maxItems: 2,
             };
           }
-          return ignoreOverride;
+          if (def.type === 'string' && json.format === 'base64') {
+            json.format = 'binary';
+            delete json.pattern;
+            delete json.contentEncoding;
+          }
+          if (
+            def.type === 'string' &&
+            json.format &&
+            json.pattern &&
+            !hasExplicitRegexCheck(def)
+          ) {
+            if (STANDARD_STRING_FORMATS.has(json.format)) {
+              delete json.pattern;
+            } else if (!MAPPED_NONSTANDARD_FORMATS.has(json.format)) {
+              delete json.format;
+            }
+          }
+          if (def.type === 'number') {
+            const explicitBound = (kind, value) =>
+              (def.checks ?? []).some(
+                (check) =>
+                  check._zod?.def?.check === kind &&
+                  Number(check._zod.def.value) === value,
+              );
+            if (
+              json.maximum === Number.MAX_SAFE_INTEGER &&
+              !explicitBound('less_than', Number.MAX_SAFE_INTEGER)
+            ) {
+              delete json.maximum;
+            }
+            if (
+              json.minimum === Number.MIN_SAFE_INTEGER &&
+              !explicitBound('greater_than', Number.MIN_SAFE_INTEGER)
+            ) {
+              delete json.minimum;
+            }
+          }
+          if (def.type === 'pipe') {
+            const outJson = convertEmbedded(def.out);
+            const outKeys = Object.keys(outJson).filter(
+              (key) => key !== 'x-sdkit-embedded-root',
+            );
+            if (outKeys.length > 0) {
+              const inJson = { ...json };
+              for (const key of Object.keys(json)) delete json[key];
+              json.allOf = [inJson, outJson];
+            }
+          }
+          if (def.type === 'tuple' && Array.isArray(json.items)) {
+            if (json.minItems === undefined) {
+              json.minItems = json.items.length;
+            }
+            if (
+              json.additionalItems === undefined &&
+              json.maxItems === undefined
+            ) {
+              json.maxItems = json.items.length;
+            }
+          }
         },
       });
     }`,
-    `const zodSchema = ${removeUnsupportedMethods(schema)};`,
-    `const { $schema, ...rawResult } = toJsonSchema(zodSchema);
-    const result = normalizeSchema(rawResult);`,
-    `const innerDef = unwrapSchemaDef(zodSchema._def);
+    `let zodSchema;
+    let rawResult;
+    try {
+      zodSchema = ${removeUnsupportedMethods(schema)};
+      maskBigIntDefaults(zodSchema);
+      const { $schema, ...converted } = toJsonSchema(zodSchema);
+      rawResult = converted;
+    } finally {
+      // The v3 shims exist only while the analyzed source evaluates and
+      // converts (lazy getters can call them mid-conversion); remove them so
+      // the shared zod instance is not left with v3 API surface process-wide.
+      for (const method of installedShims) delete stringProto[method];
+    }
+    unmaskBigIntDefaults(rawResult);
+    const result = normalizeSchema(
+      inlineDefinitions(resolveEmbeddedDocs(rawResult)),
+    );`,
+    `const innerDef = unwrapSchemaDef(zodSchema._zod.def);
     if (innerDef?.coerce && !result['x-zod-type']) {
-      const zodType = 'coerce-' + innerDef.typeName.replace('Zod', '').toLowerCase();
-      if (!applyZodType(result, zodType, innerDef.typeName)) {
+      const zodType = 'coerce-' + innerDef.type;
+      if (!applyZodType(result, zodType, innerDef.type)) {
         result['x-zod-type'] = zodType;
       }
     }`,

package/dist/lib/zod-jsonschema.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/zod-jsonschema.ts"],
-  "sourcesContent": ["export type InjectImport = {\n  import: string;\n  from: string;\n};\n\nfunction removeUnsupportedMethods(schema: string) {\n  return schema\n    .replaceAll('.instanceof(File)', '.string().base64()')\n    .replaceAll('.instanceof(Blob)', '.string().base64()')\n    .replaceAll('.custom<File>()', '.string().base64()')\n    .replaceAll('.custom<Blob>()', '.string().base64()');\n}\n\nexport async function evalZod(schema: string, imports: InjectImport[] = []) {\n  // https://github.com/nodejs/node/issues/51956\n  const lines = [\n    `import { createRequire } from \"node:module\";`,\n    `const filename = \"${import.meta.url}\";`,\n    `const require = createRequire(filename);`,\n    `const z = require(\"zod\");`,\n    ...imports.map((imp) => `const ${imp.import} = require('${imp.from}');`),\n    `const {zodToJsonSchema, ignoreOverride} = require('zod-to-json-schema');`,\n    `let optional = false;`,\n    `function unwrapSchemaDef(def) {\n      while (def) {\n        if (\n          def.typeName === 'ZodOptional' ||\n          def.typeName === 'ZodDefault' ||\n          def.typeName === 'ZodNullable' ||\n          def.typeName === 'ZodCatch' ||\n          def.typeName === 'ZodBranded' ||\n          def.typeName === 'ZodReadonly'\n        ) {\n          def = def.innerType?._def;\n          continue;\n        }\n        if (def.typeName === 'ZodEffects') {\n          def = def.schema?._def;\n          continue;\n        }\n        if (def.typeName === 'ZodPipeline') {\n          def = def.in?._def;\n          continue;\n        }\n        return def;\n      }\n      return def;\n    }`,\n    `function matchesDefType(schema, typeName) {\n      if (!schema || typeof schema !== 'object') return false;\n      if (typeName === 'ZodNumber') {\n        return schema.type === 'number' || schema.type === 'integer';\n      }\n      if (typeName === 'ZodBigInt') {\n        return schema.type === 'integer';\n      }\n      if (typeName === 'ZodString') {\n        return schema.type === 'string';\n      }\n      if (typeName === 'ZodBoolean') {\n        return schema.type === 'boolean';\n      }\n      if (typeName === 'ZodDate') {\n        return schema.type === 'string' && schema.format === 'date-time';\n      }\n      return typeof schema.type === 'string';\n    }`,\n    `function applyZodType(schema, zodType, typeName) {\n      if (!schema || typeof schema !== 'object') return false;\n      if (schema['x-zod-type']) return true;\n      if (matchesDefType(schema, typeName)) {\n        schema['x-zod-type'] = zodType;\n        return true;\n      }\n      for (const key of ['anyOf', 'oneOf', 'allOf']) {\n        if (!Array.isArray(schema[key])) continue;\n        const candidates = schema[key].filter(\n          (candidate) => candidate && candidate.type !== 'null',\n        );\n        if (candidates.length === 1 && applyZodType(candidates[0], zodType, typeName)) {\n          return true;\n        }\n        for (const candidate of candidates) {\n          if (applyZodType(candidate, zodType, typeName)) {\n            return true;\n          }\n        }\n      }\n      return false;\n    }`,\n    `function normalizeDefaultValue(value) {\n      return value instanceof Date ? value.toISOString() : value;\n    }`,\n    `function mergeComparableValue(target, key, value) {\n      if (value === undefined) return true;\n      const normalized = normalizeDefaultValue(value);\n      if (target[key] === undefined) {\n        target[key] = normalized;\n        return true;\n      }\n      return Object.is(target[key], normalized);\n    }`,\n    `function mergeLowerBound(target, key, value) {\n      if (value === undefined) return true;\n      if (typeof value !== 'number') return false;\n      if (target[key] === undefined || value > target[key]) {\n        target[key] = value;\n      }\n      return true;\n    }`,\n    `function mergeUpperBound(target, key, value) {\n      if (value === undefined) return true;\n      if (typeof value !== 'number') return false;\n      if (target[key] === undefined || value < target[key]) {\n        target[key] = value;\n      }\n      return true;\n    }`,\n    `function mergeEnumValues(target, values) {\n      if (!Array.isArray(values)) return false;\n      if (!Array.isArray(target.enum)) {\n        target.enum = [...values];\n        return true;\n      }\n      target.enum = target.enum.filter((candidate) =>\n        values.some((value) => Object.is(candidate, value)),\n      );\n      return target.enum.length > 0;\n    }`,\n    `function isMergeablePrimitiveSchema(schema) {\n      return (\n        schema &&\n        typeof schema === 'object' &&\n        !schema.$ref &&\n        !schema.anyOf &&\n        !schema.oneOf &&\n        !schema.allOf &&\n        (schema.type === 'string' ||\n          schema.type === 'boolean' ||\n          schema.type === 'number' ||\n          schema.type === 'integer')\n      );\n    }`,\n    `function mergePrimitiveSchemas(schemas) {\n      const merged = {};\n      for (const schema of schemas) {\n        if (!isMergeablePrimitiveSchema(schema)) {\n          return null;\n        }\n        if (merged.type === undefined) {\n          merged.type = schema.type;\n        } else if (merged.type !== schema.type) {\n          const numericPair =\n            (merged.type === 'number' && schema.type === 'integer') ||\n            (merged.type === 'integer' && schema.type === 'number');\n          if (!numericPair) {\n            return null;\n          }\n          merged.type = 'integer';\n        }\n\n        for (const [key, value] of Object.entries(schema)) {\n          if (key === 'type') {\n            continue;\n          }\n          switch (key) {\n            case 'minimum':\n            case 'exclusiveMinimum':\n            case 'minLength':\n            case 'minItems':\n            case 'minProperties':\n              if (!mergeLowerBound(merged, key, value)) {\n                return null;\n              }\n              break;\n            case 'maximum':\n            case 'exclusiveMaximum':\n            case 'maxLength':\n            case 'maxItems':\n            case 'maxProperties':\n              if (!mergeUpperBound(merged, key, value)) {\n                return null;\n              }\n              break;\n            case 'enum':\n              if (!mergeEnumValues(merged, value)) {\n                return null;\n              }\n              break;\n            default:\n              if (!mergeComparableValue(merged, key, value)) {\n                return null;\n              }\n          }\n        }\n      }\n      return merged;\n    }`,\n    `function normalizeSchema(schema) {\n      if (!schema || typeof schema !== 'object') {\n        return schema;\n      }\n\n      if (schema.default !== undefined) {\n        schema.default = normalizeDefaultValue(schema.default);\n      }\n\n      if (Array.isArray(schema.items)) {\n        schema.items = schema.items.map((item) => normalizeSchema(item));\n      } else if (schema.items && typeof schema.items === 'object') {\n        schema.items = normalizeSchema(schema.items);\n      }\n\n      if (schema.properties && typeof schema.properties === 'object') {\n        for (const [key, value] of Object.entries(schema.properties)) {\n          schema.properties[key] = normalizeSchema(value);\n        }\n      }\n\n      if (\n        schema.additionalProperties &&\n        typeof schema.additionalProperties === 'object'\n      ) {\n        schema.additionalProperties = normalizeSchema(schema.additionalProperties);\n      }\n\n      for (const key of ['anyOf', 'oneOf', 'allOf']) {\n        if (!Array.isArray(schema[key])) continue;\n        schema[key] = schema[key].map((candidate) => normalizeSchema(candidate));\n      }\n\n      if (Array.isArray(schema.allOf)) {\n        const merged = mergePrimitiveSchemas(schema.allOf);\n        if (merged) {\n          const { allOf, ...rest } = schema;\n          return { ...rest, ...merged };\n        }\n      }\n\n      return schema;\n    }`,\n    `function toJsonSchema(schema) {\n      return zodToJsonSchema(schema, {\n        $refStrategy: 'root',\n        basePath: ['#', 'components', 'schemas'],\n        target: 'jsonSchema7',\n        base64Strategy: 'format:binary',\n        effectStrategy: 'input',\n        override: (def) => {\n          if (def.typeName === 'ZodOptional') {\n\t\t\t\t\t\toptional = true;\n\t\t\t\t\t\tconst { $schema, ...result } = toJsonSchema(def.innerType);\n            if (def.description) { result.description = def.description; }\n            return result;\n          }\n          if (def.typeName === 'ZodDate') {\n            return {\n              type: 'string',\n              format: 'date-time',\n              'x-zod-type': def.coerce ? 'coerce-date' : 'date',\n              ...(def.description ? { description: def.description } : {}),\n            };\n          }\n          return ignoreOverride;\n        },\n      });\n    }`,\n    `const zodSchema = ${removeUnsupportedMethods(schema)};`,\n    `const { $schema, ...rawResult } = toJsonSchema(zodSchema);\n    const result = normalizeSchema(rawResult);`,\n    `const innerDef = unwrapSchemaDef(zodSchema._def);\n    if (innerDef?.coerce && !result['x-zod-type']) {\n      const zodType = 'coerce-' + innerDef.typeName.replace('Zod', '').toLowerCase();\n      if (!applyZodType(result, zodType, innerDef.typeName)) {\n        result['x-zod-type'] = zodType;\n      }\n    }`,\n    `export default {schema: result, optional}`,\n  ];\n\n  const base64 = Buffer.from(lines.join('\\n')).toString('base64');\n  return import(\n    /* @vite-ignore */\n    `data:text/javascript;base64,${base64}`\n  ).then((mod) => mod.default);\n}\n"],
-  "mappings": "AAKA,SAAS,yBAAyB,QAAgB;AAChD,SAAO,OACJ,WAAW,qBAAqB,oBAAoB,EACpD,WAAW,qBAAqB,oBAAoB,EACpD,WAAW,mBAAmB,oBAAoB,EAClD,WAAW,mBAAmB,oBAAoB;AACvD;AAEA,eAAsB,QAAQ,QAAgB,UAA0B,CAAC,GAAG;AAE1E,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA,qBAAqB,YAAY,GAAG;AAAA,IACpC;AAAA,IACA;AAAA,IACA,GAAG,QAAQ,IAAI,CAAC,QAAQ,SAAS,IAAI,MAAM,eAAe,IAAI,IAAI,KAAK;AAAA,IACvE;AAAA,IACA;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAyBA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAmBA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAuBA;AAAA;AAAA;AAAA,IAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IASA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAWA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAcA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAuDA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA2CA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA0BA,qBAAqB,yBAAyB,MAAM,CAAC;AAAA,IACrD;AAAA;AAAA,IAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA;AAAA,EACF;AAEA,QAAM,SAAS,OAAO,KAAK,MAAM,KAAK,IAAI,CAAC,EAAE,SAAS,QAAQ;AAC9D,SAAO;AAAA;AAAA,IAEL,+BAA+B,MAAM;AAAA,IACrC,KAAK,CAAC,QAAQ,IAAI,OAAO;AAC7B;",
+  "sourcesContent": ["export type InjectImport = {\n  import: string;\n  from: string;\n  property?: string;\n};\n\nfunction removeUnsupportedMethods(schema: string) {\n  return schema\n    .replaceAll('.instanceof(File)', '.string().base64()')\n    .replaceAll('.instanceof(Blob)', '.string().base64()')\n    .replaceAll('.custom<File>()', '.string().base64()')\n    .replaceAll('.custom<Blob>()', '.string().base64()');\n}\n\nexport async function evalZod(schema: string, imports: InjectImport[] = []) {\n  // https://github.com/nodejs/node/issues/51956\n  const lines = [\n    `import { createRequire } from \"node:module\";`,\n    `const filename = \"${import.meta.url}\";`,\n    `const require = createRequire(filename);`,\n    `const z = require(\"zod\");`,\n    // zod 4 removed ZodString.ip/.cidr; restore them for analyzed user source\n    // that still uses the v3 spellings.\n    `const stringProto = Object.getPrototypeOf(z.string());\n    const installedShims = [];\n    function withReceiverChecks(receiver, format) {\n      return (receiver._zod.def.checks ?? []).length\n        ? z.intersection(receiver, format)\n        : format;\n    }\n    if (!stringProto.ip) {\n      installedShims.push('ip');\n      stringProto.ip = function (options) {\n        if (options?.version === 'v4') return withReceiverChecks(this, z.ipv4());\n        if (options?.version === 'v6') return withReceiverChecks(this, z.ipv6());\n        return withReceiverChecks(this, z.union([z.ipv4(), z.ipv6()]));\n      };\n    }\n    if (!stringProto.cidr) {\n      installedShims.push('cidr');\n      stringProto.cidr = function (options) {\n        if (options?.version === 'v4') return withReceiverChecks(this, z.cidrv4());\n        if (options?.version === 'v6') return withReceiverChecks(this, z.cidrv6());\n        return withReceiverChecks(this, z.union([z.cidrv4(), z.cidrv6()]));\n      };\n    }`,\n    ...imports.map(\n      (imp) =>\n        `const ${imp.import} = require(${JSON.stringify(imp.from)})${\n          imp.property ? `[${JSON.stringify(imp.property)}]` : ''\n        };`,\n    ),\n    `let optional = false;`,\n    `const WRAPPER_TYPES = new Set([\n      'optional',\n      'nullable',\n      'default',\n      'prefault',\n      'catch',\n      'readonly',\n      'nonoptional',\n    ]);`,\n    `function unwrapSchemaDef(def) {\n      while (def) {\n        if (WRAPPER_TYPES.has(def.type)) {\n          def = def.innerType?._zod?.def;\n          continue;\n        }\n        if (def.type === 'pipe') {\n          def = def.in?._zod?.def;\n          continue;\n        }\n        return def;\n      }\n      return def;\n    }`,\n    `function matchesDefType(schema, defType) {\n      if (!schema || typeof schema !== 'object') return false;\n      if (defType === 'number') {\n        return schema.type === 'number' || schema.type === 'integer';\n      }\n      if (defType === 'bigint') {\n        return schema.type === 'integer';\n      }\n      if (defType === 'string') {\n        return schema.type === 'string';\n      }\n      if (defType === 'boolean') {\n        return schema.type === 'boolean';\n      }\n      if (defType === 'date') {\n        return schema.type === 'string' && schema.format === 'date-time';\n      }\n      return typeof schema.type === 'string';\n    }`,\n    `function applyZodType(schema, zodType, defType) {\n      if (!schema || typeof schema !== 'object') return false;\n      if (schema['x-zod-type']) return true;\n      if (matchesDefType(schema, defType)) {\n        schema['x-zod-type'] = zodType;\n        return true;\n      }\n      for (const key of ['anyOf', 'oneOf', 'allOf']) {\n        if (!Array.isArray(schema[key])) continue;\n        const candidates = schema[key].filter(\n          (candidate) => candidate && candidate.type !== 'null',\n        );\n        if (candidates.length === 1 && applyZodType(candidates[0], zodType, defType)) {\n          return true;\n        }\n        for (const candidate of candidates) {\n          if (applyZodType(candidate, zodType, defType)) {\n            return true;\n          }\n        }\n      }\n      return false;\n    }`,\n    `const BIGINT_SENTINEL = '__sdkit_bigint__';`,\n    // zod v4 JSON-round-trips default values before the override callback\n    // runs, which throws on bigint. Mask them as sentinel strings up front\n    // and restore after conversion.\n    `function maskBigIntDefaults(schema, seen = new Set()) {\n      if (!schema || !schema._zod || seen.has(schema)) return;\n      seen.add(schema);\n      const def = schema._zod.def;\n      if (\n        (def.type === 'default' || def.type === 'prefault') &&\n        typeof def.defaultValue === 'bigint'\n      ) {\n        Object.defineProperty(def, 'defaultValue', {\n          value: BIGINT_SENTINEL + def.defaultValue.toString(),\n          configurable: true,\n        });\n      }\n      for (const key of ['innerType', 'in', 'out', 'element', 'valueType', 'keyType', 'left', 'right', 'catchall', 'rest']) {\n        if (def[key]) maskBigIntDefaults(def[key], seen);\n      }\n      if (typeof def.getter === 'function') {\n        const inner = def.getter();\n        maskBigIntDefaults(inner, seen);\n        Object.defineProperty(def, 'getter', {\n          value: () => inner,\n          configurable: true,\n        });\n      }\n      if (def.shape) {\n        for (const value of Object.values(def.shape)) maskBigIntDefaults(value, seen);\n      }\n      if (Array.isArray(def.options)) {\n        for (const option of def.options) maskBigIntDefaults(option, seen);\n      }\n      if (Array.isArray(def.items)) {\n        for (const item of def.items) maskBigIntDefaults(item, seen);\n      }\n    }`,\n    // int64 is a plain number in sdk-it, so masked bigint defaults unmask to\n    // JS numbers \u2014 the spec stays plain JSON with no bigint values to trip up\n    // JSON.stringify.\n    `function unmaskBigIntDefaults(schema) {\n      if (!schema || typeof schema !== 'object') return;\n      for (const [key, value] of Object.entries(schema)) {\n        if (typeof value === 'string' && value.startsWith(BIGINT_SENTINEL)) {\n          schema[key] = Number(value.slice(BIGINT_SENTINEL.length));\n        } else if (Array.isArray(value)) {\n          value.forEach(unmaskBigIntDefaults);\n        } else if (value && typeof value === 'object') {\n          unmaskBigIntDefaults(value);\n        }\n      }\n    }`,\n    `function hasExplicitRegexCheck(def) {\n      return (def.checks ?? []).some(\n        (check) => check._zod?.def?.format === 'regex',\n      );\n    }`,\n    `const STANDARD_STRING_FORMATS = new Set([\n      'email',\n      'uri',\n      'url',\n      'uuid',\n      'guid',\n      'date-time',\n      'date',\n      'time',\n      'duration',\n      'ipv4',\n      'ipv6',\n      'hostname',\n      'binary',\n    ]);`,\n    // Nonstandard formats that sdk-it's own converters map to semantic zod\n    // validators. Keep both keys: format for our converters, pattern for\n    // third-party validators that do not recognize the format.\n    `const MAPPED_NONSTANDARD_FORMATS = new Set(['cidrv4', 'cidrv6']);`,\n    `function normalizeDefaultValue(value) {\n      return value instanceof Date ? value.toISOString() : value;\n    }`,\n    `function mergeComparableValue(target, key, value) {\n      if (value === undefined) return true;\n      const normalized = normalizeDefaultValue(value);\n      if (target[key] === undefined) {\n        target[key] = normalized;\n        return true;\n      }\n      return Object.is(target[key], normalized);\n    }`,\n    `function mergeLowerBound(target, key, value) {\n      if (value === undefined) return true;\n      if (typeof value !== 'number') return false;\n      if (target[key] === undefined || value > target[key]) {\n        target[key] = value;\n      }\n      return true;\n    }`,\n    `function mergeUpperBound(target, key, value) {\n      if (value === undefined) return true;\n      if (typeof value !== 'number') return false;\n      if (target[key] === undefined || value < target[key]) {\n        target[key] = value;\n      }\n      return true;\n    }`,\n    `function mergeEnumValues(target, values) {\n      if (!Array.isArray(values)) return false;\n      if (!Array.isArray(target.enum)) {\n        target.enum = [...values];\n        return true;\n      }\n      target.enum = target.enum.filter((candidate) =>\n        values.some((value) => Object.is(candidate, value)),\n      );\n      return target.enum.length > 0;\n    }`,\n    `function isMergeablePrimitiveSchema(schema) {\n      return (\n        schema &&\n        typeof schema === 'object' &&\n        !schema.$ref &&\n        !schema.anyOf &&\n        !schema.oneOf &&\n        !schema.allOf &&\n        (schema.type === 'string' ||\n          schema.type === 'boolean' ||\n          schema.type === 'number' ||\n          schema.type === 'integer')\n      );\n    }`,\n    `function mergePrimitiveSchemas(schemas) {\n      const merged = {};\n      for (const schema of schemas) {\n        if (\n          schema &&\n          typeof schema === 'object' &&\n          Object.keys(schema).length === 0\n        ) {\n          continue;\n        }\n        if (!isMergeablePrimitiveSchema(schema)) {\n          return null;\n        }\n        if (merged.type === undefined) {\n          merged.type = schema.type;\n        } else if (merged.type !== schema.type) {\n          const numericPair =\n            (merged.type === 'number' && schema.type === 'integer') ||\n            (merged.type === 'integer' && schema.type === 'number');\n          if (!numericPair) {\n            return null;\n          }\n          merged.type = 'integer';\n        }\n\n        for (const [key, value] of Object.entries(schema)) {\n          if (key === 'type') {\n            continue;\n          }\n          switch (key) {\n            case 'minimum':\n            case 'exclusiveMinimum':\n            case 'minLength':\n            case 'minItems':\n            case 'minProperties':\n              if (!mergeLowerBound(merged, key, value)) {\n                return null;\n              }\n              break;\n            case 'maximum':\n            case 'exclusiveMaximum':\n            case 'maxLength':\n            case 'maxItems':\n            case 'maxProperties':\n              if (!mergeUpperBound(merged, key, value)) {\n                return null;\n              }\n              break;\n            case 'enum':\n              if (!mergeEnumValues(merged, value)) {\n                return null;\n              }\n              break;\n            default:\n              if (!mergeComparableValue(merged, key, value)) {\n                return null;\n              }\n          }\n        }\n      }\n      return merged;\n    }`,\n    `function normalizeSchema(schema, isIntersectionMember = false) {\n      if (!schema || typeof schema !== 'object') {\n        return schema;\n      }\n\n      if (schema.default !== undefined) {\n        schema.default = normalizeDefaultValue(schema.default);\n      }\n\n      if (Array.isArray(schema.items)) {\n        schema.items = schema.items.map((item) => normalizeSchema(item));\n      } else if (schema.items && typeof schema.items === 'object') {\n        schema.items = normalizeSchema(schema.items);\n      }\n\n      if (schema.properties && typeof schema.properties === 'object') {\n        for (const [key, value] of Object.entries(schema.properties)) {\n          schema.properties[key] = normalizeSchema(value);\n        }\n      }\n\n      if (\n        schema.additionalProperties &&\n        typeof schema.additionalProperties === 'object'\n      ) {\n        schema.additionalProperties = normalizeSchema(schema.additionalProperties);\n      }\n\n      for (const key of ['anyOf', 'oneOf', 'allOf']) {\n        if (!Array.isArray(schema[key])) continue;\n        schema[key] = schema[key].map((candidate) =>\n          normalizeSchema(candidate, key === 'allOf'),\n        );\n      }\n\n      if (Array.isArray(schema.oneOf) && !schema.anyOf) {\n        schema.anyOf = schema.oneOf;\n        delete schema.oneOf;\n      }\n\n      if (\n        Array.isArray(schema.anyOf) &&\n        schema.anyOf.every(\n          (member) =>\n            member &&\n            typeof member === 'object' &&\n            Object.keys(member).length === 1 &&\n            typeof member.type === 'string',\n        )\n      ) {\n        const { anyOf, ...rest } = schema;\n        schema = { ...rest, type: anyOf.map((member) => member.type) };\n      }\n\n      if (\n        schema.type === 'object' &&\n        schema.properties &&\n        schema.additionalProperties === undefined &&\n        !isIntersectionMember\n      ) {\n        schema.additionalProperties = false;\n      }\n\n      if (\n        schema.type === 'object' &&\n        schema.propertyNames &&\n        JSON.stringify(schema.propertyNames) === '{\"type\":\"string\"}'\n      ) {\n        delete schema.propertyNames;\n      }\n\n      if (\n        typeof schema.$ref === 'string' &&\n        !schema.$ref.startsWith('#/components/schemas')\n      ) {\n        schema.$ref =\n          schema.$ref === '#'\n            ? '#/components/schemas'\n            : schema.$ref.replace(/^#\\\\//, '#/components/schemas/');\n      }\n\n      if (Array.isArray(schema.allOf)) {\n        const merged = mergePrimitiveSchemas(schema.allOf);\n        if (merged) {\n          const { allOf, ...rest } = schema;\n          return { ...rest, ...merged };\n        }\n        if (schema.allOf.length === 1 && Object.keys(schema).length === 1) {\n          return schema.allOf[0];\n        }\n      }\n\n      return schema;\n    }`,\n    `function escapePointerSegment(segment) {\n      return String(segment).replaceAll('~', '~0').replaceAll('/', '~1');\n    }`,\n    `function componentPointer(path) {\n      return ['#', 'components', 'schemas', ...path.map(escapePointerSegment)].join('/');\n    }`,\n    // Nested toJsonSchema passes (set/map values, pipe outputs) return\n    // self-contained draft-7 documents whose '#' and '#/definitions/*' refs\n    // are relative to the embedded document root, not the outer schema.\n    // Resolve them to outer-root structural pointers before the outer\n    // definitions/normalize passes rewrite them into dangling refs.\n    `function resolveEmbeddedDocs(root) {\n      function process(node, path, docRoot) {\n        if (!node || typeof node !== 'object') return;\n        if (Array.isArray(node)) {\n          node.forEach((item, index) => process(item, [...path, index], docRoot));\n          return;\n        }\n        if (node['x-sdkit-embedded-root']) {\n          delete node['x-sdkit-embedded-root'];\n          const defs = node.definitions ?? Object.create(null);\n          delete node.definitions;\n          docRoot = { path, defs, firstSite: Object.create(null) };\n        }\n        if (docRoot && typeof node.$ref === 'string') {\n          if (node.$ref === '#') {\n            node.$ref = componentPointer(docRoot.path);\n            return;\n          }\n          const match = node.$ref.match(/^#\\\\/definitions\\\\/(.+)$/);\n          if (match) {\n            const name = match[1];\n            if (name in docRoot.firstSite) {\n              node.$ref = docRoot.firstSite[name];\n              return;\n            }\n            docRoot.firstSite[name] = componentPointer(path);\n            delete node.$ref;\n            Object.assign(node, docRoot.defs[name]);\n          }\n        }\n        for (const [key, value] of Object.entries(node)) {\n          process(value, [...path, key], docRoot);\n        }\n      }\n      process(root, [], null);\n      return root;\n    }`,\n    // zod v4 breaks non-root cycles with a draft-7 definitions block plus\n    // #/definitions/* refs, which OpenAPI consumers cannot resolve. Inline\n    // each definition at its first use site and point the remaining\n    // (recursive) refs structurally at that site, mirroring the v3\n    // $refStrategy: 'root' output.\n    `function inlineDefinitions(root) {\n      const defs = root.definitions;\n      if (!defs || typeof defs !== 'object') return root;\n      delete root.definitions;\n      const firstSite = Object.create(null);\n      function walk(node, path) {\n        if (!node || typeof node !== 'object') return;\n        if (Array.isArray(node)) {\n          node.forEach((item, index) => walk(item, [...path, index]));\n          return;\n        }\n        const match =\n          typeof node.$ref === 'string' &&\n          node.$ref.match(/^#\\\\/definitions\\\\/(.+)$/);\n        if (match) {\n          const name = match[1];\n          if (name in firstSite) {\n            node.$ref = firstSite[name];\n            return;\n          }\n          firstSite[name] = componentPointer(path);\n          delete node.$ref;\n          Object.assign(node, defs[name]);\n        }\n        for (const [key, value] of Object.entries(node)) {\n          walk(value, [...path, key]);\n        }\n      }\n      walk(root, []);\n      return root;\n    }`,\n    // Wraps nested conversions: when the embedded document carries refs or a\n    // definitions block, tag its root so resolveEmbeddedDocs can rebase them.\n    `function convertEmbedded(schema) {\n      const { $schema: _ignored, ...doc } = toJsonSchema(schema);\n      if (doc.definitions || JSON.stringify(doc).includes('\"$ref\"')) {\n        doc['x-sdkit-embedded-root'] = true;\n      }\n      return doc;\n    }`,\n    `function toJsonSchema(schema) {\n      return z.toJSONSchema(schema, {\n        target: 'draft-7',\n        io: 'input',\n        unrepresentable: 'any',\n        override(ctx) {\n          const def = ctx.zodSchema._zod.def;\n          const json = ctx.jsonSchema;\n          if (def.type === 'optional') {\n            optional = true;\n          }\n          if (def.type === 'catch') {\n            delete json.default;\n          }\n          if (def.type === 'date') {\n            json.type = 'string';\n            json.format = 'date-time';\n            json['x-zod-type'] = def.coerce ? 'coerce-date' : 'date';\n          }\n          if (def.type === 'bigint') {\n            json.type = 'integer';\n            // z.bigint() carries no format; treat it as int64.\n            json.format = ctx.zodSchema._zod.bag.format ?? 'int64';\n            if (def.coerce) {\n              json['x-zod-type'] = 'coerce-bigint';\n            }\n          }\n          if (def.type === 'set') {\n            json.type = 'array';\n            json.uniqueItems = true;\n            json.items = convertEmbedded(def.valueType);\n          }\n          if (def.type === 'map') {\n            json.type = 'array';\n            json.items = {\n              type: 'array',\n              items: [convertEmbedded(def.keyType), convertEmbedded(def.valueType)],\n              minItems: 2,\n              maxItems: 2,\n            };\n          }\n          if (def.type === 'string' && json.format === 'base64') {\n            json.format = 'binary';\n            delete json.pattern;\n            delete json.contentEncoding;\n          }\n          if (\n            def.type === 'string' &&\n            json.format &&\n            json.pattern &&\n            !hasExplicitRegexCheck(def)\n          ) {\n            if (STANDARD_STRING_FORMATS.has(json.format)) {\n              delete json.pattern;\n            } else if (!MAPPED_NONSTANDARD_FORMATS.has(json.format)) {\n              delete json.format;\n            }\n          }\n          if (def.type === 'number') {\n            const explicitBound = (kind, value) =>\n              (def.checks ?? []).some(\n                (check) =>\n                  check._zod?.def?.check === kind &&\n                  Number(check._zod.def.value) === value,\n              );\n            if (\n              json.maximum === Number.MAX_SAFE_INTEGER &&\n              !explicitBound('less_than', Number.MAX_SAFE_INTEGER)\n            ) {\n              delete json.maximum;\n            }\n            if (\n              json.minimum === Number.MIN_SAFE_INTEGER &&\n              !explicitBound('greater_than', Number.MIN_SAFE_INTEGER)\n            ) {\n              delete json.minimum;\n            }\n          }\n          if (def.type === 'pipe') {\n            const outJson = convertEmbedded(def.out);\n            const outKeys = Object.keys(outJson).filter(\n              (key) => key !== 'x-sdkit-embedded-root',\n            );\n            if (outKeys.length > 0) {\n              const inJson = { ...json };\n              for (const key of Object.keys(json)) delete json[key];\n              json.allOf = [inJson, outJson];\n            }\n          }\n          if (def.type === 'tuple' && Array.isArray(json.items)) {\n            if (json.minItems === undefined) {\n              json.minItems = json.items.length;\n            }\n            if (\n              json.additionalItems === undefined &&\n              json.maxItems === undefined\n            ) {\n              json.maxItems = json.items.length;\n            }\n          }\n        },\n      });\n    }`,\n    `let zodSchema;\n    let rawResult;\n    try {\n      zodSchema = ${removeUnsupportedMethods(schema)};\n      maskBigIntDefaults(zodSchema);\n      const { $schema, ...converted } = toJsonSchema(zodSchema);\n      rawResult = converted;\n    } finally {\n      // The v3 shims exist only while the analyzed source evaluates and\n      // converts (lazy getters can call them mid-conversion); remove them so\n      // the shared zod instance is not left with v3 API surface process-wide.\n      for (const method of installedShims) delete stringProto[method];\n    }\n    unmaskBigIntDefaults(rawResult);\n    const result = normalizeSchema(\n      inlineDefinitions(resolveEmbeddedDocs(rawResult)),\n    );`,\n    `const innerDef = unwrapSchemaDef(zodSchema._zod.def);\n    if (innerDef?.coerce && !result['x-zod-type']) {\n      const zodType = 'coerce-' + innerDef.type;\n      if (!applyZodType(result, zodType, innerDef.type)) {\n        result['x-zod-type'] = zodType;\n      }\n    }`,\n    `export default {schema: result, optional}`,\n  ];\n\n  const base64 = Buffer.from(lines.join('\\n')).toString('base64');\n  return import(\n    /* @vite-ignore */\n    `data:text/javascript;base64,${base64}`\n  ).then((mod) => mod.default);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdk-it/core",
-  "version": "0.43.0",
+  "version": "0.45.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -29,13 +29,12 @@
   "dependencies": {
     "debug": "^4.4.0",
     "stringcase": "^4.3.1",
-    "lodash-es": "^4.17.21",
-    "zod-to-json-schema": "^3.24.6"
+    "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
     "typescript": "^5.8.3",
     "openapi3-ts": "^4.4.0",
-    "zod": "^3.25.76 || ^4.0.0"
+    "zod": "^4.3.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12"