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

package/dist/application/transform/document/referenced-parameter.mjs

@@ -0,0 +1,78 @@
+import { irReference } from '../../../domain/ir/constructors.mjs';
+import { ROOT_POINTER, parseRefPointer, appendPointer } from '../../../domain/openapi/json-pointer.mjs';
+import { QUERYSTRING_LOCATION } from '../../../domain/openapi/parameter-object.mjs';
+import { HTTP_METHODS, QUERY_METHOD, ADDITIONAL_OPERATIONS_KEY } from '../../../domain/openapi/path-item-object.mjs';
+import { refType, indexBy } from '../ref-type.mjs';
+import { parameterEntries, mergedParameters } from './parameter-entries.mjs';
+
+const INDEX_RE = /^\d+$/;
+const OPERATION_KEYS = /* @__PURE__ */ new Set([...HTTP_METHODS, QUERY_METHOD]);
+function listPointerOf(ref) {
+  if (!ref.startsWith(`${ROOT_POINTER}/`)) {
+    return null;
+  }
+  const [root, ...segments] = parseRefPointer(ref);
+  const [list, position] = segments.slice(-2);
+  const isList = list === "parameters" && position !== void 0 && INDEX_RE.test(position);
+  return root !== void 0 && isList ? { root, owner: segments.slice(0, -2) } : null;
+}
+function pointerTo(root, segments) {
+  return appendPointer(ROOT_POINTER, [root, ...segments]);
+}
+function isPathItemAt(root, segments) {
+  const isNamedRoot = root === "paths" || root === "webhooks";
+  return isNamedRoot && segments.length === 1 || root === "components" && segments[0] === "pathItems" && segments.length === 2;
+}
+function pathItemOfOperation(root, owner) {
+  const method = owner.at(-1) ?? "";
+  if (OPERATION_KEYS.has(method) && isPathItemAt(root, owner.slice(0, -1))) {
+    return owner.slice(0, -1);
+  }
+  const isAdditional = owner.at(-2) === ADDITIONAL_OPERATIONS_KEY;
+  return isAdditional && isPathItemAt(root, owner.slice(0, -2)) ? owner.slice(0, -2) : null;
+}
+function documentNode(refs, root, segments) {
+  const node = refs.resolve(pointerTo(root, segments));
+  const isTypedHere = typeof node === "object" && node !== null && !("$ref" in node);
+  return isTypedHere ? node : null;
+}
+function typedParameters(pointer, refs) {
+  const { root, owner } = pointer;
+  if (isPathItemAt(root, owner)) {
+    return documentNode(refs, root, owner)?.parameters ?? null;
+  }
+  const pathItemSegments = pathItemOfOperation(root, owner);
+  const pathItem = pathItemSegments && documentNode(refs, root, pathItemSegments);
+  const operation = pathItem && documentNode(refs, root, owner);
+  return pathItem && operation ? mergedParameters(pathItem, operation, refs) : null;
+}
+function isLocationOptional(entries, location) {
+  return entries.filter((entry) => entry.resolved?.in === location).every((entry) => location !== "path" && !entry.resolved?.required);
+}
+function correctedType(listType, entries, parameter) {
+  if (parameter.in === QUERYSTRING_LOCATION) {
+    const isTyped = !entries.some((entry) => entry.resolved?.in === "query");
+    return isTyped ? indexBy(listType, "query") : null;
+  }
+  if (!isLocationOptional(entries, parameter.in)) {
+    return null;
+  }
+  const location = irReference("NonNullable", [indexBy(listType, parameter.in)]);
+  return indexBy(location, parameter.name);
+}
+function referencedParameterType(ref, resolved, context) {
+  if (resolved.$ref) {
+    return refType(ref, { parameter: null });
+  }
+  const original = refType(ref, { parameter: { in: resolved.in, name: resolved.name } });
+  const pointer = listPointerOf(ref);
+  const parameters = pointer && typedParameters(pointer, context.refs);
+  if (pointer === null || parameters === null) {
+    return original;
+  }
+  const listType = refType(pointerTo(pointer.root, [...pointer.owner, "parameters"]));
+  return correctedType(listType, parameterEntries(parameters, context), resolved) ?? original;
+}
+
+export { referencedParameterType };
+//# sourceMappingURL=referenced-parameter.mjs.map

package/dist/application/transform/document/referenced-parameter.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"referenced-parameter.mjs","sources":["../../../../src/application/transform/document/referenced-parameter.ts"],"sourcesContent":["import { irReference } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport {\n  appendPointer,\n  parseRefPointer,\n  ROOT_POINTER,\n} from \"../../../domain/openapi/json-pointer.js\";\nimport type { OperationObject } from \"../../../domain/openapi/operation-object.js\";\nimport {\n  type ParameterObject,\n  type ParameterOrReference,\n  QUERYSTRING_LOCATION,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport {\n  ADDITIONAL_OPERATIONS_KEY,\n  HTTP_METHODS,\n  type PathItemObject,\n  QUERY_METHOD,\n} from \"../../../domain/openapi/path-item-object.js\";\nimport { indexBy, refType } from \"../ref-type.js\";\nimport type { RefResolver } from \"../schema/schema-context.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { mergedParameters, type ParameterEntry, parameterEntries } from \"./parameter-entries.js\";\n\n/**\n * The type of a parameter `$ref`. The original indexed the parameter's location and name\n * (`refType`): `#/paths/~1a/get/parameters/0` gave\n * `paths[\"/a\"][\"get\"][\"parameters\"][\"query\"][\"q\"]`.\n * Where the generated type differs, that does not compile, and only there it changes:\n *\n * - A location whose parameters are all optional is an optional member (`query?:`), so indexing it\n *   fails (TS2339); it is wrapped in `NonNullable` before the name is indexed.\n * - An OpenAPI 3.2 `in: querystring` parameter is the whole `query` member (ADR-020), not a member\n *   `querystring`, so the pointer reads `[\"query\"]`.\n *\n * A `$ref` to a component parameter, or into a list the generator types elsewhere (a `$ref` path\n * item or operation, a callback), keeps the original type.\n */\n\nconst INDEX_RE = /^\\d+$/;\nconst OPERATION_KEYS: ReadonlySet<string> = new Set([...HTTP_METHODS, QUERY_METHOD]);\n\n/** A `parameters/N` pointer, split into its root and the segments of the list's owner. */\ninterface ParameterListPointer {\n  readonly root: string;\n  readonly owner: readonly string[];\n}\n\nfunction listPointerOf(ref: string): ParameterListPointer | null {\n  if (!ref.startsWith(`${ROOT_POINTER}/`)) {\n    return null;\n  }\n  const [root, ...segments] = parseRefPointer(ref);\n  const [list, position] = segments.slice(-2);\n  const isList = list === \"parameters\" && position !== undefined && INDEX_RE.test(position);\n  return root !== undefined && isList ? { root, owner: segments.slice(0, -2) } : null;\n}\n\nfunction pointerTo(root: string, segments: readonly string[]): string {\n  return appendPointer(ROOT_POINTER, [root, ...segments]);\n}\n\n/** Whether the segments name a path item that `pathItemType` types in place. */\nfunction isPathItemAt(root: string, segments: readonly string[]): boolean {\n  const isNamedRoot = root === \"paths\" || root === \"webhooks\";\n  return (\n    (isNamedRoot && segments.length === 1) ||\n    (root === \"components\" && segments[0] === \"pathItems\" && segments.length === 2)\n  );\n}\n\n/** The segments of the path item that holds the operation at `owner`, or null. */\nfunction pathItemOfOperation(root: string, owner: readonly string[]): readonly string[] | null {\n  const method = owner.at(-1) ?? \"\";\n  if (OPERATION_KEYS.has(method) && isPathItemAt(root, owner.slice(0, -1))) {\n    return owner.slice(0, -1);\n  }\n  const isAdditional = owner.at(-2) === ADDITIONAL_OPERATIONS_KEY;\n  return isAdditional && isPathItemAt(root, owner.slice(0, -2)) ? owner.slice(0, -2) : null;\n}\n\nfunction documentNode<T>(refs: RefResolver, root: string, segments: readonly string[]): T | null {\n  const node = refs.resolve(pointerTo(root, segments));\n  const isTypedHere = typeof node === \"object\" && node !== null && !(\"$ref\" in node);\n  return isTypedHere ? (node as T) : null;\n}\n\n/** The parameters the generator types at the list's owner; null where it types them elsewhere. */\nfunction typedParameters(\n  pointer: ParameterListPointer,\n  refs: RefResolver,\n): readonly ParameterOrReference[] | null {\n  const { root, owner } = pointer;\n  if (isPathItemAt(root, owner)) {\n    return documentNode<PathItemObject>(refs, root, owner)?.parameters ?? null;\n  }\n  const pathItemSegments = pathItemOfOperation(root, owner);\n  const pathItem = pathItemSegments && documentNode<PathItemObject>(refs, root, pathItemSegments);\n  const operation = pathItem && documentNode<OperationObject>(refs, root, owner);\n  return pathItem && operation ? mergedParameters(pathItem, operation, refs) : null;\n}\n\n/** A location member is optional when none of its parameters is required (`locationParts`). */\nfunction isLocationOptional(entries: readonly ParameterEntry[], location: string): boolean {\n  return entries\n    .filter((entry) => entry.resolved?.in === location)\n    .every((entry) => location !== \"path\" && !entry.resolved?.required);\n}\n\n/** The corrected type, or null where the original type compiles or no correction applies. */\nfunction correctedType(\n  listType: IrType,\n  entries: readonly ParameterEntry[],\n  parameter: ParameterObject,\n): IrType | null {\n  if (parameter.in === QUERYSTRING_LOCATION) {\n    // Next to `in: query` parameters it is not in the generated types (QUERYSTRING_NEXT_TO_QUERY).\n    const isTyped = !entries.some((entry) => entry.resolved?.in === \"query\");\n    return isTyped ? indexBy(listType, \"query\") : null;\n  }\n  if (!isLocationOptional(entries, parameter.in)) {\n    return null;\n  }\n  const location = irReference(\"NonNullable\", [indexBy(listType, parameter.in)]);\n  return indexBy(location, parameter.name);\n}\n\n/** The type of a parameter `$ref` whose target resolved to `resolved`; see the module comment. */\nexport function referencedParameterType(\n  ref: string,\n  resolved: ParameterObject,\n  context: TransformContext,\n): IrType {\n  // A `$ref` that resolves to another `$ref` is not a parameter object yet: index it as a path.\n  if ((resolved as { $ref?: unknown }).$ref) {\n    return refType(ref, { parameter: null });\n  }\n  const original = refType(ref, { parameter: { in: resolved.in, name: resolved.name } });\n  const pointer = listPointerOf(ref);\n  const parameters = pointer && typedParameters(pointer, context.refs);\n  if (pointer === null || parameters === null) {\n    return original;\n  }\n  const listType = refType(pointerTo(pointer.root, [...pointer.owner, \"parameters\"]));\n  return correctedType(listType, parameterEntries(parameters, context), resolved) ?? original;\n}\n"],"names":[],"mappings":"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"}

package/dist/application/transform/document/request-body.cjs

@@ -11,7 +11,7 @@ const ANY_MEDIA_TYPE = "*/*";
 function contentMembers(requestBody, location, context) {
   const entries = documentEntries.documentEntries(requestBody.content ?? {}, context.options);
   return entries.map(([contentType, entry]) => {
-    const path = jsonPointer.createRef([location.path, "content", contentType]);
+    const path = jsonPointer.appendPointer(location.path, ["content", contentType]);
     const type = mediaType.contentEntryType(entry, { ...location, path }, context);
     return documentMember.documentMember(contentType, type, entry, { isReadonly: context.options.immutable });
   });

package/dist/application/transform/document/request-body.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"request-body.cjs","sources":["../../../../src/application/transform/document/request-body.ts"],"sourcesContent":["import { irKeyword, irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { RequestBodyObject } from \"../../../domain/openapi/request-body-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { contentEntryType, itemContentMember } from \"./media-type.js\";\n\n/** Stands in for the media types of a body that defines none: `\"*\\/*\"?: never`. */\nconst ANY_MEDIA_TYPE = \"*/*\";\n\nfunction contentMembers(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrMember[] {\n  const entries = documentEntries(requestBody.content ?? {}, context.options);\n  return entries.map(([contentType, entry]) => {\n    const path = createRef([location.path, \"content\", contentType]);\n    const type = contentEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n}\n\n/**\n * A request body (OpenAPI 3.2 §4.8.13): `{ content: { [mediaType]: T } }`, and `itemContent` when a\n * media type has an `itemSchema`.\n */\nexport function requestBodyType(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = contentMembers(requestBody, location, context);\n  // The placeholder is never readonly, even with --immutable, as in the original.\n  const placeholder = irProperty(toPropertyName(ANY_MEDIA_TYPE), irKeyword(\"never\"), {\n    isOptional: true,\n  });\n  const content = irObject(members.length > 0 ? members : [placeholder]);\n  const isReadonly = context.options.immutable;\n  const itemContent = itemContentMember(requestBody.content ?? {}, location, context, {\n    isReadonly,\n  });\n  return irObject([\n    irProperty(toPropertyName(\"content\"), content, { isReadonly }),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":["documentEntries","createRef","contentEntryType","documentMember","irProperty","toPropertyName","irKeyword","irObject","itemContentMember"],"mappings":";;;;;;;;;AAWA,MAAM,cAAA,GAAiB,KAAA;AAEvB,SAAS,cAAA,CACP,WAAA,EACA,QAAA,EACA,OAAA,EACY;AACZ,EAAA,MAAM,UAAUA,+BAAA,CAAgB,WAAA,CAAY,WAAW,EAAC,EAAG,QAAQ,OAAO,CAAA;AAC1E,EAAA,OAAO,QAAQ,GAAA,CAAI,CAAC,CAAC,WAAA,EAAa,KAAK,CAAA,KAAM;AAC3C,IAAA,MAAM,OAAOC,qBAAA,CAAU,CAAC,SAAS,IAAA,EAAM,SAAA,EAAW,WAAW,CAAC,CAAA;AAC9D,IAAA,MAAM,IAAA,GAAOC,2BAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AACnE,IAAA,OAAOC,6BAAA,CAAe,aAAa,IAAA,EAAM,KAAA,EAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EAC3F,CAAC,CAAA;AACH;AAMO,SAAS,eAAA,CACd,WAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,cAAA,CAAe,WAAA,EAAa,QAAA,EAAU,OAAO,CAAA;AAE7D,EAAA,MAAM,cAAcC,uBAAA,CAAWC,2BAAA,CAAe,cAAc,CAAA,EAAGC,sBAAA,CAAU,OAAO,CAAA,EAAG;AAAA,IACjF,UAAA,EAAY;AAAA,GACb,CAAA;AACD,EAAA,MAAM,OAAA,GAAUC,sBAAS,OAAA,CAAQ,MAAA,GAAS,IAAI,OAAA,GAAU,CAAC,WAAW,CAAC,CAAA;AACrE,EAAA,MAAM,UAAA,GAAa,QAAQ,OAAA,CAAQ,SAAA;AACnC,EAAA,MAAM,cAAcC,2BAAA,CAAkB,WAAA,CAAY,WAAW,EAAC,EAAG,UAAU,OAAA,EAAS;AAAA,IAClF;AAAA,GACD,CAAA;AACD,EAAA,OAAOD,qBAAA,CAAS;AAAA,IACdH,wBAAWC,2BAAA,CAAe,SAAS,GAAG,OAAA,EAAS,EAAE,YAAY,CAAA;AAAA,IAC7D,GAAI,WAAA,GAAc,CAAC,WAAW,IAAI;AAAC,GACpC,CAAA;AACH;;"}
+{"version":3,"file":"request-body.cjs","sources":["../../../../src/application/transform/document/request-body.ts"],"sourcesContent":["import { irKeyword, irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { RequestBodyObject } from \"../../../domain/openapi/request-body-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { contentEntryType, itemContentMember } from \"./media-type.js\";\n\n/** Stands in for the media types of a body that defines none: `\"*\\/*\"?: never`. */\nconst ANY_MEDIA_TYPE = \"*/*\";\n\nfunction contentMembers(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrMember[] {\n  const entries = documentEntries(requestBody.content ?? {}, context.options);\n  return entries.map(([contentType, entry]) => {\n    const path = appendPointer(location.path, [\"content\", contentType]);\n    const type = contentEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n}\n\n/**\n * A request body (OpenAPI 3.2 §4.8.13): `{ content: { [mediaType]: T } }`, and `itemContent` when a\n * media type has an `itemSchema`.\n */\nexport function requestBodyType(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = contentMembers(requestBody, location, context);\n  // The placeholder is never readonly, even with --immutable, as in the original.\n  const placeholder = irProperty(toPropertyName(ANY_MEDIA_TYPE), irKeyword(\"never\"), {\n    isOptional: true,\n  });\n  const content = irObject(members.length > 0 ? members : [placeholder]);\n  const isReadonly = context.options.immutable;\n  const itemContent = itemContentMember(requestBody.content ?? {}, location, context, {\n    isReadonly,\n  });\n  return irObject([\n    irProperty(toPropertyName(\"content\"), content, { isReadonly }),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":["documentEntries","appendPointer","contentEntryType","documentMember","irProperty","toPropertyName","irKeyword","irObject","itemContentMember"],"mappings":";;;;;;;;;AAWA,MAAM,cAAA,GAAiB,KAAA;AAEvB,SAAS,cAAA,CACP,WAAA,EACA,QAAA,EACA,OAAA,EACY;AACZ,EAAA,MAAM,UAAUA,+BAAA,CAAgB,WAAA,CAAY,WAAW,EAAC,EAAG,QAAQ,OAAO,CAAA;AAC1E,EAAA,OAAO,QAAQ,GAAA,CAAI,CAAC,CAAC,WAAA,EAAa,KAAK,CAAA,KAAM;AAC3C,IAAA,MAAM,OAAOC,yBAAA,CAAc,QAAA,CAAS,MAAM,CAAC,SAAA,EAAW,WAAW,CAAC,CAAA;AAClE,IAAA,MAAM,IAAA,GAAOC,2BAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AACnE,IAAA,OAAOC,6BAAA,CAAe,aAAa,IAAA,EAAM,KAAA,EAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EAC3F,CAAC,CAAA;AACH;AAMO,SAAS,eAAA,CACd,WAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,cAAA,CAAe,WAAA,EAAa,QAAA,EAAU,OAAO,CAAA;AAE7D,EAAA,MAAM,cAAcC,uBAAA,CAAWC,2BAAA,CAAe,cAAc,CAAA,EAAGC,sBAAA,CAAU,OAAO,CAAA,EAAG;AAAA,IACjF,UAAA,EAAY;AAAA,GACb,CAAA;AACD,EAAA,MAAM,OAAA,GAAUC,sBAAS,OAAA,CAAQ,MAAA,GAAS,IAAI,OAAA,GAAU,CAAC,WAAW,CAAC,CAAA;AACrE,EAAA,MAAM,UAAA,GAAa,QAAQ,OAAA,CAAQ,SAAA;AACnC,EAAA,MAAM,cAAcC,2BAAA,CAAkB,WAAA,CAAY,WAAW,EAAC,EAAG,UAAU,OAAA,EAAS;AAAA,IAClF;AAAA,GACD,CAAA;AACD,EAAA,OAAOD,qBAAA,CAAS;AAAA,IACdH,wBAAWC,2BAAA,CAAe,SAAS,GAAG,OAAA,EAAS,EAAE,YAAY,CAAA;AAAA,IAC7D,GAAI,WAAA,GAAc,CAAC,WAAW,IAAI;AAAC,GACpC,CAAA;AACH;;"}

package/dist/application/transform/document/request-body.mjs

@@ -1,6 +1,6 @@
 import { irProperty, irKeyword, irObject } from '../../../domain/ir/constructors.mjs';
 import { toPropertyName } from '../../../domain/ir/property-name.mjs';
-import { createRef } from '../../../domain/openapi/json-pointer.mjs';
+import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
 import { documentEntries } from '../document-entries.mjs';
 import { documentMember } from './document-member.mjs';
 import { itemContentMember, contentEntryType } from './media-type.mjs';
@@ -9,7 +9,7 @@ const ANY_MEDIA_TYPE = "*/*";
 function contentMembers(requestBody, location, context) {
   const entries = documentEntries(requestBody.content ?? {}, context.options);
   return entries.map(([contentType, entry]) => {
-    const path = createRef([location.path, "content", contentType]);
+    const path = appendPointer(location.path, ["content", contentType]);
     const type = contentEntryType(entry, { ...location, path }, context);
     return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });
   });

package/dist/application/transform/document/request-body.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"request-body.mjs","sources":["../../../../src/application/transform/document/request-body.ts"],"sourcesContent":["import { irKeyword, irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { RequestBodyObject } from \"../../../domain/openapi/request-body-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { contentEntryType, itemContentMember } from \"./media-type.js\";\n\n/** Stands in for the media types of a body that defines none: `\"*\\/*\"?: never`. */\nconst ANY_MEDIA_TYPE = \"*/*\";\n\nfunction contentMembers(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrMember[] {\n  const entries = documentEntries(requestBody.content ?? {}, context.options);\n  return entries.map(([contentType, entry]) => {\n    const path = createRef([location.path, \"content\", contentType]);\n    const type = contentEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n}\n\n/**\n * A request body (OpenAPI 3.2 §4.8.13): `{ content: { [mediaType]: T } }`, and `itemContent` when a\n * media type has an `itemSchema`.\n */\nexport function requestBodyType(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = contentMembers(requestBody, location, context);\n  // The placeholder is never readonly, even with --immutable, as in the original.\n  const placeholder = irProperty(toPropertyName(ANY_MEDIA_TYPE), irKeyword(\"never\"), {\n    isOptional: true,\n  });\n  const content = irObject(members.length > 0 ? members : [placeholder]);\n  const isReadonly = context.options.immutable;\n  const itemContent = itemContentMember(requestBody.content ?? {}, location, context, {\n    isReadonly,\n  });\n  return irObject([\n    irProperty(toPropertyName(\"content\"), content, { isReadonly }),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":[],"mappings":";;;;;;;AAWA,MAAM,cAAA,GAAiB,KAAA;AAEvB,SAAS,cAAA,CACP,WAAA,EACA,QAAA,EACA,OAAA,EACY;AACZ,EAAA,MAAM,UAAU,eAAA,CAAgB,WAAA,CAAY,WAAW,EAAC,EAAG,QAAQ,OAAO,CAAA;AAC1E,EAAA,OAAO,QAAQ,GAAA,CAAI,CAAC,CAAC,WAAA,EAAa,KAAK,CAAA,KAAM;AAC3C,IAAA,MAAM,OAAO,SAAA,CAAU,CAAC,SAAS,IAAA,EAAM,SAAA,EAAW,WAAW,CAAC,CAAA;AAC9D,IAAA,MAAM,IAAA,GAAO,iBAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AACnE,IAAA,OAAO,cAAA,CAAe,aAAa,IAAA,EAAM,KAAA,EAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EAC3F,CAAC,CAAA;AACH;AAMO,SAAS,eAAA,CACd,WAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,cAAA,CAAe,WAAA,EAAa,QAAA,EAAU,OAAO,CAAA;AAE7D,EAAA,MAAM,cAAc,UAAA,CAAW,cAAA,CAAe,cAAc,CAAA,EAAG,SAAA,CAAU,OAAO,CAAA,EAAG;AAAA,IACjF,UAAA,EAAY;AAAA,GACb,CAAA;AACD,EAAA,MAAM,OAAA,GAAU,SAAS,OAAA,CAAQ,MAAA,GAAS,IAAI,OAAA,GAAU,CAAC,WAAW,CAAC,CAAA;AACrE,EAAA,MAAM,UAAA,GAAa,QAAQ,OAAA,CAAQ,SAAA;AACnC,EAAA,MAAM,cAAc,iBAAA,CAAkB,WAAA,CAAY,WAAW,EAAC,EAAG,UAAU,OAAA,EAAS;AAAA,IAClF;AAAA,GACD,CAAA;AACD,EAAA,OAAO,QAAA,CAAS;AAAA,IACd,WAAW,cAAA,CAAe,SAAS,GAAG,OAAA,EAAS,EAAE,YAAY,CAAA;AAAA,IAC7D,GAAI,WAAA,GAAc,CAAC,WAAW,IAAI;AAAC,GACpC,CAAA;AACH;;"}
+{"version":3,"file":"request-body.mjs","sources":["../../../../src/application/transform/document/request-body.ts"],"sourcesContent":["import { irKeyword, irObject, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { RequestBodyObject } from \"../../../domain/openapi/request-body-object.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { contentEntryType, itemContentMember } from \"./media-type.js\";\n\n/** Stands in for the media types of a body that defines none: `\"*\\/*\"?: never`. */\nconst ANY_MEDIA_TYPE = \"*/*\";\n\nfunction contentMembers(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrMember[] {\n  const entries = documentEntries(requestBody.content ?? {}, context.options);\n  return entries.map(([contentType, entry]) => {\n    const path = appendPointer(location.path, [\"content\", contentType]);\n    const type = contentEntryType(entry, { ...location, path }, context);\n    return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });\n  });\n}\n\n/**\n * A request body (OpenAPI 3.2 §4.8.13): `{ content: { [mediaType]: T } }`, and `itemContent` when a\n * media type has an `itemSchema`.\n */\nexport function requestBodyType(\n  requestBody: RequestBodyObject,\n  location: SchemaLocation,\n  context: SchemaContext,\n): IrType {\n  const members = contentMembers(requestBody, location, context);\n  // The placeholder is never readonly, even with --immutable, as in the original.\n  const placeholder = irProperty(toPropertyName(ANY_MEDIA_TYPE), irKeyword(\"never\"), {\n    isOptional: true,\n  });\n  const content = irObject(members.length > 0 ? members : [placeholder]);\n  const isReadonly = context.options.immutable;\n  const itemContent = itemContentMember(requestBody.content ?? {}, location, context, {\n    isReadonly,\n  });\n  return irObject([\n    irProperty(toPropertyName(\"content\"), content, { isReadonly }),\n    ...(itemContent ? [itemContent] : []),\n  ]);\n}\n"],"names":[],"mappings":";;;;;;;AAWA,MAAM,cAAA,GAAiB,KAAA;AAEvB,SAAS,cAAA,CACP,WAAA,EACA,QAAA,EACA,OAAA,EACY;AACZ,EAAA,MAAM,UAAU,eAAA,CAAgB,WAAA,CAAY,WAAW,EAAC,EAAG,QAAQ,OAAO,CAAA;AAC1E,EAAA,OAAO,QAAQ,GAAA,CAAI,CAAC,CAAC,WAAA,EAAa,KAAK,CAAA,KAAM;AAC3C,IAAA,MAAM,OAAO,aAAA,CAAc,QAAA,CAAS,MAAM,CAAC,SAAA,EAAW,WAAW,CAAC,CAAA;AAClE,IAAA,MAAM,IAAA,GAAO,iBAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AACnE,IAAA,OAAO,cAAA,CAAe,aAAa,IAAA,EAAM,KAAA,EAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW,CAAA;AAAA,EAC3F,CAAC,CAAA;AACH;AAMO,SAAS,eAAA,CACd,WAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,OAAA,GAAU,cAAA,CAAe,WAAA,EAAa,QAAA,EAAU,OAAO,CAAA;AAE7D,EAAA,MAAM,cAAc,UAAA,CAAW,cAAA,CAAe,cAAc,CAAA,EAAG,SAAA,CAAU,OAAO,CAAA,EAAG;AAAA,IACjF,UAAA,EAAY;AAAA,GACb,CAAA;AACD,EAAA,MAAM,OAAA,GAAU,SAAS,OAAA,CAAQ,MAAA,GAAS,IAAI,OAAA,GAAU,CAAC,WAAW,CAAC,CAAA;AACrE,EAAA,MAAM,UAAA,GAAa,QAAQ,OAAA,CAAQ,SAAA;AACnC,EAAA,MAAM,cAAc,iBAAA,CAAkB,WAAA,CAAY,WAAW,EAAC,EAAG,UAAU,OAAA,EAAS;AAAA,IAClF;AAAA,GACD,CAAA;AACD,EAAA,OAAO,QAAA,CAAS;AAAA,IACd,WAAW,cAAA,CAAe,SAAS,GAAG,OAAA,EAAS,EAAE,YAAY,CAAA;AAAA,IAC7D,GAAI,WAAA,GAAc,CAAC,WAAW,IAAI;AAAC,GACpC,CAAA;AACH;;"}

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

@@ -15,7 +15,7 @@ function headerMember(name, header$1, location, context) {
   const isReference = "$ref" in header$1;
   const type = isReference ? refType.refType(header$1.$ref) : header.headerType(
     header$1,
-    { ...location, path: jsonPointer.createRef([location.path, "headers", name]) },
+    { ...location, path: jsonPointer.appendPointer(location.path, ["headers", name]) },
     context
   );
   return documentMember.documentMember(name, type, header$1, {
@@ -37,7 +37,7 @@ function mediaTypeEntryType(entry, location, context) {
 function contentMember(response, location, context) {
   const entries = documentEntries.documentEntries(response.content ?? {}, context.options);
   const members = entries.map(([contentType, entry]) => {
-    const path = jsonPointer.createRef([location.path, "content", contentType]);
+    const path = jsonPointer.appendPointer(location.path, ["content", contentType]);
     const type = mediaTypeEntryType(entry, { ...location, path }, context);
     return documentMember.documentMember(contentType, type, entry, { isReadonly: context.options.immutable });
   });

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

@@ -1 +1 @@
-{"version":3,"file":"response.cjs","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":["header","refType","headerType","createRef","documentMember","documentEntries","irStringIndexSignature","UNKNOWN_TYPE","irProperty","toPropertyName","irObject","isMediaTypeComponentRef","contentEntryType","mediaTypeType","irKeyword","itemContentMember"],"mappings":"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"}
+{"version":3,"file":"response.cjs","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":["header","refType","headerType","appendPointer","documentMember","documentEntries","irStringIndexSignature","UNKNOWN_TYPE","irProperty","toPropertyName","irObject","isMediaTypeComponentRef","contentEntryType","mediaTypeType","irKeyword","itemContentMember"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { irObject, irStringIndexSignature, irProperty, irKeyword } from '../../../domain/ir/constructors.mjs';
 import { toPropertyName } from '../../../domain/ir/property-name.mjs';
-import { createRef } from '../../../domain/openapi/json-pointer.mjs';
+import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
 import { isMediaTypeComponentRef } from '../../../domain/openapi/media-type-object.mjs';
 import { documentEntries } from '../document-entries.mjs';
 import { refType } from '../ref-type.mjs';
@@ -13,7 +13,7 @@ function headerMember(name, header, location, context) {
   const isReference = "$ref" in header;
   const type = isReference ? refType(header.$ref) : headerType(
     header,
-    { ...location, path: createRef([location.path, "headers", name]) },
+    { ...location, path: appendPointer(location.path, ["headers", name]) },
     context
   );
   return documentMember(name, type, header, {
@@ -35,7 +35,7 @@ function mediaTypeEntryType(entry, location, context) {
 function contentMember(response, location, context) {
   const entries = documentEntries(response.content ?? {}, context.options);
   const members = entries.map(([contentType, entry]) => {
-    const path = createRef([location.path, "content", contentType]);
+    const path = appendPointer(location.path, ["content", contentType]);
     const type = mediaTypeEntryType(entry, { ...location, path }, context);
     return documentMember(contentType, type, entry, { isReadonly: context.options.immutable });
   });

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;
   }