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

package/dist/application/transform/schema/access-flags.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-flags.cjs","sources":["../../../../src/application/transform/schema/access-flags.ts"],"sourcesContent":["import type { Schema, SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport type { SchemaContext } from \"./schema-context.js\";\n\n/** Whether a property is `readOnly` or `writeOnly` (JSON Schema 2020-12 Validation §9.4). */\nexport interface AccessFlags {\n  readonly isReadOnly: boolean;\n  readonly isWriteOnly: boolean;\n}\n\nconst NO_FLAGS: AccessFlags = { isReadOnly: false, isWriteOnly: false };\n\nfunction ownFlags(schema: SchemaObject): AccessFlags {\n  return { isReadOnly: Boolean(schema.readOnly), isWriteOnly: Boolean(schema.writeOnly) };\n}\n\nfunction merged(left: AccessFlags, right: AccessFlags): AccessFlags {\n  return {\n    isReadOnly: left.isReadOnly || right.isReadOnly,\n    isWriteOnly: left.isWriteOnly || right.isWriteOnly,\n  };\n}\n\n/**\n * The flags of a schema and of the schemas that always apply to the same value: the one its\n * `$ref` names and its `allOf` members, followed until a schema repeats. `readOnly` is an\n * annotation, and the annotations of those schemas are the value's (2020-12 Core §7.7.1); in\n * OpenAPI 3.0 a referenced schema is the property's definition. `anyOf` and `oneOf` members apply\n * only when they match, which the type cannot tell, so they are not read.\n */\nfunction appliedFlags(\n  schema: Schema | undefined,\n  context: SchemaContext,\n  seen: ReadonlySet<Schema>,\n): AccessFlags {\n  if (typeof schema !== \"object\" || schema === null || seen.has(schema)) {\n    return NO_FLAGS;\n  }\n  const inner = new Set([...seen, schema]);\n  // `readOnly` next to a `$ref` is read too, as the generator always has.\n  const object = schema as SchemaObject & { readonly $ref?: unknown };\n  const target =\n    typeof object.$ref === \"string\" ? (context.refs.resolve(object.$ref) as Schema) : undefined;\n  return (object.allOf ?? []).reduce<AccessFlags>(\n    (flags, member) => merged(flags, appliedFlags(member, context, inner)),\n    merged(ownFlags(object), appliedFlags(target, context, inner)),\n  );\n}\n\n/**\n * The flags of a property schema. Without the `read-write-refs` fix only the keywords written on\n * it count, as in openapi-typescript; with it, also those of the schemas its `$ref` and `allOf`\n * apply (upstream #1938).\n */\nexport function propertyAccessFlags(value: Schema, context: SchemaContext): AccessFlags {\n  if (typeof value !== \"object\") {\n    return NO_FLAGS;\n  }\n  if (!context.options.fixes.has(OutputFix.READ_WRITE_REFS)) {\n    return ownFlags(value as SchemaObject);\n  }\n  return appliedFlags(value, context, new Set());\n}\n"],"names":["OutputFix"],"mappings":";;;;AAUA,MAAM,QAAA,GAAwB,EAAE,UAAA,EAAY,KAAA,EAAO,aAAa,KAAA,EAAM;AAEtE,SAAS,SAAS,MAAA,EAAmC;AACnD,EAAA,OAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,MAAA,CAAO,QAAQ,GAAG,WAAA,EAAa,OAAA,CAAQ,MAAA,CAAO,SAAS,CAAA,EAAE;AACxF;AAEA,SAAS,MAAA,CAAO,MAAmB,KAAA,EAAiC;AAClE,EAAA,OAAO;AAAA,IACL,UAAA,EAAY,IAAA,CAAK,UAAA,IAAc,KAAA,CAAM,UAAA;AAAA,IACrC,WAAA,EAAa,IAAA,CAAK,WAAA,IAAe,KAAA,CAAM;AAAA,GACzC;AACF;AASA,SAAS,YAAA,CACP,MAAA,EACA,OAAA,EACA,IAAA,EACa;AACb,EAAA,IAAI,OAAO,WAAW,QAAA,IAAY,MAAA,KAAW,QAAQ,IAAA,CAAK,GAAA,CAAI,MAAM,CAAA,EAAG;AACrE,IAAA,OAAO,QAAA;AAAA,EACT;AACA,EAAA,MAAM,wBAAQ,IAAI,GAAA,CAAI,CAAC,GAAG,IAAA,EAAM,MAAM,CAAC,CAAA;AAEvC,EAAA,MAAM,MAAA,GAAS,MAAA;AACf,EAAA,MAAM,MAAA,GACJ,OAAO,MAAA,CAAO,IAAA,KAAS,QAAA,GAAY,QAAQ,IAAA,CAAK,OAAA,CAAQ,MAAA,CAAO,IAAI,CAAA,GAAe,MAAA;AACpF,EAAA,OAAA,CAAQ,MAAA,CAAO,KAAA,IAAS,EAAC,EAAG,MAAA;AAAA,IAC1B,CAAC,OAAO,MAAA,KAAW,MAAA,CAAO,OAAO,YAAA,CAAa,MAAA,EAAQ,OAAA,EAAS,KAAK,CAAC,CAAA;AAAA,IACrE,MAAA,CAAO,SAAS,MAAM,CAAA,EAAG,aAAa,MAAA,EAAQ,OAAA,EAAS,KAAK,CAAC;AAAA,GAC/D;AACF;AAOO,SAAS,mBAAA,CAAoB,OAAe,OAAA,EAAqC;AACtF,EAAA,IAAI,OAAO,UAAU,QAAA,EAAU;AAC7B,IAAA,OAAO,QAAA;AAAA,EACT;AACA,EAAA,IAAI,CAAC,OAAA,CAAQ,OAAA,CAAQ,MAAM,GAAA,CAAIA,qBAAA,CAAU,eAAe,CAAA,EAAG;AACzD,IAAA,OAAO,SAAS,KAAqB,CAAA;AAAA,EACvC;AACA,EAAA,OAAO,YAAA,CAAa,KAAA,EAAO,OAAA,kBAAS,IAAI,KAAK,CAAA;AAC/C;;"}

package/dist/application/transform/schema/access-flags.mjs

@@ -0,0 +1,36 @@
+import { OutputFix } from '../../../domain/output-fixes.mjs';
+
+const NO_FLAGS = { isReadOnly: false, isWriteOnly: false };
+function ownFlags(schema) {
+  return { isReadOnly: Boolean(schema.readOnly), isWriteOnly: Boolean(schema.writeOnly) };
+}
+function merged(left, right) {
+  return {
+    isReadOnly: left.isReadOnly || right.isReadOnly,
+    isWriteOnly: left.isWriteOnly || right.isWriteOnly
+  };
+}
+function appliedFlags(schema, context, seen) {
+  if (typeof schema !== "object" || schema === null || seen.has(schema)) {
+    return NO_FLAGS;
+  }
+  const inner = /* @__PURE__ */ new Set([...seen, schema]);
+  const object = schema;
+  const target = typeof object.$ref === "string" ? context.refs.resolve(object.$ref) : void 0;
+  return (object.allOf ?? []).reduce(
+    (flags, member) => merged(flags, appliedFlags(member, context, inner)),
+    merged(ownFlags(object), appliedFlags(target, context, inner))
+  );
+}
+function propertyAccessFlags(value, context) {
+  if (typeof value !== "object") {
+    return NO_FLAGS;
+  }
+  if (!context.options.fixes.has(OutputFix.READ_WRITE_REFS)) {
+    return ownFlags(value);
+  }
+  return appliedFlags(value, context, /* @__PURE__ */ new Set());
+}
+
+export { propertyAccessFlags };
+//# sourceMappingURL=access-flags.mjs.map

package/dist/application/transform/schema/access-flags.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-flags.mjs","sources":["../../../../src/application/transform/schema/access-flags.ts"],"sourcesContent":["import type { Schema, SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport type { SchemaContext } from \"./schema-context.js\";\n\n/** Whether a property is `readOnly` or `writeOnly` (JSON Schema 2020-12 Validation §9.4). */\nexport interface AccessFlags {\n  readonly isReadOnly: boolean;\n  readonly isWriteOnly: boolean;\n}\n\nconst NO_FLAGS: AccessFlags = { isReadOnly: false, isWriteOnly: false };\n\nfunction ownFlags(schema: SchemaObject): AccessFlags {\n  return { isReadOnly: Boolean(schema.readOnly), isWriteOnly: Boolean(schema.writeOnly) };\n}\n\nfunction merged(left: AccessFlags, right: AccessFlags): AccessFlags {\n  return {\n    isReadOnly: left.isReadOnly || right.isReadOnly,\n    isWriteOnly: left.isWriteOnly || right.isWriteOnly,\n  };\n}\n\n/**\n * The flags of a schema and of the schemas that always apply to the same value: the one its\n * `$ref` names and its `allOf` members, followed until a schema repeats. `readOnly` is an\n * annotation, and the annotations of those schemas are the value's (2020-12 Core §7.7.1); in\n * OpenAPI 3.0 a referenced schema is the property's definition. `anyOf` and `oneOf` members apply\n * only when they match, which the type cannot tell, so they are not read.\n */\nfunction appliedFlags(\n  schema: Schema | undefined,\n  context: SchemaContext,\n  seen: ReadonlySet<Schema>,\n): AccessFlags {\n  if (typeof schema !== \"object\" || schema === null || seen.has(schema)) {\n    return NO_FLAGS;\n  }\n  const inner = new Set([...seen, schema]);\n  // `readOnly` next to a `$ref` is read too, as the generator always has.\n  const object = schema as SchemaObject & { readonly $ref?: unknown };\n  const target =\n    typeof object.$ref === \"string\" ? (context.refs.resolve(object.$ref) as Schema) : undefined;\n  return (object.allOf ?? []).reduce<AccessFlags>(\n    (flags, member) => merged(flags, appliedFlags(member, context, inner)),\n    merged(ownFlags(object), appliedFlags(target, context, inner)),\n  );\n}\n\n/**\n * The flags of a property schema. Without the `read-write-refs` fix only the keywords written on\n * it count, as in openapi-typescript; with it, also those of the schemas its `$ref` and `allOf`\n * apply (upstream #1938).\n */\nexport function propertyAccessFlags(value: Schema, context: SchemaContext): AccessFlags {\n  if (typeof value !== \"object\") {\n    return NO_FLAGS;\n  }\n  if (!context.options.fixes.has(OutputFix.READ_WRITE_REFS)) {\n    return ownFlags(value as SchemaObject);\n  }\n  return appliedFlags(value, context, new Set());\n}\n"],"names":[],"mappings":";;AAUA,MAAM,QAAA,GAAwB,EAAE,UAAA,EAAY,KAAA,EAAO,aAAa,KAAA,EAAM;AAEtE,SAAS,SAAS,MAAA,EAAmC;AACnD,EAAA,OAAO,EAAE,UAAA,EAAY,OAAA,CAAQ,MAAA,CAAO,QAAQ,GAAG,WAAA,EAAa,OAAA,CAAQ,MAAA,CAAO,SAAS,CAAA,EAAE;AACxF;AAEA,SAAS,MAAA,CAAO,MAAmB,KAAA,EAAiC;AAClE,EAAA,OAAO;AAAA,IACL,UAAA,EAAY,IAAA,CAAK,UAAA,IAAc,KAAA,CAAM,UAAA;AAAA,IACrC,WAAA,EAAa,IAAA,CAAK,WAAA,IAAe,KAAA,CAAM;AAAA,GACzC;AACF;AASA,SAAS,YAAA,CACP,MAAA,EACA,OAAA,EACA,IAAA,EACa;AACb,EAAA,IAAI,OAAO,WAAW,QAAA,IAAY,MAAA,KAAW,QAAQ,IAAA,CAAK,GAAA,CAAI,MAAM,CAAA,EAAG;AACrE,IAAA,OAAO,QAAA;AAAA,EACT;AACA,EAAA,MAAM,wBAAQ,IAAI,GAAA,CAAI,CAAC,GAAG,IAAA,EAAM,MAAM,CAAC,CAAA;AAEvC,EAAA,MAAM,MAAA,GAAS,MAAA;AACf,EAAA,MAAM,MAAA,GACJ,OAAO,MAAA,CAAO,IAAA,KAAS,QAAA,GAAY,QAAQ,IAAA,CAAK,OAAA,CAAQ,MAAA,CAAO,IAAI,CAAA,GAAe,MAAA;AACpF,EAAA,OAAA,CAAQ,MAAA,CAAO,KAAA,IAAS,EAAC,EAAG,MAAA;AAAA,IAC1B,CAAC,OAAO,MAAA,KAAW,MAAA,CAAO,OAAO,YAAA,CAAa,MAAA,EAAQ,OAAA,EAAS,KAAK,CAAC,CAAA;AAAA,IACrE,MAAA,CAAO,SAAS,MAAM,CAAA,EAAG,aAAa,MAAA,EAAQ,OAAA,EAAS,KAAK,CAAC;AAAA,GAC/D;AACF;AAOO,SAAS,mBAAA,CAAoB,OAAe,OAAA,EAAqC;AACtF,EAAA,IAAI,OAAO,UAAU,QAAA,EAAU;AAC7B,IAAA,OAAO,QAAA;AAAA,EACT;AACA,EAAA,IAAI,CAAC,OAAA,CAAQ,OAAA,CAAQ,MAAM,GAAA,CAAI,SAAA,CAAU,eAAe,CAAA,EAAG;AACzD,IAAA,OAAO,SAAS,KAAqB,CAAA;AAAA,EACvC;AACA,EAAA,OAAO,YAAA,CAAa,KAAA,EAAO,OAAA,kBAAS,IAAI,KAAK,CAAA;AAC/C;;"}

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

@@ -8,6 +8,9 @@ const typeCombinators = require('../type-combinators.cjs');
 const MAX_LENGTH_TUPLE_ELEMENTS = 30;
 function prefixTupleType(schema, request) {
   const { items } = schema;
+  if (schema.prefixItems && isPrefixItemsFixed(schema, request)) {
+    return prefixItemsTupleType(schema.prefixItems, schema, request);
+  }
   if (!schema.prefixItems && !Array.isArray(items)) {
     return null;
   }
@@ -16,6 +19,34 @@ function prefixTupleType(schema, request) {
     prefixItems.map((item) => constructors.irTupleElement(request.transformNested(item, request.location)))
   );
 }
+function restItemType(schema, request) {
+  return schema === false ? null : request.transformNested(schema, request.location);
+}
+function prefixRestType(schema, request) {
+  const { items, unevaluatedItems, contains } = schema;
+  if (items !== void 0 && !Array.isArray(items)) {
+    return restItemType(items, request);
+  }
+  if (unevaluatedItems === void 0 || items !== void 0) {
+    return sharedTypes.UNKNOWN_TYPE;
+  }
+  const unevaluated = restItemType(unevaluatedItems, request);
+  const matched = contains === void 0 ? null : restItemType(contains, request);
+  const types = [unevaluated, matched].filter((type) => type !== null);
+  return types.length === 0 ? null : typeCombinators.unionOf(types);
+}
+function prefixItemsTupleType(prefixItems, schema, request) {
+  const { min } = lengthBounds(schema);
+  const elements = prefixItems.map((item, index) => {
+    const type = request.transformNested(item, request.location);
+    return index < min ? constructors.irTupleElement(type) : constructors.irOptionalTupleElement(type);
+  });
+  const rest = prefixRestType(schema, request);
+  return constructors.irTuple(rest === null ? elements : [...elements, constructors.irTupleElement(constructors.irArray(rest), true)]);
+}
+function isPrefixItemsFixed(schema, request) {
+  return schema.prefixItems !== void 0 && request.context.options.fixes.has(outputFixes.OutputFix.PREFIX_ITEMS);
+}
 function singleItemType(schema, request) {
   const { items } = schema;
   return items ? request.transformNested(items, request.location) : sharedTypes.UNKNOWN_TYPE;
@@ -94,7 +125,7 @@ function arrayType(schema, request) {
   }
   const item = itemType(schema, request);
   const bounds = lengthBounds(schema);
-  if (isLengthTupleWanted(bounds, request)) {
+  if (!isPrefixItemsFixed(schema, request) && isLengthTupleWanted(bounds, request)) {
     return lengthTupleType(schema, item, bounds);
   }
   const type = item.kind === "tuple" || item.kind === "array" ? item : constructors.irArray(item);

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

@@ -1 +1 @@
-{"version":3,"file":"array-type.cjs","sources":["../../../../src/application/transform/schema/array-type.ts"],"sourcesContent":["import { irArray, irReadonly, irTuple, irTupleElement } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `--array-length` writes tuples only while the estimated number of tuple elements stays below\n * this; the original chose it as roughly where TypeScript starts to struggle with tuple inference.\n */\nconst MAX_LENGTH_TUPLE_ELEMENTS = 30;\n\n/** The tuple of `prefixItems` (or of an `items` list); null without either. */\nfunction prefixTupleType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items } = schema;\n  if (!schema.prefixItems && !Array.isArray(items)) {\n    return null;\n  }\n  const prefixItems = schema.prefixItems ?? (items as SchemaObject[]);\n  return irTuple(\n    prefixItems.map((item) => irTupleElement(request.transformNested(item, request.location))),\n  );\n}\n\n/** The type of one item; `unknown` without `items`. */\nfunction singleItemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { items } = schema;\n  return items ? request.transformNested(items as SchemaObject, request.location) : UNKNOWN_TYPE;\n}\n\n/**\n * The item type as the original returns it: a tuple stands for the whole array, and a nested\n * `type: array` item is wrapped in an array here already.\n */\nfunction itemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return tuple;\n  }\n  const { items } = schema;\n  // Checked first: the `in` test below throws for `items: null`.\n  if (!items) {\n    return UNKNOWN_TYPE;\n  }\n  const nested = singleItemType(schema, request);\n  const isNestedArray = typeof items === \"object\" && \"type\" in items && items.type === \"array\";\n  return isNestedArray ? irArray(nested) : nested;\n}\n\nfunction repeat(type: IrType, count: number): IrType[] {\n  return Array.from({ length: count }, () => type);\n}\n\ninterface LengthBounds {\n  readonly min: number;\n  readonly max: number | undefined;\n}\n\nfunction lengthBounds(schema: SchemaObject): LengthBounds {\n  const { minItems, maxItems } = schema;\n  const min = typeof minItems === \"number\" && minItems >= 0 ? minItems : 0;\n  const isMaxValid = typeof maxItems === \"number\" && maxItems >= 0 && min <= maxItems;\n  return { min, max: isMaxValid ? maxItems : undefined };\n}\n\n/**\n * Tuples for `--array-length`, as the original builds them. With both bounds it emits tuples of\n * length 0 to `max - min` (not `min` to `max`); the `array-length-tuples` fix corrects it.\n */\nfunction lengthTupleType(schema: SchemaObject, item: IrType, bounds: LengthBounds): IrType {\n  const { min, max } = bounds;\n  if (min === max) {\n    return unionOf([irTuple(repeat(item, min).map((type) => irTupleElement(type)))]);\n  }\n  if ((schema.maxItems as number) > 0) {\n    const lengths = Array.from({ length: Math.max(0, (max ?? 0) - min + 1) }, (_, index) => index);\n    return unionOf(\n      lengths.map((length) => irTuple(repeat(item, length).map((type) => irTupleElement(type)))),\n    );\n  }\n  const elements = repeat(item, min).map((type) => irTupleElement(type));\n  return irTuple([...elements, irTupleElement(irArray(item), true)]);\n}\n\nfunction isLengthTupleWanted(bounds: LengthBounds, request: SchemaRequest): boolean {\n  const { min, max } = bounds;\n  const estimatedSize = max === undefined ? min : (max * (max + 1) - min * (min - 1)) / 2;\n  const hasBounds = min !== 0 || max !== undefined;\n  return (\n    request.context.options.arrayLength && hasBounds && estimatedSize < MAX_LENGTH_TUPLE_ELEMENTS\n  );\n}\n\n/** Applies `--immutable` to one array or tuple type. */\ntype ArrayWrapper = (type: IrType) => IrType;\n\nfunction tupleOf(item: IrType, length: number, isOpen: boolean): IrType {\n  const elements = repeat(item, length).map((type) => irTupleElement(type));\n  return irTuple(isOpen ? [...elements, irTupleElement(irArray(item), true)] : elements);\n}\n\n/** Tuples of every length from `min` to `max`; without `max`, `min` items and a rest element. */\nfunction fixedLengthTupleType(item: IrType, bounds: LengthBounds, wrap: ArrayWrapper): IrType {\n  const { min, max } = bounds;\n  if (max === undefined) {\n    return wrap(tupleOf(item, min, true));\n  }\n  const lengths = Array.from({ length: max - min + 1 }, (_, index) => min + index);\n  return unionOf(lengths.map((length) => wrap(tupleOf(item, length, false))));\n}\n\n/**\n * `type: array` with `--array-length` and the `array-length-tuples` fix (#2048, #2330, #2546):\n * the tuples have `min` to `max` items, the item type is used as it is (a nested array stays one\n * level deep), a `prefixItems` tuple gets no length tuples around it, and `--immutable` makes\n * every tuple `readonly`.\n */\nfunction fixedArrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const wrap: ArrayWrapper = (type) =>\n    request.context.options.immutable ? irReadonly(type) : type;\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return wrap(tuple);\n  }\n  const item = singleItemType(schema, request);\n  const bounds = lengthBounds(schema);\n  return isLengthTupleWanted(bounds, request)\n    ? fixedLengthTupleType(item, bounds, wrap)\n    : wrap(irArray(item));\n}\n\nfunction isArrayLengthFixed(request: SchemaRequest): boolean {\n  const { arrayLength, fixes } = request.context.options;\n  return arrayLength && fixes.has(OutputFix.ARRAY_LENGTH_TUPLES);\n}\n\n/** `type: array`, including tuples (`prefixItems`, array `items`) and `--array-length`. */\nexport function arrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  if (isArrayLengthFixed(request)) {\n    return fixedArrayType(schema, request);\n  }\n  const item = itemType(schema, request);\n  const bounds = lengthBounds(schema);\n  if (isLengthTupleWanted(bounds, request)) {\n    return lengthTupleType(schema, item, bounds);\n  }\n  // A tuple or an array item is used as the array type itself.\n  const type = item.kind === \"tuple\" || item.kind === \"array\" ? item : irArray(item);\n  return request.context.options.immutable ? irReadonly(type) : type;\n}\n"],"names":["irTuple","irTupleElement","UNKNOWN_TYPE","irArray","unionOf","irReadonly","OutputFix"],"mappings":";;;;;;;AAYA,MAAM,yBAAA,GAA4B,EAAA;AAGlC,SAAS,eAAA,CAAgB,QAAsB,OAAA,EAAuC;AACpF,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,IAAI,CAAC,MAAA,CAAO,WAAA,IAAe,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAK,CAAA,EAAG;AAChD,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAA,GAAc,OAAO,WAAA,IAAgB,KAAA;AAC3C,EAAA,OAAOA,oBAAA;AAAA,IACL,WAAA,CAAY,GAAA,CAAI,CAAC,IAAA,KAASC,2BAAA,CAAe,OAAA,CAAQ,eAAA,CAAgB,IAAA,EAAM,OAAA,CAAQ,QAAQ,CAAC,CAAC;AAAA,GAC3F;AACF;AAGA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,OAAO,QAAQ,OAAA,CAAQ,eAAA,CAAgB,KAAA,EAAuB,OAAA,CAAQ,QAAQ,CAAA,GAAIC,wBAAA;AACpF;AAMA,SAAS,QAAA,CAAS,QAAsB,OAAA,EAAgC;AACtE,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAA;AAAA,EACT;AACA,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAElB,EAAA,IAAI,CAAC,KAAA,EAAO;AACV,IAAA,OAAOA,wBAAA;AAAA,EACT;AACA,EAAA,MAAM,MAAA,GAAS,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,MAAM,gBAAgB,OAAO,KAAA,KAAU,YAAY,MAAA,IAAU,KAAA,IAAS,MAAM,IAAA,KAAS,OAAA;AACrF,EAAA,OAAO,aAAA,GAAgBC,oBAAA,CAAQ,MAAM,CAAA,GAAI,MAAA;AAC3C;AAEA,SAAS,MAAA,CAAO,MAAc,KAAA,EAAyB;AACrD,EAAA,OAAO,MAAM,IAAA,CAAK,EAAE,QAAQ,KAAA,EAAM,EAAG,MAAM,IAAI,CAAA;AACjD;AAOA,SAAS,aAAa,MAAA,EAAoC;AACxD,EAAA,MAAM,EAAE,QAAA,EAAU,QAAA,EAAS,GAAI,MAAA;AAC/B,EAAA,MAAM,MAAM,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,IAAI,QAAA,GAAW,CAAA;AACvE,EAAA,MAAM,aAAa,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,KAAK,GAAA,IAAO,QAAA;AAC3E,EAAA,OAAO,EAAE,GAAA,EAAK,GAAA,EAAK,UAAA,GAAa,WAAW,MAAA,EAAU;AACvD;AAMA,SAAS,eAAA,CAAgB,MAAA,EAAsB,IAAA,EAAc,MAAA,EAA8B;AACzF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,GAAA,EAAK;AACf,IAAA,OAAOC,uBAAA,CAAQ,CAACJ,oBAAA,CAAQ,MAAA,CAAO,MAAM,GAAG,CAAA,CAAE,GAAA,CAAI,CAAC,SAASC,2BAAA,CAAe,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAAA,EACjF;AACA,EAAA,IAAK,MAAA,CAAO,WAAsB,CAAA,EAAG;AACnC,IAAA,MAAM,UAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,KAAK,GAAA,CAAI,CAAA,EAAA,CAAI,GAAA,IAAO,CAAA,IAAK,MAAM,CAAC,CAAA,IAAK,CAAC,CAAA,EAAG,UAAU,KAAK,CAAA;AAC7F,IAAA,OAAOG,uBAAA;AAAA,MACL,QAAQ,GAAA,CAAI,CAAC,MAAA,KAAWJ,oBAAA,CAAQ,OAAO,IAAA,EAAM,MAAM,CAAA,CAAE,GAAA,CAAI,CAAC,IAAA,KAASC,2BAAA,CAAe,IAAI,CAAC,CAAC,CAAC;AAAA,KAC3F;AAAA,EACF;AACA,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,GAAG,CAAA,CAAE,IAAI,CAAC,IAAA,KAASA,2BAAA,CAAe,IAAI,CAAC,CAAA;AACrE,EAAA,OAAOD,oBAAA,CAAQ,CAAC,GAAG,QAAA,EAAUC,2BAAA,CAAeE,qBAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAC,CAAA;AACnE;AAEA,SAAS,mBAAA,CAAoB,QAAsB,OAAA,EAAiC;AAClF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,MAAM,aAAA,GAAgB,QAAQ,MAAA,GAAY,GAAA,GAAA,CAAO,OAAO,GAAA,GAAM,CAAA,CAAA,GAAK,GAAA,IAAO,GAAA,GAAM,CAAA,CAAA,IAAM,CAAA;AACtF,EAAA,MAAM,SAAA,GAAY,GAAA,KAAQ,CAAA,IAAK,GAAA,KAAQ,MAAA;AACvC,EAAA,OACE,OAAA,CAAQ,OAAA,CAAQ,OAAA,CAAQ,WAAA,IAAe,aAAa,aAAA,GAAgB,yBAAA;AAExE;AAKA,SAAS,OAAA,CAAQ,IAAA,EAAc,MAAA,EAAgB,MAAA,EAAyB;AACtE,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,MAAM,CAAA,CAAE,IAAI,CAAC,IAAA,KAASF,2BAAA,CAAe,IAAI,CAAC,CAAA;AACxE,EAAA,OAAOD,oBAAA,CAAQ,MAAA,GAAS,CAAC,GAAG,QAAA,EAAUC,2BAAA,CAAeE,oBAAA,CAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAA,GAAI,QAAQ,CAAA;AACvF;AAGA,SAAS,oBAAA,CAAqB,IAAA,EAAc,MAAA,EAAsB,IAAA,EAA4B;AAC5F,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,MAAA,EAAW;AACrB,IAAA,OAAO,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,GAAA,EAAK,IAAI,CAAC,CAAA;AAAA,EACtC;AACA,EAAA,MAAM,OAAA,GAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,GAAA,GAAM,GAAA,GAAM,CAAA,EAAE,EAAG,CAAC,CAAA,EAAG,KAAA,KAAU,MAAM,KAAK,CAAA;AAC/E,EAAA,OAAOC,uBAAA,CAAQ,OAAA,CAAQ,GAAA,CAAI,CAAC,MAAA,KAAW,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,MAAA,EAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;AAC5E;AAQA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,IAAA,GAAqB,CAAC,IAAA,KAC1B,OAAA,CAAQ,QAAQ,OAAA,CAAQ,SAAA,GAAYC,uBAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AACzD,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAK,KAAK,CAAA;AAAA,EACnB;AACA,EAAA,MAAM,IAAA,GAAO,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC3C,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAA,OAAO,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,GACtC,oBAAA,CAAqB,IAAA,EAAM,MAAA,EAAQ,IAAI,CAAA,GACvC,IAAA,CAAKF,oBAAA,CAAQ,IAAI,CAAC,CAAA;AACxB;AAEA,SAAS,mBAAmB,OAAA,EAAiC;AAC3D,EAAA,MAAM,EAAE,WAAA,EAAa,KAAA,EAAM,GAAI,QAAQ,OAAA,CAAQ,OAAA;AAC/C,EAAA,OAAO,WAAA,IAAe,KAAA,CAAM,GAAA,CAAIG,qBAAA,CAAU,mBAAmB,CAAA;AAC/D;AAGO,SAAS,SAAA,CAAU,QAAsB,OAAA,EAAgC;AAC9E,EAAA,IAAI,kBAAA,CAAmB,OAAO,CAAA,EAAG;AAC/B,IAAA,OAAO,cAAA,CAAe,QAAQ,OAAO,CAAA;AAAA,EACvC;AACA,EAAA,MAAM,IAAA,GAAO,QAAA,CAAS,MAAA,EAAQ,OAAO,CAAA;AACrC,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAA,IAAI,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,EAAG;AACxC,IAAA,OAAO,eAAA,CAAgB,MAAA,EAAQ,IAAA,EAAM,MAAM,CAAA;AAAA,EAC7C;AAEA,EAAA,MAAM,IAAA,GAAO,KAAK,IAAA,KAAS,OAAA,IAAW,KAAK,IAAA,KAAS,OAAA,GAAU,IAAA,GAAOH,oBAAA,CAAQ,IAAI,CAAA;AACjF,EAAA,OAAO,QAAQ,OAAA,CAAQ,OAAA,CAAQ,SAAA,GAAYE,uBAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AAChE;;"}
+{"version":3,"file":"array-type.cjs","sources":["../../../../src/application/transform/schema/array-type.ts"],"sourcesContent":["import {\n  irArray,\n  irOptionalTupleElement,\n  irReadonly,\n  irTuple,\n  irTupleElement,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrTupleElement, IrType } from \"../../../domain/ir/nodes.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 { unionOf } from \"../type-combinators.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `--array-length` writes tuples only while the estimated number of tuple elements stays below\n * this; the original chose it as roughly where TypeScript starts to struggle with tuple inference.\n */\nconst MAX_LENGTH_TUPLE_ELEMENTS = 30;\n\n/**\n * The tuple of `prefixItems` (or of an `items` list); null without either. The original closes a\n * `prefixItems` tuple and requires every element; the `prefix-items` fix does not.\n */\nfunction prefixTupleType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items } = schema;\n  if (schema.prefixItems && isPrefixItemsFixed(schema, request)) {\n    return prefixItemsTupleType(schema.prefixItems, schema, request);\n  }\n  if (!schema.prefixItems && !Array.isArray(items)) {\n    return null;\n  }\n  const prefixItems = schema.prefixItems ?? (items as SchemaObject[]);\n  return irTuple(\n    prefixItems.map((item) => irTupleElement(request.transformNested(item, request.location))),\n  );\n}\n\n/** The type of the items after the prefix, or null when there may be none (`false`). */\nfunction restItemType(schema: Schema, request: SchemaRequest): IrType | null {\n  return schema === false ? null : request.transformNested(schema, request.location);\n}\n\n/**\n * The type of the items after a `prefixItems` tuple (JSON Schema 2020-12 §10.3.1): `items`, else\n * `unevaluatedItems`, which does not apply to the items `contains` matches, else any item. Null\n * when no item may follow. An `items` list is not a schema in 2020-12, so it allows any item.\n */\nfunction prefixRestType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items, unevaluatedItems, contains } = schema;\n  if (items !== undefined && !Array.isArray(items)) {\n    return restItemType(items as Schema, request);\n  }\n  if (unevaluatedItems === undefined || items !== undefined) {\n    return UNKNOWN_TYPE;\n  }\n  const unevaluated = restItemType(unevaluatedItems, request);\n  const matched = contains === undefined ? null : restItemType(contains, request);\n  const types = [unevaluated, matched].filter((type): type is IrType => type !== null);\n  return types.length === 0 ? null : unionOf(types);\n}\n\n/**\n * The `prefix-items` tuple of `prefixItems`: an array may end before the prefix does, so the\n * elements from `minItems` on are optional (`T?`), and a rest element types the items after it.\n */\nfunction prefixItemsTupleType(\n  prefixItems: readonly Schema[],\n  schema: SchemaObject,\n  request: SchemaRequest,\n): IrType {\n  const { min } = lengthBounds(schema);\n  const elements = prefixItems.map((item, index): IrTupleElement => {\n    const type = request.transformNested(item, request.location);\n    return index < min ? irTupleElement(type) : irOptionalTupleElement(type);\n  });\n  const rest = prefixRestType(schema, request);\n  return irTuple(rest === null ? elements : [...elements, irTupleElement(irArray(rest), true)]);\n}\n\nfunction isPrefixItemsFixed(schema: SchemaObject, request: SchemaRequest): boolean {\n  return (\n    schema.prefixItems !== undefined && request.context.options.fixes.has(OutputFix.PREFIX_ITEMS)\n  );\n}\n\n/** The type of one item; `unknown` without `items`. */\nfunction singleItemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { items } = schema;\n  return items ? request.transformNested(items as SchemaObject, request.location) : UNKNOWN_TYPE;\n}\n\n/**\n * The item type as the original returns it: a tuple stands for the whole array, and a nested\n * `type: array` item is wrapped in an array here already.\n */\nfunction itemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return tuple;\n  }\n  const { items } = schema;\n  // Checked first: the `in` test below throws for `items: null`.\n  if (!items) {\n    return UNKNOWN_TYPE;\n  }\n  const nested = singleItemType(schema, request);\n  const isNestedArray = typeof items === \"object\" && \"type\" in items && items.type === \"array\";\n  return isNestedArray ? irArray(nested) : nested;\n}\n\nfunction repeat(type: IrType, count: number): IrType[] {\n  return Array.from({ length: count }, () => type);\n}\n\ninterface LengthBounds {\n  readonly min: number;\n  readonly max: number | undefined;\n}\n\nfunction lengthBounds(schema: SchemaObject): LengthBounds {\n  const { minItems, maxItems } = schema;\n  const min = typeof minItems === \"number\" && minItems >= 0 ? minItems : 0;\n  const isMaxValid = typeof maxItems === \"number\" && maxItems >= 0 && min <= maxItems;\n  return { min, max: isMaxValid ? maxItems : undefined };\n}\n\n/**\n * Tuples for `--array-length`, as the original builds them. With both bounds it emits tuples of\n * length 0 to `max - min` (not `min` to `max`); the `array-length-tuples` fix corrects it.\n */\nfunction lengthTupleType(schema: SchemaObject, item: IrType, bounds: LengthBounds): IrType {\n  const { min, max } = bounds;\n  if (min === max) {\n    return unionOf([irTuple(repeat(item, min).map((type) => irTupleElement(type)))]);\n  }\n  if ((schema.maxItems as number) > 0) {\n    const lengths = Array.from({ length: Math.max(0, (max ?? 0) - min + 1) }, (_, index) => index);\n    return unionOf(\n      lengths.map((length) => irTuple(repeat(item, length).map((type) => irTupleElement(type)))),\n    );\n  }\n  const elements = repeat(item, min).map((type) => irTupleElement(type));\n  return irTuple([...elements, irTupleElement(irArray(item), true)]);\n}\n\nfunction isLengthTupleWanted(bounds: LengthBounds, request: SchemaRequest): boolean {\n  const { min, max } = bounds;\n  const estimatedSize = max === undefined ? min : (max * (max + 1) - min * (min - 1)) / 2;\n  const hasBounds = min !== 0 || max !== undefined;\n  return (\n    request.context.options.arrayLength && hasBounds && estimatedSize < MAX_LENGTH_TUPLE_ELEMENTS\n  );\n}\n\n/** Applies `--immutable` to one array or tuple type. */\ntype ArrayWrapper = (type: IrType) => IrType;\n\nfunction tupleOf(item: IrType, length: number, isOpen: boolean): IrType {\n  const elements = repeat(item, length).map((type) => irTupleElement(type));\n  return irTuple(isOpen ? [...elements, irTupleElement(irArray(item), true)] : elements);\n}\n\n/** Tuples of every length from `min` to `max`; without `max`, `min` items and a rest element. */\nfunction fixedLengthTupleType(item: IrType, bounds: LengthBounds, wrap: ArrayWrapper): IrType {\n  const { min, max } = bounds;\n  if (max === undefined) {\n    return wrap(tupleOf(item, min, true));\n  }\n  const lengths = Array.from({ length: max - min + 1 }, (_, index) => min + index);\n  return unionOf(lengths.map((length) => wrap(tupleOf(item, length, false))));\n}\n\n/**\n * `type: array` with `--array-length` and the `array-length-tuples` fix (#2048, #2330, #2546):\n * the tuples have `min` to `max` items, the item type is used as it is (a nested array stays one\n * level deep), a `prefixItems` tuple gets no length tuples around it, and `--immutable` makes\n * every tuple `readonly`.\n */\nfunction fixedArrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const wrap: ArrayWrapper = (type) =>\n    request.context.options.immutable ? irReadonly(type) : type;\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return wrap(tuple);\n  }\n  const item = singleItemType(schema, request);\n  const bounds = lengthBounds(schema);\n  return isLengthTupleWanted(bounds, request)\n    ? fixedLengthTupleType(item, bounds, wrap)\n    : wrap(irArray(item));\n}\n\nfunction isArrayLengthFixed(request: SchemaRequest): boolean {\n  const { arrayLength, fixes } = request.context.options;\n  return arrayLength && fixes.has(OutputFix.ARRAY_LENGTH_TUPLES);\n}\n\n/** `type: array`, including tuples (`prefixItems`, array `items`) and `--array-length`. */\nexport function arrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  if (isArrayLengthFixed(request)) {\n    return fixedArrayType(schema, request);\n  }\n  const item = itemType(schema, request);\n  const bounds = lengthBounds(schema);\n  // A `prefix-items` tuple has its own lengths, so `--array-length` adds no tuples around it.\n  if (!isPrefixItemsFixed(schema, request) && isLengthTupleWanted(bounds, request)) {\n    return lengthTupleType(schema, item, bounds);\n  }\n  // A tuple or an array item is used as the array type itself.\n  const type = item.kind === \"tuple\" || item.kind === \"array\" ? item : irArray(item);\n  return request.context.options.immutable ? irReadonly(type) : type;\n}\n"],"names":["irTuple","irTupleElement","UNKNOWN_TYPE","unionOf","irOptionalTupleElement","irArray","OutputFix","irReadonly"],"mappings":";;;;;;;AAkBA,MAAM,yBAAA,GAA4B,EAAA;AAMlC,SAAS,eAAA,CAAgB,QAAsB,OAAA,EAAuC;AACpF,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,IAAI,MAAA,CAAO,WAAA,IAAe,kBAAA,CAAmB,MAAA,EAAQ,OAAO,CAAA,EAAG;AAC7D,IAAA,OAAO,oBAAA,CAAqB,MAAA,CAAO,WAAA,EAAa,MAAA,EAAQ,OAAO,CAAA;AAAA,EACjE;AACA,EAAA,IAAI,CAAC,MAAA,CAAO,WAAA,IAAe,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAK,CAAA,EAAG;AAChD,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAA,GAAc,OAAO,WAAA,IAAgB,KAAA;AAC3C,EAAA,OAAOA,oBAAA;AAAA,IACL,WAAA,CAAY,GAAA,CAAI,CAAC,IAAA,KAASC,2BAAA,CAAe,OAAA,CAAQ,eAAA,CAAgB,IAAA,EAAM,OAAA,CAAQ,QAAQ,CAAC,CAAC;AAAA,GAC3F;AACF;AAGA,SAAS,YAAA,CAAa,QAAgB,OAAA,EAAuC;AAC3E,EAAA,OAAO,WAAW,KAAA,GAAQ,IAAA,GAAO,QAAQ,eAAA,CAAgB,MAAA,EAAQ,QAAQ,QAAQ,CAAA;AACnF;AAOA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAuC;AACnF,EAAA,MAAM,EAAE,KAAA,EAAO,gBAAA,EAAkB,QAAA,EAAS,GAAI,MAAA;AAC9C,EAAA,IAAI,UAAU,MAAA,IAAa,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAK,CAAA,EAAG;AAChD,IAAA,OAAO,YAAA,CAAa,OAAiB,OAAO,CAAA;AAAA,EAC9C;AACA,EAAA,IAAI,gBAAA,KAAqB,MAAA,IAAa,KAAA,KAAU,MAAA,EAAW;AACzD,IAAA,OAAOC,wBAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAA,GAAc,YAAA,CAAa,gBAAA,EAAkB,OAAO,CAAA;AAC1D,EAAA,MAAM,UAAU,QAAA,KAAa,MAAA,GAAY,IAAA,GAAO,YAAA,CAAa,UAAU,OAAO,CAAA;AAC9E,EAAA,MAAM,KAAA,GAAQ,CAAC,WAAA,EAAa,OAAO,EAAE,MAAA,CAAO,CAAC,IAAA,KAAyB,IAAA,KAAS,IAAI,CAAA;AACnF,EAAA,OAAO,KAAA,CAAM,MAAA,KAAW,CAAA,GAAI,IAAA,GAAOC,wBAAQ,KAAK,CAAA;AAClD;AAMA,SAAS,oBAAA,CACP,WAAA,EACA,MAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,EAAE,GAAA,EAAI,GAAI,YAAA,CAAa,MAAM,CAAA;AACnC,EAAA,MAAM,QAAA,GAAW,WAAA,CAAY,GAAA,CAAI,CAAC,MAAM,KAAA,KAA0B;AAChE,IAAA,MAAM,IAAA,GAAO,OAAA,CAAQ,eAAA,CAAgB,IAAA,EAAM,QAAQ,QAAQ,CAAA;AAC3D,IAAA,OAAO,QAAQ,GAAA,GAAMF,2BAAA,CAAe,IAAI,CAAA,GAAIG,oCAAuB,IAAI,CAAA;AAAA,EACzE,CAAC,CAAA;AACD,EAAA,MAAM,IAAA,GAAO,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC3C,EAAA,OAAOJ,oBAAA,CAAQ,IAAA,KAAS,IAAA,GAAO,QAAA,GAAW,CAAC,GAAG,QAAA,EAAUC,2BAAA,CAAeI,oBAAA,CAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAC,CAAA;AAC9F;AAEA,SAAS,kBAAA,CAAmB,QAAsB,OAAA,EAAiC;AACjF,EAAA,OACE,MAAA,CAAO,gBAAgB,MAAA,IAAa,OAAA,CAAQ,QAAQ,OAAA,CAAQ,KAAA,CAAM,GAAA,CAAIC,qBAAA,CAAU,YAAY,CAAA;AAEhG;AAGA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,OAAO,QAAQ,OAAA,CAAQ,eAAA,CAAgB,KAAA,EAAuB,OAAA,CAAQ,QAAQ,CAAA,GAAIJ,wBAAA;AACpF;AAMA,SAAS,QAAA,CAAS,QAAsB,OAAA,EAAgC;AACtE,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAA;AAAA,EACT;AACA,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAElB,EAAA,IAAI,CAAC,KAAA,EAAO;AACV,IAAA,OAAOA,wBAAA;AAAA,EACT;AACA,EAAA,MAAM,MAAA,GAAS,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,MAAM,gBAAgB,OAAO,KAAA,KAAU,YAAY,MAAA,IAAU,KAAA,IAAS,MAAM,IAAA,KAAS,OAAA;AACrF,EAAA,OAAO,aAAA,GAAgBG,oBAAA,CAAQ,MAAM,CAAA,GAAI,MAAA;AAC3C;AAEA,SAAS,MAAA,CAAO,MAAc,KAAA,EAAyB;AACrD,EAAA,OAAO,MAAM,IAAA,CAAK,EAAE,QAAQ,KAAA,EAAM,EAAG,MAAM,IAAI,CAAA;AACjD;AAOA,SAAS,aAAa,MAAA,EAAoC;AACxD,EAAA,MAAM,EAAE,QAAA,EAAU,QAAA,EAAS,GAAI,MAAA;AAC/B,EAAA,MAAM,MAAM,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,IAAI,QAAA,GAAW,CAAA;AACvE,EAAA,MAAM,aAAa,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,KAAK,GAAA,IAAO,QAAA;AAC3E,EAAA,OAAO,EAAE,GAAA,EAAK,GAAA,EAAK,UAAA,GAAa,WAAW,MAAA,EAAU;AACvD;AAMA,SAAS,eAAA,CAAgB,MAAA,EAAsB,IAAA,EAAc,MAAA,EAA8B;AACzF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,GAAA,EAAK;AACf,IAAA,OAAOF,uBAAA,CAAQ,CAACH,oBAAA,CAAQ,MAAA,CAAO,MAAM,GAAG,CAAA,CAAE,GAAA,CAAI,CAAC,SAASC,2BAAA,CAAe,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAAA,EACjF;AACA,EAAA,IAAK,MAAA,CAAO,WAAsB,CAAA,EAAG;AACnC,IAAA,MAAM,UAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,KAAK,GAAA,CAAI,CAAA,EAAA,CAAI,GAAA,IAAO,CAAA,IAAK,MAAM,CAAC,CAAA,IAAK,CAAC,CAAA,EAAG,UAAU,KAAK,CAAA;AAC7F,IAAA,OAAOE,uBAAA;AAAA,MACL,QAAQ,GAAA,CAAI,CAAC,MAAA,KAAWH,oBAAA,CAAQ,OAAO,IAAA,EAAM,MAAM,CAAA,CAAE,GAAA,CAAI,CAAC,IAAA,KAASC,2BAAA,CAAe,IAAI,CAAC,CAAC,CAAC;AAAA,KAC3F;AAAA,EACF;AACA,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,GAAG,CAAA,CAAE,IAAI,CAAC,IAAA,KAASA,2BAAA,CAAe,IAAI,CAAC,CAAA;AACrE,EAAA,OAAOD,oBAAA,CAAQ,CAAC,GAAG,QAAA,EAAUC,2BAAA,CAAeI,qBAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAC,CAAA;AACnE;AAEA,SAAS,mBAAA,CAAoB,QAAsB,OAAA,EAAiC;AAClF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,MAAM,aAAA,GAAgB,QAAQ,MAAA,GAAY,GAAA,GAAA,CAAO,OAAO,GAAA,GAAM,CAAA,CAAA,GAAK,GAAA,IAAO,GAAA,GAAM,CAAA,CAAA,IAAM,CAAA;AACtF,EAAA,MAAM,SAAA,GAAY,GAAA,KAAQ,CAAA,IAAK,GAAA,KAAQ,MAAA;AACvC,EAAA,OACE,OAAA,CAAQ,OAAA,CAAQ,OAAA,CAAQ,WAAA,IAAe,aAAa,aAAA,GAAgB,yBAAA;AAExE;AAKA,SAAS,OAAA,CAAQ,IAAA,EAAc,MAAA,EAAgB,MAAA,EAAyB;AACtE,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,MAAM,CAAA,CAAE,IAAI,CAAC,IAAA,KAASJ,2BAAA,CAAe,IAAI,CAAC,CAAA;AACxE,EAAA,OAAOD,oBAAA,CAAQ,MAAA,GAAS,CAAC,GAAG,QAAA,EAAUC,2BAAA,CAAeI,oBAAA,CAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAA,GAAI,QAAQ,CAAA;AACvF;AAGA,SAAS,oBAAA,CAAqB,IAAA,EAAc,MAAA,EAAsB,IAAA,EAA4B;AAC5F,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,MAAA,EAAW;AACrB,IAAA,OAAO,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,GAAA,EAAK,IAAI,CAAC,CAAA;AAAA,EACtC;AACA,EAAA,MAAM,OAAA,GAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,GAAA,GAAM,GAAA,GAAM,CAAA,EAAE,EAAG,CAAC,CAAA,EAAG,KAAA,KAAU,MAAM,KAAK,CAAA;AAC/E,EAAA,OAAOF,uBAAA,CAAQ,OAAA,CAAQ,GAAA,CAAI,CAAC,MAAA,KAAW,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,MAAA,EAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;AAC5E;AAQA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,IAAA,GAAqB,CAAC,IAAA,KAC1B,OAAA,CAAQ,QAAQ,OAAA,CAAQ,SAAA,GAAYI,uBAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AACzD,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAK,KAAK,CAAA;AAAA,EACnB;AACA,EAAA,MAAM,IAAA,GAAO,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC3C,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAA,OAAO,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,GACtC,oBAAA,CAAqB,IAAA,EAAM,MAAA,EAAQ,IAAI,CAAA,GACvC,IAAA,CAAKF,oBAAA,CAAQ,IAAI,CAAC,CAAA;AACxB;AAEA,SAAS,mBAAmB,OAAA,EAAiC;AAC3D,EAAA,MAAM,EAAE,WAAA,EAAa,KAAA,EAAM,GAAI,QAAQ,OAAA,CAAQ,OAAA;AAC/C,EAAA,OAAO,WAAA,IAAe,KAAA,CAAM,GAAA,CAAIC,qBAAA,CAAU,mBAAmB,CAAA;AAC/D;AAGO,SAAS,SAAA,CAAU,QAAsB,OAAA,EAAgC;AAC9E,EAAA,IAAI,kBAAA,CAAmB,OAAO,CAAA,EAAG;AAC/B,IAAA,OAAO,cAAA,CAAe,QAAQ,OAAO,CAAA;AAAA,EACvC;AACA,EAAA,MAAM,IAAA,GAAO,QAAA,CAAS,MAAA,EAAQ,OAAO,CAAA;AACrC,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAElC,EAAA,IAAI,CAAC,mBAAmB,MAAA,EAAQ,OAAO,KAAK,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,EAAG;AAChF,IAAA,OAAO,eAAA,CAAgB,MAAA,EAAQ,IAAA,EAAM,MAAM,CAAA;AAAA,EAC7C;AAEA,EAAA,MAAM,IAAA,GAAO,KAAK,IAAA,KAAS,OAAA,IAAW,KAAK,IAAA,KAAS,OAAA,GAAU,IAAA,GAAOD,oBAAA,CAAQ,IAAI,CAAA;AACjF,EAAA,OAAO,QAAQ,OAAA,CAAQ,OAAA,CAAQ,SAAA,GAAYE,uBAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AAChE;;"}

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

@@ -1,4 +1,4 @@
-import { irArray, irReadonly, irTuple, irTupleElement } from '../../../domain/ir/constructors.mjs';
+import { irArray, irReadonly, irTuple, irTupleElement, irOptionalTupleElement } from '../../../domain/ir/constructors.mjs';
 import { OutputFix } from '../../../domain/output-fixes.mjs';
 import { UNKNOWN_TYPE } from '../shared-types.mjs';
 import { unionOf } from '../type-combinators.mjs';
@@ -6,6 +6,9 @@ import { unionOf } from '../type-combinators.mjs';
 const MAX_LENGTH_TUPLE_ELEMENTS = 30;
 function prefixTupleType(schema, request) {
   const { items } = schema;
+  if (schema.prefixItems && isPrefixItemsFixed(schema, request)) {
+    return prefixItemsTupleType(schema.prefixItems, schema, request);
+  }
   if (!schema.prefixItems && !Array.isArray(items)) {
     return null;
   }
@@ -14,6 +17,34 @@ function prefixTupleType(schema, request) {
     prefixItems.map((item) => irTupleElement(request.transformNested(item, request.location)))
   );
 }
+function restItemType(schema, request) {
+  return schema === false ? null : request.transformNested(schema, request.location);
+}
+function prefixRestType(schema, request) {
+  const { items, unevaluatedItems, contains } = schema;
+  if (items !== void 0 && !Array.isArray(items)) {
+    return restItemType(items, request);
+  }
+  if (unevaluatedItems === void 0 || items !== void 0) {
+    return UNKNOWN_TYPE;
+  }
+  const unevaluated = restItemType(unevaluatedItems, request);
+  const matched = contains === void 0 ? null : restItemType(contains, request);
+  const types = [unevaluated, matched].filter((type) => type !== null);
+  return types.length === 0 ? null : unionOf(types);
+}
+function prefixItemsTupleType(prefixItems, schema, request) {
+  const { min } = lengthBounds(schema);
+  const elements = prefixItems.map((item, index) => {
+    const type = request.transformNested(item, request.location);
+    return index < min ? irTupleElement(type) : irOptionalTupleElement(type);
+  });
+  const rest = prefixRestType(schema, request);
+  return irTuple(rest === null ? elements : [...elements, irTupleElement(irArray(rest), true)]);
+}
+function isPrefixItemsFixed(schema, request) {
+  return schema.prefixItems !== void 0 && request.context.options.fixes.has(OutputFix.PREFIX_ITEMS);
+}
 function singleItemType(schema, request) {
   const { items } = schema;
   return items ? request.transformNested(items, request.location) : UNKNOWN_TYPE;
@@ -92,7 +123,7 @@ function arrayType(schema, request) {
   }
   const item = itemType(schema, request);
   const bounds = lengthBounds(schema);
-  if (isLengthTupleWanted(bounds, request)) {
+  if (!isPrefixItemsFixed(schema, request) && isLengthTupleWanted(bounds, request)) {
     return lengthTupleType(schema, item, bounds);
   }
   const type = item.kind === "tuple" || item.kind === "array" ? item : irArray(item);

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

@@ -1 +1 @@
-{"version":3,"file":"array-type.mjs","sources":["../../../../src/application/transform/schema/array-type.ts"],"sourcesContent":["import { irArray, irReadonly, irTuple, irTupleElement } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { OutputFix } from \"../../../domain/output-fixes.js\";\nimport { UNKNOWN_TYPE } from \"../shared-types.js\";\nimport { unionOf } from \"../type-combinators.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `--array-length` writes tuples only while the estimated number of tuple elements stays below\n * this; the original chose it as roughly where TypeScript starts to struggle with tuple inference.\n */\nconst MAX_LENGTH_TUPLE_ELEMENTS = 30;\n\n/** The tuple of `prefixItems` (or of an `items` list); null without either. */\nfunction prefixTupleType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items } = schema;\n  if (!schema.prefixItems && !Array.isArray(items)) {\n    return null;\n  }\n  const prefixItems = schema.prefixItems ?? (items as SchemaObject[]);\n  return irTuple(\n    prefixItems.map((item) => irTupleElement(request.transformNested(item, request.location))),\n  );\n}\n\n/** The type of one item; `unknown` without `items`. */\nfunction singleItemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { items } = schema;\n  return items ? request.transformNested(items as SchemaObject, request.location) : UNKNOWN_TYPE;\n}\n\n/**\n * The item type as the original returns it: a tuple stands for the whole array, and a nested\n * `type: array` item is wrapped in an array here already.\n */\nfunction itemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return tuple;\n  }\n  const { items } = schema;\n  // Checked first: the `in` test below throws for `items: null`.\n  if (!items) {\n    return UNKNOWN_TYPE;\n  }\n  const nested = singleItemType(schema, request);\n  const isNestedArray = typeof items === \"object\" && \"type\" in items && items.type === \"array\";\n  return isNestedArray ? irArray(nested) : nested;\n}\n\nfunction repeat(type: IrType, count: number): IrType[] {\n  return Array.from({ length: count }, () => type);\n}\n\ninterface LengthBounds {\n  readonly min: number;\n  readonly max: number | undefined;\n}\n\nfunction lengthBounds(schema: SchemaObject): LengthBounds {\n  const { minItems, maxItems } = schema;\n  const min = typeof minItems === \"number\" && minItems >= 0 ? minItems : 0;\n  const isMaxValid = typeof maxItems === \"number\" && maxItems >= 0 && min <= maxItems;\n  return { min, max: isMaxValid ? maxItems : undefined };\n}\n\n/**\n * Tuples for `--array-length`, as the original builds them. With both bounds it emits tuples of\n * length 0 to `max - min` (not `min` to `max`); the `array-length-tuples` fix corrects it.\n */\nfunction lengthTupleType(schema: SchemaObject, item: IrType, bounds: LengthBounds): IrType {\n  const { min, max } = bounds;\n  if (min === max) {\n    return unionOf([irTuple(repeat(item, min).map((type) => irTupleElement(type)))]);\n  }\n  if ((schema.maxItems as number) > 0) {\n    const lengths = Array.from({ length: Math.max(0, (max ?? 0) - min + 1) }, (_, index) => index);\n    return unionOf(\n      lengths.map((length) => irTuple(repeat(item, length).map((type) => irTupleElement(type)))),\n    );\n  }\n  const elements = repeat(item, min).map((type) => irTupleElement(type));\n  return irTuple([...elements, irTupleElement(irArray(item), true)]);\n}\n\nfunction isLengthTupleWanted(bounds: LengthBounds, request: SchemaRequest): boolean {\n  const { min, max } = bounds;\n  const estimatedSize = max === undefined ? min : (max * (max + 1) - min * (min - 1)) / 2;\n  const hasBounds = min !== 0 || max !== undefined;\n  return (\n    request.context.options.arrayLength && hasBounds && estimatedSize < MAX_LENGTH_TUPLE_ELEMENTS\n  );\n}\n\n/** Applies `--immutable` to one array or tuple type. */\ntype ArrayWrapper = (type: IrType) => IrType;\n\nfunction tupleOf(item: IrType, length: number, isOpen: boolean): IrType {\n  const elements = repeat(item, length).map((type) => irTupleElement(type));\n  return irTuple(isOpen ? [...elements, irTupleElement(irArray(item), true)] : elements);\n}\n\n/** Tuples of every length from `min` to `max`; without `max`, `min` items and a rest element. */\nfunction fixedLengthTupleType(item: IrType, bounds: LengthBounds, wrap: ArrayWrapper): IrType {\n  const { min, max } = bounds;\n  if (max === undefined) {\n    return wrap(tupleOf(item, min, true));\n  }\n  const lengths = Array.from({ length: max - min + 1 }, (_, index) => min + index);\n  return unionOf(lengths.map((length) => wrap(tupleOf(item, length, false))));\n}\n\n/**\n * `type: array` with `--array-length` and the `array-length-tuples` fix (#2048, #2330, #2546):\n * the tuples have `min` to `max` items, the item type is used as it is (a nested array stays one\n * level deep), a `prefixItems` tuple gets no length tuples around it, and `--immutable` makes\n * every tuple `readonly`.\n */\nfunction fixedArrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const wrap: ArrayWrapper = (type) =>\n    request.context.options.immutable ? irReadonly(type) : type;\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return wrap(tuple);\n  }\n  const item = singleItemType(schema, request);\n  const bounds = lengthBounds(schema);\n  return isLengthTupleWanted(bounds, request)\n    ? fixedLengthTupleType(item, bounds, wrap)\n    : wrap(irArray(item));\n}\n\nfunction isArrayLengthFixed(request: SchemaRequest): boolean {\n  const { arrayLength, fixes } = request.context.options;\n  return arrayLength && fixes.has(OutputFix.ARRAY_LENGTH_TUPLES);\n}\n\n/** `type: array`, including tuples (`prefixItems`, array `items`) and `--array-length`. */\nexport function arrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  if (isArrayLengthFixed(request)) {\n    return fixedArrayType(schema, request);\n  }\n  const item = itemType(schema, request);\n  const bounds = lengthBounds(schema);\n  if (isLengthTupleWanted(bounds, request)) {\n    return lengthTupleType(schema, item, bounds);\n  }\n  // A tuple or an array item is used as the array type itself.\n  const type = item.kind === \"tuple\" || item.kind === \"array\" ? item : irArray(item);\n  return request.context.options.immutable ? irReadonly(type) : type;\n}\n"],"names":[],"mappings":";;;;;AAYA,MAAM,yBAAA,GAA4B,EAAA;AAGlC,SAAS,eAAA,CAAgB,QAAsB,OAAA,EAAuC;AACpF,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,IAAI,CAAC,MAAA,CAAO,WAAA,IAAe,CAAC,KAAA,CAAM,OAAA,CAAQ,KAAK,CAAA,EAAG;AAChD,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,WAAA,GAAc,OAAO,WAAA,IAAgB,KAAA;AAC3C,EAAA,OAAO,OAAA;AAAA,IACL,WAAA,CAAY,GAAA,CAAI,CAAC,IAAA,KAAS,cAAA,CAAe,OAAA,CAAQ,eAAA,CAAgB,IAAA,EAAM,OAAA,CAAQ,QAAQ,CAAC,CAAC;AAAA,GAC3F;AACF;AAGA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAClB,EAAA,OAAO,QAAQ,OAAA,CAAQ,eAAA,CAAgB,KAAA,EAAuB,OAAA,CAAQ,QAAQ,CAAA,GAAI,YAAA;AACpF;AAMA,SAAS,QAAA,CAAS,QAAsB,OAAA,EAAgC;AACtE,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAA;AAAA,EACT;AACA,EAAA,MAAM,EAAE,OAAM,GAAI,MAAA;AAElB,EAAA,IAAI,CAAC,KAAA,EAAO;AACV,IAAA,OAAO,YAAA;AAAA,EACT;AACA,EAAA,MAAM,MAAA,GAAS,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,MAAM,gBAAgB,OAAO,KAAA,KAAU,YAAY,MAAA,IAAU,KAAA,IAAS,MAAM,IAAA,KAAS,OAAA;AACrF,EAAA,OAAO,aAAA,GAAgB,OAAA,CAAQ,MAAM,CAAA,GAAI,MAAA;AAC3C;AAEA,SAAS,MAAA,CAAO,MAAc,KAAA,EAAyB;AACrD,EAAA,OAAO,MAAM,IAAA,CAAK,EAAE,QAAQ,KAAA,EAAM,EAAG,MAAM,IAAI,CAAA;AACjD;AAOA,SAAS,aAAa,MAAA,EAAoC;AACxD,EAAA,MAAM,EAAE,QAAA,EAAU,QAAA,EAAS,GAAI,MAAA;AAC/B,EAAA,MAAM,MAAM,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,IAAI,QAAA,GAAW,CAAA;AACvE,EAAA,MAAM,aAAa,OAAO,QAAA,KAAa,QAAA,IAAY,QAAA,IAAY,KAAK,GAAA,IAAO,QAAA;AAC3E,EAAA,OAAO,EAAE,GAAA,EAAK,GAAA,EAAK,UAAA,GAAa,WAAW,MAAA,EAAU;AACvD;AAMA,SAAS,eAAA,CAAgB,MAAA,EAAsB,IAAA,EAAc,MAAA,EAA8B;AACzF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,GAAA,EAAK;AACf,IAAA,OAAO,OAAA,CAAQ,CAAC,OAAA,CAAQ,MAAA,CAAO,MAAM,GAAG,CAAA,CAAE,GAAA,CAAI,CAAC,SAAS,cAAA,CAAe,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAAA,EACjF;AACA,EAAA,IAAK,MAAA,CAAO,WAAsB,CAAA,EAAG;AACnC,IAAA,MAAM,UAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,KAAK,GAAA,CAAI,CAAA,EAAA,CAAI,GAAA,IAAO,CAAA,IAAK,MAAM,CAAC,CAAA,IAAK,CAAC,CAAA,EAAG,UAAU,KAAK,CAAA;AAC7F,IAAA,OAAO,OAAA;AAAA,MACL,QAAQ,GAAA,CAAI,CAAC,MAAA,KAAW,OAAA,CAAQ,OAAO,IAAA,EAAM,MAAM,CAAA,CAAE,GAAA,CAAI,CAAC,IAAA,KAAS,cAAA,CAAe,IAAI,CAAC,CAAC,CAAC;AAAA,KAC3F;AAAA,EACF;AACA,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,GAAG,CAAA,CAAE,IAAI,CAAC,IAAA,KAAS,cAAA,CAAe,IAAI,CAAC,CAAA;AACrE,EAAA,OAAO,OAAA,CAAQ,CAAC,GAAG,QAAA,EAAU,cAAA,CAAe,QAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAC,CAAA;AACnE;AAEA,SAAS,mBAAA,CAAoB,QAAsB,OAAA,EAAiC;AAClF,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,MAAM,aAAA,GAAgB,QAAQ,MAAA,GAAY,GAAA,GAAA,CAAO,OAAO,GAAA,GAAM,CAAA,CAAA,GAAK,GAAA,IAAO,GAAA,GAAM,CAAA,CAAA,IAAM,CAAA;AACtF,EAAA,MAAM,SAAA,GAAY,GAAA,KAAQ,CAAA,IAAK,GAAA,KAAQ,MAAA;AACvC,EAAA,OACE,OAAA,CAAQ,OAAA,CAAQ,OAAA,CAAQ,WAAA,IAAe,aAAa,aAAA,GAAgB,yBAAA;AAExE;AAKA,SAAS,OAAA,CAAQ,IAAA,EAAc,MAAA,EAAgB,MAAA,EAAyB;AACtE,EAAA,MAAM,QAAA,GAAW,MAAA,CAAO,IAAA,EAAM,MAAM,CAAA,CAAE,IAAI,CAAC,IAAA,KAAS,cAAA,CAAe,IAAI,CAAC,CAAA;AACxE,EAAA,OAAO,OAAA,CAAQ,MAAA,GAAS,CAAC,GAAG,QAAA,EAAU,cAAA,CAAe,OAAA,CAAQ,IAAI,CAAA,EAAG,IAAI,CAAC,CAAA,GAAI,QAAQ,CAAA;AACvF;AAGA,SAAS,oBAAA,CAAqB,IAAA,EAAc,MAAA,EAAsB,IAAA,EAA4B;AAC5F,EAAA,MAAM,EAAE,GAAA,EAAK,GAAA,EAAI,GAAI,MAAA;AACrB,EAAA,IAAI,QAAQ,MAAA,EAAW;AACrB,IAAA,OAAO,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,GAAA,EAAK,IAAI,CAAC,CAAA;AAAA,EACtC;AACA,EAAA,MAAM,OAAA,GAAU,KAAA,CAAM,IAAA,CAAK,EAAE,MAAA,EAAQ,GAAA,GAAM,GAAA,GAAM,CAAA,EAAE,EAAG,CAAC,CAAA,EAAG,KAAA,KAAU,MAAM,KAAK,CAAA;AAC/E,EAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,GAAA,CAAI,CAAC,MAAA,KAAW,IAAA,CAAK,OAAA,CAAQ,IAAA,EAAM,MAAA,EAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;AAC5E;AAQA,SAAS,cAAA,CAAe,QAAsB,OAAA,EAAgC;AAC5E,EAAA,MAAM,IAAA,GAAqB,CAAC,IAAA,KAC1B,OAAA,CAAQ,QAAQ,OAAA,CAAQ,SAAA,GAAY,UAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AACzD,EAAA,MAAM,KAAA,GAAQ,eAAA,CAAgB,MAAA,EAAQ,OAAO,CAAA;AAC7C,EAAA,IAAI,UAAU,IAAA,EAAM;AAClB,IAAA,OAAO,KAAK,KAAK,CAAA;AAAA,EACnB;AACA,EAAA,MAAM,IAAA,GAAO,cAAA,CAAe,MAAA,EAAQ,OAAO,CAAA;AAC3C,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAA,OAAO,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,GACtC,oBAAA,CAAqB,IAAA,EAAM,MAAA,EAAQ,IAAI,CAAA,GACvC,IAAA,CAAK,OAAA,CAAQ,IAAI,CAAC,CAAA;AACxB;AAEA,SAAS,mBAAmB,OAAA,EAAiC;AAC3D,EAAA,MAAM,EAAE,WAAA,EAAa,KAAA,EAAM,GAAI,QAAQ,OAAA,CAAQ,OAAA;AAC/C,EAAA,OAAO,WAAA,IAAe,KAAA,CAAM,GAAA,CAAI,SAAA,CAAU,mBAAmB,CAAA;AAC/D;AAGO,SAAS,SAAA,CAAU,QAAsB,OAAA,EAAgC;AAC9E,EAAA,IAAI,kBAAA,CAAmB,OAAO,CAAA,EAAG;AAC/B,IAAA,OAAO,cAAA,CAAe,QAAQ,OAAO,CAAA;AAAA,EACvC;AACA,EAAA,MAAM,IAAA,GAAO,QAAA,CAAS,MAAA,EAAQ,OAAO,CAAA;AACrC,EAAA,MAAM,MAAA,GAAS,aAAa,MAAM,CAAA;AAClC,EAAA,IAAI,mBAAA,CAAoB,MAAA,EAAQ,OAAO,CAAA,EAAG;AACxC,IAAA,OAAO,eAAA,CAAgB,MAAA,EAAQ,IAAA,EAAM,MAAM,CAAA;AAAA,EAC7C;AAEA,EAAA,MAAM,IAAA,GAAO,KAAK,IAAA,KAAS,OAAA,IAAW,KAAK,IAAA,KAAS,OAAA,GAAU,IAAA,GAAO,OAAA,CAAQ,IAAI,CAAA;AACjF,EAAA,OAAO,QAAQ,OAAA,CAAQ,OAAA,CAAQ,SAAA,GAAY,UAAA,CAAW,IAAI,CAAA,GAAI,IAAA;AAChE;;"}
+{"version":3,"file":"array-type.mjs","sources":["../../../../src/application/transform/schema/array-type.ts"],"sourcesContent":["import {\n  irArray,\n  irOptionalTupleElement,\n  irReadonly,\n  irTuple,\n  irTupleElement,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrTupleElement, IrType } from \"../../../domain/ir/nodes.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 { unionOf } from \"../type-combinators.js\";\nimport type { SchemaRequest } from \"./schema-rule.js\";\n\n/**\n * `--array-length` writes tuples only while the estimated number of tuple elements stays below\n * this; the original chose it as roughly where TypeScript starts to struggle with tuple inference.\n */\nconst MAX_LENGTH_TUPLE_ELEMENTS = 30;\n\n/**\n * The tuple of `prefixItems` (or of an `items` list); null without either. The original closes a\n * `prefixItems` tuple and requires every element; the `prefix-items` fix does not.\n */\nfunction prefixTupleType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items } = schema;\n  if (schema.prefixItems && isPrefixItemsFixed(schema, request)) {\n    return prefixItemsTupleType(schema.prefixItems, schema, request);\n  }\n  if (!schema.prefixItems && !Array.isArray(items)) {\n    return null;\n  }\n  const prefixItems = schema.prefixItems ?? (items as SchemaObject[]);\n  return irTuple(\n    prefixItems.map((item) => irTupleElement(request.transformNested(item, request.location))),\n  );\n}\n\n/** The type of the items after the prefix, or null when there may be none (`false`). */\nfunction restItemType(schema: Schema, request: SchemaRequest): IrType | null {\n  return schema === false ? null : request.transformNested(schema, request.location);\n}\n\n/**\n * The type of the items after a `prefixItems` tuple (JSON Schema 2020-12 §10.3.1): `items`, else\n * `unevaluatedItems`, which does not apply to the items `contains` matches, else any item. Null\n * when no item may follow. An `items` list is not a schema in 2020-12, so it allows any item.\n */\nfunction prefixRestType(schema: SchemaObject, request: SchemaRequest): IrType | null {\n  const { items, unevaluatedItems, contains } = schema;\n  if (items !== undefined && !Array.isArray(items)) {\n    return restItemType(items as Schema, request);\n  }\n  if (unevaluatedItems === undefined || items !== undefined) {\n    return UNKNOWN_TYPE;\n  }\n  const unevaluated = restItemType(unevaluatedItems, request);\n  const matched = contains === undefined ? null : restItemType(contains, request);\n  const types = [unevaluated, matched].filter((type): type is IrType => type !== null);\n  return types.length === 0 ? null : unionOf(types);\n}\n\n/**\n * The `prefix-items` tuple of `prefixItems`: an array may end before the prefix does, so the\n * elements from `minItems` on are optional (`T?`), and a rest element types the items after it.\n */\nfunction prefixItemsTupleType(\n  prefixItems: readonly Schema[],\n  schema: SchemaObject,\n  request: SchemaRequest,\n): IrType {\n  const { min } = lengthBounds(schema);\n  const elements = prefixItems.map((item, index): IrTupleElement => {\n    const type = request.transformNested(item, request.location);\n    return index < min ? irTupleElement(type) : irOptionalTupleElement(type);\n  });\n  const rest = prefixRestType(schema, request);\n  return irTuple(rest === null ? elements : [...elements, irTupleElement(irArray(rest), true)]);\n}\n\nfunction isPrefixItemsFixed(schema: SchemaObject, request: SchemaRequest): boolean {\n  return (\n    schema.prefixItems !== undefined && request.context.options.fixes.has(OutputFix.PREFIX_ITEMS)\n  );\n}\n\n/** The type of one item; `unknown` without `items`. */\nfunction singleItemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const { items } = schema;\n  return items ? request.transformNested(items as SchemaObject, request.location) : UNKNOWN_TYPE;\n}\n\n/**\n * The item type as the original returns it: a tuple stands for the whole array, and a nested\n * `type: array` item is wrapped in an array here already.\n */\nfunction itemType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return tuple;\n  }\n  const { items } = schema;\n  // Checked first: the `in` test below throws for `items: null`.\n  if (!items) {\n    return UNKNOWN_TYPE;\n  }\n  const nested = singleItemType(schema, request);\n  const isNestedArray = typeof items === \"object\" && \"type\" in items && items.type === \"array\";\n  return isNestedArray ? irArray(nested) : nested;\n}\n\nfunction repeat(type: IrType, count: number): IrType[] {\n  return Array.from({ length: count }, () => type);\n}\n\ninterface LengthBounds {\n  readonly min: number;\n  readonly max: number | undefined;\n}\n\nfunction lengthBounds(schema: SchemaObject): LengthBounds {\n  const { minItems, maxItems } = schema;\n  const min = typeof minItems === \"number\" && minItems >= 0 ? minItems : 0;\n  const isMaxValid = typeof maxItems === \"number\" && maxItems >= 0 && min <= maxItems;\n  return { min, max: isMaxValid ? maxItems : undefined };\n}\n\n/**\n * Tuples for `--array-length`, as the original builds them. With both bounds it emits tuples of\n * length 0 to `max - min` (not `min` to `max`); the `array-length-tuples` fix corrects it.\n */\nfunction lengthTupleType(schema: SchemaObject, item: IrType, bounds: LengthBounds): IrType {\n  const { min, max } = bounds;\n  if (min === max) {\n    return unionOf([irTuple(repeat(item, min).map((type) => irTupleElement(type)))]);\n  }\n  if ((schema.maxItems as number) > 0) {\n    const lengths = Array.from({ length: Math.max(0, (max ?? 0) - min + 1) }, (_, index) => index);\n    return unionOf(\n      lengths.map((length) => irTuple(repeat(item, length).map((type) => irTupleElement(type)))),\n    );\n  }\n  const elements = repeat(item, min).map((type) => irTupleElement(type));\n  return irTuple([...elements, irTupleElement(irArray(item), true)]);\n}\n\nfunction isLengthTupleWanted(bounds: LengthBounds, request: SchemaRequest): boolean {\n  const { min, max } = bounds;\n  const estimatedSize = max === undefined ? min : (max * (max + 1) - min * (min - 1)) / 2;\n  const hasBounds = min !== 0 || max !== undefined;\n  return (\n    request.context.options.arrayLength && hasBounds && estimatedSize < MAX_LENGTH_TUPLE_ELEMENTS\n  );\n}\n\n/** Applies `--immutable` to one array or tuple type. */\ntype ArrayWrapper = (type: IrType) => IrType;\n\nfunction tupleOf(item: IrType, length: number, isOpen: boolean): IrType {\n  const elements = repeat(item, length).map((type) => irTupleElement(type));\n  return irTuple(isOpen ? [...elements, irTupleElement(irArray(item), true)] : elements);\n}\n\n/** Tuples of every length from `min` to `max`; without `max`, `min` items and a rest element. */\nfunction fixedLengthTupleType(item: IrType, bounds: LengthBounds, wrap: ArrayWrapper): IrType {\n  const { min, max } = bounds;\n  if (max === undefined) {\n    return wrap(tupleOf(item, min, true));\n  }\n  const lengths = Array.from({ length: max - min + 1 }, (_, index) => min + index);\n  return unionOf(lengths.map((length) => wrap(tupleOf(item, length, false))));\n}\n\n/**\n * `type: array` with `--array-length` and the `array-length-tuples` fix (#2048, #2330, #2546):\n * the tuples have `min` to `max` items, the item type is used as it is (a nested array stays one\n * level deep), a `prefixItems` tuple gets no length tuples around it, and `--immutable` makes\n * every tuple `readonly`.\n */\nfunction fixedArrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  const wrap: ArrayWrapper = (type) =>\n    request.context.options.immutable ? irReadonly(type) : type;\n  const tuple = prefixTupleType(schema, request);\n  if (tuple !== null) {\n    return wrap(tuple);\n  }\n  const item = singleItemType(schema, request);\n  const bounds = lengthBounds(schema);\n  return isLengthTupleWanted(bounds, request)\n    ? fixedLengthTupleType(item, bounds, wrap)\n    : wrap(irArray(item));\n}\n\nfunction isArrayLengthFixed(request: SchemaRequest): boolean {\n  const { arrayLength, fixes } = request.context.options;\n  return arrayLength && fixes.has(OutputFix.ARRAY_LENGTH_TUPLES);\n}\n\n/** `type: array`, including tuples (`prefixItems`, array `items`) and `--array-length`. */\nexport function arrayType(schema: SchemaObject, request: SchemaRequest): IrType {\n  if (isArrayLengthFixed(request)) {\n    return fixedArrayType(schema, request);\n  }\n  const item = itemType(schema, request);\n  const bounds = lengthBounds(schema);\n  // A `prefix-items` tuple has its own lengths, so `--array-length` adds no tuples around it.\n  if (!isPrefixItemsFixed(schema, request) && isLengthTupleWanted(bounds, request)) {\n    return lengthTupleType(schema, item, bounds);\n  }\n  // A tuple or an array item is used as the array type itself.\n  const type = item.kind === \"tuple\" || item.kind === \"array\" ? item : irArray(item);\n  return request.context.options.immutable ? irReadonly(type) : type;\n}\n"],"names":[],"mappings":"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"}

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

@@ -3,10 +3,13 @@
 const constructors = require('../../../domain/ir/constructors.cjs');
 const jsonPointer = require('../../../domain/openapi/json-pointer.cjs');
 const outputFixes = require('../../../domain/output-fixes.cjs');
+const pointerType = require('../ref-pointer/pointer-type.cjs');
 const sharedTypes = require('../shared-types.cjs');
 const typeCombinators = require('../type-combinators.cjs');
 const coreType = require('./core-type.cjs');
+const discriminatedUnion = require('./discriminated-union.cjs');
 const presenceMembers = require('./presence-members.cjs');
+const requiredVariants = require('./required-variants.cjs');
 const unevaluatedProperties = require('./unevaluated-properties.cjs');
 
 function variantTypes(variants, keyword, request) {
@@ -20,19 +23,28 @@ function variantTypes(variants, keyword, request) {
 function isRefItem(item) {
   return "$ref" in item;
 }
+function keysToRequire(ref, target, required, request) {
+  const defined = required.filter((key) => Boolean(target.properties?.[key]));
+  if (!request.context.discriminators.isHandled(ref)) {
+    return defined;
+  }
+  if (!request.context.options.fixes.has(outputFixes.OutputFix.DISCRIMINATOR_MEMBER_REQUIRED)) {
+    return [];
+  }
+  return defined.filter((key) => !target.required?.includes(key));
+}
 function refItemType(item, required, request) {
   const type = request.transformNested(item, request.location);
-  const { refs, discriminators, footer } = request.context;
-  const resolved = refs.resolve(item.$ref);
-  const isEligible = resolved && typeof resolved === "object" && "properties" in resolved && !discriminators.isHandled(item.$ref);
-  if (!isEligible) {
+  const resolved = request.context.refs.resolve(item.$ref);
+  if (!resolved || typeof resolved !== "object" || !("properties" in resolved)) {
     return type;
   }
-  const keys = required.filter((key) => Boolean(resolved.properties?.[key]));
-  if (keys.length > 0) {
-    footer.requireWithRequired();
+  const keys = keysToRequire(item.$ref, resolved, required, request);
+  if (keys.length === 0) {
+    return type;
   }
-  return typeCombinators.withRequiredKeys(type, keys);
+  request.context.footer.requireWithRequired();
+  return typeCombinators.withRequiredKeys(pointerType.requirableRefType(item.$ref, type, request), keys);
 }
 function inlineItemType(item, required, request) {
   const own = typeof item === "object" && Array.isArray(item.required) ? item.required ?? [] : [];
@@ -41,13 +53,29 @@ function inlineItemType(item, required, request) {
     request.location
   );
 }
+function ownKeywordsType(own, ref, request) {
+  return combinedType(own, { ...request, location: { ...request.location, path: ref } });
+}
+function allOfItemType(item, required, request) {
+  const isRef = isRefItem(item);
+  const discriminator = isRef && request.context.discriminators.objectAt(item.$ref) || item.discriminator;
+  const propertyName = discriminator?.propertyName;
+  const unionItem = isRef && propertyName ? discriminatedUnion.unionItemOf(item.$ref, request) : void 0;
+  if (isRef && propertyName && unionItem?.isMember) {
+    const own = discriminatedUnion.unionOwnKeywords(unionItem.union, propertyName, required);
+    return ownKeywordsType(own, item.$ref, request);
+  }
+  const type = isRef ? refItemType(item, required, request) : inlineItemType(item, required, request);
+  const isUnion = unionItem !== void 0 && !unionItem.isMapped && request.context.options.fixes.has(outputFixes.OutputFix.ALLOF_DISCRIMINATED_UNION);
+  if (!propertyName || isUnion) {
+    return type;
+  }
+  const { path } = request.location;
+  const others = path === void 0 ? [] : request.context.discriminators.otherPropertiesAt(path);
+  return typeCombinators.omitKeys(type, [propertyName, ...others]);
+}
 function allOfTypes(items, required, request) {
-  return items.map((item) => {
-    const isRef = isRefItem(item);
-    const type = isRef ? refItemType(item, required, request) : inlineItemType(item, required, request);
-    const discriminator = isRef && request.context.discriminators.objectAt(item.$ref) || item.discriminator;
-    return discriminator?.propertyName ? typeCombinators.omitKeys(type, [discriminator.propertyName]) : type;
-  });
+  return items.flatMap((item) => allOfItemType(item, required, request) ?? []);
 }
 function oneOfType(previous, variants) {
   const before = previous === null ? [] : [previous];
@@ -80,7 +108,14 @@ function composedType(schema, request) {
     const allOfType = allOf.length > 0 ? [typeCombinators.intersectionOf(allOf)] : [];
     type = typeCombinators.intersectionOf([...core === null ? [] : [core], ...allOfType]);
   }
-  type = anyOfType(type, schema, request);
+  return variantsType(type, schema, request);
+}
+function variantsType(previous, schema, request) {
+  const type = requiredVariants.requiredVariantsType(previous, schema, schema.anyOf ?? [], request) ?? anyOfType(previous, schema, request);
+  const oneOfRequired = requiredVariants.requiredVariantsType(type, schema, schema.oneOf ?? [], request);
+  if (oneOfRequired !== null) {
+    return oneOfRequired;
+  }
   const oneOf = variantTypes(oneOfVariants(schema), "oneOf", request);
   return oneOf.length > 0 ? oneOfType(type, oneOf) : type;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"composition-type.cjs","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":["createRef","withRequiredKeys","omitKeys","isPrimitiveType","unionOf","intersectionOf","OutputFix","coreType","allOfMembers","unevaluatedPropertiesType","irRecord","irKeyword","UNKNOWN_TYPE","nullableOf"],"mappings":"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"}
+{"version":3,"file":"composition-type.cjs","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":["createRef","OutputFix","withRequiredKeys","requirableRefType","unionItemOf","unionOwnKeywords","omitKeys","isPrimitiveType","unionOf","intersectionOf","coreType","allOfMembers","requiredVariantsType","unevaluatedPropertiesType","irRecord","irKeyword","UNKNOWN_TYPE","nullableOf"],"mappings":"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"}

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

@@ -1,10 +1,13 @@
 import { irRecord, irKeyword } from '../../../domain/ir/constructors.mjs';
 import { createRef } from '../../../domain/openapi/json-pointer.mjs';
 import { OutputFix } from '../../../domain/output-fixes.mjs';
+import { requirableRefType } from '../ref-pointer/pointer-type.mjs';
 import { UNKNOWN_TYPE } from '../shared-types.mjs';
 import { nullableOf, intersectionOf, omitKeys, unionOf, isPrimitiveType, withRequiredKeys } from '../type-combinators.mjs';
 import { coreType } from './core-type.mjs';
+import { unionItemOf, unionOwnKeywords } from './discriminated-union.mjs';
 import { allOfMembers } from './presence-members.mjs';
+import { requiredVariantsType } from './required-variants.mjs';
 import { unevaluatedPropertiesType } from './unevaluated-properties.mjs';
 
 function variantTypes(variants, keyword, request) {
@@ -18,19 +21,28 @@ function variantTypes(variants, keyword, request) {
 function isRefItem(item) {
   return "$ref" in item;
 }
+function keysToRequire(ref, target, required, request) {
+  const defined = required.filter((key) => Boolean(target.properties?.[key]));
+  if (!request.context.discriminators.isHandled(ref)) {
+    return defined;
+  }
+  if (!request.context.options.fixes.has(OutputFix.DISCRIMINATOR_MEMBER_REQUIRED)) {
+    return [];
+  }
+  return defined.filter((key) => !target.required?.includes(key));
+}
 function refItemType(item, required, request) {
   const type = request.transformNested(item, request.location);
-  const { refs, discriminators, footer } = request.context;
-  const resolved = refs.resolve(item.$ref);
-  const isEligible = resolved && typeof resolved === "object" && "properties" in resolved && !discriminators.isHandled(item.$ref);
-  if (!isEligible) {
+  const resolved = request.context.refs.resolve(item.$ref);
+  if (!resolved || typeof resolved !== "object" || !("properties" in resolved)) {
     return type;
   }
-  const keys = required.filter((key) => Boolean(resolved.properties?.[key]));
-  if (keys.length > 0) {
-    footer.requireWithRequired();
+  const keys = keysToRequire(item.$ref, resolved, required, request);
+  if (keys.length === 0) {
+    return type;
   }
-  return withRequiredKeys(type, keys);
+  request.context.footer.requireWithRequired();
+  return withRequiredKeys(requirableRefType(item.$ref, type, request), keys);
 }
 function inlineItemType(item, required, request) {
   const own = typeof item === "object" && Array.isArray(item.required) ? item.required ?? [] : [];
@@ -39,13 +51,29 @@ function inlineItemType(item, required, request) {
     request.location
   );
 }
+function ownKeywordsType(own, ref, request) {
+  return combinedType(own, { ...request, location: { ...request.location, path: ref } });
+}
+function allOfItemType(item, required, request) {
+  const isRef = isRefItem(item);
+  const discriminator = isRef && request.context.discriminators.objectAt(item.$ref) || item.discriminator;
+  const propertyName = discriminator?.propertyName;
+  const unionItem = isRef && propertyName ? unionItemOf(item.$ref, request) : void 0;
+  if (isRef && propertyName && unionItem?.isMember) {
+    const own = unionOwnKeywords(unionItem.union, propertyName, required);
+    return ownKeywordsType(own, item.$ref, request);
+  }
+  const type = isRef ? refItemType(item, required, request) : inlineItemType(item, required, request);
+  const isUnion = unionItem !== void 0 && !unionItem.isMapped && request.context.options.fixes.has(OutputFix.ALLOF_DISCRIMINATED_UNION);
+  if (!propertyName || isUnion) {
+    return type;
+  }
+  const { path } = request.location;
+  const others = path === void 0 ? [] : request.context.discriminators.otherPropertiesAt(path);
+  return omitKeys(type, [propertyName, ...others]);
+}
 function allOfTypes(items, required, request) {
-  return items.map((item) => {
-    const isRef = isRefItem(item);
-    const type = isRef ? refItemType(item, required, request) : inlineItemType(item, required, request);
-    const discriminator = isRef && request.context.discriminators.objectAt(item.$ref) || item.discriminator;
-    return discriminator?.propertyName ? omitKeys(type, [discriminator.propertyName]) : type;
-  });
+  return items.flatMap((item) => allOfItemType(item, required, request) ?? []);
 }
 function oneOfType(previous, variants) {
   const before = previous === null ? [] : [previous];
@@ -78,7 +106,14 @@ function composedType(schema, request) {
     const allOfType = allOf.length > 0 ? [intersectionOf(allOf)] : [];
     type = intersectionOf([...core === null ? [] : [core], ...allOfType]);
   }
-  type = anyOfType(type, schema, request);
+  return variantsType(type, schema, request);
+}
+function variantsType(previous, schema, request) {
+  const type = requiredVariantsType(previous, schema, schema.anyOf ?? [], request) ?? anyOfType(previous, schema, request);
+  const oneOfRequired = requiredVariantsType(type, schema, schema.oneOf ?? [], request);
+  if (oneOfRequired !== null) {
+    return oneOfRequired;
+  }
   const oneOf = variantTypes(oneOfVariants(schema), "oneOf", request);
   return oneOf.length > 0 ? oneOfType(type, oneOf) : type;
 }