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

package/CHANGELOG.md

@@ -11,6 +11,11 @@
 ### Patch Changes
 
 - b8f6248: - Commit remaining utility, ref resolution test, and config updates.
+- 04b6c6b: Fix bundle output by emitting z.lazy for cyclical refs outside object properties, use ZodError.issues in generated conditionals, and make nested type extraction array-aware to avoid invalid indexers.
+- b8f7b29: Fix type errors in CI by replacing symbol-based allOf indexing, guarding invalid refs, and tightening string content schema parsing types.
+- 691cc5b: - Added ESLint (recommended + no-require-imports) and cleaned all lint issues across src/tests; tightened types and removed unused vars.
+  - Ensured ESM-friendly test evals and ref/anchor resolver code without require usage.
+- 4d127fe: Remove fallback to the non-existent ZodError.errors property in generated conditional schemas; rely on ZodError.issues to avoid TypeScript errors.
 - 7d257dd: - Ensure dist/esm emits real ESM with NodeNext settings and type:module, and update tests to run under ESM by providing createRequire shims.
 
 ## 2.8.0

package/dist/cjs/core/emitZod.js

@@ -101,8 +101,8 @@ const emitZod = (analysis) => {
         })
             .join("\n")
         : "";
-    const jsdocs = rest.withJsdocs && typeof schema !== "boolean" && schema.description
-        ? (0, jsdocs_js_1.expandJsdocs)(schema.description)
+    const jsdocs = rest.withJsdocs && typeof schema === "object" && schema !== null && "description" in schema
+        ? (0, jsdocs_js_1.expandJsdocs)(String(schema.description ?? ""))
         : "";
     const lines = [];
     if (module === "cjs" && !noImport) {

package/dist/cjs/generators/generateBundle.js

@@ -83,6 +83,7 @@ const buildBundleContext = (defNames, defs, options) => {
     return { defInfoMap, rootName, rootTypeName };
 };
 const createRefHandler = (currentDefName, defInfoMap, usedRefs, allDefs, options) => {
+    const useLazyCrossRefs = options.refResolution?.lazyCrossRefs ?? true;
     return (schema, refs) => {
         if (typeof schema["$ref"] === "string") {
             const refPath = schema["$ref"];
@@ -109,7 +110,7 @@ const createRefHandler = (currentDefName, defInfoMap, usedRefs, allDefs, options
                     });
                     if (resolved)
                         return resolved;
-                    if (isCycle && options.refResolution?.lazyCrossRefs) {
+                    if (isCycle && useLazyCrossRefs) {
                         return `z.lazy(() => ${refInfo.schemaName})`;
                     }
                     return refInfo.schemaName;
@@ -289,7 +290,7 @@ const findNestedTypesInSchema = (schema, parentTypeName, defNames, currentPath =
     }
     // inline $defs
     if (record.$defs && typeof record.$defs === "object") {
-        for (const [_defName, defSchema] of Object.entries(record.$defs)) {
+        for (const [, defSchema] of Object.entries(record.$defs)) {
             nestedTypes.push(...findNestedTypesInSchema(defSchema, parentTypeName, defNames, currentPath));
         }
     }
@@ -338,14 +339,23 @@ const generateNestedTypesFile = (nestedTypes) => {
         lines.push(`import type { ${typeName} } from './${file}.schema.js';`);
     }
     lines.push("");
+    const buildAccessExpr = (parentType, propertyPath) => {
+        let accessExpr = parentType;
+        for (const prop of propertyPath) {
+            const accessor = prop === "items"
+                ? "[number]"
+                : typeof prop === "number"
+                    ? `[${prop}]`
+                    : `[${JSON.stringify(prop)}]`;
+            accessExpr = `NonNullable<${accessExpr}${accessor}>`;
+        }
+        return accessExpr;
+    };
     for (const [parentType, types] of [...byParent.entries()].sort()) {
         lines.push(`// From ${parentType}`);
         for (const info of types.sort((a, b) => a.typeName.localeCompare(b.typeName))) {
             if (info.propertyPath.length > 0) {
-                let accessExpr = parentType;
-                for (const prop of info.propertyPath) {
-                    accessExpr = `NonNullable<${accessExpr}['${prop}']>`;
-                }
+                const accessExpr = buildAccessExpr(parentType, info.propertyPath);
                 lines.push(`export type ${info.typeName} = ${accessExpr};`);
             }
         }

package/dist/cjs/parsers/parseAllOf.js

@@ -3,19 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAllOf = parseAllOf;
 const parseSchema_js_1 = require("./parseSchema.js");
 const half_js_1 = require("../utils/half.js");
-const originalIndex = Symbol("Original index");
+const originalIndexKey = "__originalIndex";
 const ensureOriginalIndex = (arr) => {
-    let newArr = [];
+    const newArr = [];
     for (let i = 0; i < arr.length; i++) {
         const item = arr[i];
         if (typeof item === "boolean") {
-            newArr.push(item ? { [originalIndex]: i } : { [originalIndex]: i, not: {} });
+            newArr.push(item ? { [originalIndexKey]: i } : { [originalIndexKey]: i, not: {} });
         }
-        else if (originalIndex in item) {
+        else if (typeof item === "object" &&
+            item !== null &&
+            originalIndexKey in item) {
             return arr;
         }
         else {
-            newArr.push({ ...item, [originalIndex]: i });
+            newArr.push({ ...item, [originalIndexKey]: i });
         }
     }
     return newArr;
@@ -28,7 +30,11 @@ function parseAllOf(schema, refs) {
         const item = schema.allOf[0];
         return (0, parseSchema_js_1.parseSchema)(item, {
             ...refs,
-            path: [...refs.path, "allOf", item[originalIndex]],
+            path: [
+                ...refs.path,
+                "allOf",
+                item[originalIndexKey] ?? 0,
+            ],
         });
     }
     else {

package/dist/cjs/parsers/parseBoolean.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBoolean = void 0;
-const parseBoolean = (_schema) => {
-    return "z.boolean()";
-};
+const parseBoolean = () => "z.boolean()";
 exports.parseBoolean = parseBoolean;

package/dist/cjs/parsers/parseIfThenElse.js

@@ -17,7 +17,7 @@ const parseIfThenElse = (schema, refs) => {
     ? ${$then}.safeParse(value)
     : ${$else}.safeParse(value);
   if (!result.success) {
-    const issues = result.error.issues ?? result.error.errors ?? [];
+    const issues = result.error.issues;
     issues.forEach((issue) => ctx.addIssue(issue))
   }
 })`;

package/dist/cjs/parsers/parseNull.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNull = void 0;
-const parseNull = (_schema) => {
-    return "z.null()";
-};
+const parseNull = () => "z.null()";
 exports.parseNull = parseNull;

package/dist/cjs/parsers/parseObject.js

@@ -200,6 +200,7 @@ function parseObject(objectSchema, refs) {
         output += `.and(${(0, parseAnyOf_js_1.parseAnyOf)({
             ...objectSchema,
             anyOf: objectSchema.anyOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -210,6 +211,7 @@ function parseObject(objectSchema, refs) {
         output += `.and(${(0, parseOneOf_js_1.parseOneOf)({
             ...objectSchema,
             oneOf: objectSchema.oneOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -220,6 +222,7 @@ function parseObject(objectSchema, refs) {
         output += `.and(${(0, parseAllOf_js_1.parseAllOf)({
             ...objectSchema,
             allOf: objectSchema.allOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -233,6 +236,7 @@ function parseObject(objectSchema, refs) {
     // propertyNames
     if (objectSchema.propertyNames) {
         const normalizedPropNames = typeof objectSchema.propertyNames === "object" &&
+            objectSchema.propertyNames !== null &&
             !objectSchema.propertyNames.type &&
             objectSchema.propertyNames.pattern
             ? { ...objectSchema.propertyNames, type: "string" }
@@ -261,12 +265,12 @@ function parseObject(objectSchema, refs) {
         if (entries.length) {
             output += `.superRefine((obj, ctx) => {
   ${entries
-                .map(([key, schema], idx) => {
+                .map(([key, schema]) => {
                 const parsed = (0, parseSchema_js_1.parseSchema)(schema, { ...refs, path: [...refs.path, "dependentSchemas", key] });
                 return `if (Object.prototype.hasOwnProperty.call(obj, ${JSON.stringify(key)})) {
     const result = ${parsed}.safeParse(obj);
     if (!result.success) {
-      ctx.addIssue({ code: "custom", message: "Dependent schema failed", path: [], params: { issues: result.error.issues } });
+      ctx.addIssue({ code: "custom", message: ${objectSchema.errorMessage?.dependentSchemas ?? JSON.stringify("Dependent schema failed")}, path: [], params: { issues: result.error.issues } });
     }
   }`;
             })
@@ -278,7 +282,8 @@ function parseObject(objectSchema, refs) {
     if (objectSchema.dependentRequired && typeof objectSchema.dependentRequired === "object") {
         const entries = Object.entries(objectSchema.dependentRequired);
         if (entries.length) {
-            const depRequiredMessage = objectSchema.errorMessage?.dependentRequired ?? "Dependent required properties missing";
+            const depRequiredMessage = objectSchema.errorMessage?.dependentRequired ??
+                "Dependent required properties missing";
             output += `.superRefine((obj, ctx) => {
   ${entries
                 .map(([prop, deps]) => {

package/dist/cjs/parsers/parseSchema.js

@@ -33,9 +33,7 @@ const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) =>
     if (typeof schema !== "object")
         return schema ? (0, anyOrUnknown_js_1.anyOrUnknown)(refs) : "z.never()";
     const parentBase = refs.currentBaseUri ?? refs.rootBaseUri ?? "root:///";
-    const baseUri = typeof schema.$id === "string"
-        ? (0, resolveUri_js_1.resolveUri)(parentBase, schema.$id)
-        : parentBase;
+    const baseUri = typeof schema.$id === "string" ? (0, resolveUri_js_1.resolveUri)(parentBase, schema.$id) : parentBase;
     const dynamicAnchors = Array.isArray(refs.dynamicAnchors) ? [...refs.dynamicAnchors] : [];
     if (typeof schema.$dynamicAnchor === "string") {
         dynamicAnchors.push({
@@ -85,6 +83,9 @@ const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) =>
 exports.parseSchema = parseSchema;
 const parseRef = (schema, refs) => {
     const refValue = schema.$dynamicRef ?? schema.$ref;
+    if (typeof refValue !== "string") {
+        return (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
+    }
     const resolved = resolveRef(schema, refValue, refs);
     if (!resolved) {
         refs.onUnresolvedRef?.(refValue, refs.path);
@@ -194,7 +195,10 @@ const resolveRef = (schemaNode, ref, refs) => {
         const loaded = refs.resolveExternalRef(extBase);
         if (loaded) {
             // If async resolver is used synchronously here, it will be ignored; keep simple sync for now
-            const schema = loaded.then ? undefined : loaded;
+            const maybePromise = loaded;
+            const schema = typeof maybePromise.then === "function"
+                ? undefined
+                : loaded;
             if (schema) {
                 const { registry } = (0, buildRefRegistry_js_1.buildRefRegistry)(schema, extBase);
                 registry.forEach((entry, k) => refs.refRegistry?.set(k, entry));
@@ -342,10 +346,10 @@ const selectParser = (schema, refs) => {
         return (0, parseNumber_js_1.parseNumber)(schema);
     }
     else if (exports.its.a.primitive(schema, "boolean")) {
-        return (0, parseBoolean_js_1.parseBoolean)(schema);
+        return (0, parseBoolean_js_1.parseBoolean)();
     }
     else if (exports.its.a.primitive(schema, "null")) {
-        return (0, parseNull_js_1.parseNull)(schema);
+        return (0, parseNull_js_1.parseNull)();
     }
     else if (exports.its.a.conditional(schema)) {
         return (0, parseIfThenElse_js_1.parseIfThenElse)(schema, refs);

package/dist/cjs/parsers/parseString.js

@@ -289,7 +289,7 @@ const parseString = (schema, refs) => {
     if (contentMediaType != "") {
         r += contentMediaType;
         r += (0, withMessage_js_1.withMessage)(schema, "contentSchema", ({ value }) => {
-            if (value && value instanceof Object) {
+            if (value && typeof value === "object") {
                 return {
                     opener: `.pipe(${(0, parseSchema_js_1.parseSchema)(value, refContext)}`,
                     closer: ")",

package/dist/cjs/utils/buildRefRegistry.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildRefRegistry = void 0;
 const resolveUri_js_1 = require("./resolveUri.js");
-const buildRefRegistry = (schema, rootBaseUri = "root:///", opts = {}) => {
+const buildRefRegistry = (schema, rootBaseUri = "root:///") => {
     const registry = new Map();
     const walk = (node, baseUri, path) => {
         if (typeof node !== "object" || node === null)

package/dist/cjs/utils/omit.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.omit = void 0;
 const omit = (obj, ...keys) => Object.keys(obj).reduce((acc, key) => {
-    if (!keys.includes(key)) {
-        acc[key] = obj[key];
+    const typedKey = key;
+    if (!keys.includes(typedKey)) {
+        acc[typedKey] = obj[typedKey];
     }
     return acc;
 }, {});

package/dist/esm/core/emitZod.js

@@ -98,8 +98,8 @@ export const emitZod = (analysis) => {
         })
             .join("\n")
         : "";
-    const jsdocs = rest.withJsdocs && typeof schema !== "boolean" && schema.description
-        ? expandJsdocs(schema.description)
+    const jsdocs = rest.withJsdocs && typeof schema === "object" && schema !== null && "description" in schema
+        ? expandJsdocs(String(schema.description ?? ""))
         : "";
     const lines = [];
     if (module === "cjs" && !noImport) {

package/dist/esm/generators/generateBundle.js

@@ -79,6 +79,7 @@ const buildBundleContext = (defNames, defs, options) => {
     return { defInfoMap, rootName, rootTypeName };
 };
 const createRefHandler = (currentDefName, defInfoMap, usedRefs, allDefs, options) => {
+    const useLazyCrossRefs = options.refResolution?.lazyCrossRefs ?? true;
     return (schema, refs) => {
         if (typeof schema["$ref"] === "string") {
             const refPath = schema["$ref"];
@@ -105,7 +106,7 @@ const createRefHandler = (currentDefName, defInfoMap, usedRefs, allDefs, options
                     });
                     if (resolved)
                         return resolved;
-                    if (isCycle && options.refResolution?.lazyCrossRefs) {
+                    if (isCycle && useLazyCrossRefs) {
                         return `z.lazy(() => ${refInfo.schemaName})`;
                     }
                     return refInfo.schemaName;
@@ -285,7 +286,7 @@ const findNestedTypesInSchema = (schema, parentTypeName, defNames, currentPath =
     }
     // inline $defs
     if (record.$defs && typeof record.$defs === "object") {
-        for (const [_defName, defSchema] of Object.entries(record.$defs)) {
+        for (const [, defSchema] of Object.entries(record.$defs)) {
             nestedTypes.push(...findNestedTypesInSchema(defSchema, parentTypeName, defNames, currentPath));
         }
     }
@@ -334,14 +335,23 @@ const generateNestedTypesFile = (nestedTypes) => {
         lines.push(`import type { ${typeName} } from './${file}.schema.js';`);
     }
     lines.push("");
+    const buildAccessExpr = (parentType, propertyPath) => {
+        let accessExpr = parentType;
+        for (const prop of propertyPath) {
+            const accessor = prop === "items"
+                ? "[number]"
+                : typeof prop === "number"
+                    ? `[${prop}]`
+                    : `[${JSON.stringify(prop)}]`;
+            accessExpr = `NonNullable<${accessExpr}${accessor}>`;
+        }
+        return accessExpr;
+    };
     for (const [parentType, types] of [...byParent.entries()].sort()) {
         lines.push(`// From ${parentType}`);
         for (const info of types.sort((a, b) => a.typeName.localeCompare(b.typeName))) {
             if (info.propertyPath.length > 0) {
-                let accessExpr = parentType;
-                for (const prop of info.propertyPath) {
-                    accessExpr = `NonNullable<${accessExpr}['${prop}']>`;
-                }
+                const accessExpr = buildAccessExpr(parentType, info.propertyPath);
                 lines.push(`export type ${info.typeName} = ${accessExpr};`);
             }
         }

package/dist/esm/parsers/parseAllOf.js

@@ -1,18 +1,20 @@
 import { parseSchema } from "./parseSchema.js";
 import { half } from "../utils/half.js";
-const originalIndex = Symbol("Original index");
+const originalIndexKey = "__originalIndex";
 const ensureOriginalIndex = (arr) => {
-    let newArr = [];
+    const newArr = [];
     for (let i = 0; i < arr.length; i++) {
         const item = arr[i];
         if (typeof item === "boolean") {
-            newArr.push(item ? { [originalIndex]: i } : { [originalIndex]: i, not: {} });
+            newArr.push(item ? { [originalIndexKey]: i } : { [originalIndexKey]: i, not: {} });
         }
-        else if (originalIndex in item) {
+        else if (typeof item === "object" &&
+            item !== null &&
+            originalIndexKey in item) {
             return arr;
         }
         else {
-            newArr.push({ ...item, [originalIndex]: i });
+            newArr.push({ ...item, [originalIndexKey]: i });
         }
     }
     return newArr;
@@ -25,7 +27,11 @@ export function parseAllOf(schema, refs) {
         const item = schema.allOf[0];
         return parseSchema(item, {
             ...refs,
-            path: [...refs.path, "allOf", item[originalIndex]],
+            path: [
+                ...refs.path,
+                "allOf",
+                item[originalIndexKey] ?? 0,
+            ],
         });
     }
     else {

package/dist/esm/parsers/parseBoolean.js

@@ -1,3 +1 @@
-export const parseBoolean = (_schema) => {
-    return "z.boolean()";
-};
+export const parseBoolean = () => "z.boolean()";

package/dist/esm/parsers/parseIfThenElse.js

@@ -14,7 +14,7 @@ export const parseIfThenElse = (schema, refs) => {
     ? ${$then}.safeParse(value)
     : ${$else}.safeParse(value);
   if (!result.success) {
-    const issues = result.error.issues ?? result.error.errors ?? [];
+    const issues = result.error.issues;
     issues.forEach((issue) => ctx.addIssue(issue))
   }
 })`;

package/dist/esm/parsers/parseNull.js

@@ -1,3 +1 @@
-export const parseNull = (_schema) => {
-    return "z.null()";
-};
+export const parseNull = () => "z.null()";

package/dist/esm/parsers/parseObject.js

@@ -197,6 +197,7 @@ export function parseObject(objectSchema, refs) {
         output += `.and(${parseAnyOf({
             ...objectSchema,
             anyOf: objectSchema.anyOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -207,6 +208,7 @@ export function parseObject(objectSchema, refs) {
         output += `.and(${parseOneOf({
             ...objectSchema,
             oneOf: objectSchema.oneOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -217,6 +219,7 @@ export function parseObject(objectSchema, refs) {
         output += `.and(${parseAllOf({
             ...objectSchema,
             allOf: objectSchema.allOf.map((x) => typeof x === "object" &&
+                x !== null &&
                 !x.type &&
                 (x.properties || x.additionalProperties || x.patternProperties)
                 ? { ...x, type: "object" }
@@ -230,6 +233,7 @@ export function parseObject(objectSchema, refs) {
     // propertyNames
     if (objectSchema.propertyNames) {
         const normalizedPropNames = typeof objectSchema.propertyNames === "object" &&
+            objectSchema.propertyNames !== null &&
             !objectSchema.propertyNames.type &&
             objectSchema.propertyNames.pattern
             ? { ...objectSchema.propertyNames, type: "string" }
@@ -258,12 +262,12 @@ export function parseObject(objectSchema, refs) {
         if (entries.length) {
             output += `.superRefine((obj, ctx) => {
   ${entries
-                .map(([key, schema], idx) => {
+                .map(([key, schema]) => {
                 const parsed = parseSchema(schema, { ...refs, path: [...refs.path, "dependentSchemas", key] });
                 return `if (Object.prototype.hasOwnProperty.call(obj, ${JSON.stringify(key)})) {
     const result = ${parsed}.safeParse(obj);
     if (!result.success) {
-      ctx.addIssue({ code: "custom", message: "Dependent schema failed", path: [], params: { issues: result.error.issues } });
+      ctx.addIssue({ code: "custom", message: ${objectSchema.errorMessage?.dependentSchemas ?? JSON.stringify("Dependent schema failed")}, path: [], params: { issues: result.error.issues } });
     }
   }`;
             })
@@ -275,7 +279,8 @@ export function parseObject(objectSchema, refs) {
     if (objectSchema.dependentRequired && typeof objectSchema.dependentRequired === "object") {
         const entries = Object.entries(objectSchema.dependentRequired);
         if (entries.length) {
-            const depRequiredMessage = objectSchema.errorMessage?.dependentRequired ?? "Dependent required properties missing";
+            const depRequiredMessage = objectSchema.errorMessage?.dependentRequired ??
+                "Dependent required properties missing";
             output += `.superRefine((obj, ctx) => {
   ${entries
                 .map(([prop, deps]) => {

package/dist/esm/parsers/parseSchema.js

@@ -30,9 +30,7 @@ export const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockM
     if (typeof schema !== "object")
         return schema ? anyOrUnknown(refs) : "z.never()";
     const parentBase = refs.currentBaseUri ?? refs.rootBaseUri ?? "root:///";
-    const baseUri = typeof schema.$id === "string"
-        ? resolveUri(parentBase, schema.$id)
-        : parentBase;
+    const baseUri = typeof schema.$id === "string" ? resolveUri(parentBase, schema.$id) : parentBase;
     const dynamicAnchors = Array.isArray(refs.dynamicAnchors) ? [...refs.dynamicAnchors] : [];
     if (typeof schema.$dynamicAnchor === "string") {
         dynamicAnchors.push({
@@ -81,6 +79,9 @@ export const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockM
 };
 const parseRef = (schema, refs) => {
     const refValue = schema.$dynamicRef ?? schema.$ref;
+    if (typeof refValue !== "string") {
+        return anyOrUnknown(refs);
+    }
     const resolved = resolveRef(schema, refValue, refs);
     if (!resolved) {
         refs.onUnresolvedRef?.(refValue, refs.path);
@@ -190,7 +191,10 @@ const resolveRef = (schemaNode, ref, refs) => {
         const loaded = refs.resolveExternalRef(extBase);
         if (loaded) {
             // If async resolver is used synchronously here, it will be ignored; keep simple sync for now
-            const schema = loaded.then ? undefined : loaded;
+            const maybePromise = loaded;
+            const schema = typeof maybePromise.then === "function"
+                ? undefined
+                : loaded;
             if (schema) {
                 const { registry } = buildRefRegistry(schema, extBase);
                 registry.forEach((entry, k) => refs.refRegistry?.set(k, entry));
@@ -338,10 +342,10 @@ const selectParser = (schema, refs) => {
         return parseNumber(schema);
     }
     else if (its.a.primitive(schema, "boolean")) {
-        return parseBoolean(schema);
+        return parseBoolean();
     }
     else if (its.a.primitive(schema, "null")) {
-        return parseNull(schema);
+        return parseNull();
     }
     else if (its.a.conditional(schema)) {
         return parseIfThenElse(schema, refs);

package/dist/esm/parsers/parseString.js

@@ -286,7 +286,7 @@ export const parseString = (schema, refs) => {
     if (contentMediaType != "") {
         r += contentMediaType;
         r += withMessage(schema, "contentSchema", ({ value }) => {
-            if (value && value instanceof Object) {
+            if (value && typeof value === "object") {
                 return {
                     opener: `.pipe(${parseSchema(value, refContext)}`,
                     closer: ")",

package/dist/esm/utils/buildRefRegistry.js

@@ -1,5 +1,5 @@
 import { resolveUri } from "./resolveUri.js";
-export const buildRefRegistry = (schema, rootBaseUri = "root:///", opts = {}) => {
+export const buildRefRegistry = (schema, rootBaseUri = "root:///") => {
     const registry = new Map();
     const walk = (node, baseUri, path) => {
         if (typeof node !== "object" || node === null)

package/dist/esm/utils/omit.js

@@ -1,6 +1,7 @@
 export const omit = (obj, ...keys) => Object.keys(obj).reduce((acc, key) => {
-    if (!keys.includes(key)) {
-        acc[key] = obj[key];
+    const typedKey = key;
+    if (!keys.includes(typedKey)) {
+        acc[typedKey] = obj[typedKey];
     }
     return acc;
 }, {});

package/dist/types/Types.d.ts

@@ -6,6 +6,11 @@ export type JsonSchemaObject = {
     type?: string | string[];
     $id?: string;
     $ref?: string;
+    $anchor?: string;
+    $dynamicRef?: string;
+    $dynamicAnchor?: string;
+    $recursiveRef?: string;
+    $recursiveAnchor?: boolean;
     $defs?: Record<string, JsonSchema>;
     definitions?: Record<string, JsonSchema>;
     title?: string;
@@ -53,9 +58,7 @@ export type JsonSchemaObject = {
     errorMessage?: {
         [key: string]: string | undefined;
     };
-} & {
-    [key: string]: any;
-};
+} & Record<string, unknown>;
 export type ParserSelector = (schema: JsonSchemaObject, refs: Refs) => string;
 export type ParserOverride = (schema: JsonSchemaObject, refs: Refs) => string | void;
 export type Options = {

package/dist/types/parsers/parseBoolean.d.ts

@@ -1,4 +1 @@
-import { JsonSchemaObject } from "../Types.js";
-export declare const parseBoolean: (_schema: JsonSchemaObject & {
-    type: "boolean";
-}) => string;
+export declare const parseBoolean: () => string;

package/dist/types/parsers/parseNull.d.ts

@@ -1,4 +1 @@
-import { JsonSchemaObject } from "../Types.js";
-export declare const parseNull: (_schema: JsonSchemaObject & {
-    type: "null";
-}) => string;
+export declare const parseNull: () => string;

package/dist/types/utils/buildRefRegistry.d.ts

@@ -1,4 +1,4 @@
-import { JsonSchema, Options } from "../Types.js";
+import { JsonSchema } from "../Types.js";
 export type RefRegistryEntry = {
     schema: JsonSchema;
     path: (string | number)[];
@@ -6,7 +6,7 @@ export type RefRegistryEntry = {
     dynamic?: boolean;
     anchor?: string;
 };
-export declare const buildRefRegistry: (schema: JsonSchema, rootBaseUri?: string, opts?: Options) => {
+export declare const buildRefRegistry: (schema: JsonSchema, rootBaseUri?: string) => {
     registry: Map<string, RefRegistryEntry>;
     rootBaseUri: string;
 };

package/eslint.config.js

@@ -3,7 +3,7 @@ import pluginTs from "@typescript-eslint/eslint-plugin";
 
 export default [
   {
-    ignores: ["dist", "node_modules"],
+    ignores: ["dist", "node_modules", "test/output/**"],
   },
   {
     files: ["**/*.ts", "**/*.tsx"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gabrielbryk/json-schema-to-zod",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Converts JSON schema objects or files into Zod schemas",
   "type": "module",
   "types": "./dist/types/index.d.ts",