@gabrielbryk/json-schema-to-zod 2.12.1 → 2.13.0

package/dist/parsers/parseObject.js

@@ -1,394 +1,139 @@
 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 { parseSchema } from "./parseSchema.js";
 import { addJsdocs } from "../utils/jsdocs.js";
-import { anyOrUnknown } from "../utils/anyOrUnknown.js";
-import { containsRecursiveRef, inferTypeFromExpression } from "../utils/schemaRepresentation.js";
-const collectKnownPropertyKeys = (schema) => {
-    const keys = new Set();
-    const visit = (node) => {
-        if (typeof node !== "object" || node === null)
-            return;
-        const obj = node;
-        if (obj.properties && typeof obj.properties === "object") {
-            Object.keys(obj.properties).forEach((key) => keys.add(key));
-        }
-    };
-    visit(schema);
-    if (Array.isArray(schema.oneOf))
-        schema.oneOf.forEach(visit);
-    if (Array.isArray(schema.anyOf))
-        schema.anyOf.forEach(visit);
-    if (Array.isArray(schema.allOf))
-        schema.allOf.forEach(visit);
-    return Array.from(keys);
-};
 export function parseObject(objectSchema, refs) {
-    // Optimization: if we have composition keywords (allOf/anyOf/oneOf) but no direct properties,
-    // delegate entirely to the composition parser to avoid generating z.object({}).and(...)
-    const hasDirectProperties = objectSchema.properties && Object.keys(objectSchema.properties).length > 0;
-    const hasAdditionalProperties = objectSchema.additionalProperties !== undefined;
-    const hasPatternProperties = objectSchema.patternProperties !== undefined;
-    const hasNoDirectSchema = !hasDirectProperties && !hasAdditionalProperties && !hasPatternProperties;
-    const parentRequired = Array.isArray(objectSchema.required) ? objectSchema.required : [];
-    const allOfRequired = its.an.allOf(objectSchema)
-        ? objectSchema.allOf.flatMap((member) => {
-            if (typeof member !== "object" || member === null)
-                return [];
-            const req = member.required;
-            return Array.isArray(req) ? req : [];
-        })
-        : [];
-    const combinedAllOfRequired = [...new Set([...parentRequired, ...allOfRequired])];
-    // Helper to add type: "object" to composition members that have properties but no explicit type
-    const addObjectType = (members) => members.map((x) => typeof x === "object" &&
-        x !== null &&
-        !x.type &&
-        (x.properties || x.additionalProperties || x.patternProperties)
-        ? { ...x, type: "object" }
-        : x);
-    const addObjectTypeAndMergeRequired = (members) => members.map((x) => {
-        if (typeof x !== "object" || x === null)
-            return x;
-        let normalized = x;
-        const hasShape = normalized.properties || normalized.additionalProperties || normalized.patternProperties;
-        if (hasShape && !normalized.type) {
-            normalized = { ...normalized, type: "object" };
-        }
-        if (combinedAllOfRequired.length &&
-            normalized.properties &&
-            Object.keys(normalized.properties).length) {
-            const memberRequired = Array.isArray(normalized.required) ? normalized.required : [];
-            const mergedRequired = Array.from(new Set([
-                ...memberRequired,
-                ...combinedAllOfRequired.filter((key) => Object.prototype.hasOwnProperty.call(normalized.properties, key)),
-            ]));
-            if (mergedRequired.length) {
-                normalized = { ...normalized, required: mergedRequired };
-            }
-        }
-        return normalized;
-    });
-    // If only allOf, delegate to parseAllOf
-    if (hasNoDirectSchema && its.an.allOf(objectSchema) && !its.an.anyOf(objectSchema) && !its.a.oneOf(objectSchema) && !its.a.conditional(objectSchema)) {
-        return parseAllOf({ ...objectSchema, allOf: addObjectTypeAndMergeRequired(objectSchema.allOf) }, refs);
-    }
-    // If only anyOf, delegate to parseAnyOf
-    if (hasNoDirectSchema && its.an.anyOf(objectSchema) && !its.an.allOf(objectSchema) && !its.a.oneOf(objectSchema) && !its.a.conditional(objectSchema)) {
-        return parseAnyOf({ ...objectSchema, anyOf: addObjectType(objectSchema.anyOf) }, refs);
-    }
-    // If only oneOf, delegate to parseOneOf
-    if (hasNoDirectSchema && its.a.oneOf(objectSchema) && !its.an.allOf(objectSchema) && !its.an.anyOf(objectSchema) && !its.a.conditional(objectSchema)) {
-        return parseOneOf({ ...objectSchema, oneOf: addObjectType(objectSchema.oneOf) }, refs);
-    }
-    let properties = undefined;
-    // Track property types for building proper object type annotations
+    const explicitProps = objectSchema.properties ? Object.keys(objectSchema.properties) : [];
+    const requiredProps = Array.isArray(objectSchema.required) ? objectSchema.required : [];
+    const allProps = [...new Set([...explicitProps, ...requiredProps])];
+    const hasProperties = allProps.length > 0;
+    // 1. Process Properties (Base Object)
+    let baseObjectExpr = "z.object({";
     const propertyTypes = [];
-    if (objectSchema.properties) {
-        if (!Object.keys(objectSchema.properties).length) {
-            properties = "z.object({})";
-        }
-        else {
-            properties = "z.object({ ";
-            properties += Object.keys(objectSchema.properties)
-                .map((key) => {
-                const propSchema = objectSchema.properties[key];
-                const parsedProp = parseSchema(propSchema, {
-                    ...refs,
-                    path: [...refs.path, "properties", key],
-                });
-                const hasDefault = typeof propSchema === "object" && propSchema.default !== undefined;
-                const required = Array.isArray(objectSchema.required)
-                    ? objectSchema.required.includes(key)
-                    : typeof propSchema === "object" && propSchema.required === true;
-                const optional = !hasDefault && !required;
-                const valueWithOptional = optional
-                    ? `${parsedProp.expression}.optional()`
-                    : parsedProp.expression;
-                // Calculate the type for getters (needed for recursive type inference)
-                const valueType = optional
-                    ? `z.ZodOptional<${parsedProp.type}>`
-                    : parsedProp.type;
-                // Track the property type for building the object type
-                propertyTypes.push({ key, type: valueType });
-                const useGetter = shouldUseGetter(valueWithOptional, refs);
-                let result = useGetter
-                    // Type annotation on getter is required for recursive type inference in unions
-                    ? `get ${JSON.stringify(key)}(): ${valueType} { return ${valueWithOptional} }`
-                    : `${JSON.stringify(key)}: ${valueWithOptional}`;
-                if (refs.withJsdocs && typeof propSchema === "object") {
-                    result = addJsdocs(propSchema, result);
-                }
-                return result;
-            })
-                .join(", ");
-            properties += " })";
-        }
-    }
-    const additionalProperties = objectSchema.additionalProperties !== undefined
-        ? parseSchema(objectSchema.additionalProperties, {
-            ...refs,
-            path: [...refs.path, "additionalProperties"],
-        })
-        : undefined;
-    const unevaluated = objectSchema.unevaluatedProperties;
-    const definedPropertyKeys = objectSchema.properties ? Object.keys(objectSchema.properties) : [];
-    const missingRequiredKeys = Array.isArray(objectSchema.required)
-        ? objectSchema.required.filter((key) => !definedPropertyKeys.includes(key))
-        : [];
-    let patternProperties = undefined;
-    if (objectSchema.patternProperties) {
-        const parsedPatternProperties = Object.fromEntries(Object.entries(objectSchema.patternProperties).map(([key, value]) => {
-            return [
-                key,
-                parseSchema(value, {
-                    ...refs,
-                    path: [...refs.path, "patternProperties", key],
-                }),
-            ];
-        }, {}));
-        // Helper to get expressions from parsed pattern properties
-        const patternExprs = Object.values(parsedPatternProperties).map(r => r.expression);
-        patternProperties = "";
-        if (properties) {
-            if (additionalProperties) {
-                patternProperties += `.catchall(z.union([${[
-                    ...patternExprs,
-                    additionalProperties.expression,
-                ].join(", ")}]))`;
-            }
-            else if (Object.keys(parsedPatternProperties).length > 1) {
-                patternProperties += `.catchall(z.union([${patternExprs.join(", ")}]))`;
-            }
-            else {
-                patternProperties += `.catchall(${patternExprs.join("")})`;
-            }
-        }
-        else {
-            if (additionalProperties) {
-                patternProperties += `z.record(z.string(), z.union([${[
-                    ...patternExprs,
-                    additionalProperties.expression,
-                ].join(", ")}]))`;
-            }
-            else if (Object.keys(parsedPatternProperties).length > 1) {
-                patternProperties += `z.record(z.string(), z.union([${patternExprs.join(", ")}]))`;
-            }
-            else {
-                patternProperties += `z.record(z.string(), ${patternExprs.join("")})`;
+    if (hasProperties) {
+        baseObjectExpr += allProps
+            .map((key) => {
+            const propSchema = objectSchema.properties?.[key];
+            const parsedProp = propSchema
+                ? parseSchema(propSchema, { ...refs, path: [...refs.path, "properties", key] })
+                : { expression: "z.any()", type: "z.ZodAny" };
+            const hasDefault = typeof propSchema === "object" && propSchema.default !== undefined;
+            // Check "required" array from parent
+            const isRequired = Array.isArray(objectSchema.required)
+                ? objectSchema.required.includes(key)
+                : typeof propSchema === "object" && propSchema.required === true;
+            const isOptional = !hasDefault && !isRequired;
+            let valueExpr = parsedProp.expression;
+            let valueType = parsedProp.type;
+            if (isOptional) {
+                valueExpr = `${parsedProp.expression}.exactOptional()`;
+                valueType = `z.ZodExactOptional<${parsedProp.type}>`;
             }
-        }
-        patternProperties += ".superRefine((value, ctx) => {\n";
-        patternProperties += "for (const key in value) {\n";
-        if (additionalProperties) {
-            if (objectSchema.properties) {
-                patternProperties += `let evaluated = [${Object.keys(objectSchema.properties)
-                    .map((key) => JSON.stringify(key))
-                    .join(", ")}].includes(key)\n`;
-            }
-            else {
-                patternProperties += `let evaluated = false\n`;
+            propertyTypes.push({ key, type: valueType });
+            if (refs.withJsdocs && typeof propSchema === "object") {
+                valueExpr = addJsdocs(propSchema, valueExpr);
             }
-        }
-        for (const key in objectSchema.patternProperties) {
-            patternProperties +=
-                "if (key.match(new RegExp(" + JSON.stringify(key) + "))) {\n";
-            if (additionalProperties) {
-                patternProperties += "evaluated = true\n";
-            }
-            patternProperties +=
-                "const result = " +
-                    parsedPatternProperties[key].expression +
-                    ".safeParse(value[key])\n";
-            patternProperties += "if (!result.success) {\n";
-            patternProperties += `ctx.addIssue({
-          path: [...(ctx.path ?? []), key],
-          code: 'custom',
-          message: \`Invalid input: Key matching regex /\${key}/ must match schema\`,
-          params: {
-            issues: result.error.issues
-          }
-        })\n`;
-            patternProperties += "}\n";
-            patternProperties += "}\n";
-        }
-        if (additionalProperties) {
-            patternProperties += "if (!evaluated) {\n";
-            patternProperties +=
-                "const result = " + additionalProperties.expression + ".safeParse(value[key])\n";
-            patternProperties += "if (!result.success) {\n";
-            patternProperties += `ctx.addIssue({
-          path: [...(ctx.path ?? []), key],
-          code: 'custom',
-          message: \`Invalid input: must match catchall schema\`,
-          params: {
-            issues: result.error.issues
-          }
-        })\n`;
-            patternProperties += "}\n";
-            patternProperties += "}\n";
-        }
-        patternProperties += "}\n";
-        patternProperties += "})";
-        // Store original patternProperties in meta for JSON Schema round-trip
-        if (refs.preserveJsonSchemaForRoundTrip) {
-            const patternPropsJson = JSON.stringify(Object.fromEntries(Object.entries(objectSchema.patternProperties).map(([pattern, schema]) => [
-                pattern,
-                schema
-            ])));
-            patternProperties += `.meta({ __jsonSchema: { patternProperties: ${patternPropsJson} } })`;
+            return `${JSON.stringify(key)}: ${valueExpr}`;
+        })
+            .join(", ");
+    }
+    baseObjectExpr += "})";
+    const additionalProps = objectSchema.additionalProperties;
+    let baseObjectModified = baseObjectExpr;
+    const patternProps = objectSchema.patternProperties || {};
+    const patterns = Object.keys(patternProps);
+    const hasPattern = patterns.length > 0;
+    // Logic to determine if we need manual handling of additionalProperties
+    // This is required if we have patternProperties AND additionalProperties is restrictive (false or schema)
+    // because Zod's .catchall() or .strict() would incorrectly rejeect/validate pattern-matched keys.
+    const isAdPropsRestrictive = additionalProps === false || (additionalProps && typeof additionalProps === "object");
+    const manualAdditionalProps = hasPattern && isAdPropsRestrictive;
+    let addPropsSchema;
+    if (manualAdditionalProps) {
+        baseObjectModified = baseObjectExpr.replace(/^z\.object\(/, "z.looseObject(");
+        if (typeof additionalProps === "object") {
+            addPropsSchema = parseSchema(additionalProps, {
+                ...refs,
+                path: [...refs.path, "additionalProperties"],
+            });
         }
     }
-    // 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 = its.an.anyOf(objectSchema) || its.a.oneOf(objectSchema) || its.an.allOf(objectSchema) || its.a.conditional(objectSchema);
-    // When there are composition keywords (allOf, anyOf, oneOf, if-then-else) but no direct properties,
-    // we should NOT default to z.record(z.string(), z.any()) because that would allow any properties.
-    // Instead, use z.object({}) and let the .and() call add properties from the composition.
-    // This is especially important when unevaluatedProperties: false is set.
-    const shouldPassthroughForUnevaluated = unevaluated === false && hasCompositionKeywords;
-    const passthroughProperties = shouldPassthroughForUnevaluated && properties && !patternProperties
-        ? `${properties}.passthrough()`
-        : properties;
-    const fallback = anyOrUnknown(refs);
-    let output;
-    if (properties) {
-        if (patternProperties) {
-            output = properties + patternProperties;
+    else {
+        if (additionalProps === false) {
+            baseObjectModified = baseObjectExpr.replace(/^z\.object\(/, "z.strictObject(");
         }
-        else if (additionalProperties) {
-            if (additionalProperties.expression === "z.never()") {
-                // Don't use .strict() if there are composition keywords that add properties
-                output = hasCompositionKeywords ? passthroughProperties : properties + ".strict()";
-            }
-            else {
-                output = properties + `.catchall(${additionalProperties.expression})`;
-            }
+        else if (additionalProps && typeof additionalProps === "object") {
+            addPropsSchema = parseSchema(additionalProps, {
+                ...refs,
+                path: [...refs.path, "additionalProperties"],
+            });
+            baseObjectModified = baseObjectExpr.replace(/^z\.object\(/, "z.looseObject(");
+            baseObjectModified += `.catchall(${addPropsSchema.expression})`;
         }
         else {
-            output = passthroughProperties;
+            baseObjectModified = baseObjectExpr.replace(/^z\.object\(/, "z.looseObject(");
         }
     }
-    else if (patternProperties) {
-        output = patternProperties;
-    }
-    else if (additionalProperties) {
-        output = `z.record(z.string(), ${additionalProperties.expression})`;
-    }
-    else {
-        // If we have composition keywords, start with empty object instead of z.record()
-        // The composition will provide the actual schema via .and()
-        output = hasCompositionKeywords ? "z.object({})" : `z.record(z.string(), ${fallback.expression})`;
-    }
-    if (unevaluated === false && properties && !hasCompositionKeywords) {
-        output += ".strict()";
-    }
-    else if (unevaluated && typeof unevaluated !== 'boolean') {
-        const unevaluatedSchema = parseSchema(unevaluated, {
-            ...refs,
-            path: [...refs.path, "unevaluatedProperties"],
-        });
-        const knownKeys = objectSchema.properties ? Object.keys(objectSchema.properties) : [];
-        const patterns = objectSchema.patternProperties
-            ? Object.keys(objectSchema.patternProperties).map((p) => new RegExp(p))
-            : [];
-        output += `.superRefine((value, ctx) => {
+    // 3. Handle patternProperties using Intersection with z.looseRecord
+    let finalExpr = baseObjectModified;
+    const intersectionTypes = [];
+    if (hasPattern) {
+        for (const [pattern, schema] of Object.entries(patternProps)) {
+            const validSchema = parseSchema(schema, {
+                ...refs,
+                path: [...refs.path, "patternProperties", pattern],
+            });
+            const keySchema = `z.string().regex(new RegExp(${JSON.stringify(pattern)}))`;
+            const recordExpr = `z.looseRecord(${keySchema}, ${validSchema.expression})`;
+            finalExpr = `z.intersection(${finalExpr}, ${recordExpr})`;
+            intersectionTypes.push(`z.ZodRecord<z.ZodString, ${validSchema.type}>`);
+        }
+    }
+    // 3b. Add manual additionalProperties check if needed
+    if (manualAdditionalProps) {
+        const definedProps = objectSchema.properties ? Object.keys(objectSchema.properties) : [];
+        finalExpr += `.superRefine((value, ctx) => {
   for (const key in value) {
-    const isKnown = ${JSON.stringify(knownKeys)}.includes(key);
-    const matchesPattern = ${patterns.length ? "[" + patterns.map((r) => r.toString()).join(",") + "]" : "[]"}.some((r) => r.test(key));
-    if (!isKnown && !matchesPattern) {
-      const result = ${unevaluatedSchema.expression}.safeParse(value[key]);
-      if (!result.success) {
-        ctx.addIssue({ code: "custom", path: [key], message: "Invalid unevaluated property", params: { issues: result.error.issues } });
-      }
-    }
+    if (${JSON.stringify(definedProps)}.includes(key)) continue;
+    let matched = false;
+    ${patterns.map((p) => `if (new RegExp(${JSON.stringify(p)}).test(key)) matched = true;`).join("\n    ")}
+    if (matched) continue;
+    
+    ${additionalProps === false
+            ? `ctx.addIssue({ code: "custom", message: "Invalid key/Strict", path: [...ctx.path, key] });`
+            : `const result = ${addPropsSchema.expression}.safeParse(value[key]);
+    if (!result.success) {
+        ctx.addIssue({ path: [...ctx.path, key], code: "custom", message: "Invalid additional property", params: { issues: result.error.issues } });
+    }`}
   }
 })`;
     }
-    // Track intersection types added via .and() calls
-    const intersectionTypes = [];
-    if (its.an.anyOf(objectSchema)) {
-        const anyOfResult = 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);
-        output += `.and(${anyOfResult.expression})`;
-        intersectionTypes.push(anyOfResult.type);
-    }
-    if (its.a.oneOf(objectSchema)) {
-        const oneOfResult = 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);
-        // Check if this is a refinement-only result (required fields validation)
-        // If so, apply superRefine directly instead of creating an intersection
-        const resultWithRefinement = oneOfResult;
-        if (resultWithRefinement.isRefinementOnly && resultWithRefinement.refinementBody) {
-            output += `.superRefine(${resultWithRefinement.refinementBody})`;
-            // No intersection type needed - superRefine doesn't change the type
-        }
-        else {
-            output += `.and(${oneOfResult.expression})`;
-            intersectionTypes.push(oneOfResult.type);
-        }
-    }
-    if (its.an.allOf(objectSchema)) {
-        const allOfResult = parseAllOf({
-            ...objectSchema,
-            allOf: addObjectTypeAndMergeRequired(objectSchema.allOf),
-        }, refs);
-        output += `.and(${allOfResult.expression})`;
-        intersectionTypes.push(allOfResult.type);
-    }
-    // Handle if/then/else conditionals on object schemas
-    if (its.a.conditional(objectSchema)) {
-        const conditionalResult = parseIfThenElse(objectSchema, refs);
-        output += `.and(${conditionalResult.expression})`;
-        intersectionTypes.push(conditionalResult.type);
-    }
-    if (unevaluated === false && hasCompositionKeywords) {
-        const knownKeys = collectKnownPropertyKeys(objectSchema);
-        const patternRegexps = objectSchema.patternProperties
-            ? Object.keys(objectSchema.patternProperties).map((pattern) => new RegExp(pattern))
-            : [];
-        const patternRegexpsLiteral = patternRegexps.length
-            ? `[${patternRegexps.map((r) => r.toString()).join(", ")}]`
-            : "[new RegExp(\"$^\")]";
-        output += `.superRefine((value, ctx) => {
-  if (!value || typeof value !== "object") return;
-  const knownKeys = ${JSON.stringify(knownKeys)};
-  const patternRegexps = ${patternRegexpsLiteral};
-  for (const key in value) {
-    const isKnown = knownKeys.includes(key);
-    const matchesPattern = patternRegexps.length ? patternRegexps.some((r) => r.test(key)) : false;
-    if (!isKnown && !matchesPattern) {
-      ctx.addIssue({ code: "unrecognized_keys", keys: [key], path: [key], message: "Unknown property" });
+    // 4. Handle composition (allOf, oneOf, anyOf) via Intersection
+    if (objectSchema.allOf) {
+        // Cast because we checked it exists
+        const schemaWithAllOf = objectSchema;
+        // Note: parseAllOf usually handles the whole schema logic, filtering properties.
+        // But typically allOf implies intersection.
+        // If we just use simple intersection:
+        schemaWithAllOf.allOf.forEach((s, i) => {
+            const res = parseSchema(s, { ...refs, path: [...refs.path, "allOf", i] });
+            finalExpr = `z.intersection(${finalExpr}, ${res.expression})`;
+            intersectionTypes.push(res.type);
+        });
     }
-  }
-})`;
+    if (objectSchema.oneOf) {
+        const schemaWithOneOf = objectSchema;
+        const res = parseOneOf(schemaWithOneOf, refs);
+        finalExpr = `z.intersection(${finalExpr}, ${res.expression})`;
+        intersectionTypes.push(res.type);
     }
-    // Only add required validation for missing keys when there are no composition keywords
-    // When allOf/anyOf/oneOf exist, they should define the properties and handle required validation
-    if (missingRequiredKeys.length > 0 && !hasCompositionKeywords) {
-        const checks = missingRequiredKeys
-            .map((key) => `if (!Object.prototype.hasOwnProperty.call(value, ${JSON.stringify(key)})) { ctx.addIssue({ code: "custom", path: [${JSON.stringify(key)}], message: "Required property missing" }); }`)
-            .join(" ");
-        output += `.superRefine((value, ctx) => { if (value && typeof value === "object") { ${checks} } })`;
+    if (objectSchema.anyOf) {
+        const schemaWithAnyOf = objectSchema;
+        const res = parseAnyOf(schemaWithAnyOf, refs);
+        finalExpr = `z.intersection(${finalExpr}, ${res.expression})`;
+        intersectionTypes.push(res.type);
     }
-    // propertyNames
+    // 5. propertyNames, unevaluatedProperties, dependentSchemas etc.
     if (objectSchema.propertyNames) {
         const normalizedPropNames = typeof objectSchema.propertyNames === "object" &&
             objectSchema.propertyNames !== null &&
@@ -400,9 +145,9 @@ export function parseObject(objectSchema, refs) {
             ...refs,
             path: [...refs.path, "propertyNames"],
         });
-        output += `.superRefine((value, ctx) => {
+        finalExpr += `.superRefine((value, ctx) => {
   for (const key in value) {
-    const result = ${propNameSchema}.safeParse(key);
+    const result = ${propNameSchema.expression}.safeParse(key);
     if (!result.success) {
       ctx.addIssue({
         path: [key],
@@ -418,12 +163,15 @@ export function parseObject(objectSchema, refs) {
     if (objectSchema.dependentSchemas && typeof objectSchema.dependentSchemas === "object") {
         const entries = Object.entries(objectSchema.dependentSchemas);
         if (entries.length) {
-            output += `.superRefine((obj, ctx) => {
+            finalExpr += `.superRefine((obj, ctx) => {
   ${entries
                 .map(([key, schema]) => {
-                const parsed = parseSchema(schema, { ...refs, path: [...refs.path, "dependentSchemas", key] });
+                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);
+    const result = ${parsed.expression}.safeParse(obj);
     if (!result.success) {
       ctx.addIssue({ code: "custom", message: ${objectSchema.errorMessage?.dependentSchemas ?? JSON.stringify("Dependent schema failed")}, path: [], params: { issues: result.error.issues } });
     }
@@ -437,9 +185,9 @@ 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";
-            output += `.superRefine((obj, ctx) => {
+            const depRequiredMessage = objectSchema.errorMessage
+                ?.dependentRequired ?? "Dependent required properties missing";
+            finalExpr += `.superRefine((obj, ctx) => {
   ${entries
                 .map(([prop, deps]) => {
                 const arr = Array.isArray(deps) ? deps : [];
@@ -458,73 +206,18 @@ export function parseObject(objectSchema, refs) {
 })`;
         }
     }
-    // Build the type representation from tracked property types
-    let type;
-    if (propertyTypes.length > 0) {
-        // Build proper object type with actual property types
-        const typeShape = propertyTypes
-            .map(({ key, type: propType }) => `${JSON.stringify(key)}: ${propType}`)
-            .join("; ");
-        type = `z.ZodObject<{ ${typeShape} }>`;
-    }
-    else if (properties === "z.object({})") {
-        // Empty object
-        type = "z.ZodObject<{}>";
-    }
-    else {
-        // Fallback for complex cases (patternProperties, record, etc.)
-        type = inferTypeFromExpression(output);
-    }
-    // Wrap in intersection types if .and() calls were added
-    for (const intersectionType of intersectionTypes) {
-        type = `z.ZodIntersection<${type}, ${intersectionType}>`;
+    // Calculate Type
+    let type = "z.ZodObject<any>";
+    if (propertyTypes.length) {
+        const shape = propertyTypes.map((p) => `${JSON.stringify(p.key)}: ${p.type}`).join("; ");
+        type = `z.ZodObject<{${shape}}>`;
     }
+    // If intersections
+    intersectionTypes.forEach((t) => {
+        type = `z.ZodIntersection<${type}, ${t}>`;
+    });
     return {
-        expression: output,
+        expression: finalExpr,
         type,
     };
 }
-/**
- * Determines if a property should use getter syntax for recursive references.
- * Getters defer evaluation until access time, which is the Zod v4 recommended
- * approach for handling recursive schemas in object properties.
- */
-const shouldUseGetter = (parsed, refs) => {
-    if (!parsed)
-        return false;
-    // Check for z.lazy() - these should use getters
-    if (parsed.includes("z.lazy("))
-        return true;
-    // Check for direct self-recursion (expression contains the current schema name)
-    // This handles cases like generateSchemaBundle where the schema name is different
-    // from the def name (e.g., NodeSchema vs node)
-    if (refs.currentSchemaName) {
-        const selfRefPattern = new RegExp(`\\b${refs.currentSchemaName}\\b`);
-        if (selfRefPattern.test(parsed)) {
-            return true;
-        }
-    }
-    // Check for direct recursive references in the same SCC
-    if (refs.currentSchemaName && refs.cycleRefNames && refs.cycleComponentByName) {
-        const cycleRefNames = refs.cycleRefNames;
-        const cycleComponentByName = refs.cycleComponentByName;
-        const refNameArray = Array.from(cycleRefNames);
-        // Check if expression contains a reference to a cycle member in the same component
-        if (containsRecursiveRef(parsed, cycleRefNames)) {
-            const currentComponent = cycleComponentByName.get(refs.currentSchemaName);
-            if (currentComponent !== undefined) {
-                for (let i = 0; i < refNameArray.length; i++) {
-                    const refName = refNameArray[i];
-                    const pattern = new RegExp(`\\b${refName}\\b`);
-                    if (pattern.test(parsed)) {
-                        const refComponent = cycleComponentByName.get(refName);
-                        if (refComponent === currentComponent) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return false;
-};