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

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

@@ -1,71 +1,48 @@
 import { irObject, irIntersection, irProperty, irRaw } from '../../../domain/ir/constructors.mjs';
 import { toPropertyName } from '../../../domain/ir/property-name.mjs';
-import { escapeTemplateText } from '../../../domain/ir/raw-text-escapes.mjs';
 import { appendPointer, ROOT_POINTER } from '../../../domain/openapi/json-pointer.mjs';
-import { pathItemOperations } from '../../../domain/openapi/path-item-object.mjs';
-import { FIX } from '../../../domain/output-fixes.mjs';
 import { documentEntries } from '../document-entries.mjs';
 import { refType } from '../ref-type.mjs';
 import { NO_DECLARED_TYPES } from './declared-types.mjs';
 import { documentMember } from './document-member.mjs';
 import { pathItemType } from './path-item.mjs';
 import { coveringTemplateKeys } from './path-key-overlaps.mjs';
-import { replacedTemplateParts, placeholderText } from './path-template-replace.mjs';
+import { plainUrlOf, pathTemplateParts, booleanExpandedKeys, templateText } from './path-template-key.mjs';
 import { assignabilityProof } from './type-assignability.mjs';
 
-const PATH_PARAMETER_RE = /\{[^{}]+\}/g;
-const PLACEHOLDERS = /* @__PURE__ */ new Map([
-  ["number", "number"],
-  ["integer", "number"],
-  ["boolean", "boolean"]
-]);
-const STRING_PLACEHOLDER = "string";
-function resolvedParameter(parameter, context) {
-  return "$ref" in parameter && parameter.$ref ? context.refs.resolve(parameter.$ref) : parameter;
+function pathKeyOf(parts) {
+  const plainUrl = plainUrlOf(parts);
+  return plainUrl === null ? { kind: "template", parts } : literalKey(plainUrl);
 }
-function addPathParameters(parameters, byName, context) {
-  for (const parameter of parameters) {
-    const resolved = resolvedParameter(parameter, context);
-    if (resolved && resolved.in === "path") {
-      byName.set(resolved.name, resolved);
-    }
-  }
-}
-function pathParameters(pathItem, context) {
-  const byName = /* @__PURE__ */ new Map();
-  addPathParameters(pathItem.parameters ?? [], byName, context);
-  for (const { operation: entry } of pathItemOperations(pathItem)) {
-    const operation = entry.$ref ? context.refs.resolve(entry.$ref) : entry;
-    addPathParameters(operation?.parameters ?? [], byName, context);
+function keyMember(url, parts, type, isReadonly) {
+  const key = pathKeyOf(parts);
+  if (key.kind === "literal") {
+    const member2 = irProperty(toPropertyName(key.url), type, { isReadonly });
+    return { url, member: member2, key, type };
   }
-  return byName;
-}
-function splitTemplateParts(url, matches) {
-  return url.split(PATH_PARAMETER_RE).flatMap((text, index) => {
-    const type = matches[index]?.type;
-    const textPart = { kind: "text", text };
-    return type === void 0 ? [textPart] : [textPart, { kind: "placeholder", type }];
-  });
+  const member = {
+    kind: "indexSignature",
+    parameterName: "path",
+    parameterType: irRaw(templateText(parts)),
+    type,
+    isReadonly,
+    comments: []
+  };
+  return { url, member, key, type };
 }
-function pathTemplateParts(url, pathItem, context) {
-  const found = url.match(PATH_PARAMETER_RE);
-  if (!found) {
-    return null;
+function isUntakenKey(url, key, takenUrls) {
+  const isExpandedUrl = key.kind === "literal" && key.url !== url;
+  if (!isExpandedUrl) {
+    return true;
   }
-  const parameters = pathParameters(pathItem, context);
-  const matches = found.map((match) => {
-    const schema = parameters.get(match.slice(1, -1))?.schema;
-    return { match, type: PLACEHOLDERS.get(schema?.type) ?? STRING_PLACEHOLDER };
-  });
-  return context.options.fixes.has(FIX.PATH_PARAM_TYPE_NAMES) ? splitTemplateParts(url, matches) : replacedTemplateParts(url, matches);
+  const isTaken = takenUrls.has(key.url);
+  takenUrls.add(key.url);
+  return !isTaken;
 }
-function templateText(parts) {
-  const text = parts.map(
-    (part) => part.kind === "text" ? escapeTemplateText(part.text) : placeholderText(part.type)
-  ).join("");
-  return `\`${text}\``;
+function withoutTakenUrls(url, members, takenUrls) {
+  return members.filter(({ key }) => isUntakenKey(url, key, takenUrls));
 }
-function pathItemMember(url, pathItem, context) {
+function pathItemMembers(url, pathItem, context) {
   const isReadonly = context.options.immutable;
   const type = pathItemType(
     pathItem,
@@ -74,18 +51,10 @@ function pathItemMember(url, pathItem, context) {
   );
   const parts = context.options.pathParamsAsTypes && url.includes("{") ? pathTemplateParts(url, pathItem, context) : null;
   if (parts === null) {
-    const member2 = irProperty(toPropertyName(url), type, { isReadonly });
-    return { url, member: member2, key: literalKey(url), type };
+    const member = irProperty(toPropertyName(url), type, { isReadonly });
+    return [{ url, member, key: literalKey(url), type }];
   }
-  const member = {
-    kind: "indexSignature",
-    parameterName: "path",
-    parameterType: irRaw(templateText(parts)),
-    type,
-    isReadonly,
-    comments: []
-  };
-  return { url, member, key: { kind: "template", parts }, type };
+  return booleanExpandedKeys(parts).map((key) => keyMember(url, key, type, isReadonly));
 }
 function literalKey(url) {
   return { kind: "literal", url };
@@ -126,6 +95,7 @@ function pathsObjectType(paths, lookup = NO_DECLARED_TYPES) {
 }
 function pathMembers(paths, context) {
   const members = [];
+  const takenUrls = new Set(Object.keys(paths));
   for (const [url, pathItem] of documentEntries(paths, context.options)) {
     if (!pathItem || typeof pathItem !== "object") {
       continue;
@@ -137,9 +107,9 @@ function pathMembers(paths, context) {
       continue;
     }
     const startedAt = context.diagnostics.now();
-    const path = pathItemMember(url, pathItem, context);
-    members.push(path);
-    if (path.member.kind === "property") {
+    const pathMembersOfUrl = pathItemMembers(url, pathItem, context);
+    members.push(...withoutTakenUrls(url, pathMembersOfUrl, takenUrls));
+    if (pathMembersOfUrl[0]?.key.kind === "literal" && pathMembersOfUrl[0].key.url === url) {
       context.diagnostics.debug(`Transformed path "${url}"`, context.diagnostics.now() - startedAt);
     }
   }
@@ -149,5 +119,5 @@ function pathsType(paths, context) {
   return pathsObjectType(pathMembers(paths, context));
 }
 
-export { pathMembers, pathsObjectType, pathsType };
+export { isUntakenKey, pathKeyOf, pathMembers, pathsObjectType, pathsType };
 //# sourceMappingURL=paths.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"paths.mjs","sources":["../../../../src/application/transform/document/paths.ts"],"sourcesContent":["import { irIntersection, irObject, irProperty, irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { escapeTemplateText } from \"../../../domain/ir/raw-text-escapes.js\";\nimport { appendPointer, ROOT_POINTER } from \"../../../domain/openapi/json-pointer.js\";\nimport type { OperationObject } from \"../../../domain/openapi/operation-object.js\";\nimport type {\n  ParameterObject,\n  ParameterOrReference,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport {\n  type PathItemObject,\n  type PathsObject,\n  pathItemOperations,\n} from \"../../../domain/openapi/path-item-object.js\";\nimport type { ReferenceSchema, SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { FIX } from \"../../../domain/output-fixes.js\";\nimport { documentEntries } from \"../document-entries.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { type DeclaredTypeLookup, NO_DECLARED_TYPES } from \"./declared-types.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { pathItemType } from \"./path-item.js\";\nimport {\n  type CoverRejection,\n  coveringTemplateKeys,\n  type PathKey,\n  type PathKeyPart,\n  type PathPlaceholder,\n} from \"./path-key-overlaps.js\";\nimport {\n  type PathParameterMatch,\n  placeholderText,\n  replacedTemplateParts,\n} from \"./path-template-replace.js\";\nimport { assignabilityProof } from \"./type-assignability.js\";\n\n/** `[^{}]` keeps the scan linear: `[^}]` retried from every `{` of a long run of them. */\nconst PATH_PARAMETER_RE = /\\{[^{}]+\\}/g;\n\n/** Placeholders by parameter schema type; anything else is a string placeholder. */\nconst PLACEHOLDERS: ReadonlyMap<unknown, PathPlaceholder> = new Map([\n  [\"number\", \"number\"],\n  [\"integer\", \"number\"],\n  [\"boolean\", \"boolean\"],\n]);\nconst STRING_PLACEHOLDER: PathPlaceholder = \"string\";\n\nfunction resolvedParameter(\n  parameter: ParameterOrReference,\n  context: TransformContext,\n): ParameterObject | undefined {\n  return \"$ref\" in parameter && parameter.$ref\n    ? (context.refs.resolve(parameter.$ref) as ParameterObject | undefined)\n    : (parameter as ParameterObject);\n}\n\nfunction addPathParameters(\n  parameters: readonly ParameterOrReference[],\n  byName: Map<string, ParameterObject>,\n  context: TransformContext,\n): void {\n  for (const parameter of parameters) {\n    const resolved = resolvedParameter(parameter, context);\n    if (resolved && resolved.in === \"path\") {\n      byName.set(resolved.name, resolved);\n    }\n  }\n}\n\n/** Path parameters of the path item and of its operations; later definitions win. */\nfunction pathParameters(\n  pathItem: PathItemObject,\n  context: TransformContext,\n): Map<string, ParameterObject> {\n  const byName = new Map<string, ParameterObject>();\n  addPathParameters(pathItem.parameters ?? [], byName, context);\n  for (const { operation: entry } of pathItemOperations(pathItem)) {\n    const operation = (entry as ReferenceSchema).$ref\n      ? (context.refs.resolve((entry as ReferenceSchema).$ref) as OperationObject | undefined)\n      : (entry as OperationObject);\n    addPathParameters(operation?.parameters ?? [], byName, context);\n  }\n  return byName;\n}\n\n/** Each `{name}` of the URL and its own placeholder, from the URL split at the matches. */\nfunction splitTemplateParts(url: string, matches: readonly PathParameterMatch[]): PathKeyPart[] {\n  return url.split(PATH_PARAMETER_RE).flatMap((text, index): PathKeyPart[] => {\n    const type = matches[index]?.type;\n    const textPart: PathKeyPart = { kind: \"text\", text };\n    return type === undefined ? [textPart] : [textPart, { kind: \"placeholder\", type }];\n  });\n}\n\n/**\n * `--path-params-as-types`: the URL as template parts, each `{name}` replaced by a placeholder for\n * its parameter's type, the way the original replaces them unless the `path-param-type-names` fix\n * is on (see `replacedTemplateParts`). Null when the URL has no complete `{…}` placeholder.\n */\nfunction pathTemplateParts(\n  url: string,\n  pathItem: PathItemObject,\n  context: TransformContext,\n): PathKeyPart[] | null {\n  const found = url.match(PATH_PARAMETER_RE);\n  if (!found) {\n    return null;\n  }\n  const parameters = pathParameters(pathItem, context);\n  const matches = found.map((match): PathParameterMatch => {\n    const schema = parameters.get(match.slice(1, -1))?.schema as SchemaObject | undefined;\n    return { match, type: PLACEHOLDERS.get(schema?.type) ?? STRING_PLACEHOLDER };\n  });\n  return context.options.fixes.has(FIX.PATH_PARAM_TYPE_NAMES)\n    ? splitTemplateParts(url, matches)\n    : replacedTemplateParts(url, matches);\n}\n\n/**\n * The template literal type of the parts. The original escaped only backticks: a backslash or\n * `${` in the URL could end the literal or open a placeholder, and add code to the generated file\n * (intentional fix). So the text parts are escaped.\n */\nfunction templateText(parts: readonly PathKeyPart[]): string {\n  const text = parts\n    .map((part) =>\n      part.kind === \"text\" ? escapeTemplateText(part.text) : placeholderText(part.type),\n    )\n    .join(\"\");\n  return `\\`${text}\\``;\n}\n\n/** A path's member, its key and its path item type for the overlap check. */\nexport interface PathMember {\n  readonly url: string;\n  readonly member: IrMember;\n  readonly key: PathKey;\n  readonly type: IrType;\n}\n\nfunction pathItemMember(\n  url: string,\n  pathItem: PathItemObject,\n  context: TransformContext,\n): PathMember {\n  const isReadonly = context.options.immutable;\n  const type = pathItemType(\n    pathItem,\n    { path: appendPointer(ROOT_POINTER, [\"paths\", url]) },\n    context,\n  );\n  const parts =\n    context.options.pathParamsAsTypes && url.includes(\"{\")\n      ? pathTemplateParts(url, pathItem, context)\n      : null;\n  if (parts === null) {\n    const member = irProperty(toPropertyName(url), type, { isReadonly });\n    return { url, member, key: literalKey(url), type };\n  }\n  const member: IrMember = {\n    kind: \"indexSignature\",\n    parameterName: \"path\",\n    parameterType: irRaw(templateText(parts)),\n    type,\n    isReadonly,\n    comments: [],\n  };\n  return { url, member, key: { kind: \"template\", parts }, type };\n}\n\nfunction literalKey(url: string): PathKey {\n  return { kind: \"literal\", url };\n}\n\nconst PATHS_TYPE_NAME = \"paths\";\n\n/** The URL of `paths[\"/apps/{id}\"]`, or null for any other type. */\nfunction pathsIndexOf(type: IrType): string | null {\n  if (type.kind !== \"indexedAccess\" || type.index.kind !== \"stringLiteral\") {\n    return null;\n  }\n  const { object } = type;\n  const isPaths =\n    object.kind === \"reference\" &&\n    object.name === PATHS_TYPE_NAME &&\n    object.typeArguments.length === 0;\n  return isPaths ? type.index.value : null;\n}\n\n/**\n * The lookup, and `paths[\"/apps/{id}\"]` as that path's item. The declarations cannot read it: a\n * templated path is no property of `paths`, and TypeScript finds it through the signature.\n */\nfunction withPathItems(\n  paths: readonly PathMember[],\n  lookup: DeclaredTypeLookup,\n): DeclaredTypeLookup {\n  const byUrl = new Map(paths.map((path) => [path.url, path.type]));\n  return (type) => {\n    const url = pathsIndexOf(type);\n    return (url === null ? undefined : byUrl.get(url)) ?? lookup(type);\n  };\n}\n\n/**\n * The rejection of a covered path item: only one proven not assignable to the signature's type\n * counts (ADR-028). A pair the proof cannot decide keeps the original output, which may well\n * compile (`Record<string, never>` fits `{ [key: string]: unknown }`).\n */\nfunction rejectionOf(paths: readonly PathMember[], lookup: DeclaredTypeLookup): CoverRejection {\n  const relate = assignabilityProof(withPathItems(paths, lookup));\n  return (coveringIndex, coveredIndex) => {\n    const coveringPath = paths[coveringIndex];\n    const coveredPath = paths[coveredIndex];\n    return (\n      coveringPath !== undefined &&\n      coveredPath !== undefined &&\n      relate(coveredPath.type, coveringPath.type) === \"rejected\"\n    );\n  };\n}\n\n/**\n * The members as one object type. When an index signature covers another key, TypeScript checks\n * the covered key's type against it. Where that check surely fails (TS2411, TS2413), each such\n * signature gets an object of its own in an intersection: an intersection does not check its parts\n * against each other, and every key has the type it had in the one object. Output that compiles\n * keeps the one object. The lookup reads the types that path items reference; without it, a\n * reference decides nothing.\n */\nexport function pathsObjectType(\n  paths: readonly PathMember[],\n  lookup: DeclaredTypeLookup = NO_DECLARED_TYPES,\n): IrType {\n  const keys = paths.map(({ key }) => key);\n  const covering = coveringTemplateKeys(keys, rejectionOf(paths, lookup));\n  if (covering.size === 0) {\n    return irObject(paths.map(({ member }) => member));\n  }\n  const rest = paths.filter((_, index) => !covering.has(index)).map(({ member }) => member);\n  const own = paths\n    .filter((_, index) => covering.has(index))\n    .map(({ member }) => irObject([member]));\n  return irIntersection([irObject(rest), ...own]);\n}\n\n/** The members of the `paths` interface (OpenAPI 3.1 §4.8.8): one per path, by URL. */\nexport function pathMembers(paths: PathsObject, context: TransformContext): PathMember[] {\n  const members: PathMember[] = [];\n  for (const [url, pathItem] of documentEntries(paths, context.options)) {\n    if (!pathItem || typeof pathItem !== \"object\") {\n      continue;\n    }\n    if (\"$ref\" in pathItem) {\n      const options = { isReadonly: context.options.immutable };\n      const member = documentMember(url, refType(pathItem.$ref), pathItem, options);\n      members.push({ url, member, key: literalKey(url), type: member.type });\n      continue;\n    }\n    const startedAt = context.diagnostics.now();\n    const path = pathItemMember(url, pathItem, context);\n    members.push(path);\n    // The original reports only paths written as properties.\n    if (path.member.kind === \"property\") {\n      context.diagnostics.debug(`Transformed path \"${url}\"`, context.diagnostics.now() - startedAt);\n    }\n  }\n  return members;\n}\n\n/**\n * The `paths` interface body, with only the path items' own types for the overlap check. The\n * document transform checks the overlaps again once the referenced types are declared.\n */\nexport function pathsType(paths: PathsObject, context: TransformContext): IrType {\n  return pathsObjectType(pathMembers(paths, context));\n}\n"],"names":["member"],"mappings":"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"}
+{"version":3,"file":"paths.mjs","sources":["../../../../src/application/transform/document/paths.ts"],"sourcesContent":["import { irIntersection, irObject, irProperty, irRaw } from \"../../../domain/ir/constructors.js\";\nimport type { IrMember, 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 { type DeclaredTypeLookup, NO_DECLARED_TYPES } from \"./declared-types.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { pathItemType } from \"./path-item.js\";\nimport {\n  type CoverRejection,\n  coveringTemplateKeys,\n  type PathKey,\n  type PathKeyPart,\n} from \"./path-key-overlaps.js\";\nimport {\n  booleanExpandedKeys,\n  pathTemplateParts,\n  plainUrlOf,\n  templateText,\n} from \"./path-template-key.js\";\nimport { assignabilityProof } from \"./type-assignability.js\";\n\n/** A path's member, its key and its path item type for the overlap check. */\nexport interface PathMember {\n  readonly url: string;\n  readonly member: IrMember;\n  readonly key: PathKey;\n  readonly type: IrType;\n}\n\n/** The key of the parts: a plain URL, or a template with placeholders left. */\nexport function pathKeyOf(parts: readonly PathKeyPart[]): PathKey {\n  const plainUrl = plainUrlOf(parts);\n  return plainUrl === null ? { kind: \"template\", parts } : literalKey(plainUrl);\n}\n\n/** The member of one key of a path: a property for a plain URL, else an index signature. */\nfunction keyMember(url: string, parts: readonly PathKeyPart[], type: IrType, isReadonly: boolean) {\n  const key = pathKeyOf(parts);\n  if (key.kind === \"literal\") {\n    const member = irProperty(toPropertyName(key.url), type, { isReadonly });\n    return { url, member, key, type };\n  }\n  const member: IrMember = {\n    kind: \"indexSignature\",\n    parameterName: \"path\",\n    parameterType: irRaw(templateText(parts)),\n    type,\n    isReadonly,\n    comments: [],\n  };\n  return { url, member, key, type };\n}\n\n/**\n * Whether a key of the path at `url` is written. A URL that `${boolean}` keys give is not when it\n * is taken already: by a path of the document, which OpenAPI matches before a template (Paths\n * Object), or by the keys of an earlier path. A property written twice does not compile (TS2300).\n * `takenUrls` starts with the document's URLs and gets each expanded URL, in document order.\n */\nexport function isUntakenKey(url: string, key: PathKey, takenUrls: Set<string>): boolean {\n  const isExpandedUrl = key.kind === \"literal\" && key.url !== url;\n  if (!isExpandedUrl) {\n    return true;\n  }\n  const isTaken = takenUrls.has(key.url);\n  takenUrls.add(key.url);\n  return !isTaken;\n}\n\nfunction withoutTakenUrls(url: string, members: readonly PathMember[], takenUrls: Set<string>) {\n  return members.filter(({ key }) => isUntakenKey(url, key, takenUrls));\n}\n\n/** The members of a path: one, or one per key of its `${boolean}` placeholders. */\nfunction pathItemMembers(\n  url: string,\n  pathItem: PathItemObject,\n  context: TransformContext,\n): PathMember[] {\n  const isReadonly = context.options.immutable;\n  const type = pathItemType(\n    pathItem,\n    { path: appendPointer(ROOT_POINTER, [\"paths\", url]) },\n    context,\n  );\n  const parts =\n    context.options.pathParamsAsTypes && url.includes(\"{\")\n      ? pathTemplateParts(url, pathItem, context)\n      : null;\n  if (parts === null) {\n    const member = irProperty(toPropertyName(url), type, { isReadonly });\n    return [{ url, member, key: literalKey(url), type }];\n  }\n  return booleanExpandedKeys(parts).map((key) => keyMember(url, key, type, isReadonly));\n}\n\nfunction literalKey(url: string): PathKey {\n  return { kind: \"literal\", url };\n}\n\nconst PATHS_TYPE_NAME = \"paths\";\n\n/** The URL of `paths[\"/apps/{id}\"]`, or null for any other type. */\nfunction pathsIndexOf(type: IrType): string | null {\n  if (type.kind !== \"indexedAccess\" || type.index.kind !== \"stringLiteral\") {\n    return null;\n  }\n  const { object } = type;\n  const isPaths =\n    object.kind === \"reference\" &&\n    object.name === PATHS_TYPE_NAME &&\n    object.typeArguments.length === 0;\n  return isPaths ? type.index.value : null;\n}\n\n/**\n * The lookup, and `paths[\"/apps/{id}\"]` as that path's item. The declarations cannot read it: a\n * templated path is no property of `paths`, and TypeScript finds it through the signature.\n */\nfunction withPathItems(\n  paths: readonly PathMember[],\n  lookup: DeclaredTypeLookup,\n): DeclaredTypeLookup {\n  const byUrl = new Map(paths.map((path) => [path.url, path.type]));\n  return (type) => {\n    const url = pathsIndexOf(type);\n    return (url === null ? undefined : byUrl.get(url)) ?? lookup(type);\n  };\n}\n\n/**\n * The rejection of a covered path item: only one proven not assignable to the signature's type\n * counts (ADR-028). A pair the proof cannot decide keeps the original output, which may well\n * compile (`Record<string, never>` fits `{ [key: string]: unknown }`).\n */\nfunction rejectionOf(paths: readonly PathMember[], lookup: DeclaredTypeLookup): CoverRejection {\n  const relate = assignabilityProof(withPathItems(paths, lookup));\n  return (coveringIndex, coveredIndex) => {\n    const coveringPath = paths[coveringIndex];\n    const coveredPath = paths[coveredIndex];\n    return (\n      coveringPath !== undefined &&\n      coveredPath !== undefined &&\n      relate(coveredPath.type, coveringPath.type) === \"rejected\"\n    );\n  };\n}\n\n/**\n * The members as one object type. When an index signature covers another key, TypeScript checks\n * the covered key's type against it. Where that check surely fails (TS2411, TS2413), each such\n * signature gets an object of its own in an intersection: an intersection does not check its parts\n * against each other, and every key has the type it had in the one object. Output that compiles\n * keeps the one object. The lookup reads the types that path items reference; without it, a\n * reference decides nothing.\n */\nexport function pathsObjectType(\n  paths: readonly PathMember[],\n  lookup: DeclaredTypeLookup = NO_DECLARED_TYPES,\n): IrType {\n  const keys = paths.map(({ key }) => key);\n  const covering = coveringTemplateKeys(keys, rejectionOf(paths, lookup));\n  if (covering.size === 0) {\n    return irObject(paths.map(({ member }) => member));\n  }\n  const rest = paths.filter((_, index) => !covering.has(index)).map(({ member }) => member);\n  const own = paths\n    .filter((_, index) => covering.has(index))\n    .map(({ member }) => irObject([member]));\n  return irIntersection([irObject(rest), ...own]);\n}\n\n/** The members of the `paths` interface (OpenAPI 3.1 §4.8.8): one per path, by URL. */\nexport function pathMembers(paths: PathsObject, context: TransformContext): PathMember[] {\n  const members: PathMember[] = [];\n  const takenUrls = new Set(Object.keys(paths));\n  for (const [url, pathItem] of documentEntries(paths, context.options)) {\n    if (!pathItem || typeof pathItem !== \"object\") {\n      continue;\n    }\n    if (\"$ref\" in pathItem) {\n      const options = { isReadonly: context.options.immutable };\n      const member = documentMember(url, refType(pathItem.$ref), pathItem, options);\n      members.push({ url, member, key: literalKey(url), type: member.type });\n      continue;\n    }\n    const startedAt = context.diagnostics.now();\n    const pathMembersOfUrl = pathItemMembers(url, pathItem, context);\n    members.push(...withoutTakenUrls(url, pathMembersOfUrl, takenUrls));\n    // The original reports only paths written as properties.\n    if (pathMembersOfUrl[0]?.key.kind === \"literal\" && pathMembersOfUrl[0].key.url === url) {\n      context.diagnostics.debug(`Transformed path \"${url}\"`, context.diagnostics.now() - startedAt);\n    }\n  }\n  return members;\n}\n\n/**\n * The `paths` interface body, with only the path items' own types for the overlap check. The\n * document transform checks the overlaps again once the referenced types are declared.\n */\nexport function pathsType(paths: PathsObject, context: TransformContext): IrType {\n  return pathsObjectType(pathMembers(paths, context));\n}\n"],"names":["member"],"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.appendPointer(jsonPointer.ROOT_POINTER, ["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 { 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 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: appendPointer(ROOT_POINTER, [\"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","appendPointer","ROOT_POINTER","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,yBAAA,CAAcC,0BAAc,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACzE,IAAA,MAAM,IAAA,GAAOC,qBAAA,CAAaH,UAAA,EAA4B,QAAA,EAAU,OAAO,CAAA;AACvE,IAAA,OAAOI,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

@@ -2,16 +2,23 @@ import { irProperty, irObject } from '../../../domain/ir/constructors.mjs';
 import { toPropertyName } from '../../../domain/ir/property-name.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: appendPointer(ROOT_POINTER, ["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 { 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 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: appendPointer(ROOT_POINTER, [\"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,aAAA,CAAc,cAAc,CAAC,UAAA,EAAY,IAAI,CAAC,CAAA,EAAE;AACzE,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

@@ -8,7 +8,10 @@ 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);
@@ -18,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) {

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

@@ -1 +1 @@
-{"version":3,"file":"document-footer.cjs","sources":["../../../../src/application/transform/footer/document-footer.ts"],"sourcesContent":["import { irReference } from \"../../../domain/ir/constructors.js\";\nimport type {\n  IrDeclaration,\n  IrEnumDeclaration,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport { HELPER_TYPES, type HelperType } from \"../helper-types.js\";\nimport type {\n  EnumDeclarationRequest,\n  EnumMemberMetadata,\n  EnumValuesRequest,\n} from \"../schema/schema-context.js\";\nimport type { DocumentFooter } from \"../transform-context.js\";\nimport { EnumNameClaims } from \"./enum-name-claims.js\";\nimport {\n  type DeclaredMembers,\n  EnumNaming,\n  enumDeclaration,\n  withoutDeclaredMembers,\n} from \"./enum-naming.js\";\nimport { OperationKeys } from \"./operation-keys.js\";\nimport { FIRST_SCHEMA_NAMES, type SharedEnumNames } from \"./shared-enum-names.js\";\n\n/** Where footer declarations go, in order: the run's `ctx.injectFooter`, open to user code. */\nexport interface FooterSink {\n  /** Whether a type alias with this name is declared already (by the generator or a user). */\n  hasTypeAlias(name: string): boolean;\n  add(declaration: IrDeclaration): void;\n  /** Add a member to the `operations` interface, declared first if needed; see `DocumentFooter`. */\n  addOperation(build: () => IrPropertySignature): void;\n}\n\n/**\n * The `--dedupe-enums` key of the original: the values in default sort order, each paired with\n * the metadata at its sorted position (not the value's own metadata), as the original does.\n */\nfunction dedupeKey(request: EnumDeclarationRequest): string {\n  return [...request.values]\n    .sort(compareAsStrings)\n    .map((value, index) => metadataKey(String(value), request.metadata[index]))\n    .join(\",\");\n}\n\n/** `Array.prototype.sort` without a comparator: compares the values as strings. */\nfunction compareAsStrings(left: string | number, right: string | number): number {\n  const leftText = String(left);\n  const rightText = String(right);\n  if (leftText === rightText) {\n    return 0;\n  }\n  return leftText < rightText ? -1 : 1;\n}\n\nfunction metadataKey(value: string, metadata: EnumMemberMetadata | undefined): string {\n  return `${metadata?.name ?? value}:${metadata?.description || \"\"}`;\n}\n\n/** Separates a repeated `--enum-values` array name from its number, as root type aliases do. */\nconst ENUM_VALUES_NUMBER_SEPARATOR = \"_\";\n\n/** The whole declaration: an equal key means the same enum, member for member. */\nfunction declarationKey(name: string, request: EnumDeclarationRequest): string {\n  return JSON.stringify([name, request.values, request.metadata]);\n}\n\n/** The naming state a run's footer shares with the rest of the run. */\nexport interface RunFooterNames {\n  readonly enums: EnumNameClaims;\n  readonly operations: OperationKeys;\n}\n\n/**\n * The footer of one run: enums (deduplicated with `--dedupe-enums`), `--enum-values` arrays, the\n * helper types they need, and the `operations` interface. Replaces the original's module-level\n * `enumCache`, so runs no longer share enums (research/legacy-bugs.md, item 3).\n */\nexport class RunFooter implements DocumentFooter {\n  private readonly naming = new EnumNaming();\n  private readonly enumNamesByKey = new Map<string, string>();\n  /** Declarations added already: the same one twice fails with \"Duplicate identifier\". */\n  private readonly declaredEnums = new Set<string>();\n  /** The member names of each declared enum, by value. */\n  private readonly membersByEnum = new Map<string, Map<string | number, string>>();\n  /** The members of each declared enum name, by member name. */\n  private readonly declaredMembers = new Map<string, Map<string, string | number>>();\n  /** `--enum-values` arrays added already: their declared name by name, type and values. */\n  private readonly declaredEnumValues = new Map<string, string>();\n  /** The declared `--enum-values` array names. */\n  private readonly enumValuesNames = new Set<string>();\n  private readonly sink: FooterSink;\n  private readonly isDedupingEnums: boolean;\n  private readonly sharedNames: SharedEnumNames;\n  private readonly names: RunFooterNames;\n\n  constructor(\n    sink: FooterSink,\n    isDedupingEnums: boolean,\n    sharedNames: SharedEnumNames = FIRST_SCHEMA_NAMES,\n    names: RunFooterNames = { enums: new EnumNameClaims(), operations: new OperationKeys() },\n  ) {\n    this.sink = sink;\n    this.isDedupingEnums = isDedupingEnums;\n    this.sharedNames = sharedNames;\n    this.names = names;\n  }\n\n  addEnum(request: EnumDeclarationRequest): string {\n    // The name is built before the cache lookup: it advances the naming state either way.\n    const ownName = this.naming.enumName(request.name);\n    const key = this.isDedupingEnums ? dedupeKey(request) : null;\n    // Every schema of a shared enum goes to `sharedNames`, the later ones too.\n    const sharedName = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);\n    const known = key === null ? undefined : this.enumNamesByKey.get(key);\n    if (known !== undefined) {\n      return known;\n    }\n    // The owner is the schema location: its requests share one enum, with `--dedupe-enums` too.\n    const name = this.names.enums.nameFor(sharedName, request.name);\n    // Only a repeated member fails to compile; two empty declarations merge, so they stay.\n    const declared = request.values.length > 0 ? declarationKey(name, request) : null;\n    if (declared !== null && this.declaredEnums.has(declared)) {\n      return name;\n    }\n    if (declared !== null) {\n      this.declaredEnums.add(declared);\n    }\n    const declaration = this.withoutRepeats(enumDeclaration(name, request, this.naming));\n    if (declaration !== null) {\n      this.record(declaration);\n      this.sink.add(declaration);\n    }\n    if (key !== null) {\n      this.enumNamesByKey.set(key, name);\n    }\n    return name;\n  }\n\n  /** The declaration without members an earlier one of the name has; null when none is left. */\n  private withoutRepeats(declaration: IrEnumDeclaration): IrEnumDeclaration | null {\n    const earlier: DeclaredMembers | undefined = this.declaredMembers.get(declaration.name);\n    if (earlier === undefined) {\n      return declaration;\n    }\n    const merged = withoutDeclaredMembers(declaration, earlier);\n    // Two empty declarations merge into one empty enum, which compiles, so the second stays.\n    return merged.members.length === 0 && declaration.members.length > 0 ? null : merged;\n  }\n\n  /** The members of a declaration; the first member of a value names it. */\n  private record(declaration: IrEnumDeclaration): void {\n    const byName = this.declaredMembers.get(declaration.name) ?? new Map();\n    const byValue = this.membersByEnum.get(declaration.name) ?? new Map();\n    for (const member of declaration.members) {\n      byName.set(member.name, member.value);\n      if (!byValue.has(member.value)) {\n        byValue.set(member.value, member.name);\n      }\n    }\n    this.declaredMembers.set(declaration.name, byName);\n    this.membersByEnum.set(declaration.name, byValue);\n  }\n\n  enumMembers(name: string): ReadonlyMap<string | number, string> {\n    return this.membersByEnum.get(name) ?? new Map();\n  }\n\n  addEnumValues(request: EnumValuesRequest): void {\n    const baseName = this.naming.arrayName(request.name);\n    // The same array twice fails with \"Cannot redeclare\"; a schema typed twice adds it twice.\n    const declared = JSON.stringify([baseName, request.type, request.values]);\n    if (this.declaredEnumValues.has(declared)) {\n      return;\n    }\n    const name = this.freeEnumValuesName(baseName);\n    this.declaredEnumValues.set(declared, name);\n    this.enumValuesNames.add(name);\n    this.require(HELPER_TYPES.flattenedDeepRequired);\n    this.require(HELPER_TYPES.readonlyArray);\n    this.sink.add({\n      kind: \"constArray\",\n      name,\n      isExported: true,\n      type: readonlyArrayOf(request.type),\n      values: request.values,\n      comments: [],\n    });\n  }\n\n  /**\n   * Another array may have the name: `Discount/type` and `discount/type`, or a property and an\n   * inline `allOf` item of one schema, typed at one location. A redeclared `const` does not\n   * compile, so a later one gets the next number (`discountTypeValues_2`). Every unnumbered name\n   * ends with `Values`, so a number never takes a name that a later array needs.\n   */\n  private freeEnumValuesName(name: string): string {\n    let candidate = name;\n    for (let count = 2; this.enumValuesNames.has(candidate); count++) {\n      candidate = `${name}${ENUM_VALUES_NUMBER_SEPARATOR}${count}`;\n    }\n    return candidate;\n  }\n\n  requireWithRequired(): void {\n    this.require(HELPER_TYPES.withRequired);\n  }\n\n  requirePropertyValues(): void {\n    this.require(HELPER_TYPES.propertyValues);\n  }\n\n  addOperation(build: () => IrPropertySignature): void {\n    this.sink.addOperation(build);\n  }\n\n  operationKey(operationId: string): string {\n    return this.names.operations.keyFor(operationId);\n  }\n\n  private require(helper: HelperType): void {\n    if (!this.sink.hasTypeAlias(helper.name)) {\n      this.sink.add({ kind: \"rawDeclaration\", name: helper.name, text: helper.text });\n    }\n  }\n}\n\nfunction readonlyArrayOf(type: IrType): IrType {\n  return irReference(HELPER_TYPES.readonlyArray.name, [type]);\n}\n"],"names":["EnumNaming","FIRST_SCHEMA_NAMES","EnumNameClaims","OperationKeys","enumDeclaration","withoutDeclaredMembers","HELPER_TYPES","irReference"],"mappings":"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"}
+{"version":3,"file":"document-footer.cjs","sources":["../../../../src/application/transform/footer/document-footer.ts"],"sourcesContent":["import { irReference } from \"../../../domain/ir/constructors.js\";\nimport type {\n  IrDeclaration,\n  IrEnumDeclaration,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport { HELPER_TYPES, type HelperType } from \"../helper-types.js\";\nimport type {\n  EnumDeclarationRequest,\n  EnumMemberMetadata,\n  EnumValuesRequest,\n} from \"../schema/schema-context.js\";\nimport type { DocumentFooter } from \"../transform-context.js\";\nimport { EnumNameClaims } from \"./enum-name-claims.js\";\nimport {\n  type DeclaredMembers,\n  EnumNaming,\n  enumDeclaration,\n  withoutDeclaredMembers,\n} from \"./enum-naming.js\";\nimport { OperationKeys } from \"./operation-keys.js\";\nimport { FIRST_SCHEMA_NAMES, type SharedEnumNames } from \"./shared-enum-names.js\";\n\n/** Where footer declarations go, in order: the run's `ctx.injectFooter`, open to user code. */\nexport interface FooterSink {\n  /** Whether a type alias with this name is declared already (by the generator or a user). */\n  hasTypeAlias(name: string): boolean;\n  add(declaration: IrDeclaration): void;\n  /** Add a member to the `operations` interface, declared first if needed; see `DocumentFooter`. */\n  addOperation(build: () => IrPropertySignature): void;\n}\n\n/**\n * The `--dedupe-enums` key. Two enums share a declaration only when the original shares it and\n * each value has the same name and description in both. The original key pairs the values in\n * default sort order with the metadata at the sorted position, not with the value's own metadata,\n * so `[desc, asc]` and `[asc, desc]`, both named `[Desc, Asc]`, shared one declaration, and one of\n * them typed `asc` as `Desc = \"desc\"`. The original also joined `name:description` texts with\n * `,`, and a member name stood in for its value, so enums with other values (`\"1\"` and `1`, `A`\n * and `1` both named `Active`, `[\"a\", \"b\"]` and `[\"a:,b\"]`) shared one key. As JSON, an equal key\n * means the same values and metadata; enums the original kept apart still are.\n */\nfunction dedupeKey(request: EnumDeclarationRequest): string {\n  const sorted = [...request.values].sort(compareAsStrings);\n  const originalPairs = sorted.map((value, index) => memberKey(value, request.metadata[index]));\n  const ownPairs = request.values\n    .map((value, index) => ({ value, member: memberKey(value, request.metadata[index]) }))\n    .sort((left, right) => compareAsStrings(left.value, right.value))\n    .map(({ member }) => member);\n  return JSON.stringify([originalPairs, ownPairs]);\n}\n\n/** `Array.prototype.sort` without a comparator: compares the values as strings. */\nfunction compareAsStrings(left: string | number, right: string | number): number {\n  const leftText = String(left);\n  const rightText = String(right);\n  if (leftText === rightText) {\n    return 0;\n  }\n  return leftText < rightText ? -1 : 1;\n}\n\n/** One member: the value (JSON keeps `\"1\"` and `1` apart), its name and its description. */\nfunction memberKey(value: string | number, metadata: EnumMemberMetadata | undefined) {\n  return [value, metadata?.name ?? null, metadata?.description || null];\n}\n\n/** Separates a repeated `--enum-values` array name from its number, as root type aliases do. */\nconst ENUM_VALUES_NUMBER_SEPARATOR = \"_\";\n\n/** The whole declaration: an equal key means the same enum, member for member. */\nfunction declarationKey(name: string, request: EnumDeclarationRequest): string {\n  return JSON.stringify([name, request.values, request.metadata]);\n}\n\n/** The naming state a run's footer shares with the rest of the run. */\nexport interface RunFooterNames {\n  readonly enums: EnumNameClaims;\n  readonly operations: OperationKeys;\n}\n\n/**\n * The footer of one run: enums (deduplicated with `--dedupe-enums`), `--enum-values` arrays, the\n * helper types they need, and the `operations` interface. Replaces the original's module-level\n * `enumCache`, so runs no longer share enums (research/legacy-bugs.md, item 3).\n */\nexport class RunFooter implements DocumentFooter {\n  private readonly naming = new EnumNaming();\n  private readonly enumNamesByKey = new Map<string, string>();\n  /** Declarations added already: the same one twice fails with \"Duplicate identifier\". */\n  private readonly declaredEnums = new Set<string>();\n  /** The member names of each declared enum, by value. */\n  private readonly membersByEnum = new Map<string, Map<string | number, string>>();\n  /** The members of each declared enum name, by member name. */\n  private readonly declaredMembers = new Map<string, Map<string, string | number>>();\n  /** `--enum-values` arrays added already: their declared name by name, type and values. */\n  private readonly declaredEnumValues = new Map<string, string>();\n  /** The declared `--enum-values` array names. */\n  private readonly enumValuesNames = new Set<string>();\n  private readonly sink: FooterSink;\n  private readonly isDedupingEnums: boolean;\n  private readonly sharedNames: SharedEnumNames;\n  private readonly names: RunFooterNames;\n\n  constructor(\n    sink: FooterSink,\n    isDedupingEnums: boolean,\n    sharedNames: SharedEnumNames = FIRST_SCHEMA_NAMES,\n    names: RunFooterNames = { enums: new EnumNameClaims(), operations: new OperationKeys() },\n  ) {\n    this.sink = sink;\n    this.isDedupingEnums = isDedupingEnums;\n    this.sharedNames = sharedNames;\n    this.names = names;\n  }\n\n  addEnum(request: EnumDeclarationRequest): string {\n    // The name is built before the cache lookup: it advances the naming state either way.\n    const ownName = this.naming.enumName(request.name);\n    const key = this.isDedupingEnums ? dedupeKey(request) : null;\n    // Every schema of a shared enum goes to `sharedNames`, the later ones too.\n    const sharedName = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);\n    const known = key === null ? undefined : this.enumNamesByKey.get(key);\n    if (known !== undefined) {\n      return known;\n    }\n    // The owner is the schema location: its requests share one enum, with `--dedupe-enums` too.\n    const name = this.names.enums.nameFor(sharedName, request.name);\n    // Only a repeated member fails to compile; two empty declarations merge, so they stay.\n    const declared = request.values.length > 0 ? declarationKey(name, request) : null;\n    if (declared !== null && this.declaredEnums.has(declared)) {\n      return name;\n    }\n    if (declared !== null) {\n      this.declaredEnums.add(declared);\n    }\n    const declaration = this.withoutRepeats(enumDeclaration(name, request, this.naming));\n    if (declaration !== null) {\n      this.record(declaration);\n      this.sink.add(declaration);\n    }\n    if (key !== null) {\n      this.enumNamesByKey.set(key, name);\n    }\n    return name;\n  }\n\n  /** The declaration without members an earlier one of the name has; null when none is left. */\n  private withoutRepeats(declaration: IrEnumDeclaration): IrEnumDeclaration | null {\n    const earlier: DeclaredMembers | undefined = this.declaredMembers.get(declaration.name);\n    if (earlier === undefined) {\n      return declaration;\n    }\n    const merged = withoutDeclaredMembers(declaration, earlier);\n    // Two empty declarations merge into one empty enum, which compiles, so the second stays.\n    return merged.members.length === 0 && declaration.members.length > 0 ? null : merged;\n  }\n\n  /** The members of a declaration; the first member of a value names it. */\n  private record(declaration: IrEnumDeclaration): void {\n    const byName = this.declaredMembers.get(declaration.name) ?? new Map();\n    const byValue = this.membersByEnum.get(declaration.name) ?? new Map();\n    for (const member of declaration.members) {\n      byName.set(member.name, member.value);\n      if (!byValue.has(member.value)) {\n        byValue.set(member.value, member.name);\n      }\n    }\n    this.declaredMembers.set(declaration.name, byName);\n    this.membersByEnum.set(declaration.name, byValue);\n  }\n\n  enumMembers(name: string): ReadonlyMap<string | number, string> {\n    return this.membersByEnum.get(name) ?? new Map();\n  }\n\n  addEnumValues(request: EnumValuesRequest): void {\n    const baseName = this.naming.arrayName(request.name);\n    // The same array twice fails with \"Cannot redeclare\"; a schema typed twice adds it twice.\n    const declared = JSON.stringify([baseName, request.type, request.values]);\n    if (this.declaredEnumValues.has(declared)) {\n      return;\n    }\n    const name = this.freeEnumValuesName(baseName);\n    this.declaredEnumValues.set(declared, name);\n    this.enumValuesNames.add(name);\n    this.require(HELPER_TYPES.flattenedDeepRequired);\n    this.require(HELPER_TYPES.readonlyArray);\n    this.sink.add({\n      kind: \"constArray\",\n      name,\n      isExported: true,\n      type: readonlyArrayOf(request.type),\n      values: request.values,\n      comments: [],\n    });\n  }\n\n  /**\n   * Another array may have the name: `Discount/type` and `discount/type`, or a property and an\n   * inline `allOf` item of one schema, typed at one location. A redeclared `const` does not\n   * compile, so a later one gets the next number (`discountTypeValues_2`). Every unnumbered name\n   * ends with `Values`, so a number never takes a name that a later array needs.\n   */\n  private freeEnumValuesName(name: string): string {\n    let candidate = name;\n    for (let count = 2; this.enumValuesNames.has(candidate); count++) {\n      candidate = `${name}${ENUM_VALUES_NUMBER_SEPARATOR}${count}`;\n    }\n    return candidate;\n  }\n\n  requireWithRequired(): void {\n    this.require(HELPER_TYPES.withRequired);\n  }\n\n  requirePropertyValues(): void {\n    this.require(HELPER_TYPES.propertyValues);\n  }\n\n  addOperation(build: () => IrPropertySignature): void {\n    this.sink.addOperation(build);\n  }\n\n  operationKey(operationId: string): string {\n    return this.names.operations.keyFor(operationId);\n  }\n\n  private require(helper: HelperType): void {\n    if (!this.sink.hasTypeAlias(helper.name)) {\n      this.sink.add({ kind: \"rawDeclaration\", name: helper.name, text: helper.text });\n    }\n  }\n}\n\nfunction readonlyArrayOf(type: IrType): IrType {\n  return irReference(HELPER_TYPES.readonlyArray.name, [type]);\n}\n"],"names":["EnumNaming","FIRST_SCHEMA_NAMES","EnumNameClaims","OperationKeys","enumDeclaration","withoutDeclaredMembers","HELPER_TYPES","irReference"],"mappings":";;;;;;;;;AA2CA,SAAS,UAAU,OAAA,EAAyC;AAC1D,EAAA,MAAM,SAAS,CAAC,GAAG,QAAQ,MAAM,CAAA,CAAE,KAAK,gBAAgB,CAAA;AACxD,EAAA,MAAM,aAAA,GAAgB,MAAA,CAAO,GAAA,CAAI,CAAC,KAAA,EAAO,KAAA,KAAU,SAAA,CAAU,KAAA,EAAO,OAAA,CAAQ,QAAA,CAAS,KAAK,CAAC,CAAC,CAAA;AAC5F,EAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,MAAA,CACtB,GAAA,CAAI,CAAC,KAAA,EAAO,KAAA,MAAW,EAAE,KAAA,EAAO,QAAQ,SAAA,CAAU,KAAA,EAAO,OAAA,CAAQ,QAAA,CAAS,KAAK,CAAC,CAAA,EAAE,CAAE,CAAA,CACpF,KAAK,CAAC,IAAA,EAAM,KAAA,KAAU,gBAAA,CAAiB,KAAK,KAAA,EAAO,KAAA,CAAM,KAAK,CAAC,EAC/D,GAAA,CAAI,CAAC,EAAE,MAAA,OAAa,MAAM,CAAA;AAC7B,EAAA,OAAO,IAAA,CAAK,SAAA,CAAU,CAAC,aAAA,EAAe,QAAQ,CAAC,CAAA;AACjD;AAGA,SAAS,gBAAA,CAAiB,MAAuB,KAAA,EAAgC;AAC/E,EAAA,MAAM,QAAA,GAAW,OAAO,IAAI,CAAA;AAC5B,EAAA,MAAM,SAAA,GAAY,OAAO,KAAK,CAAA;AAC9B,EAAA,IAAI,aAAa,SAAA,EAAW;AAC1B,IAAA,OAAO,CAAA;AAAA,EACT;AACA,EAAA,OAAO,QAAA,GAAW,YAAY,EAAA,GAAK,CAAA;AACrC;AAGA,SAAS,SAAA,CAAU,OAAwB,QAAA,EAA0C;AACnF,EAAA,OAAO,CAAC,KAAA,EAAO,QAAA,EAAU,QAAQ,IAAA,EAAM,QAAA,EAAU,eAAe,IAAI,CAAA;AACtE;AAGA,MAAM,4BAAA,GAA+B,GAAA;AAGrC,SAAS,cAAA,CAAe,MAAc,OAAA,EAAyC;AAC7E,EAAA,OAAO,IAAA,CAAK,UAAU,CAAC,IAAA,EAAM,QAAQ,MAAA,EAAQ,OAAA,CAAQ,QAAQ,CAAC,CAAA;AAChE;AAaO,MAAM,SAAA,CAAoC;AAAA,EAC9B,MAAA,GAAS,IAAIA,qBAAA,EAAW;AAAA,EACxB,cAAA,uBAAqB,GAAA,EAAoB;AAAA;AAAA,EAEzC,aAAA,uBAAoB,GAAA,EAAY;AAAA;AAAA,EAEhC,aAAA,uBAAoB,GAAA,EAA0C;AAAA;AAAA,EAE9D,eAAA,uBAAsB,GAAA,EAA0C;AAAA;AAAA,EAEhE,kBAAA,uBAAyB,GAAA,EAAoB;AAAA;AAAA,EAE7C,eAAA,uBAAsB,GAAA,EAAY;AAAA,EAClC,IAAA;AAAA,EACA,eAAA;AAAA,EACA,WAAA;AAAA,EACA,KAAA;AAAA,EAEjB,WAAA,CACE,IAAA,EACA,eAAA,EACA,WAAA,GAA+BC,oCAC/B,KAAA,GAAwB,EAAE,KAAA,EAAO,IAAIC,+BAAe,EAAG,UAAA,EAAY,IAAIC,2BAAA,IAAgB,EACvF;AACA,IAAA,IAAA,CAAK,IAAA,GAAO,IAAA;AACZ,IAAA,IAAA,CAAK,eAAA,GAAkB,eAAA;AACvB,IAAA,IAAA,CAAK,WAAA,GAAc,WAAA;AACnB,IAAA,IAAA,CAAK,KAAA,GAAQ,KAAA;AAAA,EACf;AAAA,EAEA,QAAQ,OAAA,EAAyC;AAE/C,IAAA,MAAM,OAAA,GAAU,IAAA,CAAK,MAAA,CAAO,QAAA,CAAS,QAAQ,IAAI,CAAA;AACjD,IAAA,MAAM,GAAA,GAAM,IAAA,CAAK,eAAA,GAAkB,SAAA,CAAU,OAAO,CAAA,GAAI,IAAA;AAExD,IAAA,MAAM,UAAA,GAAa,QAAQ,IAAA,GAAO,OAAA,GAAU,KAAK,WAAA,CAAY,MAAA,CAAO,GAAA,EAAK,OAAA,EAAS,OAAO,CAAA;AACzF,IAAA,MAAM,QAAQ,GAAA,KAAQ,IAAA,GAAO,SAAY,IAAA,CAAK,cAAA,CAAe,IAAI,GAAG,CAAA;AACpE,IAAA,IAAI,UAAU,MAAA,EAAW;AACvB,MAAA,OAAO,KAAA;AAAA,IACT;AAEA,IAAA,MAAM,OAAO,IAAA,CAAK,KAAA,CAAM,MAAM,OAAA,CAAQ,UAAA,EAAY,QAAQ,IAAI,CAAA;AAE9D,IAAA,MAAM,QAAA,GAAW,QAAQ,MAAA,CAAO,MAAA,GAAS,IAAI,cAAA,CAAe,IAAA,EAAM,OAAO,CAAA,GAAI,IAAA;AAC7E,IAAA,IAAI,aAAa,IAAA,IAAQ,IAAA,CAAK,aAAA,CAAc,GAAA,CAAI,QAAQ,CAAA,EAAG;AACzD,MAAA,OAAO,IAAA;AAAA,IACT;AACA,IAAA,IAAI,aAAa,IAAA,EAAM;AACrB,MAAA,IAAA,CAAK,aAAA,CAAc,IAAI,QAAQ,CAAA;AAAA,IACjC;AACA,IAAA,MAAM,WAAA,GAAc,KAAK,cAAA,CAAeC,0BAAA,CAAgB,MAAM,OAAA,EAAS,IAAA,CAAK,MAAM,CAAC,CAAA;AACnF,IAAA,IAAI,gBAAgB,IAAA,EAAM;AACxB,MAAA,IAAA,CAAK,OAAO,WAAW,CAAA;AACvB,MAAA,IAAA,CAAK,IAAA,CAAK,IAAI,WAAW,CAAA;AAAA,IAC3B;AACA,IAAA,IAAI,QAAQ,IAAA,EAAM;AAChB,MAAA,IAAA,CAAK,cAAA,CAAe,GAAA,CAAI,GAAA,EAAK,IAAI,CAAA;AAAA,IACnC;AACA,IAAA,OAAO,IAAA;AAAA,EACT;AAAA;AAAA,EAGQ,eAAe,WAAA,EAA0D;AAC/E,IAAA,MAAM,OAAA,GAAuC,IAAA,CAAK,eAAA,CAAgB,GAAA,CAAI,YAAY,IAAI,CAAA;AACtF,IAAA,IAAI,YAAY,MAAA,EAAW;AACzB,MAAA,OAAO,WAAA;AAAA,IACT;AACA,IAAA,MAAM,MAAA,GAASC,iCAAA,CAAuB,WAAA,EAAa,OAAO,CAAA;AAE1D,IAAA,OAAO,MAAA,CAAO,QAAQ,MAAA,KAAW,CAAA,IAAK,YAAY,OAAA,CAAQ,MAAA,GAAS,IAAI,IAAA,GAAO,MAAA;AAAA,EAChF;AAAA;AAAA,EAGQ,OAAO,WAAA,EAAsC;AACnD,IAAA,MAAM,MAAA,GAAS,KAAK,eAAA,CAAgB,GAAA,CAAI,YAAY,IAAI,CAAA,wBAAS,GAAA,EAAI;AACrE,IAAA,MAAM,OAAA,GAAU,KAAK,aAAA,CAAc,GAAA,CAAI,YAAY,IAAI,CAAA,wBAAS,GAAA,EAAI;AACpE,IAAA,KAAA,MAAW,MAAA,IAAU,YAAY,OAAA,EAAS;AACxC,MAAA,MAAA,CAAO,GAAA,CAAI,MAAA,CAAO,IAAA,EAAM,MAAA,CAAO,KAAK,CAAA;AACpC,MAAA,IAAI,CAAC,OAAA,CAAQ,GAAA,CAAI,MAAA,CAAO,KAAK,CAAA,EAAG;AAC9B,QAAA,OAAA,CAAQ,GAAA,CAAI,MAAA,CAAO,KAAA,EAAO,MAAA,CAAO,IAAI,CAAA;AAAA,MACvC;AAAA,IACF;AACA,IAAA,IAAA,CAAK,eAAA,CAAgB,GAAA,CAAI,WAAA,CAAY,IAAA,EAAM,MAAM,CAAA;AACjD,IAAA,IAAA,CAAK,aAAA,CAAc,GAAA,CAAI,WAAA,CAAY,IAAA,EAAM,OAAO,CAAA;AAAA,EAClD;AAAA,EAEA,YAAY,IAAA,EAAoD;AAC9D,IAAA,OAAO,KAAK,aAAA,CAAc,GAAA,CAAI,IAAI,CAAA,wBAAS,GAAA,EAAI;AAAA,EACjD;AAAA,EAEA,cAAc,OAAA,EAAkC;AAC9C,IAAA,MAAM,QAAA,GAAW,IAAA,CAAK,MAAA,CAAO,SAAA,CAAU,QAAQ,IAAI,CAAA;AAEnD,IAAA,MAAM,QAAA,GAAW,KAAK,SAAA,CAAU,CAAC,UAAU,OAAA,CAAQ,IAAA,EAAM,OAAA,CAAQ,MAAM,CAAC,CAAA;AACxE,IAAA,IAAI,IAAA,CAAK,kBAAA,CAAmB,GAAA,CAAI,QAAQ,CAAA,EAAG;AACzC,MAAA;AAAA,IACF;AACA,IAAA,MAAM,IAAA,GAAO,IAAA,CAAK,kBAAA,CAAmB,QAAQ,CAAA;AAC7C,IAAA,IAAA,CAAK,kBAAA,CAAmB,GAAA,CAAI,QAAA,EAAU,IAAI,CAAA;AAC1C,IAAA,IAAA,CAAK,eAAA,CAAgB,IAAI,IAAI,CAAA;AAC7B,IAAA,IAAA,CAAK,OAAA,CAAQC,yBAAa,qBAAqB,CAAA;AAC/C,IAAA,IAAA,CAAK,OAAA,CAAQA,yBAAa,aAAa,CAAA;AACvC,IAAA,IAAA,CAAK,KAAK,GAAA,CAAI;AAAA,MACZ,IAAA,EAAM,YAAA;AAAA,MACN,IAAA;AAAA,MACA,UAAA,EAAY,IAAA;AAAA,MACZ,IAAA,EAAM,eAAA,CAAgB,OAAA,CAAQ,IAAI,CAAA;AAAA,MAClC,QAAQ,OAAA,CAAQ,MAAA;AAAA,MAChB,UAAU;AAAC,KACZ,CAAA;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQQ,mBAAmB,IAAA,EAAsB;AAC/C,IAAA,IAAI,SAAA,GAAY,IAAA;AAChB,IAAA,KAAA,IAAS,QAAQ,CAAA,EAAG,IAAA,CAAK,gBAAgB,GAAA,CAAI,SAAS,GAAG,KAAA,EAAA,EAAS;AAChE,MAAA,SAAA,GAAY,CAAA,EAAG,IAAI,CAAA,EAAG,4BAA4B,GAAG,KAAK,CAAA,CAAA;AAAA,IAC5D;AACA,IAAA,OAAO,SAAA;AAAA,EACT;AAAA,EAEA,mBAAA,GAA4B;AAC1B,IAAA,IAAA,CAAK,OAAA,CAAQA,yBAAa,YAAY,CAAA;AAAA,EACxC;AAAA,EAEA,qBAAA,GAA8B;AAC5B,IAAA,IAAA,CAAK,OAAA,CAAQA,yBAAa,cAAc,CAAA;AAAA,EAC1C;AAAA,EAEA,aAAa,KAAA,EAAwC;AACnD,IAAA,IAAA,CAAK,IAAA,CAAK,aAAa,KAAK,CAAA;AAAA,EAC9B;AAAA,EAEA,aAAa,WAAA,EAA6B;AACxC,IAAA,OAAO,IAAA,CAAK,KAAA,CAAM,UAAA,CAAW,MAAA,CAAO,WAAW,CAAA;AAAA,EACjD;AAAA,EAEQ,QAAQ,MAAA,EAA0B;AACxC,IAAA,IAAI,CAAC,IAAA,CAAK,IAAA,CAAK,YAAA,CAAa,MAAA,CAAO,IAAI,CAAA,EAAG;AACxC,MAAA,IAAA,CAAK,IAAA,CAAK,GAAA,CAAI,EAAE,IAAA,EAAM,gBAAA,EAAkB,IAAA,EAAM,MAAA,CAAO,IAAA,EAAM,IAAA,EAAM,MAAA,CAAO,IAAA,EAAM,CAAA;AAAA,IAChF;AAAA,EACF;AACF;AAEA,SAAS,gBAAgB,IAAA,EAAsB;AAC7C,EAAA,OAAOC,yBAAYD,wBAAA,CAAa,aAAA,CAAc,IAAA,EAAM,CAAC,IAAI,CAAC,CAAA;AAC5D;;"}

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

@@ -6,7 +6,10 @@ import { OperationKeys } from './operation-keys.mjs';
 import { FIRST_SCHEMA_NAMES } from './shared-enum-names.mjs';
 
 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 +19,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) {

package/dist/application/transform/footer/document-footer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"document-footer.mjs","sources":["../../../../src/application/transform/footer/document-footer.ts"],"sourcesContent":["import { irReference } from \"../../../domain/ir/constructors.js\";\nimport type {\n  IrDeclaration,\n  IrEnumDeclaration,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport { HELPER_TYPES, type HelperType } from \"../helper-types.js\";\nimport type {\n  EnumDeclarationRequest,\n  EnumMemberMetadata,\n  EnumValuesRequest,\n} from \"../schema/schema-context.js\";\nimport type { DocumentFooter } from \"../transform-context.js\";\nimport { EnumNameClaims } from \"./enum-name-claims.js\";\nimport {\n  type DeclaredMembers,\n  EnumNaming,\n  enumDeclaration,\n  withoutDeclaredMembers,\n} from \"./enum-naming.js\";\nimport { OperationKeys } from \"./operation-keys.js\";\nimport { FIRST_SCHEMA_NAMES, type SharedEnumNames } from \"./shared-enum-names.js\";\n\n/** Where footer declarations go, in order: the run's `ctx.injectFooter`, open to user code. */\nexport interface FooterSink {\n  /** Whether a type alias with this name is declared already (by the generator or a user). */\n  hasTypeAlias(name: string): boolean;\n  add(declaration: IrDeclaration): void;\n  /** Add a member to the `operations` interface, declared first if needed; see `DocumentFooter`. */\n  addOperation(build: () => IrPropertySignature): void;\n}\n\n/**\n * The `--dedupe-enums` key of the original: the values in default sort order, each paired with\n * the metadata at its sorted position (not the value's own metadata), as the original does.\n */\nfunction dedupeKey(request: EnumDeclarationRequest): string {\n  return [...request.values]\n    .sort(compareAsStrings)\n    .map((value, index) => metadataKey(String(value), request.metadata[index]))\n    .join(\",\");\n}\n\n/** `Array.prototype.sort` without a comparator: compares the values as strings. */\nfunction compareAsStrings(left: string | number, right: string | number): number {\n  const leftText = String(left);\n  const rightText = String(right);\n  if (leftText === rightText) {\n    return 0;\n  }\n  return leftText < rightText ? -1 : 1;\n}\n\nfunction metadataKey(value: string, metadata: EnumMemberMetadata | undefined): string {\n  return `${metadata?.name ?? value}:${metadata?.description || \"\"}`;\n}\n\n/** Separates a repeated `--enum-values` array name from its number, as root type aliases do. */\nconst ENUM_VALUES_NUMBER_SEPARATOR = \"_\";\n\n/** The whole declaration: an equal key means the same enum, member for member. */\nfunction declarationKey(name: string, request: EnumDeclarationRequest): string {\n  return JSON.stringify([name, request.values, request.metadata]);\n}\n\n/** The naming state a run's footer shares with the rest of the run. */\nexport interface RunFooterNames {\n  readonly enums: EnumNameClaims;\n  readonly operations: OperationKeys;\n}\n\n/**\n * The footer of one run: enums (deduplicated with `--dedupe-enums`), `--enum-values` arrays, the\n * helper types they need, and the `operations` interface. Replaces the original's module-level\n * `enumCache`, so runs no longer share enums (research/legacy-bugs.md, item 3).\n */\nexport class RunFooter implements DocumentFooter {\n  private readonly naming = new EnumNaming();\n  private readonly enumNamesByKey = new Map<string, string>();\n  /** Declarations added already: the same one twice fails with \"Duplicate identifier\". */\n  private readonly declaredEnums = new Set<string>();\n  /** The member names of each declared enum, by value. */\n  private readonly membersByEnum = new Map<string, Map<string | number, string>>();\n  /** The members of each declared enum name, by member name. */\n  private readonly declaredMembers = new Map<string, Map<string, string | number>>();\n  /** `--enum-values` arrays added already: their declared name by name, type and values. */\n  private readonly declaredEnumValues = new Map<string, string>();\n  /** The declared `--enum-values` array names. */\n  private readonly enumValuesNames = new Set<string>();\n  private readonly sink: FooterSink;\n  private readonly isDedupingEnums: boolean;\n  private readonly sharedNames: SharedEnumNames;\n  private readonly names: RunFooterNames;\n\n  constructor(\n    sink: FooterSink,\n    isDedupingEnums: boolean,\n    sharedNames: SharedEnumNames = FIRST_SCHEMA_NAMES,\n    names: RunFooterNames = { enums: new EnumNameClaims(), operations: new OperationKeys() },\n  ) {\n    this.sink = sink;\n    this.isDedupingEnums = isDedupingEnums;\n    this.sharedNames = sharedNames;\n    this.names = names;\n  }\n\n  addEnum(request: EnumDeclarationRequest): string {\n    // The name is built before the cache lookup: it advances the naming state either way.\n    const ownName = this.naming.enumName(request.name);\n    const key = this.isDedupingEnums ? dedupeKey(request) : null;\n    // Every schema of a shared enum goes to `sharedNames`, the later ones too.\n    const sharedName = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);\n    const known = key === null ? undefined : this.enumNamesByKey.get(key);\n    if (known !== undefined) {\n      return known;\n    }\n    // The owner is the schema location: its requests share one enum, with `--dedupe-enums` too.\n    const name = this.names.enums.nameFor(sharedName, request.name);\n    // Only a repeated member fails to compile; two empty declarations merge, so they stay.\n    const declared = request.values.length > 0 ? declarationKey(name, request) : null;\n    if (declared !== null && this.declaredEnums.has(declared)) {\n      return name;\n    }\n    if (declared !== null) {\n      this.declaredEnums.add(declared);\n    }\n    const declaration = this.withoutRepeats(enumDeclaration(name, request, this.naming));\n    if (declaration !== null) {\n      this.record(declaration);\n      this.sink.add(declaration);\n    }\n    if (key !== null) {\n      this.enumNamesByKey.set(key, name);\n    }\n    return name;\n  }\n\n  /** The declaration without members an earlier one of the name has; null when none is left. */\n  private withoutRepeats(declaration: IrEnumDeclaration): IrEnumDeclaration | null {\n    const earlier: DeclaredMembers | undefined = this.declaredMembers.get(declaration.name);\n    if (earlier === undefined) {\n      return declaration;\n    }\n    const merged = withoutDeclaredMembers(declaration, earlier);\n    // Two empty declarations merge into one empty enum, which compiles, so the second stays.\n    return merged.members.length === 0 && declaration.members.length > 0 ? null : merged;\n  }\n\n  /** The members of a declaration; the first member of a value names it. */\n  private record(declaration: IrEnumDeclaration): void {\n    const byName = this.declaredMembers.get(declaration.name) ?? new Map();\n    const byValue = this.membersByEnum.get(declaration.name) ?? new Map();\n    for (const member of declaration.members) {\n      byName.set(member.name, member.value);\n      if (!byValue.has(member.value)) {\n        byValue.set(member.value, member.name);\n      }\n    }\n    this.declaredMembers.set(declaration.name, byName);\n    this.membersByEnum.set(declaration.name, byValue);\n  }\n\n  enumMembers(name: string): ReadonlyMap<string | number, string> {\n    return this.membersByEnum.get(name) ?? new Map();\n  }\n\n  addEnumValues(request: EnumValuesRequest): void {\n    const baseName = this.naming.arrayName(request.name);\n    // The same array twice fails with \"Cannot redeclare\"; a schema typed twice adds it twice.\n    const declared = JSON.stringify([baseName, request.type, request.values]);\n    if (this.declaredEnumValues.has(declared)) {\n      return;\n    }\n    const name = this.freeEnumValuesName(baseName);\n    this.declaredEnumValues.set(declared, name);\n    this.enumValuesNames.add(name);\n    this.require(HELPER_TYPES.flattenedDeepRequired);\n    this.require(HELPER_TYPES.readonlyArray);\n    this.sink.add({\n      kind: \"constArray\",\n      name,\n      isExported: true,\n      type: readonlyArrayOf(request.type),\n      values: request.values,\n      comments: [],\n    });\n  }\n\n  /**\n   * Another array may have the name: `Discount/type` and `discount/type`, or a property and an\n   * inline `allOf` item of one schema, typed at one location. A redeclared `const` does not\n   * compile, so a later one gets the next number (`discountTypeValues_2`). Every unnumbered name\n   * ends with `Values`, so a number never takes a name that a later array needs.\n   */\n  private freeEnumValuesName(name: string): string {\n    let candidate = name;\n    for (let count = 2; this.enumValuesNames.has(candidate); count++) {\n      candidate = `${name}${ENUM_VALUES_NUMBER_SEPARATOR}${count}`;\n    }\n    return candidate;\n  }\n\n  requireWithRequired(): void {\n    this.require(HELPER_TYPES.withRequired);\n  }\n\n  requirePropertyValues(): void {\n    this.require(HELPER_TYPES.propertyValues);\n  }\n\n  addOperation(build: () => IrPropertySignature): void {\n    this.sink.addOperation(build);\n  }\n\n  operationKey(operationId: string): string {\n    return this.names.operations.keyFor(operationId);\n  }\n\n  private require(helper: HelperType): void {\n    if (!this.sink.hasTypeAlias(helper.name)) {\n      this.sink.add({ kind: \"rawDeclaration\", name: helper.name, text: helper.text });\n    }\n  }\n}\n\nfunction readonlyArrayOf(type: IrType): IrType {\n  return irReference(HELPER_TYPES.readonlyArray.name, [type]);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"document-footer.mjs","sources":["../../../../src/application/transform/footer/document-footer.ts"],"sourcesContent":["import { irReference } from \"../../../domain/ir/constructors.js\";\nimport type {\n  IrDeclaration,\n  IrEnumDeclaration,\n  IrPropertySignature,\n  IrType,\n} from \"../../../domain/ir/nodes.js\";\nimport { HELPER_TYPES, type HelperType } from \"../helper-types.js\";\nimport type {\n  EnumDeclarationRequest,\n  EnumMemberMetadata,\n  EnumValuesRequest,\n} from \"../schema/schema-context.js\";\nimport type { DocumentFooter } from \"../transform-context.js\";\nimport { EnumNameClaims } from \"./enum-name-claims.js\";\nimport {\n  type DeclaredMembers,\n  EnumNaming,\n  enumDeclaration,\n  withoutDeclaredMembers,\n} from \"./enum-naming.js\";\nimport { OperationKeys } from \"./operation-keys.js\";\nimport { FIRST_SCHEMA_NAMES, type SharedEnumNames } from \"./shared-enum-names.js\";\n\n/** Where footer declarations go, in order: the run's `ctx.injectFooter`, open to user code. */\nexport interface FooterSink {\n  /** Whether a type alias with this name is declared already (by the generator or a user). */\n  hasTypeAlias(name: string): boolean;\n  add(declaration: IrDeclaration): void;\n  /** Add a member to the `operations` interface, declared first if needed; see `DocumentFooter`. */\n  addOperation(build: () => IrPropertySignature): void;\n}\n\n/**\n * The `--dedupe-enums` key. Two enums share a declaration only when the original shares it and\n * each value has the same name and description in both. The original key pairs the values in\n * default sort order with the metadata at the sorted position, not with the value's own metadata,\n * so `[desc, asc]` and `[asc, desc]`, both named `[Desc, Asc]`, shared one declaration, and one of\n * them typed `asc` as `Desc = \"desc\"`. The original also joined `name:description` texts with\n * `,`, and a member name stood in for its value, so enums with other values (`\"1\"` and `1`, `A`\n * and `1` both named `Active`, `[\"a\", \"b\"]` and `[\"a:,b\"]`) shared one key. As JSON, an equal key\n * means the same values and metadata; enums the original kept apart still are.\n */\nfunction dedupeKey(request: EnumDeclarationRequest): string {\n  const sorted = [...request.values].sort(compareAsStrings);\n  const originalPairs = sorted.map((value, index) => memberKey(value, request.metadata[index]));\n  const ownPairs = request.values\n    .map((value, index) => ({ value, member: memberKey(value, request.metadata[index]) }))\n    .sort((left, right) => compareAsStrings(left.value, right.value))\n    .map(({ member }) => member);\n  return JSON.stringify([originalPairs, ownPairs]);\n}\n\n/** `Array.prototype.sort` without a comparator: compares the values as strings. */\nfunction compareAsStrings(left: string | number, right: string | number): number {\n  const leftText = String(left);\n  const rightText = String(right);\n  if (leftText === rightText) {\n    return 0;\n  }\n  return leftText < rightText ? -1 : 1;\n}\n\n/** One member: the value (JSON keeps `\"1\"` and `1` apart), its name and its description. */\nfunction memberKey(value: string | number, metadata: EnumMemberMetadata | undefined) {\n  return [value, metadata?.name ?? null, metadata?.description || null];\n}\n\n/** Separates a repeated `--enum-values` array name from its number, as root type aliases do. */\nconst ENUM_VALUES_NUMBER_SEPARATOR = \"_\";\n\n/** The whole declaration: an equal key means the same enum, member for member. */\nfunction declarationKey(name: string, request: EnumDeclarationRequest): string {\n  return JSON.stringify([name, request.values, request.metadata]);\n}\n\n/** The naming state a run's footer shares with the rest of the run. */\nexport interface RunFooterNames {\n  readonly enums: EnumNameClaims;\n  readonly operations: OperationKeys;\n}\n\n/**\n * The footer of one run: enums (deduplicated with `--dedupe-enums`), `--enum-values` arrays, the\n * helper types they need, and the `operations` interface. Replaces the original's module-level\n * `enumCache`, so runs no longer share enums (research/legacy-bugs.md, item 3).\n */\nexport class RunFooter implements DocumentFooter {\n  private readonly naming = new EnumNaming();\n  private readonly enumNamesByKey = new Map<string, string>();\n  /** Declarations added already: the same one twice fails with \"Duplicate identifier\". */\n  private readonly declaredEnums = new Set<string>();\n  /** The member names of each declared enum, by value. */\n  private readonly membersByEnum = new Map<string, Map<string | number, string>>();\n  /** The members of each declared enum name, by member name. */\n  private readonly declaredMembers = new Map<string, Map<string, string | number>>();\n  /** `--enum-values` arrays added already: their declared name by name, type and values. */\n  private readonly declaredEnumValues = new Map<string, string>();\n  /** The declared `--enum-values` array names. */\n  private readonly enumValuesNames = new Set<string>();\n  private readonly sink: FooterSink;\n  private readonly isDedupingEnums: boolean;\n  private readonly sharedNames: SharedEnumNames;\n  private readonly names: RunFooterNames;\n\n  constructor(\n    sink: FooterSink,\n    isDedupingEnums: boolean,\n    sharedNames: SharedEnumNames = FIRST_SCHEMA_NAMES,\n    names: RunFooterNames = { enums: new EnumNameClaims(), operations: new OperationKeys() },\n  ) {\n    this.sink = sink;\n    this.isDedupingEnums = isDedupingEnums;\n    this.sharedNames = sharedNames;\n    this.names = names;\n  }\n\n  addEnum(request: EnumDeclarationRequest): string {\n    // The name is built before the cache lookup: it advances the naming state either way.\n    const ownName = this.naming.enumName(request.name);\n    const key = this.isDedupingEnums ? dedupeKey(request) : null;\n    // Every schema of a shared enum goes to `sharedNames`, the later ones too.\n    const sharedName = key === null ? ownName : this.sharedNames.nameOf(key, ownName, request);\n    const known = key === null ? undefined : this.enumNamesByKey.get(key);\n    if (known !== undefined) {\n      return known;\n    }\n    // The owner is the schema location: its requests share one enum, with `--dedupe-enums` too.\n    const name = this.names.enums.nameFor(sharedName, request.name);\n    // Only a repeated member fails to compile; two empty declarations merge, so they stay.\n    const declared = request.values.length > 0 ? declarationKey(name, request) : null;\n    if (declared !== null && this.declaredEnums.has(declared)) {\n      return name;\n    }\n    if (declared !== null) {\n      this.declaredEnums.add(declared);\n    }\n    const declaration = this.withoutRepeats(enumDeclaration(name, request, this.naming));\n    if (declaration !== null) {\n      this.record(declaration);\n      this.sink.add(declaration);\n    }\n    if (key !== null) {\n      this.enumNamesByKey.set(key, name);\n    }\n    return name;\n  }\n\n  /** The declaration without members an earlier one of the name has; null when none is left. */\n  private withoutRepeats(declaration: IrEnumDeclaration): IrEnumDeclaration | null {\n    const earlier: DeclaredMembers | undefined = this.declaredMembers.get(declaration.name);\n    if (earlier === undefined) {\n      return declaration;\n    }\n    const merged = withoutDeclaredMembers(declaration, earlier);\n    // Two empty declarations merge into one empty enum, which compiles, so the second stays.\n    return merged.members.length === 0 && declaration.members.length > 0 ? null : merged;\n  }\n\n  /** The members of a declaration; the first member of a value names it. */\n  private record(declaration: IrEnumDeclaration): void {\n    const byName = this.declaredMembers.get(declaration.name) ?? new Map();\n    const byValue = this.membersByEnum.get(declaration.name) ?? new Map();\n    for (const member of declaration.members) {\n      byName.set(member.name, member.value);\n      if (!byValue.has(member.value)) {\n        byValue.set(member.value, member.name);\n      }\n    }\n    this.declaredMembers.set(declaration.name, byName);\n    this.membersByEnum.set(declaration.name, byValue);\n  }\n\n  enumMembers(name: string): ReadonlyMap<string | number, string> {\n    return this.membersByEnum.get(name) ?? new Map();\n  }\n\n  addEnumValues(request: EnumValuesRequest): void {\n    const baseName = this.naming.arrayName(request.name);\n    // The same array twice fails with \"Cannot redeclare\"; a schema typed twice adds it twice.\n    const declared = JSON.stringify([baseName, request.type, request.values]);\n    if (this.declaredEnumValues.has(declared)) {\n      return;\n    }\n    const name = this.freeEnumValuesName(baseName);\n    this.declaredEnumValues.set(declared, name);\n    this.enumValuesNames.add(name);\n    this.require(HELPER_TYPES.flattenedDeepRequired);\n    this.require(HELPER_TYPES.readonlyArray);\n    this.sink.add({\n      kind: \"constArray\",\n      name,\n      isExported: true,\n      type: readonlyArrayOf(request.type),\n      values: request.values,\n      comments: [],\n    });\n  }\n\n  /**\n   * Another array may have the name: `Discount/type` and `discount/type`, or a property and an\n   * inline `allOf` item of one schema, typed at one location. A redeclared `const` does not\n   * compile, so a later one gets the next number (`discountTypeValues_2`). Every unnumbered name\n   * ends with `Values`, so a number never takes a name that a later array needs.\n   */\n  private freeEnumValuesName(name: string): string {\n    let candidate = name;\n    for (let count = 2; this.enumValuesNames.has(candidate); count++) {\n      candidate = `${name}${ENUM_VALUES_NUMBER_SEPARATOR}${count}`;\n    }\n    return candidate;\n  }\n\n  requireWithRequired(): void {\n    this.require(HELPER_TYPES.withRequired);\n  }\n\n  requirePropertyValues(): void {\n    this.require(HELPER_TYPES.propertyValues);\n  }\n\n  addOperation(build: () => IrPropertySignature): void {\n    this.sink.addOperation(build);\n  }\n\n  operationKey(operationId: string): string {\n    return this.names.operations.keyFor(operationId);\n  }\n\n  private require(helper: HelperType): void {\n    if (!this.sink.hasTypeAlias(helper.name)) {\n      this.sink.add({ kind: \"rawDeclaration\", name: helper.name, text: helper.text });\n    }\n  }\n}\n\nfunction readonlyArrayOf(type: IrType): IrType {\n  return irReference(HELPER_TYPES.readonlyArray.name, [type]);\n}\n"],"names":[],"mappings":"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"}

package/dist/application/transform/helper-types.cjs

@@ -46,9 +46,9 @@ const READ_WRITE_MARKER_TYPES = lines(
   "};",
   "type ReadWritePrimitive = string | number | boolean | bigint | symbol | null | undefined;",
   "type ReadWriteLeaf = ReadWritePrimitive | ((...args: never) => unknown);",
-  "type ReadWriteMarkedKeys<T, Marker> = {",
-  "    [K in keyof T]-?: 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : NonNullable<T[K]> extends Marker ? K : never;",
-  "}[keyof T];",
+  "type ReadWriteMarkedKeys<T, Marker> = keyof {",
+  "    [K in keyof T as 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : NonNullable<T[K]> extends Marker ? K : never]: never;",
+  "};",
   'type ReadWriteResolveArray<T extends readonly unknown[], Resolved extends "read" | "write"> = T[number][] extends T ? T extends unknown[] ? ReadWriteResolve<T[number], Resolved>[] : readonly ReadWriteResolve<T[number], Resolved>[] : {',
   "    [K in keyof T]: ReadWriteResolve<T[K], Resolved>;",
   "};",

package/dist/application/transform/helper-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"helper-types.cjs","sources":["../../../src/application/transform/helper-types.ts"],"sourcesContent":["/**\n * The helper type aliases the generator adds to the footer, declared once each. The text is the\n * original's source text as the TypeScript printer printed it, so printing it as written gives\n * the original output (ENGINEERING_PLAN 6.2 and 6.6), except for the fixes noted below.\n */\nexport interface HelperType {\n  readonly name: string;\n  readonly text: string;\n}\n\nfunction lines(...parts: readonly string[]): string {\n  return parts.join(\"\\n\");\n}\n\nexport const HELPER_TYPES = {\n  withRequired: {\n    name: \"WithRequired\",\n    text: lines(\"type WithRequired<T, K extends keyof T> = T & {\", \"    [P in K]-?: T[P];\", \"};\"),\n  },\n  // `unevaluated-properties` (roadmap R11): the value types of every member of a union, so a\n  // `$ref` to a `oneOf` schema gives the values of each variant, not only of the shared keys.\n  propertyValues: {\n    name: \"PropertyValues\",\n    text: \"type PropertyValues<T> = T extends unknown ? T[keyof T] : never;\",\n  },\n  // Task 7.4 changes the original text on purpose: `readonly unknown[]` also flattens the arrays\n  // of `--immutable` (upstream #2714, #2749), and `NonNullable` looks through nullable parents\n  // (upstream #2737). The old text did not compile for those schemas.\n  flattenedDeepRequired: {\n    name: \"FlattenedDeepRequired\",\n    text: lines(\n      \"type FlattenedDeepRequired<T> = {\",\n      \"    [K in keyof T]-?: FlattenedDeepRequired<T[K] extends readonly unknown[] | undefined | \" +\n        \"null ? Extract<T[K], readonly unknown[]>[number] : NonNullable<T[K]>>;\",\n      \"};\",\n    ),\n  },\n  // `readonly unknown[]`: a readonly array value type stays as is (upstream #2749).\n  readonlyArray: {\n    name: \"ReadonlyArray\",\n    text: lines(\n      \"type ReadonlyArray<T> = [\",\n      \"    Exclude<T, undefined>\",\n      \"] extends [\",\n      \"    readonly unknown[]\",\n      \"] ? Readonly<Exclude<T, undefined>> : Readonly<Exclude<T, undefined>[]>;\",\n    ),\n  },\n} as const satisfies Readonly<Record<string, HelperType>>;\n\n/**\n * The `--read-write-markers` helper types, written before the root types. Task 7.6 replaces the\n * original text on purpose (ADR-014): primitives (also branded), readonly arrays, tuples,\n * intersected arrays, null-only and `any` properties keep their types (upstream #2615, #2620,\n * #2632, #2717, #2765). The declarations equal the `Readable` / `Writable` that\n * openapi-typesafe-fetch declares (`test/api/read-write-marker-types.test.ts`); the text is what\n * the TypeScript printer prints.\n */\nexport const READ_WRITE_MARKER_TYPES = lines(\n  \"export type $Read<T> = {\",\n  \"    readonly $read: T;\",\n  \"};\",\n  \"export type $Write<T> = {\",\n  \"    readonly $write: T;\",\n  \"};\",\n  \"type ReadWritePrimitive = string | number | boolean | bigint | symbol | null | undefined;\",\n  \"type ReadWriteLeaf = ReadWritePrimitive | ((...args: never) => unknown);\",\n  \"type ReadWriteMarkedKeys<T, Marker> = {\",\n  \"    [K in keyof T]-?: 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : \" +\n    \"NonNullable<T[K]> extends Marker ? K : never;\",\n  \"}[keyof T];\",\n  'type ReadWriteResolveArray<T extends readonly unknown[], Resolved extends \"read\" | ' +\n    '\"write\"> = T[number][] extends T ? T extends unknown[] ? ReadWriteResolve<T[number], ' +\n    \"Resolved>[] : readonly ReadWriteResolve<T[number], Resolved>[] : {\",\n  \"    [K in keyof T]: ReadWriteResolve<T[K], Resolved>;\",\n  \"};\",\n  'type ReadWriteResolve<T, Resolved extends \"read\" | \"write\"> = Resolved extends \"read\" ? ' +\n    \"Readable<T> : Writable<T>;\",\n  \"export type Readable<T> = T extends $Write<any> ? never : T extends $Read<infer U> ? \" +\n    \"Readable<U> : T extends ReadWriteLeaf ? T : T extends readonly unknown[] ? \" +\n    'ReadWriteResolveArray<T, \"read\"> : T extends object ? {',\n  \"    [K in keyof T as K extends ReadWriteMarkedKeys<T, $Write<any>> ? never : K]: \" +\n    \"Readable<T[K]>;\",\n  \"} : T;\",\n  \"export type Writable<T> = T extends $Read<any> ? never : T extends $Write<infer U> ? \" +\n    \"Writable<U> : T extends ReadWriteLeaf ? T : T extends readonly unknown[] ? \" +\n    'ReadWriteResolveArray<T, \"write\"> : T extends object ? {',\n  \"    [K in keyof T as K extends ReadWriteMarkedKeys<T, $Read<any>> ? never : K]: \" +\n    \"Writable<T[K]>;\",\n  \"} & {\",\n  \"    [K in ReadWriteMarkedKeys<T, $Read<any>>]?: never;\",\n  \"} : T;\",\n);\n"],"names":[],"mappings":";;AAUA,SAAS,SAAS,KAAA,EAAkC;AAClD,EAAA,OAAO,KAAA,CAAM,KAAK,IAAI,CAAA;AACxB;AAEO,MAAM,YAAA,GAAe;AAAA,EAC1B,YAAA,EAAc;AAAA,IACZ,IAAA,EAAM,cAAA;AAAA,IACN,IAAA,EAAM,KAAA,CAAM,iDAAA,EAAmD,uBAAA,EAAyB,IAAI;AAAA,GAC9F;AAAA;AAAA;AAAA,EAGA,cAAA,EAAgB;AAAA,IACd,IAAA,EAAM,gBAAA;AAAA,IACN,IAAA,EAAM;AAAA,GACR;AAAA;AAAA;AAAA;AAAA,EAIA,qBAAA,EAAuB;AAAA,IACrB,IAAA,EAAM,uBAAA;AAAA,IACN,IAAA,EAAM,KAAA;AAAA,MACJ,mCAAA;AAAA,MACA,kKAAA;AAAA,MAEA;AAAA;AACF,GACF;AAAA;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,IAAA,EAAM,eAAA;AAAA,IACN,IAAA,EAAM,KAAA;AAAA,MACJ,2BAAA;AAAA,MACA,2BAAA;AAAA,MACA,aAAA;AAAA,MACA,wBAAA;AAAA,MACA;AAAA;AACF;AAEJ;AAUO,MAAM,uBAAA,GAA0B,KAAA;AAAA,EACrC,0BAAA;AAAA,EACA,wBAAA;AAAA,EACA,IAAA;AAAA,EACA,2BAAA;AAAA,EACA,yBAAA;AAAA,EACA,IAAA;AAAA,EACA,2FAAA;AAAA,EACA,0EAAA;AAAA,EACA,yCAAA;AAAA,EACA,4IAAA;AAAA,EAEA,aAAA;AAAA,EACA,4OAAA;AAAA,EAGA,uDAAA;AAAA,EACA,IAAA;AAAA,EACA,oHAAA;AAAA,EAEA,yNAAA;AAAA,EAGA,kGAAA;AAAA,EAEA,QAAA;AAAA,EACA,0NAAA;AAAA,EAGA,iGAAA;AAAA,EAEA,OAAA;AAAA,EACA,wDAAA;AAAA,EACA;AACF;;;"}
+{"version":3,"file":"helper-types.cjs","sources":["../../../src/application/transform/helper-types.ts"],"sourcesContent":["/**\n * The helper type aliases the generator adds to the footer, declared once each. The text is the\n * original's source text as the TypeScript printer printed it, so printing it as written gives\n * the original output (ENGINEERING_PLAN 6.2 and 6.6), except for the fixes noted below.\n */\nexport interface HelperType {\n  readonly name: string;\n  readonly text: string;\n}\n\nfunction lines(...parts: readonly string[]): string {\n  return parts.join(\"\\n\");\n}\n\nexport const HELPER_TYPES = {\n  withRequired: {\n    name: \"WithRequired\",\n    text: lines(\"type WithRequired<T, K extends keyof T> = T & {\", \"    [P in K]-?: T[P];\", \"};\"),\n  },\n  // `unevaluated-properties` (roadmap R11): the value types of every member of a union, so a\n  // `$ref` to a `oneOf` schema gives the values of each variant, not only of the shared keys.\n  propertyValues: {\n    name: \"PropertyValues\",\n    text: \"type PropertyValues<T> = T extends unknown ? T[keyof T] : never;\",\n  },\n  // Task 7.4 changes the original text on purpose: `readonly unknown[]` also flattens the arrays\n  // of `--immutable` (upstream #2714, #2749), and `NonNullable` looks through nullable parents\n  // (upstream #2737). The old text did not compile for those schemas.\n  flattenedDeepRequired: {\n    name: \"FlattenedDeepRequired\",\n    text: lines(\n      \"type FlattenedDeepRequired<T> = {\",\n      \"    [K in keyof T]-?: FlattenedDeepRequired<T[K] extends readonly unknown[] | undefined | \" +\n        \"null ? Extract<T[K], readonly unknown[]>[number] : NonNullable<T[K]>>;\",\n      \"};\",\n    ),\n  },\n  // `readonly unknown[]`: a readonly array value type stays as is (upstream #2749).\n  readonlyArray: {\n    name: \"ReadonlyArray\",\n    text: lines(\n      \"type ReadonlyArray<T> = [\",\n      \"    Exclude<T, undefined>\",\n      \"] extends [\",\n      \"    readonly unknown[]\",\n      \"] ? Readonly<Exclude<T, undefined>> : Readonly<Exclude<T, undefined>[]>;\",\n    ),\n  },\n} as const satisfies Readonly<Record<string, HelperType>>;\n\n/**\n * The `--read-write-markers` helper types, written before the root types. Task 7.6 replaces the\n * original text on purpose (ADR-014): primitives (also branded), readonly arrays, tuples,\n * intersected arrays, null-only and `any` properties keep their types (upstream #2615, #2620,\n * #2632, #2717, #2765). The declarations equal the `Readable` / `Writable` that\n * openapi-typesafe-fetch declares (`test/api/read-write-marker-types.test.ts`); the text is what\n * the TypeScript printer prints.\n */\nexport const READ_WRITE_MARKER_TYPES = lines(\n  \"export type $Read<T> = {\",\n  \"    readonly $read: T;\",\n  \"};\",\n  \"export type $Write<T> = {\",\n  \"    readonly $write: T;\",\n  \"};\",\n  \"type ReadWritePrimitive = string | number | boolean | bigint | symbol | null | undefined;\",\n  \"type ReadWriteLeaf = ReadWritePrimitive | ((...args: never) => unknown);\",\n  \"type ReadWriteMarkedKeys<T, Marker> = keyof {\",\n  \"    [K in keyof T as 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : \" +\n    \"NonNullable<T[K]> extends Marker ? K : never]: never;\",\n  \"};\",\n  'type ReadWriteResolveArray<T extends readonly unknown[], Resolved extends \"read\" | ' +\n    '\"write\"> = T[number][] extends T ? T extends unknown[] ? ReadWriteResolve<T[number], ' +\n    \"Resolved>[] : readonly ReadWriteResolve<T[number], Resolved>[] : {\",\n  \"    [K in keyof T]: ReadWriteResolve<T[K], Resolved>;\",\n  \"};\",\n  'type ReadWriteResolve<T, Resolved extends \"read\" | \"write\"> = Resolved extends \"read\" ? ' +\n    \"Readable<T> : Writable<T>;\",\n  \"export type Readable<T> = T extends $Write<any> ? never : T extends $Read<infer U> ? \" +\n    \"Readable<U> : T extends ReadWriteLeaf ? T : T extends readonly unknown[] ? \" +\n    'ReadWriteResolveArray<T, \"read\"> : T extends object ? {',\n  \"    [K in keyof T as K extends ReadWriteMarkedKeys<T, $Write<any>> ? never : K]: \" +\n    \"Readable<T[K]>;\",\n  \"} : T;\",\n  \"export type Writable<T> = T extends $Read<any> ? never : T extends $Write<infer U> ? \" +\n    \"Writable<U> : T extends ReadWriteLeaf ? T : T extends readonly unknown[] ? \" +\n    'ReadWriteResolveArray<T, \"write\"> : T extends object ? {',\n  \"    [K in keyof T as K extends ReadWriteMarkedKeys<T, $Read<any>> ? never : K]: \" +\n    \"Writable<T[K]>;\",\n  \"} & {\",\n  \"    [K in ReadWriteMarkedKeys<T, $Read<any>>]?: never;\",\n  \"} : T;\",\n);\n"],"names":[],"mappings":";;AAUA,SAAS,SAAS,KAAA,EAAkC;AAClD,EAAA,OAAO,KAAA,CAAM,KAAK,IAAI,CAAA;AACxB;AAEO,MAAM,YAAA,GAAe;AAAA,EAC1B,YAAA,EAAc;AAAA,IACZ,IAAA,EAAM,cAAA;AAAA,IACN,IAAA,EAAM,KAAA,CAAM,iDAAA,EAAmD,uBAAA,EAAyB,IAAI;AAAA,GAC9F;AAAA;AAAA;AAAA,EAGA,cAAA,EAAgB;AAAA,IACd,IAAA,EAAM,gBAAA;AAAA,IACN,IAAA,EAAM;AAAA,GACR;AAAA;AAAA;AAAA;AAAA,EAIA,qBAAA,EAAuB;AAAA,IACrB,IAAA,EAAM,uBAAA;AAAA,IACN,IAAA,EAAM,KAAA;AAAA,MACJ,mCAAA;AAAA,MACA,kKAAA;AAAA,MAEA;AAAA;AACF,GACF;AAAA;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,IAAA,EAAM,eAAA;AAAA,IACN,IAAA,EAAM,KAAA;AAAA,MACJ,2BAAA;AAAA,MACA,2BAAA;AAAA,MACA,aAAA;AAAA,MACA,wBAAA;AAAA,MACA;AAAA;AACF;AAEJ;AAUO,MAAM,uBAAA,GAA0B,KAAA;AAAA,EACrC,0BAAA;AAAA,EACA,wBAAA;AAAA,EACA,IAAA;AAAA,EACA,2BAAA;AAAA,EACA,yBAAA;AAAA,EACA,IAAA;AAAA,EACA,2FAAA;AAAA,EACA,0EAAA;AAAA,EACA,+CAAA;AAAA,EACA,mJAAA;AAAA,EAEA,IAAA;AAAA,EACA,4OAAA;AAAA,EAGA,uDAAA;AAAA,EACA,IAAA;AAAA,EACA,oHAAA;AAAA,EAEA,yNAAA;AAAA,EAGA,kGAAA;AAAA,EAEA,QAAA;AAAA,EACA,0NAAA;AAAA,EAGA,iGAAA;AAAA,EAEA,OAAA;AAAA,EACA,wDAAA;AAAA,EACA;AACF;;;"}

package/dist/application/transform/helper-types.mjs

@@ -44,9 +44,9 @@ const READ_WRITE_MARKER_TYPES = lines(
   "};",
   "type ReadWritePrimitive = string | number | boolean | bigint | symbol | null | undefined;",
   "type ReadWriteLeaf = ReadWritePrimitive | ((...args: never) => unknown);",
-  "type ReadWriteMarkedKeys<T, Marker> = {",
-  "    [K in keyof T]-?: 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : NonNullable<T[K]> extends Marker ? K : never;",
-  "}[keyof T];",
+  "type ReadWriteMarkedKeys<T, Marker> = keyof {",
+  "    [K in keyof T as 0 extends 1 & T[K] ? never : NonNullable<T[K]> extends never ? never : NonNullable<T[K]> extends Marker ? K : never]: never;",
+  "};",
   'type ReadWriteResolveArray<T extends readonly unknown[], Resolved extends "read" | "write"> = T[number][] extends T ? T extends unknown[] ? ReadWriteResolve<T[number], Resolved>[] : readonly ReadWriteResolve<T[number], Resolved>[] : {',
   "    [K in keyof T]: ReadWriteResolve<T[K], Resolved>;",
   "};",