@beff/client 0.0.128 → 0.0.130

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @beff/client
 
+## 0.0.130
+
+### Patch Changes
+
+- improve openapi mode
+- Updated dependencies
+  - @beff/cli@0.0.130
+
+## 0.0.129
+
+### Patch Changes
+
+- printing schema for openapi
+- Updated dependencies
+  - @beff/cli@0.0.129
+
 ## 0.0.128
 
 ### Patch Changes

package/dist/cjs/codegen-v2.d.ts

@@ -1,5 +1,5 @@
 import { type BeffParser, type DecodeError } from "./types.js";
-import { JSONSchema7 } from "./json-schema.js";
+import { JSONSchema7, JSONSchema7Definition } from "./json-schema.js";
 export { generateHashFromString, generateHashFromNumbers } from "./hash.js";
 type UserProvidedStringValidatorFn = (input: string) => boolean;
 export declare function registerStringFormatter(name: string, validator: UserProvidedStringValidatorFn): void;
@@ -10,9 +10,30 @@ type DescribeContext = {
     deps: Record<string, boolean | string>;
     deps_counter: Record<string, number>;
 };
+export type SchemaPrintingMode = "flat" | "contextual";
+export type SchemaPrintingContextOptions = {
+    refPathTemplate: string;
+    definitionContainerKey: string | null;
+};
+export declare class SchemaPrintingContext {
+    private readonly refPathTemplate;
+    readonly definitionContainerKey: string | null;
+    private readonly collectedDefinitions;
+    private readonly inProgressDefinitions;
+    constructor(options: SchemaPrintingContextOptions);
+    get refTemplate(): string;
+    getRef(name: string): string;
+    hasDefinition(name: string): boolean;
+    isDefinitionInProgress(name: string): boolean;
+    markDefinitionInProgress(name: string): void;
+    storeDefinition(name: string, schema: JSONSchema7Definition): void;
+    exportDefinitions(): Record<string, JSONSchema7Definition> | Record<string, Record<string, JSONSchema7Definition>>;
+}
 type SchemaContext = {
     path: string[];
     seen: Record<string, boolean>;
+    mode: SchemaPrintingMode;
+    printingContext?: SchemaPrintingContext;
 };
 type ValidateContext = {
     disallowExtraProperties: boolean;
@@ -77,7 +98,7 @@ export declare class ConstRuntype implements Runtype {
     private value;
     constructor(value: Const);
     describe(_ctx: DescribeContext): string;
-    schema(_ctx: SchemaContext): JSONSchema7;
+    schema(ctx: SchemaContext): JSONSchema7;
     validate(_ctx: ValidateContext, input: unknown): boolean;
     parseAfterValidation(_ctx: ParseContext, input: unknown): unknown;
     reportDecodeError(ctx: ReportContext, input: unknown): DecodeError[];
@@ -218,8 +239,16 @@ export declare class AnyOfDiscriminatedRuntype implements Runtype {
     private schemas;
     private discriminator;
     private mapping;
-    constructor(schemas: Runtype[], discriminator: string, mapping: Record<string, Runtype>);
+    private schemaMapping;
+    constructor(schemas: Runtype[], discriminator: string, mapping: Record<string, Runtype>, schemaMapping: Record<string, Runtype>);
     schema(ctx: SchemaContext): JSONSchema7;
+    private getSchemaVariantRefs;
+    private getPrintingContext;
+    private getRefTarget;
+    private static sanitizeComponentNamePart;
+    private static getSyntheticRefName;
+    private ensureContextualDefinition;
+    private ensureSchemaVariantRef;
     validate(ctx: ValidateContext, input: unknown): boolean;
     parseAfterValidation(ctx: ParseContext, input: any): unknown;
     reportDecodeError(ctx: ReportContext, input: unknown): DecodeError[];

package/dist/cjs/codegen-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen-v2.d.ts","sourceRoot":"","sources":["../../src/codegen-v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codegen-v2.d.ts","sourceRoot":"","sources":["../../src/codegen-v2.ts"],"names":[],"mappings":"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"}

package/dist/cjs/codegen-v2.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildParserFromRuntype = exports.overrideNamedType = exports.createNamedType = exports.BaseRefRuntype = exports.ObjectRuntype = exports.OptionalFieldRuntype = exports.AnyOfDiscriminatedRuntype = exports.SetRuntype = exports.MapRuntype = exports.ArrayRuntype = exports.AnyOfRuntype = exports.AllOfRuntype = exports.TupleRuntype = exports.AnyOfConstsRuntype = exports.NumberWithFormatRuntype = exports.StringWithFormatRuntype = exports.TypedArrayRuntype = exports.BigIntRuntype = exports.DateRuntype = exports.RegexRuntype = exports.ConstRuntype = exports.NeverRuntype = exports.NullishRuntype = exports.AnyRuntype = exports.TypeofRuntype = exports.generateHashFromNumbers = exports.generateHashFromString = void 0;
+exports.buildParserFromRuntype = exports.overrideNamedType = exports.createNamedType = exports.BaseRefRuntype = exports.ObjectRuntype = exports.OptionalFieldRuntype = exports.AnyOfDiscriminatedRuntype = exports.SetRuntype = exports.MapRuntype = exports.ArrayRuntype = exports.AnyOfRuntype = exports.AllOfRuntype = exports.TupleRuntype = exports.AnyOfConstsRuntype = exports.NumberWithFormatRuntype = exports.StringWithFormatRuntype = exports.TypedArrayRuntype = exports.BigIntRuntype = exports.DateRuntype = exports.RegexRuntype = exports.ConstRuntype = exports.NeverRuntype = exports.NullishRuntype = exports.AnyRuntype = exports.TypeofRuntype = exports.SchemaPrintingContext = exports.generateHashFromNumbers = exports.generateHashFromString = void 0;
 exports.registerStringFormatter = registerStringFormatter;
 exports.registerNumberFormatter = registerNumberFormatter;
 const zod_1 = require("zod");
 const hash_js_1 = require("./hash.js");
+const openapi_pp_js_1 = require("./openapi-pp.js");
 const err_js_1 = require("./err.js");
 var hash_js_2 = require("./hash.js");
 Object.defineProperty(exports, "generateHashFromString", { enumerable: true, get: function () { return hash_js_2.generateHashFromString; } });
@@ -234,6 +235,53 @@ const numberFormatters = {};
 function registerNumberFormatter(name, validator) {
     numberFormatters[name] = validator;
 }
+class SchemaPrintingContext {
+    refPathTemplate;
+    definitionContainerKey;
+    collectedDefinitions;
+    inProgressDefinitions;
+    constructor(options) {
+        this.refPathTemplate = options.refPathTemplate;
+        this.definitionContainerKey = options.definitionContainerKey;
+        this.collectedDefinitions = {};
+        this.inProgressDefinitions = {};
+    }
+    get refTemplate() {
+        return this.refPathTemplate;
+    }
+    getRef(name) {
+        return this.refPathTemplate.replace("{name}", name);
+    }
+    hasDefinition(name) {
+        return name in this.collectedDefinitions;
+    }
+    isDefinitionInProgress(name) {
+        return this.inProgressDefinitions[name] === true;
+    }
+    markDefinitionInProgress(name) {
+        this.inProgressDefinitions[name] = true;
+    }
+    storeDefinition(name, schema) {
+        this.collectedDefinitions[name] = schema;
+        delete this.inProgressDefinitions[name];
+    }
+    exportDefinitions() {
+        const definitions = { ...this.collectedDefinitions };
+        const normalizedDefinitions = {};
+        for (const [name, schema] of Object.entries(definitions)) {
+            normalizedDefinitions[name] = (0, openapi_pp_js_1.normalizeOpenApiSchema)(schema, definitions, {
+                refPathTemplate: this.refPathTemplate,
+            });
+        }
+        if (this.definitionContainerKey == null) {
+            return normalizedDefinitions;
+        }
+        return {
+            [this.definitionContainerKey]: normalizedDefinitions,
+        };
+    }
+}
+exports.SchemaPrintingContext = SchemaPrintingContext;
 class TypeofRuntype {
     typeName;
     constructor(typeName) {
@@ -341,7 +389,17 @@ class ConstRuntype {
     describe(_ctx) {
         return JSON.stringify(this.value);
     }
-    schema(_ctx) {
+    schema(ctx) {
+        if (ctx.mode == "contextual") {
+            const tp = typeof this.value;
+            if (tp === "string" || tp === "number" || tp === "boolean") {
+                // OpenAPI mode prefers a type + enum for constant values
+                return {
+                    type: tp,
+                    enum: [this.value],
+                };
+            }
+        }
         return { const: this.value };
     }
     validate(_ctx, input) {
@@ -591,6 +649,16 @@ class AnyOfConstsRuntype {
         return `(${inner})`;
     }
     schema(_ctx) {
+        const isSingleTypeof = this.values.length > 0 && this.values.every((v) => typeof v === typeof this.values[0]);
+        if (isSingleTypeof) {
+            const tp = typeof this.values[0];
+            if (tp == "string" || tp === "number" || tp === "boolean") {
+                return {
+                    type: tp,
+                    enum: this.values,
+                };
+            }
+        }
         return {
             enum: this.values,
         };
@@ -1005,16 +1073,92 @@ class AnyOfDiscriminatedRuntype {
     schemas;
     discriminator;
     mapping;
-    constructor(schemas, discriminator, mapping) {
+    schemaMapping;
+    constructor(schemas, discriminator, mapping, schemaMapping) {
         this.schemas = schemas;
         this.discriminator = discriminator;
         this.mapping = mapping;
+        this.schemaMapping = schemaMapping;
     }
     schema(ctx) {
+        if (ctx.mode === "contextual" && ctx.printingContext != null) {
+            const variantRefs = this.getSchemaVariantRefs(ctx);
+            return {
+                type: "object",
+                discriminator: {
+                    propertyName: this.discriminator,
+                    mapping: Object.fromEntries(variantRefs.map(({ key, ref }) => [key, ref])),
+                },
+                oneOf: variantRefs.map(({ ref }) => ({ $ref: ref })),
+            };
+        }
         return {
+            type: "object",
+            discriminator: {
+                propertyName: this.discriminator,
+            },
             anyOf: this.schemas.map((it) => it.schema(ctx)),
         };
     }
+    getSchemaVariantRefs(ctx) {
+        const unionHash = this.hash({ seen: {} });
+        return Object.entries(this.schemaMapping).map(([key, schema]) => ({
+            key,
+            ref: this.ensureSchemaVariantRef(schema, key, unionHash, ctx),
+        }));
+    }
+    getPrintingContext(ctx) {
+        const printingContext = ctx.printingContext;
+        if (printingContext == null) {
+            throw new Error("INTERNAL ERROR: Missing SchemaPrintingContext");
+        }
+        return printingContext;
+    }
+    getRefTarget(runtype) {
+        if (!(runtype instanceof BaseRefRuntype)) {
+            return null;
+        }
+        const name = runtype.refName;
+        return {
+            name,
+            target: runtype.getNamedRuntypes()[name],
+        };
+    }
+    static sanitizeComponentNamePart(value) {
+        const cleaned = value.replace(/[^a-zA-Z0-9]+/g, " ").trim();
+        if (cleaned.length === 0) {
+            return "Variant";
+        }
+        return cleaned
+            .split(/\s+/)
+            .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+            .join("");
+    }
+    static getSyntheticRefName(discriminator, key, unionHash) {
+        const discriminatorPart = AnyOfDiscriminatedRuntype.sanitizeComponentNamePart(discriminator);
+        const keyPart = AnyOfDiscriminatedRuntype.sanitizeComponentNamePart(key);
+        return `Discriminated${discriminatorPart}${keyPart}${Math.abs(unionHash)}`;
+    }
+    ensureContextualDefinition(name, target, ctx) {
+        const printingContext = this.getPrintingContext(ctx);
+        if (printingContext.hasDefinition(name) || printingContext.isDefinitionInProgress(name)) {
+            return;
+        }
+        printingContext.markDefinitionInProgress(name);
+        const body = target.schema(ctx);
+        printingContext.storeDefinition(name, body);
+    }
+    ensureSchemaVariantRef(runtype, key, unionHash, ctx) {
+        const printingContext = this.getPrintingContext(ctx);
+        const refTarget = this.getRefTarget(runtype);
+        if (refTarget != null) {
+            this.ensureContextualDefinition(refTarget.name, refTarget.target, ctx);
+            return printingContext.getRef(refTarget.name);
+        }
+        const syntheticRefName = AnyOfDiscriminatedRuntype.getSyntheticRefName(this.discriminator, key, unionHash);
+        this.ensureContextualDefinition(syntheticRefName, runtype, ctx);
+        return printingContext.getRef(syntheticRefName);
+    }
     validate(ctx, input) {
         if (typeof input !== "object" || input == null) {
             return false;
@@ -1161,6 +1305,18 @@ class ObjectRuntype {
         if (indexSchemas.length === 0) {
             return { ...base, additionalProperties: false };
         }
+        // special case for Record<string, unknown>
+        if (Object.keys(properties).length === 0 && indexSchemas.length === 1) {
+            const [indexSchema] = indexSchemas;
+            return {
+                type: "object",
+                additionalProperties: typeof indexSchema.additionalProperties === "object" &&
+                    indexSchema.additionalProperties != null &&
+                    Object.keys(indexSchema.additionalProperties).length === 0
+                    ? true
+                    : indexSchema.additionalProperties,
+            };
+        }
         return {
             allOf: [base, ...indexSchemas],
         };
@@ -1338,6 +1494,18 @@ class BaseRefRuntype {
     schema(ctx) {
         const name = this.refName;
         const to = this.getNamedRuntypes()[this.refName];
+        if (ctx.mode === "contextual") {
+            const printingContext = ctx.printingContext;
+            if (printingContext == null) {
+                throw new Error("INTERNAL ERROR: Missing SchemaPrintingContext");
+            }
+            if (!printingContext.hasDefinition(name) && !printingContext.isDefinitionInProgress(name)) {
+                printingContext.markDefinitionInProgress(name);
+                const body = to.schema(ctx);
+                printingContext.storeDefinition(name, body);
+            }
+            return { $ref: printingContext.getRef(name) };
+        }
         if (ctx.seen[name]) {
             return {};
         }
@@ -1448,9 +1616,21 @@ class ParserFromRuntype {
         const ctx = {
             path: [],
             seen: {},
+            mode: "flat",
         };
         return this._runtype.schema(ctx);
     }
+    schemaWithContext(schemaPrintingContext) {
+        const ctx = {
+            path: [],
+            seen: {},
+            mode: "contextual",
+            printingContext: schemaPrintingContext,
+        };
+        return (0, openapi_pp_js_1.normalizeOpenApiSchema)(this._runtype.schema(ctx), {}, {
+            refPathTemplate: schemaPrintingContext.refTemplate,
+        });
+    }
     describe() {
         const ctx = {
             deps: {},

package/dist/cjs/index.d.ts

@@ -2,5 +2,5 @@ export { printErrors } from "./err.js";
 export { b, buntyped } from "./b.js";
 export { StringFormat, StringFormatExtends, NumberFormat, NumberFormatExtends, RegularDecodeError, UnionDecodeError, DecodeError, ParseOptions, BeffParser, BuildParserFunction, TypeOf, } from "./types.js";
 export { JSONSchema7TypeName, JSONSchema7Type, JSONSchema7Object, JSONSchema7Array, JSONSchema7Version, JSONSchema7Definition, JSONSchema7, } from "./json-schema.js";
-export { createNamedType, overrideNamedType } from "./codegen-v2.js";
+export { createNamedType, overrideNamedType, SchemaPrintingContext } from "./codegen-v2.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,MAAM,GACP,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,MAAM,GACP,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.overrideNamedType = exports.createNamedType = exports.buntyped = exports.b = exports.printErrors = void 0;
+exports.SchemaPrintingContext = exports.overrideNamedType = exports.createNamedType = exports.buntyped = exports.b = exports.printErrors = void 0;
 var err_js_1 = require("./err.js");
 Object.defineProperty(exports, "printErrors", { enumerable: true, get: function () { return err_js_1.printErrors; } });
 var b_js_1 = require("./b.js");
@@ -9,3 +9,4 @@ Object.defineProperty(exports, "buntyped", { enumerable: true, get: function ()
 var codegen_v2_js_1 = require("./codegen-v2.js");
 Object.defineProperty(exports, "createNamedType", { enumerable: true, get: function () { return codegen_v2_js_1.createNamedType; } });
 Object.defineProperty(exports, "overrideNamedType", { enumerable: true, get: function () { return codegen_v2_js_1.overrideNamedType; } });
+Object.defineProperty(exports, "SchemaPrintingContext", { enumerable: true, get: function () { return codegen_v2_js_1.SchemaPrintingContext; } });

package/dist/cjs/json-schema.d.ts

@@ -30,6 +30,12 @@ export type JSONSchema7Version = string;
  * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01
  */
 export type JSONSchema7Definition = JSONSchema7 | boolean;
+export interface OpenAPIDiscriminator {
+    propertyName: string;
+    mapping?: {
+        [key: string]: string;
+    } | undefined;
+}
 export interface JSONSchema7 {
     $id?: string | undefined;
     $ref?: string | undefined;
@@ -125,5 +131,6 @@ export interface JSONSchema7 {
     readOnly?: boolean | undefined;
     writeOnly?: boolean | undefined;
     examples?: JSONSchema7Type | undefined;
+    discriminator?: OpenAPIDiscriminator | undefined;
 }
 //# sourceMappingURL=json-schema.d.ts.map

package/dist/cjs/json-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/json-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/json-schema.ts"],"names":[],"mappings":"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"}

package/dist/cjs/openapi-pp.d.ts

@@ -0,0 +1,13 @@
+import { JSONSchema7Definition } from "./json-schema.js";
+type NormalizeOptions = {
+    refPathTemplate: string;
+};
+/**
+ * Normalizes generated JSON Schema into a shape that is easier for OpenAPI tooling
+ * to consume. The implementation is intentionally split in two phases:
+ * 1. recursively normalize nested child schemas
+ * 2. run object-level transforms on the current schema node
+ */
+export declare const normalizeOpenApiSchema: (schema: JSONSchema7Definition, _definitions: Record<string, JSONSchema7Definition>, _options: NormalizeOptions) => JSONSchema7Definition;
+export {};
+//# sourceMappingURL=openapi-pp.d.ts.map

package/dist/cjs/openapi-pp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-pp.d.ts","sourceRoot":"","sources":["../../src/openapi-pp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,KAAK,gBAAgB,GAAG;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAaF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,qBAAqB,EAC7B,cAAc,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,EACnD,UAAU,gBAAgB,KACzB,qBAEF,CAAC"}

package/dist/cjs/openapi-pp.js

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOpenApiSchema = void 0;
+/**
+ * Applies all object-schema transforms in order. The pipeline makes it explicit
+ * which post-processing operations run at object boundaries and in which order.
+ */
+const runObjectSchemaPipeline = (schema) => {
+    const objectSchemaPipeline = [optionalizeNullUnionProperties];
+    return objectSchemaPipeline.reduce((acc, transform) => transform(acc), schema);
+};
+/**
+ * Normalizes generated JSON Schema into a shape that is easier for OpenAPI tooling
+ * to consume. The implementation is intentionally split in two phases:
+ * 1. recursively normalize nested child schemas
+ * 2. run object-level transforms on the current schema node
+ */
+const normalizeOpenApiSchema = (schema, _definitions, _options) => {
+    return walkDefinition(schema);
+};
+exports.normalizeOpenApiSchema = normalizeOpenApiSchema;
+/**
+ * Recursively walks a schema definition and normalizes every nested schema node.
+ * Booleans are JSON Schema leaf values, so they pass through untouched.
+ */
+const walkDefinition = (definition) => {
+    if (typeof definition === "boolean") {
+        return definition;
+    }
+    const schema = { ...definition };
+    if (schema.properties != null) {
+        const properties = {};
+        for (const [key, value] of Object.entries(schema.properties)) {
+            properties[key] = walkDefinition(value);
+        }
+        schema.properties = properties;
+    }
+    if (schema.items != null) {
+        schema.items = Array.isArray(schema.items)
+            ? schema.items.map((item) => walkDefinition(item))
+            : walkDefinition(schema.items);
+    }
+    if (schema.additionalItems != null) {
+        schema.additionalItems = walkDefinition(schema.additionalItems);
+    }
+    if (schema.additionalProperties != null) {
+        schema.additionalProperties = walkDefinition(schema.additionalProperties);
+    }
+    if (schema.propertyNames != null) {
+        schema.propertyNames = walkDefinition(schema.propertyNames);
+    }
+    if (schema.contains != null) {
+        schema.contains = walkDefinition(schema.contains);
+    }
+    if (schema.not != null) {
+        schema.not = walkDefinition(schema.not);
+    }
+    if (schema.if != null) {
+        schema.if = walkDefinition(schema.if);
+    }
+    if (schema.then != null) {
+        schema.then = walkDefinition(schema.then);
+    }
+    if (schema.else != null) {
+        schema.else = walkDefinition(schema.else);
+    }
+    if (schema.anyOf != null) {
+        schema.anyOf = schema.anyOf.map((item) => walkDefinition(item));
+    }
+    if (schema.oneOf != null) {
+        schema.oneOf = schema.oneOf.map((item) => walkDefinition(item));
+    }
+    if (schema.allOf != null) {
+        schema.allOf = schema.allOf.map((item) => walkDefinition(item));
+    }
+    if (schema.$defs != null) {
+        schema.$defs = walkRecord(schema.$defs);
+    }
+    if (schema.definitions != null) {
+        schema.definitions = walkRecord(schema.definitions);
+    }
+    if (schema.patternProperties != null) {
+        schema.patternProperties = walkRecord(schema.patternProperties);
+    }
+    if (schema.dependencies != null) {
+        const dependencies = {};
+        for (const [key, value] of Object.entries(schema.dependencies)) {
+            dependencies[key] = Array.isArray(value) ? value : walkDefinition(value);
+        }
+        schema.dependencies = dependencies;
+    }
+    return runObjectSchemaPipeline(schema);
+};
+/**
+ * Recursively normalizes every value in a schema-definition map such as
+ * `properties`, `$defs`, `definitions`, or `patternProperties`.
+ */
+const walkRecord = (record) => {
+    const normalized = {};
+    for (const [key, value] of Object.entries(record)) {
+        normalized[key] = walkDefinition(value);
+    }
+    return normalized;
+};
+/**
+ * Rewrites object properties shaped as `T | null` into optional properties.
+ *
+ * This only runs at object-property boundaries. Standalone unions, array items,
+ * and other non-property positions keep their original nullable-union semantics.
+ */
+const optionalizeNullUnionProperties = (schema) => {
+    if (schema.properties == null) {
+        return schema;
+    }
+    const properties = {};
+    const optionalized = new Set();
+    for (const [key, value] of Object.entries(schema.properties)) {
+        const rewrite = removeNullUnionBranch(value);
+        if (rewrite != null) {
+            properties[key] = rewrite;
+            optionalized.add(key);
+        }
+        else {
+            properties[key] = value;
+        }
+    }
+    const required = schema.required?.filter((key) => !optionalized.has(key));
+    return {
+        ...schema,
+        properties,
+        required,
+    };
+};
+/**
+ * If a property schema is a top-level `anyOf`/`oneOf` that includes a `null`
+ * branch plus at least one non-null branch, remove the `null` branch.
+ *
+ * Returning `null` means "leave this property schema unchanged".
+ */
+const removeNullUnionBranch = (definition) => {
+    if (typeof definition === "boolean") {
+        return null;
+    }
+    const variantsKey = definition.anyOf != null ? "anyOf" : definition.oneOf != null ? "oneOf" : null;
+    if (variantsKey == null) {
+        return null;
+    }
+    const variants = definition[variantsKey];
+    if (variants == null) {
+        return null;
+    }
+    const nonNull = variants.filter((variant) => !isNullDefinition(variant));
+    if (nonNull.length === variants.length || nonNull.length === 0) {
+        return null;
+    }
+    if (nonNull.length === 1) {
+        return nonNull[0];
+    }
+    return {
+        ...definition,
+        [variantsKey]: nonNull,
+    };
+};
+/**
+ * Detects a schema branch that represents JSON `null`.
+ */
+const isNullDefinition = (definition) => {
+    return typeof definition !== "boolean" && definition.type === "null";
+};

package/dist/cjs/types.d.ts

@@ -1,5 +1,6 @@
 import type { ZodType } from "zod";
 import { JSONSchema7 } from "./json-schema.js";
+import type { SchemaPrintingContext } from "./codegen-v2.js";
 export type StringFormat<Tag1 extends string> = string & {
     [k in Tag1]: Tag1;
 };
@@ -40,6 +41,7 @@ export type BeffParser<T> = {
     name: string;
     validate(input: any, options?: ParseOptions): input is T;
     schema: () => JSONSchema7;
+    schemaWithContext: (ctx: SchemaPrintingContext) => JSONSchema7;
     describe: () => string;
     hash: () => number;
 };