openapi-typesafe 1.0.0-rc.3 → 1.0.0-rc.5

package/dist/api/discriminator-enum-parent.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"discriminator-enum-parent.cjs","sources":["../../src/api/discriminator-enum-parent.ts"],"sourcesContent":["import { createRef, parseRefPointer } from \"../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\n\n/**\n * The `discriminator-values` fix (#1700). With `--enum`, the enum the scan adds to a member\n * (`petType: \"Cat\"`) is declared as an enum of its own (`CatPetType`), which is not assignable to\n * the parent's enum (`PetType`). The parent's enum is found here, so the member's property can be\n * typed with its members (`PetType.Cat`).\n */\n\n/** The parent's enum schema and the location it is typed at, which gives the enum its name. */\nexport interface EnumParent {\n  readonly schema: SchemaObject;\n  readonly path: string;\n}\n\ntype ResolveSchemaRef = (ref: string) => unknown;\n\n/** A declared property schema and the location the transformer types it at. */\ninterface DeclaredProperty {\n  readonly property: unknown;\n  readonly path: string;\n}\n\nconst PROPERTIES_KEYWORD = \"properties\";\n/** `components`, `schemas` and the schema name: the segments before the schema's own keywords. */\nconst ROOT_SEGMENTS = 3;\n\n/** The location a `$ref` is typed at: object properties are nested without `properties`. */\nfunction typedAt(ref: string): string {\n  const segments = parseRefPointer(ref);\n  const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);\n  return createRef([...segments.slice(0, ROOT_SEGMENTS), ...nested]);\n}\n\nfunction isSchemaObject(value: unknown): value is SchemaObject {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/** The property `name` of a schema object typed at `ref`. */\nfunction ownProperty(item: SchemaObject, ref: string, name: string): DeclaredProperty | undefined {\n  const property = (\"properties\" in item ? item.properties : undefined)?.[name];\n  return property === undefined ? undefined : { property, path: createRef([ref, name]) };\n}\n\n/** The property `name` of the schema at `ref`, its own or from an `allOf` item, depth first. */\nfunction declaredProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n  visited: Set<string>,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  if (visited.has(ref) || !isSchemaObject(schema)) {\n    return undefined;\n  }\n  visited.add(ref);\n  // An inline `allOf` item is typed at its parent's location, so both share the path.\n  for (const item of [schema, ...(schema.allOf ?? [])]) {\n    if (!isSchemaObject(item)) {\n      continue;\n    }\n    const found =\n      \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : ownProperty(item, ref, name);\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * A discriminator and the `$ref` of the schema that declares its property; `ref` is the member\n * whose value the discriminator gives, where there is one.\n */\nexport type DiscriminatorOwner = Pick<EnumPatch, \"discriminator\" | \"discriminatorRef\"> &\n  Partial<Pick<EnumPatch, \"ref\">>;\n\n/**\n * The property `name` that the member at `ref` inherits through its `allOf` `$ref`s. Its own\n * keywords and inline items are left out: the scan writes the added value there.\n */\nfunction inheritedProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  const visited = new Set([ref]);\n  for (const item of isSchemaObject(schema) ? (schema.allOf ?? []) : []) {\n    const found =\n      isSchemaObject(item) && \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : undefined;\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * The enum of the property that the discriminator owner declares, if it is one. An owner that\n * declares no such property (a `oneOf` with a mapping) leaves the member's type to the property\n * the member inherits, so that property's enum is the one.\n */\nexport function enumParentOf(\n  patch: DiscriminatorOwner,\n  resolve: ResolveSchemaRef,\n): EnumParent | undefined {\n  const name = patch.discriminator.propertyName;\n  const declared =\n    declaredProperty(patch.discriminatorRef, name, resolve, new Set()) ??\n    (patch.ref === undefined ? undefined : inheritedProperty(patch.ref, name, resolve));\n  if (declared === undefined || !isSchemaObject(declared.property)) {\n    return undefined;\n  }\n  const ref = (declared.property as { readonly $ref?: unknown }).$ref;\n  const parent =\n    typeof ref === \"string\"\n      ? { schema: resolve(ref), path: typedAt(ref) }\n      : { schema: declared.property, path: declared.path };\n  return isSchemaObject(parent.schema) && Array.isArray(parent.schema.enum)\n    ? { schema: parent.schema, path: parent.path }\n    : undefined;\n}\n"],"names":["parseRefPointer","createRef"],"mappings":"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"}
+{"version":3,"file":"discriminator-enum-parent.cjs","sources":["../../src/api/discriminator-enum-parent.ts"],"sourcesContent":["import { appendPointer, parseRefPointer, ROOT_POINTER } from \"../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\n\n/**\n * The `discriminator-values` fix (#1700). With `--enum`, the enum the scan adds to a member\n * (`petType: \"Cat\"`) is declared as an enum of its own (`CatPetType`), which is not assignable to\n * the parent's enum (`PetType`). The parent's enum is found here, so the member's property can be\n * typed with its members (`PetType.Cat`).\n */\n\n/** The parent's enum schema and the location it is typed at, which gives the enum its name. */\nexport interface EnumParent {\n  readonly schema: SchemaObject;\n  readonly path: string;\n}\n\ntype ResolveSchemaRef = (ref: string) => unknown;\n\n/** A declared property schema and the location the transformer types it at. */\ninterface DeclaredProperty {\n  readonly property: unknown;\n  readonly path: string;\n}\n\nconst PROPERTIES_KEYWORD = \"properties\";\n/** `components`, `schemas` and the schema name: the segments before the schema's own keywords. */\nconst ROOT_SEGMENTS = 3;\n\n/** The location a `$ref` is typed at: object properties are nested without `properties`. */\nfunction typedAt(ref: string): string {\n  const segments = parseRefPointer(ref);\n  const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);\n  return appendPointer(ROOT_POINTER, [...segments.slice(0, ROOT_SEGMENTS), ...nested]);\n}\n\nfunction isSchemaObject(value: unknown): value is SchemaObject {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/** The property `name` of a schema object typed at `ref`. */\nfunction ownProperty(item: SchemaObject, ref: string, name: string): DeclaredProperty | undefined {\n  const property = (\"properties\" in item ? item.properties : undefined)?.[name];\n  return property === undefined ? undefined : { property, path: appendPointer(ref, [name]) };\n}\n\n/** The property `name` of the schema at `ref`, its own or from an `allOf` item, depth first. */\nfunction declaredProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n  visited: Set<string>,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  if (visited.has(ref) || !isSchemaObject(schema)) {\n    return undefined;\n  }\n  visited.add(ref);\n  // An inline `allOf` item is typed at its parent's location, so both share the path.\n  for (const item of [schema, ...(schema.allOf ?? [])]) {\n    if (!isSchemaObject(item)) {\n      continue;\n    }\n    const found =\n      \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : ownProperty(item, ref, name);\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * A discriminator and the `$ref` of the schema that declares its property; `ref` is the member\n * whose value the discriminator gives, where there is one.\n */\nexport type DiscriminatorOwner = Pick<EnumPatch, \"discriminator\" | \"discriminatorRef\"> &\n  Partial<Pick<EnumPatch, \"ref\">>;\n\n/**\n * The property `name` that the member at `ref` inherits through its `allOf` `$ref`s. Its own\n * keywords and inline items are left out: the scan writes the added value there.\n */\nfunction inheritedProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  const visited = new Set([ref]);\n  for (const item of isSchemaObject(schema) ? (schema.allOf ?? []) : []) {\n    const found =\n      isSchemaObject(item) && \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : undefined;\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * The enum of the property that the discriminator owner declares, if it is one. An owner that\n * declares no such property (a `oneOf` with a mapping) leaves the member's type to the property\n * the member inherits, so that property's enum is the one.\n */\nexport function enumParentOf(\n  patch: DiscriminatorOwner,\n  resolve: ResolveSchemaRef,\n): EnumParent | undefined {\n  const name = patch.discriminator.propertyName;\n  const declared =\n    declaredProperty(patch.discriminatorRef, name, resolve, new Set()) ??\n    (patch.ref === undefined ? undefined : inheritedProperty(patch.ref, name, resolve));\n  if (declared === undefined || !isSchemaObject(declared.property)) {\n    return undefined;\n  }\n  const ref = (declared.property as { readonly $ref?: unknown }).$ref;\n  const parent =\n    typeof ref === \"string\"\n      ? { schema: resolve(ref), path: typedAt(ref) }\n      : { schema: declared.property, path: declared.path };\n  return isSchemaObject(parent.schema) && Array.isArray(parent.schema.enum)\n    ? { schema: parent.schema, path: parent.path }\n    : undefined;\n}\n"],"names":["parseRefPointer","appendPointer","ROOT_POINTER"],"mappings":"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"}

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

@@ -1,18 +1,18 @@
-import { parseRefPointer, createRef } from '../domain/openapi/json-pointer.mjs';
+import { parseRefPointer, appendPointer, ROOT_POINTER } from '../domain/openapi/json-pointer.mjs';
 
 const PROPERTIES_KEYWORD = "properties";
 const ROOT_SEGMENTS = 3;
 function typedAt(ref) {
   const segments = parseRefPointer(ref);
   const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);
-  return createRef([...segments.slice(0, ROOT_SEGMENTS), ...nested]);
+  return appendPointer(ROOT_POINTER, [...segments.slice(0, ROOT_SEGMENTS), ...nested]);
 }
 function isSchemaObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function ownProperty(item, ref, name) {
   const property = ("properties" in item ? item.properties : void 0)?.[name];
-  return property === void 0 ? void 0 : { property, path: createRef([ref, name]) };
+  return property === void 0 ? void 0 : { property, path: appendPointer(ref, [name]) };
 }
 function declaredProperty(ref, name, resolve, visited) {
   const schema = resolve(ref);

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

@@ -1 +1 @@
-{"version":3,"file":"discriminator-enum-parent.mjs","sources":["../../src/api/discriminator-enum-parent.ts"],"sourcesContent":["import { createRef, parseRefPointer } from \"../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\n\n/**\n * The `discriminator-values` fix (#1700). With `--enum`, the enum the scan adds to a member\n * (`petType: \"Cat\"`) is declared as an enum of its own (`CatPetType`), which is not assignable to\n * the parent's enum (`PetType`). The parent's enum is found here, so the member's property can be\n * typed with its members (`PetType.Cat`).\n */\n\n/** The parent's enum schema and the location it is typed at, which gives the enum its name. */\nexport interface EnumParent {\n  readonly schema: SchemaObject;\n  readonly path: string;\n}\n\ntype ResolveSchemaRef = (ref: string) => unknown;\n\n/** A declared property schema and the location the transformer types it at. */\ninterface DeclaredProperty {\n  readonly property: unknown;\n  readonly path: string;\n}\n\nconst PROPERTIES_KEYWORD = \"properties\";\n/** `components`, `schemas` and the schema name: the segments before the schema's own keywords. */\nconst ROOT_SEGMENTS = 3;\n\n/** The location a `$ref` is typed at: object properties are nested without `properties`. */\nfunction typedAt(ref: string): string {\n  const segments = parseRefPointer(ref);\n  const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);\n  return createRef([...segments.slice(0, ROOT_SEGMENTS), ...nested]);\n}\n\nfunction isSchemaObject(value: unknown): value is SchemaObject {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/** The property `name` of a schema object typed at `ref`. */\nfunction ownProperty(item: SchemaObject, ref: string, name: string): DeclaredProperty | undefined {\n  const property = (\"properties\" in item ? item.properties : undefined)?.[name];\n  return property === undefined ? undefined : { property, path: createRef([ref, name]) };\n}\n\n/** The property `name` of the schema at `ref`, its own or from an `allOf` item, depth first. */\nfunction declaredProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n  visited: Set<string>,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  if (visited.has(ref) || !isSchemaObject(schema)) {\n    return undefined;\n  }\n  visited.add(ref);\n  // An inline `allOf` item is typed at its parent's location, so both share the path.\n  for (const item of [schema, ...(schema.allOf ?? [])]) {\n    if (!isSchemaObject(item)) {\n      continue;\n    }\n    const found =\n      \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : ownProperty(item, ref, name);\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * A discriminator and the `$ref` of the schema that declares its property; `ref` is the member\n * whose value the discriminator gives, where there is one.\n */\nexport type DiscriminatorOwner = Pick<EnumPatch, \"discriminator\" | \"discriminatorRef\"> &\n  Partial<Pick<EnumPatch, \"ref\">>;\n\n/**\n * The property `name` that the member at `ref` inherits through its `allOf` `$ref`s. Its own\n * keywords and inline items are left out: the scan writes the added value there.\n */\nfunction inheritedProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  const visited = new Set([ref]);\n  for (const item of isSchemaObject(schema) ? (schema.allOf ?? []) : []) {\n    const found =\n      isSchemaObject(item) && \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : undefined;\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * The enum of the property that the discriminator owner declares, if it is one. An owner that\n * declares no such property (a `oneOf` with a mapping) leaves the member's type to the property\n * the member inherits, so that property's enum is the one.\n */\nexport function enumParentOf(\n  patch: DiscriminatorOwner,\n  resolve: ResolveSchemaRef,\n): EnumParent | undefined {\n  const name = patch.discriminator.propertyName;\n  const declared =\n    declaredProperty(patch.discriminatorRef, name, resolve, new Set()) ??\n    (patch.ref === undefined ? undefined : inheritedProperty(patch.ref, name, resolve));\n  if (declared === undefined || !isSchemaObject(declared.property)) {\n    return undefined;\n  }\n  const ref = (declared.property as { readonly $ref?: unknown }).$ref;\n  const parent =\n    typeof ref === \"string\"\n      ? { schema: resolve(ref), path: typedAt(ref) }\n      : { schema: declared.property, path: declared.path };\n  return isSchemaObject(parent.schema) && Array.isArray(parent.schema.enum)\n    ? { schema: parent.schema, path: parent.path }\n    : undefined;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"discriminator-enum-parent.mjs","sources":["../../src/api/discriminator-enum-parent.ts"],"sourcesContent":["import { appendPointer, parseRefPointer, ROOT_POINTER } from \"../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../types.js\";\nimport type { EnumPatch } from \"./discriminator-enum.js\";\n\n/**\n * The `discriminator-values` fix (#1700). With `--enum`, the enum the scan adds to a member\n * (`petType: \"Cat\"`) is declared as an enum of its own (`CatPetType`), which is not assignable to\n * the parent's enum (`PetType`). The parent's enum is found here, so the member's property can be\n * typed with its members (`PetType.Cat`).\n */\n\n/** The parent's enum schema and the location it is typed at, which gives the enum its name. */\nexport interface EnumParent {\n  readonly schema: SchemaObject;\n  readonly path: string;\n}\n\ntype ResolveSchemaRef = (ref: string) => unknown;\n\n/** A declared property schema and the location the transformer types it at. */\ninterface DeclaredProperty {\n  readonly property: unknown;\n  readonly path: string;\n}\n\nconst PROPERTIES_KEYWORD = \"properties\";\n/** `components`, `schemas` and the schema name: the segments before the schema's own keywords. */\nconst ROOT_SEGMENTS = 3;\n\n/** The location a `$ref` is typed at: object properties are nested without `properties`. */\nfunction typedAt(ref: string): string {\n  const segments = parseRefPointer(ref);\n  const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);\n  return appendPointer(ROOT_POINTER, [...segments.slice(0, ROOT_SEGMENTS), ...nested]);\n}\n\nfunction isSchemaObject(value: unknown): value is SchemaObject {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\n/** The property `name` of a schema object typed at `ref`. */\nfunction ownProperty(item: SchemaObject, ref: string, name: string): DeclaredProperty | undefined {\n  const property = (\"properties\" in item ? item.properties : undefined)?.[name];\n  return property === undefined ? undefined : { property, path: appendPointer(ref, [name]) };\n}\n\n/** The property `name` of the schema at `ref`, its own or from an `allOf` item, depth first. */\nfunction declaredProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n  visited: Set<string>,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  if (visited.has(ref) || !isSchemaObject(schema)) {\n    return undefined;\n  }\n  visited.add(ref);\n  // An inline `allOf` item is typed at its parent's location, so both share the path.\n  for (const item of [schema, ...(schema.allOf ?? [])]) {\n    if (!isSchemaObject(item)) {\n      continue;\n    }\n    const found =\n      \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : ownProperty(item, ref, name);\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * A discriminator and the `$ref` of the schema that declares its property; `ref` is the member\n * whose value the discriminator gives, where there is one.\n */\nexport type DiscriminatorOwner = Pick<EnumPatch, \"discriminator\" | \"discriminatorRef\"> &\n  Partial<Pick<EnumPatch, \"ref\">>;\n\n/**\n * The property `name` that the member at `ref` inherits through its `allOf` `$ref`s. Its own\n * keywords and inline items are left out: the scan writes the added value there.\n */\nfunction inheritedProperty(\n  ref: string,\n  name: string,\n  resolve: ResolveSchemaRef,\n): DeclaredProperty | undefined {\n  const schema = resolve(ref);\n  const visited = new Set([ref]);\n  for (const item of isSchemaObject(schema) ? (schema.allOf ?? []) : []) {\n    const found =\n      isSchemaObject(item) && \"$ref\" in item\n        ? declaredProperty(item.$ref as string, name, resolve, visited)\n        : undefined;\n    if (found !== undefined) {\n      return found;\n    }\n  }\n  return undefined;\n}\n\n/**\n * The enum of the property that the discriminator owner declares, if it is one. An owner that\n * declares no such property (a `oneOf` with a mapping) leaves the member's type to the property\n * the member inherits, so that property's enum is the one.\n */\nexport function enumParentOf(\n  patch: DiscriminatorOwner,\n  resolve: ResolveSchemaRef,\n): EnumParent | undefined {\n  const name = patch.discriminator.propertyName;\n  const declared =\n    declaredProperty(patch.discriminatorRef, name, resolve, new Set()) ??\n    (patch.ref === undefined ? undefined : inheritedProperty(patch.ref, name, resolve));\n  if (declared === undefined || !isSchemaObject(declared.property)) {\n    return undefined;\n  }\n  const ref = (declared.property as { readonly $ref?: unknown }).$ref;\n  const parent =\n    typeof ref === \"string\"\n      ? { schema: resolve(ref), path: typedAt(ref) }\n      : { schema: declared.property, path: declared.path };\n  return isSchemaObject(parent.schema) && Array.isArray(parent.schema.enum)\n    ? { schema: parent.schema, path: parent.path }\n    : undefined;\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,7 @@
 'use strict';
 
+const appendAll = require('../domain/append-all.cjs');
+const jsonPointer = require('../domain/openapi/json-pointer.cjs');
 const discriminatorPatch = require('./discriminator-patch.cjs');
 const documentRefs = require('./document-refs.cjs');
 
@@ -8,7 +10,7 @@ function allOfRefs(state, ref) {
   const schema = documentRefs.resolveDocumentRef(state.schema, ref, { silent, logger });
   const items = schema?.allOf ?? [];
   return items.flatMap(
-    (item) => "$ref" in item && typeof item.$ref === "string" ? [item.$ref] : []
+    (item) => "$ref" in item && typeof item.$ref === "string" ? [jsonPointer.canonicalRef(item.$ref)] : []
   );
 }
 function otherOwners(state, parentRef) {
@@ -26,7 +28,7 @@ function otherOwners(state, parentRef) {
     if (discriminator && name !== void 0 && name !== own && !found.has(name)) {
       found.set(name, { discriminator, ownerRef: ref });
     }
-    queue.push(...allOfRefs(state, ref));
+    appendAll.appendAll(queue, allOfRefs(state, ref));
   }
   return [...found.values()];
 }
@@ -44,7 +46,7 @@ function inheritOtherOwners(state, parentRef, ref) {
       continue;
     }
     recordOtherProperty(state, ref, discriminator.propertyName);
-    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => target === ref).map(([value]) => value);
+    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => jsonPointer.canonicalRef(target) === ref).map(([value]) => value);
     const name = ref.slice(ref.lastIndexOf("/") + 1);
     const patch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };
     if (mapped.length > 0) {

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

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

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

@@ -1,3 +1,5 @@
+import { appendAll } from '../domain/append-all.mjs';
+import { canonicalRef } from '../domain/openapi/json-pointer.mjs';
 import { enumKey, patchDiscriminatorEnum } from './discriminator-patch.mjs';
 import { resolveDocumentRef } from './document-refs.mjs';
 
@@ -6,7 +8,7 @@ function allOfRefs(state, ref) {
   const schema = resolveDocumentRef(state.schema, ref, { silent, logger });
   const items = schema?.allOf ?? [];
   return items.flatMap(
-    (item) => "$ref" in item && typeof item.$ref === "string" ? [item.$ref] : []
+    (item) => "$ref" in item && typeof item.$ref === "string" ? [canonicalRef(item.$ref)] : []
   );
 }
 function otherOwners(state, parentRef) {
@@ -24,7 +26,7 @@ function otherOwners(state, parentRef) {
     if (discriminator && name !== void 0 && name !== own && !found.has(name)) {
       found.set(name, { discriminator, ownerRef: ref });
     }
-    queue.push(...allOfRefs(state, ref));
+    appendAll(queue, allOfRefs(state, ref));
   }
   return [...found.values()];
 }
@@ -42,7 +44,7 @@ function inheritOtherOwners(state, parentRef, ref) {
       continue;
     }
     recordOtherProperty(state, ref, discriminator.propertyName);
-    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => target === ref).map(([value]) => value);
+    const mapped = Object.entries(discriminator.mapping ?? {}).filter(([, target]) => canonicalRef(target) === ref).map(([value]) => value);
     const name = ref.slice(ref.lastIndexOf("/") + 1);
     const patch = { ref, values: mapped, discriminator, discriminatorRef: ownerRef };
     if (mapped.length > 0) {

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

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

package/dist/api/discriminator-patch.cjs

@@ -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');
@@ -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 { 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  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":["FIX","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,3 +1,4 @@
+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';
@@ -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 { 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  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,7 +66,7 @@ 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.FIX.ALLOF_DISCRIMINATED_UNION)) {
@@ -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 { 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\";\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(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, 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","FIX","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":"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"}

package/dist/api/discriminator-scan.mjs

@@ -1,10 +1,10 @@
 import { unionAt, isUnionMember } from '../domain/openapi/discriminated-union.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,7 +64,7 @@ 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(FIX.ALLOF_DISCRIMINATED_UNION)) {
@@ -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)
+      );
     }
   }
 }