@beff/client 0.0.128 → 0.0.130

package/dist/tsconfig.types.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/b.ts","../src/codegen-v2.ts","../src/err.ts","../src/hash.ts","../src/index.ts","../src/json-schema.ts","../src/types.ts"],"version":"5.9.3"}
+{"root":["../src/b.ts","../src/codegen-v2.ts","../src/err.ts","../src/hash.ts","../src/index.ts","../src/json-schema.ts","../src/openapi-pp.ts","../src/types.ts"],"version":"5.9.3"}

package/dist/types/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/types/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/types/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/types/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/types/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/types/json-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/json-schema.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,SAAS,GACT,QAAQ,GACR,OAAO,GACP,MAAM,CAAC;AAEX;;;GAGG;AACH,MAAM,MAAM,eAAe,GACvB,MAAM,GACN,MAAM,GACN,OAAO,GACP,iBAAiB,GACjB,gBAAgB,GAChB,IAAI,CAAC;AAGT,MAAM,WAAW,iBAAiB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;CAChC;AAID,MAAM,WAAW,gBAAiB,SAAQ,KAAK,CAAC,eAAe,CAAC;CAAG;AAEnE;;;;;;;;;;GAUG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,OAAO,CAAC;AAC1D,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;;OAGG;IACH,KAAK,CAAC,EACF;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACtC,GACD,SAAS,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC/D,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACrC,KAAK,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,KAAK,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,GAAG,SAAS,CAAC;IACpE,eAAe,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAE7C;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EACP;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACtC,GACD,SAAS,CAAC;IACd,iBAAiB,CAAC,EACd;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACtC,GACD,SAAS,CAAC;IACd,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,YAAY,CAAC,EACT;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,GAAG,MAAM,EAAE,CAAC;KACjD,GACD,SAAS,CAAC;IACd,aAAa,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAElD;;OAEG;IACH,EAAE,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACvC,IAAI,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzC,IAAI,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAEzC;;OAEG;IACH,KAAK,CAAC,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,CAAC,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,CAAC,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;IAC5C,GAAG,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAExC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC;;OAEG;IACH,WAAW,CAAC,EACR;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACtC,GACD,SAAS,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CACxC"}
+{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/json-schema.ts"],"names":[],"mappings":"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"}

package/dist/types/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/types/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/types/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;
 };

package/dist/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,MAAM,IAAI,MAAM,GAAG;KAAG,CAAC,IAAI,IAAI,GAAG,IAAI;CAAE,CAAC;AAE/E,MAAM,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,SAAS,MAAM,IAAI,IAAI,GAAG;KACpE,CAAC,IAAI,OAAO,GAAG,OAAO;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,MAAM,IAAI,MAAM,GAAG;KAAG,CAAC,IAAI,IAAI,GAAG,IAAI;CAAE,CAAC;AAE/E,MAAM,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,SAAS,MAAM,IAAI,IAAI,GAAG;KACpE,CAAC,IAAI,OAAO,GAAG,OAAO;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,IAAI,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG,gBAAgB,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG;IACzB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAC1B,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY,KAAK,CAAC,CAAC;IACjD,SAAS,EAAE,CACT,KAAK,EAAE,GAAG,EACV,OAAO,CAAC,EAAE,YAAY,KACnB;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC;IAC5E,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,KAAK,IAAI,CAAC,CAAC;IACzD,MAAM,EAAE,MAAM,WAAW,CAAC;IAC1B,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,OAAO,CAAC,CAAC,IAAI;KACf,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;IAC3C,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;KAAE,CAAC;IAC9D,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;KAAE,CAAC;CAC/D,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAEjB,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beff/client",
-  "version": "0.0.128",
+  "version": "0.0.130",
   "description": "",
   "main": "dist/cjs/index.js",
   "exports": {
@@ -21,15 +21,17 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "^0.0.128"
+    "@beff/cli": "^0.0.130"
   },
   "peerDependencies": {
     "zod": "^3.23.5"
   },
   "devDependencies": {
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "vitest": "^0.34.4"
   },
   "scripts": {
-    "build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json"
+    "build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
+    "test": "vitest --run --update"
   }
 }

package/tests/openapi-pp.test.ts

@@ -0,0 +1,217 @@
+import { describe, expect, it } from "vitest";
+import { JSONSchema7Definition } from "../src/json-schema.js";
+import { normalizeOpenApiSchema } from "../src/openapi-pp.js";
+import {
+  AnyOfDiscriminatedRuntype,
+  BaseRefRuntype,
+  ConstRuntype,
+  ObjectRuntype,
+  SchemaPrintingContext,
+  TypeofRuntype,
+} from "../src/codegen-v2.js";
+
+const normalize = (schema: JSONSchema7Definition): JSONSchema7Definition => {
+  return normalizeOpenApiSchema(schema, {}, { refPathTemplate: "#/components/schemas/{name}" });
+};
+
+describe("normalizeOpenApiSchema", () => {
+  it("rewrites nullable object properties into optional properties", () => {
+    expect(
+      normalize({
+        type: "object",
+        properties: {
+          workerType: { type: "string" },
+          hostname: {
+            anyOf: [{ type: "null" }, { type: "string" }],
+          },
+          modelBackend: {
+            anyOf: [{ type: "string" }, { type: "null" }],
+          },
+        },
+        required: ["workerType", "hostname", "modelBackend"],
+        additionalProperties: false,
+      }),
+    ).toEqual({
+      type: "object",
+      properties: {
+        workerType: { type: "string" },
+        hostname: { type: "string" },
+        modelBackend: { type: "string" },
+      },
+      required: ["workerType"],
+      additionalProperties: false,
+    });
+  });
+
+  it("preserves explicit null-only properties", () => {
+    expect(
+      normalize({
+        type: "object",
+        properties: {
+          onlyNull: { type: "null" },
+        },
+        required: ["onlyNull"],
+        additionalProperties: false,
+      }),
+    ).toEqual({
+      type: "object",
+      properties: {
+        onlyNull: { type: "null" },
+      },
+      required: ["onlyNull"],
+      additionalProperties: false,
+    });
+  });
+
+  it("does not rewrite standalone nullable unions outside object properties", () => {
+    expect(
+      normalize({
+        anyOf: [{ type: "null" }, { type: "string" }],
+      }),
+    ).toEqual({
+      anyOf: [{ type: "null" }, { type: "string" }],
+    });
+  });
+
+  it("preserves explicit discriminators on discriminated unions", () => {
+    const named = {
+      CronSource: new ObjectRuntype(
+        {
+          type: new ConstRuntype("CRON"),
+          schedule: new TypeofRuntype("string"),
+        },
+        [],
+      ),
+      EventSource: new ObjectRuntype(
+        {
+          type: new ConstRuntype("EVENT"),
+          eventName: new TypeofRuntype("string"),
+        },
+        [],
+      ),
+    };
+
+    class TestRefRuntype extends BaseRefRuntype {
+      getNamedRuntypes() {
+        return named;
+      }
+    }
+
+    const cron = new TestRefRuntype("CronSource");
+    const event = new TestRefRuntype("EventSource");
+    const printingContext = new SchemaPrintingContext({
+      refPathTemplate: "#/components/schemas/{name}",
+      definitionContainerKey: null,
+    });
+
+    const schema = normalize(
+      new AnyOfDiscriminatedRuntype(
+        [cron, event],
+        "type",
+        {
+          EVENT: event,
+          CRON: cron,
+        },
+        {
+          EVENT: event,
+          CRON: cron,
+        },
+      ).schema({
+        path: [],
+        seen: {},
+        mode: "contextual",
+        printingContext,
+      }),
+    );
+
+    expect(schema).toMatchInlineSnapshot(`
+      {
+        "discriminator": {
+          "mapping": {
+            "CRON": "#/components/schemas/CronSource",
+            "EVENT": "#/components/schemas/EventSource",
+          },
+          "propertyName": "type",
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EventSource",
+          },
+          {
+            "$ref": "#/components/schemas/CronSource",
+          },
+        ],
+        "type": "object",
+      }
+    `);
+  });
+
+  it("creates synthetic refs for inline discriminated union variants", () => {
+    const cron = new ObjectRuntype(
+      {
+        type: new ConstRuntype("CRON"),
+        schedule: new TypeofRuntype("string"),
+      },
+      [],
+    );
+    const event = new ObjectRuntype(
+      {
+        type: new ConstRuntype("EVENT"),
+        eventName: new TypeofRuntype("string"),
+      },
+      [],
+    );
+    const printingContext = new SchemaPrintingContext({
+      refPathTemplate: "#/components/schemas/{name}",
+      definitionContainerKey: null,
+    });
+
+    const schema = normalize(
+      new AnyOfDiscriminatedRuntype(
+        [cron, event],
+        "type",
+        {
+          EVENT: event,
+          CRON: cron,
+        },
+        {
+          EVENT: event,
+          CRON: cron,
+        },
+      ).schema({
+        path: [],
+        seen: {},
+        mode: "contextual",
+        printingContext,
+      }),
+    );
+
+    expect(schema).toMatchInlineSnapshot(`
+      {
+        "discriminator": {
+          "mapping": {
+            "CRON": "#/components/schemas/DiscriminatedTypeCRON1000470817",
+            "EVENT": "#/components/schemas/DiscriminatedTypeEVENT1000470817",
+          },
+          "propertyName": "type",
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/DiscriminatedTypeEVENT1000470817",
+          },
+          {
+            "$ref": "#/components/schemas/DiscriminatedTypeCRON1000470817",
+          },
+        ],
+        "type": "object",
+      }
+    `);
+
+    expect(Object.keys(printingContext.exportDefinitions())).toMatchInlineSnapshot(`
+      [
+        "DiscriminatedTypeEVENT1000470817",
+        "DiscriminatedTypeCRON1000470817",
+      ]
+    `);
+  });
+});