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

package/dist/adapters/terminal-logger/terminal-logger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-logger.cjs","sources":["../../../src/adapters/terminal-logger/terminal-logger.ts"],"sourcesContent":["import colors from \"ansi-colors\";\nimport type { DebugGroup, Logger } from \"../../application/ports/logger.js\";\nimport { redactUrlCredentials } from \"../../domain/url-credentials.js\";\n\n/**\n * The Logger port on a terminal, with the original output format: ` ⚠  ` warnings, ` ✘  `\n * errors, and `openapi-ts:<group>` debug lines filtered by `DEBUG` (ENGINEERING_PLAN 4.5). No\n * line shows the user info of a URL.\n */\n\n/** Where the lines go: `console` in production, a recording sink in tests. */\nexport interface TerminalSink {\n  debug(line: string): void;\n  warn(line: string): void;\n  error(line: string): void;\n}\n\nexport interface TerminalLoggerOptions {\n  /** Drop warnings (errors and debug lines are still written). */\n  readonly silent: boolean;\n  /** The value of `DEBUG`: `*`, `openapi-ts:*` or `openapi-ts:<group>` turn debug lines on. */\n  readonly debugFilter: string | undefined;\n  readonly useColors: boolean;\n  readonly sink: TerminalSink;\n}\n\ntype Colors = ReturnType<typeof colors.create>;\n\nconst MILLISECONDS_PER_SECOND = 1000;\nconst MILLISECONDS_PER_MINUTE = 60_000;\n\n/** A duration as the original prints it: one decimal, in ms, s or m. */\nexport function formatDuration(milliseconds: number): string {\n  if (milliseconds < MILLISECONDS_PER_SECOND) {\n    return `${Math.round(10 * milliseconds) / 10}ms`;\n  }\n  if (milliseconds < MILLISECONDS_PER_MINUTE) {\n    return `${Math.round(milliseconds / 100) / 10}s`;\n  }\n  return `${Math.round(milliseconds / 6000) / 10}m`;\n}\n\nfunction groupColor(palette: Colors, group: DebugGroup | undefined): (text: string) => string {\n  const byGroup: Readonly<Partial<Record<DebugGroup, (text: string) => string>>> = {\n    redoc: palette.cyanBright,\n    lint: palette.yellowBright,\n    bundle: palette.magentaBright,\n    ts: palette.blueBright,\n  };\n  return (group && byGroup[group]) || palette.whiteBright;\n}\n\n/** Whether `DEBUG` asks for this group (the original check, case-insensitive for the group). */\nexport function isDebugEnabled(filter: string | undefined, group: DebugGroup | undefined): boolean {\n  if (!filter) {\n    return false;\n  }\n  return (\n    !group ||\n    filter === \"*\" ||\n    filter === \"openapi-ts:*\" ||\n    filter.toLocaleLowerCase() === `openapi-ts:${group.toLocaleLowerCase()}`\n  );\n}\n\nclass TerminalLogger implements Logger {\n  readonly #options: TerminalLoggerOptions;\n  readonly #palette: Colors;\n\n  constructor(options: TerminalLoggerOptions) {\n    this.#options = options;\n    this.#palette = colors.create();\n    this.#palette.enabled = options.useColors;\n  }\n\n  debug(message: string, group?: DebugGroup, durationMs?: number): void {\n    if (!isDebugEnabled(this.#options.debugFilter, group)) {\n      return;\n    }\n    const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? \"info\"}`);\n    // The original wrote no space without a duration (`openapi-ts:lintIgnored …`).\n    const time =\n      durationMs === undefined ? \" \" : this.#palette.green(` ${formatDuration(durationMs)} `);\n    const text = redactUrlCredentials(message);\n    this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);\n  }\n\n  warn(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.warn(this.#palette.yellow(` ⚠  ${redactUrlCredentials(message)}`));\n    }\n  }\n\n  error(message: string): void {\n    this.#options.sink.error(this.#palette.red(` ✘  ${redactUrlCredentials(message)}`));\n  }\n}\n\n/** A Logger that writes to a terminal sink. */\nexport function createTerminalLogger(options: TerminalLoggerOptions): Logger {\n  return new TerminalLogger(options);\n}\n"],"names":["colors","redactUrlCredentials"],"mappings":"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"}
+{"version":3,"file":"terminal-logger.cjs","sources":["../../../src/adapters/terminal-logger/terminal-logger.ts"],"sourcesContent":["import colors from \"ansi-colors\";\nimport type { DebugGroup, Logger } from \"../../application/ports/logger.js\";\nimport { redactUrlSecrets } from \"../../domain/url-secrets.js\";\n\n/**\n * The Logger port on a terminal, with the original output format: ` ⚠  ` warnings, ` ✘  `\n * errors, and `openapi-ts:<group>` debug lines filtered by `DEBUG` (ENGINEERING_PLAN 4.5). No\n * line shows the user info of a URL.\n */\n\n/** Where the lines go: `console` in production, a recording sink in tests. */\nexport interface TerminalSink {\n  debug(line: string): void;\n  warn(line: string): void;\n  error(line: string): void;\n}\n\nexport interface TerminalLoggerOptions {\n  /**\n   * Drop warnings and error lines; debug lines, which `DEBUG` asks for, are still written. The\n   * error lines are the problems of a document that fails to load, which the thrown error lists.\n   */\n  readonly silent: boolean;\n  /** The value of `DEBUG`: `*`, `openapi-ts:*` or `openapi-ts:<group>` turn debug lines on. */\n  readonly debugFilter: string | undefined;\n  readonly useColors: boolean;\n  readonly sink: TerminalSink;\n}\n\ntype Colors = ReturnType<typeof colors.create>;\n\nconst MILLISECONDS_PER_SECOND = 1000;\nconst MILLISECONDS_PER_MINUTE = 60_000;\n\n/** A duration as the original prints it: one decimal, in ms, s or m. */\nexport function formatDuration(milliseconds: number): string {\n  if (milliseconds < MILLISECONDS_PER_SECOND) {\n    return `${Math.round(10 * milliseconds) / 10}ms`;\n  }\n  if (milliseconds < MILLISECONDS_PER_MINUTE) {\n    return `${Math.round(milliseconds / 100) / 10}s`;\n  }\n  return `${Math.round(milliseconds / 6000) / 10}m`;\n}\n\nfunction groupColor(palette: Colors, group: DebugGroup | undefined): (text: string) => string {\n  const byGroup: Readonly<Partial<Record<DebugGroup, (text: string) => string>>> = {\n    redoc: palette.cyanBright,\n    lint: palette.yellowBright,\n    bundle: palette.magentaBright,\n    ts: palette.blueBright,\n  };\n  return (group && byGroup[group]) || palette.whiteBright;\n}\n\n/** Whether `DEBUG` asks for this group (the original check, case-insensitive for the group). */\nexport function isDebugEnabled(filter: string | undefined, group: DebugGroup | undefined): boolean {\n  if (!filter) {\n    return false;\n  }\n  return (\n    !group ||\n    filter === \"*\" ||\n    filter === \"openapi-ts:*\" ||\n    filter.toLocaleLowerCase() === `openapi-ts:${group.toLocaleLowerCase()}`\n  );\n}\n\nclass TerminalLogger implements Logger {\n  readonly #options: TerminalLoggerOptions;\n  readonly #palette: Colors;\n\n  constructor(options: TerminalLoggerOptions) {\n    this.#options = options;\n    this.#palette = colors.create();\n    this.#palette.enabled = options.useColors;\n  }\n\n  debug(message: string, group?: DebugGroup, durationMs?: number): void {\n    if (!isDebugEnabled(this.#options.debugFilter, group)) {\n      return;\n    }\n    const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? \"info\"}`);\n    // The original wrote no space without a duration (`openapi-ts:lintIgnored …`).\n    const time =\n      durationMs === undefined ? \" \" : this.#palette.green(` ${formatDuration(durationMs)} `);\n    const text = redactUrlSecrets(message);\n    this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);\n  }\n\n  warn(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.warn(this.#palette.yellow(` ⚠  ${redactUrlSecrets(message)}`));\n    }\n  }\n\n  error(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.error(this.#palette.red(` ✘  ${redactUrlSecrets(message)}`));\n    }\n  }\n}\n\n/** A Logger that writes to a terminal sink. */\nexport function createTerminalLogger(options: TerminalLoggerOptions): Logger {\n  return new TerminalLogger(options);\n}\n"],"names":["colors","redactUrlSecrets"],"mappings":"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"}

package/dist/adapters/terminal-logger/terminal-logger.mjs

@@ -1,5 +1,5 @@
 import colors from 'ansi-colors';
-import { redactUrlCredentials } from '../../domain/url-credentials.mjs';
+import { redactUrlSecrets } from '../../domain/url-secrets.mjs';
 
 const MILLISECONDS_PER_SECOND = 1e3;
 const MILLISECONDS_PER_MINUTE = 6e4;
@@ -41,16 +41,18 @@ class TerminalLogger {
     }
     const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? "info"}`);
     const time = durationMs === void 0 ? " " : this.#palette.green(` ${formatDuration(durationMs)} `);
-    const text = redactUrlCredentials(message);
+    const text = redactUrlSecrets(message);
     this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);
   }
   warn(message) {
     if (!this.#options.silent) {
-      this.#options.sink.warn(this.#palette.yellow(` \u26A0  ${redactUrlCredentials(message)}`));
+      this.#options.sink.warn(this.#palette.yellow(` \u26A0  ${redactUrlSecrets(message)}`));
     }
   }
   error(message) {
-    this.#options.sink.error(this.#palette.red(` \u2718  ${redactUrlCredentials(message)}`));
+    if (!this.#options.silent) {
+      this.#options.sink.error(this.#palette.red(` \u2718  ${redactUrlSecrets(message)}`));
+    }
   }
 }
 function createTerminalLogger(options) {

package/dist/adapters/terminal-logger/terminal-logger.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-logger.mjs","sources":["../../../src/adapters/terminal-logger/terminal-logger.ts"],"sourcesContent":["import colors from \"ansi-colors\";\nimport type { DebugGroup, Logger } from \"../../application/ports/logger.js\";\nimport { redactUrlCredentials } from \"../../domain/url-credentials.js\";\n\n/**\n * The Logger port on a terminal, with the original output format: ` ⚠  ` warnings, ` ✘  `\n * errors, and `openapi-ts:<group>` debug lines filtered by `DEBUG` (ENGINEERING_PLAN 4.5). No\n * line shows the user info of a URL.\n */\n\n/** Where the lines go: `console` in production, a recording sink in tests. */\nexport interface TerminalSink {\n  debug(line: string): void;\n  warn(line: string): void;\n  error(line: string): void;\n}\n\nexport interface TerminalLoggerOptions {\n  /** Drop warnings (errors and debug lines are still written). */\n  readonly silent: boolean;\n  /** The value of `DEBUG`: `*`, `openapi-ts:*` or `openapi-ts:<group>` turn debug lines on. */\n  readonly debugFilter: string | undefined;\n  readonly useColors: boolean;\n  readonly sink: TerminalSink;\n}\n\ntype Colors = ReturnType<typeof colors.create>;\n\nconst MILLISECONDS_PER_SECOND = 1000;\nconst MILLISECONDS_PER_MINUTE = 60_000;\n\n/** A duration as the original prints it: one decimal, in ms, s or m. */\nexport function formatDuration(milliseconds: number): string {\n  if (milliseconds < MILLISECONDS_PER_SECOND) {\n    return `${Math.round(10 * milliseconds) / 10}ms`;\n  }\n  if (milliseconds < MILLISECONDS_PER_MINUTE) {\n    return `${Math.round(milliseconds / 100) / 10}s`;\n  }\n  return `${Math.round(milliseconds / 6000) / 10}m`;\n}\n\nfunction groupColor(palette: Colors, group: DebugGroup | undefined): (text: string) => string {\n  const byGroup: Readonly<Partial<Record<DebugGroup, (text: string) => string>>> = {\n    redoc: palette.cyanBright,\n    lint: palette.yellowBright,\n    bundle: palette.magentaBright,\n    ts: palette.blueBright,\n  };\n  return (group && byGroup[group]) || palette.whiteBright;\n}\n\n/** Whether `DEBUG` asks for this group (the original check, case-insensitive for the group). */\nexport function isDebugEnabled(filter: string | undefined, group: DebugGroup | undefined): boolean {\n  if (!filter) {\n    return false;\n  }\n  return (\n    !group ||\n    filter === \"*\" ||\n    filter === \"openapi-ts:*\" ||\n    filter.toLocaleLowerCase() === `openapi-ts:${group.toLocaleLowerCase()}`\n  );\n}\n\nclass TerminalLogger implements Logger {\n  readonly #options: TerminalLoggerOptions;\n  readonly #palette: Colors;\n\n  constructor(options: TerminalLoggerOptions) {\n    this.#options = options;\n    this.#palette = colors.create();\n    this.#palette.enabled = options.useColors;\n  }\n\n  debug(message: string, group?: DebugGroup, durationMs?: number): void {\n    if (!isDebugEnabled(this.#options.debugFilter, group)) {\n      return;\n    }\n    const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? \"info\"}`);\n    // The original wrote no space without a duration (`openapi-ts:lintIgnored …`).\n    const time =\n      durationMs === undefined ? \" \" : this.#palette.green(` ${formatDuration(durationMs)} `);\n    const text = redactUrlCredentials(message);\n    this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);\n  }\n\n  warn(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.warn(this.#palette.yellow(` ⚠  ${redactUrlCredentials(message)}`));\n    }\n  }\n\n  error(message: string): void {\n    this.#options.sink.error(this.#palette.red(` ✘  ${redactUrlCredentials(message)}`));\n  }\n}\n\n/** A Logger that writes to a terminal sink. */\nexport function createTerminalLogger(options: TerminalLoggerOptions): Logger {\n  return new TerminalLogger(options);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-logger.mjs","sources":["../../../src/adapters/terminal-logger/terminal-logger.ts"],"sourcesContent":["import colors from \"ansi-colors\";\nimport type { DebugGroup, Logger } from \"../../application/ports/logger.js\";\nimport { redactUrlSecrets } from \"../../domain/url-secrets.js\";\n\n/**\n * The Logger port on a terminal, with the original output format: ` ⚠  ` warnings, ` ✘  `\n * errors, and `openapi-ts:<group>` debug lines filtered by `DEBUG` (ENGINEERING_PLAN 4.5). No\n * line shows the user info of a URL.\n */\n\n/** Where the lines go: `console` in production, a recording sink in tests. */\nexport interface TerminalSink {\n  debug(line: string): void;\n  warn(line: string): void;\n  error(line: string): void;\n}\n\nexport interface TerminalLoggerOptions {\n  /**\n   * Drop warnings and error lines; debug lines, which `DEBUG` asks for, are still written. The\n   * error lines are the problems of a document that fails to load, which the thrown error lists.\n   */\n  readonly silent: boolean;\n  /** The value of `DEBUG`: `*`, `openapi-ts:*` or `openapi-ts:<group>` turn debug lines on. */\n  readonly debugFilter: string | undefined;\n  readonly useColors: boolean;\n  readonly sink: TerminalSink;\n}\n\ntype Colors = ReturnType<typeof colors.create>;\n\nconst MILLISECONDS_PER_SECOND = 1000;\nconst MILLISECONDS_PER_MINUTE = 60_000;\n\n/** A duration as the original prints it: one decimal, in ms, s or m. */\nexport function formatDuration(milliseconds: number): string {\n  if (milliseconds < MILLISECONDS_PER_SECOND) {\n    return `${Math.round(10 * milliseconds) / 10}ms`;\n  }\n  if (milliseconds < MILLISECONDS_PER_MINUTE) {\n    return `${Math.round(milliseconds / 100) / 10}s`;\n  }\n  return `${Math.round(milliseconds / 6000) / 10}m`;\n}\n\nfunction groupColor(palette: Colors, group: DebugGroup | undefined): (text: string) => string {\n  const byGroup: Readonly<Partial<Record<DebugGroup, (text: string) => string>>> = {\n    redoc: palette.cyanBright,\n    lint: palette.yellowBright,\n    bundle: palette.magentaBright,\n    ts: palette.blueBright,\n  };\n  return (group && byGroup[group]) || palette.whiteBright;\n}\n\n/** Whether `DEBUG` asks for this group (the original check, case-insensitive for the group). */\nexport function isDebugEnabled(filter: string | undefined, group: DebugGroup | undefined): boolean {\n  if (!filter) {\n    return false;\n  }\n  return (\n    !group ||\n    filter === \"*\" ||\n    filter === \"openapi-ts:*\" ||\n    filter.toLocaleLowerCase() === `openapi-ts:${group.toLocaleLowerCase()}`\n  );\n}\n\nclass TerminalLogger implements Logger {\n  readonly #options: TerminalLoggerOptions;\n  readonly #palette: Colors;\n\n  constructor(options: TerminalLoggerOptions) {\n    this.#options = options;\n    this.#palette = colors.create();\n    this.#palette.enabled = options.useColors;\n  }\n\n  debug(message: string, group?: DebugGroup, durationMs?: number): void {\n    if (!isDebugEnabled(this.#options.debugFilter, group)) {\n      return;\n    }\n    const name = groupColor(this.#palette, group)(`openapi-ts:${group ?? \"info\"}`);\n    // The original wrote no space without a duration (`openapi-ts:lintIgnored …`).\n    const time =\n      durationMs === undefined ? \" \" : this.#palette.green(` ${formatDuration(durationMs)} `);\n    const text = redactUrlSecrets(message);\n    this.#options.sink.debug(`  ${this.#palette.bold(name)}${time}${text}`);\n  }\n\n  warn(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.warn(this.#palette.yellow(` ⚠  ${redactUrlSecrets(message)}`));\n    }\n  }\n\n  error(message: string): void {\n    if (!this.#options.silent) {\n      this.#options.sink.error(this.#palette.red(` ✘  ${redactUrlSecrets(message)}`));\n    }\n  }\n}\n\n/** A Logger that writes to a terminal sink. */\nexport function createTerminalLogger(options: TerminalLoggerOptions): Logger {\n  return new TerminalLogger(options);\n}\n"],"names":[],"mappings":"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"}

package/dist/api/default-ports.cjs

@@ -14,21 +14,33 @@ function terminalSupportsColor() {
   const stdout = supportsColor__default.stdout;
   return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;
 }
+const STDERR_SINK = {
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  debug: (line) => console.error(line),
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  warn: (line) => console.warn(line),
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  error: (line) => console.error(line)
+};
 function defaultLogger(silent) {
   return terminalLogger.createTerminalLogger({
     silent,
     debugFilter: process.env.DEBUG,
     useColors: terminalSupportsColor(),
-    sink: console
+    sink: STDERR_SINK
   });
 }
 function defaultDeprecationReporter() {
   return nodeDeprecations.createNodeDeprecationReporter();
 }
 const REMOTE_REF_TIMEOUT_MS = 6e4;
+const MEBIBYTE = 1024 * 1024;
 const DEFAULT_REMOTE_DOCUMENT_LIMITS = {
   maxDocuments: 1e4,
-  maxParallelFetches: 16
+  maxParallelFetches: 16,
+  maxDocumentBytes: 128 * MEBIBYTE,
+  maxTotalBytes: 256 * MEBIBYTE,
+  maxNodes: 8e6
 };
 function processCwd() {
   return process.cwd();

package/dist/api/default-ports.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"default-ports.cjs","sources":["../../src/api/default-ports.ts"],"sourcesContent":["import { performance } from \"node:perf_hooks\";\nimport { createConfig, type Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport supportsColor from \"supports-color\";\nimport { createNodeDeprecationReporter } from \"../adapters/node-deprecations/node-deprecations.js\";\nimport type { RemoteDocumentLimits } from \"../adapters/redocly-loader/remote-fetch.js\";\nimport { createTerminalLogger } from \"../adapters/terminal-logger/terminal-logger.js\";\nimport type { DeprecationReporter } from \"../application/ports/deprecation-reporter.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\n\n/**\n * The default adapters of the Node API (ENGINEERING_PLAN 4.5): this module and the CLI's\n * composition root are where the process environment is read.\n */\n\n/** Colors when the terminal supports them, as the original decided. */\nexport function terminalSupportsColor(): boolean {\n  const stdout = supportsColor.stdout;\n  return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;\n}\n\n/** The terminal logger with `DEBUG` from the environment, writing to the console. */\nexport function defaultLogger(silent: boolean): Logger {\n  return createTerminalLogger({\n    silent,\n    debugFilter: process.env.DEBUG,\n    useColors: terminalSupportsColor(),\n    sink: console,\n  });\n}\n\n/** Deprecations as Node.js `DeprecationWarning`s, each code once per process. */\nexport function defaultDeprecationReporter(): DeprecationReporter {\n  return createNodeDeprecationReporter();\n}\n\n/**\n * How long one remote `$ref` (or a remote source) may take to load. Large documents (the 27 MB\n * Cloudflare spec) download in seconds; a minute covers slow hosts, while Node's own fetch would\n * wait five minutes for a server that never answers (ENGINEERING_PLAN 8.5).\n */\nexport const REMOTE_REF_TIMEOUT_MS = 60_000;\n\n/**\n * Bounds on the remote documents of one run (ADR-033). Large split documents have a few thousand\n * files, so 10,000 leaves room and still ends an endless fan-out. 16 parallel fetches keep a\n * multi-file document fast without exhausting local ports.\n */\nexport const DEFAULT_REMOTE_DOCUMENT_LIMITS: RemoteDocumentLimits = {\n  maxDocuments: 10_000,\n  maxParallelFetches: 16,\n};\n\n/** The working directory of the process: the default `cwd` of an inline source. */\nexport function processCwd(): string {\n  return process.cwd();\n}\n\n/** A monotonic clock in milliseconds, for debug durations. */\nexport function monotonicNow(): number {\n  return performance.now();\n}\n\n/** The default Redocly config: minimal rules, and duplicate operation IDs are an error. */\nexport function defaultRedoclyConfig(): Promise<RedoclyConfig> {\n  const rules = { \"operation-operationId-unique\": { severity: \"error\" as const } };\n  return createConfig({ rules }, { extends: [\"minimal\"] });\n}\n"],"names":["supportsColor","createTerminalLogger","createNodeDeprecationReporter","performance","createConfig"],"mappings":";;;;;;;;;;;;AAeO,SAAS,qBAAA,GAAiC;AAC/C,EAAA,MAAM,SAASA,sBAAA,CAAc,MAAA;AAC7B,EAAA,OAAO,QAAQ,MAAM,CAAA,IAAK,MAAA,KAAW,KAAA,IAAS,OAAO,QAAA,KAAa,KAAA;AACpE;AAGO,SAAS,cAAc,MAAA,EAAyB;AACrD,EAAA,OAAOC,mCAAA,CAAqB;AAAA,IAC1B,MAAA;AAAA,IACA,WAAA,EAAa,QAAQ,GAAA,CAAI,KAAA;AAAA,IACzB,WAAW,qBAAA,EAAsB;AAAA,IACjC,IAAA,EAAM;AAAA,GACP,CAAA;AACH;AAGO,SAAS,0BAAA,GAAkD;AAChE,EAAA,OAAOC,8CAAA,EAA8B;AACvC;AAOO,MAAM,qBAAA,GAAwB;AAO9B,MAAM,8BAAA,GAAuD;AAAA,EAClE,YAAA,EAAc,GAAA;AAAA,EACd,kBAAA,EAAoB;AACtB;AAGO,SAAS,UAAA,GAAqB;AACnC,EAAA,OAAO,QAAQ,GAAA,EAAI;AACrB;AAGO,SAAS,YAAA,GAAuB;AACrC,EAAA,OAAOC,4BAAY,GAAA,EAAI;AACzB;AAGO,SAAS,oBAAA,GAA+C;AAC7D,EAAA,MAAM,QAAQ,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,SAAiB,EAAE;AAC/E,EAAA,OAAOC,wBAAA,CAAa,EAAE,KAAA,EAAM,EAAG,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA,EAAG,CAAA;AACzD;;;;;;;;;"}
+{"version":3,"file":"default-ports.cjs","sources":["../../src/api/default-ports.ts"],"sourcesContent":["import { performance } from \"node:perf_hooks\";\nimport { createConfig, type Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport supportsColor from \"supports-color\";\nimport { createNodeDeprecationReporter } from \"../adapters/node-deprecations/node-deprecations.js\";\nimport type { RemoteDocumentLimits } from \"../adapters/redocly-loader/remote-fetch.js\";\nimport {\n  createTerminalLogger,\n  type TerminalSink,\n} from \"../adapters/terminal-logger/terminal-logger.js\";\nimport type { DeprecationReporter } from \"../application/ports/deprecation-reporter.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\n\n/**\n * The default adapters of the Node API (ENGINEERING_PLAN 4.5): this module and the CLI's\n * composition root are where the process environment is read.\n */\n\n/** Colors when the terminal supports them, as the original decided. */\nexport function terminalSupportsColor(): boolean {\n  const stdout = supportsColor.stdout;\n  return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;\n}\n\n/**\n * Every line of the logger goes to stderr: the CLI writes the types to stdout, and `console.debug`\n * writes there too, so debug lines would end up inside the generated file.\n */\nconst STDERR_SINK: TerminalSink = {\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  debug: (line) => console.error(line),\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  warn: (line) => console.warn(line),\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  error: (line) => console.error(line),\n};\n\n/** The terminal logger with `DEBUG` from the environment, writing to stderr. */\nexport function defaultLogger(silent: boolean): Logger {\n  return createTerminalLogger({\n    silent,\n    debugFilter: process.env.DEBUG,\n    useColors: terminalSupportsColor(),\n    sink: STDERR_SINK,\n  });\n}\n\n/** Deprecations as Node.js `DeprecationWarning`s, each code once per process. */\nexport function defaultDeprecationReporter(): DeprecationReporter {\n  return createNodeDeprecationReporter();\n}\n\n/**\n * How long one remote `$ref` (or a remote source) may take to load. Large documents (the 27 MB\n * Cloudflare spec) download in seconds; a minute covers slow hosts, while Node's own fetch would\n * wait five minutes for a server that never answers (ENGINEERING_PLAN 8.5).\n */\nexport const REMOTE_REF_TIMEOUT_MS = 60_000;\n\nconst MEBIBYTE = 1024 * 1024;\n\n/**\n * Bounds on the remote documents of one schema (ADR-033). Large split documents have a few thousand\n * files, so 10,000 leaves room and still ends an endless fan-out. 16 parallel fetches keep a\n * multi-file document fast without exhausting local ports.\n *\n * The size limits count decoded bytes and parsed nodes (threat model T2, ADR-033 decision 6).\n * The largest document of the 1,820-entry compatibility corpus is Microsoft Graph beta: 71 MiB,\n * 2.65 million nodes (keys and values), 1.6 GB peak memory when loaded from a URL. A remote body\n * took about 7 bytes of memory per byte of text and 110 per node in our measurements, so 128 MiB\n * per document (1.8 times Graph beta), 256 MiB per schema (a split document may be twice as\n * large) and 8 million nodes per schema (3 times Graph beta) let crafted documents finish within\n * a heap of 2 GB; with the default heap of 4 GB they peak at about 1.2 to 2.3 GB.\n */\nexport const DEFAULT_REMOTE_DOCUMENT_LIMITS: RemoteDocumentLimits = {\n  maxDocuments: 10_000,\n  maxParallelFetches: 16,\n  maxDocumentBytes: 128 * MEBIBYTE,\n  maxTotalBytes: 256 * MEBIBYTE,\n  maxNodes: 8_000_000,\n};\n\n/** The working directory of the process: the default `cwd` of an inline source. */\nexport function processCwd(): string {\n  return process.cwd();\n}\n\n/** A monotonic clock in milliseconds, for debug durations. */\nexport function monotonicNow(): number {\n  return performance.now();\n}\n\n/** The default Redocly config: minimal rules, and duplicate operation IDs are an error. */\nexport function defaultRedoclyConfig(): Promise<RedoclyConfig> {\n  const rules = { \"operation-operationId-unique\": { severity: \"error\" as const } };\n  return createConfig({ rules }, { extends: [\"minimal\"] });\n}\n"],"names":["supportsColor","createTerminalLogger","createNodeDeprecationReporter","performance","createConfig"],"mappings":";;;;;;;;;;;;AAkBO,SAAS,qBAAA,GAAiC;AAC/C,EAAA,MAAM,SAASA,sBAAA,CAAc,MAAA;AAC7B,EAAA,OAAO,QAAQ,MAAM,CAAA,IAAK,MAAA,KAAW,KAAA,IAAS,OAAO,QAAA,KAAa,KAAA;AACpE;AAMA,MAAM,WAAA,GAA4B;AAAA;AAAA,EAEhC,KAAA,EAAO,CAAC,IAAA,KAAS,OAAA,CAAQ,MAAM,IAAI,CAAA;AAAA;AAAA,EAEnC,IAAA,EAAM,CAAC,IAAA,KAAS,OAAA,CAAQ,KAAK,IAAI,CAAA;AAAA;AAAA,EAEjC,KAAA,EAAO,CAAC,IAAA,KAAS,OAAA,CAAQ,MAAM,IAAI;AACrC,CAAA;AAGO,SAAS,cAAc,MAAA,EAAyB;AACrD,EAAA,OAAOC,mCAAA,CAAqB;AAAA,IAC1B,MAAA;AAAA,IACA,WAAA,EAAa,QAAQ,GAAA,CAAI,KAAA;AAAA,IACzB,WAAW,qBAAA,EAAsB;AAAA,IACjC,IAAA,EAAM;AAAA,GACP,CAAA;AACH;AAGO,SAAS,0BAAA,GAAkD;AAChE,EAAA,OAAOC,8CAAA,EAA8B;AACvC;AAOO,MAAM,qBAAA,GAAwB;AAErC,MAAM,WAAW,IAAA,GAAO,IAAA;AAejB,MAAM,8BAAA,GAAuD;AAAA,EAClE,YAAA,EAAc,GAAA;AAAA,EACd,kBAAA,EAAoB,EAAA;AAAA,EACpB,kBAAkB,GAAA,GAAM,QAAA;AAAA,EACxB,eAAe,GAAA,GAAM,QAAA;AAAA,EACrB,QAAA,EAAU;AACZ;AAGO,SAAS,UAAA,GAAqB;AACnC,EAAA,OAAO,QAAQ,GAAA,EAAI;AACrB;AAGO,SAAS,YAAA,GAAuB;AACrC,EAAA,OAAOC,4BAAY,GAAA,EAAI;AACzB;AAGO,SAAS,oBAAA,GAA+C;AAC7D,EAAA,MAAM,QAAQ,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,SAAiB,EAAE;AAC/E,EAAA,OAAOC,wBAAA,CAAa,EAAE,KAAA,EAAM,EAAG,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA,EAAG,CAAA;AACzD;;;;;;;;;"}

package/dist/api/default-ports.mjs

@@ -8,21 +8,33 @@ function terminalSupportsColor() {
   const stdout = supportsColor.stdout;
   return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;
 }
+const STDERR_SINK = {
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  debug: (line) => console.error(line),
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  warn: (line) => console.warn(line),
+  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel
+  error: (line) => console.error(line)
+};
 function defaultLogger(silent) {
   return createTerminalLogger({
     silent,
     debugFilter: process.env.DEBUG,
     useColors: terminalSupportsColor(),
-    sink: console
+    sink: STDERR_SINK
   });
 }
 function defaultDeprecationReporter() {
   return createNodeDeprecationReporter();
 }
 const REMOTE_REF_TIMEOUT_MS = 6e4;
+const MEBIBYTE = 1024 * 1024;
 const DEFAULT_REMOTE_DOCUMENT_LIMITS = {
   maxDocuments: 1e4,
-  maxParallelFetches: 16
+  maxParallelFetches: 16,
+  maxDocumentBytes: 128 * MEBIBYTE,
+  maxTotalBytes: 256 * MEBIBYTE,
+  maxNodes: 8e6
 };
 function processCwd() {
   return process.cwd();

package/dist/api/default-ports.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"default-ports.mjs","sources":["../../src/api/default-ports.ts"],"sourcesContent":["import { performance } from \"node:perf_hooks\";\nimport { createConfig, type Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport supportsColor from \"supports-color\";\nimport { createNodeDeprecationReporter } from \"../adapters/node-deprecations/node-deprecations.js\";\nimport type { RemoteDocumentLimits } from \"../adapters/redocly-loader/remote-fetch.js\";\nimport { createTerminalLogger } from \"../adapters/terminal-logger/terminal-logger.js\";\nimport type { DeprecationReporter } from \"../application/ports/deprecation-reporter.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\n\n/**\n * The default adapters of the Node API (ENGINEERING_PLAN 4.5): this module and the CLI's\n * composition root are where the process environment is read.\n */\n\n/** Colors when the terminal supports them, as the original decided. */\nexport function terminalSupportsColor(): boolean {\n  const stdout = supportsColor.stdout;\n  return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;\n}\n\n/** The terminal logger with `DEBUG` from the environment, writing to the console. */\nexport function defaultLogger(silent: boolean): Logger {\n  return createTerminalLogger({\n    silent,\n    debugFilter: process.env.DEBUG,\n    useColors: terminalSupportsColor(),\n    sink: console,\n  });\n}\n\n/** Deprecations as Node.js `DeprecationWarning`s, each code once per process. */\nexport function defaultDeprecationReporter(): DeprecationReporter {\n  return createNodeDeprecationReporter();\n}\n\n/**\n * How long one remote `$ref` (or a remote source) may take to load. Large documents (the 27 MB\n * Cloudflare spec) download in seconds; a minute covers slow hosts, while Node's own fetch would\n * wait five minutes for a server that never answers (ENGINEERING_PLAN 8.5).\n */\nexport const REMOTE_REF_TIMEOUT_MS = 60_000;\n\n/**\n * Bounds on the remote documents of one run (ADR-033). Large split documents have a few thousand\n * files, so 10,000 leaves room and still ends an endless fan-out. 16 parallel fetches keep a\n * multi-file document fast without exhausting local ports.\n */\nexport const DEFAULT_REMOTE_DOCUMENT_LIMITS: RemoteDocumentLimits = {\n  maxDocuments: 10_000,\n  maxParallelFetches: 16,\n};\n\n/** The working directory of the process: the default `cwd` of an inline source. */\nexport function processCwd(): string {\n  return process.cwd();\n}\n\n/** A monotonic clock in milliseconds, for debug durations. */\nexport function monotonicNow(): number {\n  return performance.now();\n}\n\n/** The default Redocly config: minimal rules, and duplicate operation IDs are an error. */\nexport function defaultRedoclyConfig(): Promise<RedoclyConfig> {\n  const rules = { \"operation-operationId-unique\": { severity: \"error\" as const } };\n  return createConfig({ rules }, { extends: [\"minimal\"] });\n}\n"],"names":[],"mappings":";;;;;;AAeO,SAAS,qBAAA,GAAiC;AAC/C,EAAA,MAAM,SAAS,aAAA,CAAc,MAAA;AAC7B,EAAA,OAAO,QAAQ,MAAM,CAAA,IAAK,MAAA,KAAW,KAAA,IAAS,OAAO,QAAA,KAAa,KAAA;AACpE;AAGO,SAAS,cAAc,MAAA,EAAyB;AACrD,EAAA,OAAO,oBAAA,CAAqB;AAAA,IAC1B,MAAA;AAAA,IACA,WAAA,EAAa,QAAQ,GAAA,CAAI,KAAA;AAAA,IACzB,WAAW,qBAAA,EAAsB;AAAA,IACjC,IAAA,EAAM;AAAA,GACP,CAAA;AACH;AAGO,SAAS,0BAAA,GAAkD;AAChE,EAAA,OAAO,6BAAA,EAA8B;AACvC;AAOO,MAAM,qBAAA,GAAwB;AAO9B,MAAM,8BAAA,GAAuD;AAAA,EAClE,YAAA,EAAc,GAAA;AAAA,EACd,kBAAA,EAAoB;AACtB;AAGO,SAAS,UAAA,GAAqB;AACnC,EAAA,OAAO,QAAQ,GAAA,EAAI;AACrB;AAGO,SAAS,YAAA,GAAuB;AACrC,EAAA,OAAO,YAAY,GAAA,EAAI;AACzB;AAGO,SAAS,oBAAA,GAA+C;AAC7D,EAAA,MAAM,QAAQ,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,SAAiB,EAAE;AAC/E,EAAA,OAAO,YAAA,CAAa,EAAE,KAAA,EAAM,EAAG,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA,EAAG,CAAA;AACzD;;"}
+{"version":3,"file":"default-ports.mjs","sources":["../../src/api/default-ports.ts"],"sourcesContent":["import { performance } from \"node:perf_hooks\";\nimport { createConfig, type Config as RedoclyConfig } from \"@redocly/openapi-core\";\nimport supportsColor from \"supports-color\";\nimport { createNodeDeprecationReporter } from \"../adapters/node-deprecations/node-deprecations.js\";\nimport type { RemoteDocumentLimits } from \"../adapters/redocly-loader/remote-fetch.js\";\nimport {\n  createTerminalLogger,\n  type TerminalSink,\n} from \"../adapters/terminal-logger/terminal-logger.js\";\nimport type { DeprecationReporter } from \"../application/ports/deprecation-reporter.js\";\nimport type { Logger } from \"../application/ports/logger.js\";\n\n/**\n * The default adapters of the Node API (ENGINEERING_PLAN 4.5): this module and the CLI's\n * composition root are where the process environment is read.\n */\n\n/** Colors when the terminal supports them, as the original decided. */\nexport function terminalSupportsColor(): boolean {\n  const stdout = supportsColor.stdout;\n  return Boolean(stdout) && stdout !== false && stdout.hasBasic !== false;\n}\n\n/**\n * Every line of the logger goes to stderr: the CLI writes the types to stdout, and `console.debug`\n * writes there too, so debug lines would end up inside the generated file.\n */\nconst STDERR_SINK: TerminalSink = {\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  debug: (line) => console.error(line),\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  warn: (line) => console.warn(line),\n  // biome-ignore lint/suspicious/noConsole: the terminal logger's own channel\n  error: (line) => console.error(line),\n};\n\n/** The terminal logger with `DEBUG` from the environment, writing to stderr. */\nexport function defaultLogger(silent: boolean): Logger {\n  return createTerminalLogger({\n    silent,\n    debugFilter: process.env.DEBUG,\n    useColors: terminalSupportsColor(),\n    sink: STDERR_SINK,\n  });\n}\n\n/** Deprecations as Node.js `DeprecationWarning`s, each code once per process. */\nexport function defaultDeprecationReporter(): DeprecationReporter {\n  return createNodeDeprecationReporter();\n}\n\n/**\n * How long one remote `$ref` (or a remote source) may take to load. Large documents (the 27 MB\n * Cloudflare spec) download in seconds; a minute covers slow hosts, while Node's own fetch would\n * wait five minutes for a server that never answers (ENGINEERING_PLAN 8.5).\n */\nexport const REMOTE_REF_TIMEOUT_MS = 60_000;\n\nconst MEBIBYTE = 1024 * 1024;\n\n/**\n * Bounds on the remote documents of one schema (ADR-033). Large split documents have a few thousand\n * files, so 10,000 leaves room and still ends an endless fan-out. 16 parallel fetches keep a\n * multi-file document fast without exhausting local ports.\n *\n * The size limits count decoded bytes and parsed nodes (threat model T2, ADR-033 decision 6).\n * The largest document of the 1,820-entry compatibility corpus is Microsoft Graph beta: 71 MiB,\n * 2.65 million nodes (keys and values), 1.6 GB peak memory when loaded from a URL. A remote body\n * took about 7 bytes of memory per byte of text and 110 per node in our measurements, so 128 MiB\n * per document (1.8 times Graph beta), 256 MiB per schema (a split document may be twice as\n * large) and 8 million nodes per schema (3 times Graph beta) let crafted documents finish within\n * a heap of 2 GB; with the default heap of 4 GB they peak at about 1.2 to 2.3 GB.\n */\nexport const DEFAULT_REMOTE_DOCUMENT_LIMITS: RemoteDocumentLimits = {\n  maxDocuments: 10_000,\n  maxParallelFetches: 16,\n  maxDocumentBytes: 128 * MEBIBYTE,\n  maxTotalBytes: 256 * MEBIBYTE,\n  maxNodes: 8_000_000,\n};\n\n/** The working directory of the process: the default `cwd` of an inline source. */\nexport function processCwd(): string {\n  return process.cwd();\n}\n\n/** A monotonic clock in milliseconds, for debug durations. */\nexport function monotonicNow(): number {\n  return performance.now();\n}\n\n/** The default Redocly config: minimal rules, and duplicate operation IDs are an error. */\nexport function defaultRedoclyConfig(): Promise<RedoclyConfig> {\n  const rules = { \"operation-operationId-unique\": { severity: \"error\" as const } };\n  return createConfig({ rules }, { extends: [\"minimal\"] });\n}\n"],"names":[],"mappings":";;;;;;AAkBO,SAAS,qBAAA,GAAiC;AAC/C,EAAA,MAAM,SAAS,aAAA,CAAc,MAAA;AAC7B,EAAA,OAAO,QAAQ,MAAM,CAAA,IAAK,MAAA,KAAW,KAAA,IAAS,OAAO,QAAA,KAAa,KAAA;AACpE;AAMA,MAAM,WAAA,GAA4B;AAAA;AAAA,EAEhC,KAAA,EAAO,CAAC,IAAA,KAAS,OAAA,CAAQ,MAAM,IAAI,CAAA;AAAA;AAAA,EAEnC,IAAA,EAAM,CAAC,IAAA,KAAS,OAAA,CAAQ,KAAK,IAAI,CAAA;AAAA;AAAA,EAEjC,KAAA,EAAO,CAAC,IAAA,KAAS,OAAA,CAAQ,MAAM,IAAI;AACrC,CAAA;AAGO,SAAS,cAAc,MAAA,EAAyB;AACrD,EAAA,OAAO,oBAAA,CAAqB;AAAA,IAC1B,MAAA;AAAA,IACA,WAAA,EAAa,QAAQ,GAAA,CAAI,KAAA;AAAA,IACzB,WAAW,qBAAA,EAAsB;AAAA,IACjC,IAAA,EAAM;AAAA,GACP,CAAA;AACH;AAGO,SAAS,0BAAA,GAAkD;AAChE,EAAA,OAAO,6BAAA,EAA8B;AACvC;AAOO,MAAM,qBAAA,GAAwB;AAErC,MAAM,WAAW,IAAA,GAAO,IAAA;AAejB,MAAM,8BAAA,GAAuD;AAAA,EAClE,YAAA,EAAc,GAAA;AAAA,EACd,kBAAA,EAAoB,EAAA;AAAA,EACpB,kBAAkB,GAAA,GAAM,QAAA;AAAA,EACxB,eAAe,GAAA,GAAM,QAAA;AAAA,EACrB,QAAA,EAAU;AACZ;AAGO,SAAS,UAAA,GAAqB;AACnC,EAAA,OAAO,QAAQ,GAAA,EAAI;AACrB;AAGO,SAAS,YAAA,GAAuB;AACrC,EAAA,OAAO,YAAY,GAAA,EAAI;AACzB;AAGO,SAAS,oBAAA,GAA+C;AAC7D,EAAA,MAAM,QAAQ,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,SAAiB,EAAE;AAC/E,EAAA,OAAO,YAAA,CAAa,EAAE,KAAA,EAAM,EAAG,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA,EAAG,CAAA;AACzD;;"}

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

@@ -7,14 +7,14 @@ const ROOT_SEGMENTS = 3;
 function typedAt(ref) {
   const segments = jsonPointer.parseRefPointer(ref);
   const nested = segments.slice(ROOT_SEGMENTS).filter((segment) => segment !== PROPERTIES_KEYWORD);
-  return jsonPointer.createRef([...segments.slice(0, ROOT_SEGMENTS), ...nested]);
+  return jsonPointer.appendPointer(jsonPointer.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: jsonPointer.createRef([ref, name]) };
+  return property === void 0 ? void 0 : { property, path: jsonPointer.appendPointer(ref, [name]) };
 }
 function declaredProperty(ref, name, resolve, visited) {
   const schema = resolve(ref);

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":";;AAyBA,MAAM,kBAAA,GAAqB,YAAA;AAE3B,MAAM,aAAA,GAAgB,CAAA;AAGtB,SAAS,QAAQ,GAAA,EAAqB;AACpC,EAAA,MAAM,QAAA,GAAW,gBAAgB,GAAG,CAAA;AACpC,EAAA,MAAM,MAAA,GAAS,SAAS,KAAA,CAAM,aAAa,EAAE,MAAA,CAAO,CAAC,OAAA,KAAY,OAAA,KAAY,kBAAkB,CAAA;AAC/F,EAAA,OAAO,SAAA,CAAU,CAAC,GAAG,QAAA,CAAS,KAAA,CAAM,GAAG,aAAa,CAAA,EAAG,GAAG,MAAM,CAAC,CAAA;AACnE;AAEA,SAAS,eAAe,KAAA,EAAuC;AAC7D,EAAA,OAAO,OAAO,UAAU,QAAA,IAAY,KAAA,KAAU,QAAQ,CAAC,KAAA,CAAM,QAAQ,KAAK,CAAA;AAC5E;AAGA,SAAS,WAAA,CAAY,IAAA,EAAoB,GAAA,EAAa,IAAA,EAA4C;AAChG,EAAA,MAAM,YAAY,YAAA,IAAgB,IAAA,GAAO,IAAA,CAAK,UAAA,GAAa,UAAa,IAAI,CAAA;AAC5E,EAAA,OAAO,QAAA,KAAa,MAAA,GAAY,MAAA,GAAY,EAAE,QAAA,EAAU,IAAA,EAAM,SAAA,CAAU,CAAC,GAAA,EAAK,IAAI,CAAC,CAAA,EAAE;AACvF;AAGA,SAAS,gBAAA,CACP,GAAA,EACA,IAAA,EACA,OAAA,EACA,OAAA,EAC8B;AAC9B,EAAA,MAAM,MAAA,GAAS,QAAQ,GAAG,CAAA;AAC1B,EAAA,IAAI,QAAQ,GAAA,CAAI,GAAG,KAAK,CAAC,cAAA,CAAe,MAAM,CAAA,EAAG;AAC/C,IAAA,OAAO,MAAA;AAAA,EACT;AACA,EAAA,OAAA,CAAQ,IAAI,GAAG,CAAA;AAEf,EAAA,KAAA,MAAW,IAAA,IAAQ,CAAC,MAAA,EAAQ,GAAI,OAAO,KAAA,IAAS,EAAG,CAAA,EAAG;AACpD,IAAA,IAAI,CAAC,cAAA,CAAe,IAAI,CAAA,EAAG;AACzB,MAAA;AAAA,IACF;AACA,IAAA,MAAM,KAAA,GACJ,MAAA,IAAU,IAAA,GACN,gBAAA,CAAiB,IAAA,CAAK,IAAA,EAAgB,IAAA,EAAM,OAAA,EAAS,OAAO,CAAA,GAC5D,WAAA,CAAY,IAAA,EAAM,KAAK,IAAI,CAAA;AACjC,IAAA,IAAI,UAAU,MAAA,EAAW;AACvB,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,EACF;AACA,EAAA,OAAO,MAAA;AACT;AAaA,SAAS,iBAAA,CACP,GAAA,EACA,IAAA,EACA,OAAA,EAC8B;AAC9B,EAAA,MAAM,MAAA,GAAS,QAAQ,GAAG,CAAA;AAC1B,EAAA,MAAM,OAAA,mBAAU,IAAI,GAAA,CAAI,CAAC,GAAG,CAAC,CAAA;AAC7B,EAAA,KAAA,MAAW,IAAA,IAAQ,eAAe,MAAM,CAAA,GAAK,OAAO,KAAA,IAAS,EAAC,GAAK,EAAC,EAAG;AACrE,IAAA,MAAM,KAAA,GACJ,cAAA,CAAe,IAAI,CAAA,IAAK,MAAA,IAAU,IAAA,GAC9B,gBAAA,CAAiB,IAAA,CAAK,IAAA,EAAgB,IAAA,EAAM,OAAA,EAAS,OAAO,CAAA,GAC5D,MAAA;AACN,IAAA,IAAI,UAAU,MAAA,EAAW;AACvB,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,EACF;AACA,EAAA,OAAO,MAAA;AACT;AAOO,SAAS,YAAA,CACd,OACA,OAAA,EACwB;AACxB,EAAA,MAAM,IAAA,GAAO,MAAM,aAAA,CAAc,YAAA;AACjC,EAAA,MAAM,WACJ,gBAAA,CAAiB,KAAA,CAAM,kBAAkB,IAAA,EAAM,OAAA,sBAAa,GAAA,EAAK,CAAA,KAChE,KAAA,CAAM,QAAQ,MAAA,GAAY,MAAA,GAAY,kBAAkB,KAAA,CAAM,GAAA,EAAK,MAAM,OAAO,CAAA,CAAA;AACnF,EAAA,IAAI,aAAa,MAAA,IAAa,CAAC,cAAA,CAAe,QAAA,CAAS,QAAQ,CAAA,EAAG;AAChE,IAAA,OAAO,MAAA;AAAA,EACT;AACA,EAAA,MAAM,GAAA,GAAO,SAAS,QAAA,CAAyC,IAAA;AAC/D,EAAA,MAAM,MAAA,GACJ,OAAO,GAAA,KAAQ,QAAA,GACX,EAAE,MAAA,EAAQ,OAAA,CAAQ,GAAG,CAAA,EAAG,IAAA,EAAM,QAAQ,GAAG,CAAA,KACzC,EAAE,MAAA,EAAQ,SAAS,QAAA,EAAU,IAAA,EAAM,SAAS,IAAA,EAAK;AACvD,EAAA,OAAO,eAAe,MAAA,CAAO,MAAM,CAAA,IAAK,KAAA,CAAM,QAAQ,MAAA,CAAO,MAAA,CAAO,IAAI,CAAA,GACpE,EAAE,MAAA,EAAQ,MAAA,CAAO,QAAQ,IAAA,EAAM,MAAA,CAAO,MAAK,GAC3C,MAAA;AACN;;"}
+{"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) {