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

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 { WARNING_CODES, warningText } from \"../domain/warnings.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    warningText(\n      \"Discriminator mapping has an invalid schema \" +\n        \"(neither an object schema nor an allOf array): \" +\n        `${mapped} (Discriminator: ${patch.discriminatorRef})`,\n      WARNING_CODES.DISCRIMINATOR_MAPPING_INVALID,\n    ),\n  );\n}\n"],"names":["OutputFix","resolveDocumentRef","declaresValues","enumParentOf","addEnumProperty","warningText","WARNING_CODES"],"mappings":"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"}

package/dist/api/discriminator-patch.mjs

@@ -0,0 +1,86 @@
+import { OutputFix } from '../domain/output-fixes.mjs';
+import { warningText, WARNING_CODES } from '../domain/warnings.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(
+    warningText(
+      `Discriminator mapping has an invalid schema (neither an object schema nor an allOf array): ${mapped} (Discriminator: ${patch.discriminatorRef})`,
+      WARNING_CODES.DISCRIMINATOR_MAPPING_INVALID
+    )
+  );
+}
+
+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 { WARNING_CODES, warningText } from \"../domain/warnings.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    warningText(\n      \"Discriminator mapping has an invalid schema \" +\n        \"(neither an object schema nor an allOf array): \" +\n        `${mapped} (Discriminator: ${patch.discriminatorRef})`,\n      WARNING_CODES.DISCRIMINATOR_MAPPING_INVALID,\n    ),\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;

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

@@ -1 +1 @@
-{"version":3,"file":"discriminator-scan.cjs","sources":["../../src/api/discriminator-scan.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport type {\n  DiscriminatorObject,\n  GeneratorOptions,\n  OpenAPI3,\n  ReferenceObject,\n  SchemaObject,\n} from \"../types.js\";\nimport { defaultLogger } from \"./default-ports.js\";\nimport { addEnumProperty, type EnumPatch } from \"./discriminator-enum.js\";\nimport { resolveDocumentRef, walkDocument } from \"./document-refs.js\";\nimport { createRef } from \"./legacy-utils.js\";\n\n/**\n * The inherited discriminator pre-pass. It finds every discriminator in the bundled document and\n * patches the mapped schemas in place with a required enum property, so that TypeScript can narrow\n * the generated union. The behavior and the warning text match the original `scanDiscriminators`.\n */\n\ntype DiscriminatorMapping = Record<string, { inferred?: string; defined?: string[] }>;\n\n/** How to scan; `fixesValueConflicts` is the `discriminator-values` fix (ADR-021, roadmap R12). */\nexport interface DiscriminatorScanOptions {\n  readonly silent: boolean;\n  readonly logger: Logger;\n  readonly fixesValueConflicts: boolean;\n}\n\n/** What the two passes share: the document they patch and what they found so far. */\ninterface ScanState extends DiscriminatorScanOptions {\n  readonly schema: OpenAPI3;\n  readonly objects: Record<string, DiscriminatorObject>;\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}\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 { silent, logger } = state;\n  const resolved = resolveDocumentRef<SchemaObject>(state.schema, patch.ref, { silent, logger });\n  const added = addEnumProperty(resolved, patch);\n  if (added === null) {\n    warnInvalidMapping(patch, state.logger);\n  }\n  return added;\n}\n\n/** One schema and discriminator property; two discriminators of one property share an enum. */\nfunction 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 */\nfunction patchDiscriminatorEnum(state: ScanState, patch: EnumPatch): boolean {\n  if (!state.fixesValueConflicts) {\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\nfunction 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\n/** The schema name at the end of each `oneOf` `$ref` is the inferred discriminator value. */\nfunction inferredMapping(oneOf: (SchemaObject | ReferenceObject)[]): DiscriminatorMapping {\n  const mapping: DiscriminatorMapping = {};\n  for (const item of oneOf) {\n    if (!(\"$ref\" in item)) {\n      continue;\n    }\n    const value = item.$ref.split(\"/\").pop();\n    if (value) {\n      mapping[item.$ref] = { ...mapping[item.$ref], inferred: value };\n    }\n  }\n  return mapping;\n}\n\n/** Values defined in `discriminator.mapping` replace inferred ones for the same schema. */\nfunction addDefinedMapping(\n  mapping: DiscriminatorMapping,\n  discriminator: DiscriminatorObject,\n): void {\n  for (const [mappedValue, mappedRef] of Object.entries(discriminator.mapping ?? {})) {\n    if (!mappedRef) {\n      continue;\n    }\n    if (!mapping[mappedRef]?.defined) {\n      mapping[mappedRef] = { defined: [] };\n    }\n    mapping[mappedRef].defined?.push(mappedValue);\n  }\n}\n\nfunction patchMappedSchemas(\n  state: ScanState,\n  mapping: DiscriminatorMapping,\n  discriminator: Omit<EnumPatch, \"ref\" | \"values\">,\n): void {\n  for (const [ref, { inferred, defined }] of Object.entries(mapping)) {\n    const isSkipped = !state.fixesValueConflicts && state.refsHandled.includes(ref);\n    if (isSkipped || (!inferred && !defined)) {\n      continue;\n    }\n    // A defined value wins: the schema name may not be the value the API sends.\n    const values = defined ?? [inferred as string];\n    if (state.fixesValueConflicts && defined === undefined) {\n      // A mapping found later, in this pass or the next, may name the schema.\n      state.inferredPatches.push({ ...discriminator, ref, values });\n    } else if (patchDiscriminatorEnum(state, { ...discriminator, ref, values })) {\n      markHandled(state, ref);\n    }\n  }\n}\n\n/** Pass 1: collect every discriminator; patch the schemas of a discriminator + `oneOf`. */\nfunction collectDiscriminator(\n  state: ScanState,\n  value: Record<string, unknown>,\n  path: (string | number)[],\n): void {\n  const discriminator = value.discriminator as DiscriminatorObject | undefined;\n  if (!discriminator?.propertyName) {\n    return;\n  }\n  const discriminatorRef = createRef(path);\n  state.objects[discriminatorRef] = discriminator;\n  if (!Array.isArray(value.oneOf)) {\n    return;\n  }\n  const mapping = inferredMapping(value.oneOf);\n  if (discriminator.mapping) {\n    addDefinedMapping(mapping, discriminator);\n  }\n  patchMappedSchemas(state, mapping, { discriminator, discriminatorRef });\n}\n\n/** The mapping keys of `discriminator` that point at `ref`. */\nfunction valuesMappedTo(discriminator: DiscriminatorObject, ref: string): string[] {\n  return Object.entries(discriminator.mapping ?? {})\n    .filter(([, mappedRef]) => mappedRef === ref)\n    .map(([mappedValue]) => mappedValue);\n}\n\n/**\n * An `allOf` item that is a `$ref` to a discriminator owner: the schema at `ref` inherits the\n * discriminator, and gets its enum when the parent's mapping names it. Returns false when the\n * `$ref` owns no discriminator, which ends the scan of this `allOf` (as in the original).\n */\nfunction inheritFromRef(state: ScanState, parentRef: string, ref: string): boolean {\n  const discriminator = state.objects[parentRef];\n  if (!discriminator) {\n    return false;\n  }\n  const values = valuesMappedTo(discriminator, ref);\n  const patch = { ref, values, discriminator, discriminatorRef: parentRef };\n  if (values.length > 0 && patchDiscriminatorEnum(state, patch)) {\n    markHandled(state, ref);\n  }\n  state.objects[ref] = { ...discriminator };\n  return true;\n}\n\n/** Pass 2: a schema whose `allOf` holds a discriminator, or a `$ref` to one, inherits it. */\nfunction inheritDiscriminators(\n  state: ScanState,\n  value: Record<string, unknown>,\n  path: (string | number)[],\n): void {\n  if (!Array.isArray(value.allOf)) {\n    return;\n  }\n  for (const item of value.allOf as (SchemaObject | ReferenceObject)[]) {\n    if (\"$ref\" in item) {\n      if (!inheritFromRef(state, item.$ref, createRef(path))) {\n        return;\n      }\n    } else if (item.discriminator?.propertyName) {\n      state.objects[createRef(path)] = { ...item.discriminator };\n    }\n  }\n}\n\n/** The discriminators of a bundled document, after patching the mapped schemas in place. */\nexport interface DiscriminatorScan {\n  objects: Record<string, DiscriminatorObject>;\n  refsHandled: string[];\n}\n\n/**\n * With the fix: a schema-name value, only for a schema and property that no mapping gave a value.\n * Every enum patched so far came from a mapping, since schema-name values wait for this step.\n */\nfunction applyInferredPatches(state: ScanState): void {\n  const mapped = new Set(state.patchedEnums.keys());\n  for (const patch of state.inferredPatches) {\n    if (!mapped.has(enumKey(patch)) && patchDiscriminatorEnum(state, patch)) {\n      markHandled(state, patch.ref);\n    }\n  }\n}\n\n/** Find every discriminator in `schema`; warnings go to `logger` unless `silent`. */\nexport function findDiscriminators(\n  schema: OpenAPI3,\n  options: DiscriminatorScanOptions,\n): DiscriminatorScan {\n  const state: ScanState = {\n    ...options,\n    schema,\n    objects: {},\n    refsHandled: [],\n    patchedEnums: new Map(),\n    inferredPatches: [],\n  };\n  walkDocument(schema, (value, path) => collectDiscriminator(state, value, path));\n  // A second pass, because an `allOf` may name a discriminator that is defined later.\n  walkDocument(schema, (value, path) => inheritDiscriminators(state, value, path));\n  applyInferredPatches(state);\n  return { objects: state.objects, refsHandled: state.refsHandled };\n}\n\n/**\n * Return a key–value map of discriminator objects found in a schema. Warnings go to `logger`;\n * without one, to the default terminal logger, as the original did.\n * @deprecated Kept for 1.x; removed in 2.0 (ADR-004, decision 9).\n */\nexport function scanDiscriminators(\n  schema: OpenAPI3,\n  options: GeneratorOptions,\n  logger: Logger = defaultLogger(options.silent ?? false),\n): DiscriminatorScan {\n  const silent = options.silent ?? false;\n  return findDiscriminators(schema, { silent, logger, fixesValueConflicts: false });\n}\n"],"names":["resolveDocumentRef","addEnumProperty","createRef","walkDocument","defaultLogger"],"mappings":"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"}
+{"version":3,"file":"discriminator-scan.cjs","sources":["../../src/api/discriminator-scan.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport { isUnionMember, unionAt } from \"../domain/openapi/discriminated-union.js\";\nimport { OutputFix } from \"../domain/output-fixes.js\";\nimport type {\n  DiscriminatorObject,\n  GeneratorOptions,\n  OpenAPI3,\n  ReferenceObject,\n  SchemaObject,\n} from \"../types.js\";\nimport { defaultLogger } from \"./default-ports.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\nimport type { EnumParent } from \"./discriminator-enum-parent.js\";\nimport { applyOtherInferredPatches, inheritOtherOwners } from \"./discriminator-other-owners.js\";\nimport {\n  type DiscriminatorScanOptions,\n  enumKey,\n  markHandled,\n  mergesValues,\n  patchDiscriminatorEnum,\n  recordEnumParent,\n  type ScanState,\n} from \"./discriminator-patch.js\";\nimport { resolveDocumentRef, walkDocument } from \"./document-refs.js\";\nimport { createRef } from \"./legacy-utils.js\";\n\n/**\n * The inherited discriminator pre-pass. It finds every discriminator in the bundled document and\n * patches the mapped schemas in place with a required enum property, so that TypeScript can narrow\n * the generated union. The behavior and the warning text match the original `scanDiscriminators`.\n */\n\ntype DiscriminatorMapping = Record<string, { inferred?: string; defined?: string[] }>;\n\n/** The schema name at the end of each `oneOf` `$ref` is the inferred discriminator value. */\nfunction inferredMapping(oneOf: (SchemaObject | ReferenceObject)[]): DiscriminatorMapping {\n  const mapping: DiscriminatorMapping = {};\n  for (const item of oneOf) {\n    if (!(\"$ref\" in item)) {\n      continue;\n    }\n    const value = item.$ref.split(\"/\").pop();\n    if (value) {\n      mapping[item.$ref] = { ...mapping[item.$ref], inferred: value };\n    }\n  }\n  return mapping;\n}\n\n/** Values defined in `discriminator.mapping` replace inferred ones for the same schema. */\nfunction addDefinedMapping(\n  mapping: DiscriminatorMapping,\n  defined: Readonly<Record<string, string>>,\n): void {\n  for (const [mappedValue, mappedRef] of Object.entries(defined)) {\n    if (!mappedRef) {\n      continue;\n    }\n    if (!mapping[mappedRef]?.defined) {\n      mapping[mappedRef] = { defined: [] };\n    }\n    mapping[mappedRef].defined?.push(mappedValue);\n  }\n}\n\nfunction patchMappedSchemas(\n  state: ScanState,\n  mapping: DiscriminatorMapping,\n  discriminator: Omit<EnumPatch, \"ref\" | \"values\">,\n): void {\n  for (const [ref, { inferred, defined }] of Object.entries(mapping)) {\n    const isSkipped = !mergesValues(state) && state.refsHandled.includes(ref);\n    if (isSkipped || (!inferred && !defined)) {\n      continue;\n    }\n    // A defined value wins: the schema name may not be the value the API sends.\n    const values = defined ?? [inferred as string];\n    if (mergesValues(state) && defined === undefined) {\n      // A mapping found later, in this pass or the next, may name the schema.\n      state.inferredPatches.push({ ...discriminator, ref, values });\n    } else if (patchDiscriminatorEnum(state, { ...discriminator, ref, values })) {\n      markHandled(state, ref);\n    }\n  }\n}\n\n/** Pass 1: collect every discriminator; patch the schemas of a discriminator + `oneOf`. */\nfunction collectDiscriminator(\n  state: ScanState,\n  value: Record<string, unknown>,\n  path: (string | number)[],\n): void {\n  const discriminator = value.discriminator as DiscriminatorObject | undefined;\n  if (!discriminator?.propertyName) {\n    return;\n  }\n  const discriminatorRef = createRef(path);\n  state.objects[discriminatorRef] = discriminator;\n  state.owners.add(discriminatorRef);\n  if (!Array.isArray(value.oneOf)) {\n    return;\n  }\n  const mapping = inferredMapping(value.oneOf);\n  if (discriminator.mapping) {\n    addDefinedMapping(mapping, discriminator.mapping);\n  }\n  patchMappedSchemas(state, mapping, { discriminator, discriminatorRef });\n}\n\n/** The mapping keys of `discriminator` that point at `ref`. */\nfunction valuesMappedTo(discriminator: DiscriminatorObject, ref: string): string[] {\n  return Object.entries(discriminator.mapping ?? {})\n    .filter(([, mappedRef]) => mappedRef === ref)\n    .map(([mappedValue]) => mappedValue);\n}\n\n/**\n * Whether the schema at `ref` takes the discriminator of its `allOf` parent at `parentRef`. With\n * `allof-discriminated-union`, a schema that `allOf`s a discriminated union that does not contain\n * it is that union, not one of its members, so it gets no value of its own (#1464, #1690). A\n * schema that the union's mapping names is a member.\n */\nfunction inheritsDiscriminator(state: ScanState, parentRef: string, ref: string): boolean {\n  if (!state.fixes.has(OutputFix.ALLOF_DISCRIMINATED_UNION)) {\n    return true;\n  }\n  const resolve = (target: string) => resolveDocumentRef(state.schema, target, state);\n  const union = unionAt(parentRef, resolve);\n  return union === undefined || isUnionMember(union, ref, resolve);\n}\n\n/**\n * The schema at `ref` inherits `discriminator`. With `discriminator-values`, a schema that\n * defines a discriminator keeps it: the inherited one replaced its mapping, so the members walked\n * after this schema got their schema name instead of the mapped value (#2200). `ownerRef` is the\n * schema that declares the discriminator property, whose enum `--enum` values use (#1700).\n */\nfunction recordInherited(\n  state: ScanState,\n  ref: string,\n  discriminator: DiscriminatorObject,\n  ownerRef: string,\n): void {\n  if (state.fixes.has(OutputFix.DISCRIMINATOR_VALUES) && state.owners.has(ref)) {\n    return;\n  }\n  const inherited = { ...discriminator };\n  state.objects[ref] = inherited;\n  recordEnumParent(state, { discriminator, discriminatorRef: ownerRef }, inherited);\n}\n\n/**\n * An `allOf` item that is a `$ref` to a discriminator owner: the schema at `ref` inherits the\n * discriminator, and gets its enum when the parent's mapping names it. Returns false when the\n * `$ref` owns no discriminator, which ends the scan of this `allOf` (as in the original).\n */\nfunction inheritFromRef(state: ScanState, parentRef: string, ref: string): boolean {\n  const discriminator = state.objects[parentRef];\n  if (!discriminator) {\n    return false;\n  }\n  const values = valuesMappedTo(discriminator, ref);\n  const patch = { ref, values, discriminator, discriminatorRef: parentRef };\n  if (values.length > 0 && patchDiscriminatorEnum(state, patch)) {\n    markHandled(state, ref);\n  }\n  if (inheritsDiscriminator(state, parentRef, ref)) {\n    recordInherited(state, ref, discriminator, parentRef);\n    if (mergesValues(state)) {\n      inheritOtherOwners(state, parentRef, ref);\n    }\n  }\n  return true;\n}\n\n/** Pass 2: a schema whose `allOf` holds a discriminator, or a `$ref` to one, inherits it. */\nfunction inheritDiscriminators(\n  state: ScanState,\n  value: Record<string, unknown>,\n  path: (string | number)[],\n): void {\n  if (!Array.isArray(value.allOf)) {\n    return;\n  }\n  for (const item of value.allOf as (SchemaObject | ReferenceObject)[]) {\n    if (\"$ref\" in item) {\n      if (!inheritFromRef(state, item.$ref, createRef(path))) {\n        return;\n      }\n    } else if (item.discriminator?.propertyName) {\n      // The inline item is typed at the schema's own location.\n      recordInherited(state, createRef(path), item.discriminator, createRef(path));\n    }\n  }\n}\n\n/** The discriminators of a bundled document, after patching the mapped schemas in place. */\nexport interface DiscriminatorScan {\n  objects: Record<string, DiscriminatorObject>;\n  refsHandled: string[];\n  /** With `discriminator-values`: the owner's enum of each enum the scan added. */\n  enumParents: ReadonlyMap<object, EnumParent>;\n  /** With `discriminator-values`: the properties of the other discriminators a schema inherits. */\n  otherProperties: Readonly<Record<string, readonly string[]>>;\n}\n\n/**\n * With the fix: a schema-name value, only for a schema and property that no mapping gave a value.\n * Every enum patched so far came from a mapping, since schema-name values wait for this step.\n */\nfunction applyInferredPatches(state: ScanState): void {\n  // A value that a schema declares itself came from a mapping as well.\n  const mapped = new Set([...state.patchedEnums.keys(), ...state.declaredKeys]);\n  for (const patch of state.inferredPatches) {\n    if (!mapped.has(enumKey(patch)) && patchDiscriminatorEnum(state, patch)) {\n      markHandled(state, patch.ref);\n    }\n  }\n  applyOtherInferredPatches(state, mapped);\n}\n\n/** Find every discriminator in `schema`; warnings go to `logger` unless `silent`. */\nexport function findDiscriminators(\n  schema: OpenAPI3,\n  options: DiscriminatorScanOptions,\n): DiscriminatorScan {\n  const state: ScanState = {\n    ...options,\n    schema,\n    objects: {},\n    owners: new Set(),\n    refsHandled: [],\n    patchedEnums: new Map(),\n    inferredPatches: [],\n    otherInferredPatches: [],\n    otherProperties: {},\n    declaredKeys: new Set(),\n    enumParents: new Map(),\n  };\n  walkDocument(schema, (value, path) => collectDiscriminator(state, value, path));\n  // A second pass, because an `allOf` may name a discriminator that is defined later.\n  walkDocument(schema, (value, path) => inheritDiscriminators(state, value, path));\n  applyInferredPatches(state);\n  const { objects, refsHandled, enumParents, otherProperties } = state;\n  return { objects, refsHandled, enumParents, otherProperties };\n}\n\n/**\n * Return a key–value map of discriminator objects found in a schema. Warnings go to `logger`;\n * without one, to the default terminal logger, as the original did.\n * @deprecated Kept for 1.x; removed in 2.0 (ADR-004, decision 9).\n */\nexport function scanDiscriminators(\n  schema: OpenAPI3,\n  options: GeneratorOptions,\n  logger: Logger = defaultLogger(options.silent ?? false),\n): DiscriminatorScan {\n  const silent = options.silent ?? false;\n  return findDiscriminators(schema, { silent, logger, fixes: new Set() });\n}\n"],"names":["mergesValues","patchDiscriminatorEnum","markHandled","createRef","OutputFix","resolveDocumentRef","unionAt","isUnionMember","recordEnumParent","inheritOtherOwners","enumKey","applyOtherInferredPatches","walkDocument","defaultLogger"],"mappings":"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"}

package/dist/api/discriminator-scan.mjs

@@ -1,55 +1,11 @@
+import { unionAt, isUnionMember } from '../domain/openapi/discriminated-union.mjs';
+import { OutputFix } from '../domain/output-fixes.mjs';
 import { defaultLogger } from './default-ports.mjs';
-import { addEnumProperty } from './discriminator-enum.mjs';
+import { applyOtherInferredPatches, inheritOtherOwners } from './discriminator-other-owners.mjs';
+import { enumKey, patchDiscriminatorEnum, markHandled, mergesValues, recordEnumParent } from './discriminator-patch.mjs';
 import { walkDocument, resolveDocumentRef } from './document-refs.mjs';
 import { createRef } from './legacy-utils.mjs';
 
-function addDiscriminatorEnum(state, patch) {
-  const { silent, logger } = state;
-  const resolved = resolveDocumentRef(state.schema, patch.ref, { silent, logger });
-  const added = 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) {
@@ -63,8 +19,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;
     }
@@ -76,12 +32,12 @@ 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 = !mergesValues(state) && state.refsHandled.includes(ref);
     if (isSkipped || !inferred && !defined) {
       continue;
     }
     const values = defined ?? [inferred];
-    if (state.fixesValueConflicts && defined === void 0) {
+    if (mergesValues(state) && defined === void 0) {
       state.inferredPatches.push({ ...discriminator, ref, values });
     } else if (patchDiscriminatorEnum(state, { ...discriminator, ref, values })) {
       markHandled(state, ref);
@@ -95,18 +51,35 @@ function collectDiscriminator(state, value, path) {
   }
   const discriminatorRef = 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(OutputFix.ALLOF_DISCRIMINATED_UNION)) {
+    return true;
+  }
+  const resolve = (target) => resolveDocumentRef(state.schema, target, state);
+  const union = unionAt(parentRef, resolve);
+  return union === void 0 || isUnionMember(union, ref, resolve);
+}
+function recordInherited(state, ref, discriminator, ownerRef) {
+  if (state.fixes.has(OutputFix.DISCRIMINATOR_VALUES) && state.owners.has(ref)) {
+    return;
+  }
+  const inherited = { ...discriminator };
+  state.objects[ref] = inherited;
+  recordEnumParent(state, { discriminator, discriminatorRef: ownerRef }, inherited);
+}
 function inheritFromRef(state, parentRef, ref) {
   const discriminator = state.objects[parentRef];
   if (!discriminator) {
@@ -117,7 +90,12 @@ function inheritFromRef(state, parentRef, ref) {
   if (values.length > 0 && patchDiscriminatorEnum(state, patch)) {
     markHandled(state, ref);
   }
-  state.objects[ref] = { ...discriminator };
+  if (inheritsDiscriminator(state, parentRef, ref)) {
+    recordInherited(state, ref, discriminator, parentRef);
+    if (mergesValues(state)) {
+      inheritOtherOwners(state, parentRef, ref);
+    }
+  }
   return true;
 }
 function inheritDiscriminators(state, value, path) {
@@ -130,35 +108,42 @@ function inheritDiscriminators(state, value, path) {
         return;
       }
     } else if (item.discriminator?.propertyName) {
-      state.objects[createRef(path)] = { ...item.discriminator };
+      recordInherited(state, createRef(path), item.discriminator, 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);
     }
   }
+  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()
   };
   walkDocument(schema, (value, path) => collectDiscriminator(state, value, path));
   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 = 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() });
 }
 
 export { findDiscriminators, scanDiscriminators };