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

package/dist/esm/parsers/parseObject.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseObject = parseObject;
-const parseAnyOf_js_1 = require("./parseAnyOf.js");
-const parseOneOf_js_1 = require("./parseOneOf.js");
-const parseSchema_js_1 = require("./parseSchema.js");
-const parseAllOf_js_1 = require("./parseAllOf.js");
-const parseIfThenElse_js_1 = require("./parseIfThenElse.js");
-const jsdocs_js_1 = require("../utils/jsdocs.js");
-const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
-function parseObject(objectSchema, refs) {
+import { parseAnyOf } from "./parseAnyOf.js";
+import { parseOneOf } from "./parseOneOf.js";
+import { its, parseSchema } from "./parseSchema.js";
+import { parseAllOf } from "./parseAllOf.js";
+import { parseIfThenElse } from "./parseIfThenElse.js";
+import { addJsdocs } from "../utils/jsdocs.js";
+import { anyOrUnknown } from "../utils/anyOrUnknown.js";
+export function parseObject(objectSchema, refs) {
     let properties = undefined;
     if (objectSchema.properties) {
         if (!Object.keys(objectSchema.properties).length) {
@@ -19,7 +16,7 @@ function parseObject(objectSchema, refs) {
             properties += Object.keys(objectSchema.properties)
                 .map((key) => {
                 const propSchema = objectSchema.properties[key];
-                const parsedProp = (0, parseSchema_js_1.parseSchema)(propSchema, {
+                const parsedProp = parseSchema(propSchema, {
                     ...refs,
                     path: [...refs.path, "properties", key],
                 });
@@ -35,7 +32,7 @@ function parseObject(objectSchema, refs) {
                     ? `get ${JSON.stringify(key)}(){ return ${valueWithOptional} }`
                     : `${JSON.stringify(key)}: ${valueWithOptional}`;
                 if (refs.withJsdocs && typeof propSchema === "object") {
-                    result = (0, jsdocs_js_1.addJsdocs)(propSchema, result);
+                    result = addJsdocs(propSchema, result);
                 }
                 return result;
             })
@@ -44,7 +41,7 @@ function parseObject(objectSchema, refs) {
         }
     }
     const additionalProperties = objectSchema.additionalProperties !== undefined
-        ? (0, parseSchema_js_1.parseSchema)(objectSchema.additionalProperties, {
+        ? parseSchema(objectSchema.additionalProperties, {
             ...refs,
             path: [...refs.path, "additionalProperties"],
         })
@@ -55,7 +52,7 @@ function parseObject(objectSchema, refs) {
         const parsedPatternProperties = Object.fromEntries(Object.entries(objectSchema.patternProperties).map(([key, value]) => {
             return [
                 key,
-                (0, parseSchema_js_1.parseSchema)(value, {
+                parseSchema(value, {
                     ...refs,
                     path: [...refs.path, "patternProperties", key],
                 }),
@@ -154,7 +151,7 @@ function parseObject(objectSchema, refs) {
     // Check if there will be an .and() call that adds properties from oneOf/anyOf/allOf/if-then-else
     // In that case, we should NOT use .strict() because it will reject the additional keys
     // before the union gets a chance to validate them.
-    const hasCompositionKeywords = parseSchema_js_1.its.an.anyOf(objectSchema) || parseSchema_js_1.its.a.oneOf(objectSchema) || parseSchema_js_1.its.an.allOf(objectSchema) || parseSchema_js_1.its.a.conditional(objectSchema);
+    const hasCompositionKeywords = its.an.anyOf(objectSchema) || its.a.oneOf(objectSchema) || its.an.allOf(objectSchema) || its.a.conditional(objectSchema);
     let output = properties
         ? patternProperties
             ? properties + patternProperties
@@ -170,12 +167,12 @@ function parseObject(objectSchema, refs) {
             ? patternProperties
             : additionalProperties
                 ? `z.record(z.string(), ${additionalProperties})`
-                : `z.record(z.string(), ${(0, anyOrUnknown_js_1.anyOrUnknown)(refs)})`;
+                : `z.record(z.string(), ${anyOrUnknown(refs)})`;
     if (unevaluated === false && properties && !hasCompositionKeywords) {
         output += ".strict()";
     }
     else if (unevaluated && typeof unevaluated !== 'boolean') {
-        const unevaluatedSchema = (0, parseSchema_js_1.parseSchema)(unevaluated, {
+        const unevaluatedSchema = parseSchema(unevaluated, {
             ...refs,
             path: [...refs.path, "unevaluatedProperties"],
         });
@@ -196,30 +193,33 @@ function parseObject(objectSchema, refs) {
   }
 })`;
     }
-    if (parseSchema_js_1.its.an.anyOf(objectSchema)) {
-        output += `.and(${(0, parseAnyOf_js_1.parseAnyOf)({
+    if (its.an.anyOf(objectSchema)) {
+        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" }
                 : x),
         }, refs)})`;
     }
-    if (parseSchema_js_1.its.a.oneOf(objectSchema)) {
-        output += `.and(${(0, parseOneOf_js_1.parseOneOf)({
+    if (its.a.oneOf(objectSchema)) {
+        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" }
                 : x),
         }, refs)})`;
     }
-    if (parseSchema_js_1.its.an.allOf(objectSchema)) {
-        output += `.and(${(0, parseAllOf_js_1.parseAllOf)({
+    if (its.an.allOf(objectSchema)) {
+        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" }
@@ -227,17 +227,18 @@ function parseObject(objectSchema, refs) {
         }, refs)})`;
     }
     // Handle if/then/else conditionals on object schemas
-    if (parseSchema_js_1.its.a.conditional(objectSchema)) {
-        output += `.and(${(0, parseIfThenElse_js_1.parseIfThenElse)(objectSchema, refs)})`;
+    if (its.a.conditional(objectSchema)) {
+        output += `.and(${parseIfThenElse(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" }
             : objectSchema.propertyNames;
-        const propNameSchema = (0, parseSchema_js_1.parseSchema)(normalizedPropNames, {
+        const propNameSchema = parseSchema(normalizedPropNames, {
             ...refs,
             path: [...refs.path, "propertyNames"],
         });
@@ -261,12 +262,12 @@ function parseObject(objectSchema, refs) {
         if (entries.length) {
             output += `.superRefine((obj, ctx) => {
   ${entries
-                .map(([key, schema], idx) => {
-                const parsed = (0, parseSchema_js_1.parseSchema)(schema, { ...refs, path: [...refs.path, "dependentSchemas", key] });
+                .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 } });
     }
   }`;
             })
@@ -278,7 +279,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/esm/parsers/parseOneOf.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseOneOf = void 0;
-const parseSchema_js_1 = require("./parseSchema.js");
-const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
-const parseOneOf = (schema, refs) => {
+import { parseSchema } from "./parseSchema.js";
+import { anyOrUnknown } from "../utils/anyOrUnknown.js";
+export const parseOneOf = (schema, refs) => {
     if (!schema.oneOf.length) {
-        return (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
+        return anyOrUnknown(refs);
     }
     if (schema.oneOf.length === 1) {
-        return (0, parseSchema_js_1.parseSchema)(schema.oneOf[0], {
+        return parseSchema(schema.oneOf[0], {
             ...refs,
             path: [...refs.path, "oneOf", 0],
         });
     }
     // Generate parsed schemas for each oneOf option
-    const parsedSchemas = schema.oneOf.map((s, i) => (0, parseSchema_js_1.parseSchema)(s, {
+    const parsedSchemas = schema.oneOf.map((s, i) => parseSchema(s, {
         ...refs,
         path: [...refs.path, "oneOf", i],
     }));
@@ -50,4 +47,3 @@ const parseOneOf = (schema, refs) => {
     // Default: use simple z.union() (at least one must match)
     return `z.union([${parsedSchemas.join(", ")}])`;
 };
-exports.parseOneOf = parseOneOf;

package/dist/esm/parsers/parseSchema.js

@@ -1,36 +1,46 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.its = exports.parseSchema = void 0;
-const parseAnyOf_js_1 = require("./parseAnyOf.js");
-const parseBoolean_js_1 = require("./parseBoolean.js");
-const parseDefault_js_1 = require("./parseDefault.js");
-const parseMultipleType_js_1 = require("./parseMultipleType.js");
-const parseNot_js_1 = require("./parseNot.js");
-const parseNull_js_1 = require("./parseNull.js");
-const parseAllOf_js_1 = require("./parseAllOf.js");
-const parseArray_js_1 = require("./parseArray.js");
-const parseConst_js_1 = require("./parseConst.js");
-const parseEnum_js_1 = require("./parseEnum.js");
-const parseIfThenElse_js_1 = require("./parseIfThenElse.js");
-const parseNumber_js_1 = require("./parseNumber.js");
-const parseObject_js_1 = require("./parseObject.js");
-const parseString_js_1 = require("./parseString.js");
-const parseOneOf_js_1 = require("./parseOneOf.js");
-const parseSimpleDiscriminatedOneOf_js_1 = require("./parseSimpleDiscriminatedOneOf.js");
-const parseNullable_js_1 = require("./parseNullable.js");
-const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
-const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) => {
+import { parseAnyOf } from "./parseAnyOf.js";
+import { parseBoolean } from "./parseBoolean.js";
+import { parseDefault } from "./parseDefault.js";
+import { parseMultipleType } from "./parseMultipleType.js";
+import { parseNot } from "./parseNot.js";
+import { parseNull } from "./parseNull.js";
+import { parseAllOf } from "./parseAllOf.js";
+import { parseArray } from "./parseArray.js";
+import { parseConst } from "./parseConst.js";
+import { parseEnum } from "./parseEnum.js";
+import { parseIfThenElse } from "./parseIfThenElse.js";
+import { parseNumber } from "./parseNumber.js";
+import { parseObject } from "./parseObject.js";
+import { parseString } from "./parseString.js";
+import { parseOneOf } from "./parseOneOf.js";
+import { parseSimpleDiscriminatedOneOf } from "./parseSimpleDiscriminatedOneOf.js";
+import { parseNullable } from "./parseNullable.js";
+import { anyOrUnknown } from "../utils/anyOrUnknown.js";
+import { resolveUri } from "../utils/resolveUri.js";
+import { buildRefRegistry } from "../utils/buildRefRegistry.js";
+export const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) => {
     // Ensure ref bookkeeping exists so $ref declarations and getter-based recursion work
     refs.root = refs.root ?? schema;
+    refs.rootBaseUri = refs.rootBaseUri ?? "root:///";
     refs.declarations = refs.declarations ?? new Map();
     refs.dependencies = refs.dependencies ?? new Map();
     refs.inProgress = refs.inProgress ?? new Set();
     refs.refNameByPointer = refs.refNameByPointer ?? new Map();
     refs.usedNames = refs.usedNames ?? new Set();
     if (typeof schema !== "object")
-        return schema ? (0, anyOrUnknown_js_1.anyOrUnknown)(refs) : "z.never()";
+        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 dynamicAnchors = Array.isArray(refs.dynamicAnchors) ? [...refs.dynamicAnchors] : [];
+    if (typeof schema.$dynamicAnchor === "string") {
+        dynamicAnchors.push({
+            name: schema.$dynamicAnchor,
+            uri: baseUri,
+            path: refs.path,
+        });
+    }
     if (refs.parserOverride) {
-        const custom = refs.parserOverride(schema, refs);
+        const custom = refs.parserOverride(schema, { ...refs, currentBaseUri: baseUri, dynamicAnchors });
         if (typeof custom === "string") {
             return custom;
         }
@@ -41,7 +51,7 @@ const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) =>
             return seen.r;
         }
         if (refs.depth === undefined || seen.n >= refs.depth) {
-            return (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
+            return anyOrUnknown(refs);
         }
         seen.n += 1;
     }
@@ -49,15 +59,15 @@ const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) =>
         seen = { r: undefined, n: 0 };
         refs.seen.set(schema, seen);
     }
-    if (exports.its.a.ref(schema)) {
-        const parsedRef = parseRef(schema, refs);
+    if (its.a.ref(schema)) {
+        const parsedRef = parseRef(schema, { ...refs, currentBaseUri: baseUri, dynamicAnchors });
         seen.r = parsedRef;
         return parsedRef;
     }
-    let parsed = selectParser(schema, refs);
+    let parsed = selectParser(schema, { ...refs, currentBaseUri: baseUri, dynamicAnchors });
     if (!blockMeta) {
         if (!refs.withoutDescribes) {
-            parsed = addDescribes(schema, parsed, refs);
+            parsed = addDescribes(schema, parsed, { ...refs, currentBaseUri: baseUri, dynamicAnchors });
         }
         if (!refs.withoutDefaults) {
             parsed = addDefaults(schema, parsed);
@@ -67,19 +77,24 @@ const parseSchema = (schema, refs = { seen: new Map(), path: [] }, blockMeta) =>
     seen.r = parsed;
     return parsed;
 };
-exports.parseSchema = parseSchema;
 const parseRef = (schema, refs) => {
-    const resolved = resolveRef(refs.root, schema.$ref);
+    const refValue = schema.$dynamicRef ?? schema.$ref;
+    if (typeof refValue !== "string") {
+        return anyOrUnknown(refs);
+    }
+    const resolved = resolveRef(schema, refValue, refs);
     if (!resolved) {
-        return (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
+        refs.onUnresolvedRef?.(refValue, refs.path);
+        return anyOrUnknown(refs);
     }
-    const { schema: target, path } = resolved;
-    const refName = getOrCreateRefName(schema.$ref, path, refs);
+    const { schema: target, path, pointerKey } = resolved;
+    const refName = getOrCreateRefName(pointerKey, path, refs);
     if (!refs.declarations.has(refName) && !refs.inProgress.has(refName)) {
         refs.inProgress.add(refName);
-        const declaration = (0, exports.parseSchema)(target, {
+        const declaration = parseSchema(target, {
             ...refs,
             path,
+            currentBaseUri: resolved.baseUri,
             currentSchemaName: refName,
             root: refs.root,
         });
@@ -132,23 +147,96 @@ const addDescribes = (schema, parsed, refs) => {
     }
     return parsed;
 };
-const resolveRef = (root, ref) => {
-    if (!root || !ref.startsWith("#/"))
-        return undefined;
-    const rawSegments = ref
-        .slice(2)
-        .split("/")
-        .filter((segment) => segment.length > 0)
-        .map(decodePointerSegment);
-    let current = root;
-    for (const segment of rawSegments) {
-        if (typeof current !== "object" || current === null)
-            return undefined;
-        current = current[segment];
-    }
-    return { schema: current, path: rawSegments };
+const resolveRef = (schemaNode, ref, refs) => {
+    const base = refs.currentBaseUri ?? refs.rootBaseUri ?? "root:///";
+    // Handle dynamicRef lookup via dynamicAnchors stack
+    const isDynamic = typeof schemaNode.$dynamicRef === "string";
+    if (isDynamic && refs.dynamicAnchors && ref.startsWith("#")) {
+        const name = ref.slice(1);
+        for (let i = refs.dynamicAnchors.length - 1; i >= 0; i -= 1) {
+            const entry = refs.dynamicAnchors[i];
+            if (entry.name === name) {
+                const key = `${entry.uri}#${name}`;
+                const target = refs.refRegistry?.get(key);
+                if (target) {
+                    return { schema: target.schema, path: target.path, baseUri: target.baseUri, pointerKey: key };
+                }
+            }
+        }
+    }
+    // Resolve URI against base
+    const resolvedUri = resolveUri(base, ref);
+    const [uriBase, fragment] = resolvedUri.split("#");
+    const key = fragment ? `${uriBase}#${fragment}` : uriBase;
+    let regEntry = refs.refRegistry?.get(key);
+    if (regEntry) {
+        return { schema: regEntry.schema, path: regEntry.path, baseUri: regEntry.baseUri, pointerKey: key };
+    }
+    // Legacy recursive ref: treat as dynamic to __recursive__
+    if (schemaNode.$recursiveRef) {
+        const recursiveKey = `${base}#__recursive__`;
+        regEntry = refs.refRegistry?.get(recursiveKey);
+        if (regEntry) {
+            return {
+                schema: regEntry.schema,
+                path: regEntry.path,
+                baseUri: regEntry.baseUri,
+                pointerKey: recursiveKey,
+            };
+        }
+    }
+    // External resolver hook
+    const extBase = uriBaseFromRef(resolvedUri);
+    if (refs.resolveExternalRef && extBase && !isLocalBase(extBase, refs.rootBaseUri ?? "")) {
+        const loaded = refs.resolveExternalRef(extBase);
+        if (loaded) {
+            // If async resolver is used synchronously here, it will be ignored; keep simple sync for now
+            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));
+                regEntry = refs.refRegistry?.get(key);
+                if (regEntry) {
+                    return {
+                        schema: regEntry.schema,
+                        path: regEntry.path,
+                        baseUri: regEntry.baseUri,
+                        pointerKey: key,
+                    };
+                }
+            }
+        }
+    }
+    // Backward compatibility: JSON Pointer into root
+    if (refs.root && ref.startsWith("#/")) {
+        const rawSegments = ref
+            .slice(2)
+            .split("/")
+            .filter((segment) => segment.length > 0)
+            .map(decodePointerSegment);
+        let current = refs.root;
+        for (const segment of rawSegments) {
+            if (typeof current !== "object" || current === null)
+                return undefined;
+            current = current[segment];
+        }
+        return { schema: current, path: rawSegments, baseUri: base, pointerKey: ref };
+    }
+    return undefined;
 };
 const decodePointerSegment = (segment) => segment.replace(/~1/g, "/").replace(/~0/g, "~");
+const uriBaseFromRef = (resolvedUri) => {
+    const hashIdx = resolvedUri.indexOf("#");
+    return hashIdx === -1 ? resolvedUri : resolvedUri.slice(0, hashIdx);
+};
+const isLocalBase = (base, rootBase) => {
+    if (!rootBase)
+        return false;
+    return base === rootBase;
+};
 const getOrCreateRefName = (pointer, path, refs) => {
     if (refs.refNameByPointer?.has(pointer)) {
         return refs.refNameByPointer.get(pointer);
@@ -159,12 +247,24 @@ const getOrCreateRefName = (pointer, path, refs) => {
     return preferred;
 };
 const buildNameFromPath = (path, used) => {
-    const filtered = path.filter((segment) => segment !== "$defs" && segment !== "definitions" && segment !== "properties");
+    const filtered = path
+        .map((segment, idx) => {
+        if (idx === 0 && (segment === "$defs" || segment === "definitions")) {
+            return undefined; // root-level defs prefix is redundant for naming
+        }
+        if (segment === "properties")
+            return undefined; // skip noisy properties segment
+        if (segment === "$defs" || segment === "definitions")
+            return "Defs";
+        return segment;
+    })
+        .filter((segment) => segment !== undefined);
     const base = filtered.length
         ? filtered
             .map((segment) => typeof segment === "number"
             ? `Ref${segment}`
             : segment
+                .toString()
                 .replace(/[^a-zA-Z0-9_$]/g, " ")
                 .split(" ")
                 .filter(Boolean)
@@ -201,60 +301,60 @@ const addAnnotations = (schema, parsed) => {
     return parsed;
 };
 const selectParser = (schema, refs) => {
-    if (exports.its.a.nullable(schema)) {
-        return (0, parseNullable_js_1.parseNullable)(schema, refs);
+    if (its.a.nullable(schema)) {
+        return parseNullable(schema, refs);
     }
-    else if (exports.its.an.object(schema)) {
-        return (0, parseObject_js_1.parseObject)(schema, refs);
+    else if (its.an.object(schema)) {
+        return parseObject(schema, refs);
     }
-    else if (exports.its.an.array(schema)) {
-        return (0, parseArray_js_1.parseArray)(schema, refs);
+    else if (its.an.array(schema)) {
+        return parseArray(schema, refs);
     }
-    else if (exports.its.an.anyOf(schema)) {
-        return (0, parseAnyOf_js_1.parseAnyOf)(schema, refs);
+    else if (its.an.anyOf(schema)) {
+        return parseAnyOf(schema, refs);
     }
-    else if (exports.its.an.allOf(schema)) {
-        return (0, parseAllOf_js_1.parseAllOf)(schema, refs);
+    else if (its.an.allOf(schema)) {
+        return parseAllOf(schema, refs);
     }
-    else if (exports.its.a.simpleDiscriminatedOneOf(schema)) {
-        return (0, parseSimpleDiscriminatedOneOf_js_1.parseSimpleDiscriminatedOneOf)(schema, refs);
+    else if (its.a.simpleDiscriminatedOneOf(schema)) {
+        return parseSimpleDiscriminatedOneOf(schema, refs);
     }
-    else if (exports.its.a.oneOf(schema)) {
-        return (0, parseOneOf_js_1.parseOneOf)(schema, refs);
+    else if (its.a.oneOf(schema)) {
+        return parseOneOf(schema, refs);
     }
-    else if (exports.its.a.not(schema)) {
-        return (0, parseNot_js_1.parseNot)(schema, refs);
+    else if (its.a.not(schema)) {
+        return parseNot(schema, refs);
     }
-    else if (exports.its.an.enum(schema)) {
-        return (0, parseEnum_js_1.parseEnum)(schema); //<-- needs to come before primitives
+    else if (its.an.enum(schema)) {
+        return parseEnum(schema); //<-- needs to come before primitives
     }
-    else if (exports.its.a.const(schema)) {
-        return (0, parseConst_js_1.parseConst)(schema);
+    else if (its.a.const(schema)) {
+        return parseConst(schema);
     }
-    else if (exports.its.a.multipleType(schema)) {
-        return (0, parseMultipleType_js_1.parseMultipleType)(schema, refs);
+    else if (its.a.multipleType(schema)) {
+        return parseMultipleType(schema, refs);
     }
-    else if (exports.its.a.primitive(schema, "string")) {
-        return (0, parseString_js_1.parseString)(schema, refs);
+    else if (its.a.primitive(schema, "string")) {
+        return parseString(schema, refs);
     }
-    else if (exports.its.a.primitive(schema, "number") ||
-        exports.its.a.primitive(schema, "integer")) {
-        return (0, parseNumber_js_1.parseNumber)(schema);
+    else if (its.a.primitive(schema, "number") ||
+        its.a.primitive(schema, "integer")) {
+        return parseNumber(schema);
     }
-    else if (exports.its.a.primitive(schema, "boolean")) {
-        return (0, parseBoolean_js_1.parseBoolean)(schema);
+    else if (its.a.primitive(schema, "boolean")) {
+        return parseBoolean();
     }
-    else if (exports.its.a.primitive(schema, "null")) {
-        return (0, parseNull_js_1.parseNull)(schema);
+    else if (its.a.primitive(schema, "null")) {
+        return parseNull();
     }
-    else if (exports.its.a.conditional(schema)) {
-        return (0, parseIfThenElse_js_1.parseIfThenElse)(schema, refs);
+    else if (its.a.conditional(schema)) {
+        return parseIfThenElse(schema, refs);
     }
     else {
-        return (0, parseDefault_js_1.parseDefault)(schema, refs);
+        return parseDefault(schema, refs);
     }
 };
-exports.its = {
+export const its = {
     an: {
         object: (x) => x.type === "object",
         array: (x) => x.type === "array",
@@ -266,7 +366,7 @@ exports.its = {
         nullable: (x) => x.nullable === true,
         multipleType: (x) => Array.isArray(x.type),
         not: (x) => x.not !== undefined,
-        ref: (x) => typeof x.$ref === "string",
+        ref: (x) => typeof x.$ref === "string" || typeof x.$dynamicRef === "string",
         const: (x) => x.const !== undefined,
         primitive: (x, p) => x.type === p,
         conditional: (x) => Boolean("if" in x && x.if && "then" in x && "else" in x && x.then && x.else),

package/dist/esm/parsers/parseSimpleDiscriminatedOneOf.js

@@ -1,21 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSimpleDiscriminatedOneOf = void 0;
-const parseSchema_js_1 = require("./parseSchema.js");
-const anyOrUnknown_js_1 = require("../utils/anyOrUnknown.js");
-const parseSimpleDiscriminatedOneOf = (schema, refs) => {
+import { parseSchema } from "./parseSchema.js";
+import { anyOrUnknown } from "../utils/anyOrUnknown.js";
+export const parseSimpleDiscriminatedOneOf = (schema, refs) => {
     const discriminator = schema.discriminator.propertyName;
-    const options = schema.oneOf.map((option, i) => (0, parseSchema_js_1.parseSchema)(option, {
+    const options = schema.oneOf.map((option, i) => parseSchema(option, {
         ...refs,
         path: [...refs.path, "oneOf", i],
     }));
     return schema.oneOf.length
         ? schema.oneOf.length === 1
-            ? (0, parseSchema_js_1.parseSchema)(schema.oneOf[0], {
+            ? parseSchema(schema.oneOf[0], {
                 ...refs,
                 path: [...refs.path, "oneOf", 0],
             })
             : `z.discriminatedUnion("${discriminator}", [${options.join(", ")}])`
-        : (0, anyOrUnknown_js_1.anyOrUnknown)(refs);
+        : anyOrUnknown(refs);
 };
-exports.parseSimpleDiscriminatedOneOf = parseSimpleDiscriminatedOneOf;