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

package/dist/api/discriminator-patch.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+const appendAll = require('../domain/append-all.cjs');
 const outputFixes = require('../domain/output-fixes.cjs');
 const warnings = require('../domain/warnings.cjs');
 const discriminatorEnum = require('./discriminator-enum.cjs');
@@ -7,17 +8,17 @@ const discriminatorEnumParent = require('./discriminator-enum-parent.cjs');
 const documentRefs = require('./document-refs.cjs');
 
 function mergesValues(state) {
-  return state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES);
+  return state.fixes.has(outputFixes.FIX.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);
+  return state.fixes.has(outputFixes.FIX.DISCRIMINATOR_VALUES) && discriminatorEnum.declaresValues(patchedSchema(state, patch), patch);
 }
 function recordEnumParent(state, owner, key) {
-  if (!state.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_VALUES)) {
+  if (!state.fixes.has(outputFixes.FIX.DISCRIMINATOR_VALUES)) {
     return;
   }
   const { silent, logger } = state;
@@ -48,7 +49,10 @@ function mergeIntoPatchedEnum(state, key, values) {
     return false;
   }
   const merged = patched.enum;
-  merged.push(...values.filter((value) => !merged.includes(value)));
+  appendAll.appendAll(
+    merged,
+    values.filter((value) => !merged.includes(value))
+  );
   return true;
 }
 function patchDiscriminatorEnum(state, patch) {

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

@@ -1 +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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"}
+{"version":3,"file":"discriminator-patch.cjs","sources":["../../src/api/discriminator-patch.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport { appendAll } from \"../domain/append-all.js\";\nimport { FIX, type 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(FIX.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(FIX.DISCRIMINATOR_VALUES) && 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(FIX.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  appendAll(\n    merged,\n    values.filter((value) => !merged.includes(value)),\n  );\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":["FIX","resolveDocumentRef","declaresValues","enumParentOf","addEnumProperty","appendAll","warningText","WARNING_CODES"],"mappings":"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"}

package/dist/api/discriminator-patch.mjs

@@ -1,21 +1,22 @@
-import { OutputFix } from '../domain/output-fixes.mjs';
+import { appendAll } from '../domain/append-all.mjs';
+import { FIX } 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);
+  return state.fixes.has(FIX.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);
+  return state.fixes.has(FIX.DISCRIMINATOR_VALUES) && declaresValues(patchedSchema(state, patch), patch);
 }
 function recordEnumParent(state, owner, key) {
-  if (!state.fixes.has(OutputFix.DISCRIMINATOR_VALUES)) {
+  if (!state.fixes.has(FIX.DISCRIMINATOR_VALUES)) {
     return;
   }
   const { silent, logger } = state;
@@ -46,7 +47,10 @@ function mergeIntoPatchedEnum(state, key, values) {
     return false;
   }
   const merged = patched.enum;
-  merged.push(...values.filter((value) => !merged.includes(value)));
+  appendAll(
+    merged,
+    values.filter((value) => !merged.includes(value))
+  );
   return true;
 }
 function patchDiscriminatorEnum(state, patch) {

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

@@ -1 +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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"}
+{"version":3,"file":"discriminator-patch.mjs","sources":["../../src/api/discriminator-patch.ts"],"sourcesContent":["import type { Logger } from \"../application/ports/logger.js\";\nimport { appendAll } from \"../domain/append-all.js\";\nimport { FIX, type 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(FIX.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(FIX.DISCRIMINATOR_VALUES) && 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(FIX.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  appendAll(\n    merged,\n    values.filter((value) => !merged.includes(value)),\n  );\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,12 +1,12 @@
 'use strict';
 
 const discriminatedUnion = require('../domain/openapi/discriminated-union.cjs');
+const jsonPointer = require('../domain/openapi/json-pointer.cjs');
 const outputFixes = require('../domain/output-fixes.cjs');
 const defaultPorts = require('./default-ports.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 inferredMapping(oneOf) {
   const mapping = {};
@@ -15,17 +15,19 @@ function inferredMapping(oneOf) {
       continue;
     }
     const value = item.$ref.split("/").pop();
+    const ref = jsonPointer.canonicalRef(item.$ref);
     if (value) {
-      mapping[item.$ref] = { ...mapping[item.$ref], inferred: value };
+      mapping[ref] = { ...mapping[ref], inferred: value };
     }
   }
   return mapping;
 }
 function addDefinedMapping(mapping, defined) {
-  for (const [mappedValue, mappedRef] of Object.entries(defined)) {
-    if (!mappedRef) {
+  for (const [mappedValue, target] of Object.entries(defined)) {
+    if (!target) {
       continue;
     }
+    const mappedRef = jsonPointer.canonicalRef(target);
     if (!mapping[mappedRef]?.defined) {
       mapping[mappedRef] = { defined: [] };
     }
@@ -51,7 +53,7 @@ function collectDiscriminator(state, value, path) {
   if (!discriminator?.propertyName) {
     return;
   }
-  const discriminatorRef = legacyUtils.createRef(path);
+  const discriminatorRef = jsonPointer.appendPointer(jsonPointer.ROOT_POINTER, path);
   state.objects[discriminatorRef] = discriminator;
   state.owners.add(discriminatorRef);
   if (!Array.isArray(value.oneOf)) {
@@ -64,10 +66,10 @@ function collectDiscriminator(state, value, path) {
   patchMappedSchemas(state, mapping, { discriminator, discriminatorRef });
 }
 function valuesMappedTo(discriminator, ref) {
-  return Object.entries(discriminator.mapping ?? {}).filter(([, mappedRef]) => mappedRef === ref).map(([mappedValue]) => mappedValue);
+  return Object.entries(discriminator.mapping ?? {}).filter(([, mappedRef]) => jsonPointer.canonicalRef(mappedRef) === ref).map(([mappedValue]) => mappedValue);
 }
 function inheritsDiscriminator(state, parentRef, ref) {
-  if (!state.fixes.has(outputFixes.OutputFix.ALLOF_DISCRIMINATED_UNION)) {
+  if (!state.fixes.has(outputFixes.FIX.ALLOF_DISCRIMINATED_UNION)) {
     return true;
   }
   const resolve = (target) => documentRefs.resolveDocumentRef(state.schema, target, state);
@@ -75,7 +77,7 @@ function inheritsDiscriminator(state, parentRef, ref) {
   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)) {
+  if (state.fixes.has(outputFixes.FIX.DISCRIMINATOR_VALUES) && state.owners.has(ref)) {
     return;
   }
   const inherited = { ...discriminator };
@@ -106,11 +108,16 @@ function inheritDiscriminators(state, value, path) {
   }
   for (const item of value.allOf) {
     if ("$ref" in item) {
-      if (!inheritFromRef(state, item.$ref, legacyUtils.createRef(path))) {
+      if (!inheritFromRef(state, jsonPointer.canonicalRef(item.$ref), jsonPointer.appendPointer(jsonPointer.ROOT_POINTER, path))) {
         return;
       }
     } else if (item.discriminator?.propertyName) {
-      recordInherited(state, legacyUtils.createRef(path), item.discriminator, legacyUtils.createRef(path));
+      recordInherited(
+        state,
+        jsonPointer.appendPointer(jsonPointer.ROOT_POINTER, path),
+        item.discriminator,
+        jsonPointer.appendPointer(jsonPointer.ROOT_POINTER, path)
+      );
     }
   }
 }

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 { 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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"}
+{"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 { appendPointer, canonicalRef, ROOT_POINTER } from \"../domain/openapi/json-pointer.js\";\nimport { FIX } 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\";\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    // The value is the name as the `$ref` writes it, as in the original.\n    const value = item.$ref.split(\"/\").pop();\n    const ref = canonicalRef(item.$ref);\n    if (value) {\n      mapping[ref] = { ...mapping[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, target] of Object.entries(defined)) {\n    if (!target) {\n      continue;\n    }\n    const mappedRef = canonicalRef(target);\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 = appendPointer(ROOT_POINTER, 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]) => canonicalRef(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(FIX.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(FIX.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, canonicalRef(item.$ref), appendPointer(ROOT_POINTER, path))) {\n        return;\n      }\n    } else if (item.discriminator?.propertyName) {\n      // The inline item is typed at the schema's own location.\n      recordInherited(\n        state,\n        appendPointer(ROOT_POINTER, path),\n        item.discriminator,\n        appendPointer(ROOT_POINTER, path),\n      );\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":["canonicalRef","mergesValues","patchDiscriminatorEnum","markHandled","appendPointer","ROOT_POINTER","FIX","resolveDocumentRef","unionAt","isUnionMember","recordEnumParent","inheritOtherOwners","enumKey","applyOtherInferredPatches","walkDocument","defaultLogger"],"mappings":";;;;;;;;;;AAmCA,SAAS,gBAAgB,KAAA,EAAiE;AACxF,EAAA,MAAM,UAAgC,EAAC;AACvC,EAAA,KAAA,MAAW,QAAQ,KAAA,EAAO;AACxB,IAAA,IAAI,EAAE,UAAU,IAAA,CAAA,EAAO;AACrB,MAAA;AAAA,IACF;AAEA,IAAA,MAAM,QAAQ,IAAA,CAAK,IAAA,CAAK,KAAA,CAAM,GAAG,EAAE,GAAA,EAAI;AACvC,IAAA,MAAM,GAAA,GAAMA,wBAAA,CAAa,IAAA,CAAK,IAAI,CAAA;AAClC,IAAA,IAAI,KAAA,EAAO;AACT,MAAA,OAAA,CAAQ,GAAG,IAAI,EAAE,GAAG,QAAQ,GAAG,CAAA,EAAG,UAAU,KAAA,EAAM;AAAA,IACpD;AAAA,EACF;AACA,EAAA,OAAO,OAAA;AACT;AAGA,SAAS,iBAAA,CACP,SACA,OAAA,EACM;AACN,EAAA,KAAA,MAAW,CAAC,WAAA,EAAa,MAAM,KAAK,MAAA,CAAO,OAAA,CAAQ,OAAO,CAAA,EAAG;AAC3D,IAAA,IAAI,CAAC,MAAA,EAAQ;AACX,MAAA;AAAA,IACF;AACA,IAAA,MAAM,SAAA,GAAYA,yBAAa,MAAM,CAAA;AACrC,IAAA,IAAI,CAAC,OAAA,CAAQ,SAAS,CAAA,EAAG,OAAA,EAAS;AAChC,MAAA,OAAA,CAAQ,SAAS,CAAA,GAAI,EAAE,OAAA,EAAS,EAAC,EAAE;AAAA,IACrC;AACA,IAAA,OAAA,CAAQ,SAAS,CAAA,CAAE,OAAA,EAAS,IAAA,CAAK,WAAW,CAAA;AAAA,EAC9C;AACF;AAEA,SAAS,kBAAA,CACP,KAAA,EACA,OAAA,EACA,aAAA,EACM;AACN,EAAA,KAAA,MAAW,CAAC,GAAA,EAAK,EAAE,QAAA,EAAU,OAAA,EAAS,CAAA,IAAK,MAAA,CAAO,OAAA,CAAQ,OAAO,CAAA,EAAG;AAClE,IAAA,MAAM,SAAA,GAAY,CAACC,+BAAA,CAAa,KAAK,KAAK,KAAA,CAAM,WAAA,CAAY,SAAS,GAAG,CAAA;AACxE,IAAA,IAAI,SAAA,IAAc,CAAC,QAAA,IAAY,CAAC,OAAA,EAAU;AACxC,MAAA;AAAA,IACF;AAEA,IAAA,MAAM,MAAA,GAAS,OAAA,IAAW,CAAC,QAAkB,CAAA;AAC7C,IAAA,IAAIA,+BAAA,CAAa,KAAK,CAAA,IAAK,OAAA,KAAY,MAAA,EAAW;AAEhD,MAAA,KAAA,CAAM,gBAAgB,IAAA,CAAK,EAAE,GAAG,aAAA,EAAe,GAAA,EAAK,QAAQ,CAAA;AAAA,IAC9D,CAAA,MAAA,IAAWC,0CAAuB,KAAA,EAAO,EAAE,GAAG,aAAA,EAAe,GAAA,EAAK,MAAA,EAAQ,CAAA,EAAG;AAC3E,MAAAC,8BAAA,CAAY,OAAO,GAAG,CAAA;AAAA,IACxB;AAAA,EACF;AACF;AAGA,SAAS,oBAAA,CACP,KAAA,EACA,KAAA,EACA,IAAA,EACM;AACN,EAAA,MAAM,gBAAgB,KAAA,CAAM,aAAA;AAC5B,EAAA,IAAI,CAAC,eAAe,YAAA,EAAc;AAChC,IAAA;AAAA,EACF;AACA,EAAA,MAAM,gBAAA,GAAmBC,yBAAA,CAAcC,wBAAA,EAAc,IAAI,CAAA;AACzD,EAAA,KAAA,CAAM,OAAA,CAAQ,gBAAgB,CAAA,GAAI,aAAA;AAClC,EAAA,KAAA,CAAM,MAAA,CAAO,IAAI,gBAAgB,CAAA;AACjC,EAAA,IAAI,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAA,CAAM,KAAK,CAAA,EAAG;AAC/B,IAAA;AAAA,EACF;AACA,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,KAAA,CAAM,KAAK,CAAA;AAC3C,EAAA,IAAI,cAAc,OAAA,EAAS;AACzB,IAAA,iBAAA,CAAkB,OAAA,EAAS,cAAc,OAAO,CAAA;AAAA,EAClD;AACA,EAAA,kBAAA,CAAmB,KAAA,EAAO,OAAA,EAAS,EAAE,aAAA,EAAe,kBAAkB,CAAA;AACxE;AAGA,SAAS,cAAA,CAAe,eAAoC,GAAA,EAAuB;AACjF,EAAA,OAAO,MAAA,CAAO,QAAQ,aAAA,CAAc,OAAA,IAAW,EAAE,CAAA,CAC9C,MAAA,CAAO,CAAC,GAAG,SAAS,CAAA,KAAML,wBAAA,CAAa,SAAS,CAAA,KAAM,GAAG,CAAA,CACzD,IAAI,CAAC,CAAC,WAAW,CAAA,KAAM,WAAW,CAAA;AACvC;AAQA,SAAS,qBAAA,CAAsB,KAAA,EAAkB,SAAA,EAAmB,GAAA,EAAsB;AACxF,EAAA,IAAI,CAAC,KAAA,CAAM,KAAA,CAAM,GAAA,CAAIM,eAAA,CAAI,yBAAyB,CAAA,EAAG;AACnD,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,UAAU,CAAC,MAAA,KAAmBC,gCAAmB,KAAA,CAAM,MAAA,EAAQ,QAAQ,KAAK,CAAA;AAClF,EAAA,MAAM,KAAA,GAAQC,0BAAA,CAAQ,SAAA,EAAW,OAAO,CAAA;AACxC,EAAA,OAAO,KAAA,KAAU,MAAA,IAAaC,gCAAA,CAAc,KAAA,EAAO,KAAK,OAAO,CAAA;AACjE;AAQA,SAAS,eAAA,CACP,KAAA,EACA,GAAA,EACA,aAAA,EACA,QAAA,EACM;AACN,EAAA,IAAI,KAAA,CAAM,KAAA,CAAM,GAAA,CAAIH,eAAA,CAAI,oBAAoB,KAAK,KAAA,CAAM,MAAA,CAAO,GAAA,CAAI,GAAG,CAAA,EAAG;AACtE,IAAA;AAAA,EACF;AACA,EAAA,MAAM,SAAA,GAAY,EAAE,GAAG,aAAA,EAAc;AACrC,EAAA,KAAA,CAAM,OAAA,CAAQ,GAAG,CAAA,GAAI,SAAA;AACrB,EAAAI,mCAAA,CAAiB,OAAO,EAAE,aAAA,EAAe,gBAAA,EAAkB,QAAA,IAAY,SAAS,CAAA;AAClF;AAOA,SAAS,cAAA,CAAe,KAAA,EAAkB,SAAA,EAAmB,GAAA,EAAsB;AACjF,EAAA,MAAM,aAAA,GAAgB,KAAA,CAAM,OAAA,CAAQ,SAAS,CAAA;AAC7C,EAAA,IAAI,CAAC,aAAA,EAAe;AAClB,IAAA,OAAO,KAAA;AAAA,EACT;AACA,EAAA,MAAM,MAAA,GAAS,cAAA,CAAe,aAAA,EAAe,GAAG,CAAA;AAChD,EAAA,MAAM,QAAQ,EAAE,GAAA,EAAK,MAAA,EAAQ,aAAA,EAAe,kBAAkB,SAAA,EAAU;AACxE,EAAA,IAAI,OAAO,MAAA,GAAS,CAAA,IAAKR,yCAAA,CAAuB,KAAA,EAAO,KAAK,CAAA,EAAG;AAC7D,IAAAC,8BAAA,CAAY,OAAO,GAAG,CAAA;AAAA,EACxB;AACA,EAAA,IAAI,qBAAA,CAAsB,KAAA,EAAO,SAAA,EAAW,GAAG,CAAA,EAAG;AAChD,IAAA,eAAA,CAAgB,KAAA,EAAO,GAAA,EAAK,aAAA,EAAe,SAAS,CAAA;AACpD,IAAA,IAAIF,+BAAA,CAAa,KAAK,CAAA,EAAG;AACvB,MAAAU,2CAAA,CAAmB,KAAA,EAAO,WAAW,GAAG,CAAA;AAAA,IAC1C;AAAA,EACF;AACA,EAAA,OAAO,IAAA;AACT;AAGA,SAAS,qBAAA,CACP,KAAA,EACA,KAAA,EACA,IAAA,EACM;AACN,EAAA,IAAI,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAA,CAAM,KAAK,CAAA,EAAG;AAC/B,IAAA;AAAA,EACF;AACA,EAAA,KAAA,MAAW,IAAA,IAAQ,MAAM,KAAA,EAA6C;AACpE,IAAA,IAAI,UAAU,IAAA,EAAM;AAClB,MAAA,IAAI,CAAC,cAAA,CAAe,KAAA,EAAOX,wBAAA,CAAa,IAAA,CAAK,IAAI,CAAA,EAAGI,yBAAA,CAAcC,wBAAA,EAAc,IAAI,CAAC,CAAA,EAAG;AACtF,QAAA;AAAA,MACF;AAAA,IACF,CAAA,MAAA,IAAW,IAAA,CAAK,aAAA,EAAe,YAAA,EAAc;AAE3C,MAAA,eAAA;AAAA,QACE,KAAA;AAAA,QACAD,yBAAA,CAAcC,0BAAc,IAAI,CAAA;AAAA,QAChC,IAAA,CAAK,aAAA;AAAA,QACLD,yBAAA,CAAcC,0BAAc,IAAI;AAAA,OAClC;AAAA,IACF;AAAA,EACF;AACF;AAgBA,SAAS,qBAAqB,KAAA,EAAwB;AAEpD,EAAA,MAAM,MAAA,mBAAS,IAAI,GAAA,CAAI,CAAC,GAAG,KAAA,CAAM,YAAA,CAAa,IAAA,EAAK,EAAG,GAAG,KAAA,CAAM,YAAY,CAAC,CAAA;AAC5E,EAAA,KAAA,MAAW,KAAA,IAAS,MAAM,eAAA,EAAiB;AACzC,IAAA,IAAI,CAAC,MAAA,CAAO,GAAA,CAAIO,0BAAA,CAAQ,KAAK,CAAC,CAAA,IAAKV,yCAAA,CAAuB,KAAA,EAAO,KAAK,CAAA,EAAG;AACvE,MAAAC,8BAAA,CAAY,KAAA,EAAO,MAAM,GAAG,CAAA;AAAA,IAC9B;AAAA,EACF;AACA,EAAAU,kDAAA,CAA0B,OAAO,MAAM,CAAA;AACzC;AAGO,SAAS,kBAAA,CACd,QACA,OAAA,EACmB;AACnB,EAAA,MAAM,KAAA,GAAmB;AAAA,IACvB,GAAG,OAAA;AAAA,IACH,MAAA;AAAA,IACA,SAAS,EAAC;AAAA,IACV,MAAA,sBAAY,GAAA,EAAI;AAAA,IAChB,aAAa,EAAC;AAAA,IACd,YAAA,sBAAkB,GAAA,EAAI;AAAA,IACtB,iBAAiB,EAAC;AAAA,IAClB,sBAAsB,EAAC;AAAA,IACvB,iBAAiB,EAAC;AAAA,IAClB,YAAA,sBAAkB,GAAA,EAAI;AAAA,IACtB,WAAA,sBAAiB,GAAA;AAAI,GACvB;AACA,EAAAC,yBAAA,CAAa,MAAA,EAAQ,CAAC,KAAA,EAAO,IAAA,KAAS,qBAAqB,KAAA,EAAO,KAAA,EAAO,IAAI,CAAC,CAAA;AAE9E,EAAAA,yBAAA,CAAa,MAAA,EAAQ,CAAC,KAAA,EAAO,IAAA,KAAS,sBAAsB,KAAA,EAAO,KAAA,EAAO,IAAI,CAAC,CAAA;AAC/E,EAAA,oBAAA,CAAqB,KAAK,CAAA;AAC1B,EAAA,MAAM,EAAE,OAAA,EAAS,WAAA,EAAa,WAAA,EAAa,iBAAgB,GAAI,KAAA;AAC/D,EAAA,OAAO,EAAE,OAAA,EAAS,WAAA,EAAa,WAAA,EAAa,eAAA,EAAgB;AAC9D;AAOO,SAAS,kBAAA,CACd,QACA,OAAA,EACA,MAAA,GAAiBC,2BAAc,OAAA,CAAQ,MAAA,IAAU,KAAK,CAAA,EACnC;AACnB,EAAA,MAAM,MAAA,GAAS,QAAQ,MAAA,IAAU,KAAA;AACjC,EAAA,OAAO,kBAAA,CAAmB,QAAQ,EAAE,MAAA,EAAQ,QAAQ,KAAA,kBAAO,IAAI,GAAA,EAAI,EAAG,CAAA;AACxE;;;"}

package/dist/api/discriminator-scan.mjs

@@ -1,10 +1,10 @@
 import { unionAt, isUnionMember } from '../domain/openapi/discriminated-union.mjs';
-import { OutputFix } from '../domain/output-fixes.mjs';
+import { appendPointer, ROOT_POINTER, canonicalRef } from '../domain/openapi/json-pointer.mjs';
+import { FIX } from '../domain/output-fixes.mjs';
 import { defaultLogger } from './default-ports.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 inferredMapping(oneOf) {
   const mapping = {};
@@ -13,17 +13,19 @@ function inferredMapping(oneOf) {
       continue;
     }
     const value = item.$ref.split("/").pop();
+    const ref = canonicalRef(item.$ref);
     if (value) {
-      mapping[item.$ref] = { ...mapping[item.$ref], inferred: value };
+      mapping[ref] = { ...mapping[ref], inferred: value };
     }
   }
   return mapping;
 }
 function addDefinedMapping(mapping, defined) {
-  for (const [mappedValue, mappedRef] of Object.entries(defined)) {
-    if (!mappedRef) {
+  for (const [mappedValue, target] of Object.entries(defined)) {
+    if (!target) {
       continue;
     }
+    const mappedRef = canonicalRef(target);
     if (!mapping[mappedRef]?.defined) {
       mapping[mappedRef] = { defined: [] };
     }
@@ -49,7 +51,7 @@ function collectDiscriminator(state, value, path) {
   if (!discriminator?.propertyName) {
     return;
   }
-  const discriminatorRef = createRef(path);
+  const discriminatorRef = appendPointer(ROOT_POINTER, path);
   state.objects[discriminatorRef] = discriminator;
   state.owners.add(discriminatorRef);
   if (!Array.isArray(value.oneOf)) {
@@ -62,10 +64,10 @@ function collectDiscriminator(state, value, path) {
   patchMappedSchemas(state, mapping, { discriminator, discriminatorRef });
 }
 function valuesMappedTo(discriminator, ref) {
-  return Object.entries(discriminator.mapping ?? {}).filter(([, mappedRef]) => mappedRef === ref).map(([mappedValue]) => mappedValue);
+  return Object.entries(discriminator.mapping ?? {}).filter(([, mappedRef]) => canonicalRef(mappedRef) === ref).map(([mappedValue]) => mappedValue);
 }
 function inheritsDiscriminator(state, parentRef, ref) {
-  if (!state.fixes.has(OutputFix.ALLOF_DISCRIMINATED_UNION)) {
+  if (!state.fixes.has(FIX.ALLOF_DISCRIMINATED_UNION)) {
     return true;
   }
   const resolve = (target) => resolveDocumentRef(state.schema, target, state);
@@ -73,7 +75,7 @@ function inheritsDiscriminator(state, parentRef, ref) {
   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)) {
+  if (state.fixes.has(FIX.DISCRIMINATOR_VALUES) && state.owners.has(ref)) {
     return;
   }
   const inherited = { ...discriminator };
@@ -104,11 +106,16 @@ function inheritDiscriminators(state, value, path) {
   }
   for (const item of value.allOf) {
     if ("$ref" in item) {
-      if (!inheritFromRef(state, item.$ref, createRef(path))) {
+      if (!inheritFromRef(state, canonicalRef(item.$ref), appendPointer(ROOT_POINTER, path))) {
         return;
       }
     } else if (item.discriminator?.propertyName) {
-      recordInherited(state, createRef(path), item.discriminator, createRef(path));
+      recordInherited(
+        state,
+        appendPointer(ROOT_POINTER, path),
+        item.discriminator,
+        appendPointer(ROOT_POINTER, path)
+      );
     }
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"discriminator-scan.mjs","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":[],"mappings":";;;;;;;;AAmCA,SAAS,gBAAgB,KAAA,EAAiE;AACxF,EAAA,MAAM,UAAgC,EAAC;AACvC,EAAA,KAAA,MAAW,QAAQ,KAAA,EAAO;AACxB,IAAA,IAAI,EAAE,UAAU,IAAA,CAAA,EAAO;AACrB,MAAA;AAAA,IACF;AACA,IAAA,MAAM,QAAQ,IAAA,CAAK,IAAA,CAAK,KAAA,CAAM,GAAG,EAAE,GAAA,EAAI;AACvC,IAAA,IAAI,KAAA,EAAO;AACT,MAAA,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAA,GAAI,EAAE,GAAG,QAAQ,IAAA,CAAK,IAAI,CAAA,EAAG,QAAA,EAAU,KAAA,EAAM;AAAA,IAChE;AAAA,EACF;AACA,EAAA,OAAO,OAAA;AACT;AAGA,SAAS,iBAAA,CACP,SACA,OAAA,EACM;AACN,EAAA,KAAA,MAAW,CAAC,WAAA,EAAa,SAAS,KAAK,MAAA,CAAO,OAAA,CAAQ,OAAO,CAAA,EAAG;AAC9D,IAAA,IAAI,CAAC,SAAA,EAAW;AACd,MAAA;AAAA,IACF;AACA,IAAA,IAAI,CAAC,OAAA,CAAQ,SAAS,CAAA,EAAG,OAAA,EAAS;AAChC,MAAA,OAAA,CAAQ,SAAS,CAAA,GAAI,EAAE,OAAA,EAAS,EAAC,EAAE;AAAA,IACrC;AACA,IAAA,OAAA,CAAQ,SAAS,CAAA,CAAE,OAAA,EAAS,IAAA,CAAK,WAAW,CAAA;AAAA,EAC9C;AACF;AAEA,SAAS,kBAAA,CACP,KAAA,EACA,OAAA,EACA,aAAA,EACM;AACN,EAAA,KAAA,MAAW,CAAC,GAAA,EAAK,EAAE,QAAA,EAAU,OAAA,EAAS,CAAA,IAAK,MAAA,CAAO,OAAA,CAAQ,OAAO,CAAA,EAAG;AAClE,IAAA,MAAM,SAAA,GAAY,CAAC,YAAA,CAAa,KAAK,KAAK,KAAA,CAAM,WAAA,CAAY,SAAS,GAAG,CAAA;AACxE,IAAA,IAAI,SAAA,IAAc,CAAC,QAAA,IAAY,CAAC,OAAA,EAAU;AACxC,MAAA;AAAA,IACF;AAEA,IAAA,MAAM,MAAA,GAAS,OAAA,IAAW,CAAC,QAAkB,CAAA;AAC7C,IAAA,IAAI,YAAA,CAAa,KAAK,CAAA,IAAK,OAAA,KAAY,MAAA,EAAW;AAEhD,MAAA,KAAA,CAAM,gBAAgB,IAAA,CAAK,EAAE,GAAG,aAAA,EAAe,GAAA,EAAK,QAAQ,CAAA;AAAA,IAC9D,CAAA,MAAA,IAAW,uBAAuB,KAAA,EAAO,EAAE,GAAG,aAAA,EAAe,GAAA,EAAK,MAAA,EAAQ,CAAA,EAAG;AAC3E,MAAA,WAAA,CAAY,OAAO,GAAG,CAAA;AAAA,IACxB;AAAA,EACF;AACF;AAGA,SAAS,oBAAA,CACP,KAAA,EACA,KAAA,EACA,IAAA,EACM;AACN,EAAA,MAAM,gBAAgB,KAAA,CAAM,aAAA;AAC5B,EAAA,IAAI,CAAC,eAAe,YAAA,EAAc;AAChC,IAAA;AAAA,EACF;AACA,EAAA,MAAM,gBAAA,GAAmB,UAAU,IAAI,CAAA;AACvC,EAAA,KAAA,CAAM,OAAA,CAAQ,gBAAgB,CAAA,GAAI,aAAA;AAClC,EAAA,KAAA,CAAM,MAAA,CAAO,IAAI,gBAAgB,CAAA;AACjC,EAAA,IAAI,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAA,CAAM,KAAK,CAAA,EAAG;AAC/B,IAAA;AAAA,EACF;AACA,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,KAAA,CAAM,KAAK,CAAA;AAC3C,EAAA,IAAI,cAAc,OAAA,EAAS;AACzB,IAAA,iBAAA,CAAkB,OAAA,EAAS,cAAc,OAAO,CAAA;AAAA,EAClD;AACA,EAAA,kBAAA,CAAmB,KAAA,EAAO,OAAA,EAAS,EAAE,aAAA,EAAe,kBAAkB,CAAA;AACxE;AAGA,SAAS,cAAA,CAAe,eAAoC,GAAA,EAAuB;AACjF,EAAA,OAAO,MAAA,CAAO,QAAQ,aAAA,CAAc,OAAA,IAAW,EAAE,CAAA,CAC9C,OAAO,CAAC,GAAG,SAAS,CAAA,KAAM,cAAc,GAAG,CAAA,CAC3C,IAAI,CAAC,CAAC,WAAW,CAAA,KAAM,WAAW,CAAA;AACvC;AAQA,SAAS,qBAAA,CAAsB,KAAA,EAAkB,SAAA,EAAmB,GAAA,EAAsB;AACxF,EAAA,IAAI,CAAC,KAAA,CAAM,KAAA,CAAM,GAAA,CAAI,SAAA,CAAU,yBAAyB,CAAA,EAAG;AACzD,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,UAAU,CAAC,MAAA,KAAmB,mBAAmB,KAAA,CAAM,MAAA,EAAQ,QAAQ,KAAK,CAAA;AAClF,EAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,SAAA,EAAW,OAAO,CAAA;AACxC,EAAA,OAAO,KAAA,KAAU,MAAA,IAAa,aAAA,CAAc,KAAA,EAAO,KAAK,OAAO,CAAA;AACjE;AAQA,SAAS,eAAA,CACP,KAAA,EACA,GAAA,EACA,aAAA,EACA,QAAA,EACM;AACN,EAAA,IAAI,KAAA,CAAM,KAAA,CAAM,GAAA,CAAI,SAAA,CAAU,oBAAoB,KAAK,KAAA,CAAM,MAAA,CAAO,GAAA,CAAI,GAAG,CAAA,EAAG;AAC5E,IAAA;AAAA,EACF;AACA,EAAA,MAAM,SAAA,GAAY,EAAE,GAAG,aAAA,EAAc;AACrC,EAAA,KAAA,CAAM,OAAA,CAAQ,GAAG,CAAA,GAAI,SAAA;AACrB,EAAA,gBAAA,CAAiB,OAAO,EAAE,aAAA,EAAe,gBAAA,EAAkB,QAAA,IAAY,SAAS,CAAA;AAClF;AAOA,SAAS,cAAA,CAAe,KAAA,EAAkB,SAAA,EAAmB,GAAA,EAAsB;AACjF,EAAA,MAAM,aAAA,GAAgB,KAAA,CAAM,OAAA,CAAQ,SAAS,CAAA;AAC7C,EAAA,IAAI,CAAC,aAAA,EAAe;AAClB,IAAA,OAAO,KAAA;AAAA,EACT;AACA,EAAA,MAAM,MAAA,GAAS,cAAA,CAAe,aAAA,EAAe,GAAG,CAAA;AAChD,EAAA,MAAM,QAAQ,EAAE,GAAA,EAAK,MAAA,EAAQ,aAAA,EAAe,kBAAkB,SAAA,EAAU;AACxE,EAAA,IAAI,OAAO,MAAA,GAAS,CAAA,IAAK,sBAAA,CAAuB,KAAA,EAAO,KAAK,CAAA,EAAG;AAC7D,IAAA,WAAA,CAAY,OAAO,GAAG,CAAA;AAAA,EACxB;AACA,EAAA,IAAI,qBAAA,CAAsB,KAAA,EAAO,SAAA,EAAW,GAAG,CAAA,EAAG;AAChD,IAAA,eAAA,CAAgB,KAAA,EAAO,GAAA,EAAK,aAAA,EAAe,SAAS,CAAA;AACpD,IAAA,IAAI,YAAA,CAAa,KAAK,CAAA,EAAG;AACvB,MAAA,kBAAA,CAAmB,KAAA,EAAO,WAAW,GAAG,CAAA;AAAA,IAC1C;AAAA,EACF;AACA,EAAA,OAAO,IAAA;AACT;AAGA,SAAS,qBAAA,CACP,KAAA,EACA,KAAA,EACA,IAAA,EACM;AACN,EAAA,IAAI,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAA,CAAM,KAAK,CAAA,EAAG;AAC/B,IAAA;AAAA,EACF;AACA,EAAA,KAAA,MAAW,IAAA,IAAQ,MAAM,KAAA,EAA6C;AACpE,IAAA,IAAI,UAAU,IAAA,EAAM;AAClB,MAAA,IAAI,CAAC,eAAe,KAAA,EAAO,IAAA,CAAK,MAAM,SAAA,CAAU,IAAI,CAAC,CAAA,EAAG;AACtD,QAAA;AAAA,MACF;AAAA,IACF,CAAA,MAAA,IAAW,IAAA,CAAK,aAAA,EAAe,YAAA,EAAc;AAE3C,MAAA,eAAA,CAAgB,KAAA,EAAO,UAAU,IAAI,CAAA,EAAG,KAAK,aAAA,EAAe,SAAA,CAAU,IAAI,CAAC,CAAA;AAAA,IAC7E;AAAA,EACF;AACF;AAgBA,SAAS,qBAAqB,KAAA,EAAwB;AAEpD,EAAA,MAAM,MAAA,mBAAS,IAAI,GAAA,CAAI,CAAC,GAAG,KAAA,CAAM,YAAA,CAAa,IAAA,EAAK,EAAG,GAAG,KAAA,CAAM,YAAY,CAAC,CAAA;AAC5E,EAAA,KAAA,MAAW,KAAA,IAAS,MAAM,eAAA,EAAiB;AACzC,IAAA,IAAI,CAAC,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,KAAK,CAAC,CAAA,IAAK,sBAAA,CAAuB,KAAA,EAAO,KAAK,CAAA,EAAG;AACvE,MAAA,WAAA,CAAY,KAAA,EAAO,MAAM,GAAG,CAAA;AAAA,IAC9B;AAAA,EACF;AACA,EAAA,yBAAA,CAA0B,OAAO,MAAM,CAAA;AACzC;AAGO,SAAS,kBAAA,CACd,QACA,OAAA,EACmB;AACnB,EAAA,MAAM,KAAA,GAAmB;AAAA,IACvB,GAAG,OAAA;AAAA,IACH,MAAA;AAAA,IACA,SAAS,EAAC;AAAA,IACV,MAAA,sBAAY,GAAA,EAAI;AAAA,IAChB,aAAa,EAAC;AAAA,IACd,YAAA,sBAAkB,GAAA,EAAI;AAAA,IACtB,iBAAiB,EAAC;AAAA,IAClB,sBAAsB,EAAC;AAAA,IACvB,iBAAiB,EAAC;AAAA,IAClB,YAAA,sBAAkB,GAAA,EAAI;AAAA,IACtB,WAAA,sBAAiB,GAAA;AAAI,GACvB;AACA,EAAA,YAAA,CAAa,MAAA,EAAQ,CAAC,KAAA,EAAO,IAAA,KAAS,qBAAqB,KAAA,EAAO,KAAA,EAAO,IAAI,CAAC,CAAA;AAE9E,EAAA,YAAA,CAAa,MAAA,EAAQ,CAAC,KAAA,EAAO,IAAA,KAAS,sBAAsB,KAAA,EAAO,KAAA,EAAO,IAAI,CAAC,CAAA;AAC/E,EAAA,oBAAA,CAAqB,KAAK,CAAA;AAC1B,EAAA,MAAM,EAAE,OAAA,EAAS,WAAA,EAAa,WAAA,EAAa,iBAAgB,GAAI,KAAA;AAC/D,EAAA,OAAO,EAAE,OAAA,EAAS,WAAA,EAAa,WAAA,EAAa,eAAA,EAAgB;AAC9D;AAOO,SAAS,kBAAA,CACd,QACA,OAAA,EACA,MAAA,GAAiB,cAAc,OAAA,CAAQ,MAAA,IAAU,KAAK,CAAA,EACnC;AACnB,EAAA,MAAM,MAAA,GAAS,QAAQ,MAAA,IAAU,KAAA;AACjC,EAAA,OAAO,kBAAA,CAAmB,QAAQ,EAAE,MAAA,EAAQ,QAAQ,KAAA,kBAAO,IAAI,GAAA,EAAI,EAAG,CAAA;AACxE;;"}
+{"version":3,"file":"discriminator-scan.mjs","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 { appendPointer, canonicalRef, ROOT_POINTER } from \"../domain/openapi/json-pointer.js\";\nimport { FIX } 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\";\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    // The value is the name as the `$ref` writes it, as in the original.\n    const value = item.$ref.split(\"/\").pop();\n    const ref = canonicalRef(item.$ref);\n    if (value) {\n      mapping[ref] = { ...mapping[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, target] of Object.entries(defined)) {\n    if (!target) {\n      continue;\n    }\n    const mappedRef = canonicalRef(target);\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 = appendPointer(ROOT_POINTER, 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]) => canonicalRef(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(FIX.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(FIX.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, canonicalRef(item.$ref), appendPointer(ROOT_POINTER, path))) {\n        return;\n      }\n    } else if (item.discriminator?.propertyName) {\n      // The inline item is typed at the schema's own location.\n      recordInherited(\n        state,\n        appendPointer(ROOT_POINTER, path),\n        item.discriminator,\n        appendPointer(ROOT_POINTER, path),\n      );\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":[],"mappings":"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"}

package/dist/api/document-run.cjs

@@ -92,7 +92,7 @@ async function createDocumentRun(source, options, ports) {
   const fix = outputFixesOf(options, logger);
   const silent = options.silent ?? false;
   const cwd = sourceCwd(options);
-  const schema = await ports.loader.load({
+  const { document: schema, localFiles } = await ports.loader.load({
     source,
     cwd,
     shouldLint: options.lint ?? true,
@@ -115,9 +115,10 @@ async function createDocumentRun(source, options, ports) {
     injectFooter: [],
     redoc: ports.redoc,
     resolve: ($ref) => documentRefs.resolveDocumentRef(schema, $ref, { silent, logger }),
-    logger
+    logger,
+    deprecations: ports.deprecations
   };
-  return { schema, ctx };
+  return { schema, localFiles, ctx };
 }
 
 exports.createDocumentRun = createDocumentRun;

package/dist/api/document-run.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"document-run.cjs","sources":["../../src/api/document-run.ts"],"sourcesContent":["import path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport { sourceEmptyError } from \"../adapters/redocly-loader/schema-load-errors.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\nimport type { RefAccess, SchemaLoader } from \"../application/ports/schema-loader.js\";\nimport { withStackOverflowReported } from \"../application/stack-overflow.js\";\nimport {\n  ineffectiveFixNotices,\n  type OutputFix,\n  outputFixNamesOf,\n  resolveOutputFixes,\n} from \"../domain/output-fixes.js\";\nimport { WARNING_CODES, warningText } from \"../domain/warnings.js\";\nimport type { GeneratorOptions, OpenAPI3, SchemaSource } from \"../types.js\";\nimport { processCwd } from \"./default-ports.js\";\nimport { warnDiscriminatorValueConflicts } from \"./discriminator-conflict-warnings.js\";\nimport { findDiscriminators } from \"./discriminator-scan.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\nimport { warnIdenticalPathTemplates } from \"./path-template-warnings.js\";\nimport type { RunContext } from \"./run-context.js\";\nimport { warnUnsupportedFeatures } from \"./unsupported-feature-warnings.js\";\n\n/** The ports of one generator run, wired by the Node API or the CLI (ENGINEERING_PLAN 4.5). */\nexport interface GeneratorPorts {\n  readonly loader: SchemaLoader;\n  readonly logger: Logger;\n  /** The Redocly config the loader uses; the run's context exposes it as `ctx.redoc`. */\n  readonly redoc: RedoclyConfig;\n  /** A monotonic time in milliseconds, for debug durations. */\n  readonly now: () => number;\n}\n\n/** A validated, bundled document and the context of one generator run. */\nexport interface DocumentRun {\n  readonly schema: OpenAPI3;\n  readonly ctx: RunContext;\n}\n\n/** The context fields that are user flags, with the original defaults. */\ntype ContextFlags = Omit<\n  RunContext,\n  | \"discriminators\"\n  | \"injectFooter\"\n  | \"redoc\"\n  | \"resolve\"\n  | \"runFooter\"\n  | \"legacyCallbackWarnings\"\n  | \"logger\"\n  | \"fix\"\n>;\n\n/**\n * The directory that relative `$ref`s of an inline source resolve against, as a URL that ends in\n * a slash. A path is resolved and encoded (`#`, `%`, spaces); a URL without the slash gets one.\n */\nfunction sourceCwd(options: GeneratorOptions): URL {\n  const { cwd } = options;\n  if (cwd instanceof URL) {\n    return cwd.pathname.endsWith(\"/\") ? cwd : new URL(`${cwd.pathname}/`, cwd);\n  }\n  const directory = path.resolve(cwd === undefined ? processCwd() : cwd.toString());\n  return pathToFileURL(path.join(directory, path.sep));\n}\n\n/** The `$ref` limits of the options; a relative local root resolves against the cwd. */\nfunction refAccessOf(options: GeneratorOptions, cwd: URL): RefAccess {\n  const { localRefRoot, remoteRefHosts } = options;\n  const localRoot =\n    typeof localRefRoot === \"string\"\n      ? pathToFileURL(path.resolve(fileURLToPath(cwd), localRefRoot))\n      : localRefRoot;\n  return {\n    ...(localRoot === undefined ? {} : { localRoot }),\n    ...(remoteRefHosts === undefined ? {} : { remoteHosts: remoteRefHosts }),\n  };\n}\n\nfunction callbackOptions(options: GeneratorOptions) {\n  return {\n    irCallbacks: options.irCallbacks === true,\n    postTransform: typeof options.postTransform === \"function\" ? options.postTransform : undefined,\n    transform: typeof options.transform === \"function\" ? options.transform : undefined,\n    transformProperty:\n      typeof options.transformProperty === \"function\" ? options.transformProperty : undefined,\n  };\n}\n\nfunction contextFlags(options: GeneratorOptions): ContextFlags {\n  return {\n    additionalProperties: options.additionalProperties ?? false,\n    alphabetize: options.alphabetize ?? false,\n    arrayLength: options.arrayLength ?? false,\n    binaryAsBlob: options.binaryAsBlob ?? false,\n    defaultNonNullable: options.defaultNonNullable ?? true,\n    emptyObjectsUnknown: options.emptyObjectsUnknown ?? false,\n    enum: options.enum ?? false,\n    enumValues: options.enumValues ?? false,\n    conditionalEnums: options.conditionalEnums ?? false,\n    dedupeEnums: options.dedupeEnums ?? false,\n    excludeDeprecated: options.excludeDeprecated ?? false,\n    exportType: options.exportType ?? false,\n    immutable: options.immutable ?? false,\n    rootTypes: options.rootTypes ?? false,\n    rootTypesNoSchemaPrefix: options.rootTypesNoSchemaPrefix ?? false,\n    rootTypesKeepCasing: options.rootTypesKeepCasing ?? false,\n    pathParamsAsTypes: options.pathParamsAsTypes ?? false,\n    propertiesRequiredByDefault: options.propertiesRequiredByDefault ?? false,\n    silent: options.silent ?? false,\n    ...(options.inject === undefined ? {} : { inject: options.inject }),\n    makePathsEnum: options.makePathsEnum ?? false,\n    generatePathParams: options.generatePathParams ?? false,\n    readWriteMarkers: options.readWriteMarkers ?? false,\n    ...callbackOptions(options),\n  };\n}\n\n/**\n * The fixes of the options, `all` expanded; fails with `OPTION_FIX_UNKNOWN` for another name.\n * A fix named without the option it needs is reported, since it changes nothing.\n */\nfunction outputFixesOf(options: GeneratorOptions, logger: Logger): readonly OutputFix[] {\n  const names = outputFixNamesOf(options.fix ?? []);\n  for (const notice of ineffectiveFixNotices(names, (option) => options[option] === true)) {\n    logger.warn(warningText(notice, WARNING_CODES.FIX_NEEDS_OPTION));\n  }\n  return [...resolveOutputFixes(names)];\n}\n\n/** The warnings about the loaded document itself, before it is transformed. */\nfunction warnAboutDocument(schema: OpenAPI3, fix: readonly OutputFix[], logger: Logger): void {\n  withStackOverflowReported(\"transform\", () => warnUnsupportedFeatures(schema, logger));\n  withStackOverflowReported(\"transform\", () =>\n    warnDiscriminatorValueConflicts(schema, fix, logger),\n  );\n  warnIdenticalPathTemplates(schema, logger);\n}\n\n/**\n * Load the source through the ports, then build the run's context from the options. The fix names\n * are checked first, so a typo fails before the document is read.\n */\nexport async function createDocumentRun(\n  source: SchemaSource,\n  options: GeneratorOptions,\n  ports: GeneratorPorts,\n): Promise<DocumentRun> {\n  if (!source) {\n    throw sourceEmptyError(\"Empty schema. Please specify a URL, file path, or Redocly Config\");\n  }\n  const { logger } = ports;\n  const fix = outputFixesOf(options, logger);\n  const silent = options.silent ?? false;\n  const cwd = sourceCwd(options);\n  const schema = await ports.loader.load({\n    source,\n    cwd,\n    shouldLint: options.lint ?? true,\n    refAccess: refAccessOf(options, cwd),\n  });\n  warnAboutDocument(schema, fix, logger);\n  const ctx: RunContext = {\n    ...contextFlags(options),\n    fix,\n    // The scan walks every schema before the transform does, so on a larger stack, where loading\n    // passed, it is the first step to run out.\n    discriminators: withStackOverflowReported(\"transform\", () =>\n      findDiscriminators(schema, {\n        silent,\n        logger,\n        fixes: new Set(fix),\n      }),\n    ),\n    injectFooter: [],\n    redoc: ports.redoc,\n    resolve: ($ref) => resolveDocumentRef(schema, $ref, { silent, logger }),\n    logger,\n  };\n  return { schema, ctx };\n}\n"],"names":["path","processCwd","pathToFileURL","fileURLToPath","outputFixNamesOf","ineffectiveFixNotices","warningText","WARNING_CODES","resolveOutputFixes","withStackOverflowReported","warnUnsupportedFeatures","warnDiscriminatorValueConflicts","warnIdenticalPathTemplates","sourceEmptyError","findDiscriminators","resolveDocumentRef"],"mappings":"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"}
+{"version":3,"file":"document-run.cjs","sources":["../../src/api/document-run.ts"],"sourcesContent":["import path from \"node:path\";\nimport { fileURLToPath, pathToFileURL } from \"node:url\";\nimport type { Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport { sourceEmptyError } from \"../adapters/redocly-loader/schema-load-errors.js\";\nimport type { DeprecationReporter } from \"../application/ports/deprecation-reporter.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\nimport type { RefAccess, SchemaLoader } from \"../application/ports/schema-loader.js\";\nimport { withStackOverflowReported } from \"../application/stack-overflow.js\";\nimport {\n  ineffectiveFixNotices,\n  type OutputFix,\n  outputFixNamesOf,\n  resolveOutputFixes,\n} from \"../domain/output-fixes.js\";\nimport { WARNING_CODES, warningText } from \"../domain/warnings.js\";\nimport type { GeneratorOptions, OpenAPI3, SchemaSource } from \"../types.js\";\nimport { processCwd } from \"./default-ports.js\";\nimport { warnDiscriminatorValueConflicts } from \"./discriminator-conflict-warnings.js\";\nimport { findDiscriminators } from \"./discriminator-scan.js\";\nimport { resolveDocumentRef } from \"./document-refs.js\";\nimport { warnIdenticalPathTemplates } from \"./path-template-warnings.js\";\nimport type { RunContext } from \"./run-context.js\";\nimport { warnUnsupportedFeatures } from \"./unsupported-feature-warnings.js\";\n\n/** The ports of one generator run, wired by the Node API or the CLI (ENGINEERING_PLAN 4.5). */\nexport interface GeneratorPorts {\n  readonly loader: SchemaLoader;\n  readonly logger: Logger;\n  /** Where the run reports the deprecated callback forms (ADR-004). */\n  readonly deprecations: DeprecationReporter;\n  /** The Redocly config the loader uses; the run's context exposes it as `ctx.redoc`. */\n  readonly redoc: RedoclyConfig;\n  /** A monotonic time in milliseconds, for debug durations. */\n  readonly now: () => number;\n}\n\n/** A validated, bundled document, the local files it was read from, and the run's context. */\nexport interface DocumentRun {\n  readonly schema: OpenAPI3;\n  readonly localFiles: readonly URL[];\n  readonly ctx: RunContext;\n}\n\n/** The context fields that are user flags, with the original defaults. */\ntype ContextFlags = Omit<\n  RunContext,\n  | \"discriminators\"\n  | \"injectFooter\"\n  | \"redoc\"\n  | \"resolve\"\n  | \"runFooter\"\n  | \"legacyCallbackWarnings\"\n  | \"logger\"\n  | \"deprecations\"\n  | \"fix\"\n>;\n\n/**\n * The directory that relative `$ref`s of an inline source resolve against, as a URL that ends in\n * a slash. A path is resolved and encoded (`#`, `%`, spaces); a URL without the slash gets one.\n */\nfunction sourceCwd(options: GeneratorOptions): URL {\n  const { cwd } = options;\n  if (cwd instanceof URL) {\n    return cwd.pathname.endsWith(\"/\") ? cwd : new URL(`${cwd.pathname}/`, cwd);\n  }\n  const directory = path.resolve(cwd === undefined ? processCwd() : cwd.toString());\n  return pathToFileURL(path.join(directory, path.sep));\n}\n\n/** The `$ref` limits of the options; a relative local root resolves against the cwd. */\nfunction refAccessOf(options: GeneratorOptions, cwd: URL): RefAccess {\n  const { localRefRoot, remoteRefHosts } = options;\n  const localRoot =\n    typeof localRefRoot === \"string\"\n      ? pathToFileURL(path.resolve(fileURLToPath(cwd), localRefRoot))\n      : localRefRoot;\n  return {\n    ...(localRoot === undefined ? {} : { localRoot }),\n    ...(remoteRefHosts === undefined ? {} : { remoteHosts: remoteRefHosts }),\n  };\n}\n\nfunction callbackOptions(options: GeneratorOptions) {\n  return {\n    irCallbacks: options.irCallbacks === true,\n    postTransform: typeof options.postTransform === \"function\" ? options.postTransform : undefined,\n    transform: typeof options.transform === \"function\" ? options.transform : undefined,\n    transformProperty:\n      typeof options.transformProperty === \"function\" ? options.transformProperty : undefined,\n  };\n}\n\nfunction contextFlags(options: GeneratorOptions): ContextFlags {\n  return {\n    additionalProperties: options.additionalProperties ?? false,\n    alphabetize: options.alphabetize ?? false,\n    arrayLength: options.arrayLength ?? false,\n    binaryAsBlob: options.binaryAsBlob ?? false,\n    defaultNonNullable: options.defaultNonNullable ?? true,\n    emptyObjectsUnknown: options.emptyObjectsUnknown ?? false,\n    enum: options.enum ?? false,\n    enumValues: options.enumValues ?? false,\n    conditionalEnums: options.conditionalEnums ?? false,\n    dedupeEnums: options.dedupeEnums ?? false,\n    excludeDeprecated: options.excludeDeprecated ?? false,\n    exportType: options.exportType ?? false,\n    immutable: options.immutable ?? false,\n    rootTypes: options.rootTypes ?? false,\n    rootTypesNoSchemaPrefix: options.rootTypesNoSchemaPrefix ?? false,\n    rootTypesKeepCasing: options.rootTypesKeepCasing ?? false,\n    pathParamsAsTypes: options.pathParamsAsTypes ?? false,\n    propertiesRequiredByDefault: options.propertiesRequiredByDefault ?? false,\n    silent: options.silent ?? false,\n    ...(options.inject === undefined ? {} : { inject: options.inject }),\n    makePathsEnum: options.makePathsEnum ?? false,\n    generatePathParams: options.generatePathParams ?? false,\n    readWriteMarkers: options.readWriteMarkers ?? false,\n    ...callbackOptions(options),\n  };\n}\n\n/**\n * The fixes of the options, `all` expanded; fails with `OPTION_FIX_UNKNOWN` for another name.\n * A fix named without the option it needs is reported, since it changes nothing.\n */\nfunction outputFixesOf(options: GeneratorOptions, logger: Logger): readonly OutputFix[] {\n  const names = outputFixNamesOf(options.fix ?? []);\n  for (const notice of ineffectiveFixNotices(names, (option) => options[option] === true)) {\n    logger.warn(warningText(notice, WARNING_CODES.FIX_NEEDS_OPTION));\n  }\n  return [...resolveOutputFixes(names)];\n}\n\n/** The warnings about the loaded document itself, before it is transformed. */\nfunction warnAboutDocument(schema: OpenAPI3, fix: readonly OutputFix[], logger: Logger): void {\n  withStackOverflowReported(\"transform\", () => warnUnsupportedFeatures(schema, logger));\n  withStackOverflowReported(\"transform\", () =>\n    warnDiscriminatorValueConflicts(schema, fix, logger),\n  );\n  warnIdenticalPathTemplates(schema, logger);\n}\n\n/**\n * Load the source through the ports, then build the run's context from the options. The fix names\n * are checked first, so a typo fails before the document is read.\n */\nexport async function createDocumentRun(\n  source: SchemaSource,\n  options: GeneratorOptions,\n  ports: GeneratorPorts,\n): Promise<DocumentRun> {\n  if (!source) {\n    throw sourceEmptyError(\"Empty schema. Please specify a URL, file path, or Redocly Config\");\n  }\n  const { logger } = ports;\n  const fix = outputFixesOf(options, logger);\n  const silent = options.silent ?? false;\n  const cwd = sourceCwd(options);\n  const { document: schema, localFiles } = await ports.loader.load({\n    source,\n    cwd,\n    shouldLint: options.lint ?? true,\n    refAccess: refAccessOf(options, cwd),\n  });\n  warnAboutDocument(schema, fix, logger);\n  const ctx: RunContext = {\n    ...contextFlags(options),\n    fix,\n    // The scan walks every schema before the transform does, so on a larger stack, where loading\n    // passed, it is the first step to run out.\n    discriminators: withStackOverflowReported(\"transform\", () =>\n      findDiscriminators(schema, {\n        silent,\n        logger,\n        fixes: new Set(fix),\n      }),\n    ),\n    injectFooter: [],\n    redoc: ports.redoc,\n    resolve: ($ref) => resolveDocumentRef(schema, $ref, { silent, logger }),\n    logger,\n    deprecations: ports.deprecations,\n  };\n  return { schema, localFiles, ctx };\n}\n"],"names":["path","processCwd","pathToFileURL","fileURLToPath","outputFixNamesOf","ineffectiveFixNotices","warningText","WARNING_CODES","resolveOutputFixes","withStackOverflowReported","warnUnsupportedFeatures","warnDiscriminatorValueConflicts","warnIdenticalPathTemplates","sourceEmptyError","findDiscriminators","resolveDocumentRef"],"mappings":";;;;;;;;;;;;;;;;;;;AA6DA,SAAS,UAAU,OAAA,EAAgC;AACjD,EAAA,MAAM,EAAE,KAAI,GAAI,OAAA;AAChB,EAAA,IAAI,eAAe,GAAA,EAAK;AACtB,IAAA,OAAO,GAAA,CAAI,QAAA,CAAS,QAAA,CAAS,GAAG,CAAA,GAAI,GAAA,GAAM,IAAI,GAAA,CAAI,CAAA,EAAG,GAAA,CAAI,QAAQ,CAAA,CAAA,CAAA,EAAK,GAAG,CAAA;AAAA,EAC3E;AACA,EAAA,MAAM,SAAA,GAAYA,cAAK,OAAA,CAAQ,GAAA,KAAQ,SAAYC,uBAAA,EAAW,GAAI,GAAA,CAAI,QAAA,EAAU,CAAA;AAChF,EAAA,OAAOC,uBAAcF,aAAA,CAAK,IAAA,CAAK,SAAA,EAAWA,aAAA,CAAK,GAAG,CAAC,CAAA;AACrD;AAGA,SAAS,WAAA,CAAY,SAA2B,GAAA,EAAqB;AACnE,EAAA,MAAM,EAAE,YAAA,EAAc,cAAA,EAAe,GAAI,OAAA;AACzC,EAAA,MAAM,SAAA,GACJ,OAAO,YAAA,KAAiB,QAAA,GACpBE,sBAAA,CAAcF,aAAA,CAAK,OAAA,CAAQG,sBAAA,CAAc,GAAG,CAAA,EAAG,YAAY,CAAC,CAAA,GAC5D,YAAA;AACN,EAAA,OAAO;AAAA,IACL,GAAI,SAAA,KAAc,MAAA,GAAY,EAAC,GAAI,EAAE,SAAA,EAAU;AAAA,IAC/C,GAAI,cAAA,KAAmB,MAAA,GAAY,EAAC,GAAI,EAAE,aAAa,cAAA;AAAe,GACxE;AACF;AAEA,SAAS,gBAAgB,OAAA,EAA2B;AAClD,EAAA,OAAO;AAAA,IACL,WAAA,EAAa,QAAQ,WAAA,KAAgB,IAAA;AAAA,IACrC,eAAe,OAAO,OAAA,CAAQ,aAAA,KAAkB,UAAA,GAAa,QAAQ,aAAA,GAAgB,MAAA;AAAA,IACrF,WAAW,OAAO,OAAA,CAAQ,SAAA,KAAc,UAAA,GAAa,QAAQ,SAAA,GAAY,MAAA;AAAA,IACzE,mBACE,OAAO,OAAA,CAAQ,iBAAA,KAAsB,UAAA,GAAa,QAAQ,iBAAA,GAAoB;AAAA,GAClF;AACF;AAEA,SAAS,aAAa,OAAA,EAAyC;AAC7D,EAAA,OAAO;AAAA,IACL,oBAAA,EAAsB,QAAQ,oBAAA,IAAwB,KAAA;AAAA,IACtD,WAAA,EAAa,QAAQ,WAAA,IAAe,KAAA;AAAA,IACpC,WAAA,EAAa,QAAQ,WAAA,IAAe,KAAA;AAAA,IACpC,YAAA,EAAc,QAAQ,YAAA,IAAgB,KAAA;AAAA,IACtC,kBAAA,EAAoB,QAAQ,kBAAA,IAAsB,IAAA;AAAA,IAClD,mBAAA,EAAqB,QAAQ,mBAAA,IAAuB,KAAA;AAAA,IACpD,IAAA,EAAM,QAAQ,IAAA,IAAQ,KAAA;AAAA,IACtB,UAAA,EAAY,QAAQ,UAAA,IAAc,KAAA;AAAA,IAClC,gBAAA,EAAkB,QAAQ,gBAAA,IAAoB,KAAA;AAAA,IAC9C,WAAA,EAAa,QAAQ,WAAA,IAAe,KAAA;AAAA,IACpC,iBAAA,EAAmB,QAAQ,iBAAA,IAAqB,KAAA;AAAA,IAChD,UAAA,EAAY,QAAQ,UAAA,IAAc,KAAA;AAAA,IAClC,SAAA,EAAW,QAAQ,SAAA,IAAa,KAAA;AAAA,IAChC,SAAA,EAAW,QAAQ,SAAA,IAAa,KAAA;AAAA,IAChC,uBAAA,EAAyB,QAAQ,uBAAA,IAA2B,KAAA;AAAA,IAC5D,mBAAA,EAAqB,QAAQ,mBAAA,IAAuB,KAAA;AAAA,IACpD,iBAAA,EAAmB,QAAQ,iBAAA,IAAqB,KAAA;AAAA,IAChD,2BAAA,EAA6B,QAAQ,2BAAA,IAA+B,KAAA;AAAA,IACpE,MAAA,EAAQ,QAAQ,MAAA,IAAU,KAAA;AAAA,IAC1B,GAAI,QAAQ,MAAA,KAAW,MAAA,GAAY,EAAC,GAAI,EAAE,MAAA,EAAQ,OAAA,CAAQ,MAAA,EAAO;AAAA,IACjE,aAAA,EAAe,QAAQ,aAAA,IAAiB,KAAA;AAAA,IACxC,kBAAA,EAAoB,QAAQ,kBAAA,IAAsB,KAAA;AAAA,IAClD,gBAAA,EAAkB,QAAQ,gBAAA,IAAoB,KAAA;AAAA,IAC9C,GAAG,gBAAgB,OAAO;AAAA,GAC5B;AACF;AAMA,SAAS,aAAA,CAAc,SAA2B,MAAA,EAAsC;AACtF,EAAA,MAAM,KAAA,GAAQC,4BAAA,CAAiB,OAAA,CAAQ,GAAA,IAAO,EAAE,CAAA;AAChD,EAAA,KAAA,MAAW,MAAA,IAAUC,kCAAsB,KAAA,EAAO,CAAC,WAAW,OAAA,CAAQ,MAAM,CAAA,KAAM,IAAI,CAAA,EAAG;AACvF,IAAA,MAAA,CAAO,IAAA,CAAKC,oBAAA,CAAY,MAAA,EAAQC,sBAAA,CAAc,gBAAgB,CAAC,CAAA;AAAA,EACjE;AACA,EAAA,OAAO,CAAC,GAAGC,8BAAA,CAAmB,KAAK,CAAC,CAAA;AACtC;AAGA,SAAS,iBAAA,CAAkB,MAAA,EAAkB,GAAA,EAA2B,MAAA,EAAsB;AAC5F,EAAAC,uCAAA,CAA0B,WAAA,EAAa,MAAMC,kDAAA,CAAwB,MAAA,EAAQ,MAAM,CAAC,CAAA;AACpF,EAAAD,uCAAA;AAAA,IAA0B,WAAA;AAAA,IAAa,MACrCE,6DAAA,CAAgC,MAAA,EAAQ,GAAA,EAAK,MAAM;AAAA,GACrD;AACA,EAAAC,+CAAA,CAA2B,QAAQ,MAAM,CAAA;AAC3C;AAMA,eAAsB,iBAAA,CACpB,MAAA,EACA,OAAA,EACA,KAAA,EACsB;AACtB,EAAA,IAAI,CAAC,MAAA,EAAQ;AACX,IAAA,MAAMC,kCAAiB,kEAAkE,CAAA;AAAA,EAC3F;AACA,EAAA,MAAM,EAAE,QAAO,GAAI,KAAA;AACnB,EAAA,MAAM,GAAA,GAAM,aAAA,CAAc,OAAA,EAAS,MAAM,CAAA;AACzC,EAAA,MAAM,MAAA,GAAS,QAAQ,MAAA,IAAU,KAAA;AACjC,EAAA,MAAM,GAAA,GAAM,UAAU,OAAO,CAAA;AAC7B,EAAA,MAAM,EAAE,UAAU,MAAA,EAAQ,UAAA,KAAe,MAAM,KAAA,CAAM,OAAO,IAAA,CAAK;AAAA,IAC/D,MAAA;AAAA,IACA,GAAA;AAAA,IACA,UAAA,EAAY,QAAQ,IAAA,IAAQ,IAAA;AAAA,IAC5B,SAAA,EAAW,WAAA,CAAY,OAAA,EAAS,GAAG;AAAA,GACpC,CAAA;AACD,EAAA,iBAAA,CAAkB,MAAA,EAAQ,KAAK,MAAM,CAAA;AACrC,EAAA,MAAM,GAAA,GAAkB;AAAA,IACtB,GAAG,aAAa,OAAO,CAAA;AAAA,IACvB,GAAA;AAAA;AAAA;AAAA,IAGA,cAAA,EAAgBJ,uCAAA;AAAA,MAA0B,WAAA;AAAA,MAAa,MACrDK,qCAAmB,MAAA,EAAQ;AAAA,QACzB,MAAA;AAAA,QACA,MAAA;AAAA,QACA,KAAA,EAAO,IAAI,GAAA,CAAI,GAAG;AAAA,OACnB;AAAA,KACH;AAAA,IACA,cAAc,EAAC;AAAA,IACf,OAAO,KAAA,CAAM,KAAA;AAAA,IACb,OAAA,EAAS,CAAC,IAAA,KAASC,+BAAA,CAAmB,QAAQ,IAAA,EAAM,EAAE,MAAA,EAAQ,MAAA,EAAQ,CAAA;AAAA,IACtE,MAAA;AAAA,IACA,cAAc,KAAA,CAAM;AAAA,GACtB;AACA,EAAA,OAAO,EAAE,MAAA,EAAQ,UAAA,EAAY,GAAA,EAAI;AACnC;;"}

package/dist/api/document-run.mjs

@@ -86,7 +86,7 @@ async function createDocumentRun(source, options, ports) {
   const fix = outputFixesOf(options, logger);
   const silent = options.silent ?? false;
   const cwd = sourceCwd(options);
-  const schema = await ports.loader.load({
+  const { document: schema, localFiles } = await ports.loader.load({
     source,
     cwd,
     shouldLint: options.lint ?? true,
@@ -109,9 +109,10 @@ async function createDocumentRun(source, options, ports) {
     injectFooter: [],
     redoc: ports.redoc,
     resolve: ($ref) => resolveDocumentRef(schema, $ref, { silent, logger }),
-    logger
+    logger,
+    deprecations: ports.deprecations
   };
-  return { schema, ctx };
+  return { schema, localFiles, ctx };
 }
 
 export { createDocumentRun };