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

package/dist/adapters/redocly-loader/redocly-config-source.cjs

@@ -3,12 +3,30 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const openapiCore = require('@redocly/openapi-core');
+const errors = require('../../domain/errors.cjs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 
+function reasonOf(error) {
+  return String(error).replace(/\n[\s\S]*$/, "");
+}
+async function loadedConfig(load, configPath) {
+  try {
+    return await load();
+  } catch (error) {
+    const config = configPath === void 0 ? "the default Redocly config" : `the Redocly config ${configPath}`;
+    const where = configPath === void 0 ? "in the working directory" : "next to it";
+    throw new errors.OpenAPITypesafeError({
+      code: errors.ERROR_CODES.CLI_CONFIG_INVALID,
+      message: `Cannot load ${config} or the ${openapiCore.IGNORE_FILE} ${where}: ${reasonOf(error)}`,
+      details: { configPath },
+      cause: error
+    });
+  }
+}
 class RedoclyConfigFiles {
   #cwd;
   constructor(cwd) {
@@ -25,13 +43,14 @@ class RedoclyConfigFiles {
     return fs__default.statSync(resolved).isDirectory() ? openapiCore.findConfig(resolved) : resolved;
   }
   load(configPath) {
-    return openapiCore.loadConfig({ configPath });
+    return loadedConfig(() => openapiCore.loadConfig({ configPath }), configPath);
   }
   createDefault() {
-    return openapiCore.createConfig(
+    const create = () => openapiCore.createConfig(
       { rules: { "operation-operationId-unique": { severity: "warn" } } },
       { extends: ["minimal"] }
     );
+    return loadedConfig(create, void 0);
   }
 }
 function createRedoclyConfigSource(cwd) {

package/dist/adapters/redocly-loader/redocly-config-source.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"redocly-config-source.cjs","sources":["../../../src/adapters/redocly-loader/redocly-config-source.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { createConfig, findConfig, loadConfig } from \"@redocly/openapi-core\";\nimport type {\n  RedoclyConfig,\n  RedoclyConfigSource,\n} from \"../../application/ports/redocly-config-source.js\";\n\n/** The Redocly config port on `@redocly/openapi-core`, resolving paths from `cwd`. */\nclass RedoclyConfigFiles implements RedoclyConfigSource {\n  readonly #cwd: string;\n\n  constructor(cwd: string) {\n    this.#cwd = cwd;\n  }\n\n  find(explicitPath: string | undefined): string | undefined {\n    if (!explicitPath) {\n      return findConfig(this.#cwd);\n    }\n    const resolved = path.resolve(this.#cwd, explicitPath);\n    if (!fs.existsSync(resolved)) {\n      return undefined;\n    }\n    return fs.statSync(resolved).isDirectory() ? findConfig(resolved) : resolved;\n  }\n\n  load(configPath: string): Promise<RedoclyConfig> {\n    return loadConfig({ configPath });\n  }\n\n  createDefault(): Promise<RedoclyConfig> {\n    return createConfig(\n      { rules: { \"operation-operationId-unique\": { severity: \"warn\" } } },\n      { extends: [\"minimal\"] },\n    );\n  }\n}\n\n/** Find and load `redocly.yaml` relative to the directory `cwd`. */\nexport function createRedoclyConfigSource(cwd: string): RedoclyConfigSource {\n  return new RedoclyConfigFiles(cwd);\n}\n"],"names":["findConfig","path","fs","loadConfig","createConfig"],"mappings":";;;;;;;;;;;AASA,MAAM,kBAAA,CAAkD;AAAA,EAC7C,IAAA;AAAA,EAET,YAAY,GAAA,EAAa;AACvB,IAAA,IAAA,CAAK,IAAA,GAAO,GAAA;AAAA,EACd;AAAA,EAEA,KAAK,YAAA,EAAsD;AACzD,IAAA,IAAI,CAAC,YAAA,EAAc;AACjB,MAAA,OAAOA,sBAAA,CAAW,KAAK,IAAI,CAAA;AAAA,IAC7B;AACA,IAAA,MAAM,QAAA,GAAWC,aAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,MAAM,YAAY,CAAA;AACrD,IAAA,IAAI,CAACC,WAAA,CAAG,UAAA,CAAW,QAAQ,CAAA,EAAG;AAC5B,MAAA,OAAO,MAAA;AAAA,IACT;AACA,IAAA,OAAOA,WAAA,CAAG,SAAS,QAAQ,CAAA,CAAE,aAAY,GAAIF,sBAAA,CAAW,QAAQ,CAAA,GAAI,QAAA;AAAA,EACtE;AAAA,EAEA,KAAK,UAAA,EAA4C;AAC/C,IAAA,OAAOG,sBAAA,CAAW,EAAE,UAAA,EAAY,CAAA;AAAA,EAClC;AAAA,EAEA,aAAA,GAAwC;AACtC,IAAA,OAAOC,wBAAA;AAAA,MACL,EAAE,OAAO,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,MAAA,IAAS,EAAE;AAAA,MAClE,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA;AAAE,KACzB;AAAA,EACF;AACF;AAGO,SAAS,0BAA0B,GAAA,EAAkC;AAC1E,EAAA,OAAO,IAAI,mBAAmB,GAAG,CAAA;AACnC;;"}
+{"version":3,"file":"redocly-config-source.cjs","sources":["../../../src/adapters/redocly-loader/redocly-config-source.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { createConfig, findConfig, IGNORE_FILE, loadConfig } from \"@redocly/openapi-core\";\nimport type {\n  RedoclyConfig,\n  RedoclyConfigSource,\n} from \"../../application/ports/redocly-config-source.js\";\nimport { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * The first line of a failure, with the error's name: a YAML error goes on with a snippet of the\n * file, and the name tells a YAML error from a file system one.\n */\nfunction reasonOf(error: unknown): string {\n  return String(error).replace(/\\n[\\s\\S]*$/, \"\");\n}\n\n/**\n * The config, or `CLI_CONFIG_INVALID`. Redocly reads the config file and the lint-ignore file\n * next to it (or in the working directory); either can be malformed, and its error does not\n * always name the file, so the message names both.\n */\nasync function loadedConfig(\n  load: () => Promise<RedoclyConfig>,\n  configPath: string | undefined,\n): Promise<RedoclyConfig> {\n  try {\n    return await load();\n  } catch (error) {\n    const config =\n      configPath === undefined ? \"the default Redocly config\" : `the Redocly config ${configPath}`;\n    const where = configPath === undefined ? \"in the working directory\" : \"next to it\";\n    throw new OpenAPITypesafeError({\n      code: ERROR_CODES.CLI_CONFIG_INVALID,\n      message: `Cannot load ${config} or the ${IGNORE_FILE} ${where}: ${reasonOf(error)}`,\n      details: { configPath },\n      cause: error,\n    });\n  }\n}\n\n/** The Redocly config port on `@redocly/openapi-core`, resolving paths from `cwd`. */\nclass RedoclyConfigFiles implements RedoclyConfigSource {\n  readonly #cwd: string;\n\n  constructor(cwd: string) {\n    this.#cwd = cwd;\n  }\n\n  find(explicitPath: string | undefined): string | undefined {\n    if (!explicitPath) {\n      return findConfig(this.#cwd);\n    }\n    const resolved = path.resolve(this.#cwd, explicitPath);\n    if (!fs.existsSync(resolved)) {\n      return undefined;\n    }\n    return fs.statSync(resolved).isDirectory() ? findConfig(resolved) : resolved;\n  }\n\n  load(configPath: string): Promise<RedoclyConfig> {\n    return loadedConfig(() => loadConfig({ configPath }), configPath);\n  }\n\n  createDefault(): Promise<RedoclyConfig> {\n    const create = () =>\n      createConfig(\n        { rules: { \"operation-operationId-unique\": { severity: \"warn\" } } },\n        { extends: [\"minimal\"] },\n      );\n    return loadedConfig(create, undefined);\n  }\n}\n\n/** Find and load `redocly.yaml` relative to the directory `cwd`. */\nexport function createRedoclyConfigSource(cwd: string): RedoclyConfigSource {\n  return new RedoclyConfigFiles(cwd);\n}\n"],"names":["OpenAPITypesafeError","ERROR_CODES","IGNORE_FILE","findConfig","path","fs","loadConfig","createConfig"],"mappings":";;;;;;;;;;;;AAaA,SAAS,SAAS,KAAA,EAAwB;AACxC,EAAA,OAAO,MAAA,CAAO,KAAK,CAAA,CAAE,OAAA,CAAQ,cAAc,EAAE,CAAA;AAC/C;AAOA,eAAe,YAAA,CACb,MACA,UAAA,EACwB;AACxB,EAAA,IAAI;AACF,IAAA,OAAO,MAAM,IAAA,EAAK;AAAA,EACpB,SAAS,KAAA,EAAO;AACd,IAAA,MAAM,MAAA,GACJ,UAAA,KAAe,MAAA,GAAY,4BAAA,GAA+B,sBAAsB,UAAU,CAAA,CAAA;AAC5F,IAAA,MAAM,KAAA,GAAQ,UAAA,KAAe,MAAA,GAAY,0BAAA,GAA6B,YAAA;AACtE,IAAA,MAAM,IAAIA,2BAAA,CAAqB;AAAA,MAC7B,MAAMC,kBAAA,CAAY,kBAAA;AAAA,MAClB,OAAA,EAAS,CAAA,YAAA,EAAe,MAAM,CAAA,QAAA,EAAWC,uBAAW,IAAI,KAAK,CAAA,EAAA,EAAK,QAAA,CAAS,KAAK,CAAC,CAAA,CAAA;AAAA,MACjF,OAAA,EAAS,EAAE,UAAA,EAAW;AAAA,MACtB,KAAA,EAAO;AAAA,KACR,CAAA;AAAA,EACH;AACF;AAGA,MAAM,kBAAA,CAAkD;AAAA,EAC7C,IAAA;AAAA,EAET,YAAY,GAAA,EAAa;AACvB,IAAA,IAAA,CAAK,IAAA,GAAO,GAAA;AAAA,EACd;AAAA,EAEA,KAAK,YAAA,EAAsD;AACzD,IAAA,IAAI,CAAC,YAAA,EAAc;AACjB,MAAA,OAAOC,sBAAA,CAAW,KAAK,IAAI,CAAA;AAAA,IAC7B;AACA,IAAA,MAAM,QAAA,GAAWC,aAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,MAAM,YAAY,CAAA;AACrD,IAAA,IAAI,CAACC,WAAA,CAAG,UAAA,CAAW,QAAQ,CAAA,EAAG;AAC5B,MAAA,OAAO,MAAA;AAAA,IACT;AACA,IAAA,OAAOA,WAAA,CAAG,SAAS,QAAQ,CAAA,CAAE,aAAY,GAAIF,sBAAA,CAAW,QAAQ,CAAA,GAAI,QAAA;AAAA,EACtE;AAAA,EAEA,KAAK,UAAA,EAA4C;AAC/C,IAAA,OAAO,aAAa,MAAMG,sBAAA,CAAW,EAAE,UAAA,EAAY,GAAG,UAAU,CAAA;AAAA,EAClE;AAAA,EAEA,aAAA,GAAwC;AACtC,IAAA,MAAM,SAAS,MACbC,wBAAA;AAAA,MACE,EAAE,OAAO,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,MAAA,IAAS,EAAE;AAAA,MAClE,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA;AAAE,KACzB;AACF,IAAA,OAAO,YAAA,CAAa,QAAQ,MAAS,CAAA;AAAA,EACvC;AACF;AAGO,SAAS,0BAA0B,GAAA,EAAkC;AAC1E,EAAA,OAAO,IAAI,mBAAmB,GAAG,CAAA;AACnC;;"}

package/dist/adapters/redocly-loader/redocly-config-source.mjs

@@ -1,7 +1,25 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { findConfig, loadConfig, createConfig } from '@redocly/openapi-core';
+import { findConfig, IGNORE_FILE, loadConfig, createConfig } from '@redocly/openapi-core';
+import { OpenAPITypesafeError, ERROR_CODES } from '../../domain/errors.mjs';
 
+function reasonOf(error) {
+  return String(error).replace(/\n[\s\S]*$/, "");
+}
+async function loadedConfig(load, configPath) {
+  try {
+    return await load();
+  } catch (error) {
+    const config = configPath === void 0 ? "the default Redocly config" : `the Redocly config ${configPath}`;
+    const where = configPath === void 0 ? "in the working directory" : "next to it";
+    throw new OpenAPITypesafeError({
+      code: ERROR_CODES.CLI_CONFIG_INVALID,
+      message: `Cannot load ${config} or the ${IGNORE_FILE} ${where}: ${reasonOf(error)}`,
+      details: { configPath },
+      cause: error
+    });
+  }
+}
 class RedoclyConfigFiles {
   #cwd;
   constructor(cwd) {
@@ -18,13 +36,14 @@ class RedoclyConfigFiles {
     return fs.statSync(resolved).isDirectory() ? findConfig(resolved) : resolved;
   }
   load(configPath) {
-    return loadConfig({ configPath });
+    return loadedConfig(() => loadConfig({ configPath }), configPath);
   }
   createDefault() {
-    return createConfig(
+    const create = () => createConfig(
       { rules: { "operation-operationId-unique": { severity: "warn" } } },
       { extends: ["minimal"] }
     );
+    return loadedConfig(create, void 0);
   }
 }
 function createRedoclyConfigSource(cwd) {

package/dist/adapters/redocly-loader/redocly-config-source.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"redocly-config-source.mjs","sources":["../../../src/adapters/redocly-loader/redocly-config-source.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { createConfig, findConfig, loadConfig } from \"@redocly/openapi-core\";\nimport type {\n  RedoclyConfig,\n  RedoclyConfigSource,\n} from \"../../application/ports/redocly-config-source.js\";\n\n/** The Redocly config port on `@redocly/openapi-core`, resolving paths from `cwd`. */\nclass RedoclyConfigFiles implements RedoclyConfigSource {\n  readonly #cwd: string;\n\n  constructor(cwd: string) {\n    this.#cwd = cwd;\n  }\n\n  find(explicitPath: string | undefined): string | undefined {\n    if (!explicitPath) {\n      return findConfig(this.#cwd);\n    }\n    const resolved = path.resolve(this.#cwd, explicitPath);\n    if (!fs.existsSync(resolved)) {\n      return undefined;\n    }\n    return fs.statSync(resolved).isDirectory() ? findConfig(resolved) : resolved;\n  }\n\n  load(configPath: string): Promise<RedoclyConfig> {\n    return loadConfig({ configPath });\n  }\n\n  createDefault(): Promise<RedoclyConfig> {\n    return createConfig(\n      { rules: { \"operation-operationId-unique\": { severity: \"warn\" } } },\n      { extends: [\"minimal\"] },\n    );\n  }\n}\n\n/** Find and load `redocly.yaml` relative to the directory `cwd`. */\nexport function createRedoclyConfigSource(cwd: string): RedoclyConfigSource {\n  return new RedoclyConfigFiles(cwd);\n}\n"],"names":[],"mappings":";;;;AASA,MAAM,kBAAA,CAAkD;AAAA,EAC7C,IAAA;AAAA,EAET,YAAY,GAAA,EAAa;AACvB,IAAA,IAAA,CAAK,IAAA,GAAO,GAAA;AAAA,EACd;AAAA,EAEA,KAAK,YAAA,EAAsD;AACzD,IAAA,IAAI,CAAC,YAAA,EAAc;AACjB,MAAA,OAAO,UAAA,CAAW,KAAK,IAAI,CAAA;AAAA,IAC7B;AACA,IAAA,MAAM,QAAA,GAAW,IAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,MAAM,YAAY,CAAA;AACrD,IAAA,IAAI,CAAC,EAAA,CAAG,UAAA,CAAW,QAAQ,CAAA,EAAG;AAC5B,MAAA,OAAO,MAAA;AAAA,IACT;AACA,IAAA,OAAO,EAAA,CAAG,SAAS,QAAQ,CAAA,CAAE,aAAY,GAAI,UAAA,CAAW,QAAQ,CAAA,GAAI,QAAA;AAAA,EACtE;AAAA,EAEA,KAAK,UAAA,EAA4C;AAC/C,IAAA,OAAO,UAAA,CAAW,EAAE,UAAA,EAAY,CAAA;AAAA,EAClC;AAAA,EAEA,aAAA,GAAwC;AACtC,IAAA,OAAO,YAAA;AAAA,MACL,EAAE,OAAO,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,MAAA,IAAS,EAAE;AAAA,MAClE,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA;AAAE,KACzB;AAAA,EACF;AACF;AAGO,SAAS,0BAA0B,GAAA,EAAkC;AAC1E,EAAA,OAAO,IAAI,mBAAmB,GAAG,CAAA;AACnC;;"}
+{"version":3,"file":"redocly-config-source.mjs","sources":["../../../src/adapters/redocly-loader/redocly-config-source.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { createConfig, findConfig, IGNORE_FILE, loadConfig } from \"@redocly/openapi-core\";\nimport type {\n  RedoclyConfig,\n  RedoclyConfigSource,\n} from \"../../application/ports/redocly-config-source.js\";\nimport { ERROR_CODES, OpenAPITypesafeError } from \"../../domain/errors.js\";\n\n/**\n * The first line of a failure, with the error's name: a YAML error goes on with a snippet of the\n * file, and the name tells a YAML error from a file system one.\n */\nfunction reasonOf(error: unknown): string {\n  return String(error).replace(/\\n[\\s\\S]*$/, \"\");\n}\n\n/**\n * The config, or `CLI_CONFIG_INVALID`. Redocly reads the config file and the lint-ignore file\n * next to it (or in the working directory); either can be malformed, and its error does not\n * always name the file, so the message names both.\n */\nasync function loadedConfig(\n  load: () => Promise<RedoclyConfig>,\n  configPath: string | undefined,\n): Promise<RedoclyConfig> {\n  try {\n    return await load();\n  } catch (error) {\n    const config =\n      configPath === undefined ? \"the default Redocly config\" : `the Redocly config ${configPath}`;\n    const where = configPath === undefined ? \"in the working directory\" : \"next to it\";\n    throw new OpenAPITypesafeError({\n      code: ERROR_CODES.CLI_CONFIG_INVALID,\n      message: `Cannot load ${config} or the ${IGNORE_FILE} ${where}: ${reasonOf(error)}`,\n      details: { configPath },\n      cause: error,\n    });\n  }\n}\n\n/** The Redocly config port on `@redocly/openapi-core`, resolving paths from `cwd`. */\nclass RedoclyConfigFiles implements RedoclyConfigSource {\n  readonly #cwd: string;\n\n  constructor(cwd: string) {\n    this.#cwd = cwd;\n  }\n\n  find(explicitPath: string | undefined): string | undefined {\n    if (!explicitPath) {\n      return findConfig(this.#cwd);\n    }\n    const resolved = path.resolve(this.#cwd, explicitPath);\n    if (!fs.existsSync(resolved)) {\n      return undefined;\n    }\n    return fs.statSync(resolved).isDirectory() ? findConfig(resolved) : resolved;\n  }\n\n  load(configPath: string): Promise<RedoclyConfig> {\n    return loadedConfig(() => loadConfig({ configPath }), configPath);\n  }\n\n  createDefault(): Promise<RedoclyConfig> {\n    const create = () =>\n      createConfig(\n        { rules: { \"operation-operationId-unique\": { severity: \"warn\" } } },\n        { extends: [\"minimal\"] },\n      );\n    return loadedConfig(create, undefined);\n  }\n}\n\n/** Find and load `redocly.yaml` relative to the directory `cwd`. */\nexport function createRedoclyConfigSource(cwd: string): RedoclyConfigSource {\n  return new RedoclyConfigFiles(cwd);\n}\n"],"names":[],"mappings":";;;;;AAaA,SAAS,SAAS,KAAA,EAAwB;AACxC,EAAA,OAAO,MAAA,CAAO,KAAK,CAAA,CAAE,OAAA,CAAQ,cAAc,EAAE,CAAA;AAC/C;AAOA,eAAe,YAAA,CACb,MACA,UAAA,EACwB;AACxB,EAAA,IAAI;AACF,IAAA,OAAO,MAAM,IAAA,EAAK;AAAA,EACpB,SAAS,KAAA,EAAO;AACd,IAAA,MAAM,MAAA,GACJ,UAAA,KAAe,MAAA,GAAY,4BAAA,GAA+B,sBAAsB,UAAU,CAAA,CAAA;AAC5F,IAAA,MAAM,KAAA,GAAQ,UAAA,KAAe,MAAA,GAAY,0BAAA,GAA6B,YAAA;AACtE,IAAA,MAAM,IAAI,oBAAA,CAAqB;AAAA,MAC7B,MAAM,WAAA,CAAY,kBAAA;AAAA,MAClB,OAAA,EAAS,CAAA,YAAA,EAAe,MAAM,CAAA,QAAA,EAAW,WAAW,IAAI,KAAK,CAAA,EAAA,EAAK,QAAA,CAAS,KAAK,CAAC,CAAA,CAAA;AAAA,MACjF,OAAA,EAAS,EAAE,UAAA,EAAW;AAAA,MACtB,KAAA,EAAO;AAAA,KACR,CAAA;AAAA,EACH;AACF;AAGA,MAAM,kBAAA,CAAkD;AAAA,EAC7C,IAAA;AAAA,EAET,YAAY,GAAA,EAAa;AACvB,IAAA,IAAA,CAAK,IAAA,GAAO,GAAA;AAAA,EACd;AAAA,EAEA,KAAK,YAAA,EAAsD;AACzD,IAAA,IAAI,CAAC,YAAA,EAAc;AACjB,MAAA,OAAO,UAAA,CAAW,KAAK,IAAI,CAAA;AAAA,IAC7B;AACA,IAAA,MAAM,QAAA,GAAW,IAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,MAAM,YAAY,CAAA;AACrD,IAAA,IAAI,CAAC,EAAA,CAAG,UAAA,CAAW,QAAQ,CAAA,EAAG;AAC5B,MAAA,OAAO,MAAA;AAAA,IACT;AACA,IAAA,OAAO,EAAA,CAAG,SAAS,QAAQ,CAAA,CAAE,aAAY,GAAI,UAAA,CAAW,QAAQ,CAAA,GAAI,QAAA;AAAA,EACtE;AAAA,EAEA,KAAK,UAAA,EAA4C;AAC/C,IAAA,OAAO,aAAa,MAAM,UAAA,CAAW,EAAE,UAAA,EAAY,GAAG,UAAU,CAAA;AAAA,EAClE;AAAA,EAEA,aAAA,GAAwC;AACtC,IAAA,MAAM,SAAS,MACb,YAAA;AAAA,MACE,EAAE,OAAO,EAAE,8BAAA,EAAgC,EAAE,QAAA,EAAU,MAAA,IAAS,EAAE;AAAA,MAClE,EAAE,OAAA,EAAS,CAAC,SAAS,CAAA;AAAE,KACzB;AACF,IAAA,OAAO,YAAA,CAAa,QAAQ,MAAS,CAAA;AAAA,EACvC;AACF;AAGO,SAAS,0BAA0B,GAAA,EAAkC;AAC1E,EAAA,OAAO,IAAI,mBAAmB,GAAG,CAAA;AACnC;;"}

package/dist/adapters/redocly-loader/redocly-schema-loader.cjs

@@ -33,11 +33,10 @@ function assertOpenAPI3(document) {
   }
   throw schemaLoadErrors.versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);
 }
+const INLINE_SOURCE_NAME = "inline-source";
 function sourceAbsoluteRef(source, cwd) {
-  if (source instanceof URL) {
-    return source.protocol === "file:" ? sourceFilePath(source) : source.href;
-  }
-  return node_url.fileURLToPath(cwd);
+  const document = source instanceof URL ? source : new URL(INLINE_SOURCE_NAME, cwd);
+  return document.protocol === "file:" ? sourceFilePath(document) : document.href;
 }
 function sourceFilePath(source) {
   try {
@@ -140,10 +139,21 @@ class RedoclySchemaLoader {
     this.#options.logger.debug("Bundled schema", "bundle", this.#options.now() - startedAt);
     return bundled.bundle.parsed;
   }
-  /** Report every problem; then throw if any of them is an error. */
+  /**
+   * Report every problem; then throw if any of them is an error. A problem that the Redocly
+   * config's `.redocly.lint-ignore.yaml` lists is left out, as `redocly lint` leaves it out
+   * (upstream #2189).
+   */
   #report(problems) {
     const errorMessages = [];
     for (const problem of problems) {
+      if (problem.ignored === true) {
+        this.#options.logger.debug(
+          `Ignored by the lint ignore file: ${problemMessage(problem)}`,
+          "lint"
+        );
+        continue;
+      }
       const message = problemMessage(problem);
       if (problem.severity === "error") {
         errorMessages.push(message);

package/dist/adapters/redocly-loader/redocly-schema-loader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"redocly-schema-loader.cjs","sources":["../../../src/adapters/redocly-loader/redocly-schema-loader.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  bundle,\n  type Document,\n  lintDocument,\n  type NormalizedProblem,\n  type Config as RedoclyConfig,\n} from \"@redocly/openapi-core\";\nimport type { Logger } from \"../../application/ports/logger.js\";\nimport type { SchemaLoader, SchemaLoadRequest } from \"../../application/ports/schema-loader.js\";\nimport { withStackOverflowReportedAsync } from \"../../application/stack-overflow.js\";\nimport type { OpenAPI3 } from \"../../types.js\";\nimport { repairBundledRefs } from \"./bundled-ref-repair.js\";\nimport { findMalformedRefs, malformedRefsError } from \"./malformed-refs.js\";\nimport { RefAccessResolver } from \"./ref-access.js\";\nimport { resolveConfigWithAccess } from \"./remote-fetch.js\";\nimport {\n  loadFailedError,\n  refCycleError,\n  schemaInvalidError,\n  versionUnsupportedError,\n} from \"./schema-load-errors.js\";\nimport { parseSchema } from \"./schema-source.js\";\nimport {\n  findUnsupportedKeys,\n  type LoadedDocument,\n  unsupportedKeysError,\n} from \"./unsupported-keys.js\";\n\n/**\n * The SchemaLoader port on Redocly 1.34 (ADR-005): parse any inherited source type, then lint and\n * bundle with the given Redocly config. Problems go to the logger; errors fail the load.\n */\nexport interface RedoclySchemaLoaderOptions {\n  readonly redoc: RedoclyConfig;\n  readonly logger: Logger;\n  /** A monotonic time in milliseconds, for the debug durations. */\n  readonly now: () => number;\n  /** Time limit of one remote fetch, unless the Redocly config brings its own `customFetch`. */\n  readonly remoteRefTimeoutMs: number;\n}\n\nconst UNSUPPORTED_FORMAT_MESSAGE = \"Unsupported schema format, expected `openapi: 3.x`\";\n\n/**\n * Accept OpenAPI 3.x only; Swagger 2 and other formats get their own message. An empty file or a\n * `null` root parses to nothing, so it is checked before any field is read.\n */\nfunction assertOpenAPI3(document: unknown): void {\n  if (typeof document !== \"object\" || document === null) {\n    throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, {});\n  }\n  const parsed = document as Record<string, unknown>;\n  const openapiVersion = Number.parseFloat(parsed.openapi as string);\n  const isOpenAPI3 =\n    !parsed.swagger &&\n    Boolean(parsed.openapi) &&\n    !Number.isNaN(openapiVersion) &&\n    openapiVersion >= 3 &&\n    openapiVersion < 4;\n  if (isOpenAPI3) {\n    return;\n  }\n  if (parsed.swagger) {\n    throw versionUnsupportedError(\n      \"Unsupported Swagger version: 2.x. Use OpenAPI 3.x instead.\",\n      parsed,\n    );\n  }\n  if (parsed.openapi || openapiVersion < 3 || openapiVersion >= 4) {\n    throw versionUnsupportedError(`Unsupported OpenAPI version: ${parsed.openapi}`, parsed);\n  }\n  throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);\n}\n\n/** The base for relative `$ref`s: the source file or URL itself, else the working directory. */\nfunction sourceAbsoluteRef(source: unknown, cwd: URL): string {\n  if (source instanceof URL) {\n    return source.protocol === \"file:\" ? sourceFilePath(source) : source.href;\n  }\n  return fileURLToPath(cwd);\n}\n\n/**\n * The path of a `file:` source. A URL that names no path on this platform (an encoded slash, a\n * host on POSIX, no drive letter on Windows) cannot be read, so it fails as a read would.\n */\nfunction sourceFilePath(source: URL): string {\n  try {\n    return fileURLToPath(source);\n  } catch (error) {\n    // Node.js reports these as TypeErrors (ERR_INVALID_FILE_URL_PATH, ERR_INVALID_FILE_URL_HOST).\n    if (!(error instanceof TypeError)) {\n      throw error;\n    }\n    throw loadFailedError(source.href, error);\n  }\n}\n\n/** Redocly throws a plain Error for a `$ref` chain that points back to itself. */\nconst REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\n/**\n * The root document and every other document the resolver loaded, as far as they parsed. A root\n * read from a file or URL is in the resolver cache too, and is listed once.\n */\nasync function loadedDocuments(root: Document, resolver: BaseResolver): Promise<LoadedDocument[]> {\n  const cached = await Promise.all(resolver.cache.values());\n  const bySource = new Map<string, unknown>([[root.source.absoluteRef, root.parsed]]);\n  for (const document of cached) {\n    if (\"parsed\" in document && !bySource.has(document.source.absoluteRef)) {\n      bySource.set(document.source.absoluteRef, document.parsed);\n    }\n  }\n  return [...bySource].map(([source, parsed]) => ({ source, parsed }));\n}\n\n/** Report the document problems Redocly throws as typed errors; anything else passes through. */\nasync function rethrowDocumentError(\n  error: unknown,\n  root: Document,\n  resolver: BaseResolver,\n): Promise<never> {\n  if (error instanceof Error && error.message === REF_CYCLE_MESSAGE) {\n    throw refCycleError(error);\n  }\n  if (error instanceof URIError) {\n    throw malformedRefsError(findMalformedRefs(await loadedDocuments(root, resolver)), error);\n  }\n  if (error instanceof TypeError) {\n    const keys = findUnsupportedKeys(await loadedDocuments(root, resolver));\n    throw keys.length === 0 ? error : unsupportedKeysError(keys, error);\n  }\n  throw error;\n}\n\nclass RedoclySchemaLoader implements SchemaLoader {\n  readonly #options: RedoclySchemaLoaderOptions;\n\n  constructor(options: RedoclySchemaLoaderOptions) {\n    this.#options = options;\n  }\n\n  async load(request: SchemaLoadRequest): Promise<OpenAPI3> {\n    const resolver = this.#resolver(request);\n    // Parsing is guarded too: `JSON.stringify` of a deep object source overflows the stack on\n    // Node.js 22 and 24, before linting starts.\n    const bundled = await withStackOverflowReportedAsync(\"load\", () =>\n      this.#parseAndBundle(request, resolver),\n    ).catch((error: unknown) => {\n      throw resolver.firstRefusal ?? error;\n    });\n    // A refused `$ref` is an unresolved-`$ref` problem, which a Redocly config can turn off.\n    if (resolver.firstRefusal !== undefined) {\n      throw resolver.firstRefusal;\n    }\n    return bundled;\n  }\n\n  async #parseAndBundle(request: SchemaLoadRequest, resolver: BaseResolver): Promise<OpenAPI3> {\n    const { logger, now } = this.#options;\n    const configLoadedAt = now();\n    logger.debug(\"Loaded Redoc config\", \"redoc\", now() - configLoadedAt);\n    const parseStartedAt = now();\n    const absoluteRef = sourceAbsoluteRef(request.source, request.cwd);\n    const document = await parseSchema(request.source, { absoluteRef, resolver });\n    logger.debug(\"Parsed schema\", \"redoc\", now() - parseStartedAt);\n    assertOpenAPI3(document.parsed);\n    return this.#lintAndBundle(document, resolver, request.shouldLint);\n  }\n\n  #resolver(request: SchemaLoadRequest): RefAccessResolver {\n    const { redoc, remoteRefTimeoutMs } = this.#options;\n    const config = resolveConfigWithAccess(redoc.resolve, {\n      timeoutMs: remoteRefTimeoutMs,\n      access: request.refAccess,\n    });\n    return new RefAccessResolver(config, request.refAccess);\n  }\n\n  async #lintAndBundle(\n    document: Document,\n    resolver: BaseResolver,\n    shouldLint: boolean,\n  ): Promise<OpenAPI3> {\n    const rethrow = (error: unknown) => rethrowDocumentError(error, document, resolver);\n    if (shouldLint) {\n      await this.#lint(document, resolver).catch(rethrow);\n    }\n    return this.#bundle(document, resolver).catch(rethrow);\n  }\n\n  async #lint(document: Document, resolver: BaseResolver): Promise<void> {\n    const startedAt = this.#options.now();\n    const problems = await lintDocument({\n      document,\n      config: this.#options.redoc.styleguide,\n      externalRefResolver: resolver,\n    });\n    this.#report(problems);\n    this.#options.logger.debug(\"Linted schema\", \"lint\", this.#options.now() - startedAt);\n  }\n\n  async #bundle(document: Document, resolver: BaseResolver): Promise<OpenAPI3> {\n    const startedAt = this.#options.now();\n    // The lint resolver: documents it already loaded are not fetched again.\n    const bundled = await bundle({\n      config: this.#options.redoc,\n      dereference: false,\n      doc: document,\n      externalRefResolver: resolver,\n    });\n    this.#report(bundled.problems);\n    repairBundledRefs(bundled.bundle.parsed);\n    this.#options.logger.debug(\"Bundled schema\", \"bundle\", this.#options.now() - startedAt);\n    return bundled.bundle.parsed;\n  }\n\n  /** Report every problem; then throw if any of them is an error. */\n  #report(problems: readonly NormalizedProblem[]): void {\n    const errorMessages: string[] = [];\n    for (const problem of problems) {\n      const message = problemMessage(problem);\n      if (problem.severity === \"error\") {\n        errorMessages.push(message);\n        this.#options.logger.error(message);\n      } else {\n        this.#options.logger.warn(message);\n      }\n    }\n    if (errorMessages.length > 0) {\n      throw schemaInvalidError(errorMessages);\n    }\n  }\n}\n\nfunction problemMessage(problem: NormalizedProblem): string {\n  const location = problem.location?.[0]?.pointer;\n  return location ? `${problem.message} at ${location}` : problem.message;\n}\n\n/** A schema loader with one Redocly config and logger, for one or more loads. */\nexport function createRedoclySchemaLoader(options: RedoclySchemaLoaderOptions): SchemaLoader {\n  return new RedoclySchemaLoader(options);\n}\n"],"names":["versionUnsupportedError","fileURLToPath","loadFailedError","refCycleError","malformedRefsError","findMalformedRefs","findUnsupportedKeys","unsupportedKeysError","withStackOverflowReportedAsync","parseSchema","resolveConfigWithAccess","RefAccessResolver","lintDocument","bundle","repairBundledRefs","schemaInvalidError"],"mappings":"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"}
+{"version":3,"file":"redocly-schema-loader.cjs","sources":["../../../src/adapters/redocly-loader/redocly-schema-loader.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  bundle,\n  type Document,\n  lintDocument,\n  type NormalizedProblem,\n  type Config as RedoclyConfig,\n} from \"@redocly/openapi-core\";\nimport type { Logger } from \"../../application/ports/logger.js\";\nimport type { SchemaLoader, SchemaLoadRequest } from \"../../application/ports/schema-loader.js\";\nimport { withStackOverflowReportedAsync } from \"../../application/stack-overflow.js\";\nimport type { OpenAPI3 } from \"../../types.js\";\nimport { repairBundledRefs } from \"./bundled-ref-repair.js\";\nimport { findMalformedRefs, malformedRefsError } from \"./malformed-refs.js\";\nimport { RefAccessResolver } from \"./ref-access.js\";\nimport { resolveConfigWithAccess } from \"./remote-fetch.js\";\nimport {\n  loadFailedError,\n  refCycleError,\n  schemaInvalidError,\n  versionUnsupportedError,\n} from \"./schema-load-errors.js\";\nimport { parseSchema } from \"./schema-source.js\";\nimport {\n  findUnsupportedKeys,\n  type LoadedDocument,\n  unsupportedKeysError,\n} from \"./unsupported-keys.js\";\n\n/**\n * The SchemaLoader port on Redocly 1.34 (ADR-005): parse any inherited source type, then lint and\n * bundle with the given Redocly config. Problems go to the logger; errors fail the load.\n */\nexport interface RedoclySchemaLoaderOptions {\n  readonly redoc: RedoclyConfig;\n  readonly logger: Logger;\n  /** A monotonic time in milliseconds, for the debug durations. */\n  readonly now: () => number;\n  /** Time limit of one remote fetch, unless the Redocly config brings its own `customFetch`. */\n  readonly remoteRefTimeoutMs: number;\n}\n\nconst UNSUPPORTED_FORMAT_MESSAGE = \"Unsupported schema format, expected `openapi: 3.x`\";\n\n/**\n * Accept OpenAPI 3.x only; Swagger 2 and other formats get their own message. An empty file or a\n * `null` root parses to nothing, so it is checked before any field is read.\n */\nfunction assertOpenAPI3(document: unknown): void {\n  if (typeof document !== \"object\" || document === null) {\n    throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, {});\n  }\n  const parsed = document as Record<string, unknown>;\n  const openapiVersion = Number.parseFloat(parsed.openapi as string);\n  const isOpenAPI3 =\n    !parsed.swagger &&\n    Boolean(parsed.openapi) &&\n    !Number.isNaN(openapiVersion) &&\n    openapiVersion >= 3 &&\n    openapiVersion < 4;\n  if (isOpenAPI3) {\n    return;\n  }\n  if (parsed.swagger) {\n    throw versionUnsupportedError(\n      \"Unsupported Swagger version: 2.x. Use OpenAPI 3.x instead.\",\n      parsed,\n    );\n  }\n  if (parsed.openapi || openapiVersion < 3 || openapiVersion >= 4) {\n    throw versionUnsupportedError(`Unsupported OpenAPI version: ${parsed.openapi}`, parsed);\n  }\n  throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);\n}\n\n/**\n * The name an inline source (a string, object, buffer or stream) gets inside the working\n * directory. Redocly resolves relative `$ref`s against the directory of the document, so the\n * document must be named as a file in the working directory, not as the directory itself.\n */\nconst INLINE_SOURCE_NAME = \"inline-source\";\n\n/** The base for relative `$ref`s: the source file or URL itself, else a file in the cwd. */\nfunction sourceAbsoluteRef(source: unknown, cwd: URL): string {\n  const document = source instanceof URL ? source : new URL(INLINE_SOURCE_NAME, cwd);\n  return document.protocol === \"file:\" ? sourceFilePath(document) : document.href;\n}\n\n/**\n * The path of a `file:` source. A URL that names no path on this platform (an encoded slash, a\n * host on POSIX, no drive letter on Windows) cannot be read, so it fails as a read would.\n */\nfunction sourceFilePath(source: URL): string {\n  try {\n    return fileURLToPath(source);\n  } catch (error) {\n    // Node.js reports these as TypeErrors (ERR_INVALID_FILE_URL_PATH, ERR_INVALID_FILE_URL_HOST).\n    if (!(error instanceof TypeError)) {\n      throw error;\n    }\n    throw loadFailedError(source.href, error);\n  }\n}\n\n/** Redocly throws a plain Error for a `$ref` chain that points back to itself. */\nconst REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\n/**\n * The root document and every other document the resolver loaded, as far as they parsed. A root\n * read from a file or URL is in the resolver cache too, and is listed once.\n */\nasync function loadedDocuments(root: Document, resolver: BaseResolver): Promise<LoadedDocument[]> {\n  const cached = await Promise.all(resolver.cache.values());\n  const bySource = new Map<string, unknown>([[root.source.absoluteRef, root.parsed]]);\n  for (const document of cached) {\n    if (\"parsed\" in document && !bySource.has(document.source.absoluteRef)) {\n      bySource.set(document.source.absoluteRef, document.parsed);\n    }\n  }\n  return [...bySource].map(([source, parsed]) => ({ source, parsed }));\n}\n\n/** Report the document problems Redocly throws as typed errors; anything else passes through. */\nasync function rethrowDocumentError(\n  error: unknown,\n  root: Document,\n  resolver: BaseResolver,\n): Promise<never> {\n  if (error instanceof Error && error.message === REF_CYCLE_MESSAGE) {\n    throw refCycleError(error);\n  }\n  if (error instanceof URIError) {\n    throw malformedRefsError(findMalformedRefs(await loadedDocuments(root, resolver)), error);\n  }\n  if (error instanceof TypeError) {\n    const keys = findUnsupportedKeys(await loadedDocuments(root, resolver));\n    throw keys.length === 0 ? error : unsupportedKeysError(keys, error);\n  }\n  throw error;\n}\n\nclass RedoclySchemaLoader implements SchemaLoader {\n  readonly #options: RedoclySchemaLoaderOptions;\n\n  constructor(options: RedoclySchemaLoaderOptions) {\n    this.#options = options;\n  }\n\n  async load(request: SchemaLoadRequest): Promise<OpenAPI3> {\n    const resolver = this.#resolver(request);\n    // Parsing is guarded too: `JSON.stringify` of a deep object source overflows the stack on\n    // Node.js 22 and 24, before linting starts.\n    const bundled = await withStackOverflowReportedAsync(\"load\", () =>\n      this.#parseAndBundle(request, resolver),\n    ).catch((error: unknown) => {\n      throw resolver.firstRefusal ?? error;\n    });\n    // A refused `$ref` is an unresolved-`$ref` problem, which a Redocly config can turn off.\n    if (resolver.firstRefusal !== undefined) {\n      throw resolver.firstRefusal;\n    }\n    return bundled;\n  }\n\n  async #parseAndBundle(request: SchemaLoadRequest, resolver: BaseResolver): Promise<OpenAPI3> {\n    const { logger, now } = this.#options;\n    const configLoadedAt = now();\n    logger.debug(\"Loaded Redoc config\", \"redoc\", now() - configLoadedAt);\n    const parseStartedAt = now();\n    const absoluteRef = sourceAbsoluteRef(request.source, request.cwd);\n    const document = await parseSchema(request.source, { absoluteRef, resolver });\n    logger.debug(\"Parsed schema\", \"redoc\", now() - parseStartedAt);\n    assertOpenAPI3(document.parsed);\n    return this.#lintAndBundle(document, resolver, request.shouldLint);\n  }\n\n  #resolver(request: SchemaLoadRequest): RefAccessResolver {\n    const { redoc, remoteRefTimeoutMs } = this.#options;\n    const config = resolveConfigWithAccess(redoc.resolve, {\n      timeoutMs: remoteRefTimeoutMs,\n      access: request.refAccess,\n    });\n    return new RefAccessResolver(config, request.refAccess);\n  }\n\n  async #lintAndBundle(\n    document: Document,\n    resolver: BaseResolver,\n    shouldLint: boolean,\n  ): Promise<OpenAPI3> {\n    const rethrow = (error: unknown) => rethrowDocumentError(error, document, resolver);\n    if (shouldLint) {\n      await this.#lint(document, resolver).catch(rethrow);\n    }\n    return this.#bundle(document, resolver).catch(rethrow);\n  }\n\n  async #lint(document: Document, resolver: BaseResolver): Promise<void> {\n    const startedAt = this.#options.now();\n    const problems = await lintDocument({\n      document,\n      config: this.#options.redoc.styleguide,\n      externalRefResolver: resolver,\n    });\n    this.#report(problems);\n    this.#options.logger.debug(\"Linted schema\", \"lint\", this.#options.now() - startedAt);\n  }\n\n  async #bundle(document: Document, resolver: BaseResolver): Promise<OpenAPI3> {\n    const startedAt = this.#options.now();\n    // The lint resolver: documents it already loaded are not fetched again.\n    const bundled = await bundle({\n      config: this.#options.redoc,\n      dereference: false,\n      doc: document,\n      externalRefResolver: resolver,\n    });\n    this.#report(bundled.problems);\n    repairBundledRefs(bundled.bundle.parsed);\n    this.#options.logger.debug(\"Bundled schema\", \"bundle\", this.#options.now() - startedAt);\n    return bundled.bundle.parsed;\n  }\n\n  /**\n   * Report every problem; then throw if any of them is an error. A problem that the Redocly\n   * config's `.redocly.lint-ignore.yaml` lists is left out, as `redocly lint` leaves it out\n   * (upstream #2189).\n   */\n  #report(problems: readonly NormalizedProblem[]): void {\n    const errorMessages: string[] = [];\n    for (const problem of problems) {\n      if (problem.ignored === true) {\n        this.#options.logger.debug(\n          `Ignored by the lint ignore file: ${problemMessage(problem)}`,\n          \"lint\",\n        );\n        continue;\n      }\n      const message = problemMessage(problem);\n      if (problem.severity === \"error\") {\n        errorMessages.push(message);\n        this.#options.logger.error(message);\n      } else {\n        this.#options.logger.warn(message);\n      }\n    }\n    if (errorMessages.length > 0) {\n      throw schemaInvalidError(errorMessages);\n    }\n  }\n}\n\nfunction problemMessage(problem: NormalizedProblem): string {\n  const location = problem.location?.[0]?.pointer;\n  return location ? `${problem.message} at ${location}` : problem.message;\n}\n\n/** A schema loader with one Redocly config and logger, for one or more loads. */\nexport function createRedoclySchemaLoader(options: RedoclySchemaLoaderOptions): SchemaLoader {\n  return new RedoclySchemaLoader(options);\n}\n"],"names":["versionUnsupportedError","fileURLToPath","loadFailedError","refCycleError","malformedRefsError","findMalformedRefs","findUnsupportedKeys","unsupportedKeysError","withStackOverflowReportedAsync","parseSchema","resolveConfigWithAccess","RefAccessResolver","lintDocument","bundle","repairBundledRefs","schemaInvalidError"],"mappings":"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"}

package/dist/adapters/redocly-loader/redocly-schema-loader.mjs

@@ -31,11 +31,10 @@ function assertOpenAPI3(document) {
   }
   throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);
 }
+const INLINE_SOURCE_NAME = "inline-source";
 function sourceAbsoluteRef(source, cwd) {
-  if (source instanceof URL) {
-    return source.protocol === "file:" ? sourceFilePath(source) : source.href;
-  }
-  return fileURLToPath(cwd);
+  const document = source instanceof URL ? source : new URL(INLINE_SOURCE_NAME, cwd);
+  return document.protocol === "file:" ? sourceFilePath(document) : document.href;
 }
 function sourceFilePath(source) {
   try {
@@ -138,10 +137,21 @@ class RedoclySchemaLoader {
     this.#options.logger.debug("Bundled schema", "bundle", this.#options.now() - startedAt);
     return bundled.bundle.parsed;
   }
-  /** Report every problem; then throw if any of them is an error. */
+  /**
+   * Report every problem; then throw if any of them is an error. A problem that the Redocly
+   * config's `.redocly.lint-ignore.yaml` lists is left out, as `redocly lint` leaves it out
+   * (upstream #2189).
+   */
   #report(problems) {
     const errorMessages = [];
     for (const problem of problems) {
+      if (problem.ignored === true) {
+        this.#options.logger.debug(
+          `Ignored by the lint ignore file: ${problemMessage(problem)}`,
+          "lint"
+        );
+        continue;
+      }
       const message = problemMessage(problem);
       if (problem.severity === "error") {
         errorMessages.push(message);

package/dist/adapters/redocly-loader/redocly-schema-loader.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"redocly-schema-loader.mjs","sources":["../../../src/adapters/redocly-loader/redocly-schema-loader.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  bundle,\n  type Document,\n  lintDocument,\n  type NormalizedProblem,\n  type Config as RedoclyConfig,\n} from \"@redocly/openapi-core\";\nimport type { Logger } from \"../../application/ports/logger.js\";\nimport type { SchemaLoader, SchemaLoadRequest } from \"../../application/ports/schema-loader.js\";\nimport { withStackOverflowReportedAsync } from \"../../application/stack-overflow.js\";\nimport type { OpenAPI3 } from \"../../types.js\";\nimport { repairBundledRefs } from \"./bundled-ref-repair.js\";\nimport { findMalformedRefs, malformedRefsError } from \"./malformed-refs.js\";\nimport { RefAccessResolver } from \"./ref-access.js\";\nimport { resolveConfigWithAccess } from \"./remote-fetch.js\";\nimport {\n  loadFailedError,\n  refCycleError,\n  schemaInvalidError,\n  versionUnsupportedError,\n} from \"./schema-load-errors.js\";\nimport { parseSchema } from \"./schema-source.js\";\nimport {\n  findUnsupportedKeys,\n  type LoadedDocument,\n  unsupportedKeysError,\n} from \"./unsupported-keys.js\";\n\n/**\n * The SchemaLoader port on Redocly 1.34 (ADR-005): parse any inherited source type, then lint and\n * bundle with the given Redocly config. Problems go to the logger; errors fail the load.\n */\nexport interface RedoclySchemaLoaderOptions {\n  readonly redoc: RedoclyConfig;\n  readonly logger: Logger;\n  /** A monotonic time in milliseconds, for the debug durations. */\n  readonly now: () => number;\n  /** Time limit of one remote fetch, unless the Redocly config brings its own `customFetch`. */\n  readonly remoteRefTimeoutMs: number;\n}\n\nconst UNSUPPORTED_FORMAT_MESSAGE = \"Unsupported schema format, expected `openapi: 3.x`\";\n\n/**\n * Accept OpenAPI 3.x only; Swagger 2 and other formats get their own message. An empty file or a\n * `null` root parses to nothing, so it is checked before any field is read.\n */\nfunction assertOpenAPI3(document: unknown): void {\n  if (typeof document !== \"object\" || document === null) {\n    throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, {});\n  }\n  const parsed = document as Record<string, unknown>;\n  const openapiVersion = Number.parseFloat(parsed.openapi as string);\n  const isOpenAPI3 =\n    !parsed.swagger &&\n    Boolean(parsed.openapi) &&\n    !Number.isNaN(openapiVersion) &&\n    openapiVersion >= 3 &&\n    openapiVersion < 4;\n  if (isOpenAPI3) {\n    return;\n  }\n  if (parsed.swagger) {\n    throw versionUnsupportedError(\n      \"Unsupported Swagger version: 2.x. Use OpenAPI 3.x instead.\",\n      parsed,\n    );\n  }\n  if (parsed.openapi || openapiVersion < 3 || openapiVersion >= 4) {\n    throw versionUnsupportedError(`Unsupported OpenAPI version: ${parsed.openapi}`, parsed);\n  }\n  throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);\n}\n\n/** The base for relative `$ref`s: the source file or URL itself, else the working directory. */\nfunction sourceAbsoluteRef(source: unknown, cwd: URL): string {\n  if (source instanceof URL) {\n    return source.protocol === \"file:\" ? sourceFilePath(source) : source.href;\n  }\n  return fileURLToPath(cwd);\n}\n\n/**\n * The path of a `file:` source. A URL that names no path on this platform (an encoded slash, a\n * host on POSIX, no drive letter on Windows) cannot be read, so it fails as a read would.\n */\nfunction sourceFilePath(source: URL): string {\n  try {\n    return fileURLToPath(source);\n  } catch (error) {\n    // Node.js reports these as TypeErrors (ERR_INVALID_FILE_URL_PATH, ERR_INVALID_FILE_URL_HOST).\n    if (!(error instanceof TypeError)) {\n      throw error;\n    }\n    throw loadFailedError(source.href, error);\n  }\n}\n\n/** Redocly throws a plain Error for a `$ref` chain that points back to itself. */\nconst REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\n/**\n * The root document and every other document the resolver loaded, as far as they parsed. A root\n * read from a file or URL is in the resolver cache too, and is listed once.\n */\nasync function loadedDocuments(root: Document, resolver: BaseResolver): Promise<LoadedDocument[]> {\n  const cached = await Promise.all(resolver.cache.values());\n  const bySource = new Map<string, unknown>([[root.source.absoluteRef, root.parsed]]);\n  for (const document of cached) {\n    if (\"parsed\" in document && !bySource.has(document.source.absoluteRef)) {\n      bySource.set(document.source.absoluteRef, document.parsed);\n    }\n  }\n  return [...bySource].map(([source, parsed]) => ({ source, parsed }));\n}\n\n/** Report the document problems Redocly throws as typed errors; anything else passes through. */\nasync function rethrowDocumentError(\n  error: unknown,\n  root: Document,\n  resolver: BaseResolver,\n): Promise<never> {\n  if (error instanceof Error && error.message === REF_CYCLE_MESSAGE) {\n    throw refCycleError(error);\n  }\n  if (error instanceof URIError) {\n    throw malformedRefsError(findMalformedRefs(await loadedDocuments(root, resolver)), error);\n  }\n  if (error instanceof TypeError) {\n    const keys = findUnsupportedKeys(await loadedDocuments(root, resolver));\n    throw keys.length === 0 ? error : unsupportedKeysError(keys, error);\n  }\n  throw error;\n}\n\nclass RedoclySchemaLoader implements SchemaLoader {\n  readonly #options: RedoclySchemaLoaderOptions;\n\n  constructor(options: RedoclySchemaLoaderOptions) {\n    this.#options = options;\n  }\n\n  async load(request: SchemaLoadRequest): Promise<OpenAPI3> {\n    const resolver = this.#resolver(request);\n    // Parsing is guarded too: `JSON.stringify` of a deep object source overflows the stack on\n    // Node.js 22 and 24, before linting starts.\n    const bundled = await withStackOverflowReportedAsync(\"load\", () =>\n      this.#parseAndBundle(request, resolver),\n    ).catch((error: unknown) => {\n      throw resolver.firstRefusal ?? error;\n    });\n    // A refused `$ref` is an unresolved-`$ref` problem, which a Redocly config can turn off.\n    if (resolver.firstRefusal !== undefined) {\n      throw resolver.firstRefusal;\n    }\n    return bundled;\n  }\n\n  async #parseAndBundle(request: SchemaLoadRequest, resolver: BaseResolver): Promise<OpenAPI3> {\n    const { logger, now } = this.#options;\n    const configLoadedAt = now();\n    logger.debug(\"Loaded Redoc config\", \"redoc\", now() - configLoadedAt);\n    const parseStartedAt = now();\n    const absoluteRef = sourceAbsoluteRef(request.source, request.cwd);\n    const document = await parseSchema(request.source, { absoluteRef, resolver });\n    logger.debug(\"Parsed schema\", \"redoc\", now() - parseStartedAt);\n    assertOpenAPI3(document.parsed);\n    return this.#lintAndBundle(document, resolver, request.shouldLint);\n  }\n\n  #resolver(request: SchemaLoadRequest): RefAccessResolver {\n    const { redoc, remoteRefTimeoutMs } = this.#options;\n    const config = resolveConfigWithAccess(redoc.resolve, {\n      timeoutMs: remoteRefTimeoutMs,\n      access: request.refAccess,\n    });\n    return new RefAccessResolver(config, request.refAccess);\n  }\n\n  async #lintAndBundle(\n    document: Document,\n    resolver: BaseResolver,\n    shouldLint: boolean,\n  ): Promise<OpenAPI3> {\n    const rethrow = (error: unknown) => rethrowDocumentError(error, document, resolver);\n    if (shouldLint) {\n      await this.#lint(document, resolver).catch(rethrow);\n    }\n    return this.#bundle(document, resolver).catch(rethrow);\n  }\n\n  async #lint(document: Document, resolver: BaseResolver): Promise<void> {\n    const startedAt = this.#options.now();\n    const problems = await lintDocument({\n      document,\n      config: this.#options.redoc.styleguide,\n      externalRefResolver: resolver,\n    });\n    this.#report(problems);\n    this.#options.logger.debug(\"Linted schema\", \"lint\", this.#options.now() - startedAt);\n  }\n\n  async #bundle(document: Document, resolver: BaseResolver): Promise<OpenAPI3> {\n    const startedAt = this.#options.now();\n    // The lint resolver: documents it already loaded are not fetched again.\n    const bundled = await bundle({\n      config: this.#options.redoc,\n      dereference: false,\n      doc: document,\n      externalRefResolver: resolver,\n    });\n    this.#report(bundled.problems);\n    repairBundledRefs(bundled.bundle.parsed);\n    this.#options.logger.debug(\"Bundled schema\", \"bundle\", this.#options.now() - startedAt);\n    return bundled.bundle.parsed;\n  }\n\n  /** Report every problem; then throw if any of them is an error. */\n  #report(problems: readonly NormalizedProblem[]): void {\n    const errorMessages: string[] = [];\n    for (const problem of problems) {\n      const message = problemMessage(problem);\n      if (problem.severity === \"error\") {\n        errorMessages.push(message);\n        this.#options.logger.error(message);\n      } else {\n        this.#options.logger.warn(message);\n      }\n    }\n    if (errorMessages.length > 0) {\n      throw schemaInvalidError(errorMessages);\n    }\n  }\n}\n\nfunction problemMessage(problem: NormalizedProblem): string {\n  const location = problem.location?.[0]?.pointer;\n  return location ? `${problem.message} at ${location}` : problem.message;\n}\n\n/** A schema loader with one Redocly config and logger, for one or more loads. */\nexport function createRedoclySchemaLoader(options: RedoclySchemaLoaderOptions): SchemaLoader {\n  return new RedoclySchemaLoader(options);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"redocly-schema-loader.mjs","sources":["../../../src/adapters/redocly-loader/redocly-schema-loader.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\nimport {\n  type BaseResolver,\n  bundle,\n  type Document,\n  lintDocument,\n  type NormalizedProblem,\n  type Config as RedoclyConfig,\n} from \"@redocly/openapi-core\";\nimport type { Logger } from \"../../application/ports/logger.js\";\nimport type { SchemaLoader, SchemaLoadRequest } from \"../../application/ports/schema-loader.js\";\nimport { withStackOverflowReportedAsync } from \"../../application/stack-overflow.js\";\nimport type { OpenAPI3 } from \"../../types.js\";\nimport { repairBundledRefs } from \"./bundled-ref-repair.js\";\nimport { findMalformedRefs, malformedRefsError } from \"./malformed-refs.js\";\nimport { RefAccessResolver } from \"./ref-access.js\";\nimport { resolveConfigWithAccess } from \"./remote-fetch.js\";\nimport {\n  loadFailedError,\n  refCycleError,\n  schemaInvalidError,\n  versionUnsupportedError,\n} from \"./schema-load-errors.js\";\nimport { parseSchema } from \"./schema-source.js\";\nimport {\n  findUnsupportedKeys,\n  type LoadedDocument,\n  unsupportedKeysError,\n} from \"./unsupported-keys.js\";\n\n/**\n * The SchemaLoader port on Redocly 1.34 (ADR-005): parse any inherited source type, then lint and\n * bundle with the given Redocly config. Problems go to the logger; errors fail the load.\n */\nexport interface RedoclySchemaLoaderOptions {\n  readonly redoc: RedoclyConfig;\n  readonly logger: Logger;\n  /** A monotonic time in milliseconds, for the debug durations. */\n  readonly now: () => number;\n  /** Time limit of one remote fetch, unless the Redocly config brings its own `customFetch`. */\n  readonly remoteRefTimeoutMs: number;\n}\n\nconst UNSUPPORTED_FORMAT_MESSAGE = \"Unsupported schema format, expected `openapi: 3.x`\";\n\n/**\n * Accept OpenAPI 3.x only; Swagger 2 and other formats get their own message. An empty file or a\n * `null` root parses to nothing, so it is checked before any field is read.\n */\nfunction assertOpenAPI3(document: unknown): void {\n  if (typeof document !== \"object\" || document === null) {\n    throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, {});\n  }\n  const parsed = document as Record<string, unknown>;\n  const openapiVersion = Number.parseFloat(parsed.openapi as string);\n  const isOpenAPI3 =\n    !parsed.swagger &&\n    Boolean(parsed.openapi) &&\n    !Number.isNaN(openapiVersion) &&\n    openapiVersion >= 3 &&\n    openapiVersion < 4;\n  if (isOpenAPI3) {\n    return;\n  }\n  if (parsed.swagger) {\n    throw versionUnsupportedError(\n      \"Unsupported Swagger version: 2.x. Use OpenAPI 3.x instead.\",\n      parsed,\n    );\n  }\n  if (parsed.openapi || openapiVersion < 3 || openapiVersion >= 4) {\n    throw versionUnsupportedError(`Unsupported OpenAPI version: ${parsed.openapi}`, parsed);\n  }\n  throw versionUnsupportedError(UNSUPPORTED_FORMAT_MESSAGE, parsed);\n}\n\n/**\n * The name an inline source (a string, object, buffer or stream) gets inside the working\n * directory. Redocly resolves relative `$ref`s against the directory of the document, so the\n * document must be named as a file in the working directory, not as the directory itself.\n */\nconst INLINE_SOURCE_NAME = \"inline-source\";\n\n/** The base for relative `$ref`s: the source file or URL itself, else a file in the cwd. */\nfunction sourceAbsoluteRef(source: unknown, cwd: URL): string {\n  const document = source instanceof URL ? source : new URL(INLINE_SOURCE_NAME, cwd);\n  return document.protocol === \"file:\" ? sourceFilePath(document) : document.href;\n}\n\n/**\n * The path of a `file:` source. A URL that names no path on this platform (an encoded slash, a\n * host on POSIX, no drive letter on Windows) cannot be read, so it fails as a read would.\n */\nfunction sourceFilePath(source: URL): string {\n  try {\n    return fileURLToPath(source);\n  } catch (error) {\n    // Node.js reports these as TypeErrors (ERR_INVALID_FILE_URL_PATH, ERR_INVALID_FILE_URL_HOST).\n    if (!(error instanceof TypeError)) {\n      throw error;\n    }\n    throw loadFailedError(source.href, error);\n  }\n}\n\n/** Redocly throws a plain Error for a `$ref` chain that points back to itself. */\nconst REF_CYCLE_MESSAGE = \"Self-referencing circular pointer\";\n\n/**\n * The root document and every other document the resolver loaded, as far as they parsed. A root\n * read from a file or URL is in the resolver cache too, and is listed once.\n */\nasync function loadedDocuments(root: Document, resolver: BaseResolver): Promise<LoadedDocument[]> {\n  const cached = await Promise.all(resolver.cache.values());\n  const bySource = new Map<string, unknown>([[root.source.absoluteRef, root.parsed]]);\n  for (const document of cached) {\n    if (\"parsed\" in document && !bySource.has(document.source.absoluteRef)) {\n      bySource.set(document.source.absoluteRef, document.parsed);\n    }\n  }\n  return [...bySource].map(([source, parsed]) => ({ source, parsed }));\n}\n\n/** Report the document problems Redocly throws as typed errors; anything else passes through. */\nasync function rethrowDocumentError(\n  error: unknown,\n  root: Document,\n  resolver: BaseResolver,\n): Promise<never> {\n  if (error instanceof Error && error.message === REF_CYCLE_MESSAGE) {\n    throw refCycleError(error);\n  }\n  if (error instanceof URIError) {\n    throw malformedRefsError(findMalformedRefs(await loadedDocuments(root, resolver)), error);\n  }\n  if (error instanceof TypeError) {\n    const keys = findUnsupportedKeys(await loadedDocuments(root, resolver));\n    throw keys.length === 0 ? error : unsupportedKeysError(keys, error);\n  }\n  throw error;\n}\n\nclass RedoclySchemaLoader implements SchemaLoader {\n  readonly #options: RedoclySchemaLoaderOptions;\n\n  constructor(options: RedoclySchemaLoaderOptions) {\n    this.#options = options;\n  }\n\n  async load(request: SchemaLoadRequest): Promise<OpenAPI3> {\n    const resolver = this.#resolver(request);\n    // Parsing is guarded too: `JSON.stringify` of a deep object source overflows the stack on\n    // Node.js 22 and 24, before linting starts.\n    const bundled = await withStackOverflowReportedAsync(\"load\", () =>\n      this.#parseAndBundle(request, resolver),\n    ).catch((error: unknown) => {\n      throw resolver.firstRefusal ?? error;\n    });\n    // A refused `$ref` is an unresolved-`$ref` problem, which a Redocly config can turn off.\n    if (resolver.firstRefusal !== undefined) {\n      throw resolver.firstRefusal;\n    }\n    return bundled;\n  }\n\n  async #parseAndBundle(request: SchemaLoadRequest, resolver: BaseResolver): Promise<OpenAPI3> {\n    const { logger, now } = this.#options;\n    const configLoadedAt = now();\n    logger.debug(\"Loaded Redoc config\", \"redoc\", now() - configLoadedAt);\n    const parseStartedAt = now();\n    const absoluteRef = sourceAbsoluteRef(request.source, request.cwd);\n    const document = await parseSchema(request.source, { absoluteRef, resolver });\n    logger.debug(\"Parsed schema\", \"redoc\", now() - parseStartedAt);\n    assertOpenAPI3(document.parsed);\n    return this.#lintAndBundle(document, resolver, request.shouldLint);\n  }\n\n  #resolver(request: SchemaLoadRequest): RefAccessResolver {\n    const { redoc, remoteRefTimeoutMs } = this.#options;\n    const config = resolveConfigWithAccess(redoc.resolve, {\n      timeoutMs: remoteRefTimeoutMs,\n      access: request.refAccess,\n    });\n    return new RefAccessResolver(config, request.refAccess);\n  }\n\n  async #lintAndBundle(\n    document: Document,\n    resolver: BaseResolver,\n    shouldLint: boolean,\n  ): Promise<OpenAPI3> {\n    const rethrow = (error: unknown) => rethrowDocumentError(error, document, resolver);\n    if (shouldLint) {\n      await this.#lint(document, resolver).catch(rethrow);\n    }\n    return this.#bundle(document, resolver).catch(rethrow);\n  }\n\n  async #lint(document: Document, resolver: BaseResolver): Promise<void> {\n    const startedAt = this.#options.now();\n    const problems = await lintDocument({\n      document,\n      config: this.#options.redoc.styleguide,\n      externalRefResolver: resolver,\n    });\n    this.#report(problems);\n    this.#options.logger.debug(\"Linted schema\", \"lint\", this.#options.now() - startedAt);\n  }\n\n  async #bundle(document: Document, resolver: BaseResolver): Promise<OpenAPI3> {\n    const startedAt = this.#options.now();\n    // The lint resolver: documents it already loaded are not fetched again.\n    const bundled = await bundle({\n      config: this.#options.redoc,\n      dereference: false,\n      doc: document,\n      externalRefResolver: resolver,\n    });\n    this.#report(bundled.problems);\n    repairBundledRefs(bundled.bundle.parsed);\n    this.#options.logger.debug(\"Bundled schema\", \"bundle\", this.#options.now() - startedAt);\n    return bundled.bundle.parsed;\n  }\n\n  /**\n   * Report every problem; then throw if any of them is an error. A problem that the Redocly\n   * config's `.redocly.lint-ignore.yaml` lists is left out, as `redocly lint` leaves it out\n   * (upstream #2189).\n   */\n  #report(problems: readonly NormalizedProblem[]): void {\n    const errorMessages: string[] = [];\n    for (const problem of problems) {\n      if (problem.ignored === true) {\n        this.#options.logger.debug(\n          `Ignored by the lint ignore file: ${problemMessage(problem)}`,\n          \"lint\",\n        );\n        continue;\n      }\n      const message = problemMessage(problem);\n      if (problem.severity === \"error\") {\n        errorMessages.push(message);\n        this.#options.logger.error(message);\n      } else {\n        this.#options.logger.warn(message);\n      }\n    }\n    if (errorMessages.length > 0) {\n      throw schemaInvalidError(errorMessages);\n    }\n  }\n}\n\nfunction problemMessage(problem: NormalizedProblem): string {\n  const location = problem.location?.[0]?.pointer;\n  return location ? `${problem.message} at ${location}` : problem.message;\n}\n\n/** A schema loader with one Redocly config and logger, for one or more loads. */\nexport function createRedoclySchemaLoader(options: RedoclySchemaLoaderOptions): SchemaLoader {\n  return new RedoclySchemaLoader(options);\n}\n"],"names":[],"mappings":"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"}

package/dist/adapters/type-ast-bridge/ir-to-typescript.cjs

@@ -30,6 +30,9 @@ function toStringLiteralType(ts, value, encoding) {
 }
 function toTupleElement(ts, element) {
   const type = toTypeNode(ts, element.type);
+  if (element.isOptional) {
+    return ts.factory.createOptionalTypeNode(type);
+  }
   return element.isRest ? ts.factory.createRestTypeNode(type) : type;
 }
 function toLeafTypeNode(ts, type) {

package/dist/adapters/type-ast-bridge/ir-to-typescript.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ir-to-typescript.cjs","sources":["../../../src/adapters/type-ast-bridge/ir-to-typescript.ts"],"sourcesContent":["import type ts from \"typescript\";\nimport { assertNever } from \"../../domain/assert-never.js\";\nimport type {\n  IrComment,\n  IrKeyword,\n  IrMember,\n  IrPropertyName,\n  IrPropertySignature,\n  IrTupleElement,\n  IrType,\n} from \"../../domain/ir/nodes.js\";\nimport type { TypeScriptModule } from \"./load-typescript.js\";\n\n/**\n * Convert IR to TypeScript AST nodes with the same factory calls the original generator makes.\n * Printing the result with the TypeScript printer gives the original output, which is how the\n * printer parity tests (ENGINEERING_PLAN 4.3) define \"byte-identical\". Every function takes the\n * TypeScript module to build with (ADR-004, decision 4): the nodes must come from the same module\n * that later reads or prints them.\n */\n\ntype KeywordName = Exclude<IrKeyword, \"null\">;\n\nfunction keywordKind(ts: TypeScriptModule, keyword: KeywordName): ts.KeywordTypeSyntaxKind {\n  const kinds: Readonly<Record<KeywordName, ts.KeywordTypeSyntaxKind>> = {\n    string: ts.SyntaxKind.StringKeyword,\n    number: ts.SyntaxKind.NumberKeyword,\n    boolean: ts.SyntaxKind.BooleanKeyword,\n    undefined: ts.SyntaxKind.UndefinedKeyword,\n    unknown: ts.SyntaxKind.UnknownKeyword,\n    never: ts.SyntaxKind.NeverKeyword,\n  };\n  return kinds[keyword];\n}\n\nfunction toKeywordType(ts: TypeScriptModule, keyword: IrKeyword): ts.TypeNode {\n  return keyword === \"null\"\n    ? ts.factory.createLiteralTypeNode(ts.factory.createNull())\n    : ts.factory.createKeywordTypeNode(keywordKind(ts, keyword));\n}\n\n/**\n * Numbers as the original writes them: a negative value is a prefix minus on its absolute value.\n */\nfunction toNumberExpression(\n  ts: TypeScriptModule,\n  value: number,\n): ts.PrefixUnaryExpression | ts.NumericLiteral {\n  return value < 0\n    ? ts.factory.createPrefixUnaryExpression(\n        ts.SyntaxKind.MinusToken,\n        ts.factory.createNumericLiteral(Math.abs(value)),\n      )\n    : ts.factory.createNumericLiteral(value);\n}\n\n/** An enum member or array element value, written as the original writes it. */\nexport function toValueExpression(ts: TypeScriptModule, value: string | number): ts.Expression {\n  return typeof value === \"number\"\n    ? toNumberExpression(ts, value)\n    : ts.factory.createStringLiteral(value);\n}\n\n/** The original writes JSON-encoded literal types as identifiers to keep UTF-8 readable. */\nfunction toStringLiteralType(\n  ts: TypeScriptModule,\n  value: string,\n  encoding: \"json\" | \"escaped\",\n): ts.TypeNode {\n  return encoding === \"json\"\n    ? (ts.factory.createIdentifier(JSON.stringify(value)) as unknown as ts.TypeNode)\n    : ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(value));\n}\n\nfunction toTupleElement(ts: TypeScriptModule, element: IrTupleElement): ts.TypeNode {\n  const type = toTypeNode(ts, element.type);\n  return element.isRest ? ts.factory.createRestTypeNode(type) : type;\n}\n\ntype LeafType = Extract<\n  IrType,\n  { kind: \"keyword\" | \"stringLiteral\" | \"numberLiteral\" | \"booleanLiteral\" | \"raw\" }\n>;\n\nfunction toLeafTypeNode(ts: TypeScriptModule, type: LeafType): ts.TypeNode {\n  switch (type.kind) {\n    case \"keyword\":\n      return toKeywordType(ts, type.keyword);\n    case \"stringLiteral\":\n      return toStringLiteralType(ts, type.value, type.encoding);\n    case \"numberLiteral\":\n      return ts.factory.createLiteralTypeNode(toNumberExpression(ts, type.value));\n    case \"booleanLiteral\":\n      return ts.factory.createLiteralTypeNode(\n        type.value ? ts.factory.createTrue() : ts.factory.createFalse(),\n      );\n    case \"raw\":\n      // A node read from TypeScript goes back as it was, so the TypeScript printer indents it.\n      return (\n        (type.origin as ts.TypeNode | undefined) ??\n        (ts.factory.createIdentifier(type.text) as unknown as ts.TypeNode)\n      );\n    default:\n      return assertNever(type);\n  }\n}\n\nfunction toReferenceNode(\n  ts: TypeScriptModule,\n  type: Extract<IrType, { kind: \"reference\" }>,\n): ts.TypeNode {\n  const typeArguments =\n    type.typeArguments.length > 0\n      ? type.typeArguments.map((argument) => toTypeNode(ts, argument))\n      : undefined;\n  return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(type.name), typeArguments);\n}\n\n/** Convert one IR type. */\nexport function toTypeNode(ts: TypeScriptModule, type: IrType): ts.TypeNode {\n  const convert = (inner: IrType) => toTypeNode(ts, inner);\n  const { factory } = ts;\n  switch (type.kind) {\n    case \"keyword\":\n    case \"stringLiteral\":\n    case \"numberLiteral\":\n    case \"booleanLiteral\":\n    case \"raw\":\n      return toLeafTypeNode(ts, type);\n    case \"reference\":\n      return toReferenceNode(ts, type);\n    case \"array\":\n      return factory.createArrayTypeNode(convert(type.element));\n    case \"tuple\":\n      return factory.createTupleTypeNode(\n        type.elements.map((element) => toTupleElement(ts, element)),\n      );\n    case \"union\":\n      return factory.createUnionTypeNode(type.types.map(convert));\n    case \"intersection\":\n      return factory.createIntersectionTypeNode(type.types.map(convert));\n    case \"object\":\n      return factory.createTypeLiteralNode(type.members.map((member) => toTypeElement(ts, member)));\n    case \"indexedAccess\":\n      return factory.createIndexedAccessTypeNode(convert(type.object), convert(type.index));\n    case \"readonly\":\n      return factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, convert(type.type));\n    default:\n      return assertNever(type);\n  }\n}\n\n/** Attach IR comments to a node as synthetic leading comments, as the original does. */\nexport function withComments<T extends ts.Node>(\n  ts: TypeScriptModule,\n  node: T,\n  comments: readonly IrComment[],\n): T {\n  for (const comment of comments) {\n    const kind =\n      comment.kind === \"block\"\n        ? ts.SyntaxKind.MultiLineCommentTrivia\n        : ts.SyntaxKind.SingleLineCommentTrivia;\n    ts.addSyntheticLeadingComment(node, kind, comment.text, true);\n  }\n  return node;\n}\n\nfunction toPropertyName(ts: TypeScriptModule, name: IrPropertyName): ts.PropertyName {\n  switch (name.kind) {\n    case \"identifier\":\n      return ts.factory.createIdentifier(name.text);\n    case \"string\":\n      return ts.factory.createStringLiteral(name.value);\n    case \"number\":\n      return ts.factory.createNumericLiteral(name.text);\n    default:\n      return assertNever(name);\n  }\n}\n\nfunction readonlyModifiers(ts: TypeScriptModule, isReadonly: boolean): ts.Modifier[] | undefined {\n  return isReadonly ? [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)] : undefined;\n}\n\n/** Convert one property signature (for callbacks that receive a `ts.PropertySignature`). */\nexport function toPropertySignature(\n  ts: TypeScriptModule,\n  property: IrPropertySignature,\n): ts.PropertySignature {\n  const questionToken = property.isOptional\n    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)\n    : undefined;\n  const signature = ts.factory.createPropertySignature(\n    readonlyModifiers(ts, property.isReadonly),\n    toPropertyName(ts, property.name),\n    questionToken,\n    toTypeNode(ts, property.type),\n  );\n  return withComments(ts, signature, property.comments);\n}\n\nexport function toTypeElement(ts: TypeScriptModule, member: IrMember): ts.TypeElement {\n  if (member.kind === \"property\") {\n    return toPropertySignature(ts, member);\n  }\n  const parameter = ts.factory.createParameterDeclaration(\n    undefined,\n    undefined,\n    member.parameterName,\n    undefined,\n    toTypeNode(ts, member.parameterType),\n  );\n  const signature = ts.factory.createIndexSignature(\n    readonlyModifiers(ts, member.isReadonly),\n    [parameter],\n    toTypeNode(ts, member.type),\n  );\n  return withComments(ts, signature, member.comments);\n}\n"],"names":["assertNever"],"mappings":"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"}
+{"version":3,"file":"ir-to-typescript.cjs","sources":["../../../src/adapters/type-ast-bridge/ir-to-typescript.ts"],"sourcesContent":["import type ts from \"typescript\";\nimport { assertNever } from \"../../domain/assert-never.js\";\nimport type {\n  IrComment,\n  IrKeyword,\n  IrMember,\n  IrPropertyName,\n  IrPropertySignature,\n  IrTupleElement,\n  IrType,\n} from \"../../domain/ir/nodes.js\";\nimport type { TypeScriptModule } from \"./load-typescript.js\";\n\n/**\n * Convert IR to TypeScript AST nodes with the same factory calls the original generator makes.\n * Printing the result with the TypeScript printer gives the original output, which is how the\n * printer parity tests (ENGINEERING_PLAN 4.3) define \"byte-identical\". Every function takes the\n * TypeScript module to build with (ADR-004, decision 4): the nodes must come from the same module\n * that later reads or prints them.\n */\n\ntype KeywordName = Exclude<IrKeyword, \"null\">;\n\nfunction keywordKind(ts: TypeScriptModule, keyword: KeywordName): ts.KeywordTypeSyntaxKind {\n  const kinds: Readonly<Record<KeywordName, ts.KeywordTypeSyntaxKind>> = {\n    string: ts.SyntaxKind.StringKeyword,\n    number: ts.SyntaxKind.NumberKeyword,\n    boolean: ts.SyntaxKind.BooleanKeyword,\n    undefined: ts.SyntaxKind.UndefinedKeyword,\n    unknown: ts.SyntaxKind.UnknownKeyword,\n    never: ts.SyntaxKind.NeverKeyword,\n  };\n  return kinds[keyword];\n}\n\nfunction toKeywordType(ts: TypeScriptModule, keyword: IrKeyword): ts.TypeNode {\n  return keyword === \"null\"\n    ? ts.factory.createLiteralTypeNode(ts.factory.createNull())\n    : ts.factory.createKeywordTypeNode(keywordKind(ts, keyword));\n}\n\n/**\n * Numbers as the original writes them: a negative value is a prefix minus on its absolute value.\n */\nfunction toNumberExpression(\n  ts: TypeScriptModule,\n  value: number,\n): ts.PrefixUnaryExpression | ts.NumericLiteral {\n  return value < 0\n    ? ts.factory.createPrefixUnaryExpression(\n        ts.SyntaxKind.MinusToken,\n        ts.factory.createNumericLiteral(Math.abs(value)),\n      )\n    : ts.factory.createNumericLiteral(value);\n}\n\n/** An enum member or array element value, written as the original writes it. */\nexport function toValueExpression(ts: TypeScriptModule, value: string | number): ts.Expression {\n  return typeof value === \"number\"\n    ? toNumberExpression(ts, value)\n    : ts.factory.createStringLiteral(value);\n}\n\n/** The original writes JSON-encoded literal types as identifiers to keep UTF-8 readable. */\nfunction toStringLiteralType(\n  ts: TypeScriptModule,\n  value: string,\n  encoding: \"json\" | \"escaped\",\n): ts.TypeNode {\n  return encoding === \"json\"\n    ? (ts.factory.createIdentifier(JSON.stringify(value)) as unknown as ts.TypeNode)\n    : ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(value));\n}\n\nfunction toTupleElement(ts: TypeScriptModule, element: IrTupleElement): ts.TypeNode {\n  const type = toTypeNode(ts, element.type);\n  if (element.isOptional) {\n    return ts.factory.createOptionalTypeNode(type);\n  }\n  return element.isRest ? ts.factory.createRestTypeNode(type) : type;\n}\n\ntype LeafType = Extract<\n  IrType,\n  { kind: \"keyword\" | \"stringLiteral\" | \"numberLiteral\" | \"booleanLiteral\" | \"raw\" }\n>;\n\nfunction toLeafTypeNode(ts: TypeScriptModule, type: LeafType): ts.TypeNode {\n  switch (type.kind) {\n    case \"keyword\":\n      return toKeywordType(ts, type.keyword);\n    case \"stringLiteral\":\n      return toStringLiteralType(ts, type.value, type.encoding);\n    case \"numberLiteral\":\n      return ts.factory.createLiteralTypeNode(toNumberExpression(ts, type.value));\n    case \"booleanLiteral\":\n      return ts.factory.createLiteralTypeNode(\n        type.value ? ts.factory.createTrue() : ts.factory.createFalse(),\n      );\n    case \"raw\":\n      // A node read from TypeScript goes back as it was, so the TypeScript printer indents it.\n      return (\n        (type.origin as ts.TypeNode | undefined) ??\n        (ts.factory.createIdentifier(type.text) as unknown as ts.TypeNode)\n      );\n    default:\n      return assertNever(type);\n  }\n}\n\nfunction toReferenceNode(\n  ts: TypeScriptModule,\n  type: Extract<IrType, { kind: \"reference\" }>,\n): ts.TypeNode {\n  const typeArguments =\n    type.typeArguments.length > 0\n      ? type.typeArguments.map((argument) => toTypeNode(ts, argument))\n      : undefined;\n  return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(type.name), typeArguments);\n}\n\n/** Convert one IR type. */\nexport function toTypeNode(ts: TypeScriptModule, type: IrType): ts.TypeNode {\n  const convert = (inner: IrType) => toTypeNode(ts, inner);\n  const { factory } = ts;\n  switch (type.kind) {\n    case \"keyword\":\n    case \"stringLiteral\":\n    case \"numberLiteral\":\n    case \"booleanLiteral\":\n    case \"raw\":\n      return toLeafTypeNode(ts, type);\n    case \"reference\":\n      return toReferenceNode(ts, type);\n    case \"array\":\n      return factory.createArrayTypeNode(convert(type.element));\n    case \"tuple\":\n      return factory.createTupleTypeNode(\n        type.elements.map((element) => toTupleElement(ts, element)),\n      );\n    case \"union\":\n      return factory.createUnionTypeNode(type.types.map(convert));\n    case \"intersection\":\n      return factory.createIntersectionTypeNode(type.types.map(convert));\n    case \"object\":\n      return factory.createTypeLiteralNode(type.members.map((member) => toTypeElement(ts, member)));\n    case \"indexedAccess\":\n      return factory.createIndexedAccessTypeNode(convert(type.object), convert(type.index));\n    case \"readonly\":\n      return factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, convert(type.type));\n    default:\n      return assertNever(type);\n  }\n}\n\n/** Attach IR comments to a node as synthetic leading comments, as the original does. */\nexport function withComments<T extends ts.Node>(\n  ts: TypeScriptModule,\n  node: T,\n  comments: readonly IrComment[],\n): T {\n  for (const comment of comments) {\n    const kind =\n      comment.kind === \"block\"\n        ? ts.SyntaxKind.MultiLineCommentTrivia\n        : ts.SyntaxKind.SingleLineCommentTrivia;\n    ts.addSyntheticLeadingComment(node, kind, comment.text, true);\n  }\n  return node;\n}\n\nfunction toPropertyName(ts: TypeScriptModule, name: IrPropertyName): ts.PropertyName {\n  switch (name.kind) {\n    case \"identifier\":\n      return ts.factory.createIdentifier(name.text);\n    case \"string\":\n      return ts.factory.createStringLiteral(name.value);\n    case \"number\":\n      return ts.factory.createNumericLiteral(name.text);\n    default:\n      return assertNever(name);\n  }\n}\n\nfunction readonlyModifiers(ts: TypeScriptModule, isReadonly: boolean): ts.Modifier[] | undefined {\n  return isReadonly ? [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)] : undefined;\n}\n\n/** Convert one property signature (for callbacks that receive a `ts.PropertySignature`). */\nexport function toPropertySignature(\n  ts: TypeScriptModule,\n  property: IrPropertySignature,\n): ts.PropertySignature {\n  const questionToken = property.isOptional\n    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)\n    : undefined;\n  const signature = ts.factory.createPropertySignature(\n    readonlyModifiers(ts, property.isReadonly),\n    toPropertyName(ts, property.name),\n    questionToken,\n    toTypeNode(ts, property.type),\n  );\n  return withComments(ts, signature, property.comments);\n}\n\nexport function toTypeElement(ts: TypeScriptModule, member: IrMember): ts.TypeElement {\n  if (member.kind === \"property\") {\n    return toPropertySignature(ts, member);\n  }\n  const parameter = ts.factory.createParameterDeclaration(\n    undefined,\n    undefined,\n    member.parameterName,\n    undefined,\n    toTypeNode(ts, member.parameterType),\n  );\n  const signature = ts.factory.createIndexSignature(\n    readonlyModifiers(ts, member.isReadonly),\n    [parameter],\n    toTypeNode(ts, member.type),\n  );\n  return withComments(ts, signature, member.comments);\n}\n"],"names":["assertNever"],"mappings":"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"}

package/dist/adapters/type-ast-bridge/ir-to-typescript.mjs

@@ -28,6 +28,9 @@ function toStringLiteralType(ts, value, encoding) {
 }
 function toTupleElement(ts, element) {
   const type = toTypeNode(ts, element.type);
+  if (element.isOptional) {
+    return ts.factory.createOptionalTypeNode(type);
+  }
   return element.isRest ? ts.factory.createRestTypeNode(type) : type;
 }
 function toLeafTypeNode(ts, type) {

package/dist/adapters/type-ast-bridge/ir-to-typescript.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ir-to-typescript.mjs","sources":["../../../src/adapters/type-ast-bridge/ir-to-typescript.ts"],"sourcesContent":["import type ts from \"typescript\";\nimport { assertNever } from \"../../domain/assert-never.js\";\nimport type {\n  IrComment,\n  IrKeyword,\n  IrMember,\n  IrPropertyName,\n  IrPropertySignature,\n  IrTupleElement,\n  IrType,\n} from \"../../domain/ir/nodes.js\";\nimport type { TypeScriptModule } from \"./load-typescript.js\";\n\n/**\n * Convert IR to TypeScript AST nodes with the same factory calls the original generator makes.\n * Printing the result with the TypeScript printer gives the original output, which is how the\n * printer parity tests (ENGINEERING_PLAN 4.3) define \"byte-identical\". Every function takes the\n * TypeScript module to build with (ADR-004, decision 4): the nodes must come from the same module\n * that later reads or prints them.\n */\n\ntype KeywordName = Exclude<IrKeyword, \"null\">;\n\nfunction keywordKind(ts: TypeScriptModule, keyword: KeywordName): ts.KeywordTypeSyntaxKind {\n  const kinds: Readonly<Record<KeywordName, ts.KeywordTypeSyntaxKind>> = {\n    string: ts.SyntaxKind.StringKeyword,\n    number: ts.SyntaxKind.NumberKeyword,\n    boolean: ts.SyntaxKind.BooleanKeyword,\n    undefined: ts.SyntaxKind.UndefinedKeyword,\n    unknown: ts.SyntaxKind.UnknownKeyword,\n    never: ts.SyntaxKind.NeverKeyword,\n  };\n  return kinds[keyword];\n}\n\nfunction toKeywordType(ts: TypeScriptModule, keyword: IrKeyword): ts.TypeNode {\n  return keyword === \"null\"\n    ? ts.factory.createLiteralTypeNode(ts.factory.createNull())\n    : ts.factory.createKeywordTypeNode(keywordKind(ts, keyword));\n}\n\n/**\n * Numbers as the original writes them: a negative value is a prefix minus on its absolute value.\n */\nfunction toNumberExpression(\n  ts: TypeScriptModule,\n  value: number,\n): ts.PrefixUnaryExpression | ts.NumericLiteral {\n  return value < 0\n    ? ts.factory.createPrefixUnaryExpression(\n        ts.SyntaxKind.MinusToken,\n        ts.factory.createNumericLiteral(Math.abs(value)),\n      )\n    : ts.factory.createNumericLiteral(value);\n}\n\n/** An enum member or array element value, written as the original writes it. */\nexport function toValueExpression(ts: TypeScriptModule, value: string | number): ts.Expression {\n  return typeof value === \"number\"\n    ? toNumberExpression(ts, value)\n    : ts.factory.createStringLiteral(value);\n}\n\n/** The original writes JSON-encoded literal types as identifiers to keep UTF-8 readable. */\nfunction toStringLiteralType(\n  ts: TypeScriptModule,\n  value: string,\n  encoding: \"json\" | \"escaped\",\n): ts.TypeNode {\n  return encoding === \"json\"\n    ? (ts.factory.createIdentifier(JSON.stringify(value)) as unknown as ts.TypeNode)\n    : ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(value));\n}\n\nfunction toTupleElement(ts: TypeScriptModule, element: IrTupleElement): ts.TypeNode {\n  const type = toTypeNode(ts, element.type);\n  return element.isRest ? ts.factory.createRestTypeNode(type) : type;\n}\n\ntype LeafType = Extract<\n  IrType,\n  { kind: \"keyword\" | \"stringLiteral\" | \"numberLiteral\" | \"booleanLiteral\" | \"raw\" }\n>;\n\nfunction toLeafTypeNode(ts: TypeScriptModule, type: LeafType): ts.TypeNode {\n  switch (type.kind) {\n    case \"keyword\":\n      return toKeywordType(ts, type.keyword);\n    case \"stringLiteral\":\n      return toStringLiteralType(ts, type.value, type.encoding);\n    case \"numberLiteral\":\n      return ts.factory.createLiteralTypeNode(toNumberExpression(ts, type.value));\n    case \"booleanLiteral\":\n      return ts.factory.createLiteralTypeNode(\n        type.value ? ts.factory.createTrue() : ts.factory.createFalse(),\n      );\n    case \"raw\":\n      // A node read from TypeScript goes back as it was, so the TypeScript printer indents it.\n      return (\n        (type.origin as ts.TypeNode | undefined) ??\n        (ts.factory.createIdentifier(type.text) as unknown as ts.TypeNode)\n      );\n    default:\n      return assertNever(type);\n  }\n}\n\nfunction toReferenceNode(\n  ts: TypeScriptModule,\n  type: Extract<IrType, { kind: \"reference\" }>,\n): ts.TypeNode {\n  const typeArguments =\n    type.typeArguments.length > 0\n      ? type.typeArguments.map((argument) => toTypeNode(ts, argument))\n      : undefined;\n  return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(type.name), typeArguments);\n}\n\n/** Convert one IR type. */\nexport function toTypeNode(ts: TypeScriptModule, type: IrType): ts.TypeNode {\n  const convert = (inner: IrType) => toTypeNode(ts, inner);\n  const { factory } = ts;\n  switch (type.kind) {\n    case \"keyword\":\n    case \"stringLiteral\":\n    case \"numberLiteral\":\n    case \"booleanLiteral\":\n    case \"raw\":\n      return toLeafTypeNode(ts, type);\n    case \"reference\":\n      return toReferenceNode(ts, type);\n    case \"array\":\n      return factory.createArrayTypeNode(convert(type.element));\n    case \"tuple\":\n      return factory.createTupleTypeNode(\n        type.elements.map((element) => toTupleElement(ts, element)),\n      );\n    case \"union\":\n      return factory.createUnionTypeNode(type.types.map(convert));\n    case \"intersection\":\n      return factory.createIntersectionTypeNode(type.types.map(convert));\n    case \"object\":\n      return factory.createTypeLiteralNode(type.members.map((member) => toTypeElement(ts, member)));\n    case \"indexedAccess\":\n      return factory.createIndexedAccessTypeNode(convert(type.object), convert(type.index));\n    case \"readonly\":\n      return factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, convert(type.type));\n    default:\n      return assertNever(type);\n  }\n}\n\n/** Attach IR comments to a node as synthetic leading comments, as the original does. */\nexport function withComments<T extends ts.Node>(\n  ts: TypeScriptModule,\n  node: T,\n  comments: readonly IrComment[],\n): T {\n  for (const comment of comments) {\n    const kind =\n      comment.kind === \"block\"\n        ? ts.SyntaxKind.MultiLineCommentTrivia\n        : ts.SyntaxKind.SingleLineCommentTrivia;\n    ts.addSyntheticLeadingComment(node, kind, comment.text, true);\n  }\n  return node;\n}\n\nfunction toPropertyName(ts: TypeScriptModule, name: IrPropertyName): ts.PropertyName {\n  switch (name.kind) {\n    case \"identifier\":\n      return ts.factory.createIdentifier(name.text);\n    case \"string\":\n      return ts.factory.createStringLiteral(name.value);\n    case \"number\":\n      return ts.factory.createNumericLiteral(name.text);\n    default:\n      return assertNever(name);\n  }\n}\n\nfunction readonlyModifiers(ts: TypeScriptModule, isReadonly: boolean): ts.Modifier[] | undefined {\n  return isReadonly ? [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)] : undefined;\n}\n\n/** Convert one property signature (for callbacks that receive a `ts.PropertySignature`). */\nexport function toPropertySignature(\n  ts: TypeScriptModule,\n  property: IrPropertySignature,\n): ts.PropertySignature {\n  const questionToken = property.isOptional\n    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)\n    : undefined;\n  const signature = ts.factory.createPropertySignature(\n    readonlyModifiers(ts, property.isReadonly),\n    toPropertyName(ts, property.name),\n    questionToken,\n    toTypeNode(ts, property.type),\n  );\n  return withComments(ts, signature, property.comments);\n}\n\nexport function toTypeElement(ts: TypeScriptModule, member: IrMember): ts.TypeElement {\n  if (member.kind === \"property\") {\n    return toPropertySignature(ts, member);\n  }\n  const parameter = ts.factory.createParameterDeclaration(\n    undefined,\n    undefined,\n    member.parameterName,\n    undefined,\n    toTypeNode(ts, member.parameterType),\n  );\n  const signature = ts.factory.createIndexSignature(\n    readonlyModifiers(ts, member.isReadonly),\n    [parameter],\n    toTypeNode(ts, member.type),\n  );\n  return withComments(ts, signature, member.comments);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ir-to-typescript.mjs","sources":["../../../src/adapters/type-ast-bridge/ir-to-typescript.ts"],"sourcesContent":["import type ts from \"typescript\";\nimport { assertNever } from \"../../domain/assert-never.js\";\nimport type {\n  IrComment,\n  IrKeyword,\n  IrMember,\n  IrPropertyName,\n  IrPropertySignature,\n  IrTupleElement,\n  IrType,\n} from \"../../domain/ir/nodes.js\";\nimport type { TypeScriptModule } from \"./load-typescript.js\";\n\n/**\n * Convert IR to TypeScript AST nodes with the same factory calls the original generator makes.\n * Printing the result with the TypeScript printer gives the original output, which is how the\n * printer parity tests (ENGINEERING_PLAN 4.3) define \"byte-identical\". Every function takes the\n * TypeScript module to build with (ADR-004, decision 4): the nodes must come from the same module\n * that later reads or prints them.\n */\n\ntype KeywordName = Exclude<IrKeyword, \"null\">;\n\nfunction keywordKind(ts: TypeScriptModule, keyword: KeywordName): ts.KeywordTypeSyntaxKind {\n  const kinds: Readonly<Record<KeywordName, ts.KeywordTypeSyntaxKind>> = {\n    string: ts.SyntaxKind.StringKeyword,\n    number: ts.SyntaxKind.NumberKeyword,\n    boolean: ts.SyntaxKind.BooleanKeyword,\n    undefined: ts.SyntaxKind.UndefinedKeyword,\n    unknown: ts.SyntaxKind.UnknownKeyword,\n    never: ts.SyntaxKind.NeverKeyword,\n  };\n  return kinds[keyword];\n}\n\nfunction toKeywordType(ts: TypeScriptModule, keyword: IrKeyword): ts.TypeNode {\n  return keyword === \"null\"\n    ? ts.factory.createLiteralTypeNode(ts.factory.createNull())\n    : ts.factory.createKeywordTypeNode(keywordKind(ts, keyword));\n}\n\n/**\n * Numbers as the original writes them: a negative value is a prefix minus on its absolute value.\n */\nfunction toNumberExpression(\n  ts: TypeScriptModule,\n  value: number,\n): ts.PrefixUnaryExpression | ts.NumericLiteral {\n  return value < 0\n    ? ts.factory.createPrefixUnaryExpression(\n        ts.SyntaxKind.MinusToken,\n        ts.factory.createNumericLiteral(Math.abs(value)),\n      )\n    : ts.factory.createNumericLiteral(value);\n}\n\n/** An enum member or array element value, written as the original writes it. */\nexport function toValueExpression(ts: TypeScriptModule, value: string | number): ts.Expression {\n  return typeof value === \"number\"\n    ? toNumberExpression(ts, value)\n    : ts.factory.createStringLiteral(value);\n}\n\n/** The original writes JSON-encoded literal types as identifiers to keep UTF-8 readable. */\nfunction toStringLiteralType(\n  ts: TypeScriptModule,\n  value: string,\n  encoding: \"json\" | \"escaped\",\n): ts.TypeNode {\n  return encoding === \"json\"\n    ? (ts.factory.createIdentifier(JSON.stringify(value)) as unknown as ts.TypeNode)\n    : ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(value));\n}\n\nfunction toTupleElement(ts: TypeScriptModule, element: IrTupleElement): ts.TypeNode {\n  const type = toTypeNode(ts, element.type);\n  if (element.isOptional) {\n    return ts.factory.createOptionalTypeNode(type);\n  }\n  return element.isRest ? ts.factory.createRestTypeNode(type) : type;\n}\n\ntype LeafType = Extract<\n  IrType,\n  { kind: \"keyword\" | \"stringLiteral\" | \"numberLiteral\" | \"booleanLiteral\" | \"raw\" }\n>;\n\nfunction toLeafTypeNode(ts: TypeScriptModule, type: LeafType): ts.TypeNode {\n  switch (type.kind) {\n    case \"keyword\":\n      return toKeywordType(ts, type.keyword);\n    case \"stringLiteral\":\n      return toStringLiteralType(ts, type.value, type.encoding);\n    case \"numberLiteral\":\n      return ts.factory.createLiteralTypeNode(toNumberExpression(ts, type.value));\n    case \"booleanLiteral\":\n      return ts.factory.createLiteralTypeNode(\n        type.value ? ts.factory.createTrue() : ts.factory.createFalse(),\n      );\n    case \"raw\":\n      // A node read from TypeScript goes back as it was, so the TypeScript printer indents it.\n      return (\n        (type.origin as ts.TypeNode | undefined) ??\n        (ts.factory.createIdentifier(type.text) as unknown as ts.TypeNode)\n      );\n    default:\n      return assertNever(type);\n  }\n}\n\nfunction toReferenceNode(\n  ts: TypeScriptModule,\n  type: Extract<IrType, { kind: \"reference\" }>,\n): ts.TypeNode {\n  const typeArguments =\n    type.typeArguments.length > 0\n      ? type.typeArguments.map((argument) => toTypeNode(ts, argument))\n      : undefined;\n  return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(type.name), typeArguments);\n}\n\n/** Convert one IR type. */\nexport function toTypeNode(ts: TypeScriptModule, type: IrType): ts.TypeNode {\n  const convert = (inner: IrType) => toTypeNode(ts, inner);\n  const { factory } = ts;\n  switch (type.kind) {\n    case \"keyword\":\n    case \"stringLiteral\":\n    case \"numberLiteral\":\n    case \"booleanLiteral\":\n    case \"raw\":\n      return toLeafTypeNode(ts, type);\n    case \"reference\":\n      return toReferenceNode(ts, type);\n    case \"array\":\n      return factory.createArrayTypeNode(convert(type.element));\n    case \"tuple\":\n      return factory.createTupleTypeNode(\n        type.elements.map((element) => toTupleElement(ts, element)),\n      );\n    case \"union\":\n      return factory.createUnionTypeNode(type.types.map(convert));\n    case \"intersection\":\n      return factory.createIntersectionTypeNode(type.types.map(convert));\n    case \"object\":\n      return factory.createTypeLiteralNode(type.members.map((member) => toTypeElement(ts, member)));\n    case \"indexedAccess\":\n      return factory.createIndexedAccessTypeNode(convert(type.object), convert(type.index));\n    case \"readonly\":\n      return factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, convert(type.type));\n    default:\n      return assertNever(type);\n  }\n}\n\n/** Attach IR comments to a node as synthetic leading comments, as the original does. */\nexport function withComments<T extends ts.Node>(\n  ts: TypeScriptModule,\n  node: T,\n  comments: readonly IrComment[],\n): T {\n  for (const comment of comments) {\n    const kind =\n      comment.kind === \"block\"\n        ? ts.SyntaxKind.MultiLineCommentTrivia\n        : ts.SyntaxKind.SingleLineCommentTrivia;\n    ts.addSyntheticLeadingComment(node, kind, comment.text, true);\n  }\n  return node;\n}\n\nfunction toPropertyName(ts: TypeScriptModule, name: IrPropertyName): ts.PropertyName {\n  switch (name.kind) {\n    case \"identifier\":\n      return ts.factory.createIdentifier(name.text);\n    case \"string\":\n      return ts.factory.createStringLiteral(name.value);\n    case \"number\":\n      return ts.factory.createNumericLiteral(name.text);\n    default:\n      return assertNever(name);\n  }\n}\n\nfunction readonlyModifiers(ts: TypeScriptModule, isReadonly: boolean): ts.Modifier[] | undefined {\n  return isReadonly ? [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)] : undefined;\n}\n\n/** Convert one property signature (for callbacks that receive a `ts.PropertySignature`). */\nexport function toPropertySignature(\n  ts: TypeScriptModule,\n  property: IrPropertySignature,\n): ts.PropertySignature {\n  const questionToken = property.isOptional\n    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)\n    : undefined;\n  const signature = ts.factory.createPropertySignature(\n    readonlyModifiers(ts, property.isReadonly),\n    toPropertyName(ts, property.name),\n    questionToken,\n    toTypeNode(ts, property.type),\n  );\n  return withComments(ts, signature, property.comments);\n}\n\nexport function toTypeElement(ts: TypeScriptModule, member: IrMember): ts.TypeElement {\n  if (member.kind === \"property\") {\n    return toPropertySignature(ts, member);\n  }\n  const parameter = ts.factory.createParameterDeclaration(\n    undefined,\n    undefined,\n    member.parameterName,\n    undefined,\n    toTypeNode(ts, member.parameterType),\n  );\n  const signature = ts.factory.createIndexSignature(\n    readonlyModifiers(ts, member.isReadonly),\n    [parameter],\n    toTypeNode(ts, member.type),\n  );\n  return withComments(ts, signature, member.comments);\n}\n"],"names":[],"mappings":";;AAuBA,SAAS,WAAA,CAAY,IAAsB,OAAA,EAAgD;AACzF,EAAA,MAAM,KAAA,GAAiE;AAAA,IACrE,MAAA,EAAQ,GAAG,UAAA,CAAW,aAAA;AAAA,IACtB,MAAA,EAAQ,GAAG,UAAA,CAAW,aAAA;AAAA,IACtB,OAAA,EAAS,GAAG,UAAA,CAAW,cAAA;AAAA,IACvB,SAAA,EAAW,GAAG,UAAA,CAAW,gBAAA;AAAA,IACzB,OAAA,EAAS,GAAG,UAAA,CAAW,cAAA;AAAA,IACvB,KAAA,EAAO,GAAG,UAAA,CAAW;AAAA,GACvB;AACA,EAAA,OAAO,MAAM,OAAO,CAAA;AACtB;AAEA,SAAS,aAAA,CAAc,IAAsB,OAAA,EAAiC;AAC5E,EAAA,OAAO,YAAY,MAAA,GACf,EAAA,CAAG,OAAA,CAAQ,qBAAA,CAAsB,GAAG,OAAA,CAAQ,UAAA,EAAY,CAAA,GACxD,GAAG,OAAA,CAAQ,qBAAA,CAAsB,WAAA,CAAY,EAAA,EAAI,OAAO,CAAC,CAAA;AAC/D;AAKA,SAAS,kBAAA,CACP,IACA,KAAA,EAC8C;AAC9C,EAAA,OAAO,KAAA,GAAQ,CAAA,GACX,EAAA,CAAG,OAAA,CAAQ,2BAAA;AAAA,IACT,GAAG,UAAA,CAAW,UAAA;AAAA,IACd,GAAG,OAAA,CAAQ,oBAAA,CAAqB,IAAA,CAAK,GAAA,CAAI,KAAK,CAAC;AAAA,GACjD,GACA,EAAA,CAAG,OAAA,CAAQ,oBAAA,CAAqB,KAAK,CAAA;AAC3C;AAGO,SAAS,iBAAA,CAAkB,IAAsB,KAAA,EAAuC;AAC7F,EAAA,OAAO,OAAO,KAAA,KAAU,QAAA,GACpB,kBAAA,CAAmB,EAAA,EAAI,KAAK,CAAA,GAC5B,EAAA,CAAG,OAAA,CAAQ,mBAAA,CAAoB,KAAK,CAAA;AAC1C;AAGA,SAAS,mBAAA,CACP,EAAA,EACA,KAAA,EACA,QAAA,EACa;AACb,EAAA,OAAO,aAAa,MAAA,GACf,EAAA,CAAG,OAAA,CAAQ,gBAAA,CAAiB,KAAK,SAAA,CAAU,KAAK,CAAC,CAAA,GAClD,GAAG,OAAA,CAAQ,qBAAA,CAAsB,GAAG,OAAA,CAAQ,mBAAA,CAAoB,KAAK,CAAC,CAAA;AAC5E;AAEA,SAAS,cAAA,CAAe,IAAsB,OAAA,EAAsC;AAClF,EAAA,MAAM,IAAA,GAAO,UAAA,CAAW,EAAA,EAAI,OAAA,CAAQ,IAAI,CAAA;AACxC,EAAA,IAAI,QAAQ,UAAA,EAAY;AACtB,IAAA,OAAO,EAAA,CAAG,OAAA,CAAQ,sBAAA,CAAuB,IAAI,CAAA;AAAA,EAC/C;AACA,EAAA,OAAO,QAAQ,MAAA,GAAS,EAAA,CAAG,OAAA,CAAQ,kBAAA,CAAmB,IAAI,CAAA,GAAI,IAAA;AAChE;AAOA,SAAS,cAAA,CAAe,IAAsB,IAAA,EAA6B;AACzE,EAAA,QAAQ,KAAK,IAAA;AAAM,IACjB,KAAK,SAAA;AACH,MAAA,OAAO,aAAA,CAAc,EAAA,EAAI,IAAA,CAAK,OAAO,CAAA;AAAA,IACvC,KAAK,eAAA;AACH,MAAA,OAAO,mBAAA,CAAoB,EAAA,EAAI,IAAA,CAAK,KAAA,EAAO,KAAK,QAAQ,CAAA;AAAA,IAC1D,KAAK,eAAA;AACH,MAAA,OAAO,GAAG,OAAA,CAAQ,qBAAA,CAAsB,mBAAmB,EAAA,EAAI,IAAA,CAAK,KAAK,CAAC,CAAA;AAAA,IAC5E,KAAK,gBAAA;AACH,MAAA,OAAO,GAAG,OAAA,CAAQ,qBAAA;AAAA,QAChB,IAAA,CAAK,QAAQ,EAAA,CAAG,OAAA,CAAQ,YAAW,GAAI,EAAA,CAAG,QAAQ,WAAA;AAAY,OAChE;AAAA,IACF,KAAK,KAAA;AAEH,MAAA,OACG,KAAK,MAAA,IACL,EAAA,CAAG,OAAA,CAAQ,gBAAA,CAAiB,KAAK,IAAI,CAAA;AAAA,IAE1C;AACE,MAAA,OAAO,YAAY,IAAI,CAAA;AAAA;AAE7B;AAEA,SAAS,eAAA,CACP,IACA,IAAA,EACa;AACb,EAAA,MAAM,aAAA,GACJ,IAAA,CAAK,aAAA,CAAc,MAAA,GAAS,IACxB,IAAA,CAAK,aAAA,CAAc,GAAA,CAAI,CAAC,QAAA,KAAa,UAAA,CAAW,EAAA,EAAI,QAAQ,CAAC,CAAA,GAC7D,MAAA;AACN,EAAA,OAAO,EAAA,CAAG,QAAQ,uBAAA,CAAwB,EAAA,CAAG,QAAQ,gBAAA,CAAiB,IAAA,CAAK,IAAI,CAAA,EAAG,aAAa,CAAA;AACjG;AAGO,SAAS,UAAA,CAAW,IAAsB,IAAA,EAA2B;AAC1E,EAAA,MAAM,OAAA,GAAU,CAAC,KAAA,KAAkB,UAAA,CAAW,IAAI,KAAK,CAAA;AACvD,EAAA,MAAM,EAAE,SAAQ,GAAI,EAAA;AACpB,EAAA,QAAQ,KAAK,IAAA;AAAM,IACjB,KAAK,SAAA;AAAA,IACL,KAAK,eAAA;AAAA,IACL,KAAK,eAAA;AAAA,IACL,KAAK,gBAAA;AAAA,IACL,KAAK,KAAA;AACH,MAAA,OAAO,cAAA,CAAe,IAAI,IAAI,CAAA;AAAA,IAChC,KAAK,WAAA;AACH,MAAA,OAAO,eAAA,CAAgB,IAAI,IAAI,CAAA;AAAA,IACjC,KAAK,OAAA;AACH,MAAA,OAAO,OAAA,CAAQ,mBAAA,CAAoB,OAAA,CAAQ,IAAA,CAAK,OAAO,CAAC,CAAA;AAAA,IAC1D,KAAK,OAAA;AACH,MAAA,OAAO,OAAA,CAAQ,mBAAA;AAAA,QACb,IAAA,CAAK,SAAS,GAAA,CAAI,CAAC,YAAY,cAAA,CAAe,EAAA,EAAI,OAAO,CAAC;AAAA,OAC5D;AAAA,IACF,KAAK,OAAA;AACH,MAAA,OAAO,QAAQ,mBAAA,CAAoB,IAAA,CAAK,KAAA,CAAM,GAAA,CAAI,OAAO,CAAC,CAAA;AAAA,IAC5D,KAAK,cAAA;AACH,MAAA,OAAO,QAAQ,0BAAA,CAA2B,IAAA,CAAK,KAAA,CAAM,GAAA,CAAI,OAAO,CAAC,CAAA;AAAA,IACnE,KAAK,QAAA;AACH,MAAA,OAAO,OAAA,CAAQ,qBAAA,CAAsB,IAAA,CAAK,OAAA,CAAQ,GAAA,CAAI,CAAC,MAAA,KAAW,aAAA,CAAc,EAAA,EAAI,MAAM,CAAC,CAAC,CAAA;AAAA,IAC9F,KAAK,eAAA;AACH,MAAA,OAAO,OAAA,CAAQ,4BAA4B,OAAA,CAAQ,IAAA,CAAK,MAAM,CAAA,EAAG,OAAA,CAAQ,IAAA,CAAK,KAAK,CAAC,CAAA;AAAA,IACtF,KAAK,UAAA;AACH,MAAA,OAAO,OAAA,CAAQ,uBAAuB,EAAA,CAAG,UAAA,CAAW,iBAAiB,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAC,CAAA;AAAA,IACzF;AACE,MAAA,OAAO,YAAY,IAAI,CAAA;AAAA;AAE7B;AAGO,SAAS,YAAA,CACd,EAAA,EACA,IAAA,EACA,QAAA,EACG;AACH,EAAA,KAAA,MAAW,WAAW,QAAA,EAAU;AAC9B,IAAA,MAAM,IAAA,GACJ,QAAQ,IAAA,KAAS,OAAA,GACb,GAAG,UAAA,CAAW,sBAAA,GACd,GAAG,UAAA,CAAW,uBAAA;AACpB,IAAA,EAAA,CAAG,0BAAA,CAA2B,IAAA,EAAM,IAAA,EAAM,OAAA,CAAQ,MAAM,IAAI,CAAA;AAAA,EAC9D;AACA,EAAA,OAAO,IAAA;AACT;AAEA,SAAS,cAAA,CAAe,IAAsB,IAAA,EAAuC;AACnF,EAAA,QAAQ,KAAK,IAAA;AAAM,IACjB,KAAK,YAAA;AACH,MAAA,OAAO,EAAA,CAAG,OAAA,CAAQ,gBAAA,CAAiB,IAAA,CAAK,IAAI,CAAA;AAAA,IAC9C,KAAK,QAAA;AACH,MAAA,OAAO,EAAA,CAAG,OAAA,CAAQ,mBAAA,CAAoB,IAAA,CAAK,KAAK,CAAA;AAAA,IAClD,KAAK,QAAA;AACH,MAAA,OAAO,EAAA,CAAG,OAAA,CAAQ,oBAAA,CAAqB,IAAA,CAAK,IAAI,CAAA;AAAA,IAClD;AACE,MAAA,OAAO,YAAY,IAAI,CAAA;AAAA;AAE7B;AAEA,SAAS,iBAAA,CAAkB,IAAsB,UAAA,EAAgD;AAC/F,EAAA,OAAO,UAAA,GAAa,CAAC,EAAA,CAAG,OAAA,CAAQ,eAAe,EAAA,CAAG,UAAA,CAAW,eAAe,CAAC,CAAA,GAAI,MAAA;AACnF;AAGO,SAAS,mBAAA,CACd,IACA,QAAA,EACsB;AACtB,EAAA,MAAM,aAAA,GAAgB,SAAS,UAAA,GAC3B,EAAA,CAAG,QAAQ,WAAA,CAAY,EAAA,CAAG,UAAA,CAAW,aAAa,CAAA,GAClD,MAAA;AACJ,EAAA,MAAM,SAAA,GAAY,GAAG,OAAA,CAAQ,uBAAA;AAAA,IAC3B,iBAAA,CAAkB,EAAA,EAAI,QAAA,CAAS,UAAU,CAAA;AAAA,IACzC,cAAA,CAAe,EAAA,EAAI,QAAA,CAAS,IAAI,CAAA;AAAA,IAChC,aAAA;AAAA,IACA,UAAA,CAAW,EAAA,EAAI,QAAA,CAAS,IAAI;AAAA,GAC9B;AACA,EAAA,OAAO,YAAA,CAAa,EAAA,EAAI,SAAA,EAAW,QAAA,CAAS,QAAQ,CAAA;AACtD;AAEO,SAAS,aAAA,CAAc,IAAsB,MAAA,EAAkC;AACpF,EAAA,IAAI,MAAA,CAAO,SAAS,UAAA,EAAY;AAC9B,IAAA,OAAO,mBAAA,CAAoB,IAAI,MAAM,CAAA;AAAA,EACvC;AACA,EAAA,MAAM,SAAA,GAAY,GAAG,OAAA,CAAQ,0BAAA;AAAA,IAC3B,MAAA;AAAA,IACA,MAAA;AAAA,IACA,MAAA,CAAO,aAAA;AAAA,IACP,MAAA;AAAA,IACA,UAAA,CAAW,EAAA,EAAI,MAAA,CAAO,aAAa;AAAA,GACrC;AACA,EAAA,MAAM,SAAA,GAAY,GAAG,OAAA,CAAQ,oBAAA;AAAA,IAC3B,iBAAA,CAAkB,EAAA,EAAI,MAAA,CAAO,UAAU,CAAA;AAAA,IACvC,CAAC,SAAS,CAAA;AAAA,IACV,UAAA,CAAW,EAAA,EAAI,MAAA,CAAO,IAAI;AAAA,GAC5B;AACA,EAAA,OAAO,YAAA,CAAa,EAAA,EAAI,SAAA,EAAW,MAAA,CAAO,QAAQ,CAAA;AACpD;;"}

package/dist/adapters/type-ast-bridge/typescript-to-ir.cjs

@@ -48,18 +48,24 @@ function fromReference(ts, node) {
   const typeArguments = (node.typeArguments ?? []).map(childrenOf(ts, node));
   return { kind: "reference", name: ts.idText(node.typeName), typeArguments };
 }
+function fromTupleElement(ts, element, convert) {
+  if (ts.isRestTypeNode(element)) {
+    return { type: convert(element.type), isRest: true, isOptional: false };
+  }
+  if (ts.isOptionalTypeNode(element)) {
+    return { type: fromTypeNode(ts, element.type, element), isRest: false, isOptional: true };
+  }
+  return { type: convert(element), isRest: false, isOptional: false };
+}
 function fromTuple(ts, node) {
-  const isPlain = node.elements.every(
-    (element) => !ts.isNamedTupleMember(element) && !ts.isOptionalTypeNode(element)
-  );
-  if (!isPlain) {
+  if (node.elements.some((element) => ts.isNamedTupleMember(element))) {
     return null;
   }
   const convert = childrenOf(ts, node);
-  const elements = node.elements.map(
-    (element) => ts.isRestTypeNode(element) ? { type: convert(element.type), isRest: true } : { type: convert(element), isRest: false }
-  );
-  return { kind: "tuple", elements };
+  return {
+    kind: "tuple",
+    elements: node.elements.map((element) => fromTupleElement(ts, element, convert))
+  };
 }
 function fromComments(ts, node) {
   const comments = ts.getSyntheticLeadingComments(node) ?? [];
@@ -179,7 +185,7 @@ function isFactoryParenthesis(ts, inner, parent) {
     return false;
   }
   const isComposite = ts.isUnionTypeNode(inner) || ts.isIntersectionTypeNode(inner);
-  const isPostfixOrReadonlyParent = ts.isArrayTypeNode(parent) || ts.isIndexedAccessTypeNode(parent) || ts.isTypeOperatorNode(parent);
+  const isPostfixOrReadonlyParent = ts.isArrayTypeNode(parent) || ts.isIndexedAccessTypeNode(parent) || ts.isOptionalTypeNode(parent) || ts.isTypeOperatorNode(parent);
   if (isPostfixOrReadonlyParent) {
     return isComposite || ts.isTypeOperatorNode(inner);
   }