openapi-typesafe 1.0.0-rc.0 → 1.0.0-rc.1

package/dist/api/discriminator-enum.mjs

@@ -31,6 +31,30 @@ function patchObjectSchema(schema, patch) {
 function isObjectSchema(schema) {
   return typeof schema === "object" && schema !== null && "type" in schema && schema.type === "object";
 }
+function listedValues(property) {
+  if (typeof property !== "object" || property === null) {
+    return null;
+  }
+  const { const: constant, enum: values } = property;
+  if (constant !== void 0) {
+    return [constant];
+  }
+  return Array.isArray(values) ? values : null;
+}
+function requiresValues(schema, name, values) {
+  if (typeof schema !== "object" || schema === null || "$ref" in schema) {
+    return false;
+  }
+  const { required, properties } = schema;
+  const listed = listedValues(properties?.[name]);
+  return Boolean(required?.includes(name)) && listed !== null && listed.length === values.length && values.every((value) => listed.includes(value));
+}
+function declaresValues(schema, patch) {
+  const name = patch.discriminator.propertyName;
+  return [schema, ...schema?.allOf ?? []].some(
+    (item) => requiresValues(item, name, patch.values)
+  );
+}
 function addEnumProperty(schema, patch) {
   if (schema?.allOf) {
     return patchAllOf(schema.allOf, patch);
@@ -38,5 +62,5 @@ function addEnumProperty(schema, patch) {
   return isObjectSchema(schema) ? patchObjectSchema(schema, patch) : null;
 }
 
-export { addEnumProperty };
+export { addEnumProperty, declaresValues };
 //# sourceMappingURL=discriminator-enum.mjs.map

package/dist/api/discriminator-enum.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"discriminator-enum.mjs","sources":["../../src/api/discriminator-enum.ts"],"sourcesContent":["import type {\n  DiscriminatorObject,\n  ObjectSubtype,\n  ReferenceObject,\n  SchemaObject,\n} from \"../types.js\";\n\n/**\n * The in-place patch of the discriminator pre-pass: a mapped schema gets a required enum property\n * with its discriminator values, so that TypeScript can narrow the generated union.\n */\n\n/** One mapped schema to patch: `ref` is the schema; `discriminatorRef` owns the discriminator. */\nexport interface EnumPatch {\n  readonly ref: string;\n  readonly values: string[];\n  readonly discriminator: DiscriminatorObject;\n  readonly discriminatorRef: string;\n}\n\nfunction discriminatorEnum(values: string[], previous?: SchemaObject): SchemaObject {\n  return {\n    type: \"string\",\n    enum: values,\n    description: previous?.description\n      ? `${previous.description} (enum property replaced by openapi-typesafe)`\n      : \"discriminator enum property added by openapi-typesafe\",\n  };\n}\n\n/** An `allOf` schema gets one more item that holds the required enum property. */\nfunction patchAllOf(allOf: (SchemaObject | ReferenceObject)[], patch: EnumPatch): SchemaObject {\n  const added = discriminatorEnum(patch.values);\n  allOf.push({\n    type: \"object\",\n    required: [patch.discriminator.propertyName],\n    properties: { [patch.discriminator.propertyName]: added },\n  });\n  return added;\n}\n\n/** An object schema gets the enum property, which is always required, added or replaced. */\nfunction patchObjectSchema(schema: SchemaObject & ObjectSubtype, patch: EnumPatch): SchemaObject {\n  const name = patch.discriminator.propertyName;\n  if (!schema.properties) {\n    schema.properties = {};\n  }\n  if (!schema.required) {\n    schema.required = [name];\n  } else if (!schema.required.includes(name)) {\n    schema.required.push(name);\n  }\n  const added = discriminatorEnum(patch.values, schema.properties[name] as SchemaObject);\n  schema.properties[name] = added;\n  return added;\n}\n\nfunction isObjectSchema(schema: unknown): schema is SchemaObject & ObjectSubtype {\n  return (\n    typeof schema === \"object\" && schema !== null && \"type\" in schema && schema.type === \"object\"\n  );\n}\n\n/**\n * Add or replace the enum property in `schema`, an `allOf` or object schema. Returns the added\n * enum schema, or null for another kind of schema, which is left as it is.\n */\nexport function addEnumProperty(\n  schema: SchemaObject | undefined,\n  patch: EnumPatch,\n): SchemaObject | null {\n  if (schema?.allOf) {\n    return patchAllOf(schema.allOf, patch);\n  }\n  return isObjectSchema(schema) ? patchObjectSchema(schema, patch) : null;\n}\n"],"names":[],"mappings":"AAoBA,SAAS,iBAAA,CAAkB,QAAkB,QAAA,EAAuC;AAClF,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,QAAA;AAAA,IACN,IAAA,EAAM,MAAA;AAAA,IACN,aAAa,QAAA,EAAU,WAAA,GACnB,CAAA,EAAG,QAAA,CAAS,WAAW,CAAA,6CAAA,CAAA,GACvB;AAAA,GACN;AACF;AAGA,SAAS,UAAA,CAAW,OAA2C,KAAA,EAAgC;AAC7F,EAAA,MAAM,KAAA,GAAQ,iBAAA,CAAkB,KAAA,CAAM,MAAM,CAAA;AAC5C,EAAA,KAAA,CAAM,IAAA,CAAK;AAAA,IACT,IAAA,EAAM,QAAA;AAAA,IACN,QAAA,EAAU,CAAC,KAAA,CAAM,aAAA,CAAc,YAAY,CAAA;AAAA,IAC3C,YAAY,EAAE,CAAC,MAAM,aAAA,CAAc,YAAY,GAAG,KAAA;AAAM,GACzD,CAAA;AACD,EAAA,OAAO,KAAA;AACT;AAGA,SAAS,iBAAA,CAAkB,QAAsC,KAAA,EAAgC;AAC/F,EAAA,MAAM,IAAA,GAAO,MAAM,aAAA,CAAc,YAAA;AACjC,EAAA,IAAI,CAAC,OAAO,UAAA,EAAY;AACtB,IAAA,MAAA,CAAO,aAAa,EAAC;AAAA,EACvB;AACA,EAAA,IAAI,CAAC,OAAO,QAAA,EAAU;AACpB,IAAA,MAAA,CAAO,QAAA,GAAW,CAAC,IAAI,CAAA;AAAA,EACzB,WAAW,CAAC,MAAA,CAAO,QAAA,CAAS,QAAA,CAAS,IAAI,CAAA,EAAG;AAC1C,IAAA,MAAA,CAAO,QAAA,CAAS,KAAK,IAAI,CAAA;AAAA,EAC3B;AACA,EAAA,MAAM,QAAQ,iBAAA,CAAkB,KAAA,CAAM,QAAQ,MAAA,CAAO,UAAA,CAAW,IAAI,CAAiB,CAAA;AACrF,EAAA,MAAA,CAAO,UAAA,CAAW,IAAI,CAAA,GAAI,KAAA;AAC1B,EAAA,OAAO,KAAA;AACT;AAEA,SAAS,eAAe,MAAA,EAAyD;AAC/E,EAAA,OACE,OAAO,WAAW,QAAA,IAAY,MAAA,KAAW,QAAQ,MAAA,IAAU,MAAA,IAAU,OAAO,IAAA,KAAS,QAAA;AAEzF;AAMO,SAAS,eAAA,CACd,QACA,KAAA,EACqB;AACrB,EAAA,IAAI,QAAQ,KAAA,EAAO;AACjB,IAAA,OAAO,UAAA,CAAW,MAAA,CAAO,KAAA,EAAO,KAAK,CAAA;AAAA,EACvC;AACA,EAAA,OAAO,eAAe,MAAM,CAAA,GAAI,iBAAA,CAAkB,MAAA,EAAQ,KAAK,CAAA,GAAI,IAAA;AACrE;;"}
+{"version":3,"file":"discriminator-enum.mjs","sources":["../../src/api/discriminator-enum.ts"],"sourcesContent":["import type {\n  DiscriminatorObject,\n  ObjectSubtype,\n  ReferenceObject,\n  SchemaObject,\n} from \"../types.js\";\n\n/**\n * The in-place patch of the discriminator pre-pass: a mapped schema gets a required enum property\n * with its discriminator values, so that TypeScript can narrow the generated union.\n */\n\n/** One mapped schema to patch: `ref` is the schema; `discriminatorRef` owns the discriminator. */\nexport interface EnumPatch {\n  readonly ref: string;\n  readonly values: string[];\n  readonly discriminator: DiscriminatorObject;\n  readonly discriminatorRef: string;\n}\n\nfunction discriminatorEnum(values: string[], previous?: SchemaObject): SchemaObject {\n  return {\n    type: \"string\",\n    enum: values,\n    description: previous?.description\n      ? `${previous.description} (enum property replaced by openapi-typesafe)`\n      : \"discriminator enum property added by openapi-typesafe\",\n  };\n}\n\n/** An `allOf` schema gets one more item that holds the required enum property. */\nfunction patchAllOf(allOf: (SchemaObject | ReferenceObject)[], patch: EnumPatch): SchemaObject {\n  const added = discriminatorEnum(patch.values);\n  allOf.push({\n    type: \"object\",\n    required: [patch.discriminator.propertyName],\n    properties: { [patch.discriminator.propertyName]: added },\n  });\n  return added;\n}\n\n/** An object schema gets the enum property, which is always required, added or replaced. */\nfunction patchObjectSchema(schema: SchemaObject & ObjectSubtype, patch: EnumPatch): SchemaObject {\n  const name = patch.discriminator.propertyName;\n  if (!schema.properties) {\n    schema.properties = {};\n  }\n  if (!schema.required) {\n    schema.required = [name];\n  } else if (!schema.required.includes(name)) {\n    schema.required.push(name);\n  }\n  const added = discriminatorEnum(patch.values, schema.properties[name] as SchemaObject);\n  schema.properties[name] = added;\n  return added;\n}\n\nfunction isObjectSchema(schema: unknown): schema is SchemaObject & ObjectSubtype {\n  return (\n    typeof schema === \"object\" && schema !== null && \"type\" in schema && schema.type === \"object\"\n  );\n}\n\n/** The values a property schema allows, from `const` or `enum`; null when it lists none. */\nfunction listedValues(property: unknown): readonly unknown[] | null {\n  if (typeof property !== \"object\" || property === null) {\n    return null;\n  }\n  const { const: constant, enum: values } = property as SchemaObject;\n  if (constant !== undefined) {\n    return [constant];\n  }\n  return Array.isArray(values) ? values : null;\n}\n\n/** Whether one schema object requires the property and allows exactly the values. */\nfunction requiresValues(schema: unknown, name: string, values: readonly string[]): boolean {\n  if (typeof schema !== \"object\" || schema === null || \"$ref\" in schema) {\n    return false;\n  }\n  const { required, properties } = schema as SchemaObject & ObjectSubtype;\n  const listed = listedValues(properties?.[name]);\n  return (\n    Boolean(required?.includes(name)) &&\n    listed !== null &&\n    listed.length === values.length &&\n    values.every((value) => listed.includes(value))\n  );\n}\n\n/**\n * Whether `schema`, or an inline `allOf` item of it, already requires the discriminator property\n * with exactly the patch's values (the `discriminator-values` fix). Then a patch would\n * only repeat it (#2124).\n */\nexport function declaresValues(schema: SchemaObject | undefined, patch: EnumPatch): boolean {\n  const name = patch.discriminator.propertyName;\n  return [schema, ...(schema?.allOf ?? [])].some((item) =>\n    requiresValues(item, name, patch.values),\n  );\n}\n\n/**\n * Add or replace the enum property in `schema`, an `allOf` or object schema. Returns the added\n * enum schema, or null for another kind of schema, which is left as it is.\n */\nexport function addEnumProperty(\n  schema: SchemaObject | undefined,\n  patch: EnumPatch,\n): SchemaObject | null {\n  if (schema?.allOf) {\n    return patchAllOf(schema.allOf, patch);\n  }\n  return isObjectSchema(schema) ? patchObjectSchema(schema, patch) : null;\n}\n"],"names":[],"mappings":"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"}

package/dist/api/discriminator-other-owners.cjs

@@ -0,0 +1,67 @@
+'use strict';
+
+const discriminatorPatch = require('./discriminator-patch.cjs');
+const documentRefs = require('./document-refs.cjs');
+
+function allOfRefs(state, ref) {
+  const { silent, logger } = state;
+  const schema = documentRefs.resolveDocumentRef(state.schema, ref, { silent, logger });
+  const items = schema?.allOf ?? [];
+  return items.flatMap(
+    (item) => "$ref" in item && typeof item.$ref === "string" ? [item.$ref] : []
+  );
+}
+function otherOwners(state, parentRef) {
+  const own = state.objects[parentRef]?.propertyName;
+  const found = /* @__PURE__ */ new Map();
+  const visited = /* @__PURE__ */ new Set();
+  const queue = [parentRef];
+  for (let ref = queue.shift(); ref !== void 0; ref = queue.shift()) {
+    if (visited.has(ref)) {
+      continue;
+    }
+    visited.add(ref);
+    const discriminator = state.owners.has(ref) ? state.objects[ref] : void 0;
+    const name = discriminator?.propertyName;
+    if (discriminator && name !== void 0 && name !== own && !found.has(name)) {
+      found.set(name, { discriminator, ownerRef: ref });
+    }
+    queue.push(...allOfRefs(state, ref));
+  }
+  return [...found.values()];
+}
+function recordOtherProperty(state, ref, propertyName) {
+  const names = state.otherProperties[ref] ?? [];
+  if (!names.includes(propertyName)) {
+    names.push(propertyName);
+  }
+  state.otherProperties[ref] = names;
+}
+function inheritOtherOwners(state, parentRef, ref) {
+  const childProperty = state.objects[ref]?.propertyName;
+  for (const { discriminator, ownerRef } of otherOwners(state, parentRef)) {
+    if (discriminator.propertyName === childProperty) {
+      continue;
+    }
+    recordOtherProperty(state, ref, discriminator.propertyName);
+    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => target === ref).map(([value]) => value);
+    const name = ref.slice(ref.lastIndexOf("/") + 1);
+    const patch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };
+    if (mapped.length > 0) {
+      discriminatorPatch.patchDiscriminatorEnum(state, patch);
+    } else {
+      state.otherInferredPatches.push({ ...patch, values: [name] });
+    }
+  }
+}
+function applyOtherInferredPatches(state, mapped) {
+  for (const patch of state.otherInferredPatches) {
+    if (!mapped.has(discriminatorPatch.enumKey(patch))) {
+      discriminatorPatch.patchDiscriminatorEnum(state, patch);
+    }
+  }
+}
+
+exports.applyOtherInferredPatches = applyOtherInferredPatches;
+exports.inheritOtherOwners = inheritOtherOwners;
+//# sourceMappingURL=discriminator-other-owners.cjs.map

package/dist/api/discriminator-other-owners.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminator-other-owners.cjs","sources":["../../src/api/discriminator-other-owners.ts"],"sourcesContent":["import type { DiscriminatorObject, ReferenceObject, SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\nimport { enumKey, patchDiscriminatorEnum, type ScanState } from \"./discriminator-patch.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\n\n/**\n * The `discriminator-values` fix: a schema inherits one discriminator per property. A schema that\n * owns a discriminator keeps its own (#2200), so the scan does not record the one it inherits for\n * another property (`Content` owns `subtype` and `allOf`s `Element`, which owns `contentType`).\n * Its members (`Video`) still get a value of that property, found here from the owners above.\n */\n\n/** A discriminator and the schema that defines it. */\ninterface OtherOwner {\n  readonly discriminator: DiscriminatorObject;\n  readonly ownerRef: string;\n}\n\n/** The `$ref`s of a schema's `allOf` items. */\nfunction allOfRefs(state: ScanState, ref: string): string[] {\n  const { silent, logger } = state;\n  const schema = resolveDocumentRef<SchemaObject>(state.schema, ref, { silent, logger });\n  const items = (schema?.allOf ?? []) as (SchemaObject | ReferenceObject)[];\n  return items.flatMap((item) =>\n    \"$ref\" in item && typeof item.$ref === \"string\" ? [item.$ref] : [],\n  );\n}\n\n/**\n * The owners' discriminators that the schema at `parentRef` and its `allOf` parents define, the\n * nearest one per property, except the property of `parentRef`'s own discriminator.\n */\nfunction otherOwners(state: ScanState, parentRef: string): OtherOwner[] {\n  const own = state.objects[parentRef]?.propertyName;\n  const found = new Map<string, OtherOwner>();\n  const visited = new Set<string>();\n  const queue = [parentRef];\n  for (let ref = queue.shift(); ref !== undefined; ref = queue.shift()) {\n    if (visited.has(ref)) {\n      continue;\n    }\n    visited.add(ref);\n    const discriminator = state.owners.has(ref) ? state.objects[ref] : undefined;\n    const name = discriminator?.propertyName;\n    if (discriminator && name !== undefined && name !== own && !found.has(name)) {\n      found.set(name, { discriminator, ownerRef: ref });\n    }\n    queue.push(...allOfRefs(state, ref));\n  }\n  return [...found.values()];\n}\n\n/**\n * The child redefines this property, so its `allOf` items omit it: a parent may have a value of\n * its own, as `Content` has when `Element`'s mapping names it.\n */\nfunction recordOtherProperty(state: ScanState, ref: string, propertyName: string): void {\n  const names = state.otherProperties[ref] ?? [];\n  if (!names.includes(propertyName)) {\n    names.push(propertyName);\n  }\n  state.otherProperties[ref] = names;\n}\n\n/**\n * The child at `ref` of the schema at `parentRef` gets a value of each other property: a mapped\n * one at once, else its schema name after both passes, where no mapping gives one. The schema's\n * own discriminator property is still added, so these patches do not mark it handled.\n */\nexport function inheritOtherOwners(state: ScanState, parentRef: string, ref: string): void {\n  const childProperty = state.objects[ref]?.propertyName;\n  for (const { discriminator, ownerRef } of otherOwners(state, parentRef)) {\n    if (discriminator.propertyName === childProperty) {\n      continue;\n    }\n    recordOtherProperty(state, ref, discriminator.propertyName);\n    const mapped = Object.entries(discriminator.mapping ?? {})\n      .filter(([, target]) => target === ref)\n      .map(([value]) => value);\n    const name = ref.slice(ref.lastIndexOf(\"/\") + 1);\n    const patch: EnumPatch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };\n    if (mapped.length > 0) {\n      patchDiscriminatorEnum(state, patch);\n    } else {\n      state.otherInferredPatches.push({ ...patch, values: [name] });\n    }\n  }\n}\n\n/** The deferred schema-name values of other properties; see `inheritOtherOwners`. */\nexport function applyOtherInferredPatches(state: ScanState, mapped: ReadonlySet<string>): void {\n  for (const patch of state.otherInferredPatches) {\n    if (!mapped.has(enumKey(patch))) {\n      patchDiscriminatorEnum(state, patch);\n    }\n  }\n}\n"],"names":["resolveDocumentRef","patchDiscriminatorEnum","enumKey"],"mappings":"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"}

package/dist/api/discriminator-other-owners.mjs

@@ -0,0 +1,64 @@
+import { enumKey, patchDiscriminatorEnum } from './discriminator-patch.mjs';
+import { resolveDocumentRef } from './document-refs.mjs';
+
+function allOfRefs(state, ref) {
+  const { silent, logger } = state;
+  const schema = resolveDocumentRef(state.schema, ref, { silent, logger });
+  const items = schema?.allOf ?? [];
+  return items.flatMap(
+    (item) => "$ref" in item && typeof item.$ref === "string" ? [item.$ref] : []
+  );
+}
+function otherOwners(state, parentRef) {
+  const own = state.objects[parentRef]?.propertyName;
+  const found = /* @__PURE__ */ new Map();
+  const visited = /* @__PURE__ */ new Set();
+  const queue = [parentRef];
+  for (let ref = queue.shift(); ref !== void 0; ref = queue.shift()) {
+    if (visited.has(ref)) {
+      continue;
+    }
+    visited.add(ref);
+    const discriminator = state.owners.has(ref) ? state.objects[ref] : void 0;
+    const name = discriminator?.propertyName;
+    if (discriminator && name !== void 0 && name !== own && !found.has(name)) {
+      found.set(name, { discriminator, ownerRef: ref });
+    }
+    queue.push(...allOfRefs(state, ref));
+  }
+  return [...found.values()];
+}
+function recordOtherProperty(state, ref, propertyName) {
+  const names = state.otherProperties[ref] ?? [];
+  if (!names.includes(propertyName)) {
+    names.push(propertyName);
+  }
+  state.otherProperties[ref] = names;
+}
+function inheritOtherOwners(state, parentRef, ref) {
+  const childProperty = state.objects[ref]?.propertyName;
+  for (const { discriminator, ownerRef } of otherOwners(state, parentRef)) {
+    if (discriminator.propertyName === childProperty) {
+      continue;
+    }
+    recordOtherProperty(state, ref, discriminator.propertyName);
+    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => target === ref).map(([value]) => value);
+    const name = ref.slice(ref.lastIndexOf("/") + 1);
+    const patch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };
+    if (mapped.length > 0) {
+      patchDiscriminatorEnum(state, patch);
+    } else {
+      state.otherInferredPatches.push({ ...patch, values: [name] });
+    }
+  }
+}
+function applyOtherInferredPatches(state, mapped) {
+  for (const patch of state.otherInferredPatches) {
+    if (!mapped.has(enumKey(patch))) {
+      patchDiscriminatorEnum(state, patch);
+    }
+  }
+}
+
+export { applyOtherInferredPatches, inheritOtherOwners };
+//# sourceMappingURL=discriminator-other-owners.mjs.map

package/dist/api/discriminator-other-owners.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminator-other-owners.mjs","sources":["../../src/api/discriminator-other-owners.ts"],"sourcesContent":["import type { DiscriminatorObject, ReferenceObject, SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\nimport { enumKey, patchDiscriminatorEnum, type ScanState } from \"./discriminator-patch.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\n\n/**\n * The `discriminator-values` fix: a schema inherits one discriminator per property. A schema that\n * owns a discriminator keeps its own (#2200), so the scan does not record the one it inherits for\n * another property (`Content` owns `subtype` and `allOf`s `Element`, which owns `contentType`).\n * Its members (`Video`) still get a value of that property, found here from the owners above.\n */\n\n/** A discriminator and the schema that defines it. */\ninterface OtherOwner {\n  readonly discriminator: DiscriminatorObject;\n  readonly ownerRef: string;\n}\n\n/** The `$ref`s of a schema's `allOf` items. */\nfunction allOfRefs(state: ScanState, ref: string): string[] {\n  const { silent, logger } = state;\n  const schema = resolveDocumentRef<SchemaObject>(state.schema, ref, { silent, logger });\n  const items = (schema?.allOf ?? []) as (SchemaObject | ReferenceObject)[];\n  return items.flatMap((item) =>\n    \"$ref\" in item && typeof item.$ref === \"string\" ? [item.$ref] : [],\n  );\n}\n\n/**\n * The owners' discriminators that the schema at `parentRef` and its `allOf` parents define, the\n * nearest one per property, except the property of `parentRef`'s own discriminator.\n */\nfunction otherOwners(state: ScanState, parentRef: string): OtherOwner[] {\n  const own = state.objects[parentRef]?.propertyName;\n  const found = new Map<string, OtherOwner>();\n  const visited = new Set<string>();\n  const queue = [parentRef];\n  for (let ref = queue.shift(); ref !== undefined; ref = queue.shift()) {\n    if (visited.has(ref)) {\n      continue;\n    }\n    visited.add(ref);\n    const discriminator = state.owners.has(ref) ? state.objects[ref] : undefined;\n    const name = discriminator?.propertyName;\n    if (discriminator && name !== undefined && name !== own && !found.has(name)) {\n      found.set(name, { discriminator, ownerRef: ref });\n    }\n    queue.push(...allOfRefs(state, ref));\n  }\n  return [...found.values()];\n}\n\n/**\n * The child redefines this property, so its `allOf` items omit it: a parent may have a value of\n * its own, as `Content` has when `Element`'s mapping names it.\n */\nfunction recordOtherProperty(state: ScanState, ref: string, propertyName: string): void {\n  const names = state.otherProperties[ref] ?? [];\n  if (!names.includes(propertyName)) {\n    names.push(propertyName);\n  }\n  state.otherProperties[ref] = names;\n}\n\n/**\n * The child at `ref` of the schema at `parentRef` gets a value of each other property: a mapped\n * one at once, else its schema name after both passes, where no mapping gives one. The schema's\n * own discriminator property is still added, so these patches do not mark it handled.\n */\nexport function inheritOtherOwners(state: ScanState, parentRef: string, ref: string): void {\n  const childProperty = state.objects[ref]?.propertyName;\n  for (const { discriminator, ownerRef } of otherOwners(state, parentRef)) {\n    if (discriminator.propertyName === childProperty) {\n      continue;\n    }\n    recordOtherProperty(state, ref, discriminator.propertyName);\n    const mapped = Object.entries(discriminator.mapping ?? {})\n      .filter(([, target]) => target === ref)\n      .map(([value]) => value);\n    const name = ref.slice(ref.lastIndexOf(\"/\") + 1);\n    const patch: EnumPatch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };\n    if (mapped.length > 0) {\n      patchDiscriminatorEnum(state, patch);\n    } else {\n      state.otherInferredPatches.push({ ...patch, values: [name] });\n    }\n  }\n}\n\n/** The deferred schema-name values of other properties; see `inheritOtherOwners`. */\nexport function applyOtherInferredPatches(state: ScanState, mapped: ReadonlySet<string>): void {\n  for (const patch of state.otherInferredPatches) {\n    if (!mapped.has(enumKey(patch))) {\n      patchDiscriminatorEnum(state, patch);\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/api/discriminator-patch.cjs

@@ -0,0 +1,88 @@
+'use strict';
+
+const outputFixes = require('../domain/output-fixes.cjs');
+const discriminatorEnum = require('./discriminator-enum.cjs');
+const discriminatorEnumParent = require('./discriminator-enum-parent.cjs');
+const documentRefs = require('./document-refs.cjs');
+
+function mergesValues(state) {
+  return state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES);
+}
+function patchedSchema(state, patch) {
+  const { silent, logger } = state;
+  return documentRefs.resolveDocumentRef(state.schema, patch.ref, { silent, logger });
+}
+function isDeclared(state, patch) {
+  return state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES) && discriminatorEnum.declaresValues(patchedSchema(state, patch), patch);
+}
+function recordEnumParent(state, owner, key) {
+  if (!state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES)) {
+    return;
+  }
+  const { silent, logger } = state;
+  const parent = discriminatorEnumParent.enumParentOf(
+    owner,
+    (ref) => documentRefs.resolveDocumentRef(state.schema, ref, { silent, logger })
+  );
+  if (parent !== void 0) {
+    state.enumParents.set(key, parent);
+  }
+}
+function addDiscriminatorEnum(state, patch) {
+  const added = discriminatorEnum.addEnumProperty(patchedSchema(state, patch), patch);
+  if (added === null) {
+    warnInvalidMapping(patch, state.logger);
+  } else {
+    recordEnumParent(state, patch, added);
+  }
+  return added;
+}
+function enumKey(patch) {
+  return `${patch.ref}
+${patch.discriminator.propertyName}`;
+}
+function mergeIntoPatchedEnum(state, key, values) {
+  const patched = state.patchedEnums.get(key);
+  if (patched === void 0) {
+    return false;
+  }
+  const merged = patched.enum;
+  merged.push(...values.filter((value) => !merged.includes(value)));
+  return true;
+}
+function patchDiscriminatorEnum(state, patch) {
+  if (isDeclared(state, patch)) {
+    state.declaredKeys.add(enumKey(patch));
+    return true;
+  }
+  if (!mergesValues(state)) {
+    return addDiscriminatorEnum(state, patch) !== null;
+  }
+  const key = enumKey(patch);
+  if (mergeIntoPatchedEnum(state, key, patch.values)) {
+    return true;
+  }
+  const added = addDiscriminatorEnum(state, patch);
+  if (added !== null) {
+    state.patchedEnums.set(key, added);
+  }
+  return added !== null;
+}
+function markHandled(state, ref) {
+  if (!state.refsHandled.includes(ref)) {
+    state.refsHandled.push(ref);
+  }
+}
+function warnInvalidMapping(patch, logger) {
+  const mapped = `${patch.ref} => ${patch.values.join(", ")}`;
+  logger.warn(
+    `Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): ${mapped} (Discriminator: ${patch.discriminatorRef})`
+  );
+}
+
+exports.enumKey = enumKey;
+exports.markHandled = markHandled;
+exports.mergesValues = mergesValues;
+exports.patchDiscriminatorEnum = patchDiscriminatorEnum;
+exports.recordEnumParent = recordEnumParent;
+//# sourceMappingURL=discriminator-patch.cjs.map

package/dist/api/discriminator-patch.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminator-patch.cjs","sources":["../../src/api/discriminator-patch.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport { OutputFix } from \"../domain/output-fixes.js\";\nimport type { DiscriminatorObject, OpenAPI3, SchemaObject } from \"../types.js\";\nimport { addEnumProperty, declaresValues, type EnumPatch } from \"./discriminator-enum.js\";\nimport {\n  type DiscriminatorOwner,\n  type EnumParent,\n  enumParentOf,\n} from \"./discriminator-enum-parent.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\n\n/**\n * The state of the discriminator pre-pass and the in-place patch of a mapped schema: the enum\n * property that the generated union narrows by. Two discriminators of one property may patch one\n * schema; how they combine is the `discriminator-values` fix (ADR-021, roadmap R12).\n */\n\n/** How to scan: the warnings, and the output fixes of the run (ADR-021). */\nexport interface DiscriminatorScanOptions {\n  readonly silent: boolean;\n  readonly logger: Logger;\n  readonly fixes: ReadonlySet<OutputFix>;\n}\n\n/** What the two passes share: the document they patch and what they found so far. */\nexport interface ScanState extends DiscriminatorScanOptions {\n  readonly schema: OpenAPI3;\n  readonly objects: Record<string, DiscriminatorObject>;\n  /** The schemas that define a discriminator themselves (pass 1), not by inheritance. */\n  readonly owners: Set<string>;\n  readonly refsHandled: string[];\n  /** With the fix: the enum added to each schema, by schema and property, so values merge. */\n  readonly patchedEnums: Map<string, SchemaObject>;\n  /** With the fix: schema-name values, applied after both passes where no mapping names one. */\n  readonly inferredPatches: EnumPatch[];\n  /** With the fix: schema-name values of other properties (`inheritOtherOwners`). */\n  readonly otherInferredPatches: EnumPatch[];\n  /** With the fix: the other properties each schema got a value of (`inheritOtherOwners`). */\n  readonly otherProperties: Record<string, string[]>;\n  /** With `discriminator-values`: the enum keys that a schema declares itself. */\n  readonly declaredKeys: Set<string>;\n  /** With `discriminator-values`: the owner's enum of each added enum, by that enum. */\n  readonly enumParents: Map<object, EnumParent>;\n}\n\n/** Whether `discriminator-values` is on: values of two discriminators merge into one enum. */\nexport function mergesValues(state: ScanState): boolean {\n  return state.fixes.has(OutputFix.DISCRIMINATOR_VALUES);\n}\n\nfunction patchedSchema(state: ScanState, patch: EnumPatch): SchemaObject | undefined {\n  const { silent, logger } = state;\n  return resolveDocumentRef<SchemaObject>(state.schema, patch.ref, { silent, logger });\n}\n\n/**\n * With `discriminator-values`: the schema at `patch.ref` requires the property with\n * exactly these values already, so a patch would only repeat it (#2124).\n */\nfunction isDeclared(state: ScanState, patch: EnumPatch): boolean {\n  return (\n    state.fixes.has(OutputFix.DISCRIMINATOR_VALUES) &&\n    declaresValues(patchedSchema(state, patch), patch)\n  );\n}\n\n/**\n * With `discriminator-values`: the enum of the owner's property, for `key`: an enum the scan\n * added, or a discriminator object that a schema inherited.\n */\nexport function recordEnumParent(state: ScanState, owner: DiscriminatorOwner, key: object): void {\n  if (!state.fixes.has(OutputFix.DISCRIMINATOR_VALUES)) {\n    return;\n  }\n  const { silent, logger } = state;\n  const parent = enumParentOf(owner, (ref) =>\n    resolveDocumentRef(state.schema, ref, { silent, logger }),\n  );\n  if (parent !== undefined) {\n    state.enumParents.set(key, parent);\n  }\n}\n\n/** The enum the schema at `patch.ref` gets, or null (with a warning) for another kind of schema. */\nfunction addDiscriminatorEnum(state: ScanState, patch: EnumPatch): SchemaObject | null {\n  const added = addEnumProperty(patchedSchema(state, patch), patch);\n  if (added === null) {\n    warnInvalidMapping(patch, state.logger);\n  } else {\n    recordEnumParent(state, patch, added);\n  }\n  return added;\n}\n\n/** One schema and discriminator property; two discriminators of one property share an enum. */\nexport function enumKey(patch: EnumPatch): string {\n  return `${patch.ref}\\n${patch.discriminator.propertyName}`;\n}\n\n/** With the fix, a second discriminator of the same property adds its values to the first enum. */\nfunction mergeIntoPatchedEnum(state: ScanState, key: string, values: readonly string[]): boolean {\n  const patched = state.patchedEnums.get(key);\n  if (patched === undefined) {\n    return false;\n  }\n  const merged = patched.enum as unknown[];\n  merged.push(...values.filter((value) => !merged.includes(value)));\n  return true;\n}\n\n/**\n * Add or replace the discriminator enum in the schema at `patch.ref`. Returns false, with a\n * warning, when that schema is neither an `allOf` nor an object schema. Without the fix every\n * patch adds a property, so two discriminators with different values intersect to `never`.\n */\nexport function patchDiscriminatorEnum(state: ScanState, patch: EnumPatch): boolean {\n  if (isDeclared(state, patch)) {\n    state.declaredKeys.add(enumKey(patch));\n    return true;\n  }\n  if (!mergesValues(state)) {\n    return addDiscriminatorEnum(state, patch) !== null;\n  }\n  const key = enumKey(patch);\n  if (mergeIntoPatchedEnum(state, key, patch.values)) {\n    return true;\n  }\n  const added = addDiscriminatorEnum(state, patch);\n  if (added !== null) {\n    state.patchedEnums.set(key, added);\n  }\n  return added !== null;\n}\n\nexport function markHandled(state: ScanState, ref: string): void {\n  if (!state.refsHandled.includes(ref)) {\n    state.refsHandled.push(ref);\n  }\n}\n\nfunction warnInvalidMapping(patch: EnumPatch, logger: Logger): void {\n  const mapped = `${patch.ref} => ${patch.values.join(\", \")}`;\n  logger.warn(\n    \"Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): \" +\n      `${mapped} (Discriminator: ${patch.discriminatorRef})`,\n  );\n}\n"],"names":["OutputFix","resolveDocumentRef","declaresValues","enumParentOf","addEnumProperty"],"mappings":"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"}

package/dist/api/discriminator-patch.mjs

@@ -0,0 +1,82 @@
+import { OutputFix } from '../domain/output-fixes.mjs';
+import { declaresValues, addEnumProperty } from './discriminator-enum.mjs';
+import { enumParentOf } from './discriminator-enum-parent.mjs';
+import { resolveDocumentRef } from './document-refs.mjs';
+
+function mergesValues(state) {
+  return state.fixes.has(OutputFix.DISCRIMINATOR_VALUES);
+}
+function patchedSchema(state, patch) {
+  const { silent, logger } = state;
+  return resolveDocumentRef(state.schema, patch.ref, { silent, logger });
+}
+function isDeclared(state, patch) {
+  return state.fixes.has(OutputFix.DISCRIMINATOR_VALUES) && declaresValues(patchedSchema(state, patch), patch);
+}
+function recordEnumParent(state, owner, key) {
+  if (!state.fixes.has(OutputFix.DISCRIMINATOR_VALUES)) {
+    return;
+  }
+  const { silent, logger } = state;
+  const parent = enumParentOf(
+    owner,
+    (ref) => resolveDocumentRef(state.schema, ref, { silent, logger })
+  );
+  if (parent !== void 0) {
+    state.enumParents.set(key, parent);
+  }
+}
+function addDiscriminatorEnum(state, patch) {
+  const added = addEnumProperty(patchedSchema(state, patch), patch);
+  if (added === null) {
+    warnInvalidMapping(patch, state.logger);
+  } else {
+    recordEnumParent(state, patch, added);
+  }
+  return added;
+}
+function enumKey(patch) {
+  return `${patch.ref}
+${patch.discriminator.propertyName}`;
+}
+function mergeIntoPatchedEnum(state, key, values) {
+  const patched = state.patchedEnums.get(key);
+  if (patched === void 0) {
+    return false;
+  }
+  const merged = patched.enum;
+  merged.push(...values.filter((value) => !merged.includes(value)));
+  return true;
+}
+function patchDiscriminatorEnum(state, patch) {
+  if (isDeclared(state, patch)) {
+    state.declaredKeys.add(enumKey(patch));
+    return true;
+  }
+  if (!mergesValues(state)) {
+    return addDiscriminatorEnum(state, patch) !== null;
+  }
+  const key = enumKey(patch);
+  if (mergeIntoPatchedEnum(state, key, patch.values)) {
+    return true;
+  }
+  const added = addDiscriminatorEnum(state, patch);
+  if (added !== null) {
+    state.patchedEnums.set(key, added);
+  }
+  return added !== null;
+}
+function markHandled(state, ref) {
+  if (!state.refsHandled.includes(ref)) {
+    state.refsHandled.push(ref);
+  }
+}
+function warnInvalidMapping(patch, logger) {
+  const mapped = `${patch.ref} => ${patch.values.join(", ")}`;
+  logger.warn(
+    `Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): ${mapped} (Discriminator: ${patch.discriminatorRef})`
+  );
+}
+
+export { enumKey, markHandled, mergesValues, patchDiscriminatorEnum, recordEnumParent };
+//# sourceMappingURL=discriminator-patch.mjs.map

package/dist/api/discriminator-patch.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminator-patch.mjs","sources":["../../src/api/discriminator-patch.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport { OutputFix } from \"../domain/output-fixes.js\";\nimport type { DiscriminatorObject, OpenAPI3, SchemaObject } from \"../types.js\";\nimport { addEnumProperty, declaresValues, type EnumPatch } from \"./discriminator-enum.js\";\nimport {\n  type DiscriminatorOwner,\n  type EnumParent,\n  enumParentOf,\n} from \"./discriminator-enum-parent.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\n\n/**\n * The state of the discriminator pre-pass and the in-place patch of a mapped schema: the enum\n * property that the generated union narrows by. Two discriminators of one property may patch one\n * schema; how they combine is the `discriminator-values` fix (ADR-021, roadmap R12).\n */\n\n/** How to scan: the warnings, and the output fixes of the run (ADR-021). */\nexport interface DiscriminatorScanOptions {\n  readonly silent: boolean;\n  readonly logger: Logger;\n  readonly fixes: ReadonlySet<OutputFix>;\n}\n\n/** What the two passes share: the document they patch and what they found so far. */\nexport interface ScanState extends DiscriminatorScanOptions {\n  readonly schema: OpenAPI3;\n  readonly objects: Record<string, DiscriminatorObject>;\n  /** The schemas that define a discriminator themselves (pass 1), not by inheritance. */\n  readonly owners: Set<string>;\n  readonly refsHandled: string[];\n  /** With the fix: the enum added to each schema, by schema and property, so values merge. */\n  readonly patchedEnums: Map<string, SchemaObject>;\n  /** With the fix: schema-name values, applied after both passes where no mapping names one. */\n  readonly inferredPatches: EnumPatch[];\n  /** With the fix: schema-name values of other properties (`inheritOtherOwners`). */\n  readonly otherInferredPatches: EnumPatch[];\n  /** With the fix: the other properties each schema got a value of (`inheritOtherOwners`). */\n  readonly otherProperties: Record<string, string[]>;\n  /** With `discriminator-values`: the enum keys that a schema declares itself. */\n  readonly declaredKeys: Set<string>;\n  /** With `discriminator-values`: the owner's enum of each added enum, by that enum. */\n  readonly enumParents: Map<object, EnumParent>;\n}\n\n/** Whether `discriminator-values` is on: values of two discriminators merge into one enum. */\nexport function mergesValues(state: ScanState): boolean {\n  return state.fixes.has(OutputFix.DISCRIMINATOR_VALUES);\n}\n\nfunction patchedSchema(state: ScanState, patch: EnumPatch): SchemaObject | undefined {\n  const { silent, logger } = state;\n  return resolveDocumentRef<SchemaObject>(state.schema, patch.ref, { silent, logger });\n}\n\n/**\n * With `discriminator-values`: the schema at `patch.ref` requires the property with\n * exactly these values already, so a patch would only repeat it (#2124).\n */\nfunction isDeclared(state: ScanState, patch: EnumPatch): boolean {\n  return (\n    state.fixes.has(OutputFix.DISCRIMINATOR_VALUES) &&\n    declaresValues(patchedSchema(state, patch), patch)\n  );\n}\n\n/**\n * With `discriminator-values`: the enum of the owner's property, for `key`: an enum the scan\n * added, or a discriminator object that a schema inherited.\n */\nexport function recordEnumParent(state: ScanState, owner: DiscriminatorOwner, key: object): void {\n  if (!state.fixes.has(OutputFix.DISCRIMINATOR_VALUES)) {\n    return;\n  }\n  const { silent, logger } = state;\n  const parent = enumParentOf(owner, (ref) =>\n    resolveDocumentRef(state.schema, ref, { silent, logger }),\n  );\n  if (parent !== undefined) {\n    state.enumParents.set(key, parent);\n  }\n}\n\n/** The enum the schema at `patch.ref` gets, or null (with a warning) for another kind of schema. */\nfunction addDiscriminatorEnum(state: ScanState, patch: EnumPatch): SchemaObject | null {\n  const added = addEnumProperty(patchedSchema(state, patch), patch);\n  if (added === null) {\n    warnInvalidMapping(patch, state.logger);\n  } else {\n    recordEnumParent(state, patch, added);\n  }\n  return added;\n}\n\n/** One schema and discriminator property; two discriminators of one property share an enum. */\nexport function enumKey(patch: EnumPatch): string {\n  return `${patch.ref}\\n${patch.discriminator.propertyName}`;\n}\n\n/** With the fix, a second discriminator of the same property adds its values to the first enum. */\nfunction mergeIntoPatchedEnum(state: ScanState, key: string, values: readonly string[]): boolean {\n  const patched = state.patchedEnums.get(key);\n  if (patched === undefined) {\n    return false;\n  }\n  const merged = patched.enum as unknown[];\n  merged.push(...values.filter((value) => !merged.includes(value)));\n  return true;\n}\n\n/**\n * Add or replace the discriminator enum in the schema at `patch.ref`. Returns false, with a\n * warning, when that schema is neither an `allOf` nor an object schema. Without the fix every\n * patch adds a property, so two discriminators with different values intersect to `never`.\n */\nexport function patchDiscriminatorEnum(state: ScanState, patch: EnumPatch): boolean {\n  if (isDeclared(state, patch)) {\n    state.declaredKeys.add(enumKey(patch));\n    return true;\n  }\n  if (!mergesValues(state)) {\n    return addDiscriminatorEnum(state, patch) !== null;\n  }\n  const key = enumKey(patch);\n  if (mergeIntoPatchedEnum(state, key, patch.values)) {\n    return true;\n  }\n  const added = addDiscriminatorEnum(state, patch);\n  if (added !== null) {\n    state.patchedEnums.set(key, added);\n  }\n  return added !== null;\n}\n\nexport function markHandled(state: ScanState, ref: string): void {\n  if (!state.refsHandled.includes(ref)) {\n    state.refsHandled.push(ref);\n  }\n}\n\nfunction warnInvalidMapping(patch: EnumPatch, logger: Logger): void {\n  const mapped = `${patch.ref} => ${patch.values.join(\", \")}`;\n  logger.warn(\n    \"Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): \" +\n      `${mapped} (Discriminator: ${patch.discriminatorRef})`,\n  );\n}\n"],"names":[],"mappings":"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"}

package/dist/api/discriminator-scan.cjs

@@ -1,57 +1,13 @@
 'use strict';
 
+const discriminatedUnion = require('../domain/openapi/discriminated-union.cjs');
+const outputFixes = require('../domain/output-fixes.cjs');
 const defaultPorts = require('./default-ports.cjs');
-const discriminatorEnum = require('./discriminator-enum.cjs');
+const discriminatorOtherOwners = require('./discriminator-other-owners.cjs');
+const discriminatorPatch = require('./discriminator-patch.cjs');
 const documentRefs = require('./document-refs.cjs');
 const legacyUtils = require('./legacy-utils.cjs');
 
-function addDiscriminatorEnum(state, patch) {
-  const { silent, logger } = state;
-  const resolved = documentRefs.resolveDocumentRef(state.schema, patch.ref, { silent, logger });
-  const added = discriminatorEnum.addEnumProperty(resolved, patch);
-  if (added === null) {
-    warnInvalidMapping(patch, state.logger);
-  }
-  return added;
-}
-function enumKey(patch) {
-  return `${patch.ref}
-${patch.discriminator.propertyName}`;
-}
-function mergeIntoPatchedEnum(state, key, values) {
-  const patched = state.patchedEnums.get(key);
-  if (patched === void 0) {
-    return false;
-  }
-  const merged = patched.enum;
-  merged.push(...values.filter((value) => !merged.includes(value)));
-  return true;
-}
-function patchDiscriminatorEnum(state, patch) {
-  if (!state.fixesValueConflicts) {
-    return addDiscriminatorEnum(state, patch) !== null;
-  }
-  const key = enumKey(patch);
-  if (mergeIntoPatchedEnum(state, key, patch.values)) {
-    return true;
-  }
-  const added = addDiscriminatorEnum(state, patch);
-  if (added !== null) {
-    state.patchedEnums.set(key, added);
-  }
-  return added !== null;
-}
-function markHandled(state, ref) {
-  if (!state.refsHandled.includes(ref)) {
-    state.refsHandled.push(ref);
-  }
-}
-function warnInvalidMapping(patch, logger) {
-  const mapped = `${patch.ref} => ${patch.values.join(", ")}`;
-  logger.warn(
-    `Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): ${mapped} (Discriminator: ${patch.discriminatorRef})`
-  );
-}
 function inferredMapping(oneOf) {
   const mapping = {};
   for (const item of oneOf) {
@@ -65,8 +21,8 @@ function inferredMapping(oneOf) {
   }
   return mapping;
 }
-function addDefinedMapping(mapping, discriminator) {
-  for (const [mappedValue, mappedRef] of Object.entries(discriminator.mapping ?? {})) {
+function addDefinedMapping(mapping, defined) {
+  for (const [mappedValue, mappedRef] of Object.entries(defined)) {
     if (!mappedRef) {
       continue;
     }
@@ -78,15 +34,15 @@ function addDefinedMapping(mapping, discriminator) {
 }
 function patchMappedSchemas(state, mapping, discriminator) {
   for (const [ref, { inferred, defined }] of Object.entries(mapping)) {
-    const isSkipped = !state.fixesValueConflicts && state.refsHandled.includes(ref);
+    const isSkipped = !discriminatorPatch.mergesValues(state) && state.refsHandled.includes(ref);
     if (isSkipped || !inferred && !defined) {
       continue;
     }
     const values = defined ?? [inferred];
-    if (state.fixesValueConflicts && defined === void 0) {
+    if (discriminatorPatch.mergesValues(state) && defined === void 0) {
       state.inferredPatches.push({ ...discriminator, ref, values });
-    } else if (patchDiscriminatorEnum(state, { ...discriminator, ref, values })) {
-      markHandled(state, ref);
+    } else if (discriminatorPatch.patchDiscriminatorEnum(state, { ...discriminator, ref, values })) {
+      discriminatorPatch.markHandled(state, ref);
     }
   }
 }
@@ -97,18 +53,35 @@ function collectDiscriminator(state, value, path) {
   }
   const discriminatorRef = legacyUtils.createRef(path);
   state.objects[discriminatorRef] = discriminator;
+  state.owners.add(discriminatorRef);
   if (!Array.isArray(value.oneOf)) {
     return;
   }
   const mapping = inferredMapping(value.oneOf);
   if (discriminator.mapping) {
-    addDefinedMapping(mapping, discriminator);
+    addDefinedMapping(mapping, discriminator.mapping);
   }
   patchMappedSchemas(state, mapping, { discriminator, discriminatorRef });
 }
 function valuesMappedTo(discriminator, ref) {
   return Object.entries(discriminator.mapping ?? {}).filter(([, mappedRef]) => mappedRef === ref).map(([mappedValue]) => mappedValue);
 }
+function inheritsDiscriminator(state, parentRef, ref) {
+  if (!state.fixes.has(outputFixes.OutputFix.ALLOF_DISCRIMINATED_UNION)) {
+    return true;
+  }
+  const resolve = (target) => documentRefs.resolveDocumentRef(state.schema, target, state);
+  const union = discriminatedUnion.unionAt(parentRef, resolve);
+  return union === void 0 || discriminatedUnion.isUnionMember(union, ref, resolve);
+}
+function recordInherited(state, ref, discriminator, ownerRef) {
+  if (state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES) && state.owners.has(ref)) {
+    return;
+  }
+  const inherited = { ...discriminator };
+  state.objects[ref] = inherited;
+  discriminatorPatch.recordEnumParent(state, { discriminator, discriminatorRef: ownerRef }, inherited);
+}
 function inheritFromRef(state, parentRef, ref) {
   const discriminator = state.objects[parentRef];
   if (!discriminator) {
@@ -116,10 +89,15 @@ function inheritFromRef(state, parentRef, ref) {
   }
   const values = valuesMappedTo(discriminator, ref);
   const patch = { ref, values, discriminator, discriminatorRef: parentRef };
-  if (values.length > 0 && patchDiscriminatorEnum(state, patch)) {
-    markHandled(state, ref);
+  if (values.length > 0 && discriminatorPatch.patchDiscriminatorEnum(state, patch)) {
+    discriminatorPatch.markHandled(state, ref);
+  }
+  if (inheritsDiscriminator(state, parentRef, ref)) {
+    recordInherited(state, ref, discriminator, parentRef);
+    if (discriminatorPatch.mergesValues(state)) {
+      discriminatorOtherOwners.inheritOtherOwners(state, parentRef, ref);
+    }
   }
-  state.objects[ref] = { ...discriminator };
   return true;
 }
 function inheritDiscriminators(state, value, path) {
@@ -132,35 +110,42 @@ function inheritDiscriminators(state, value, path) {
         return;
       }
     } else if (item.discriminator?.propertyName) {
-      state.objects[legacyUtils.createRef(path)] = { ...item.discriminator };
+      recordInherited(state, legacyUtils.createRef(path), item.discriminator, legacyUtils.createRef(path));
     }
   }
 }
 function applyInferredPatches(state) {
-  const mapped = new Set(state.patchedEnums.keys());
+  const mapped = /* @__PURE__ */ new Set([...state.patchedEnums.keys(), ...state.declaredKeys]);
   for (const patch of state.inferredPatches) {
-    if (!mapped.has(enumKey(patch)) && patchDiscriminatorEnum(state, patch)) {
-      markHandled(state, patch.ref);
+    if (!mapped.has(discriminatorPatch.enumKey(patch)) && discriminatorPatch.patchDiscriminatorEnum(state, patch)) {
+      discriminatorPatch.markHandled(state, patch.ref);
     }
   }
+  discriminatorOtherOwners.applyOtherInferredPatches(state, mapped);
 }
 function findDiscriminators(schema, options) {
   const state = {
     ...options,
     schema,
     objects: {},
+    owners: /* @__PURE__ */ new Set(),
     refsHandled: [],
     patchedEnums: /* @__PURE__ */ new Map(),
-    inferredPatches: []
+    inferredPatches: [],
+    otherInferredPatches: [],
+    otherProperties: {},
+    declaredKeys: /* @__PURE__ */ new Set(),
+    enumParents: /* @__PURE__ */ new Map()
   };
   documentRefs.walkDocument(schema, (value, path) => collectDiscriminator(state, value, path));
   documentRefs.walkDocument(schema, (value, path) => inheritDiscriminators(state, value, path));
   applyInferredPatches(state);
-  return { objects: state.objects, refsHandled: state.refsHandled };
+  const { objects, refsHandled, enumParents, otherProperties } = state;
+  return { objects, refsHandled, enumParents, otherProperties };
 }
 function scanDiscriminators(schema, options, logger = defaultPorts.defaultLogger(options.silent ?? false)) {
   const silent = options.silent ?? false;
-  return findDiscriminators(schema, { silent, logger, fixesValueConflicts: false });
+  return findDiscriminators(schema, { silent, logger, fixes: /* @__PURE__ */ new Set() });
 }
 
 exports.findDiscriminators = findDiscriminators;