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

package/dist/application/transform/document/response.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"response.mjs","sources":["../../../../src/application/transform/document/response.ts"],"sourcesContent":["import {\n  irKeyword,\n  irObject,\n  irProperty,\n  irStringIndexSignature,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n  isMediaTypeComponentRef,\n  type MediaTypeObject,\n} from \"../../../domain/openapi/media-type-object.js\";\nimport type { ResponseObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { headerType } from \"./header.js\";\nimport { contentEntryType, itemContentMember, mediaTypeType } from \"./media-type.js\";\n\ntype HeaderEntry = NonNullable<ResponseObject[\"headers\"]>[string];\n\nfunction headerMember(\n  name: string,\n  header: HeaderEntry,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  // A referenced header counts as required: the reference does not say otherwise.\n  const isReference = \"$ref\" in header;\n  const type = isReference\n    ? refType(header.$ref)\n    : headerType(\n        header,\n        { ...location, path: createRef([location.path, \"headers\", name]) },\n        context,\n      );\n  return documentMember(name, type, header, {\n    isReadonly: context.options.immutable,\n    isOptional: !isReference && !header.required,\n  });\n}\n\n/** The listed headers, then `[name: string]: unknown`, because servers may send others. */\nfunction headersMember(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  const entries = documentEntries(response.headers ?? {}, context.options);\n  const members: IrMember[] = entries.map(([name, header]) =>\n    headerMember(name, header, location, context),\n  );\n  members.push(irStringIndexSignature(\"name\", UNKNOWN_TYPE, context.options.immutable));\n  return irProperty(toPropertyName(\"headers\"), irObject(members));\n}\n\n/**\n * One media type of a response. The original reads a `$ref` entry as a media type without a\n * schema, so it is `unknown`; a `$ref` to an OpenAPI 3.2 media type component is typed as it.\n */\nfunction mediaTypeEntryType(\n  entry: NonNullable<ResponseObject[\"content\"]>[string],\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  return \"$ref\" in entry && isMediaTypeComponentRef(entry.$ref)\n    ? contentEntryType(entry, location, context)\n    : mediaTypeType(entry as MediaTypeObject, location, context);\n}\n\n/** `content` with one member per media type, or `content?: never` when there are none. */\nfunction contentMember(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  const entries = documentEntries(response.content ?? {}, context.options);\n  const members = entries.map(([contentType, entry]) => {\n    const path = createRef([location.path, \"content\", contentType]);\n    const type = mediaTypeEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n  const name = toPropertyName(\"content\");\n  return members.length > 0\n    ? irProperty(name, irObject(members))\n    : irProperty(name, irKeyword(\"never\"), { isOptional: true });\n}\n\n/**\n * A response (OpenAPI 3.2 §4.8.17): `{ headers: {…}; content: {…} }`, and `itemContent` when a\n * media type has an `itemSchema`. No member is readonly, even with --immutable, as in the original.\n */\nexport function responseType(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const itemContent = itemContentMember(response.content ?? {}, location, context, {\n    isReadonly: false,\n  });\n  return irObject([\n    headersMember(response, location, context),\n    contentMember(response, location, context),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"response.mjs","sources":["../../../../src/application/transform/document/response.ts"],"sourcesContent":["import {\n  irKeyword,\n  irObject,\n  irProperty,\n  irStringIndexSignature,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n  isMediaTypeComponentRef,\n  type MediaTypeObject,\n} from \"../../../domain/openapi/media-type-object.js\";\nimport type { ResponseObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { headerType } from \"./header.js\";\nimport { contentEntryType, itemContentMember, mediaTypeType } from \"./media-type.js\";\n\ntype HeaderEntry = NonNullable<ResponseObject[\"headers\"]>[string];\n\nfunction headerMember(\n  name: string,\n  header: HeaderEntry,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  // A referenced header counts as required: the reference does not say otherwise.\n  const isReference = \"$ref\" in header;\n  const type = isReference\n    ? refType(header.$ref)\n    : headerType(\n        header,\n        { ...location, path: appendPointer(location.path, [\"headers\", name]) },\n        context,\n      );\n  return documentMember(name, type, header, {\n    isReadonly: context.options.immutable,\n    isOptional: !isReference && !header.required,\n  });\n}\n\n/** The listed headers, then `[name: string]: unknown`, because servers may send others. */\nfunction headersMember(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  const entries = documentEntries(response.headers ?? {}, context.options);\n  const members: IrMember[] = entries.map(([name, header]) =>\n    headerMember(name, header, location, context),\n  );\n  members.push(irStringIndexSignature(\"name\", UNKNOWN_TYPE, context.options.immutable));\n  return irProperty(toPropertyName(\"headers\"), irObject(members));\n}\n\n/**\n * One media type of a response. The original reads a `$ref` entry as a media type without a\n * schema, so it is `unknown`; a `$ref` to an OpenAPI 3.2 media type component is typed as it.\n */\nfunction mediaTypeEntryType(\n  entry: NonNullable<ResponseObject[\"content\"]>[string],\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  return \"$ref\" in entry && isMediaTypeComponentRef(entry.$ref)\n    ? contentEntryType(entry, location, context)\n    : mediaTypeType(entry as MediaTypeObject, location, context);\n}\n\n/** `content` with one member per media type, or `content?: never` when there are none. */\nfunction contentMember(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrPropertySignature {\n  const entries = documentEntries(response.content ?? {}, context.options);\n  const members = entries.map(([contentType, entry]) => {\n    const path = appendPointer(location.path, [\"content\", contentType]);\n    const type = mediaTypeEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n  const name = toPropertyName(\"content\");\n  return members.length > 0\n    ? irProperty(name, irObject(members))\n    : irProperty(name, irKeyword(\"never\"), { isOptional: true });\n}\n\n/**\n * A response (OpenAPI 3.2 §4.8.17): `{ headers: {…}; content: {…} }`, and `itemContent` when a\n * media type has an `itemSchema`. No member is readonly, even with --immutable, as in the original.\n */\nexport function responseType(\n  response: ResponseObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const itemContent = itemContentMember(response.content ?? {}, location, context, {\n    isReadonly: false,\n  });\n  return irObject([\n    headersMember(response, location, context),\n    contentMember(response, location, context),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":[],"mappings":"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"}

package/dist/application/transform/document/responses.cjs

@@ -11,7 +11,7 @@ function responsesType(responses, location, context) {
   const members = documentEntries.documentEntries(responses, context.options).map(([code, response$1]) => {
     const type = "$ref" in response$1 ? refType.refType(response$1.$ref) : response.responseType(
       response$1,
-      { ...location, path: jsonPointer.createRef([location.path, "responses", code]) },
+      { ...location, path: jsonPointer.appendPointer(location.path, ["responses", code]) },
       context
     );
     return documentMember.documentMember(code, type, response$1, { isReadonly: context.options.immutable });

package/dist/application/transform/document/responses.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"responses.cjs","sources":["../../../../src/application/transform/document/responses.ts"],"sourcesContent":["import { irKeyword, irObject } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { ResponsesObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { responseType } from \"./response.js\";\n\n/** Responses by status code (OpenAPI 3.1 §4.8.16), or `never` when there are none. */\nexport function responsesType(\n  responses: ResponsesObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = documentEntries(responses, context.options).map(([code, response]) => {\n    const type =\n      \"$ref\" in response\n        ? refType(response.$ref)\n        : responseType(\n            response,\n            { ...location, path: createRef([location.path, \"responses\", code]) },\n            context,\n          );\n    return documentMember(code, type, response, { isReadonly: context.options.immutable });\n  });\n  return members.length > 0 ? irObject(members) : irKeyword(\"never\");\n}\n"],"names":["documentEntries","response","refType","responseType","createRef","documentMember","irObject","irKeyword"],"mappings":";;;;;;;;;AAWO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAUA,+BAAA,CAAgB,SAAA,EAAW,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAMC,UAAQ,CAAA,KAAM;AACpF,IAAA,MAAM,OACJ,MAAA,IAAUA,UAAA,GACNC,eAAA,CAAQD,UAAA,CAAS,IAAI,CAAA,GACrBE,qBAAA;AAAA,MACEF,UAAA;AAAA,MACA,EAAE,GAAG,QAAA,EAAU,IAAA,EAAMG,qBAAA,CAAU,CAAC,QAAA,CAAS,IAAA,EAAM,WAAA,EAAa,IAAI,CAAC,CAAA,EAAE;AAAA,MACnE;AAAA,KACF;AACN,IAAA,OAAOC,6BAAA,CAAe,MAAM,IAAA,EAAMJ,UAAA,EAAU,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACvF,CAAC,CAAA;AACD,EAAA,OAAO,QAAQ,MAAA,GAAS,CAAA,GAAIK,sBAAS,OAAO,CAAA,GAAIC,uBAAU,OAAO,CAAA;AACnE;;"}
+{"version":3,"file":"responses.cjs","sources":["../../../../src/application/transform/document/responses.ts"],"sourcesContent":["import { irKeyword, irObject } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { ResponsesObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { responseType } from \"./response.js\";\n\n/** Responses by status code (OpenAPI 3.1 §4.8.16), or `never` when there are none. */\nexport function responsesType(\n  responses: ResponsesObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = documentEntries(responses, context.options).map(([code, response]) => {\n    const type =\n      \"$ref\" in response\n        ? refType(response.$ref)\n        : responseType(\n            response,\n            { ...location, path: appendPointer(location.path, [\"responses\", code]) },\n            context,\n          );\n    return documentMember(code, type, response, { isReadonly: context.options.immutable });\n  });\n  return members.length > 0 ? irObject(members) : irKeyword(\"never\");\n}\n"],"names":["documentEntries","response","refType","responseType","appendPointer","documentMember","irObject","irKeyword"],"mappings":";;;;;;;;;AAWO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAUA,+BAAA,CAAgB,SAAA,EAAW,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAMC,UAAQ,CAAA,KAAM;AACpF,IAAA,MAAM,OACJ,MAAA,IAAUA,UAAA,GACNC,eAAA,CAAQD,UAAA,CAAS,IAAI,CAAA,GACrBE,qBAAA;AAAA,MACEF,UAAA;AAAA,MACA,EAAE,GAAG,QAAA,EAAU,IAAA,EAAMG,yBAAA,CAAc,QAAA,CAAS,IAAA,EAAM,CAAC,WAAA,EAAa,IAAI,CAAC,CAAA,EAAE;AAAA,MACvE;AAAA,KACF;AACN,IAAA,OAAOC,6BAAA,CAAe,MAAM,IAAA,EAAMJ,UAAA,EAAU,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACvF,CAAC,CAAA;AACD,EAAA,OAAO,QAAQ,MAAA,GAAS,CAAA,GAAIK,sBAAS,OAAO,CAAA,GAAIC,uBAAU,OAAO,CAAA;AACnE;;"}

package/dist/application/transform/document/responses.mjs

@@ -1,5 +1,5 @@
 import { irObject, irKeyword } from '../../../domain/ir/constructors.mjs';
-import { createRef } from '../../../domain/openapi/json-pointer.mjs';
+import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
 import { documentEntries } from '../document-entries.mjs';
 import { refType } from '../ref-type.mjs';
 import { documentMember } from './document-member.mjs';
@@ -9,7 +9,7 @@ function responsesType(responses, location, context) {
   const members = documentEntries(responses, context.options).map(([code, response]) => {
     const type = "$ref" in response ? refType(response.$ref) : responseType(
       response,
-      { ...location, path: createRef([location.path, "responses", code]) },
+      { ...location, path: appendPointer(location.path, ["responses", code]) },
       context
     );
     return documentMember(code, type, response, { isReadonly: context.options.immutable });

package/dist/application/transform/document/responses.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"responses.mjs","sources":["../../../../src/application/transform/document/responses.ts"],"sourcesContent":["import { irKeyword, irObject } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { ResponsesObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { responseType } from \"./response.js\";\n\n/** Responses by status code (OpenAPI 3.1 §4.8.16), or `never` when there are none. */\nexport function responsesType(\n  responses: ResponsesObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = documentEntries(responses, context.options).map(([code, response]) => {\n    const type =\n      \"$ref\" in response\n        ? refType(response.$ref)\n        : responseType(\n            response,\n            { ...location, path: createRef([location.path, \"responses\", code]) },\n            context,\n          );\n    return documentMember(code, type, response, { isReadonly: context.options.immutable });\n  });\n  return members.length > 0 ? irObject(members) : irKeyword(\"never\");\n}\n"],"names":[],"mappings":";;;;;;;AAWO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,SAAA,EAAW,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAM,QAAQ,CAAA,KAAM;AACpF,IAAA,MAAM,OACJ,MAAA,IAAU,QAAA,GACN,OAAA,CAAQ,QAAA,CAAS,IAAI,CAAA,GACrB,YAAA;AAAA,MACE,QAAA;AAAA,MACA,EAAE,GAAG,QAAA,EAAU,IAAA,EAAM,SAAA,CAAU,CAAC,QAAA,CAAS,IAAA,EAAM,WAAA,EAAa,IAAI,CAAC,CAAA,EAAE;AAAA,MACnE;AAAA,KACF;AACN,IAAA,OAAO,cAAA,CAAe,MAAM,IAAA,EAAM,QAAA,EAAU,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACvF,CAAC,CAAA;AACD,EAAA,OAAO,QAAQ,MAAA,GAAS,CAAA,GAAI,SAAS,OAAO,CAAA,GAAI,UAAU,OAAO,CAAA;AACnE;;"}
+{"version":3,"file":"responses.mjs","sources":["../../../../src/application/transform/document/responses.ts"],"sourcesContent":["import { irKeyword, irObject } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { ResponsesObject } from \"../../../domain/openapi/response-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { responseType } from \"./response.js\";\n\n/** Responses by status code (OpenAPI 3.1 §4.8.16), or `never` when there are none. */\nexport function responsesType(\n  responses: ResponsesObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = documentEntries(responses, context.options).map(([code, response]) => {\n    const type =\n      \"$ref\" in response\n        ? refType(response.$ref)\n        : responseType(\n            response,\n            { ...location, path: appendPointer(location.path, [\"responses\", code]) },\n            context,\n          );\n    return documentMember(code, type, response, { isReadonly: context.options.immutable });\n  });\n  return members.length > 0 ? irObject(members) : irKeyword(\"never\");\n}\n"],"names":[],"mappings":";;;;;;;AAWO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,SAAA,EAAW,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAM,QAAQ,CAAA,KAAM;AACpF,IAAA,MAAM,OACJ,MAAA,IAAU,QAAA,GACN,OAAA,CAAQ,QAAA,CAAS,IAAI,CAAA,GACrB,YAAA;AAAA,MACE,QAAA;AAAA,MACA,EAAE,GAAG,QAAA,EAAU,IAAA,EAAM,aAAA,CAAc,QAAA,CAAS,IAAA,EAAM,CAAC,WAAA,EAAa,IAAI,CAAC,CAAA,EAAE;AAAA,MACvE;AAAA,KACF;AACN,IAAA,OAAO,cAAA,CAAe,MAAM,IAAA,EAAM,QAAA,EAAU,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACvF,CAAC,CAAA;AACD,EAAA,OAAO,QAAQ,MAAA,GAAS,CAAA,GAAI,SAAS,OAAO,CAAA,GAAI,UAAU,OAAO,CAAA;AACnE;;"}

package/dist/application/transform/document/root-type-aliases.cjs

@@ -2,6 +2,8 @@
 
 const constructors = require('../../../domain/ir/constructors.cjs');
 const rawTextEscapes = require('../../../domain/ir/raw-text-escapes.cjs');
+const numberedNames = require('../numbered-names.cjs');
+const declaredTypeNames = require('./declared-type-names.cjs');
 const globalTypeReferences = require('./global-type-references.cjs');
 
 const REFERENCE_PREFIX = "components['";
@@ -19,16 +21,6 @@ function rootTypeAlias(name, kind, item) {
 function isRootTypeAlias(declaration) {
   return declaration.kind === "typeAlias" && declaration.type.kind === "raw" && declaration.type.text.startsWith(REFERENCE_PREFIX);
 }
-function footerTypeNames(declarations) {
-  return new Set(
-    declarations.flatMap((declaration) => {
-      if (declaration.kind === "enum") {
-        return [declaration.name];
-      }
-      return declaration.kind === "rawDeclaration" && declaration.name !== void 0 ? [declaration.name] : [];
-    })
-  );
-}
 function declaredNames(declarations) {
   return new Set(
     declarations.flatMap(
@@ -36,19 +28,11 @@ function declaredNames(declarations) {
     )
   );
 }
-function freeName(name, taken) {
-  let candidate = `${name}_2`;
-  for (let counter = 3; taken.has(candidate); counter++) {
-    candidate = `${name}_${counter}`;
-  }
-  return candidate;
-}
 function renameTakenAliases(body, footer, closing = []) {
-  const reserved = footerTypeNames(footer);
-  for (const name of globalTypeReferences.globalTypeReferences([...body, ...footer, ...closing])) {
-    reserved.add(name);
-  }
-  const taken = declaredNames([...body, ...footer, ...closing]);
+  const all = [...body, ...footer, ...closing];
+  const others = all.filter((declaration) => !isRootTypeAlias(declaration));
+  const reserved = /* @__PURE__ */ new Set([...declaredTypeNames.typeNamesDeclaredBy(others), ...globalTypeReferences.globalTypeReferences(all)]);
+  const taken = /* @__PURE__ */ new Set([...declaredNames(all), ...declaredTypeNames.typeNamesDeclaredBy(all)]);
   const aliasNames = /* @__PURE__ */ new Set();
   return body.map((declaration) => {
     if (!isRootTypeAlias(declaration)) {
@@ -59,12 +43,13 @@ function renameTakenAliases(body, footer, closing = []) {
     if (!isRepeated && !reserved.has(declaration.name)) {
       return declaration;
     }
-    const name = freeName(declaration.name, taken);
+    const name = numberedNames.freeNumberedName(declaration.name, taken);
     taken.add(name);
     return { ...declaration, name };
   });
 }
 
+exports.isRootTypeAlias = isRootTypeAlias;
 exports.renameTakenAliases = renameTakenAliases;
 exports.rootTypeAlias = rootTypeAlias;
 //# sourceMappingURL=root-type-aliases.cjs.map

package/dist/application/transform/document/root-type-aliases.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"root-type-aliases.cjs","sources":["../../../../src/application/transform/document/root-type-aliases.ts"],"sourcesContent":["import { irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrDeclaration, IrTypeAliasDeclaration } from \"../../../domain/ir/nodes.js\";\nimport { escapeSingleQuotedText } from \"../../../domain/ir/raw-text-escapes.js\";\nimport type { ComponentKind } from \"../../../domain/openapi/components-object.js\";\nimport { globalTypeReferences } from \"./global-type-references.js\";\n\n/** The `--root-types` aliases: `export type Pet = components['schemas']['Pet'];`. */\n\nconst REFERENCE_PREFIX = \"components['\";\n\n/** The alias of one component. */\nexport function rootTypeAlias(\n  name: string,\n  kind: ComponentKind,\n  item: string,\n): IrTypeAliasDeclaration {\n  return {\n    kind: \"typeAlias\",\n    name,\n    isExported: true,\n    // The original writes the reference as text, with single quotes, and did not escape the\n    // name: a quote in it could add code to the generated file (intentional fix).\n    type: irRaw(`${REFERENCE_PREFIX}${kind}']['${escapeSingleQuotedText(item)}']`),\n    comments: [],\n  };\n}\n\nfunction isRootTypeAlias(declaration: IrDeclaration): declaration is IrTypeAliasDeclaration {\n  return (\n    declaration.kind === \"typeAlias\" &&\n    declaration.type.kind === \"raw\" &&\n    declaration.type.text.startsWith(REFERENCE_PREFIX)\n  );\n}\n\n/**\n * The type names the footer declares that an alias must not take: enums, and helper types such as\n * `WithRequired`. Value declarations (`--enum-values` arrays) live in another namespace.\n */\nfunction footerTypeNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) => {\n      if (declaration.kind === \"enum\") {\n        return [declaration.name];\n      }\n      return declaration.kind === \"rawDeclaration\" && declaration.name !== undefined\n        ? [declaration.name]\n        : [];\n    }),\n  );\n}\n\nfunction declaredNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) =>\n      \"name\" in declaration && declaration.name !== undefined ? [declaration.name] : [],\n    ),\n  );\n}\n\nfunction freeName(name: string, taken: ReadonlySet<string>): string {\n  let candidate = `${name}_2`;\n  for (let counter = 3; taken.has(candidate); counter++) {\n    candidate = `${name}_${counter}`;\n  }\n  return candidate;\n}\n\n/**\n * Rename each root alias whose name an enum or a helper type of the footer also declares, or that\n * shadows a TypeScript global type the output refers to (`Record` in `Record<string, never>`), to\n * the next free `Name_2`, `Name_3`, … (the suffix `--root-types` uses for its own conflicts). The\n * footer and the globals keep their names, because the generated types refer to them. Before, the\n * output did not compile (enums: upstream #2099, #2341, #2206; helpers: a schema named\n * `WithRequired`, roadmap R11; globals: TS2315). Other declarations are returned unchanged.\n *\n * With the `root-type-numbering` fix (ADR-021, roadmap R13, backlog 30) the body also holds the\n * aliases a later schema of one exported name took the name from, after the other aliases and\n * under that same name. Each gets the next free number in body order, after the alias that kept\n * the name got its own: so the fix only adds exports, and every other alias keeps the name it has\n * without the fix.\n */\nexport function renameTakenAliases<T extends IrDeclaration>(\n  body: readonly T[],\n  footer: readonly IrDeclaration[],\n  closing: readonly IrDeclaration[] = [],\n): T[] {\n  const reserved = footerTypeNames(footer);\n  for (const name of globalTypeReferences([...body, ...footer, ...closing])) {\n    reserved.add(name);\n  }\n  const taken = declaredNames([...body, ...footer, ...closing]);\n  const aliasNames = new Set<string>();\n  return body.map((declaration) => {\n    if (!isRootTypeAlias(declaration)) {\n      return declaration;\n    }\n    const isRepeated = aliasNames.has(declaration.name);\n    aliasNames.add(declaration.name);\n    if (!isRepeated && !reserved.has(declaration.name)) {\n      return declaration;\n    }\n    const name = freeName(declaration.name, taken);\n    taken.add(name);\n    return { ...declaration, name };\n  });\n}\n"],"names":["irRaw","escapeSingleQuotedText","globalTypeReferences"],"mappings":"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"}
+{"version":3,"file":"root-type-aliases.cjs","sources":["../../../../src/application/transform/document/root-type-aliases.ts"],"sourcesContent":["import { irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrDeclaration, IrTypeAliasDeclaration } from \"../../../domain/ir/nodes.js\";\nimport { escapeSingleQuotedText } from \"../../../domain/ir/raw-text-escapes.js\";\nimport type { ComponentKind } from \"../../../domain/openapi/components-object.js\";\nimport { freeNumberedName } from \"../numbered-names.js\";\nimport { typeNamesDeclaredBy } from \"./declared-type-names.js\";\nimport { globalTypeReferences } from \"./global-type-references.js\";\n\n/** The `--root-types` aliases: `export type Pet = components['schemas']['Pet'];`. */\n\nconst REFERENCE_PREFIX = \"components['\";\n\n/** The alias of one component. */\nexport function rootTypeAlias(\n  name: string,\n  kind: ComponentKind,\n  item: string,\n): IrTypeAliasDeclaration {\n  return {\n    kind: \"typeAlias\",\n    name,\n    isExported: true,\n    // The original writes the reference as text, with single quotes, and did not escape the\n    // name: a quote in it could add code to the generated file (intentional fix).\n    type: irRaw(`${REFERENCE_PREFIX}${kind}']['${escapeSingleQuotedText(item)}']`),\n    comments: [],\n  };\n}\n\n/** Whether the declaration is a `--root-types` alias, which gives way to every other name. */\nexport function isRootTypeAlias(declaration: IrDeclaration): declaration is IrTypeAliasDeclaration {\n  return (\n    declaration.kind === \"typeAlias\" &&\n    declaration.type.kind === \"raw\" &&\n    declaration.type.text.startsWith(REFERENCE_PREFIX)\n  );\n}\n\nfunction declaredNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) =>\n      \"name\" in declaration && declaration.name !== undefined ? [declaration.name] : [],\n    ),\n  );\n}\n\n/**\n * Rename each root alias whose name another declaration of the output also takes (an enum, a\n * helper type, the `--make-paths-enum` enum `ApiPaths`, a root interface, `--read-write-markers`\n * or `inject` types), or that shadows a TypeScript global type the output refers to (`Record` in\n * `Record<string, never>`), to the next free `Name_2`, `Name_3`, … (the suffix `--root-types` uses\n * for its own conflicts). The others and the globals keep their names, because the generated\n * types refer to them. Before, the output did not compile (enums: upstream #2099, #2341, #2206;\n * helpers: a schema named `WithRequired`, roadmap R11; globals: TS2315; `ApiPaths`: TS2567).\n * Other declarations are returned unchanged.\n *\n * With the `root-type-numbering` fix (ADR-021, roadmap R13, backlog 30) the body also holds the\n * aliases a later schema of one exported name took the name from, after the other aliases and\n * under that same name. Each gets the next free number in body order, after the alias that kept\n * the name got its own: so the fix only adds exports, and every other alias keeps the name it has\n * without the fix.\n */\nexport function renameTakenAliases<T extends IrDeclaration>(\n  body: readonly T[],\n  footer: readonly IrDeclaration[],\n  closing: readonly IrDeclaration[] = [],\n): T[] {\n  const all = [...body, ...footer, ...closing];\n  const others = all.filter((declaration) => !isRootTypeAlias(declaration));\n  const reserved = new Set([...typeNamesDeclaredBy(others), ...globalTypeReferences(all)]);\n  const taken = new Set([...declaredNames(all), ...typeNamesDeclaredBy(all)]);\n  const aliasNames = new Set<string>();\n  return body.map((declaration) => {\n    if (!isRootTypeAlias(declaration)) {\n      return declaration;\n    }\n    const isRepeated = aliasNames.has(declaration.name);\n    aliasNames.add(declaration.name);\n    if (!isRepeated && !reserved.has(declaration.name)) {\n      return declaration;\n    }\n    const name = freeNumberedName(declaration.name, taken);\n    taken.add(name);\n    return { ...declaration, name };\n  });\n}\n"],"names":["irRaw","escapeSingleQuotedText","typeNamesDeclaredBy","globalTypeReferences","freeNumberedName"],"mappings":";;;;;;;;AAUA,MAAM,gBAAA,GAAmB,cAAA;AAGlB,SAAS,aAAA,CACd,IAAA,EACA,IAAA,EACA,IAAA,EACwB;AACxB,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,WAAA;AAAA,IACN,IAAA;AAAA,IACA,UAAA,EAAY,IAAA;AAAA;AAAA;AAAA,IAGZ,IAAA,EAAMA,kBAAA,CAAM,CAAA,EAAG,gBAAgB,CAAA,EAAG,IAAI,CAAA,IAAA,EAAOC,qCAAA,CAAuB,IAAI,CAAC,CAAA,EAAA,CAAI,CAAA;AAAA,IAC7E,UAAU;AAAC,GACb;AACF;AAGO,SAAS,gBAAgB,WAAA,EAAmE;AACjG,EAAA,OACE,WAAA,CAAY,IAAA,KAAS,WAAA,IACrB,WAAA,CAAY,IAAA,CAAK,IAAA,KAAS,KAAA,IAC1B,WAAA,CAAY,IAAA,CAAK,IAAA,CAAK,UAAA,CAAW,gBAAgB,CAAA;AAErD;AAEA,SAAS,cAAc,YAAA,EAAqD;AAC1E,EAAA,OAAO,IAAI,GAAA;AAAA,IACT,YAAA,CAAa,OAAA;AAAA,MAAQ,CAAC,WAAA,KACpB,MAAA,IAAU,WAAA,IAAe,WAAA,CAAY,IAAA,KAAS,MAAA,GAAY,CAAC,WAAA,CAAY,IAAI,CAAA,GAAI;AAAC;AAClF,GACF;AACF;AAkBO,SAAS,kBAAA,CACd,IAAA,EACA,MAAA,EACA,OAAA,GAAoC,EAAC,EAChC;AACL,EAAA,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,MAAA,EAAQ,GAAG,OAAO,CAAA;AAC3C,EAAA,MAAM,MAAA,GAAS,IAAI,MAAA,CAAO,CAAC,gBAAgB,CAAC,eAAA,CAAgB,WAAW,CAAC,CAAA;AACxE,EAAA,MAAM,QAAA,mBAAW,IAAI,GAAA,CAAI,CAAC,GAAGC,qCAAA,CAAoB,MAAM,CAAA,EAAG,GAAGC,yCAAA,CAAqB,GAAG,CAAC,CAAC,CAAA;AACvF,EAAA,MAAM,KAAA,mBAAQ,IAAI,GAAA,CAAI,CAAC,GAAG,aAAA,CAAc,GAAG,CAAA,EAAG,GAAGD,qCAAA,CAAoB,GAAG,CAAC,CAAC,CAAA;AAC1E,EAAA,MAAM,UAAA,uBAAiB,GAAA,EAAY;AACnC,EAAA,OAAO,IAAA,CAAK,GAAA,CAAI,CAAC,WAAA,KAAgB;AAC/B,IAAA,IAAI,CAAC,eAAA,CAAgB,WAAW,CAAA,EAAG;AACjC,MAAA,OAAO,WAAA;AAAA,IACT;AACA,IAAA,MAAM,UAAA,GAAa,UAAA,CAAW,GAAA,CAAI,WAAA,CAAY,IAAI,CAAA;AAClD,IAAA,UAAA,CAAW,GAAA,CAAI,YAAY,IAAI,CAAA;AAC/B,IAAA,IAAI,CAAC,UAAA,IAAc,CAAC,SAAS,GAAA,CAAI,WAAA,CAAY,IAAI,CAAA,EAAG;AAClD,MAAA,OAAO,WAAA;AAAA,IACT;AACA,IAAA,MAAM,IAAA,GAAOE,8BAAA,CAAiB,WAAA,CAAY,IAAA,EAAM,KAAK,CAAA;AACrD,IAAA,KAAA,CAAM,IAAI,IAAI,CAAA;AACd,IAAA,OAAO,EAAE,GAAG,WAAA,EAAa,IAAA,EAAK;AAAA,EAChC,CAAC,CAAA;AACH;;;;"}

package/dist/application/transform/document/root-type-aliases.mjs

@@ -1,5 +1,7 @@
 import { irRaw } from '../../../domain/ir/constructors.mjs';
 import { escapeSingleQuotedText } from '../../../domain/ir/raw-text-escapes.mjs';
+import { freeNumberedName } from '../numbered-names.mjs';
+import { typeNamesDeclaredBy } from './declared-type-names.mjs';
 import { globalTypeReferences } from './global-type-references.mjs';
 
 const REFERENCE_PREFIX = "components['";
@@ -17,16 +19,6 @@ function rootTypeAlias(name, kind, item) {
 function isRootTypeAlias(declaration) {
   return declaration.kind === "typeAlias" && declaration.type.kind === "raw" && declaration.type.text.startsWith(REFERENCE_PREFIX);
 }
-function footerTypeNames(declarations) {
-  return new Set(
-    declarations.flatMap((declaration) => {
-      if (declaration.kind === "enum") {
-        return [declaration.name];
-      }
-      return declaration.kind === "rawDeclaration" && declaration.name !== void 0 ? [declaration.name] : [];
-    })
-  );
-}
 function declaredNames(declarations) {
   return new Set(
     declarations.flatMap(
@@ -34,19 +26,11 @@ function declaredNames(declarations) {
     )
   );
 }
-function freeName(name, taken) {
-  let candidate = `${name}_2`;
-  for (let counter = 3; taken.has(candidate); counter++) {
-    candidate = `${name}_${counter}`;
-  }
-  return candidate;
-}
 function renameTakenAliases(body, footer, closing = []) {
-  const reserved = footerTypeNames(footer);
-  for (const name of globalTypeReferences([...body, ...footer, ...closing])) {
-    reserved.add(name);
-  }
-  const taken = declaredNames([...body, ...footer, ...closing]);
+  const all = [...body, ...footer, ...closing];
+  const others = all.filter((declaration) => !isRootTypeAlias(declaration));
+  const reserved = /* @__PURE__ */ new Set([...typeNamesDeclaredBy(others), ...globalTypeReferences(all)]);
+  const taken = /* @__PURE__ */ new Set([...declaredNames(all), ...typeNamesDeclaredBy(all)]);
   const aliasNames = /* @__PURE__ */ new Set();
   return body.map((declaration) => {
     if (!isRootTypeAlias(declaration)) {
@@ -57,11 +41,11 @@ function renameTakenAliases(body, footer, closing = []) {
     if (!isRepeated && !reserved.has(declaration.name)) {
       return declaration;
     }
-    const name = freeName(declaration.name, taken);
+    const name = freeNumberedName(declaration.name, taken);
     taken.add(name);
     return { ...declaration, name };
   });
 }
 
-export { renameTakenAliases, rootTypeAlias };
+export { isRootTypeAlias, renameTakenAliases, rootTypeAlias };
 //# sourceMappingURL=root-type-aliases.mjs.map

package/dist/application/transform/document/root-type-aliases.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"root-type-aliases.mjs","sources":["../../../../src/application/transform/document/root-type-aliases.ts"],"sourcesContent":["import { irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrDeclaration, IrTypeAliasDeclaration } from \"../../../domain/ir/nodes.js\";\nimport { escapeSingleQuotedText } from \"../../../domain/ir/raw-text-escapes.js\";\nimport type { ComponentKind } from \"../../../domain/openapi/components-object.js\";\nimport { globalTypeReferences } from \"./global-type-references.js\";\n\n/** The `--root-types` aliases: `export type Pet = components['schemas']['Pet'];`. */\n\nconst REFERENCE_PREFIX = \"components['\";\n\n/** The alias of one component. */\nexport function rootTypeAlias(\n  name: string,\n  kind: ComponentKind,\n  item: string,\n): IrTypeAliasDeclaration {\n  return {\n    kind: \"typeAlias\",\n    name,\n    isExported: true,\n    // The original writes the reference as text, with single quotes, and did not escape the\n    // name: a quote in it could add code to the generated file (intentional fix).\n    type: irRaw(`${REFERENCE_PREFIX}${kind}']['${escapeSingleQuotedText(item)}']`),\n    comments: [],\n  };\n}\n\nfunction isRootTypeAlias(declaration: IrDeclaration): declaration is IrTypeAliasDeclaration {\n  return (\n    declaration.kind === \"typeAlias\" &&\n    declaration.type.kind === \"raw\" &&\n    declaration.type.text.startsWith(REFERENCE_PREFIX)\n  );\n}\n\n/**\n * The type names the footer declares that an alias must not take: enums, and helper types such as\n * `WithRequired`. Value declarations (`--enum-values` arrays) live in another namespace.\n */\nfunction footerTypeNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) => {\n      if (declaration.kind === \"enum\") {\n        return [declaration.name];\n      }\n      return declaration.kind === \"rawDeclaration\" && declaration.name !== undefined\n        ? [declaration.name]\n        : [];\n    }),\n  );\n}\n\nfunction declaredNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) =>\n      \"name\" in declaration && declaration.name !== undefined ? [declaration.name] : [],\n    ),\n  );\n}\n\nfunction freeName(name: string, taken: ReadonlySet<string>): string {\n  let candidate = `${name}_2`;\n  for (let counter = 3; taken.has(candidate); counter++) {\n    candidate = `${name}_${counter}`;\n  }\n  return candidate;\n}\n\n/**\n * Rename each root alias whose name an enum or a helper type of the footer also declares, or that\n * shadows a TypeScript global type the output refers to (`Record` in `Record<string, never>`), to\n * the next free `Name_2`, `Name_3`, … (the suffix `--root-types` uses for its own conflicts). The\n * footer and the globals keep their names, because the generated types refer to them. Before, the\n * output did not compile (enums: upstream #2099, #2341, #2206; helpers: a schema named\n * `WithRequired`, roadmap R11; globals: TS2315). Other declarations are returned unchanged.\n *\n * With the `root-type-numbering` fix (ADR-021, roadmap R13, backlog 30) the body also holds the\n * aliases a later schema of one exported name took the name from, after the other aliases and\n * under that same name. Each gets the next free number in body order, after the alias that kept\n * the name got its own: so the fix only adds exports, and every other alias keeps the name it has\n * without the fix.\n */\nexport function renameTakenAliases<T extends IrDeclaration>(\n  body: readonly T[],\n  footer: readonly IrDeclaration[],\n  closing: readonly IrDeclaration[] = [],\n): T[] {\n  const reserved = footerTypeNames(footer);\n  for (const name of globalTypeReferences([...body, ...footer, ...closing])) {\n    reserved.add(name);\n  }\n  const taken = declaredNames([...body, ...footer, ...closing]);\n  const aliasNames = new Set<string>();\n  return body.map((declaration) => {\n    if (!isRootTypeAlias(declaration)) {\n      return declaration;\n    }\n    const isRepeated = aliasNames.has(declaration.name);\n    aliasNames.add(declaration.name);\n    if (!isRepeated && !reserved.has(declaration.name)) {\n      return declaration;\n    }\n    const name = freeName(declaration.name, taken);\n    taken.add(name);\n    return { ...declaration, name };\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"root-type-aliases.mjs","sources":["../../../../src/application/transform/document/root-type-aliases.ts"],"sourcesContent":["import { irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrDeclaration, IrTypeAliasDeclaration } from \"../../../domain/ir/nodes.js\";\nimport { escapeSingleQuotedText } from \"../../../domain/ir/raw-text-escapes.js\";\nimport type { ComponentKind } from \"../../../domain/openapi/components-object.js\";\nimport { freeNumberedName } from \"../numbered-names.js\";\nimport { typeNamesDeclaredBy } from \"./declared-type-names.js\";\nimport { globalTypeReferences } from \"./global-type-references.js\";\n\n/** The `--root-types` aliases: `export type Pet = components['schemas']['Pet'];`. */\n\nconst REFERENCE_PREFIX = \"components['\";\n\n/** The alias of one component. */\nexport function rootTypeAlias(\n  name: string,\n  kind: ComponentKind,\n  item: string,\n): IrTypeAliasDeclaration {\n  return {\n    kind: \"typeAlias\",\n    name,\n    isExported: true,\n    // The original writes the reference as text, with single quotes, and did not escape the\n    // name: a quote in it could add code to the generated file (intentional fix).\n    type: irRaw(`${REFERENCE_PREFIX}${kind}']['${escapeSingleQuotedText(item)}']`),\n    comments: [],\n  };\n}\n\n/** Whether the declaration is a `--root-types` alias, which gives way to every other name. */\nexport function isRootTypeAlias(declaration: IrDeclaration): declaration is IrTypeAliasDeclaration {\n  return (\n    declaration.kind === \"typeAlias\" &&\n    declaration.type.kind === \"raw\" &&\n    declaration.type.text.startsWith(REFERENCE_PREFIX)\n  );\n}\n\nfunction declaredNames(declarations: readonly IrDeclaration[]): Set<string> {\n  return new Set(\n    declarations.flatMap((declaration) =>\n      \"name\" in declaration && declaration.name !== undefined ? [declaration.name] : [],\n    ),\n  );\n}\n\n/**\n * Rename each root alias whose name another declaration of the output also takes (an enum, a\n * helper type, the `--make-paths-enum` enum `ApiPaths`, a root interface, `--read-write-markers`\n * or `inject` types), or that shadows a TypeScript global type the output refers to (`Record` in\n * `Record<string, never>`), to the next free `Name_2`, `Name_3`, … (the suffix `--root-types` uses\n * for its own conflicts). The others and the globals keep their names, because the generated\n * types refer to them. Before, the output did not compile (enums: upstream #2099, #2341, #2206;\n * helpers: a schema named `WithRequired`, roadmap R11; globals: TS2315; `ApiPaths`: TS2567).\n * Other declarations are returned unchanged.\n *\n * With the `root-type-numbering` fix (ADR-021, roadmap R13, backlog 30) the body also holds the\n * aliases a later schema of one exported name took the name from, after the other aliases and\n * under that same name. Each gets the next free number in body order, after the alias that kept\n * the name got its own: so the fix only adds exports, and every other alias keeps the name it has\n * without the fix.\n */\nexport function renameTakenAliases<T extends IrDeclaration>(\n  body: readonly T[],\n  footer: readonly IrDeclaration[],\n  closing: readonly IrDeclaration[] = [],\n): T[] {\n  const all = [...body, ...footer, ...closing];\n  const others = all.filter((declaration) => !isRootTypeAlias(declaration));\n  const reserved = new Set([...typeNamesDeclaredBy(others), ...globalTypeReferences(all)]);\n  const taken = new Set([...declaredNames(all), ...typeNamesDeclaredBy(all)]);\n  const aliasNames = new Set<string>();\n  return body.map((declaration) => {\n    if (!isRootTypeAlias(declaration)) {\n      return declaration;\n    }\n    const isRepeated = aliasNames.has(declaration.name);\n    aliasNames.add(declaration.name);\n    if (!isRepeated && !reserved.has(declaration.name)) {\n      return declaration;\n    }\n    const name = freeNumberedName(declaration.name, taken);\n    taken.add(name);\n    return { ...declaration, name };\n  });\n}\n"],"names":[],"mappings":";;;;;;AAUA,MAAM,gBAAA,GAAmB,cAAA;AAGlB,SAAS,aAAA,CACd,IAAA,EACA,IAAA,EACA,IAAA,EACwB;AACxB,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,WAAA;AAAA,IACN,IAAA;AAAA,IACA,UAAA,EAAY,IAAA;AAAA;AAAA;AAAA,IAGZ,IAAA,EAAM,KAAA,CAAM,CAAA,EAAG,gBAAgB,CAAA,EAAG,IAAI,CAAA,IAAA,EAAO,sBAAA,CAAuB,IAAI,CAAC,CAAA,EAAA,CAAI,CAAA;AAAA,IAC7E,UAAU;AAAC,GACb;AACF;AAGO,SAAS,gBAAgB,WAAA,EAAmE;AACjG,EAAA,OACE,WAAA,CAAY,IAAA,KAAS,WAAA,IACrB,WAAA,CAAY,IAAA,CAAK,IAAA,KAAS,KAAA,IAC1B,WAAA,CAAY,IAAA,CAAK,IAAA,CAAK,UAAA,CAAW,gBAAgB,CAAA;AAErD;AAEA,SAAS,cAAc,YAAA,EAAqD;AAC1E,EAAA,OAAO,IAAI,GAAA;AAAA,IACT,YAAA,CAAa,OAAA;AAAA,MAAQ,CAAC,WAAA,KACpB,MAAA,IAAU,WAAA,IAAe,WAAA,CAAY,IAAA,KAAS,MAAA,GAAY,CAAC,WAAA,CAAY,IAAI,CAAA,GAAI;AAAC;AAClF,GACF;AACF;AAkBO,SAAS,kBAAA,CACd,IAAA,EACA,MAAA,EACA,OAAA,GAAoC,EAAC,EAChC;AACL,EAAA,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,MAAA,EAAQ,GAAG,OAAO,CAAA;AAC3C,EAAA,MAAM,MAAA,GAAS,IAAI,MAAA,CAAO,CAAC,gBAAgB,CAAC,eAAA,CAAgB,WAAW,CAAC,CAAA;AACxE,EAAA,MAAM,QAAA,mBAAW,IAAI,GAAA,CAAI,CAAC,GAAG,mBAAA,CAAoB,MAAM,CAAA,EAAG,GAAG,oBAAA,CAAqB,GAAG,CAAC,CAAC,CAAA;AACvF,EAAA,MAAM,KAAA,mBAAQ,IAAI,GAAA,CAAI,CAAC,GAAG,aAAA,CAAc,GAAG,CAAA,EAAG,GAAG,mBAAA,CAAoB,GAAG,CAAC,CAAC,CAAA;AAC1E,EAAA,MAAM,UAAA,uBAAiB,GAAA,EAAY;AACnC,EAAA,OAAO,IAAA,CAAK,GAAA,CAAI,CAAC,WAAA,KAAgB;AAC/B,IAAA,IAAI,CAAC,eAAA,CAAgB,WAAW,CAAA,EAAG;AACjC,MAAA,OAAO,WAAA;AAAA,IACT;AACA,IAAA,MAAM,UAAA,GAAa,UAAA,CAAW,GAAA,CAAI,WAAA,CAAY,IAAI,CAAA;AAClD,IAAA,UAAA,CAAW,GAAA,CAAI,YAAY,IAAI,CAAA;AAC/B,IAAA,IAAI,CAAC,UAAA,IAAc,CAAC,SAAS,GAAA,CAAI,WAAA,CAAY,IAAI,CAAA,EAAG;AAClD,MAAA,OAAO,WAAA;AAAA,IACT;AACA,IAAA,MAAM,IAAA,GAAO,gBAAA,CAAiB,WAAA,CAAY,IAAA,EAAM,KAAK,CAAA;AACrD,IAAA,KAAA,CAAM,IAAI,IAAI,CAAA;AACd,IAAA,OAAO,EAAE,GAAG,WAAA,EAAa,IAAA,EAAK;AAAA,EAChC,CAAC,CAAA;AACH;;"}

package/dist/application/transform/document/type-resolution.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+const appendAll = require('../../../domain/append-all.cjs');
+
 const UNDEFINED = { kind: "keyword", keyword: "undefined" };
 function nameOf(member) {
   return member.name.kind === "string" ? member.name.value : member.name.text;
@@ -117,7 +119,7 @@ class TypeResolution {
       if (objects === null) {
         return null;
       }
-      parts.push(...objects);
+      appendAll.appendAll(parts, objects);
     }
     return parts;
   }

package/dist/application/transform/document/type-resolution.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"type-resolution.cjs","sources":["../../../../src/application/transform/document/type-resolution.ts"],"sourcesContent":["import type {\n  IrIndexSignature,\n  IrMember,\n  IrObjectType,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport type { DeclaredTypeLookup } from \"./declared-types.js\";\n\n/**\n * The types the `--path-params-as-types` overlap check compares, as TypeScript sees them:\n * references followed to the declarations of the document, `T[\"key\"]` and `T[number]` read from\n * `T`, and an intersection of object types merged into one object.\n */\n\nconst UNDEFINED: IrType = { kind: \"keyword\", keyword: \"undefined\" };\n\nexport function nameOf(member: IrPropertySignature): string {\n  return member.name.kind === \"string\" ? member.name.value : member.name.text;\n}\n\nexport function propertiesOf(type: IrObjectType): Map<string, IrPropertySignature> {\n  const properties = type.members.filter(\n    (member: IrMember): member is IrPropertySignature => member.kind === \"property\",\n  );\n  return new Map(properties.map((property) => [nameOf(property), property]));\n}\n\nexport function indexSignaturesOf(type: IrObjectType): IrIndexSignature[] {\n  return type.members.filter(\n    (member: IrMember): member is IrIndexSignature => member.kind === \"indexSignature\",\n  );\n}\n\n/** The type read from a property: an optional one may be `undefined`. */\nexport function readType(property: IrPropertySignature): IrType {\n  return property.isOptional ? { kind: \"union\", types: [property.type, UNDEFINED] } : property.type;\n}\n\n/**\n * `T[number]` for an array `T`, as the generator writes for an item of an array response: the\n * element type, readonly or not. A tuple's is the union of its elements, which is not modelled.\n */\nfunction arrayElement(type: IrType): IrType | null {\n  const list = type.kind === \"readonly\" ? type.type : type;\n  return list.kind === \"array\" ? list.element : null;\n}\n\n/** One property for two of the same name in an intersection. */\nfunction mergedProperty(\n  first: IrPropertySignature,\n  second: IrPropertySignature,\n): IrPropertySignature {\n  return {\n    ...first,\n    type: { kind: \"intersection\", types: [first.type, second.type] },\n    isOptional: first.isOptional && second.isOptional,\n    isReadonly: first.isReadonly || second.isReadonly,\n  };\n}\n\n/** Resolves types once each, for one comparison. */\nexport class TypeResolution {\n  private readonly lookup: DeclaredTypeLookup;\n  private readonly resolvedTypes = new Map<IrType, IrType>();\n\n  constructor(lookup: DeclaredTypeLookup) {\n    this.lookup = lookup;\n  }\n\n  /** The type a reference names, followed through references to references; computed once. */\n  resolved(type: IrType): IrType {\n    const known = this.resolvedTypes.get(type);\n    if (known !== undefined) {\n      return known;\n    }\n    // A type that reaches itself while it is resolved stays as it is written there.\n    this.resolvedTypes.set(type, type);\n    const seen = new Set<IrType>();\n    let current = type;\n    while (!seen.has(current)) {\n      seen.add(current);\n      const named = this.lookup(current) ?? this.indexedProperty(current);\n      if (named === null) {\n        break;\n      }\n      current = named;\n    }\n    const result = current.kind === \"intersection\" ? (this.merged(current) ?? current) : current;\n    this.resolvedTypes.set(type, result);\n    return result;\n  }\n\n  /**\n   * `T[\"key\"]` read from the object type `T` resolves to, which the lookup does not do for an\n   * object it reached through another lookup (`paths[\"/a/{id}\"][\"get\"]`). An optional property\n   * reads as `T | undefined`; `T[number]` is the element of the array `T`.\n   */\n  private indexedProperty(type: IrType): IrType | null {\n    if (type.kind !== \"indexedAccess\") {\n      return null;\n    }\n    const { index } = type;\n    if (index.kind === \"keyword\" && index.keyword === \"number\") {\n      return arrayElement(this.resolved(type.object));\n    }\n    const object = this.resolved(type.object);\n    if (index.kind !== \"stringLiteral\" || object.kind !== \"object\") {\n      return null;\n    }\n    const property = propertiesOf(object).get(index.value);\n    return property === undefined ? null : readType(property);\n  }\n\n  /**\n   * An intersection of object types as the one object TypeScript makes of it: a property in\n   * several parts has the intersection of their types, and is optional only when it is in each.\n   * Null when a part is no object type.\n   */\n  private merged(type: IrType): IrObjectType | null {\n    const parts = this.objectParts(type);\n    if (parts === null) {\n      return null;\n    }\n    const properties = new Map<string, IrPropertySignature>();\n    const indexes: IrIndexSignature[] = [];\n    for (const member of parts.flatMap((part) => part.members)) {\n      if (member.kind === \"indexSignature\") {\n        indexes.push(member);\n        continue;\n      }\n      const name = nameOf(member);\n      const other = properties.get(name);\n      properties.set(name, other === undefined ? member : mergedProperty(other, member));\n    }\n    return { kind: \"object\", members: [...properties.values(), ...indexes] };\n  }\n\n  /**\n   * The object types an intersection is made of, nested ones flattened; null for any other, and\n   * for an intersection that contains itself, which TypeScript does not merge either.\n   */\n  private objectParts(\n    type: IrType,\n    visiting: ReadonlySet<IrType> = new Set(),\n  ): IrObjectType[] | null {\n    if (type.kind === \"object\") {\n      return [type];\n    }\n    if (type.kind !== \"intersection\" || visiting.has(type)) {\n      return null;\n    }\n    const parts: IrObjectType[] = [];\n    for (const part of type.types) {\n      const objects = this.objectParts(this.resolved(part), new Set([...visiting, type]));\n      if (objects === null) {\n        return null;\n      }\n      parts.push(...objects);\n    }\n    return parts;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-resolution.cjs","sources":["../../../../src/application/transform/document/type-resolution.ts"],"sourcesContent":["import { appendAll } from \"../../../domain/append-all.js\";\nimport type {\n  IrIndexSignature,\n  IrMember,\n  IrObjectType,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport type { DeclaredTypeLookup } from \"./declared-types.js\";\n\n/**\n * The types the `--path-params-as-types` overlap check compares, as TypeScript sees them:\n * references followed to the declarations of the document, `T[\"key\"]` and `T[number]` read from\n * `T`, and an intersection of object types merged into one object.\n */\n\nconst UNDEFINED: IrType = { kind: \"keyword\", keyword: \"undefined\" };\n\nexport function nameOf(member: IrPropertySignature): string {\n  return member.name.kind === \"string\" ? member.name.value : member.name.text;\n}\n\nexport function propertiesOf(type: IrObjectType): Map<string, IrPropertySignature> {\n  const properties = type.members.filter(\n    (member: IrMember): member is IrPropertySignature => member.kind === \"property\",\n  );\n  return new Map(properties.map((property) => [nameOf(property), property]));\n}\n\nexport function indexSignaturesOf(type: IrObjectType): IrIndexSignature[] {\n  return type.members.filter(\n    (member: IrMember): member is IrIndexSignature => member.kind === \"indexSignature\",\n  );\n}\n\n/** The type read from a property: an optional one may be `undefined`. */\nexport function readType(property: IrPropertySignature): IrType {\n  return property.isOptional ? { kind: \"union\", types: [property.type, UNDEFINED] } : property.type;\n}\n\n/**\n * `T[number]` for an array `T`, as the generator writes for an item of an array response: the\n * element type, readonly or not. A tuple's is the union of its elements, which is not modelled.\n */\nfunction arrayElement(type: IrType): IrType | null {\n  const list = type.kind === \"readonly\" ? type.type : type;\n  return list.kind === \"array\" ? list.element : null;\n}\n\n/** One property for two of the same name in an intersection. */\nfunction mergedProperty(\n  first: IrPropertySignature,\n  second: IrPropertySignature,\n): IrPropertySignature {\n  return {\n    ...first,\n    type: { kind: \"intersection\", types: [first.type, second.type] },\n    isOptional: first.isOptional && second.isOptional,\n    isReadonly: first.isReadonly || second.isReadonly,\n  };\n}\n\n/** Resolves types once each, for one comparison. */\nexport class TypeResolution {\n  private readonly lookup: DeclaredTypeLookup;\n  private readonly resolvedTypes = new Map<IrType, IrType>();\n\n  constructor(lookup: DeclaredTypeLookup) {\n    this.lookup = lookup;\n  }\n\n  /** The type a reference names, followed through references to references; computed once. */\n  resolved(type: IrType): IrType {\n    const known = this.resolvedTypes.get(type);\n    if (known !== undefined) {\n      return known;\n    }\n    // A type that reaches itself while it is resolved stays as it is written there.\n    this.resolvedTypes.set(type, type);\n    const seen = new Set<IrType>();\n    let current = type;\n    while (!seen.has(current)) {\n      seen.add(current);\n      const named = this.lookup(current) ?? this.indexedProperty(current);\n      if (named === null) {\n        break;\n      }\n      current = named;\n    }\n    const result = current.kind === \"intersection\" ? (this.merged(current) ?? current) : current;\n    this.resolvedTypes.set(type, result);\n    return result;\n  }\n\n  /**\n   * `T[\"key\"]` read from the object type `T` resolves to, which the lookup does not do for an\n   * object it reached through another lookup (`paths[\"/a/{id}\"][\"get\"]`). An optional property\n   * reads as `T | undefined`; `T[number]` is the element of the array `T`.\n   */\n  private indexedProperty(type: IrType): IrType | null {\n    if (type.kind !== \"indexedAccess\") {\n      return null;\n    }\n    const { index } = type;\n    if (index.kind === \"keyword\" && index.keyword === \"number\") {\n      return arrayElement(this.resolved(type.object));\n    }\n    const object = this.resolved(type.object);\n    if (index.kind !== \"stringLiteral\" || object.kind !== \"object\") {\n      return null;\n    }\n    const property = propertiesOf(object).get(index.value);\n    return property === undefined ? null : readType(property);\n  }\n\n  /**\n   * An intersection of object types as the one object TypeScript makes of it: a property in\n   * several parts has the intersection of their types, and is optional only when it is in each.\n   * Null when a part is no object type.\n   */\n  private merged(type: IrType): IrObjectType | null {\n    const parts = this.objectParts(type);\n    if (parts === null) {\n      return null;\n    }\n    const properties = new Map<string, IrPropertySignature>();\n    const indexes: IrIndexSignature[] = [];\n    for (const member of parts.flatMap((part) => part.members)) {\n      if (member.kind === \"indexSignature\") {\n        indexes.push(member);\n        continue;\n      }\n      const name = nameOf(member);\n      const other = properties.get(name);\n      properties.set(name, other === undefined ? member : mergedProperty(other, member));\n    }\n    return { kind: \"object\", members: [...properties.values(), ...indexes] };\n  }\n\n  /**\n   * The object types an intersection is made of, nested ones flattened; null for any other, and\n   * for an intersection that contains itself, which TypeScript does not merge either.\n   */\n  private objectParts(\n    type: IrType,\n    visiting: ReadonlySet<IrType> = new Set(),\n  ): IrObjectType[] | null {\n    if (type.kind === \"object\") {\n      return [type];\n    }\n    if (type.kind !== \"intersection\" || visiting.has(type)) {\n      return null;\n    }\n    const parts: IrObjectType[] = [];\n    for (const part of type.types) {\n      const objects = this.objectParts(this.resolved(part), new Set([...visiting, type]));\n      if (objects === null) {\n        return null;\n      }\n      appendAll(parts, objects);\n    }\n    return parts;\n  }\n}\n"],"names":["appendAll"],"mappings":"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"}

package/dist/application/transform/document/type-resolution.mjs

@@ -1,3 +1,5 @@
+import { appendAll } from '../../../domain/append-all.mjs';
+
 const UNDEFINED = { kind: "keyword", keyword: "undefined" };
 function nameOf(member) {
   return member.name.kind === "string" ? member.name.value : member.name.text;
@@ -115,7 +117,7 @@ class TypeResolution {
       if (objects === null) {
         return null;
       }
-      parts.push(...objects);
+      appendAll(parts, objects);
     }
     return parts;
   }

package/dist/application/transform/document/type-resolution.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"type-resolution.mjs","sources":["../../../../src/application/transform/document/type-resolution.ts"],"sourcesContent":["import type {\n  IrIndexSignature,\n  IrMember,\n  IrObjectType,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport type { DeclaredTypeLookup } from \"./declared-types.js\";\n\n/**\n * The types the `--path-params-as-types` overlap check compares, as TypeScript sees them:\n * references followed to the declarations of the document, `T[\"key\"]` and `T[number]` read from\n * `T`, and an intersection of object types merged into one object.\n */\n\nconst UNDEFINED: IrType = { kind: \"keyword\", keyword: \"undefined\" };\n\nexport function nameOf(member: IrPropertySignature): string {\n  return member.name.kind === \"string\" ? member.name.value : member.name.text;\n}\n\nexport function propertiesOf(type: IrObjectType): Map<string, IrPropertySignature> {\n  const properties = type.members.filter(\n    (member: IrMember): member is IrPropertySignature => member.kind === \"property\",\n  );\n  return new Map(properties.map((property) => [nameOf(property), property]));\n}\n\nexport function indexSignaturesOf(type: IrObjectType): IrIndexSignature[] {\n  return type.members.filter(\n    (member: IrMember): member is IrIndexSignature => member.kind === \"indexSignature\",\n  );\n}\n\n/** The type read from a property: an optional one may be `undefined`. */\nexport function readType(property: IrPropertySignature): IrType {\n  return property.isOptional ? { kind: \"union\", types: [property.type, UNDEFINED] } : property.type;\n}\n\n/**\n * `T[number]` for an array `T`, as the generator writes for an item of an array response: the\n * element type, readonly or not. A tuple's is the union of its elements, which is not modelled.\n */\nfunction arrayElement(type: IrType): IrType | null {\n  const list = type.kind === \"readonly\" ? type.type : type;\n  return list.kind === \"array\" ? list.element : null;\n}\n\n/** One property for two of the same name in an intersection. */\nfunction mergedProperty(\n  first: IrPropertySignature,\n  second: IrPropertySignature,\n): IrPropertySignature {\n  return {\n    ...first,\n    type: { kind: \"intersection\", types: [first.type, second.type] },\n    isOptional: first.isOptional && second.isOptional,\n    isReadonly: first.isReadonly || second.isReadonly,\n  };\n}\n\n/** Resolves types once each, for one comparison. */\nexport class TypeResolution {\n  private readonly lookup: DeclaredTypeLookup;\n  private readonly resolvedTypes = new Map<IrType, IrType>();\n\n  constructor(lookup: DeclaredTypeLookup) {\n    this.lookup = lookup;\n  }\n\n  /** The type a reference names, followed through references to references; computed once. */\n  resolved(type: IrType): IrType {\n    const known = this.resolvedTypes.get(type);\n    if (known !== undefined) {\n      return known;\n    }\n    // A type that reaches itself while it is resolved stays as it is written there.\n    this.resolvedTypes.set(type, type);\n    const seen = new Set<IrType>();\n    let current = type;\n    while (!seen.has(current)) {\n      seen.add(current);\n      const named = this.lookup(current) ?? this.indexedProperty(current);\n      if (named === null) {\n        break;\n      }\n      current = named;\n    }\n    const result = current.kind === \"intersection\" ? (this.merged(current) ?? current) : current;\n    this.resolvedTypes.set(type, result);\n    return result;\n  }\n\n  /**\n   * `T[\"key\"]` read from the object type `T` resolves to, which the lookup does not do for an\n   * object it reached through another lookup (`paths[\"/a/{id}\"][\"get\"]`). An optional property\n   * reads as `T | undefined`; `T[number]` is the element of the array `T`.\n   */\n  private indexedProperty(type: IrType): IrType | null {\n    if (type.kind !== \"indexedAccess\") {\n      return null;\n    }\n    const { index } = type;\n    if (index.kind === \"keyword\" && index.keyword === \"number\") {\n      return arrayElement(this.resolved(type.object));\n    }\n    const object = this.resolved(type.object);\n    if (index.kind !== \"stringLiteral\" || object.kind !== \"object\") {\n      return null;\n    }\n    const property = propertiesOf(object).get(index.value);\n    return property === undefined ? null : readType(property);\n  }\n\n  /**\n   * An intersection of object types as the one object TypeScript makes of it: a property in\n   * several parts has the intersection of their types, and is optional only when it is in each.\n   * Null when a part is no object type.\n   */\n  private merged(type: IrType): IrObjectType | null {\n    const parts = this.objectParts(type);\n    if (parts === null) {\n      return null;\n    }\n    const properties = new Map<string, IrPropertySignature>();\n    const indexes: IrIndexSignature[] = [];\n    for (const member of parts.flatMap((part) => part.members)) {\n      if (member.kind === \"indexSignature\") {\n        indexes.push(member);\n        continue;\n      }\n      const name = nameOf(member);\n      const other = properties.get(name);\n      properties.set(name, other === undefined ? member : mergedProperty(other, member));\n    }\n    return { kind: \"object\", members: [...properties.values(), ...indexes] };\n  }\n\n  /**\n   * The object types an intersection is made of, nested ones flattened; null for any other, and\n   * for an intersection that contains itself, which TypeScript does not merge either.\n   */\n  private objectParts(\n    type: IrType,\n    visiting: ReadonlySet<IrType> = new Set(),\n  ): IrObjectType[] | null {\n    if (type.kind === \"object\") {\n      return [type];\n    }\n    if (type.kind !== \"intersection\" || visiting.has(type)) {\n      return null;\n    }\n    const parts: IrObjectType[] = [];\n    for (const part of type.types) {\n      const objects = this.objectParts(this.resolved(part), new Set([...visiting, type]));\n      if (objects === null) {\n        return null;\n      }\n      parts.push(...objects);\n    }\n    return parts;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-resolution.mjs","sources":["../../../../src/application/transform/document/type-resolution.ts"],"sourcesContent":["import { appendAll } from \"../../../domain/append-all.js\";\nimport type {\n  IrIndexSignature,\n  IrMember,\n  IrObjectType,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport type { DeclaredTypeLookup } from \"./declared-types.js\";\n\n/**\n * The types the `--path-params-as-types` overlap check compares, as TypeScript sees them:\n * references followed to the declarations of the document, `T[\"key\"]` and `T[number]` read from\n * `T`, and an intersection of object types merged into one object.\n */\n\nconst UNDEFINED: IrType = { kind: \"keyword\", keyword: \"undefined\" };\n\nexport function nameOf(member: IrPropertySignature): string {\n  return member.name.kind === \"string\" ? member.name.value : member.name.text;\n}\n\nexport function propertiesOf(type: IrObjectType): Map<string, IrPropertySignature> {\n  const properties = type.members.filter(\n    (member: IrMember): member is IrPropertySignature => member.kind === \"property\",\n  );\n  return new Map(properties.map((property) => [nameOf(property), property]));\n}\n\nexport function indexSignaturesOf(type: IrObjectType): IrIndexSignature[] {\n  return type.members.filter(\n    (member: IrMember): member is IrIndexSignature => member.kind === \"indexSignature\",\n  );\n}\n\n/** The type read from a property: an optional one may be `undefined`. */\nexport function readType(property: IrPropertySignature): IrType {\n  return property.isOptional ? { kind: \"union\", types: [property.type, UNDEFINED] } : property.type;\n}\n\n/**\n * `T[number]` for an array `T`, as the generator writes for an item of an array response: the\n * element type, readonly or not. A tuple's is the union of its elements, which is not modelled.\n */\nfunction arrayElement(type: IrType): IrType | null {\n  const list = type.kind === \"readonly\" ? type.type : type;\n  return list.kind === \"array\" ? list.element : null;\n}\n\n/** One property for two of the same name in an intersection. */\nfunction mergedProperty(\n  first: IrPropertySignature,\n  second: IrPropertySignature,\n): IrPropertySignature {\n  return {\n    ...first,\n    type: { kind: \"intersection\", types: [first.type, second.type] },\n    isOptional: first.isOptional && second.isOptional,\n    isReadonly: first.isReadonly || second.isReadonly,\n  };\n}\n\n/** Resolves types once each, for one comparison. */\nexport class TypeResolution {\n  private readonly lookup: DeclaredTypeLookup;\n  private readonly resolvedTypes = new Map<IrType, IrType>();\n\n  constructor(lookup: DeclaredTypeLookup) {\n    this.lookup = lookup;\n  }\n\n  /** The type a reference names, followed through references to references; computed once. */\n  resolved(type: IrType): IrType {\n    const known = this.resolvedTypes.get(type);\n    if (known !== undefined) {\n      return known;\n    }\n    // A type that reaches itself while it is resolved stays as it is written there.\n    this.resolvedTypes.set(type, type);\n    const seen = new Set<IrType>();\n    let current = type;\n    while (!seen.has(current)) {\n      seen.add(current);\n      const named = this.lookup(current) ?? this.indexedProperty(current);\n      if (named === null) {\n        break;\n      }\n      current = named;\n    }\n    const result = current.kind === \"intersection\" ? (this.merged(current) ?? current) : current;\n    this.resolvedTypes.set(type, result);\n    return result;\n  }\n\n  /**\n   * `T[\"key\"]` read from the object type `T` resolves to, which the lookup does not do for an\n   * object it reached through another lookup (`paths[\"/a/{id}\"][\"get\"]`). An optional property\n   * reads as `T | undefined`; `T[number]` is the element of the array `T`.\n   */\n  private indexedProperty(type: IrType): IrType | null {\n    if (type.kind !== \"indexedAccess\") {\n      return null;\n    }\n    const { index } = type;\n    if (index.kind === \"keyword\" && index.keyword === \"number\") {\n      return arrayElement(this.resolved(type.object));\n    }\n    const object = this.resolved(type.object);\n    if (index.kind !== \"stringLiteral\" || object.kind !== \"object\") {\n      return null;\n    }\n    const property = propertiesOf(object).get(index.value);\n    return property === undefined ? null : readType(property);\n  }\n\n  /**\n   * An intersection of object types as the one object TypeScript makes of it: a property in\n   * several parts has the intersection of their types, and is optional only when it is in each.\n   * Null when a part is no object type.\n   */\n  private merged(type: IrType): IrObjectType | null {\n    const parts = this.objectParts(type);\n    if (parts === null) {\n      return null;\n    }\n    const properties = new Map<string, IrPropertySignature>();\n    const indexes: IrIndexSignature[] = [];\n    for (const member of parts.flatMap((part) => part.members)) {\n      if (member.kind === \"indexSignature\") {\n        indexes.push(member);\n        continue;\n      }\n      const name = nameOf(member);\n      const other = properties.get(name);\n      properties.set(name, other === undefined ? member : mergedProperty(other, member));\n    }\n    return { kind: \"object\", members: [...properties.values(), ...indexes] };\n  }\n\n  /**\n   * The object types an intersection is made of, nested ones flattened; null for any other, and\n   * for an intersection that contains itself, which TypeScript does not merge either.\n   */\n  private objectParts(\n    type: IrType,\n    visiting: ReadonlySet<IrType> = new Set(),\n  ): IrObjectType[] | null {\n    if (type.kind === \"object\") {\n      return [type];\n    }\n    if (type.kind !== \"intersection\" || visiting.has(type)) {\n      return null;\n    }\n    const parts: IrObjectType[] = [];\n    for (const part of type.types) {\n      const objects = this.objectParts(this.resolved(part), new Set([...visiting, type]));\n      if (objects === null) {\n        return null;\n      }\n      appendAll(parts, objects);\n    }\n    return parts;\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/application/transform/document/webhooks.cjs

@@ -4,16 +4,23 @@ const constructors = require('../../../domain/ir/constructors.cjs');
 const propertyName = require('../../../domain/ir/property-name.cjs');
 const jsonPointer = require('../../../domain/openapi/json-pointer.cjs');
 const documentEntries = require('../document-entries.cjs');
+const refType = require('../ref-type.cjs');
 const pathItem = require('./path-item.cjs');
 
 function webhooksType(webhooks, context) {
-  const members = documentEntries.documentEntries(webhooks, context.options).map(([name, pathItem$1]) => {
-    const location = { path: jsonPointer.createRef(["webhooks", name]) };
-    const type = pathItem.pathItemType(pathItem$1, location, context);
+  const members = documentEntries.documentEntries(webhooks, context.options).map(([name, pathItem]) => {
+    const type = webhookType(name, pathItem, context);
     return constructors.irProperty(propertyName.toPropertyName(name), type, { isReadonly: context.options.immutable });
   });
   return constructors.irObject(members);
 }
+function webhookType(name, pathItem$1, context) {
+  if (typeof pathItem$1 === "object" && pathItem$1 !== null && "$ref" in pathItem$1) {
+    return refType.refType(pathItem$1.$ref);
+  }
+  const location = { path: jsonPointer.appendPointer(jsonPointer.ROOT_POINTER, ["webhooks", name]) };
+  return pathItem.pathItemType(pathItem$1, location, context);
+}
 
 exports.webhooksType = webhooksType;
 //# sourceMappingURL=webhooks.cjs.map

package/dist/application/transform/document/webhooks.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.cjs","sources":["../../../../src/application/transform/document/webhooks.ts"],"sourcesContent":["import { irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { PathItemObject, PathsObject } from \"../../../domain/openapi/path-item-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { pathItemType } from \"./path-item.js\";\n\n/**\n * The `webhooks` interface body (OpenAPI 3.1 §4.8.1): one path item per webhook name. Unlike\n * `paths`, a `$ref` entry is read as a path item (so every method is `never`), as in the original,\n * and members carry no JSDoc.\n */\nexport function webhooksType(webhooks: PathsObject, context: TransformContext): IrType {\n  const members = documentEntries(webhooks, context.options).map(([name, pathItem]) => {\n    const location = { path: createRef([\"webhooks\", name]) };\n    const type = pathItemType(pathItem as PathItemObject, location, context);\n    return irProperty(toPropertyName(name), type, { isReadonly: context.options.immutable });\n  });\n  return irObject(members);\n}\n"],"names":["documentEntries","pathItem","createRef","pathItemType","irProperty","toPropertyName","irObject"],"mappings":";;;;;;;;AAcO,SAAS,YAAA,CAAa,UAAuB,OAAA,EAAmC;AACrF,EAAA,MAAM,OAAA,GAAUA,+BAAA,CAAgB,QAAA,EAAU,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAMC,UAAQ,CAAA,KAAM;AACnF,IAAA,MAAM,QAAA,GAAW,EAAE,IAAA,EAAMC,qBAAA,CAAU,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACvD,IAAA,MAAM,IAAA,GAAOC,qBAAA,CAAaF,UAAA,EAA4B,QAAA,EAAU,OAAO,CAAA;AACvE,IAAA,OAAOG,uBAAA,CAAWC,2BAAA,CAAe,IAAI,CAAA,EAAG,IAAA,EAAM,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACzF,CAAC,CAAA;AACD,EAAA,OAAOC,sBAAS,OAAO,CAAA;AACzB;;"}
+{"version":3,"file":"webhooks.cjs","sources":["../../../../src/application/transform/document/webhooks.ts"],"sourcesContent":["import { irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer, ROOT_POINTER } from \"../../../domain/openapi/json-pointer.js\";\nimport type { PathItemObject, PathsObject } from \"../../../domain/openapi/path-item-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { pathItemType } from \"./path-item.js\";\n\n/**\n * The `webhooks` interface body (OpenAPI 3.1 §4.8.1): one path item per webhook name. A `$ref`\n * entry (often to `components/pathItems`) is the type it points at, as in `paths`; the original\n * read it as a path item, so every method was `never`. Members carry no JSDoc.\n */\nexport function webhooksType(webhooks: PathsObject, context: TransformContext): IrType {\n  const members = documentEntries(webhooks, context.options).map(([name, pathItem]) => {\n    const type = webhookType(name, pathItem, context);\n    return irProperty(toPropertyName(name), type, { isReadonly: context.options.immutable });\n  });\n  return irObject(members);\n}\n\nfunction webhookType(\n  name: string,\n  pathItem: PathsObject[string],\n  context: TransformContext,\n): IrType {\n  // A document may hold any value here; one that is no object is read as a path item, as before.\n  if (typeof pathItem === \"object\" && pathItem !== null && \"$ref\" in pathItem) {\n    return refType(pathItem.$ref);\n  }\n  const location = { path: appendPointer(ROOT_POINTER, [\"webhooks\", name]) };\n  return pathItemType(pathItem as PathItemObject, location, context);\n}\n"],"names":["documentEntries","irProperty","toPropertyName","irObject","pathItem","refType","appendPointer","ROOT_POINTER","pathItemType"],"mappings":";;;;;;;;;AAeO,SAAS,YAAA,CAAa,UAAuB,OAAA,EAAmC;AACrF,EAAA,MAAM,OAAA,GAAUA,+BAAA,CAAgB,QAAA,EAAU,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAM,QAAQ,CAAA,KAAM;AACnF,IAAA,MAAM,IAAA,GAAO,WAAA,CAAY,IAAA,EAAM,QAAA,EAAU,OAAO,CAAA;AAChD,IAAA,OAAOC,uBAAA,CAAWC,2BAAA,CAAe,IAAI,CAAA,EAAG,IAAA,EAAM,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACzF,CAAC,CAAA;AACD,EAAA,OAAOC,sBAAS,OAAO,CAAA;AACzB;AAEA,SAAS,WAAA,CACP,IAAA,EACAC,UAAA,EACA,OAAA,EACQ;AAER,EAAA,IAAI,OAAOA,UAAA,KAAa,QAAA,IAAYA,UAAA,KAAa,IAAA,IAAQ,UAAUA,UAAA,EAAU;AAC3E,IAAA,OAAOC,eAAA,CAAQD,WAAS,IAAI,CAAA;AAAA,EAC9B;AACA,EAAA,MAAM,QAAA,GAAW,EAAE,IAAA,EAAME,yBAAA,CAAcC,0BAAc,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACzE,EAAA,OAAOC,qBAAA,CAAaJ,UAAA,EAA4B,QAAA,EAAU,OAAO,CAAA;AACnE;;"}

package/dist/application/transform/document/webhooks.mjs

@@ -1,17 +1,24 @@
 import { irProperty, irObject } from '../../../domain/ir/constructors.mjs';
 import { toPropertyName } from '../../../domain/ir/property-name.mjs';
-import { createRef } from '../../../domain/openapi/json-pointer.mjs';
+import { appendPointer, ROOT_POINTER } from '../../../domain/openapi/json-pointer.mjs';
 import { documentEntries } from '../document-entries.mjs';
+import { refType } from '../ref-type.mjs';
 import { pathItemType } from './path-item.mjs';
 
 function webhooksType(webhooks, context) {
   const members = documentEntries(webhooks, context.options).map(([name, pathItem]) => {
-    const location = { path: createRef(["webhooks", name]) };
-    const type = pathItemType(pathItem, location, context);
+    const type = webhookType(name, pathItem, context);
     return irProperty(toPropertyName(name), type, { isReadonly: context.options.immutable });
   });
   return irObject(members);
 }
+function webhookType(name, pathItem, context) {
+  if (typeof pathItem === "object" && pathItem !== null && "$ref" in pathItem) {
+    return refType(pathItem.$ref);
+  }
+  const location = { path: appendPointer(ROOT_POINTER, ["webhooks", name]) };
+  return pathItemType(pathItem, location, context);
+}
 
 export { webhooksType };
 //# sourceMappingURL=webhooks.mjs.map

package/dist/application/transform/document/webhooks.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.mjs","sources":["../../../../src/application/transform/document/webhooks.ts"],"sourcesContent":["import { irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { PathItemObject, PathsObject } from \"../../../domain/openapi/path-item-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { pathItemType } from \"./path-item.js\";\n\n/**\n * The `webhooks` interface body (OpenAPI 3.1 §4.8.1): one path item per webhook name. Unlike\n * `paths`, a `$ref` entry is read as a path item (so every method is `never`), as in the original,\n * and members carry no JSDoc.\n */\nexport function webhooksType(webhooks: PathsObject, context: TransformContext): IrType {\n  const members = documentEntries(webhooks, context.options).map(([name, pathItem]) => {\n    const location = { path: createRef([\"webhooks\", name]) };\n    const type = pathItemType(pathItem as PathItemObject, location, context);\n    return irProperty(toPropertyName(name), type, { isReadonly: context.options.immutable });\n  });\n  return irObject(members);\n}\n"],"names":[],"mappings":";;;;;;AAcO,SAAS,YAAA,CAAa,UAAuB,OAAA,EAAmC;AACrF,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,QAAA,EAAU,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAM,QAAQ,CAAA,KAAM;AACnF,IAAA,MAAM,QAAA,GAAW,EAAE,IAAA,EAAM,SAAA,CAAU,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACvD,IAAA,MAAM,IAAA,GAAO,YAAA,CAAa,QAAA,EAA4B,QAAA,EAAU,OAAO,CAAA;AACvE,IAAA,OAAO,UAAA,CAAW,cAAA,CAAe,IAAI,CAAA,EAAG,IAAA,EAAM,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACzF,CAAC,CAAA;AACD,EAAA,OAAO,SAAS,OAAO,CAAA;AACzB;;"}
+{"version":3,"file":"webhooks.mjs","sources":["../../../../src/application/transform/document/webhooks.ts"],"sourcesContent":["import { irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer, ROOT_POINTER } from \"../../../domain/openapi/json-pointer.js\";\nimport type { PathItemObject, PathsObject } from \"../../../domain/openapi/path-item-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { pathItemType } from \"./path-item.js\";\n\n/**\n * The `webhooks` interface body (OpenAPI 3.1 §4.8.1): one path item per webhook name. A `$ref`\n * entry (often to `components/pathItems`) is the type it points at, as in `paths`; the original\n * read it as a path item, so every method was `never`. Members carry no JSDoc.\n */\nexport function webhooksType(webhooks: PathsObject, context: TransformContext): IrType {\n  const members = documentEntries(webhooks, context.options).map(([name, pathItem]) => {\n    const type = webhookType(name, pathItem, context);\n    return irProperty(toPropertyName(name), type, { isReadonly: context.options.immutable });\n  });\n  return irObject(members);\n}\n\nfunction webhookType(\n  name: string,\n  pathItem: PathsObject[string],\n  context: TransformContext,\n): IrType {\n  // A document may hold any value here; one that is no object is read as a path item, as before.\n  if (typeof pathItem === \"object\" && pathItem !== null && \"$ref\" in pathItem) {\n    return refType(pathItem.$ref);\n  }\n  const location = { path: appendPointer(ROOT_POINTER, [\"webhooks\", name]) };\n  return pathItemType(pathItem as PathItemObject, location, context);\n}\n"],"names":[],"mappings":";;;;;;;AAeO,SAAS,YAAA,CAAa,UAAuB,OAAA,EAAmC;AACrF,EAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,QAAA,EAAU,OAAA,CAAQ,OAAO,CAAA,CAAE,GAAA,CAAI,CAAC,CAAC,IAAA,EAAM,QAAQ,CAAA,KAAM;AACnF,IAAA,MAAM,IAAA,GAAO,WAAA,CAAY,IAAA,EAAM,QAAA,EAAU,OAAO,CAAA;AAChD,IAAA,OAAO,UAAA,CAAW,cAAA,CAAe,IAAI,CAAA,EAAG,IAAA,EAAM,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EACzF,CAAC,CAAA;AACD,EAAA,OAAO,SAAS,OAAO,CAAA;AACzB;AAEA,SAAS,WAAA,CACP,IAAA,EACA,QAAA,EACA,OAAA,EACQ;AAER,EAAA,IAAI,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,KAAa,IAAA,IAAQ,UAAU,QAAA,EAAU;AAC3E,IAAA,OAAO,OAAA,CAAQ,SAAS,IAAI,CAAA;AAAA,EAC9B;AACA,EAAA,MAAM,QAAA,GAAW,EAAE,IAAA,EAAM,aAAA,CAAc,cAAc,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACzE,EAAA,OAAO,YAAA,CAAa,QAAA,EAA4B,QAAA,EAAU,OAAO,CAAA;AACnE;;"}

package/dist/application/transform/footer/document-footer.cjs

@@ -2,11 +2,16 @@
 
 const constructors = require('../../../domain/ir/constructors.cjs');
 const helperTypes = require('../helper-types.cjs');
+const enumNameClaims = require('./enum-name-claims.cjs');
 const enumNaming = require('./enum-naming.cjs');
+const operationKeys = require('./operation-keys.cjs');
 const sharedEnumNames = require('./shared-enum-names.cjs');
 
 function dedupeKey(request) {
-  return [...request.values].sort(compareAsStrings).map((value, index) => metadataKey(String(value), request.metadata[index])).join(",");
+  const sorted = [...request.values].sort(compareAsStrings);
+  const originalPairs = sorted.map((value, index) => memberKey(value, request.metadata[index]));
+  const ownPairs = request.values.map((value, index) => ({ value, member: memberKey(value, request.metadata[index]) })).sort((left, right) => compareAsStrings(left.value, right.value)).map(({ member }) => member);
+  return JSON.stringify([originalPairs, ownPairs]);
 }
 function compareAsStrings(left, right) {
   const leftText = String(left);
@@ -16,8 +21,8 @@ function compareAsStrings(left, right) {
   }
   return leftText < rightText ? -1 : 1;
 }
-function metadataKey(value, metadata) {
-  return `${metadata?.name ?? value}:${metadata?.description || ""}`;
+function memberKey(value, metadata) {
+  return [value, metadata?.name ?? null, metadata?.description || null];
 }
 const ENUM_VALUES_NUMBER_SEPARATOR = "_";
 function declarationKey(name, request) {
@@ -39,19 +44,22 @@ class RunFooter {
   sink;
   isDedupingEnums;
   sharedNames;
-  constructor(sink, isDedupingEnums, sharedNames = sharedEnumNames.FIRST_SCHEMA_NAMES) {
+  names;
+  constructor(sink, isDedupingEnums, sharedNames = sharedEnumNames.FIRST_SCHEMA_NAMES, names = { enums: new enumNameClaims.EnumNameClaims(), operations: new operationKeys.OperationKeys() }) {
     this.sink = sink;
     this.isDedupingEnums = isDedupingEnums;
     this.sharedNames = sharedNames;
+    this.names = names;
   }
   addEnum(request) {
     const ownName = this.naming.enumName(request.name);
     const key = this.isDedupingEnums ? dedupeKey(request) : null;
-    const name = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);
+    const sharedName = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);
     const known = key === null ? void 0 : this.enumNamesByKey.get(key);
     if (known !== void 0) {
       return known;
     }
+    const name = this.names.enums.nameFor(sharedName, request.name);
     const declared = request.values.length > 0 ? declarationKey(name, request) : null;
     if (declared !== null && this.declaredEnums.has(declared)) {
       return name;
@@ -136,6 +144,9 @@ class RunFooter {
   addOperation(build) {
     this.sink.addOperation(build);
   }
+  operationKey(operationId) {
+    return this.names.operations.keyFor(operationId);
+  }
   require(helper) {
     if (!this.sink.hasTypeAlias(helper.name)) {
       this.sink.add({ kind: "rawDeclaration", name: helper.name, text: helper.text });