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

package/dist/application/transform/schema/composition-type.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"composition-type.mjs","sources":["../../../../src/application/transform/schema/composition-type.ts"],"sourcesContent":["import { irKeyword, irRecord } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { Schema, SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport {\n  intersectionOf,\n  isPrimitiveType,\n  nullableOf,\n  omitKeys,\n  unionOf,\n  withRequiredKeys,\n} from \"../type-combinators.js\";\nimport { coreType } from \"./core-type.js\";\nimport { allOfMembers } from \"./presence-members.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\nimport { unevaluatedPropertiesType } from \"./unevaluated-properties.js\";\n\n/** `anyOf` / `oneOf` variants; the position is part of the path so nested names stay unique. */\nfunction variantTypes(\n  variants: readonly Schema[],\n  keyword: \"anyOf\" | \"oneOf\",\n  request: SchemaRequest,\n): IrType[] {\n  return variants.map((variant, index) =>\n    request.transformNested(variant, {\n      ...request.location,\n      path: createRef([request.location.path, keyword, String(index)]),\n    }),\n  );\n}\n\n/**\n * Whether an `allOf` item is a `$ref`. Like the original, this uses `in`, so a boolean item throws\n * a TypeError instead of being accepted.\n */\nfunction isRefItem(item: Schema): item is { readonly $ref: string } {\n  return \"$ref\" in (item as object);\n}\n\n/** A `$ref` item gets the parent's `required` keys that its target defines (`WithRequired`). */\nfunction refItemType(\n  item: { readonly $ref: string },\n  required: readonly string[],\n  request: SchemaRequest,\n): IrType {\n  const type = request.transformNested(item, request.location);\n  const { refs, discriminators, footer } = request.context;\n  const resolved = refs.resolve(item.$ref) as SchemaObject | undefined;\n  const isEligible =\n    resolved &&\n    typeof resolved === \"object\" &&\n    \"properties\" in resolved &&\n    !discriminators.isHandled(item.$ref);\n  if (!isEligible) {\n    return type;\n  }\n  const keys = required.filter((key) => Boolean(resolved.properties?.[key]));\n  if (keys.length > 0) {\n    footer.requireWithRequired();\n  }\n  return withRequiredKeys(type, keys);\n}\n\n/** An inline item merges the parent's `required` keys with its own. */\nfunction inlineItemType(item: Schema, required: readonly string[], request: SchemaRequest): IrType {\n  const own =\n    typeof item === \"object\" && Array.isArray((item as SchemaObject).required)\n      ? ((item as SchemaObject).required ?? [])\n      : [];\n  return request.transformNested(\n    { ...(item as SchemaObject), required: [...required, ...own] },\n    request.location,\n  );\n}\n\n/** `allOf` items; an item with a discriminator omits that property (the parent redefines it). */\nfunction allOfTypes(\n  items: readonly Schema[],\n  required: readonly string[],\n  request: SchemaRequest,\n): IrType[] {\n  return items.map((item) => {\n    const isRef = isRefItem(item);\n    const type = isRef\n      ? refItemType(item, required, request)\n      : inlineItemType(item, required, request);\n    const discriminator =\n      (isRef && request.context.discriminators.objectAt(item.$ref)) ||\n      (item as SchemaObject).discriminator;\n    return discriminator?.propertyName ? omitKeys(type, [discriminator.propertyName]) : type;\n  });\n}\n\nfunction oneOfType(previous: IrType | null, variants: readonly IrType[]): IrType {\n  const before = previous === null ? [] : [previous];\n  // Only `oneOf` may list primitives; then it stays a flat union.\n  return variants.every(isPrimitiveType)\n    ? unionOf([...before, ...variants])\n    : intersectionOf([...before, unionOf(variants)]);\n}\n\n/**\n * `anyOf` is a union: TypeScript unions are not exclusive, which matches anyOf better than oneOf.\n * By default the sibling type is one more member, as in the original. With `anyof-properties` it\n * is intersected with the union, so it applies to every variant (#2380); for a `type` list, each\n * listed type has applied `anyOf` already (`multipleTypes`), so the list is the whole type.\n */\nfunction anyOfType(\n  previous: IrType | null,\n  schema: SchemaObject,\n  request: SchemaRequest,\n): IrType | null {\n  const variants = variantTypes(schema.anyOf ?? [], \"anyOf\", request);\n  if (variants.length === 0 || previous === null) {\n    return variants.length === 0 ? previous : unionOf(variants);\n  }\n  if (!request.context.options.fixes.has(OutputFix.ANYOF_PROPERTIES)) {\n    return unionOf([previous, ...variants]);\n  }\n  return Array.isArray(schema.type) ? previous : intersectionOf([previous, unionOf(variants)]);\n}\n\n/** Object enums are written as `oneOf` over their values. */\nfunction oneOfVariants(schema: SchemaObject): readonly Schema[] {\n  const objectEnum =\n    \"type\" in schema && schema.type === \"object\" && (schema.enum as Schema[] | undefined);\n  return schema.oneOf || objectEnum || [];\n}\n\n/**\n * The parent's `required` keys, plus the keys of left-out `allOf` members (`allof-required`).\n * Without such keys the parent's list stays as it is, duplicates included, as in the original.\n */\nfunction requiredKeys(schema: SchemaObject, presenceKeys: readonly string[]): readonly string[] {\n  const own = schema.required ?? [];\n  return presenceKeys.length === 0 ? own : [...new Set([...own, ...presenceKeys])];\n}\n\nfunction composedType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  let type: IrType | null = null;\n  const core = coreType(schema, request);\n  const { members, required } = allOfMembers(schema.allOf ?? [], request);\n  const allOf = allOfTypes(members, requiredKeys(schema, required), request);\n  if (core !== null || allOf.length > 0) {\n    const allOfType = allOf.length > 0 ? [intersectionOf(allOf)] : [];\n    type = intersectionOf([...(core === null ? [] : [core]), ...allOfType]);\n  }\n  type = anyOfType(type, schema, request);\n  const oneOf = variantTypes(oneOfVariants(schema), \"oneOf\", request);\n  return oneOf.length > 0 ? oneOfType(type, oneOf) : type;\n}\n\n/** The composed type, with the `unevaluatedProperties` index signature when it applies. */\nfunction combinedType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const type = composedType(schema, request);\n  const unevaluated = unevaluatedPropertiesType(schema, type, request);\n  if (unevaluated === null) {\n    return type;\n  }\n  if (type === null) {\n    return unevaluated;\n  }\n  // One flat intersection, so an `allOf` intersection is not printed in parentheses.\n  const parts = type.kind === \"intersection\" ? type.types : [type];\n  return intersectionOf([...parts, unevaluated]);\n}\n\n/**\n * The schema with composition: core type and `allOf` intersected, then `anyOf` and `oneOf`. Without\n * any of them: `Record<string, never>` (or `unknown` with `--empty-objects-unknown`) when `type` is\n * present, else `unknown`. `nullable: true` adds `null`, except to the shared `unknown`.\n */\nexport function compositionType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { emptyObjectsUnknown } = request.context.options;\n  const empty =\n    \"type\" in schema\n      ? irRecord(irKeyword(\"string\"), emptyObjectsUnknown ? UNKNOWN_TYPE : irKeyword(\"never\"))\n      : UNKNOWN_TYPE;\n  const type = combinedType(schema, request) ?? empty;\n  return type !== UNKNOWN_TYPE && schema.nullable ? nullableOf([type]) : type;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"composition-type.mjs","sources":["../../../../src/application/transform/schema/composition-type.ts"],"sourcesContent":["import { irKeyword, irRecord } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport type { Schema, SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport { requirableRefType } from \"../ref-pointer/pointer-type.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport {\n  intersectionOf,\n  isPrimitiveType,\n  nullableOf,\n  omitKeys,\n  unionOf,\n  withRequiredKeys,\n} from \"../type-combinators.js\";\nimport { coreType } from \"./core-type.js\";\nimport { unionItemOf, unionOwnKeywords } from \"./discriminated-union.js\";\nimport { allOfMembers } from \"./presence-members.js\";\nimport { requiredVariantsType } from \"./required-variants.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\nimport { unevaluatedPropertiesType } from \"./unevaluated-properties.js\";\n\n/** `anyOf` / `oneOf` variants; the position is part of the path so nested names stay unique. */\nfunction variantTypes(\n  variants: readonly Schema[],\n  keyword: \"anyOf\" | \"oneOf\",\n  request: SchemaRequest,\n): IrType[] {\n  return variants.map((variant, index) =>\n    request.transformNested(variant, {\n      ...request.location,\n      path: createRef([request.location.path, keyword, String(index)]),\n    }),\n  );\n}\n\n/**\n * Whether an `allOf` item is a `$ref`. Like the original, this uses `in`, so a boolean item throws\n * a TypeError instead of being accepted.\n */\nfunction isRefItem(item: Schema): item is { readonly $ref: string } {\n  return \"$ref\" in (item as object);\n}\n\n/**\n * The parent's `required` keys that the target at `ref` defines. A target that the discriminator\n * scan gave its property got none: the scan made that property required, but the other keys were\n * lost too. With `discriminator-member-required` only keys the target requires already are left\n * out (#2162).\n */\nfunction keysToRequire(\n  ref: string,\n  target: SchemaObject,\n  required: readonly string[],\n  request: SchemaRequest,\n): readonly string[] {\n  const defined = required.filter((key) => Boolean(target.properties?.[key]));\n  if (!request.context.discriminators.isHandled(ref)) {\n    return defined;\n  }\n  if (!request.context.options.fixes.has(OutputFix.DISCRIMINATOR_MEMBER_REQUIRED)) {\n    return [];\n  }\n  return defined.filter((key) => !target.required?.includes(key));\n}\n\n/** A `$ref` item gets the parent's `required` keys that its target defines (`WithRequired`). */\nfunction refItemType(\n  item: { readonly $ref: string },\n  required: readonly string[],\n  request: SchemaRequest,\n): IrType {\n  const type = request.transformNested(item, request.location);\n  const resolved = request.context.refs.resolve(item.$ref) as SchemaObject | undefined;\n  if (!resolved || typeof resolved !== \"object\" || !(\"properties\" in resolved)) {\n    return type;\n  }\n  const keys = keysToRequire(item.$ref, resolved, required, request);\n  if (keys.length === 0) {\n    return type;\n  }\n  request.context.footer.requireWithRequired();\n  return withRequiredKeys(requirableRefType(item.$ref, type, request), keys);\n}\n\n/** An inline item merges the parent's `required` keys with its own. */\nfunction inlineItemType(item: Schema, required: readonly string[], request: SchemaRequest): IrType {\n  const own =\n    typeof item === \"object\" && Array.isArray((item as SchemaObject).required)\n      ? ((item as SchemaObject).required ?? [])\n      : [];\n  return request.transformNested(\n    { ...(item as SchemaObject), required: [...required, ...own] },\n    request.location,\n  );\n}\n\n/**\n * The union's own keywords at the union's location, so nested names (enums) stay the union's.\n * Null when the union has none.\n */\nfunction ownKeywordsType(own: SchemaObject, ref: string, request: SchemaRequest): IrType | null {\n  return combinedType(own, { ...request, location: { ...request.location, path: ref } });\n}\n\n/**\n * An `allOf` item; one with a discriminator omits that property (the parent redefines it). A\n * `$ref` to a discriminated union is not such a parent: for a member of the union it is the\n * union's own keywords, since the union contains the member (#1665); with\n * `allof-discriminated-union` it is the union, since `Omit` on a union drops keys (#1464), unless\n * the union's mapping names the schema: then it is a member, as the discriminator scan has it.\n */\nfunction allOfItemType(\n  item: Schema,\n  required: readonly string[],\n  request: SchemaRequest,\n): IrType | null {\n  const isRef = isRefItem(item);\n  const discriminator =\n    (isRef && request.context.discriminators.objectAt(item.$ref)) ||\n    (item as SchemaObject).discriminator;\n  const propertyName = discriminator?.propertyName;\n  const unionItem = isRef && propertyName ? unionItemOf(item.$ref, request) : undefined;\n  if (isRef && propertyName && unionItem?.isMember) {\n    const own = unionOwnKeywords(unionItem.union, propertyName, required);\n    return ownKeywordsType(own, item.$ref, request);\n  }\n  const type = isRef\n    ? refItemType(item, required, request)\n    : inlineItemType(item, required, request);\n  const isUnion =\n    unionItem !== undefined &&\n    !unionItem.isMapped &&\n    request.context.options.fixes.has(OutputFix.ALLOF_DISCRIMINATED_UNION);\n  if (!propertyName || isUnion) {\n    return type;\n  }\n  // With `discriminator-values` the schema also redefines the properties of other owners above\n  // it, so no item may keep a value of its own for them (a parent mapped as `content`).\n  const { path } = request.location;\n  const others = path === undefined ? [] : request.context.discriminators.otherPropertiesAt(path);\n  return omitKeys(type, [propertyName, ...others]);\n}\n\nfunction allOfTypes(\n  items: readonly Schema[],\n  required: readonly string[],\n  request: SchemaRequest,\n): IrType[] {\n  return items.flatMap((item) => allOfItemType(item, required, request) ?? []);\n}\n\nfunction oneOfType(previous: IrType | null, variants: readonly IrType[]): IrType {\n  const before = previous === null ? [] : [previous];\n  // Only `oneOf` may list primitives; then it stays a flat union.\n  return variants.every(isPrimitiveType)\n    ? unionOf([...before, ...variants])\n    : intersectionOf([...before, unionOf(variants)]);\n}\n\n/**\n * `anyOf` is a union: TypeScript unions are not exclusive, which matches anyOf better than oneOf.\n * By default the sibling type is one more member, as in the original. With `anyof-properties` it\n * is intersected with the union, so it applies to every variant (#2380); for a `type` list, each\n * listed type has applied `anyOf` already (`multipleTypes`), so the list is the whole type.\n */\nfunction anyOfType(\n  previous: IrType | null,\n  schema: SchemaObject,\n  request: SchemaRequest,\n): IrType | null {\n  const variants = variantTypes(schema.anyOf ?? [], \"anyOf\", request);\n  if (variants.length === 0 || previous === null) {\n    return variants.length === 0 ? previous : unionOf(variants);\n  }\n  if (!request.context.options.fixes.has(OutputFix.ANYOF_PROPERTIES)) {\n    return unionOf([previous, ...variants]);\n  }\n  return Array.isArray(schema.type) ? previous : intersectionOf([previous, unionOf(variants)]);\n}\n\n/** Object enums are written as `oneOf` over their values. */\nfunction oneOfVariants(schema: SchemaObject): readonly Schema[] {\n  const objectEnum =\n    \"type\" in schema && schema.type === \"object\" && (schema.enum as Schema[] | undefined);\n  return schema.oneOf || objectEnum || [];\n}\n\n/**\n * The parent's `required` keys, plus the keys of left-out `allOf` members (`allof-required`).\n * Without such keys the parent's list stays as it is, duplicates included, as in the original.\n */\nfunction requiredKeys(schema: SchemaObject, presenceKeys: readonly string[]): readonly string[] {\n  const own = schema.required ?? [];\n  return presenceKeys.length === 0 ? own : [...new Set([...own, ...presenceKeys])];\n}\n\nfunction composedType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  let type: IrType | null = null;\n  const core = coreType(schema, request);\n  const { members, required } = allOfMembers(schema.allOf ?? [], request);\n  const allOf = allOfTypes(members, requiredKeys(schema, required), request);\n  if (core !== null || allOf.length > 0) {\n    const allOfType = allOf.length > 0 ? [intersectionOf(allOf)] : [];\n    type = intersectionOf([...(core === null ? [] : [core]), ...allOfType]);\n  }\n  return variantsType(type, schema, request);\n}\n\n/** `anyOf`, then `oneOf`, applied to the core and `allOf` type (`anyof-oneof-required` first). */\nfunction variantsType(\n  previous: IrType | null,\n  schema: SchemaObject,\n  request: SchemaRequest,\n): IrType | null {\n  const type =\n    requiredVariantsType(previous, schema, schema.anyOf ?? [], request) ??\n    anyOfType(previous, schema, request);\n  const oneOfRequired = requiredVariantsType(type, schema, schema.oneOf ?? [], request);\n  if (oneOfRequired !== null) {\n    return oneOfRequired;\n  }\n  const oneOf = variantTypes(oneOfVariants(schema), \"oneOf\", request);\n  return oneOf.length > 0 ? oneOfType(type, oneOf) : type;\n}\n\n/** The composed type, with the `unevaluatedProperties` index signature when it applies. */\nfunction combinedType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const type = composedType(schema, request);\n  const unevaluated = unevaluatedPropertiesType(schema, type, request);\n  if (unevaluated === null) {\n    return type;\n  }\n  if (type === null) {\n    return unevaluated;\n  }\n  // One flat intersection, so an `allOf` intersection is not printed in parentheses.\n  const parts = type.kind === \"intersection\" ? type.types : [type];\n  return intersectionOf([...parts, unevaluated]);\n}\n\n/**\n * The schema with composition: core type and `allOf` intersected, then `anyOf` and `oneOf`. Without\n * any of them: `Record<string, never>` (or `unknown` with `--empty-objects-unknown`) when `type` is\n * present, else `unknown`. `nullable: true` adds `null`, except to the shared `unknown`.\n */\nexport function compositionType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { emptyObjectsUnknown } = request.context.options;\n  const empty =\n    \"type\" in schema\n      ? irRecord(irKeyword(\"string\"), emptyObjectsUnknown ? UNKNOWN_TYPE : irKeyword(\"never\"))\n      : UNKNOWN_TYPE;\n  const type = combinedType(schema, request) ?? empty;\n  return type !== UNKNOWN_TYPE && schema.nullable ? nullableOf([type]) : type;\n}\n"],"names":[],"mappings":"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"}

package/dist/application/transform/schema/core-type.cjs

@@ -5,6 +5,7 @@ const binaryContent = require('../../../domain/openapi/binary-content.cjs');
 const typeCombinators = require('../type-combinators.cjs');
 const arrayType = require('./array-type.cjs');
 const objectType = require('./object-type.cjs');
+const requiredVariants = require('./required-variants.cjs');
 
 const PRIMITIVE_TYPE_NAMES = /* @__PURE__ */ new Set([
   "boolean",
@@ -24,7 +25,8 @@ function multipleTypes(schema, request) {
     if (isInOneOf) {
       continue;
     }
-    const variant = Array.isArray(oneOf) ? { ...schema, type: typeName, oneOf: void 0 } : { ...schema, type: typeName };
+    const isKept = typeName === "object" && requiredVariants.hasRequiredVariants(schema, oneOf ?? [], request);
+    const variant = Array.isArray(oneOf) && !isKept ? { ...schema, type: typeName, oneOf: void 0 } : { ...schema, type: typeName };
     members.push(
       typeName === "null" || typeName === null ? constructors.irKeyword("null") : request.transformNested(variant, request.location)
     );

package/dist/application/transform/schema/core-type.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"core-type.cjs","sources":["../../../../src/application/transform/schema/core-type.ts"],"sourcesContent":["import { irKeyword, irReference, irUnion } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { isRawBinarySchema } from \"../../../domain/openapi/binary-content.js\";\nimport type {\n  Schema,\n  SchemaObject,\n  SchemaTypeName,\n} from \"../../../domain/openapi/schema-object.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport { arrayType } from \"./array-type.js\";\nimport { objectType } from \"./object-type.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\nconst PRIMITIVE_TYPE_NAMES: ReadonlySet<SchemaTypeName | null> = new Set([\n  \"boolean\",\n  \"string\",\n  \"number\",\n  \"integer\",\n  \"null\",\n]);\n\n/** Each `type` of a list becomes a union member; one already listed in `oneOf` is skipped. */\nfunction multipleTypes(schema: SchemaObject, request: SchemaRequest): IrType {\n  const typeNames = schema.type as readonly (SchemaTypeName | null)[];\n  const { oneOf } = schema;\n  const members: IrType[] = [];\n  for (const typeName of typeNames) {\n    const isInOneOf =\n      Array.isArray(oneOf) &&\n      PRIMITIVE_TYPE_NAMES.has(typeName) &&\n      oneOf.some(\n        (variant) => typeof variant === \"object\" && \"type\" in variant && variant.type === typeName,\n      );\n    if (isInOneOf) {\n      continue;\n    }\n    // With oneOf, the member drops it, so oneOf is not applied once per member.\n    const variant = Array.isArray(oneOf)\n      ? { ...schema, type: typeName, oneOf: undefined }\n      : { ...schema, type: typeName };\n    members.push(\n      typeName === \"null\" || typeName === null\n        ? irKeyword(\"null\")\n        : request.transformNested(variant as Schema, request.location),\n    );\n  }\n  return unionOf(members);\n}\n\nfunction keywordRule(\n  name: string,\n  typeNames: readonly string[],\n  keyword: \"null\" | \"number\" | \"boolean\",\n): SchemaRule {\n  return {\n    name,\n    matches: (schema) => typeNames.includes(schema.type as string),\n    transform: () => irKeyword(keyword),\n  };\n}\n\n/** The global type of raw binary data with `--binary-as-blob` (DOM lib, `@types/node`). */\nconst BLOB_TYPE_NAME = \"Blob\";\n\nfunction isBinaryAsBlob(schema: SchemaObject, request: SchemaRequest): boolean {\n  return request.context.options.binaryAsBlob && isRawBinarySchema(schema);\n}\n\nfunction stringType(schema: SchemaObject, request: SchemaRequest): IrType {\n  return isBinaryAsBlob(schema, request) ? irReference(BLOB_TYPE_NAME) : irKeyword(\"string\");\n}\n\n/** Rules for schemas with a `type`, in the original order. */\nconst TYPED_RULES: readonly SchemaRule[] = [\n  keywordRule(\"null\", [\"null\"], \"null\"),\n  { name: \"string\", matches: (schema) => schema.type === \"string\", transform: stringType },\n  keywordRule(\"number\", [\"number\", \"integer\"], \"number\"),\n  keywordRule(\"boolean\", [\"boolean\"], \"boolean\"),\n  { name: \"array\", matches: (schema) => schema.type === \"array\", transform: arrayType },\n  {\n    name: \"multiple types\",\n    matches: (schema) => Array.isArray(schema.type),\n    transform: multipleTypes,\n  },\n];\n\n/** The `transform` callback's type; a `questionToken` adds `undefined` here. */\nfunction customType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const custom = request.context.callbacks.transform(schema, request.location);\n  if (custom === null) {\n    return null;\n  }\n  return custom.isOptional ? irUnion([custom.type, irKeyword(\"undefined\")]) : custom.type;\n}\n\n/**\n * The schema without composition keywords: the `transform` callback, then a typed rule, then raw\n * binary without `type` (OpenAPI 3.1 allows leaving it out), then the object keywords. Null means\n * the schema has no type of its own.\n */\nexport function coreType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  if (\"type\" in schema && schema.type) {\n    const custom = customType(schema, request);\n    if (custom !== null) {\n      return custom;\n    }\n    const rule = TYPED_RULES.find((candidate) => candidate.matches(schema));\n    if (rule !== undefined) {\n      return rule.transform(schema, request);\n    }\n  } else if (isBinaryAsBlob(schema, request)) {\n    return irReference(BLOB_TYPE_NAME);\n  }\n  return objectType(schema, request);\n}\n"],"names":["variant","irKeyword","unionOf","isRawBinarySchema","irReference","arrayType","irUnion","objectType"],"mappings":";;;;;;;;AAaA,MAAM,oBAAA,uBAA+D,GAAA,CAAI;AAAA,EACvE,SAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EACA,SAAA;AAAA,EACA;AACF,CAAC,CAAA;AAGD,SAAS,aAAA,CAAc,QAAsB,OAAA,EAAgC;AAC3E,EAAA,MAAM,YAAY,MAAA,CAAO,IAAA;AACzB,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,MAAM,UAAoB,EAAC;AAC3B,EAAA,KAAA,MAAW,YAAY,SAAA,EAAW;AAChC,IAAA,MAAM,SAAA,GACJ,MAAM,OAAA,CAAQ,KAAK,KACnB,oBAAA,CAAqB,GAAA,CAAI,QAAQ,CAAA,IACjC,KAAA,CAAM,IAAA;AAAA,MACJ,CAACA,aAAY,OAAOA,QAAAA,KAAY,YAAY,MAAA,IAAUA,QAAAA,IAAWA,SAAQ,IAAA,KAAS;AAAA,KACpF;AACF,IAAA,IAAI,SAAA,EAAW;AACb,MAAA;AAAA,IACF;AAEA,IAAA,MAAM,UAAU,KAAA,CAAM,OAAA,CAAQ,KAAK,CAAA,GAC/B,EAAE,GAAG,MAAA,EAAQ,IAAA,EAAM,QAAA,EAAU,OAAO,MAAA,EAAU,GAC9C,EAAE,GAAG,MAAA,EAAQ,MAAM,QAAA,EAAS;AAChC,IAAA,OAAA,CAAQ,IAAA;AAAA,MACN,QAAA,KAAa,MAAA,IAAU,QAAA,KAAa,IAAA,GAChCC,sBAAA,CAAU,MAAM,CAAA,GAChB,OAAA,CAAQ,eAAA,CAAgB,OAAA,EAAmB,OAAA,CAAQ,QAAQ;AAAA,KACjE;AAAA,EACF;AACA,EAAA,OAAOC,wBAAQ,OAAO,CAAA;AACxB;AAEA,SAAS,WAAA,CACP,IAAA,EACA,SAAA,EACA,OAAA,EACY;AACZ,EAAA,OAAO;AAAA,IACL,IAAA;AAAA,IACA,SAAS,CAAC,MAAA,KAAW,SAAA,CAAU,QAAA,CAAS,OAAO,IAAc,CAAA;AAAA,IAC7D,SAAA,EAAW,MAAMD,sBAAA,CAAU,OAAO;AAAA,GACpC;AACF;AAGA,MAAM,cAAA,GAAiB,MAAA;AAEvB,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAiC;AAC7E,EAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,OAAA,CAAQ,YAAA,IAAgBE,gCAAkB,MAAM,CAAA;AACzE;AAEA,SAAS,UAAA,CAAW,QAAsB,OAAA,EAAgC;AACxE,EAAA,OAAO,cAAA,CAAe,QAAQ,OAAO,CAAA,GAAIC,yBAAY,cAAc,CAAA,GAAIH,uBAAU,QAAQ,CAAA;AAC3F;AAGA,MAAM,WAAA,GAAqC;AAAA,EACzC,WAAA,CAAY,MAAA,EAAQ,CAAC,MAAM,GAAG,MAAM,CAAA;AAAA,EACpC,EAAE,IAAA,EAAM,QAAA,EAAU,OAAA,EAAS,CAAC,WAAW,MAAA,CAAO,IAAA,KAAS,QAAA,EAAU,SAAA,EAAW,UAAA,EAAW;AAAA,EACvF,YAAY,QAAA,EAAU,CAAC,QAAA,EAAU,SAAS,GAAG,QAAQ,CAAA;AAAA,EACrD,WAAA,CAAY,SAAA,EAAW,CAAC,SAAS,GAAG,SAAS,CAAA;AAAA,EAC7C,EAAE,IAAA,EAAM,OAAA,EAAS,OAAA,EAAS,CAAC,WAAW,MAAA,CAAO,IAAA,KAAS,OAAA,EAAS,SAAA,EAAWI,mBAAA,EAAU;AAAA,EACpF;AAAA,IACE,IAAA,EAAM,gBAAA;AAAA,IACN,SAAS,CAAC,MAAA,KAAW,KAAA,CAAM,OAAA,CAAQ,OAAO,IAAI,CAAA;AAAA,IAC9C,SAAA,EAAW;AAAA;AAEf,CAAA;AAGA,SAAS,UAAA,CAAW,QAAsB,OAAA,EAAuC;AAC/E,EAAA,MAAM,SAAS,OAAA,CAAQ,OAAA,CAAQ,UAAU,SAAA,CAAU,MAAA,EAAQ,QAAQ,QAAQ,CAAA;AAC3E,EAAA,IAAI,WAAW,IAAA,EAAM;AACnB,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,OAAO,MAAA,CAAO,UAAA,GAAaC,oBAAA,CAAQ,CAAC,MAAA,CAAO,IAAA,EAAML,sBAAA,CAAU,WAAW,CAAC,CAAC,CAAA,GAAI,MAAA,CAAO,IAAA;AACrF;AAOO,SAAS,QAAA,CAAS,QAAsB,OAAA,EAAuC;AACpF,EAAA,IAAI,MAAA,IAAU,MAAA,IAAU,MAAA,CAAO,IAAA,EAAM;AACnC,IAAA,MAAM,MAAA,GAAS,UAAA,CAAW,MAAA,EAAQ,OAAO,CAAA;AACzC,IAAA,IAAI,WAAW,IAAA,EAAM;AACnB,MAAA,OAAO,MAAA;AAAA,IACT;AACA,IAAA,MAAM,IAAA,GAAO,YAAY,IAAA,CAAK,CAAC,cAAc,SAAA,CAAU,OAAA,CAAQ,MAAM,CAAC,CAAA;AACtE,IAAA,IAAI,SAAS,MAAA,EAAW;AACtB,MAAA,OAAO,IAAA,CAAK,SAAA,CAAU,MAAA,EAAQ,OAAO,CAAA;AAAA,IACvC;AAAA,EACF,CAAA,MAAA,IAAW,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA,EAAG;AAC1C,IAAA,OAAOG,yBAAY,cAAc,CAAA;AAAA,EACnC;AACA,EAAA,OAAOG,qBAAA,CAAW,QAAQ,OAAO,CAAA;AACnC;;"}
+{"version":3,"file":"core-type.cjs","sources":["../../../../src/application/transform/schema/core-type.ts"],"sourcesContent":["import { irKeyword, irReference, irUnion } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { isRawBinarySchema } from \"../../../domain/openapi/binary-content.js\";\nimport type {\n  Schema,\n  SchemaObject,\n  SchemaTypeName,\n} from \"../../../domain/openapi/schema-object.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport { arrayType } from \"./array-type.js\";\nimport { objectType } from \"./object-type.js\";\nimport { hasRequiredVariants } from \"./required-variants.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\nconst PRIMITIVE_TYPE_NAMES: ReadonlySet<SchemaTypeName | null> = new Set([\n  \"boolean\",\n  \"string\",\n  \"number\",\n  \"integer\",\n  \"null\",\n]);\n\n/** Each `type` of a list becomes a union member; one already listed in `oneOf` is skipped. */\nfunction multipleTypes(schema: SchemaObject, request: SchemaRequest): IrType {\n  const typeNames = schema.type as readonly (SchemaTypeName | null)[];\n  const { oneOf } = schema;\n  const members: IrType[] = [];\n  for (const typeName of typeNames) {\n    const isInOneOf =\n      Array.isArray(oneOf) &&\n      PRIMITIVE_TYPE_NAMES.has(typeName) &&\n      oneOf.some(\n        (variant) => typeof variant === \"object\" && \"type\" in variant && variant.type === typeName,\n      );\n    if (isInOneOf) {\n      continue;\n    }\n    // With oneOf, the member drops it, so oneOf is not applied once per member. Variants that\n    // only require properties (`anyof-oneof-required`) belong to the object member.\n    const isKept = typeName === \"object\" && hasRequiredVariants(schema, oneOf ?? [], request);\n    const variant =\n      Array.isArray(oneOf) && !isKept\n        ? { ...schema, type: typeName, oneOf: undefined }\n        : { ...schema, type: typeName };\n    members.push(\n      typeName === \"null\" || typeName === null\n        ? irKeyword(\"null\")\n        : request.transformNested(variant as Schema, request.location),\n    );\n  }\n  return unionOf(members);\n}\n\nfunction keywordRule(\n  name: string,\n  typeNames: readonly string[],\n  keyword: \"null\" | \"number\" | \"boolean\",\n): SchemaRule {\n  return {\n    name,\n    matches: (schema) => typeNames.includes(schema.type as string),\n    transform: () => irKeyword(keyword),\n  };\n}\n\n/** The global type of raw binary data with `--binary-as-blob` (DOM lib, `@types/node`). */\nconst BLOB_TYPE_NAME = \"Blob\";\n\nfunction isBinaryAsBlob(schema: SchemaObject, request: SchemaRequest): boolean {\n  return request.context.options.binaryAsBlob && isRawBinarySchema(schema);\n}\n\nfunction stringType(schema: SchemaObject, request: SchemaRequest): IrType {\n  return isBinaryAsBlob(schema, request) ? irReference(BLOB_TYPE_NAME) : irKeyword(\"string\");\n}\n\n/** Rules for schemas with a `type`, in the original order. */\nconst TYPED_RULES: readonly SchemaRule[] = [\n  keywordRule(\"null\", [\"null\"], \"null\"),\n  { name: \"string\", matches: (schema) => schema.type === \"string\", transform: stringType },\n  keywordRule(\"number\", [\"number\", \"integer\"], \"number\"),\n  keywordRule(\"boolean\", [\"boolean\"], \"boolean\"),\n  { name: \"array\", matches: (schema) => schema.type === \"array\", transform: arrayType },\n  {\n    name: \"multiple types\",\n    matches: (schema) => Array.isArray(schema.type),\n    transform: multipleTypes,\n  },\n];\n\n/** The `transform` callback's type; a `questionToken` adds `undefined` here. */\nfunction customType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const custom = request.context.callbacks.transform(schema, request.location);\n  if (custom === null) {\n    return null;\n  }\n  return custom.isOptional ? irUnion([custom.type, irKeyword(\"undefined\")]) : custom.type;\n}\n\n/**\n * The schema without composition keywords: the `transform` callback, then a typed rule, then raw\n * binary without `type` (OpenAPI 3.1 allows leaving it out), then the object keywords. Null means\n * the schema has no type of its own.\n */\nexport function coreType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  if (\"type\" in schema && schema.type) {\n    const custom = customType(schema, request);\n    if (custom !== null) {\n      return custom;\n    }\n    const rule = TYPED_RULES.find((candidate) => candidate.matches(schema));\n    if (rule !== undefined) {\n      return rule.transform(schema, request);\n    }\n  } else if (isBinaryAsBlob(schema, request)) {\n    return irReference(BLOB_TYPE_NAME);\n  }\n  return objectType(schema, request);\n}\n"],"names":["variant","hasRequiredVariants","irKeyword","unionOf","isRawBinarySchema","irReference","arrayType","irUnion","objectType"],"mappings":"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"}

package/dist/application/transform/schema/core-type.mjs

@@ -3,6 +3,7 @@ import { isRawBinarySchema } from '../../../domain/openapi/binary-content.mjs';
 import { unionOf } from '../type-combinators.mjs';
 import { arrayType } from './array-type.mjs';
 import { objectType } from './object-type.mjs';
+import { hasRequiredVariants } from './required-variants.mjs';
 
 const PRIMITIVE_TYPE_NAMES = /* @__PURE__ */ new Set([
   "boolean",
@@ -22,7 +23,8 @@ function multipleTypes(schema, request) {
     if (isInOneOf) {
       continue;
     }
-    const variant = Array.isArray(oneOf) ? { ...schema, type: typeName, oneOf: void 0 } : { ...schema, type: typeName };
+    const isKept = typeName === "object" && hasRequiredVariants(schema, oneOf ?? [], request);
+    const variant = Array.isArray(oneOf) && !isKept ? { ...schema, type: typeName, oneOf: void 0 } : { ...schema, type: typeName };
     members.push(
       typeName === "null" || typeName === null ? irKeyword("null") : request.transformNested(variant, request.location)
     );

package/dist/application/transform/schema/core-type.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"core-type.mjs","sources":["../../../../src/application/transform/schema/core-type.ts"],"sourcesContent":["import { irKeyword, irReference, irUnion } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { isRawBinarySchema } from \"../../../domain/openapi/binary-content.js\";\nimport type {\n  Schema,\n  SchemaObject,\n  SchemaTypeName,\n} from \"../../../domain/openapi/schema-object.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport { arrayType } from \"./array-type.js\";\nimport { objectType } from \"./object-type.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\nconst PRIMITIVE_TYPE_NAMES: ReadonlySet<SchemaTypeName | null> = new Set([\n  \"boolean\",\n  \"string\",\n  \"number\",\n  \"integer\",\n  \"null\",\n]);\n\n/** Each `type` of a list becomes a union member; one already listed in `oneOf` is skipped. */\nfunction multipleTypes(schema: SchemaObject, request: SchemaRequest): IrType {\n  const typeNames = schema.type as readonly (SchemaTypeName | null)[];\n  const { oneOf } = schema;\n  const members: IrType[] = [];\n  for (const typeName of typeNames) {\n    const isInOneOf =\n      Array.isArray(oneOf) &&\n      PRIMITIVE_TYPE_NAMES.has(typeName) &&\n      oneOf.some(\n        (variant) => typeof variant === \"object\" && \"type\" in variant && variant.type === typeName,\n      );\n    if (isInOneOf) {\n      continue;\n    }\n    // With oneOf, the member drops it, so oneOf is not applied once per member.\n    const variant = Array.isArray(oneOf)\n      ? { ...schema, type: typeName, oneOf: undefined }\n      : { ...schema, type: typeName };\n    members.push(\n      typeName === \"null\" || typeName === null\n        ? irKeyword(\"null\")\n        : request.transformNested(variant as Schema, request.location),\n    );\n  }\n  return unionOf(members);\n}\n\nfunction keywordRule(\n  name: string,\n  typeNames: readonly string[],\n  keyword: \"null\" | \"number\" | \"boolean\",\n): SchemaRule {\n  return {\n    name,\n    matches: (schema) => typeNames.includes(schema.type as string),\n    transform: () => irKeyword(keyword),\n  };\n}\n\n/** The global type of raw binary data with `--binary-as-blob` (DOM lib, `@types/node`). */\nconst BLOB_TYPE_NAME = \"Blob\";\n\nfunction isBinaryAsBlob(schema: SchemaObject, request: SchemaRequest): boolean {\n  return request.context.options.binaryAsBlob && isRawBinarySchema(schema);\n}\n\nfunction stringType(schema: SchemaObject, request: SchemaRequest): IrType {\n  return isBinaryAsBlob(schema, request) ? irReference(BLOB_TYPE_NAME) : irKeyword(\"string\");\n}\n\n/** Rules for schemas with a `type`, in the original order. */\nconst TYPED_RULES: readonly SchemaRule[] = [\n  keywordRule(\"null\", [\"null\"], \"null\"),\n  { name: \"string\", matches: (schema) => schema.type === \"string\", transform: stringType },\n  keywordRule(\"number\", [\"number\", \"integer\"], \"number\"),\n  keywordRule(\"boolean\", [\"boolean\"], \"boolean\"),\n  { name: \"array\", matches: (schema) => schema.type === \"array\", transform: arrayType },\n  {\n    name: \"multiple types\",\n    matches: (schema) => Array.isArray(schema.type),\n    transform: multipleTypes,\n  },\n];\n\n/** The `transform` callback's type; a `questionToken` adds `undefined` here. */\nfunction customType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const custom = request.context.callbacks.transform(schema, request.location);\n  if (custom === null) {\n    return null;\n  }\n  return custom.isOptional ? irUnion([custom.type, irKeyword(\"undefined\")]) : custom.type;\n}\n\n/**\n * The schema without composition keywords: the `transform` callback, then a typed rule, then raw\n * binary without `type` (OpenAPI 3.1 allows leaving it out), then the object keywords. Null means\n * the schema has no type of its own.\n */\nexport function coreType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  if (\"type\" in schema && schema.type) {\n    const custom = customType(schema, request);\n    if (custom !== null) {\n      return custom;\n    }\n    const rule = TYPED_RULES.find((candidate) => candidate.matches(schema));\n    if (rule !== undefined) {\n      return rule.transform(schema, request);\n    }\n  } else if (isBinaryAsBlob(schema, request)) {\n    return irReference(BLOB_TYPE_NAME);\n  }\n  return objectType(schema, request);\n}\n"],"names":["variant"],"mappings":"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"}
+{"version":3,"file":"core-type.mjs","sources":["../../../../src/application/transform/schema/core-type.ts"],"sourcesContent":["import { irKeyword, irReference, irUnion } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { isRawBinarySchema } from \"../../../domain/openapi/binary-content.js\";\nimport type {\n  Schema,\n  SchemaObject,\n  SchemaTypeName,\n} from \"../../../domain/openapi/schema-object.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport { arrayType } from \"./array-type.js\";\nimport { objectType } from \"./object-type.js\";\nimport { hasRequiredVariants } from \"./required-variants.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\nconst PRIMITIVE_TYPE_NAMES: ReadonlySet<SchemaTypeName | null> = new Set([\n  \"boolean\",\n  \"string\",\n  \"number\",\n  \"integer\",\n  \"null\",\n]);\n\n/** Each `type` of a list becomes a union member; one already listed in `oneOf` is skipped. */\nfunction multipleTypes(schema: SchemaObject, request: SchemaRequest): IrType {\n  const typeNames = schema.type as readonly (SchemaTypeName | null)[];\n  const { oneOf } = schema;\n  const members: IrType[] = [];\n  for (const typeName of typeNames) {\n    const isInOneOf =\n      Array.isArray(oneOf) &&\n      PRIMITIVE_TYPE_NAMES.has(typeName) &&\n      oneOf.some(\n        (variant) => typeof variant === \"object\" && \"type\" in variant && variant.type === typeName,\n      );\n    if (isInOneOf) {\n      continue;\n    }\n    // With oneOf, the member drops it, so oneOf is not applied once per member. Variants that\n    // only require properties (`anyof-oneof-required`) belong to the object member.\n    const isKept = typeName === \"object\" && hasRequiredVariants(schema, oneOf ?? [], request);\n    const variant =\n      Array.isArray(oneOf) && !isKept\n        ? { ...schema, type: typeName, oneOf: undefined }\n        : { ...schema, type: typeName };\n    members.push(\n      typeName === \"null\" || typeName === null\n        ? irKeyword(\"null\")\n        : request.transformNested(variant as Schema, request.location),\n    );\n  }\n  return unionOf(members);\n}\n\nfunction keywordRule(\n  name: string,\n  typeNames: readonly string[],\n  keyword: \"null\" | \"number\" | \"boolean\",\n): SchemaRule {\n  return {\n    name,\n    matches: (schema) => typeNames.includes(schema.type as string),\n    transform: () => irKeyword(keyword),\n  };\n}\n\n/** The global type of raw binary data with `--binary-as-blob` (DOM lib, `@types/node`). */\nconst BLOB_TYPE_NAME = \"Blob\";\n\nfunction isBinaryAsBlob(schema: SchemaObject, request: SchemaRequest): boolean {\n  return request.context.options.binaryAsBlob && isRawBinarySchema(schema);\n}\n\nfunction stringType(schema: SchemaObject, request: SchemaRequest): IrType {\n  return isBinaryAsBlob(schema, request) ? irReference(BLOB_TYPE_NAME) : irKeyword(\"string\");\n}\n\n/** Rules for schemas with a `type`, in the original order. */\nconst TYPED_RULES: readonly SchemaRule[] = [\n  keywordRule(\"null\", [\"null\"], \"null\"),\n  { name: \"string\", matches: (schema) => schema.type === \"string\", transform: stringType },\n  keywordRule(\"number\", [\"number\", \"integer\"], \"number\"),\n  keywordRule(\"boolean\", [\"boolean\"], \"boolean\"),\n  { name: \"array\", matches: (schema) => schema.type === \"array\", transform: arrayType },\n  {\n    name: \"multiple types\",\n    matches: (schema) => Array.isArray(schema.type),\n    transform: multipleTypes,\n  },\n];\n\n/** The `transform` callback's type; a `questionToken` adds `undefined` here. */\nfunction customType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const custom = request.context.callbacks.transform(schema, request.location);\n  if (custom === null) {\n    return null;\n  }\n  return custom.isOptional ? irUnion([custom.type, irKeyword(\"undefined\")]) : custom.type;\n}\n\n/**\n * The schema without composition keywords: the `transform` callback, then a typed rule, then raw\n * binary without `type` (OpenAPI 3.1 allows leaving it out), then the object keywords. Null means\n * the schema has no type of its own.\n */\nexport function coreType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  if (\"type\" in schema && schema.type) {\n    const custom = customType(schema, request);\n    if (custom !== null) {\n      return custom;\n    }\n    const rule = TYPED_RULES.find((candidate) => candidate.matches(schema));\n    if (rule !== undefined) {\n      return rule.transform(schema, request);\n    }\n  } else if (isBinaryAsBlob(schema, request)) {\n    return irReference(BLOB_TYPE_NAME);\n  }\n  return objectType(schema, request);\n}\n"],"names":["variant"],"mappings":"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"}

package/dist/application/transform/schema/discriminated-union.cjs

@@ -0,0 +1,30 @@
+'use strict';
+
+const discriminatedUnion = require('../../../domain/openapi/discriminated-union.cjs');
+
+function unionItemOf(ref, request) {
+  const path = request.location.path;
+  const resolve = (target) => request.context.refs.resolve(target);
+  const union = discriminatedUnion.unionAt(ref, resolve);
+  if (union === void 0) {
+    return void 0;
+  }
+  const isMember = path !== void 0 && discriminatedUnion.unionReaches(union, path, resolve);
+  return { union, isMember, isMapped: path !== void 0 && discriminatedUnion.unionMaps(union, path) };
+}
+function withoutKey(record, key) {
+  return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));
+}
+function unionOwnKeywords(union, propertyName, required) {
+  const { oneOf: _oneOf, anyOf: _anyOf, ...own } = union;
+  const ownRequired = (union.required ?? []).filter((key) => key !== propertyName);
+  return {
+    ...own,
+    ...union.properties === void 0 ? {} : { properties: withoutKey(union.properties, propertyName) },
+    required: [...required, ...ownRequired]
+  };
+}
+
+exports.unionItemOf = unionItemOf;
+exports.unionOwnKeywords = unionOwnKeywords;
+//# sourceMappingURL=discriminated-union.cjs.map

package/dist/application/transform/schema/discriminated-union.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminated-union.cjs","sources":["../../../../src/application/transform/schema/discriminated-union.ts"],"sourcesContent":["import { unionAt, unionMaps, unionReaches } from \"../../../domain/openapi/discriminated-union.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `allOf` items that are a `$ref` to a discriminated union (`oneOf` / `anyOf` and a\n * discriminator). Such an item cannot be typed as the parent of the inheritance pattern,\n * `Omit<Union, \"kind\">`.\n */\n\n/** The union an `allOf` item refers to, and whether the union's type contains this schema. */\nexport interface UnionItem {\n  readonly union: SchemaObject;\n  /**\n   * The schema is one of the union's members: intersecting the union would make it refer to\n   * itself, which does not compile (TS2502, upstream #1665).\n   */\n  readonly isMember: boolean;\n  /** The union's mapping names the schema, so it is a member even where the type is not. */\n  readonly isMapped: boolean;\n}\n\n/** The union at `ref`, if the schema there is one. */\nexport function unionItemOf(ref: string, request: SchemaRequest): UnionItem | undefined {\n  const path = request.location.path;\n  const resolve = (target: string) => request.context.refs.resolve(target);\n  const union = unionAt(ref, resolve);\n  if (union === undefined) {\n    return undefined;\n  }\n  const isMember = path !== undefined && unionReaches(union, path, resolve);\n  return { union, isMember, isMapped: path !== undefined && unionMaps(union, path) };\n}\n\nfunction withoutKey<T>(record: Readonly<Record<string, T>>, key: string): Record<string, T> {\n  return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));\n}\n\n/**\n * The keywords of a union that its members inherit: everything but the members and the\n * discriminator property, which each member redefines (as `Omit` does for a parent). The item's\n * `required` keys are added, as for an inline `allOf` item.\n */\nexport function unionOwnKeywords(\n  union: SchemaObject,\n  propertyName: string,\n  required: readonly string[],\n): SchemaObject {\n  const { oneOf: _oneOf, anyOf: _anyOf, ...own } = union;\n  const ownRequired = (union.required ?? []).filter((key) => key !== propertyName);\n  return {\n    ...own,\n    ...(union.properties === undefined\n      ? {}\n      : { properties: withoutKey(union.properties, propertyName) }),\n    required: [...required, ...ownRequired],\n  };\n}\n"],"names":["unionAt","unionReaches","unionMaps"],"mappings":";;;;AAuBO,SAAS,WAAA,CAAY,KAAa,OAAA,EAA+C;AACtF,EAAA,MAAM,IAAA,GAAO,QAAQ,QAAA,CAAS,IAAA;AAC9B,EAAA,MAAM,UAAU,CAAC,MAAA,KAAmB,QAAQ,OAAA,CAAQ,IAAA,CAAK,QAAQ,MAAM,CAAA;AACvE,EAAA,MAAM,KAAA,GAAQA,0BAAA,CAAQ,GAAA,EAAK,OAAO,CAAA;AAClC,EAAA,IAAI,UAAU,MAAA,EAAW;AACvB,IAAA,OAAO,MAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAW,IAAA,KAAS,MAAA,IAAaC,+BAAA,CAAa,KAAA,EAAO,MAAM,OAAO,CAAA;AACxE,EAAA,OAAO,EAAE,OAAO,QAAA,EAAU,QAAA,EAAU,SAAS,MAAA,IAAaC,4BAAA,CAAU,KAAA,EAAO,IAAI,CAAA,EAAE;AACnF;AAEA,SAAS,UAAA,CAAc,QAAqC,GAAA,EAAgC;AAC1F,EAAA,OAAO,MAAA,CAAO,WAAA,CAAY,MAAA,CAAO,OAAA,CAAQ,MAAM,CAAA,CAAE,MAAA,CAAO,CAAC,CAAC,IAAI,CAAA,KAAM,IAAA,KAAS,GAAG,CAAC,CAAA;AACnF;AAOO,SAAS,gBAAA,CACd,KAAA,EACA,YAAA,EACA,QAAA,EACc;AACd,EAAA,MAAM,EAAE,KAAA,EAAO,MAAA,EAAQ,OAAO,MAAA,EAAQ,GAAG,KAAI,GAAI,KAAA;AACjD,EAAA,MAAM,WAAA,GAAA,CAAe,MAAM,QAAA,IAAY,IAAI,MAAA,CAAO,CAAC,GAAA,KAAQ,GAAA,KAAQ,YAAY,CAAA;AAC/E,EAAA,OAAO;AAAA,IACL,GAAG,GAAA;AAAA,IACH,GAAI,KAAA,CAAM,UAAA,KAAe,MAAA,GACrB,EAAC,GACD,EAAE,UAAA,EAAY,UAAA,CAAW,KAAA,CAAM,UAAA,EAAY,YAAY,CAAA,EAAE;AAAA,IAC7D,QAAA,EAAU,CAAC,GAAG,QAAA,EAAU,GAAG,WAAW;AAAA,GACxC;AACF;;;"}

package/dist/application/transform/schema/discriminated-union.mjs

@@ -0,0 +1,27 @@
+import { unionAt, unionReaches, unionMaps } from '../../../domain/openapi/discriminated-union.mjs';
+
+function unionItemOf(ref, request) {
+  const path = request.location.path;
+  const resolve = (target) => request.context.refs.resolve(target);
+  const union = unionAt(ref, resolve);
+  if (union === void 0) {
+    return void 0;
+  }
+  const isMember = path !== void 0 && unionReaches(union, path, resolve);
+  return { union, isMember, isMapped: path !== void 0 && unionMaps(union, path) };
+}
+function withoutKey(record, key) {
+  return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));
+}
+function unionOwnKeywords(union, propertyName, required) {
+  const { oneOf: _oneOf, anyOf: _anyOf, ...own } = union;
+  const ownRequired = (union.required ?? []).filter((key) => key !== propertyName);
+  return {
+    ...own,
+    ...union.properties === void 0 ? {} : { properties: withoutKey(union.properties, propertyName) },
+    required: [...required, ...ownRequired]
+  };
+}
+
+export { unionItemOf, unionOwnKeywords };
+//# sourceMappingURL=discriminated-union.mjs.map

package/dist/application/transform/schema/discriminated-union.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"discriminated-union.mjs","sources":["../../../../src/application/transform/schema/discriminated-union.ts"],"sourcesContent":["import { unionAt, unionMaps, unionReaches } from \"../../../domain/openapi/discriminated-union.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `allOf` items that are a `$ref` to a discriminated union (`oneOf` / `anyOf` and a\n * discriminator). Such an item cannot be typed as the parent of the inheritance pattern,\n * `Omit<Union, \"kind\">`.\n */\n\n/** The union an `allOf` item refers to, and whether the union's type contains this schema. */\nexport interface UnionItem {\n  readonly union: SchemaObject;\n  /**\n   * The schema is one of the union's members: intersecting the union would make it refer to\n   * itself, which does not compile (TS2502, upstream #1665).\n   */\n  readonly isMember: boolean;\n  /** The union's mapping names the schema, so it is a member even where the type is not. */\n  readonly isMapped: boolean;\n}\n\n/** The union at `ref`, if the schema there is one. */\nexport function unionItemOf(ref: string, request: SchemaRequest): UnionItem | undefined {\n  const path = request.location.path;\n  const resolve = (target: string) => request.context.refs.resolve(target);\n  const union = unionAt(ref, resolve);\n  if (union === undefined) {\n    return undefined;\n  }\n  const isMember = path !== undefined && unionReaches(union, path, resolve);\n  return { union, isMember, isMapped: path !== undefined && unionMaps(union, path) };\n}\n\nfunction withoutKey<T>(record: Readonly<Record<string, T>>, key: string): Record<string, T> {\n  return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));\n}\n\n/**\n * The keywords of a union that its members inherit: everything but the members and the\n * discriminator property, which each member redefines (as `Omit` does for a parent). The item's\n * `required` keys are added, as for an inline `allOf` item.\n */\nexport function unionOwnKeywords(\n  union: SchemaObject,\n  propertyName: string,\n  required: readonly string[],\n): SchemaObject {\n  const { oneOf: _oneOf, anyOf: _anyOf, ...own } = union;\n  const ownRequired = (union.required ?? []).filter((key) => key !== propertyName);\n  return {\n    ...own,\n    ...(union.properties === undefined\n      ? {}\n      : { properties: withoutKey(union.properties, propertyName) }),\n    required: [...required, ...ownRequired],\n  };\n}\n"],"names":[],"mappings":";;AAuBO,SAAS,WAAA,CAAY,KAAa,OAAA,EAA+C;AACtF,EAAA,MAAM,IAAA,GAAO,QAAQ,QAAA,CAAS,IAAA;AAC9B,EAAA,MAAM,UAAU,CAAC,MAAA,KAAmB,QAAQ,OAAA,CAAQ,IAAA,CAAK,QAAQ,MAAM,CAAA;AACvE,EAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,EAAK,OAAO,CAAA;AAClC,EAAA,IAAI,UAAU,MAAA,EAAW;AACvB,IAAA,OAAO,MAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAW,IAAA,KAAS,MAAA,IAAa,YAAA,CAAa,KAAA,EAAO,MAAM,OAAO,CAAA;AACxE,EAAA,OAAO,EAAE,OAAO,QAAA,EAAU,QAAA,EAAU,SAAS,MAAA,IAAa,SAAA,CAAU,KAAA,EAAO,IAAI,CAAA,EAAE;AACnF;AAEA,SAAS,UAAA,CAAc,QAAqC,GAAA,EAAgC;AAC1F,EAAA,OAAO,MAAA,CAAO,WAAA,CAAY,MAAA,CAAO,OAAA,CAAQ,MAAM,CAAA,CAAE,MAAA,CAAO,CAAC,CAAC,IAAI,CAAA,KAAM,IAAA,KAAS,GAAG,CAAC,CAAA;AACnF;AAOO,SAAS,gBAAA,CACd,KAAA,EACA,YAAA,EACA,QAAA,EACc;AACd,EAAA,MAAM,EAAE,KAAA,EAAO,MAAA,EAAQ,OAAO,MAAA,EAAQ,GAAG,KAAI,GAAI,KAAA;AACjD,EAAA,MAAM,WAAA,GAAA,CAAe,MAAM,QAAA,IAAY,IAAI,MAAA,CAAO,CAAC,GAAA,KAAQ,GAAA,KAAQ,YAAY,CAAA;AAC/E,EAAA,OAAO;AAAA,IACL,GAAG,GAAA;AAAA,IACH,GAAI,KAAA,CAAM,UAAA,KAAe,MAAA,GACrB,EAAC,GACD,EAAE,UAAA,EAAY,UAAA,CAAW,KAAA,CAAM,UAAA,EAAY,YAAY,CAAA,EAAE;AAAA,IAC7D,QAAA,EAAU,CAAC,GAAG,QAAA,EAAU,GAAG,WAAW;AAAA,GACxC;AACF;;"}

package/dist/application/transform/schema/discriminator-property.cjs

@@ -12,9 +12,10 @@ function discriminatorValue(discriminator, path) {
   );
   return match ? match[0] : name;
 }
-function discriminatorProperty(discriminator, path, isReadonly) {
+function discriminatorProperty(discriminator, path, isReadonly, valueType = () => null) {
   const value = discriminatorValue(discriminator, path);
-  return constructors.irProperty(propertyName.toPropertyName(discriminator.propertyName), literalType.literalType(value), { isReadonly });
+  const type = valueType(value) ?? literalType.literalType(value);
+  return constructors.irProperty(propertyName.toPropertyName(discriminator.propertyName), type, { isReadonly });
 }
 
 exports.discriminatorProperty = discriminatorProperty;

package/dist/application/transform/schema/discriminator-property.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"discriminator-property.cjs","sources":["../../../../src/application/transform/schema/discriminator-property.ts"],"sourcesContent":["import { irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport { literalType } from \"../literal-type.js\";\nimport type { Discriminator } from \"./schema-context.js\";\n\n/**\n * The value a schema has for its parent's discriminator: the mapping key whose target is this\n * schema (a full `$ref` or a bare schema name), else the schema's own name (the last segment).\n */\nfunction discriminatorValue(discriminator: Discriminator, path: string): string | undefined {\n  const name = parseRefPointer(path).pop();\n  const match = Object.entries(discriminator.mapping ?? {}).find(([, target]) =>\n    target.startsWith(\"#\") ? parseRefPointer(target).pop() === name : target === name,\n  );\n  return match ? match[0] : name;\n}\n\n/** The discriminator property, typed as its literal value (`createDiscriminatorProperty`). */\nexport function discriminatorProperty(\n  discriminator: Discriminator,\n  path: string,\n  isReadonly: boolean,\n): IrPropertySignature {\n  const value = discriminatorValue(discriminator, path);\n  return irProperty(toPropertyName(discriminator.propertyName), literalType(value), { isReadonly });\n}\n"],"names":["parseRefPointer","irProperty","toPropertyName","literalType"],"mappings":";;;;;;;AAWA,SAAS,kBAAA,CAAmB,eAA8B,IAAA,EAAkC;AAC1F,EAAA,MAAM,IAAA,GAAOA,2BAAA,CAAgB,IAAI,CAAA,CAAE,GAAA,EAAI;AACvC,EAAA,MAAM,QAAQ,MAAA,CAAO,OAAA,CAAQ,cAAc,OAAA,IAAW,EAAE,CAAA,CAAE,IAAA;AAAA,IAAK,CAAC,GAAG,MAAM,MACvE,MAAA,CAAO,UAAA,CAAW,GAAG,CAAA,GAAIA,4BAAgB,MAAM,CAAA,CAAE,GAAA,EAAI,KAAM,OAAO,MAAA,KAAW;AAAA,GAC/E;AACA,EAAA,OAAO,KAAA,GAAQ,KAAA,CAAM,CAAC,CAAA,GAAI,IAAA;AAC5B;AAGO,SAAS,qBAAA,CACd,aAAA,EACA,IAAA,EACA,UAAA,EACqB;AACrB,EAAA,MAAM,KAAA,GAAQ,kBAAA,CAAmB,aAAA,EAAe,IAAI,CAAA;AACpD,EAAA,OAAOC,uBAAA,CAAWC,2BAAA,CAAe,aAAA,CAAc,YAAY,CAAA,EAAGC,wBAAY,KAAK,CAAA,EAAG,EAAE,UAAA,EAAY,CAAA;AAClG;;"}
+{"version":3,"file":"discriminator-property.cjs","sources":["../../../../src/application/transform/schema/discriminator-property.ts"],"sourcesContent":["import { irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport { literalType } from \"../literal-type.js\";\nimport type { Discriminator } from \"./schema-context.js\";\n\n/**\n * The value a schema has for its parent's discriminator: the mapping key whose target is this\n * schema (a full `$ref` or a bare schema name), else the schema's own name (the last segment).\n */\nfunction discriminatorValue(discriminator: Discriminator, path: string): string | undefined {\n  const name = parseRefPointer(path).pop();\n  const match = Object.entries(discriminator.mapping ?? {}).find(([, target]) =>\n    target.startsWith(\"#\") ? parseRefPointer(target).pop() === name : target === name,\n  );\n  return match ? match[0] : name;\n}\n\n/**\n * The discriminator property, typed as its literal value (`createDiscriminatorProperty`), or as\n * `valueType` gives it; `valueType` returns null to keep the literal.\n */\nexport function discriminatorProperty(\n  discriminator: Discriminator,\n  path: string,\n  isReadonly: boolean,\n  valueType: (value: string | undefined) => IrType | null = () => null,\n): IrPropertySignature {\n  const value = discriminatorValue(discriminator, path);\n  const type = valueType(value) ?? literalType(value);\n  return irProperty(toPropertyName(discriminator.propertyName), type, { isReadonly });\n}\n"],"names":["parseRefPointer","literalType","irProperty","toPropertyName"],"mappings":";;;;;;;AAWA,SAAS,kBAAA,CAAmB,eAA8B,IAAA,EAAkC;AAC1F,EAAA,MAAM,IAAA,GAAOA,2BAAA,CAAgB,IAAI,CAAA,CAAE,GAAA,EAAI;AACvC,EAAA,MAAM,QAAQ,MAAA,CAAO,OAAA,CAAQ,cAAc,OAAA,IAAW,EAAE,CAAA,CAAE,IAAA;AAAA,IAAK,CAAC,GAAG,MAAM,MACvE,MAAA,CAAO,UAAA,CAAW,GAAG,CAAA,GAAIA,4BAAgB,MAAM,CAAA,CAAE,GAAA,EAAI,KAAM,OAAO,MAAA,KAAW;AAAA,GAC/E;AACA,EAAA,OAAO,KAAA,GAAQ,KAAA,CAAM,CAAC,CAAA,GAAI,IAAA;AAC5B;AAMO,SAAS,sBACd,aAAA,EACA,IAAA,EACA,UAAA,EACA,SAAA,GAA0D,MAAM,IAAA,EAC3C;AACrB,EAAA,MAAM,KAAA,GAAQ,kBAAA,CAAmB,aAAA,EAAe,IAAI,CAAA;AACpD,EAAA,MAAM,IAAA,GAAO,SAAA,CAAU,KAAK,CAAA,IAAKC,wBAAY,KAAK,CAAA;AAClD,EAAA,OAAOC,uBAAA,CAAWC,4BAAe,aAAA,CAAc,YAAY,GAAG,IAAA,EAAM,EAAE,YAAY,CAAA;AACpF;;"}

package/dist/application/transform/schema/discriminator-property.mjs

@@ -10,9 +10,10 @@ function discriminatorValue(discriminator, path) {
   );
   return match ? match[0] : name;
 }
-function discriminatorProperty(discriminator, path, isReadonly) {
+function discriminatorProperty(discriminator, path, isReadonly, valueType = () => null) {
   const value = discriminatorValue(discriminator, path);
-  return irProperty(toPropertyName(discriminator.propertyName), literalType(value), { isReadonly });
+  const type = valueType(value) ?? literalType(value);
+  return irProperty(toPropertyName(discriminator.propertyName), type, { isReadonly });
 }
 
 export { discriminatorProperty };

package/dist/application/transform/schema/discriminator-property.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"discriminator-property.mjs","sources":["../../../../src/application/transform/schema/discriminator-property.ts"],"sourcesContent":["import { irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport { literalType } from \"../literal-type.js\";\nimport type { Discriminator } from \"./schema-context.js\";\n\n/**\n * The value a schema has for its parent's discriminator: the mapping key whose target is this\n * schema (a full `$ref` or a bare schema name), else the schema's own name (the last segment).\n */\nfunction discriminatorValue(discriminator: Discriminator, path: string): string | undefined {\n  const name = parseRefPointer(path).pop();\n  const match = Object.entries(discriminator.mapping ?? {}).find(([, target]) =>\n    target.startsWith(\"#\") ? parseRefPointer(target).pop() === name : target === name,\n  );\n  return match ? match[0] : name;\n}\n\n/** The discriminator property, typed as its literal value (`createDiscriminatorProperty`). */\nexport function discriminatorProperty(\n  discriminator: Discriminator,\n  path: string,\n  isReadonly: boolean,\n): IrPropertySignature {\n  const value = discriminatorValue(discriminator, path);\n  return irProperty(toPropertyName(discriminator.propertyName), literalType(value), { isReadonly });\n}\n"],"names":[],"mappings":";;;;;AAWA,SAAS,kBAAA,CAAmB,eAA8B,IAAA,EAAkC;AAC1F,EAAA,MAAM,IAAA,GAAO,eAAA,CAAgB,IAAI,CAAA,CAAE,GAAA,EAAI;AACvC,EAAA,MAAM,QAAQ,MAAA,CAAO,OAAA,CAAQ,cAAc,OAAA,IAAW,EAAE,CAAA,CAAE,IAAA;AAAA,IAAK,CAAC,GAAG,MAAM,MACvE,MAAA,CAAO,UAAA,CAAW,GAAG,CAAA,GAAI,gBAAgB,MAAM,CAAA,CAAE,GAAA,EAAI,KAAM,OAAO,MAAA,KAAW;AAAA,GAC/E;AACA,EAAA,OAAO,KAAA,GAAQ,KAAA,CAAM,CAAC,CAAA,GAAI,IAAA;AAC5B;AAGO,SAAS,qBAAA,CACd,aAAA,EACA,IAAA,EACA,UAAA,EACqB;AACrB,EAAA,MAAM,KAAA,GAAQ,kBAAA,CAAmB,aAAA,EAAe,IAAI,CAAA;AACpD,EAAA,OAAO,UAAA,CAAW,cAAA,CAAe,aAAA,CAAc,YAAY,CAAA,EAAG,YAAY,KAAK,CAAA,EAAG,EAAE,UAAA,EAAY,CAAA;AAClG;;"}
+{"version":3,"file":"discriminator-property.mjs","sources":["../../../../src/application/transform/schema/discriminator-property.ts"],"sourcesContent":["import { irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport { literalType } from \"../literal-type.js\";\nimport type { Discriminator } from \"./schema-context.js\";\n\n/**\n * The value a schema has for its parent's discriminator: the mapping key whose target is this\n * schema (a full `$ref` or a bare schema name), else the schema's own name (the last segment).\n */\nfunction discriminatorValue(discriminator: Discriminator, path: string): string | undefined {\n  const name = parseRefPointer(path).pop();\n  const match = Object.entries(discriminator.mapping ?? {}).find(([, target]) =>\n    target.startsWith(\"#\") ? parseRefPointer(target).pop() === name : target === name,\n  );\n  return match ? match[0] : name;\n}\n\n/**\n * The discriminator property, typed as its literal value (`createDiscriminatorProperty`), or as\n * `valueType` gives it; `valueType` returns null to keep the literal.\n */\nexport function discriminatorProperty(\n  discriminator: Discriminator,\n  path: string,\n  isReadonly: boolean,\n  valueType: (value: string | undefined) => IrType | null = () => null,\n): IrPropertySignature {\n  const value = discriminatorValue(discriminator, path);\n  const type = valueType(value) ?? literalType(value);\n  return irProperty(toPropertyName(discriminator.propertyName), type, { isReadonly });\n}\n"],"names":[],"mappings":";;;;;AAWA,SAAS,kBAAA,CAAmB,eAA8B,IAAA,EAAkC;AAC1F,EAAA,MAAM,IAAA,GAAO,eAAA,CAAgB,IAAI,CAAA,CAAE,GAAA,EAAI;AACvC,EAAA,MAAM,QAAQ,MAAA,CAAO,OAAA,CAAQ,cAAc,OAAA,IAAW,EAAE,CAAA,CAAE,IAAA;AAAA,IAAK,CAAC,GAAG,MAAM,MACvE,MAAA,CAAO,UAAA,CAAW,GAAG,CAAA,GAAI,gBAAgB,MAAM,CAAA,CAAE,GAAA,EAAI,KAAM,OAAO,MAAA,KAAW;AAAA,GAC/E;AACA,EAAA,OAAO,KAAA,GAAQ,KAAA,CAAM,CAAC,CAAA,GAAI,IAAA;AAC5B;AAMO,SAAS,sBACd,aAAA,EACA,IAAA,EACA,UAAA,EACA,SAAA,GAA0D,MAAM,IAAA,EAC3C;AACrB,EAAA,MAAM,KAAA,GAAQ,kBAAA,CAAmB,aAAA,EAAe,IAAI,CAAA;AACpD,EAAA,MAAM,IAAA,GAAO,SAAA,CAAU,KAAK,CAAA,IAAK,YAAY,KAAK,CAAA;AAClD,EAAA,OAAO,UAAA,CAAW,eAAe,aAAA,CAAc,YAAY,GAAG,IAAA,EAAM,EAAE,YAAY,CAAA;AACpF;;"}

package/dist/application/transform/schema/enum-rule.cjs

@@ -2,6 +2,7 @@
 
 const constructors = require('../../../domain/ir/constructors.cjs');
 const jsonPointer = require('../../../domain/openapi/json-pointer.cjs');
+const outputFixes = require('../../../domain/output-fixes.cjs');
 const literalType = require('../literal-type.cjs');
 const refType = require('../ref-type.cjs');
 const typeCombinators = require('../type-combinators.cjs');
@@ -15,6 +16,7 @@ function hasAdditionalProperties(schema) {
 function nameFromPath(path) {
   return jsonPointer.parseRefPointer(path ?? "").join("/").replace(COMPONENT_SCHEMAS_PREFIX, "");
 }
+const COMPONENT_SCHEMA_RE = /^#\/components\/schemas\/[^/]+$/;
 function hasEnumMetadata(schema) {
   return [
     schema["x-enum-varnames"],
@@ -23,39 +25,92 @@ function hasEnumMetadata(schema) {
     schema["x-enumDescriptions"]
   ].some(Array.isArray);
 }
+function tsEnumEntries(schema, options) {
+  const entries = (schema.enum ?? []).map((value, index) => [value, index]);
+  return options.fixes.has(outputFixes.OutputFix.NULLABLE_ENUMS) ? entries.filter(([value]) => value !== null) : entries;
+}
 function isTsEnum(schema, options) {
   if (!options.enum || !schema.enum) {
     return false;
   }
-  const isSupported = schema.enum.every((value) => ["string", "number"].includes(typeof value));
+  const entries = tsEnumEntries(schema, options);
+  const isOnlyNull = entries.length === 0 && schema.enum.length > 0;
+  const isSupported = !isOnlyNull && entries.every(([value]) => ["string", "number"].includes(typeof value));
   return isSupported && (!options.conditionalEnums || hasEnumMetadata(schema));
 }
-function enumMetadata(schema) {
-  return (schema.enum ?? []).map((_, index) => ({
+function enumMetadata(schema, entries) {
+  return entries.map(([, index]) => ({
     name: schema["x-enum-varnames"]?.[index] ?? schema["x-enumNames"]?.[index],
     description: schema["x-enum-descriptions"]?.[index] ?? schema["x-enumDescriptions"]?.[index]
   }));
 }
+function isNullAllowed(schema) {
+  const { type } = schema;
+  const isTypeNullable = type === void 0 || Array.isArray(type) && type.includes("null") || Boolean(schema.nullable);
+  return (schema.enum ?? []).includes(null) && isTypeNullable;
+}
 function withOtherStrings(type, schema) {
   if (!hasAdditionalProperties(schema) || schema.type !== "string") {
     return type;
   }
   return typeCombinators.unionOf([type, typeCombinators.intersectionOf([constructors.irKeyword("string"), constructors.irObject([])])]);
 }
+function enumRequest(schema, path, options) {
+  const entries = tsEnumEntries(schema, options);
+  return {
+    name: nameFromPath(path),
+    isComponentSchema: COMPONENT_SCHEMA_RE.test(path ?? ""),
+    values: entries.map(([value]) => value),
+    metadata: enumMetadata(schema, entries)
+  };
+}
+function enumMemberType(enumName, member) {
+  return member.startsWith('"') ? constructors.irIndexedAccess(constructors.irReference(`typeof ${enumName}`), constructors.irString(JSON.parse(member), "escaped")) : constructors.irReference(`${enumName}.${member}`);
+}
+function ownerEnumMembersType(key, values, request) {
+  const { options, discriminators, footer } = request.context;
+  const parent = options.fixes.has(
+    outputFixes.OutputFix.DISCRIMINATOR_VALUES
+  ) ? discriminators.enumParentOf(key) : void 0;
+  if (parent === void 0 || !isTsEnum(parent.schema, options)) {
+    return null;
+  }
+  const reference = { ...enumRequest(parent.schema, parent.path, options), isOwnerReference: true };
+  const name = footer.addEnum(reference);
+  const members = footer.enumMembers(name);
+  const names = values.map((value) => members.get(value));
+  if (names.length === 0 || names.some((member) => member === void 0)) {
+    return null;
+  }
+  return typeCombinators.unionOf(names.map((member) => enumMemberType(name, member)));
+}
 function tsEnumType(schema, request) {
-  const name = request.context.footer.addEnum({
-    name: nameFromPath(request.location.path),
-    values: schema.enum ?? [],
-    metadata: enumMetadata(schema)
-  });
-  return withOtherStrings(constructors.irReference(name), schema);
+  const { options, footer } = request.context;
+  const values = tsEnumEntries(schema, options).map(([value]) => value);
+  const type = ownerEnumMembersType(schema, values, request) ?? withOtherStrings(
+    constructors.irReference(footer.addEnum(enumRequest(schema, request.location.path, options))),
+    schema
+  );
+  return options.fixes.has(outputFixes.OutputFix.NULLABLE_ENUMS) && isNullAllowed(schema) ? typeCombinators.unionOf([type, constructors.irKeyword("null")]) : type;
 }
 function isUnionPosition(pointer, index) {
   const next = pointer[index + 1];
   return UNION_KEYWORDS.has(pointer[index]) && next !== void 0 && INDEX_RE.test(next);
 }
+const PARAMETERS = "parameters";
+function pathItemParametersIndex(pointer) {
+  if (pointer[0] === "paths" || pointer[0] === "webhooks") {
+    return 2;
+  }
+  return pointer[0] === "components" && pointer[1] === "pathItems" ? 3 : null;
+}
+function withSingleParametersSegment(pointer) {
+  const index = pathItemParametersIndex(pointer);
+  const isRepeated = index !== null && pointer[index] === PARAMETERS && pointer[index + 1] === PARAMETERS;
+  return isRepeated ? [...pointer.slice(0, index), ...pointer.slice(index + 1)] : pointer;
+}
 function enumValuesPointer(path) {
-  const pointer = jsonPointer.parseRefPointer(path ?? "");
+  const pointer = withSingleParametersSegment(jsonPointer.parseRefPointer(path ?? ""));
   const kept = [];
   let firstVariantStart = null;
   for (let index = 0; index < pointer.length; index++) {
@@ -104,4 +159,5 @@ const enumRule = {
 };
 
 exports.enumRule = enumRule;
+exports.ownerEnumMembersType = ownerEnumMembersType;
 //# sourceMappingURL=enum-rule.cjs.map

package/dist/application/transform/schema/enum-rule.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"enum-rule.cjs","sources":["../../../../src/application/transform/schema/enum-rule.ts"],"sourcesContent":["import {\n  irIndexedAccess,\n  irKeyword,\n  irObject,\n  irReference,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef, parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { literalType } from \"../literal-type.js\";\nimport { refType } from \"../ref-type.js\";\nimport { intersectionOf, unionOf } from \"../type-combinators.js\";\nimport type { EnumMemberMetadata, SchemaOptions } from \"./schema-context.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\n/** Removed from generated names, so `#/components/schemas/Status` gives `Status`. */\nconst COMPONENT_SCHEMAS_PREFIX = \"components/schemas\";\nconst UNION_KEYWORDS: ReadonlySet<string> = new Set([\"anyOf\", \"oneOf\"]);\nconst INDEX_RE = /^\\d+$/;\n\nfunction hasAdditionalProperties(schema: SchemaObject): boolean {\n  return \"additionalProperties\" in schema && Boolean(schema.additionalProperties);\n}\n\n/** A name from the schema's pointer: `#/components/schemas/Pet/status` → `/Pet/status`. */\nfunction nameFromPath(path: string | undefined): string {\n  return parseRefPointer(path ?? \"\")\n    .join(\"/\")\n    .replace(COMPONENT_SCHEMAS_PREFIX, \"\");\n}\n\nfunction hasEnumMetadata(schema: SchemaObject): boolean {\n  return [\n    schema[\"x-enum-varnames\"],\n    schema[\"x-enumNames\"],\n    schema[\"x-enum-descriptions\"],\n    schema[\"x-enumDescriptions\"],\n  ].some(Array.isArray);\n}\n\n/**\n * `--enum`: string and number enums become TypeScript enums. The original meant to allow `null`\n * too, but tested `typeof value` against `null`, so an enum containing null stays a union.\n */\nfunction isTsEnum(schema: SchemaObject, options: SchemaOptions): boolean {\n  if (!options.enum || !schema.enum) {\n    return false;\n  }\n  const isSupported = schema.enum.every((value) => [\"string\", \"number\"].includes(typeof value));\n  // `--conditional-enums` converts only enums that carry x-enum-* metadata.\n  return isSupported && (!options.conditionalEnums || hasEnumMetadata(schema));\n}\n\nfunction enumMetadata(schema: SchemaObject): EnumMemberMetadata[] {\n  return (schema.enum ?? []).map((_, index) => ({\n    name: schema[\"x-enum-varnames\"]?.[index] ?? schema[\"x-enumNames\"]?.[index],\n    description: schema[\"x-enum-descriptions\"]?.[index] ?? schema[\"x-enumDescriptions\"]?.[index],\n  }));\n}\n\n/**\n * `additionalProperties: true` on a string enum keeps other strings allowed but still offers the\n * listed values in editors: `\"a\" | \"b\" | (string & {})`.\n */\nfunction withOtherStrings(type: IrType, schema: SchemaObject): IrType {\n  if (!hasAdditionalProperties(schema) || schema.type !== \"string\") {\n    return type;\n  }\n  return unionOf([type, intersectionOf([irKeyword(\"string\"), irObject([])])]);\n}\n\nfunction tsEnumType(schema: SchemaObject, request: SchemaRequest): IrType {\n  // `isTsEnum` admits only strings and numbers, so there is no null member to split off.\n  const name = request.context.footer.addEnum({\n    name: nameFromPath(request.location.path),\n    values: (schema.enum ?? []) as (string | number)[],\n    metadata: enumMetadata(schema),\n  });\n  return withOtherStrings(irReference(name), schema);\n}\n\nfunction isUnionPosition(pointer: readonly string[], index: number): boolean {\n  const next = pointer[index + 1];\n  return UNION_KEYWORDS.has(pointer[index] as string) && next !== undefined && INDEX_RE.test(next);\n}\n\n/**\n * The pointer of `--enum-values` arrays without union positions (`anyOf/0`), so names stay\n * stable. Every property after the first union position is narrowed with `Extract`: a no-op where\n * all variants have it, and the needed narrowing where only some do.\n */\nfunction enumValuesPointer(path: string | undefined): { ref: string; extract: string[] } {\n  const pointer = parseRefPointer(path ?? \"\");\n  const kept: string[] = [];\n  let firstVariantStart: number | null = null;\n  for (let index = 0; index < pointer.length; index++) {\n    if (isUnionPosition(pointer, index)) {\n      firstVariantStart ??= index + 2;\n      index++;\n      continue;\n    }\n    kept.push(pointer[index] as string);\n  }\n  const extract =\n    firstVariantStart === null\n      ? []\n      : pointer\n          .slice(firstVariantStart)\n          .filter((segment) => !UNION_KEYWORDS.has(segment) && !INDEX_RE.test(segment));\n  return { ref: createRef(kept), extract };\n}\n\nfunction addEnumValues(schema: SchemaObject, request: SchemaRequest): void {\n  const { ref, extract } = enumValuesPointer(request.location.path);\n  const valuesType = refType(ref, { isDeep: true, extractProperties: extract });\n  request.context.footer.addEnumValues({\n    name: `${nameFromPath(request.location.path)}Values`,\n    // A record value (`additionalProperties`) is reached by indexing with `string`.\n    type: request.isFromAdditionalProperties\n      ? irIndexedAccess(valuesType, irReference(\"string\"))\n      : valuesType,\n    values: (schema.enum ?? []) as (string | number)[],\n  });\n}\n\nfunction literalEnumType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const values = schema.enum ?? [];\n  const isNullable =\n    (Array.isArray(schema.type) && schema.type.includes(\"null\")) || Boolean(schema.nullable);\n  const literals = [...values.map(literalType), ...(isNullable ? [irKeyword(\"null\")] : [])];\n  const type = withOtherStrings(unionOf(literals), schema);\n  const isListable = values.every(\n    (value) => typeof value === \"string\" || typeof value === \"number\",\n  );\n  if (request.context.options.enumValues && isListable) {\n    addEnumValues(schema, request);\n  }\n  return type;\n}\n\n/**\n * `enum` on anything but an object (object enums are handled as `oneOf`). With\n * `additionalProperties`, only string enums are handled here; others fall through to composition.\n */\nexport const enumRule: SchemaRule = {\n  name: \"enum\",\n  matches(schema) {\n    const isCandidate =\n      Array.isArray(schema.enum) && schema.type !== \"object\" && !(\"properties\" in schema);\n    return isCandidate && (!hasAdditionalProperties(schema) || schema.type === \"string\");\n  },\n  transform(schema, request) {\n    return isTsEnum(schema, request.context.options)\n      ? tsEnumType(schema, request)\n      : literalEnumType(schema, request);\n  },\n};\n"],"names":["parseRefPointer","unionOf","intersectionOf","irKeyword","irObject","irReference","createRef","refType","irIndexedAccess","literalType"],"mappings":"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"}
+{"version":3,"file":"enum-rule.cjs","sources":["../../../../src/application/transform/schema/enum-rule.ts"],"sourcesContent":["import {\n  irIndexedAccess,\n  irKeyword,\n  irObject,\n  irReference,\n  irString,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { createRef, parseRefPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport { literalType } from \"../literal-type.js\";\nimport { refType } from \"../ref-type.js\";\nimport { intersectionOf, unionOf } from \"../type-combinators.js\";\nimport type {\n  DiscriminatorEnumParent,\n  EnumDeclarationRequest,\n  EnumMemberMetadata,\n  SchemaOptions,\n} from \"./schema-context.js\";\nimport type { SchemaRequest, SchemaRule } from \"./schema-rule.js\";\n\n/** Removed from generated names, so `#/components/schemas/Status` gives `Status`. */\nconst COMPONENT_SCHEMAS_PREFIX = \"components/schemas\";\nconst UNION_KEYWORDS: ReadonlySet<string> = new Set([\"anyOf\", \"oneOf\"]);\nconst INDEX_RE = /^\\d+$/;\n\nfunction hasAdditionalProperties(schema: SchemaObject): boolean {\n  return \"additionalProperties\" in schema && Boolean(schema.additionalProperties);\n}\n\n/** A name from the schema's pointer: `#/components/schemas/Pet/status` → `/Pet/status`. */\nfunction nameFromPath(path: string | undefined): string {\n  return parseRefPointer(path ?? \"\")\n    .join(\"/\")\n    .replace(COMPONENT_SCHEMAS_PREFIX, \"\");\n}\n\n/** `#/components/schemas/Name`, and no deeper pointer. */\nconst COMPONENT_SCHEMA_RE = /^#\\/components\\/schemas\\/[^/]+$/;\n\nfunction hasEnumMetadata(schema: SchemaObject): boolean {\n  return [\n    schema[\"x-enum-varnames\"],\n    schema[\"x-enumNames\"],\n    schema[\"x-enum-descriptions\"],\n    schema[\"x-enumDescriptions\"],\n  ].some(Array.isArray);\n}\n\n/**\n * The values a TypeScript enum declares, with their positions in `enum`. With the\n * `nullable-enums` fix a `null` value is left out (upstream #1872): an enum member cannot be\n * `null`, so the type adds it as `| null` instead (`tsEnumType`).\n */\nfunction tsEnumEntries(schema: SchemaObject, options: SchemaOptions): [unknown, number][] {\n  const entries = (schema.enum ?? []).map((value, index): [unknown, number] => [value, index]);\n  return options.fixes.has(OutputFix.NULLABLE_ENUMS)\n    ? entries.filter(([value]) => value !== null)\n    : entries;\n}\n\n/**\n * `--enum`: string and number enums become TypeScript enums. The original meant to allow `null`\n * too, but tested `typeof value` against `null`, so an enum containing null stays a union; the\n * `nullable-enums` fix declares its other values.\n */\nfunction isTsEnum(schema: SchemaObject, options: SchemaOptions): boolean {\n  if (!options.enum || !schema.enum) {\n    return false;\n  }\n  const entries = tsEnumEntries(schema, options);\n  // An empty `enum` stays an empty TypeScript enum, as the original made it; an enum of only\n  // `null` has no member left once the fix drops `null`, so it stays a union.\n  const isOnlyNull = entries.length === 0 && schema.enum.length > 0;\n  const isSupported =\n    !isOnlyNull && entries.every(([value]) => [\"string\", \"number\"].includes(typeof value));\n  // `--conditional-enums` converts only enums that carry x-enum-* metadata.\n  return isSupported && (!options.conditionalEnums || hasEnumMetadata(schema));\n}\n\nfunction enumMetadata(\n  schema: SchemaObject,\n  entries: readonly [unknown, number][],\n): EnumMemberMetadata[] {\n  return entries.map(([, index]) => ({\n    name: schema[\"x-enum-varnames\"]?.[index] ?? schema[\"x-enumNames\"]?.[index],\n    description: schema[\"x-enum-descriptions\"]?.[index] ?? schema[\"x-enumDescriptions\"]?.[index],\n  }));\n}\n\n/**\n * Whether `null` is a valid value: it is in `enum` and the schema's type admits it (`type`\n * absent or listing `\"null\"`, or OpenAPI 3.0 `nullable: true`). Both keywords must pass.\n */\nfunction isNullAllowed(schema: SchemaObject): boolean {\n  const { type } = schema;\n  const isTypeNullable =\n    type === undefined ||\n    (Array.isArray(type) && type.includes(\"null\")) ||\n    Boolean(schema.nullable);\n  return (schema.enum ?? []).includes(null) && isTypeNullable;\n}\n\n/**\n * `additionalProperties: true` on a string enum keeps other strings allowed but still offers the\n * listed values in editors: `\"a\" | \"b\" | (string & {})`.\n */\nfunction withOtherStrings(type: IrType, schema: SchemaObject): IrType {\n  if (!hasAdditionalProperties(schema) || schema.type !== \"string\") {\n    return type;\n  }\n  return unionOf([type, intersectionOf([irKeyword(\"string\"), irObject([])])]);\n}\n\n/** The enum declaration of `schema` typed at `path`; its values are strings and numbers. */\nfunction enumRequest(\n  schema: SchemaObject,\n  path: string | undefined,\n  options: SchemaOptions,\n): EnumDeclarationRequest {\n  const entries = tsEnumEntries(schema, options);\n  return {\n    name: nameFromPath(path),\n    isComponentSchema: COMPONENT_SCHEMA_RE.test(path ?? \"\"),\n    values: entries.map(([value]) => value as string | number),\n    metadata: enumMetadata(schema, entries),\n  };\n}\n\n/** One member's type; a quoted member cannot follow a dot, `typeof E[\"+\"]` is the same type. */\nfunction enumMemberType(enumName: string, member: string): IrType {\n  return member.startsWith('\"')\n    ? irIndexedAccess(irReference(`typeof ${enumName}`), irString(JSON.parse(member), \"escaped\"))\n    : irReference(`${enumName}.${member}`);\n}\n\n/**\n * The `discriminator-values` fix: a member's discriminator value is typed with members of\n * the owner's enum (`PetType.Cat`), so the member is one of the owner's type (#1700). `key` is the\n * enum the scan added or the inherited discriminator object. Null when the fix is off, or the\n * owner's property is no TypeScript enum with every value.\n */\nexport function ownerEnumMembersType(\n  key: object,\n  values: readonly unknown[],\n  request: SchemaRequest,\n): IrType | null {\n  const { options, discriminators, footer } = request.context;\n  const parent: DiscriminatorEnumParent | undefined = options.fixes.has(\n    OutputFix.DISCRIMINATOR_VALUES,\n  )\n    ? discriminators.enumParentOf(key)\n    : undefined;\n  if (parent === undefined || !isTsEnum(parent.schema, options)) {\n    return null;\n  }\n  const reference = { ...enumRequest(parent.schema, parent.path, options), isOwnerReference: true };\n  const name = footer.addEnum(reference);\n  const members = footer.enumMembers(name);\n  const names = values.map((value) => members.get(value as string | number));\n  if (names.length === 0 || names.some((member) => member === undefined)) {\n    return null;\n  }\n  return unionOf(names.map((member) => enumMemberType(name, member as string)));\n}\n\nfunction tsEnumType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { options, footer } = request.context;\n  // `isTsEnum` admits only strings and numbers, and the fix leaves `null` out of the members.\n  const values = tsEnumEntries(schema, options).map(([value]) => value);\n  const type =\n    ownerEnumMembersType(schema, values, request) ??\n    withOtherStrings(\n      irReference(footer.addEnum(enumRequest(schema, request.location.path, options))),\n      schema,\n    );\n  return options.fixes.has(OutputFix.NULLABLE_ENUMS) && isNullAllowed(schema)\n    ? unionOf([type, irKeyword(\"null\")])\n    : type;\n}\n\nfunction isUnionPosition(pointer: readonly string[], index: number): boolean {\n  const next = pointer[index + 1];\n  return UNION_KEYWORDS.has(pointer[index] as string) && next !== undefined && INDEX_RE.test(next);\n}\n\nconst PARAMETERS = \"parameters\";\n\n/** Where the `parameters` of a path item sit in its pointer: `paths/<key>/…`, `components/…`. */\nfunction pathItemParametersIndex(pointer: readonly string[]): number | null {\n  if (pointer[0] === \"paths\" || pointer[0] === \"webhooks\") {\n    return 2;\n  }\n  return pointer[0] === \"components\" && pointer[1] === \"pathItems\" ? 3 : null;\n}\n\n/**\n * The location of a path item parameter repeats `parameters` (`paths/~1a/parameters/parameters/\n * path/id`), which keeps the generated names as they were. The generated type has the segment\n * once: `paths[\"/a\"][\"parameters\"][\"path\"][\"id\"]`.\n */\nfunction withSingleParametersSegment(pointer: readonly string[]): readonly string[] {\n  const index = pathItemParametersIndex(pointer);\n  const isRepeated =\n    index !== null && pointer[index] === PARAMETERS && pointer[index + 1] === PARAMETERS;\n  return isRepeated ? [...pointer.slice(0, index), ...pointer.slice(index + 1)] : pointer;\n}\n\n/**\n * The pointer of `--enum-values` arrays without union positions (`anyOf/0`), so names stay\n * stable. Every property after the first union position is narrowed with `Extract`: a no-op where\n * all variants have it, and the needed narrowing where only some do.\n */\nfunction enumValuesPointer(path: string | undefined): { ref: string; extract: string[] } {\n  const pointer = withSingleParametersSegment(parseRefPointer(path ?? \"\"));\n  const kept: string[] = [];\n  let firstVariantStart: number | null = null;\n  for (let index = 0; index < pointer.length; index++) {\n    if (isUnionPosition(pointer, index)) {\n      firstVariantStart ??= index + 2;\n      index++;\n      continue;\n    }\n    kept.push(pointer[index] as string);\n  }\n  const extract =\n    firstVariantStart === null\n      ? []\n      : pointer\n          .slice(firstVariantStart)\n          .filter((segment) => !UNION_KEYWORDS.has(segment) && !INDEX_RE.test(segment));\n  return { ref: createRef(kept), extract };\n}\n\nfunction addEnumValues(schema: SchemaObject, request: SchemaRequest): void {\n  const { ref, extract } = enumValuesPointer(request.location.path);\n  const valuesType = refType(ref, { isDeep: true, extractProperties: extract });\n  request.context.footer.addEnumValues({\n    name: `${nameFromPath(request.location.path)}Values`,\n    // A record value (`additionalProperties`) is reached by indexing with `string`.\n    type: request.isFromAdditionalProperties\n      ? irIndexedAccess(valuesType, irReference(\"string\"))\n      : valuesType,\n    values: (schema.enum ?? []) as (string | number)[],\n  });\n}\n\nfunction literalEnumType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const values = schema.enum ?? [];\n  const isNullable =\n    (Array.isArray(schema.type) && schema.type.includes(\"null\")) || Boolean(schema.nullable);\n  const literals = [...values.map(literalType), ...(isNullable ? [irKeyword(\"null\")] : [])];\n  const type = withOtherStrings(unionOf(literals), schema);\n  const isListable = values.every(\n    (value) => typeof value === \"string\" || typeof value === \"number\",\n  );\n  if (request.context.options.enumValues && isListable) {\n    addEnumValues(schema, request);\n  }\n  return type;\n}\n\n/**\n * `enum` on anything but an object (object enums are handled as `oneOf`). With\n * `additionalProperties`, only string enums are handled here; others fall through to composition.\n */\nexport const enumRule: SchemaRule = {\n  name: \"enum\",\n  matches(schema) {\n    const isCandidate =\n      Array.isArray(schema.enum) && schema.type !== \"object\" && !(\"properties\" in schema);\n    return isCandidate && (!hasAdditionalProperties(schema) || schema.type === \"string\");\n  },\n  transform(schema, request) {\n    return isTsEnum(schema, request.context.options)\n      ? tsEnumType(schema, request)\n      : literalEnumType(schema, request);\n  },\n};\n"],"names":["parseRefPointer","OutputFix","unionOf","intersectionOf","irKeyword","irObject","irIndexedAccess","irReference","irString","createRef","refType","literalType"],"mappings":"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"}