ts-fortress 11.0.2 → 11.2.0

package/README.md

@@ -909,14 +909,15 @@ const ColorEnum = t.enumType(['red', 'green', 'blue']);
 
 type Color = t.TypeOf<typeof ColorEnum>; // 'red' | 'green' | 'blue'
 
-// Numeric ranges
-const DiceRoll = t.uintRange({
-    start: 1,
-    end: 7,
-    defaultValue: 1,
-}); // integers from 1 to 6
+// Numeric ranges (end is exclusive)
+const DiceRoll = t.uintRange(1, 7, { defaultValue: 1 }); // integers from 1 to 6
 
 type DiceRoll = t.TypeOf<typeof DiceRoll>; // 1 | 2 | 3 | 4 | 5 | 6
+
+// Numeric ranges (end is inclusive)
+const DiceRoll2 = t.uintRangeInclusive(1, 6, { defaultValue: 1 }); // integers from 1 to 6
+
+type DiceRoll2 = t.TypeOf<typeof DiceRoll2>; // 1 | 2 | 3 | 4 | 5 | 6
 ```
 
 Tips: It is often better to use `uintRange` instead of `enumType` when possible, because `enumType` stores a Set of the sizes of its members as data, while `uintRange` only stores the range, resulting in smaller memory usage.
@@ -1077,8 +1078,10 @@ type ValidationError = Readonly<{
 
 - `t.TypeOf<T>` - Extract TypeScript type from validator
 - `t.enumType(values)` - Enum validation
-- `t.uintRange({ start, end, defaultValue? })` - Non-negative integer range validation
-- `t.intRange({ start, end, defaultValue? })` - Integer range validation
+- `t.uintRange(start, end, { defaultValue? })` - Non-negative integer range validation (`end` is exclusive)
+- `t.intRange(start, end, { defaultValue? })` - Integer range validation (`end` is exclusive)
+- `t.uintRangeInclusive(start, end, { defaultValue? })` - Non-negative integer range validation (`end` is inclusive)
+- `t.intRangeInclusive(start, end, { defaultValue? })` - Integer range validation (`end` is inclusive)
 - `t.unknown` - Unknown Type
 - `t.recursion(typeName, definition)` - Define recursive type
 

package/dist/brand/brand.mjs

@@ -1,4 +1,5 @@
 import { pipe, Result } from 'ts-data-forge';
+import '@sindresorhus/is';
 import { createType } from '../utils/create-type.mjs';
 
 const brand = ({

package/dist/brand/brand.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":["import { pipe, Result } from 'ts-data-forge';\nimport { type Brand, type Primitive, type StrictExtract } from 'ts-type-forge';\nimport { type Type } from '../type.mjs';\nimport { createType, type ValidationError } from '../utils/index.mjs';\n\nexport type { Brand } from 'ts-type-forge';\n\ntype ArrayToUnion<A extends readonly unknown[]> = A extends readonly []\n  ? never\n  : A[number];\n\nexport const brand = <\n  const A extends StrictExtract<Primitive, string | number | bigint | boolean>,\n  const BrandTrueKeys extends readonly string[],\n  const BrandFalseKeys extends readonly string[] = readonly [],\n>({\n  baseType,\n  brandFalseKeys,\n  brandKeys,\n  defaultValue: defaultValue_,\n  is: is_,\n  typeName,\n}: Readonly<{\n  baseType: Type<A>;\n  is?: (\n    a: A,\n  ) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;\n  defaultValue?: A;\n  typeName?: string;\n  brandKeys: BrandTrueKeys;\n  brandFalseKeys?: BrandFalseKeys;\n}>): Type<\n  Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>\n> => {\n  type T = Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;\n\n  const is: (a: A) => a is T = is_ ?? ((_a): _a is T => true);\n\n  const defaultValue: A = defaultValue_ ?? baseType.defaultValue;\n\n  if (!is(defaultValue)) {\n    throw new Error(\n      `defaultValue ${defaultValue} doesn't pass \\`is\\` function`,\n    );\n  }\n\n  const brandKeysStr = [\n    ...brandKeys.map((s) => `\"${s}\"`),\n    ...(brandFalseKeys?.map((s) => `not(\"${s}\")`) ?? []),\n  ].join(' & ');\n\n  const typeNameFilled = typeName ?? brandKeysStr;\n\n  const validate: Type<T>['validate'] = (a) =>\n    pipe(a)\n      .map(baseType.validate)\n      .map((res): Result<T, readonly ValidationError[]> =>\n        Result.isErr(res)\n          ? res\n          : is(res.value)\n            ? Result.ok(res.value satisfies T)\n            : Result.err([\n                {\n                  path: [],\n                  actualValue: res.value,\n                  expectedType: typeNameFilled,\n                  typeName: typeNameFilled,\n                  details:\n                    // If typeName is specified, it will be used in the error message, so no further information is required.\n                    typeName === undefined\n                      ? {\n                          kind: 'brand' as const,\n                          description: brandKeysStr,\n                        }\n                      : undefined,\n                } satisfies ValidationError,\n              ]),\n      ).value;\n\n  return createType({\n    typeName: typeNameFilled,\n    defaultValue,\n    validate,\n  });\n};\n"],"names":[],"mappings":";;;AAWO,MAAM,QAAQ,CAInB;AAAA,EACA,QAAA;AAAA,EACA,cAAA;AAAA,EACA,SAAA;AAAA,EACA,YAAA,EAAc,aAAA;AAAA,EACd,EAAA,EAAI,GAAA;AAAA,EACJ;AACF,CAAA,KAWK;AAGH,EAAA,MAAM,EAAA,GAAuB,GAAA,KAAQ,CAAC,EAAA,KAAgB,IAAA,CAAA;AAEtD,EAAA,MAAM,YAAA,GAAkB,iBAAiB,QAAA,CAAS,YAAA;AAElD,EAAA,IAAI,CAAC,EAAA,CAAG,YAAY,CAAA,EAAG;AACrB,IAAA,MAAM,IAAI,KAAA;AAAA,MACR,gBAAgB,YAAY,CAAA,6BAAA;AAAA,KAC9B;AAAA,EACF;AAEA,EAAA,MAAM,YAAA,GAAe;AAAA,IACnB,GAAG,SAAA,CAAU,GAAA,CAAI,CAAC,CAAA,KAAM,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAA;AAAA,IAChC,GAAI,gBAAgB,GAAA,CAAI,CAAC,MAAM,CAAA,KAAA,EAAQ,CAAC,CAAA,EAAA,CAAI,CAAA,IAAK;AAAC,GACpD,CAAE,KAAK,KAAK,CAAA;AAEZ,EAAA,MAAM,iBAAiB,QAAA,IAAY,YAAA;AAEnC,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KACrC,IAAA,CAAK,CAAC,CAAA,CACH,GAAA,CAAI,QAAA,CAAS,QAAQ,CAAA,CACrB,GAAA;AAAA,IAAI,CAAC,GAAA,KACJ,MAAA,CAAO,KAAA,CAAM,GAAG,IACZ,GAAA,GACA,EAAA,CAAG,GAAA,CAAI,KAAK,IACV,MAAA,CAAO,EAAA,CAAG,IAAI,KAAiB,CAAA,GAC/B,OAAO,GAAA,CAAI;AAAA,MACT;AAAA,QACE,MAAM,EAAC;AAAA,QACP,aAAa,GAAA,CAAI,KAAA;AAAA,QACjB,YAAA,EAAc,cAAA;AAAA,QACd,QAAA,EAAU,cAAA;AAAA,QACV,OAAA;AAAA;AAAA,UAEE,aAAa,MAAA,GACT;AAAA,YACE,IAAA,EAAM,OAAA;AAAA,YACN,WAAA,EAAa;AAAA,WACf,GACA;AAAA;AAAA;AACR,KACD;AAAA,GACT,CAAE,KAAA;AAEN,EAAA,OAAO,UAAA,CAAW;AAAA,IAChB,QAAA,EAAU,cAAA;AAAA,IACV,YAAA;AAAA,IACA;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"brand.mjs","sources":["../../src/brand/brand.mts"],"sourcesContent":["import { pipe, Result } from 'ts-data-forge';\nimport { type Brand, type Primitive, type StrictExtract } from 'ts-type-forge';\nimport { type Type } from '../type.mjs';\nimport { createType, type ValidationError } from '../utils/index.mjs';\n\nexport type { Brand } from 'ts-type-forge';\n\ntype ArrayToUnion<A extends readonly unknown[]> = A extends readonly []\n  ? never\n  : A[number];\n\nexport const brand = <\n  const A extends StrictExtract<Primitive, string | number | bigint | boolean>,\n  const BrandTrueKeys extends readonly string[],\n  const BrandFalseKeys extends readonly string[] = readonly [],\n>({\n  baseType,\n  brandFalseKeys,\n  brandKeys,\n  defaultValue: defaultValue_,\n  is: is_,\n  typeName,\n}: Readonly<{\n  baseType: Type<A>;\n  is?: (\n    a: A,\n  ) => a is Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;\n  defaultValue?: A;\n  typeName?: string;\n  brandKeys: BrandTrueKeys;\n  brandFalseKeys?: BrandFalseKeys;\n}>): Type<\n  Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>\n> => {\n  type T = Brand<A, ArrayToUnion<BrandTrueKeys>, ArrayToUnion<BrandFalseKeys>>;\n\n  const is: (a: A) => a is T = is_ ?? ((_a): _a is T => true);\n\n  const defaultValue: A = defaultValue_ ?? baseType.defaultValue;\n\n  if (!is(defaultValue)) {\n    throw new Error(\n      `defaultValue ${defaultValue} doesn't pass \\`is\\` function`,\n    );\n  }\n\n  const brandKeysStr = [\n    ...brandKeys.map((s) => `\"${s}\"`),\n    ...(brandFalseKeys?.map((s) => `not(\"${s}\")`) ?? []),\n  ].join(' & ');\n\n  const typeNameFilled = typeName ?? brandKeysStr;\n\n  const validate: Type<T>['validate'] = (a) =>\n    pipe(a)\n      .map(baseType.validate)\n      .map((res): Result<T, readonly ValidationError[]> =>\n        Result.isErr(res)\n          ? res\n          : is(res.value)\n            ? Result.ok(res.value satisfies T)\n            : Result.err([\n                {\n                  path: [],\n                  actualValue: res.value,\n                  expectedType: typeNameFilled,\n                  typeName: typeNameFilled,\n                  details:\n                    // If typeName is specified, it will be used in the error message, so no further information is required.\n                    typeName === undefined\n                      ? {\n                          kind: 'brand' as const,\n                          description: brandKeysStr,\n                        }\n                      : undefined,\n                } satisfies ValidationError,\n              ]),\n      ).value;\n\n  return createType({\n    typeName: typeNameFilled,\n    defaultValue,\n    validate,\n  });\n};\n"],"names":[],"mappings":";;;;AAWO,MAAM,QAAQ,CAInB;AAAA,EACA,QAAA;AAAA,EACA,cAAA;AAAA,EACA,SAAA;AAAA,EACA,YAAA,EAAc,aAAA;AAAA,EACd,EAAA,EAAI,GAAA;AAAA,EACJ;AACF,CAAA,KAWK;AAGH,EAAA,MAAM,EAAA,GAAuB,GAAA,KAAQ,CAAC,EAAA,KAAgB,IAAA,CAAA;AAEtD,EAAA,MAAM,YAAA,GAAkB,iBAAiB,QAAA,CAAS,YAAA;AAElD,EAAA,IAAI,CAAC,EAAA,CAAG,YAAY,CAAA,EAAG;AACrB,IAAA,MAAM,IAAI,KAAA;AAAA,MACR,gBAAgB,YAAY,CAAA,6BAAA;AAAA,KAC9B;AAAA,EACF;AAEA,EAAA,MAAM,YAAA,GAAe;AAAA,IACnB,GAAG,SAAA,CAAU,GAAA,CAAI,CAAC,CAAA,KAAM,CAAA,CAAA,EAAI,CAAC,CAAA,CAAA,CAAG,CAAA;AAAA,IAChC,GAAI,gBAAgB,GAAA,CAAI,CAAC,MAAM,CAAA,KAAA,EAAQ,CAAC,CAAA,EAAA,CAAI,CAAA,IAAK;AAAC,GACpD,CAAE,KAAK,KAAK,CAAA;AAEZ,EAAA,MAAM,iBAAiB,QAAA,IAAY,YAAA;AAEnC,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KACrC,IAAA,CAAK,CAAC,CAAA,CACH,GAAA,CAAI,QAAA,CAAS,QAAQ,CAAA,CACrB,GAAA;AAAA,IAAI,CAAC,GAAA,KACJ,MAAA,CAAO,KAAA,CAAM,GAAG,IACZ,GAAA,GACA,EAAA,CAAG,GAAA,CAAI,KAAK,IACV,MAAA,CAAO,EAAA,CAAG,IAAI,KAAiB,CAAA,GAC/B,OAAO,GAAA,CAAI;AAAA,MACT;AAAA,QACE,MAAM,EAAC;AAAA,QACP,aAAa,GAAA,CAAI,KAAA;AAAA,QACjB,YAAA,EAAc,cAAA;AAAA,QACd,QAAA,EAAU,cAAA;AAAA,QACV,OAAA;AAAA;AAAA,UAEE,aAAa,MAAA,GACT;AAAA,YACE,IAAA,EAAM,OAAA;AAAA,YACN,WAAA,EAAa;AAAA,WACf,GACA;AAAA;AAAA;AACR,KACD;AAAA,GACT,CAAE,KAAA;AAEN,EAAA,OAAO,UAAA,CAAW;AAAA,IAChB,QAAA,EAAU,cAAA;AAAA,IACV,YAAA;AAAA,IACA;AAAA,GACD,CAAA;AACH;;;;"}

package/dist/compose/intersection.mjs

@@ -3,6 +3,7 @@ import { hasRecordInternals } from '../type.mjs';
 import { createAssertFn } from '../utils/create-assert-fn.mjs';
 import { createCastFn } from '../utils/create-cast-fn.mjs';
 import { createIsFn } from '../utils/create-is-fn.mjs';
+import '@sindresorhus/is';
 import { toIntersectionString } from '../utils/to-union-string.mjs';
 
 const intersection = (types, defaultType, options) => {

package/dist/compose/intersection.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"intersection.mjs","sources":["../../src/compose/intersection.mts"],"sourcesContent":["import { Arr, expectType, hasKey, isRecord, Result, tp } from 'ts-data-forge';\nimport { type Intersection, type NonEmptyTuple } from 'ts-type-forge';\nimport {\n  hasRecordInternals,\n  type AnyType,\n  type ExcessPropertyOption,\n  type Type,\n  type TypeOf,\n} from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  toIntersectionString,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport const intersection = <const Types extends NonEmptyTuple<AnyType>>(\n  types: Types,\n  defaultType: IntersectionType<Types>,\n  options?: Partial<\n    Readonly<{\n      typeName: string;\n    }>\n  >,\n): IntersectionType<Types> => {\n  type T = IntersectionTypeValue<Types>;\n\n  const typeNameFilled: string =\n    options?.typeName ??\n    `(${toIntersectionString(types.map((a) => a.typeName))})`;\n\n  const validate: Type<T>['validate'] = (a) => {\n    const errors: readonly ValidationError[] = Arr.generate(function* () {\n      for (const type of types) {\n        const res = type.validate(a);\n\n        if (Result.isErr(res)) {\n          yield {\n            path: [],\n            actualValue: a,\n            expectedType: typeNameFilled,\n            typeName: typeNameFilled,\n            details: {\n              kind: 'intersection',\n              typeNames: types.map((t) => t.typeName),\n            },\n          } satisfies ValidationError;\n\n          yield* res.value;\n        }\n      }\n    });\n\n    if (Arr.isNonEmpty(errors)) {\n      return Result.err(errors);\n    }\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return Result.ok(a as T);\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : defaultType.fill(a));\n\n  const baseType: Type<T> = {\n    typeName: typeNameFilled,\n    defaultValue: defaultType.defaultValue,\n    fill,\n    // Non-record intersections (e.g. branded primitives) have no excess paths\n    // to remove. Record intersections override this below.\n    prune: (a) => a,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  } as const;\n\n  // If all types are records, add RecordTypeInternals\n  if (types.every(hasRecordInternals)) {\n    const shapeStructures = Arr.map(types, (t) => t.shapeStructure);\n\n    const excessProperty: ExcessPropertyOption = Arr.some(\n      types,\n      (t) => t.excessProperty === 'reject',\n    )\n      ? 'reject'\n      : 'allow';\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return {\n      ...baseType,\n      // A value path is represented by a record intersection if it is\n      // represented by any member, so the pruned members are merged (deeply;\n      // see `mergePruned`). All members are record types here\n      // (`hasRecordInternals`), so each pruned result is a record.\n      prune: (a: T): T =>\n        // eslint-disable-next-line total-functions/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return\n        types.map((t) => t.prune(a)).reduce(mergePruned, {}) as T,\n      shapeStructure: Arr.isFixedLengthTuple(shapeStructures, 1)\n        ? shapeStructures[0]\n        : ({ kind: 'intersection', parts: shapeStructures } as const),\n      excessProperty,\n    } as IntersectionType<Types>;\n  }\n\n  return baseType;\n};\n\n/**\n * Deep-merges the pruned results of intersection members. Each pruned result\n * contains only the value paths represented by its own member type, so the\n * results have to be merged recursively to keep the union of all represented\n * paths — a shallow spread would drop nested paths kept by an earlier member\n * whenever a later member shares the same key (e.g. two members both having a\n * `pos` sub-record with different fields).\n */\nconst mergePruned = (x: unknown, y: unknown): unknown => {\n  if (isRecord(x) && isRecord(y)) {\n    const xMergedWithY = Object.fromEntries(\n      Object.entries(x).map(([k, xv]) =>\n        tp(k, hasKey(y, k) ? mergePruned(xv, y[k]) : xv),\n      ),\n    );\n\n    const yOnly = Object.fromEntries(\n      Object.entries(y).filter(([k]) => !hasKey(x, k)),\n    );\n\n    return { ...xMergedWithY, ...yOnly };\n  }\n\n  // Both members pruned the same input array, so the lengths always match;\n  // merge element-wise to keep every represented element path.\n  if (Arr.isArray(x) && Arr.isArray(y) && x.length === y.length) {\n    return x.map((xi, i) => mergePruned(xi, y[i]));\n  }\n\n  // Not structurally mergeable — the later member wins.\n  return y;\n};\n\ntype IntersectionType<Types extends NonEmptyTuple<AnyType>> = Type<\n  IntersectionTypeValue<Types>\n>;\n\ntype IntersectionTypeValue<Types extends NonEmptyTuple<AnyType>> =\n  TsFortressInternal.IntersectionTypeValueImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type IntersectionTypeValueImpl<Types extends NonEmptyTuple<AnyType>> =\n    Intersection<Cast0<UnwrapTypeList<Types>>>;\n\n  type Cast0<T> = readonly [T] extends readonly [NonEmptyTuple<unknown>]\n    ? T\n    : never;\n}\n\nexpectType<\n  IntersectionType<\n    readonly [\n      Type<\n        Readonly<{\n          a: 0;\n          b: 0;\n        }>\n      >,\n      Type<\n        Readonly<{\n          b: 0;\n          c: 0;\n        }>\n      >,\n    ]\n  >,\n  Type<\n    Readonly<{\n      a: 0;\n      b: 0;\n      c: 0;\n    }>\n  >\n>('=');\n\ntype UnwrapTypeList<Types extends readonly AnyType[]> =\n  TsFortressInternal.UnwrapTypeImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type UnwrapTypeImpl<Types extends readonly unknown[]> =\n    Types extends readonly []\n      ? readonly []\n      : Types extends readonly [infer Head, ...infer Tail]\n        ? readonly [TypeOf<Cast1<Head>>, ...UnwrapTypeImpl<Tail>]\n        : never;\n\n  type Cast1<T> = [T] extends [AnyType] ? T : never;\n}\n\nexpectType<\n  TypeOf<\n    Type<\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>\n    >\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n  }>\n>('=');\n\nexpectType<\n  UnwrapTypeList<\n    readonly [\n      Type<\n        Readonly<{\n          a: 0;\n          b: 0;\n        }>\n      >,\n      Type<\n        Readonly<{\n          b: 0;\n          c: 0;\n        }>\n      >,\n    ]\n  >,\n  readonly [\n    Readonly<{\n      a: 0;\n      b: 0;\n    }>,\n    Readonly<{\n      b: 0;\n      c: 0;\n    }>,\n  ]\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 0;\n        c: 0;\n      }>,\n    ]\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n    c: 0;\n  }>\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 0;\n        c: 0;\n      }>,\n      Readonly<{\n        c: 0;\n        d: 0;\n      }>,\n    ]\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n    c: 0;\n    d: 0;\n  }>\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 1;\n        c: 0;\n      }>,\n    ]\n  >,\n  never\n>('=');\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"intersection.mjs","sources":["../../src/compose/intersection.mts"],"sourcesContent":["import { Arr, expectType, hasKey, isRecord, Result, tp } from 'ts-data-forge';\nimport { type Intersection, type NonEmptyTuple } from 'ts-type-forge';\nimport {\n  hasRecordInternals,\n  type AnyType,\n  type ExcessPropertyOption,\n  type Type,\n  type TypeOf,\n} from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  toIntersectionString,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport const intersection = <const Types extends NonEmptyTuple<AnyType>>(\n  types: Types,\n  defaultType: IntersectionType<Types>,\n  options?: Partial<\n    Readonly<{\n      typeName: string;\n    }>\n  >,\n): IntersectionType<Types> => {\n  type T = IntersectionTypeValue<Types>;\n\n  const typeNameFilled: string =\n    options?.typeName ??\n    `(${toIntersectionString(types.map((a) => a.typeName))})`;\n\n  const validate: Type<T>['validate'] = (a) => {\n    const errors: readonly ValidationError[] = Arr.generate(function* () {\n      for (const type of types) {\n        const res = type.validate(a);\n\n        if (Result.isErr(res)) {\n          yield {\n            path: [],\n            actualValue: a,\n            expectedType: typeNameFilled,\n            typeName: typeNameFilled,\n            details: {\n              kind: 'intersection',\n              typeNames: types.map((t) => t.typeName),\n            },\n          } satisfies ValidationError;\n\n          yield* res.value;\n        }\n      }\n    });\n\n    if (Arr.isNonEmpty(errors)) {\n      return Result.err(errors);\n    }\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return Result.ok(a as T);\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : defaultType.fill(a));\n\n  const baseType: Type<T> = {\n    typeName: typeNameFilled,\n    defaultValue: defaultType.defaultValue,\n    fill,\n    // Non-record intersections (e.g. branded primitives) have no excess paths\n    // to remove. Record intersections override this below.\n    prune: (a) => a,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  } as const;\n\n  // If all types are records, add RecordTypeInternals\n  if (types.every(hasRecordInternals)) {\n    const shapeStructures = Arr.map(types, (t) => t.shapeStructure);\n\n    const excessProperty: ExcessPropertyOption = Arr.some(\n      types,\n      (t) => t.excessProperty === 'reject',\n    )\n      ? 'reject'\n      : 'allow';\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return {\n      ...baseType,\n      // A value path is represented by a record intersection if it is\n      // represented by any member, so the pruned members are merged (deeply;\n      // see `mergePruned`). All members are record types here\n      // (`hasRecordInternals`), so each pruned result is a record.\n      prune: (a: T): T =>\n        // eslint-disable-next-line total-functions/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return\n        types.map((t) => t.prune(a)).reduce(mergePruned, {}) as T,\n      shapeStructure: Arr.isFixedLengthTuple(shapeStructures, 1)\n        ? shapeStructures[0]\n        : ({ kind: 'intersection', parts: shapeStructures } as const),\n      excessProperty,\n    } as IntersectionType<Types>;\n  }\n\n  return baseType;\n};\n\n/**\n * Deep-merges the pruned results of intersection members. Each pruned result\n * contains only the value paths represented by its own member type, so the\n * results have to be merged recursively to keep the union of all represented\n * paths — a shallow spread would drop nested paths kept by an earlier member\n * whenever a later member shares the same key (e.g. two members both having a\n * `pos` sub-record with different fields).\n */\nconst mergePruned = (x: unknown, y: unknown): unknown => {\n  if (isRecord(x) && isRecord(y)) {\n    const xMergedWithY = Object.fromEntries(\n      Object.entries(x).map(([k, xv]) =>\n        tp(k, hasKey(y, k) ? mergePruned(xv, y[k]) : xv),\n      ),\n    );\n\n    const yOnly = Object.fromEntries(\n      Object.entries(y).filter(([k]) => !hasKey(x, k)),\n    );\n\n    return { ...xMergedWithY, ...yOnly };\n  }\n\n  // Both members pruned the same input array, so the lengths always match;\n  // merge element-wise to keep every represented element path.\n  if (Arr.isArray(x) && Arr.isArray(y) && x.length === y.length) {\n    return x.map((xi, i) => mergePruned(xi, y[i]));\n  }\n\n  // Not structurally mergeable — the later member wins.\n  return y;\n};\n\ntype IntersectionType<Types extends NonEmptyTuple<AnyType>> = Type<\n  IntersectionTypeValue<Types>\n>;\n\ntype IntersectionTypeValue<Types extends NonEmptyTuple<AnyType>> =\n  TsFortressInternal.IntersectionTypeValueImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type IntersectionTypeValueImpl<Types extends NonEmptyTuple<AnyType>> =\n    Intersection<Cast0<UnwrapTypeList<Types>>>;\n\n  type Cast0<T> = readonly [T] extends readonly [NonEmptyTuple<unknown>]\n    ? T\n    : never;\n}\n\nexpectType<\n  IntersectionType<\n    readonly [\n      Type<\n        Readonly<{\n          a: 0;\n          b: 0;\n        }>\n      >,\n      Type<\n        Readonly<{\n          b: 0;\n          c: 0;\n        }>\n      >,\n    ]\n  >,\n  Type<\n    Readonly<{\n      a: 0;\n      b: 0;\n      c: 0;\n    }>\n  >\n>('=');\n\ntype UnwrapTypeList<Types extends readonly AnyType[]> =\n  TsFortressInternal.UnwrapTypeImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type UnwrapTypeImpl<Types extends readonly unknown[]> =\n    Types extends readonly []\n      ? readonly []\n      : Types extends readonly [infer Head, ...infer Tail]\n        ? readonly [TypeOf<Cast1<Head>>, ...UnwrapTypeImpl<Tail>]\n        : never;\n\n  type Cast1<T> = [T] extends [AnyType] ? T : never;\n}\n\nexpectType<\n  TypeOf<\n    Type<\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>\n    >\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n  }>\n>('=');\n\nexpectType<\n  UnwrapTypeList<\n    readonly [\n      Type<\n        Readonly<{\n          a: 0;\n          b: 0;\n        }>\n      >,\n      Type<\n        Readonly<{\n          b: 0;\n          c: 0;\n        }>\n      >,\n    ]\n  >,\n  readonly [\n    Readonly<{\n      a: 0;\n      b: 0;\n    }>,\n    Readonly<{\n      b: 0;\n      c: 0;\n    }>,\n  ]\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 0;\n        c: 0;\n      }>,\n    ]\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n    c: 0;\n  }>\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 0;\n        c: 0;\n      }>,\n      Readonly<{\n        c: 0;\n        d: 0;\n      }>,\n    ]\n  >,\n  Readonly<{\n    a: 0;\n    b: 0;\n    c: 0;\n    d: 0;\n  }>\n>('=');\n\nexpectType<\n  Intersection<\n    readonly [\n      Readonly<{\n        a: 0;\n        b: 0;\n      }>,\n      Readonly<{\n        b: 1;\n        c: 0;\n      }>,\n    ]\n  >,\n  never\n>('=');\n"],"names":[],"mappings":"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"}

package/dist/compose/union.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"union.d.mts","sourceRoot":"","sources":["../../src/compose/union.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAEL,KAAK,OAAO,EAEZ,KAAK,IAAI,EACT,KAAK,MAAM,EACZ,MAAM,aAAa,CAAC;AASrB,eAAO,MAAM,KAAK,GAAI,KAAK,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,SACvD,KAAK,YACF,OAAO,CACf,QAAQ,CAAC;IACP,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;CAC/B,CAAC,CACH,KACA,SAAS,CAAC,KAAK,CA6EjB,CAAC;AAEF,KAAK,SAAS,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IAAI,IAAI,CACzD,cAAc,CAAC,KAAK,CAAC,CACtB,CAAC;AAEF,KAAK,cAAc,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IACtD,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE/C,kBAAU,kBAAkB,CAAC;IAC3B,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IACjE,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAEnC,KAAK,WAAW,CAAC,CAAC,SAAS,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;;CACvE"}
+{"version":3,"file":"union.d.mts","sourceRoot":"","sources":["../../src/compose/union.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAKL,KAAK,OAAO,EAEZ,KAAK,IAAI,EACT,KAAK,MAAM,EAEZ,MAAM,aAAa,CAAC;AAWrB,eAAO,MAAM,KAAK,GAAI,KAAK,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,SACvD,KAAK,YACF,OAAO,CACf,QAAQ,CAAC;IACP,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;CAC/B,CAAC,CACH,KACA,SAAS,CAAC,KAAK,CA0KjB,CAAC;AA0EF,KAAK,SAAS,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IAAI,IAAI,CACzD,cAAc,CAAC,KAAK,CAAC,CACtB,CAAC;AAEF,KAAK,cAAc,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IACtD,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE/C,kBAAU,kBAAkB,CAAC;IAC3B,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,aAAa,CAAC,OAAO,CAAC,IACjE,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAEnC,KAAK,WAAW,CAAC,CAAC,SAAS,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;;CACvE"}

package/dist/compose/union.mjs

@@ -1,8 +1,9 @@
 import { memoizeFunction, Arr, Result } from 'ts-data-forge';
-import { hasRecordInternals } from '../type.mjs';
+import { hasUnionInternals, hasRecordInternals, flattenShapeStructure, hasTupleInternals } from '../type.mjs';
 import { createAssertFn } from '../utils/create-assert-fn.mjs';
 import { createCastFn } from '../utils/create-cast-fn.mjs';
 import { createIsFn } from '../utils/create-is-fn.mjs';
+import { UNION_MEMBER_LISTING_MAX_LENGTH, runtimeTypeNameOf } from '../utils/validation-error.mjs';
 import { toUnionString } from '../utils/to-union-string.mjs';
 
 const union = (types, options) => {
@@ -10,25 +11,74 @@ const union = (types, options) => {
     () => options?.defaultType ?? types[0]
   );
   const typeNameFilled = options?.typeName ?? `(${toUnionString(types.map((a) => a.typeName))})`;
-  const validate = (a) => types.some((t) => t.is(a)) ? (
-    // eslint-disable-next-line total-functions/no-unsafe-type-assertion
-    Result.ok(a)
-  ) : Result.err([
-    {
-      path: [],
-      actualValue: a,
-      expectedType: typeNameFilled,
-      typeName: typeNameFilled,
-      details: {
-        kind: "union",
-        typeNames: types.map((t) => t.typeName)
-      }
+  const memberTypes = types.flatMap(
+    (t) => hasUnionInternals(t) ? t.memberTypes : [t]
+  );
+  const validate = (a) => {
+    if (memberTypes.some((t) => t.is(a))) {
+      return Result.ok(a);
+    }
+    const memberTypeNames = types.map((t) => t.typeName);
+    if (toUnionString(memberTypeNames).length <= UNION_MEMBER_LISTING_MAX_LENGTH) {
+      return Result.err([
+        {
+          path: [],
+          actualValue: a,
+          expectedType: typeNameFilled,
+          typeName: typeNameFilled,
+          details: {
+            kind: "union",
+            typeNames: memberTypeNames
+          }
+        }
+      ]);
+    }
+    const actualCategory = runtimeTypeNameOf(a);
+    const candidates = memberTypes.filter((t) => runtimeTypeNameOf(t.defaultValue) === actualCategory).map((t) => evaluateMember(t, a));
+    if (!Arr.isNonEmpty(candidates)) {
+      return Result.err([
+        {
+          path: [],
+          actualValue: a,
+          expectedType: typeNameFilled,
+          typeName: typeNameFilled,
+          details: {
+            kind: "union-category-mismatch",
+            memberCount: memberTypes.length,
+            memberCategories: Arr.uniq(
+              memberTypes.map((t) => runtimeTypeNameOf(t.defaultValue))
+            )
+          }
+        }
+      ]);
     }
-  ]);
+    const closest = Arr.minBy(
+      candidates,
+      (candidate) => candidate,
+      compareByCloseness
+    ).value;
+    const equallyClose = candidates.filter(
+      (c) => c !== closest && compareByCloseness(c, closest) === 0
+    );
+    return Result.err(
+      Arr.toUnshifted({
+        path: [],
+        actualValue: a,
+        expectedType: typeNameFilled,
+        typeName: typeNameFilled,
+        details: {
+          kind: "union-closest-member",
+          memberCount: memberTypes.length,
+          closestMemberTypeName: closest.typeName,
+          equallyCloseMemberTypeNames: equallyClose.map((c) => c.typeName)
+        }
+      })(closest.errors)
+    );
+  };
   const is = createIsFn(validate);
   const fill = (a) => is(a) ? a : getDefaultType().fill(a);
   const prune = (a) => {
-    const matched = types.find((t) => t.is(a));
+    const matched = memberTypes.find((t) => t.is(a));
     return matched === void 0 ? a : (
       // eslint-disable-next-line total-functions/no-unsafe-type-assertion
       matched.prune(a)
@@ -44,7 +94,9 @@ const union = (types, options) => {
     validate,
     is,
     assertIs: createAssertFn(validate),
-    cast: createCastFn(validate)
+    cast: createCastFn(validate),
+    // Lets a union that takes this one as a member flatten it in.
+    memberTypes
   };
   if (types.every(hasRecordInternals)) {
     const shapeStructures = Arr.map(types, (t) => t.shapeStructure);
@@ -60,6 +112,31 @@ const union = (types, options) => {
   }
   return baseType;
 };
+const evaluateMember = (memberType, a) => {
+  const errors = validationErrorsOf(memberType.validate(a));
+  const satisfiedCheckCount = Math.max(
+    0,
+    checkCountOf(memberType) - errors.length
+  );
+  return {
+    typeName: memberType.typeName,
+    errors,
+    satisfiedCheckCount,
+    score: errors.length - satisfiedCheckCount
+  };
+};
+const compareByCloseness = (x, y) => x.score !== y.score ? x.score - y.score : y.satisfiedCheckCount - x.satisfiedCheckCount;
+const checkCountOf = (memberType) => {
+  if (hasRecordInternals(memberType)) {
+    const shape = flattenShapeStructure(memberType.shapeStructure);
+    return shape === void 0 ? 1 : Object.keys(shape).length;
+  }
+  if (hasTupleInternals(memberType)) {
+    return memberType.elementTypes.length;
+  }
+  return 1;
+};
+const validationErrorsOf = (result) => Result.isErr(result) ? result.value : [];
 
 export { union };
 //# sourceMappingURL=union.mjs.map

package/dist/compose/union.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"union.mjs","sources":["../../src/compose/union.mts"],"sourcesContent":["import { Arr, Result, expectType, memoizeFunction } from 'ts-data-forge';\nimport { type ArrayElement, type NonEmptyTuple } from 'ts-type-forge';\nimport {\n  hasRecordInternals,\n  type AnyType,\n  type ExcessPropertyOption,\n  type Type,\n  type TypeOf,\n} from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  toUnionString,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport const union = <const Types extends NonEmptyTuple<AnyType>>(\n  types: Types,\n  options?: Partial<\n    Readonly<{\n      typeName: string;\n      defaultType: UnionType<Types>;\n    }>\n  >,\n): UnionType<Types> => {\n  type T = UnionTypeValue<Types>;\n\n  const getDefaultType = memoizeFunction(\n    (): UnionType<Types> =>\n      options?.defaultType ?? (types[0] as UnionType<Types>),\n  );\n\n  const typeNameFilled: string =\n    options?.typeName ?? `(${toUnionString(types.map((a) => a.typeName))})`;\n\n  const validate: Type<T>['validate'] = (a) =>\n    types.some((t) => t.is(a))\n      ? // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n        Result.ok(a as T)\n      : Result.err([\n          {\n            path: [],\n            actualValue: a,\n            expectedType: typeNameFilled,\n            typeName: typeNameFilled,\n            details: {\n              kind: 'union',\n              typeNames: types.map((t) => t.typeName),\n            },\n          } satisfies ValidationError,\n        ]);\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : getDefaultType().fill(a));\n\n  // Prunes with the first member type that matches the value.\n  const prune = (a: T): T => {\n    const matched = types.find((t) => t.is(a));\n\n    return matched === undefined\n      ? a\n      : // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n        (matched.prune(a) as T);\n  };\n\n  const baseType: Type<T> = {\n    typeName: typeNameFilled,\n    get defaultValue() {\n      return getDefaultType().defaultValue;\n    },\n    fill,\n    prune,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  } as const;\n\n  // If all types are records, add RecordTypeInternals with union structure\n  if (types.every(hasRecordInternals)) {\n    const shapeStructures = Arr.map(types, (t) => t.shapeStructure);\n\n    const excessProperty: ExcessPropertyOption = Arr.some(\n      types,\n      (t) => t.excessProperty === 'reject',\n    )\n      ? 'reject'\n      : 'allow';\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return {\n      ...baseType,\n      shapeStructure: Arr.isFixedLengthTuple(shapeStructures, 1)\n        ? shapeStructures[0]\n        : ({ kind: 'union', variants: shapeStructures } as const),\n      excessProperty,\n    } as UnionType<Types>;\n  }\n\n  return baseType;\n};\n\ntype UnionType<Types extends NonEmptyTuple<AnyType>> = Type<\n  UnionTypeValue<Types>\n>;\n\ntype UnionTypeValue<Types extends NonEmptyTuple<AnyType>> =\n  TsFortressInternal.UnionTypeValueImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type UnionTypeValueImpl<Types extends NonEmptyTuple<AnyType>> =\n    UnwrapUnion<ArrayElement<Types>>;\n\n  type UnwrapUnion<T extends AnyType> = T extends T ? TypeOf<T> : never;\n}\n\nexpectType<\n  UnionType<\n    readonly [Type<Readonly<{ a: 0; b: 0 }>>, Type<Readonly<{ b: 0; c: 0 }>>]\n  >,\n  Type<Readonly<{ a: 0; b: 0 } | { b: 0; c: 0 }>>\n>('=');\n\nexpectType<\n  UnionType<\n    readonly [\n      Type<Readonly<{ a: 0; b: 0 }>>,\n      Type<Readonly<{ b: 0; c: 0 }>>,\n      Type<Readonly<{ e: 0; f: 0 }>>,\n    ]\n  >,\n  Type<Readonly<{ a: 0; b: 0 } | { b: 0; c: 0 } | { e: 0; f: 0 }>>\n>('=');\n"],"names":[],"mappings":";;;;;;;MAiBa,KAAA,GAAQ,CACnB,KAAA,EACA,OAAA,KAMqB;AAGrB,EAAA,MAAM,cAAA,GAAiB,eAAA;AAAA,IACrB,MACE,OAAA,EAAS,WAAA,IAAgB,KAAA,CAAM,CAAC;AAAA,GACpC;AAEA,EAAA,MAAM,cAAA,GACJ,OAAA,EAAS,QAAA,IAAY,CAAA,CAAA,EAAI,aAAA,CAAc,KAAA,CAAM,GAAA,CAAI,CAAC,CAAA,KAAM,CAAA,CAAE,QAAQ,CAAC,CAAC,CAAA,CAAA,CAAA;AAEtE,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KACrC,KAAA,CAAM,IAAA,CAAK,CAAC,CAAA,KAAM,CAAA,CAAE,EAAA,CAAG,CAAC,CAAC,CAAA;AAAA;AAAA,IAErB,MAAA,CAAO,GAAG,CAAM;AAAA,MAChB,OAAO,GAAA,CAAI;AAAA,IACT;AAAA,MACE,MAAM,EAAC;AAAA,MACP,WAAA,EAAa,CAAA;AAAA,MACb,YAAA,EAAc,cAAA;AAAA,MACd,QAAA,EAAU,cAAA;AAAA,MACV,OAAA,EAAS;AAAA,QACP,IAAA,EAAM,OAAA;AAAA,QACN,WAAW,KAAA,CAAM,GAAA,CAAI,CAAC,CAAA,KAAM,EAAE,QAAQ;AAAA;AACxC;AACF,GACD,CAAA;AAEP,EAAA,MAAM,EAAA,GAAK,WAAc,QAAQ,CAAA;AAEjC,EAAA,MAAM,IAAA,GAAwB,CAAC,CAAA,KAAO,EAAA,CAAG,CAAC,IAAI,CAAA,GAAI,cAAA,EAAe,CAAE,IAAA,CAAK,CAAC,CAAA;AAGzE,EAAA,MAAM,KAAA,GAAQ,CAAC,CAAA,KAAY;AACzB,IAAA,MAAM,OAAA,GAAU,MAAM,IAAA,CAAK,CAAC,MAAM,CAAA,CAAE,EAAA,CAAG,CAAC,CAAC,CAAA;AAEzC,IAAA,OAAO,YAAY,MAAA,GACf,CAAA;AAAA;AAAA,MAEC,OAAA,CAAQ,MAAM,CAAC;AAAA,KAAA;AAAA,EAAA,CACtB;AAEA,EAAA,MAAM,QAAA,GAAoB;AAAA,IACxB,QAAA,EAAU,cAAA;AAAA,IACV,IAAI,YAAA,GAAe;AACjB,MAAA,OAAO,gBAAe,CAAE,YAAA;AAAA,IAAA,CAC1B;AAAA,IACA,IAAA;AAAA,IACA,KAAA;AAAA,IACA,QAAA;AAAA,IACA,EAAA;AAAA,IACA,QAAA,EAAU,eAAe,QAAQ,CAAA;AAAA,IACjC,IAAA,EAAM,aAAa,QAAQ;AAAA,GAC7B;AAGA,EAAA,IAAI,KAAA,CAAM,KAAA,CAAM,kBAAkB,CAAA,EAAG;AACnC,IAAA,MAAM,kBAAkB,GAAA,CAAI,GAAA,CAAI,OAAO,CAAC,CAAA,KAAM,EAAE,cAAc,CAAA;AAE9D,IAAA,MAAM,iBAAuC,GAAA,CAAI,IAAA;AAAA,MAC/C,KAAA;AAAA,MACA,CAAC,CAAA,KAAM,CAAA,CAAE,cAAA,KAAmB;AAAA,QAE1B,QAAA,GACA,OAAA;AAGJ,IAAA,OAAO;AAAA,MACL,GAAG,QAAA;AAAA,MACH,cAAA,EAAgB,GAAA,CAAI,kBAAA,CAAmB,eAAA,EAAiB,CAAC,CAAA,GACrD,eAAA,CAAgB,CAAC,CAAA,GAChB,EAAE,IAAA,EAAM,OAAA,EAAS,UAAU,eAAA,EAAgB;AAAA,MAChD;AAAA,KACF;AAAA,EAAA;AAGF,EAAA,OAAO,QAAA;AACT;;;;"}
+{"version":3,"file":"union.mjs","sources":["../../src/compose/union.mts"],"sourcesContent":["import { Arr, expectType, memoizeFunction, Result } from 'ts-data-forge';\nimport { type ArrayElement, type NonEmptyTuple } from 'ts-type-forge';\nimport {\n  flattenShapeStructure,\n  hasRecordInternals,\n  hasTupleInternals,\n  hasUnionInternals,\n  type AnyType,\n  type ExcessPropertyOption,\n  type Type,\n  type TypeOf,\n  type UnionTypeInternals,\n} from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  runtimeTypeNameOf,\n  toUnionString,\n  UNION_MEMBER_LISTING_MAX_LENGTH,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport const union = <const Types extends NonEmptyTuple<AnyType>>(\n  types: Types,\n  options?: Partial<\n    Readonly<{\n      typeName: string;\n      defaultType: UnionType<Types>;\n    }>\n  >,\n): UnionType<Types> => {\n  type T = UnionTypeValue<Types>;\n\n  const getDefaultType = memoizeFunction(\n    (): UnionType<Types> =>\n      options?.defaultType ?? (types[0] as UnionType<Types>),\n  );\n\n  const typeNameFilled: string =\n    options?.typeName ?? `(${toUnionString(types.map((a) => a.typeName))})`;\n\n  /**\n   * A union nested directly inside this one contributes its own members\n   * instead of itself. `A | (B | C)` and `A | B | C` describe the same set of\n   * values, so this changes nothing about what the union accepts.\n   *\n   * It was introduced for the error path. Reporting the member closest to a\n   * rejected value starts by filing each member under a single runtime type\n   * category, taken from its default value — and a nested union has only one\n   * default value. Unflattened, `union([union([literal('alpha'), literal(42)]),\n   * ...])` is filed under `string`, so validating `41` finds no candidate at\n   * all and the union falls back to listing the categories it accepts.\n   * Flattened, the `42` member competes on its own and is reported.\n   *\n   * Two things deliberately stay unflattened: `typeName` and the member\n   * listing use the members as they were written, so a nested union that\n   * carries a name of its own keeps it; and a `recursion` member answers\n   * {@link hasUnionInternals} without running its definition, so a type\n   * defined in terms of itself stays a single opaque member.\n   *\n   * See `documents/union-closest-member-heuristic.md`.\n   */\n  const memberTypes: readonly AnyType[] = types.flatMap((t) =>\n    hasUnionInternals(t) ? t.memberTypes : [t],\n  );\n\n  const validate: Type<T>['validate'] = (a) => {\n    if (memberTypes.some((t) => t.is(a))) {\n      // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n      return Result.ok(a as T);\n    }\n\n    const memberTypeNames = types.map((t) => t.typeName);\n\n    if (\n      toUnionString(memberTypeNames).length <= UNION_MEMBER_LISTING_MAX_LENGTH\n    ) {\n      return Result.err([\n        {\n          path: [],\n          actualValue: a,\n          expectedType: typeNameFilled,\n          typeName: typeNameFilled,\n          details: {\n            kind: 'union',\n            typeNames: memberTypeNames,\n          },\n        } satisfies ValidationError,\n      ]);\n    }\n\n    // The member listing is too long to be a readable error message, so\n    // narrow the report down to the members whose runtime type category\n    // (derived from each member's default value) matches the value.\n    const actualCategory = runtimeTypeNameOf(a);\n\n    const candidates = memberTypes\n      .filter((t) => runtimeTypeNameOf(t.defaultValue) === actualCategory)\n      .map((t) => evaluateMember(t, a));\n\n    if (!Arr.isNonEmpty(candidates)) {\n      return Result.err([\n        {\n          path: [],\n          actualValue: a,\n          expectedType: typeNameFilled,\n          typeName: typeNameFilled,\n          details: {\n            kind: 'union-category-mismatch',\n            memberCount: memberTypes.length,\n            memberCategories: Arr.uniq(\n              memberTypes.map((t) => runtimeTypeNameOf(t.defaultValue)),\n            ),\n          },\n        } satisfies ValidationError,\n      ]);\n    }\n\n    // The closest member is the one with the lowest similarity score (see\n    // `evaluateMember`); its errors explain the mismatch far better than the\n    // full member listing would. Members that tie with it are named alongside\n    // it, and the first of them (in declaration order, as in `prune` and\n    // `fill`) is the one whose errors are reported.\n    const closest = Arr.minBy(\n      candidates,\n      (candidate) => candidate,\n      compareByCloseness,\n    ).value;\n\n    const equallyClose = candidates.filter(\n      (c) => c !== closest && compareByCloseness(c, closest) === 0,\n    );\n\n    return Result.err(\n      Arr.toUnshifted({\n        path: [],\n        actualValue: a,\n        expectedType: typeNameFilled,\n        typeName: typeNameFilled,\n        details: {\n          kind: 'union-closest-member',\n          memberCount: memberTypes.length,\n          closestMemberTypeName: closest.typeName,\n          equallyCloseMemberTypeNames: equallyClose.map((c) => c.typeName),\n        },\n      } satisfies ValidationError)(closest.errors),\n    );\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : getDefaultType().fill(a));\n\n  // Prunes with the first member type that matches the value.\n  const prune = (a: T): T => {\n    const matched = memberTypes.find((t) => t.is(a));\n\n    return matched === undefined\n      ? a\n      : // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n        (matched.prune(a) as T);\n  };\n\n  const baseType = {\n    typeName: typeNameFilled,\n    get defaultValue() {\n      return getDefaultType().defaultValue;\n    },\n    fill,\n    prune,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n    // Lets a union that takes this one as a member flatten it in.\n    memberTypes,\n  } as const satisfies Type<T> & UnionTypeInternals;\n\n  // If all types are records, add RecordTypeInternals with union structure\n  if (types.every(hasRecordInternals)) {\n    const shapeStructures = Arr.map(types, (t) => t.shapeStructure);\n\n    const excessProperty: ExcessPropertyOption = Arr.some(\n      types,\n      (t) => t.excessProperty === 'reject',\n    )\n      ? 'reject'\n      : 'allow';\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return {\n      ...baseType,\n      shapeStructure: Arr.isFixedLengthTuple(shapeStructures, 1)\n        ? shapeStructures[0]\n        : ({ kind: 'union', variants: shapeStructures } as const),\n      excessProperty,\n    } as UnionType<Types>;\n  }\n\n  return baseType as UnionType<Types>;\n};\n\n/**\n * How close a member is to a value it rejected.\n *\n * `score` is the number of checks the member failed minus the number it\n * passed, so a member is credited for what the value does satisfy. Plain error\n * counting would let a small unrelated member (one missing key) outrank a large\n * member the value nearly satisfies (two wrong fields out of ten), while a\n * ratio would do the opposite and let a large member win with a long list of\n * errors just because it also has many keys. Subtracting keeps both the failed\n * and the passed checks in absolute terms.\n *\n * Members with the same score are ordered by how much they satisfied, so the\n * one that recognized more of the value comes first.\n *\n * See `documents/union-closest-member-heuristic.md` for the scenarios these\n * rules were chosen against.\n */\ntype MemberCloseness = Readonly<{\n  typeName: string;\n  errors: readonly ValidationError[];\n  satisfiedCheckCount: number;\n  score: number;\n}>;\n\nconst evaluateMember = (memberType: AnyType, a: unknown): MemberCloseness => {\n  const errors = validationErrorsOf(memberType.validate(a));\n\n  // A member cannot pass fewer than zero checks: a record that rejects excess\n  // properties can report more errors than it has keys.\n  const satisfiedCheckCount = Math.max(\n    0,\n    checkCountOf(memberType) - errors.length,\n  );\n\n  return {\n    typeName: memberType.typeName,\n    errors,\n    satisfiedCheckCount,\n    score: errors.length - satisfiedCheckCount,\n  };\n};\n\nconst compareByCloseness = (x: MemberCloseness, y: MemberCloseness): number =>\n  x.score !== y.score\n    ? x.score - y.score\n    : y.satisfiedCheckCount - x.satisfiedCheckCount;\n\n/**\n * How many checks a member performs on a value: one per key for a record, one\n * per element for a tuple, and a single check for everything else, which either\n * matches or does not. A record whose shape cannot be flattened to a single set\n * of keys (a union of shapes) also counts as one check.\n */\nconst checkCountOf = (memberType: AnyType): number => {\n  if (hasRecordInternals(memberType)) {\n    const shape = flattenShapeStructure(memberType.shapeStructure);\n\n    return shape === undefined ? 1 : Object.keys(shape).length;\n  }\n\n  if (hasTupleInternals(memberType)) {\n    return memberType.elementTypes.length;\n  }\n\n  return 1;\n};\n\nconst validationErrorsOf = (\n  result: Result<unknown, readonly ValidationError[]>,\n): readonly ValidationError[] =>\n  Result.isErr(result) ? result.value : ([] as const);\n\ntype UnionType<Types extends NonEmptyTuple<AnyType>> = Type<\n  UnionTypeValue<Types>\n>;\n\ntype UnionTypeValue<Types extends NonEmptyTuple<AnyType>> =\n  TsFortressInternal.UnionTypeValueImpl<Types>;\n\nnamespace TsFortressInternal {\n  export type UnionTypeValueImpl<Types extends NonEmptyTuple<AnyType>> =\n    UnwrapUnion<ArrayElement<Types>>;\n\n  type UnwrapUnion<T extends AnyType> = T extends T ? TypeOf<T> : never;\n}\n\nexpectType<\n  UnionType<\n    readonly [Type<Readonly<{ a: 0; b: 0 }>>, Type<Readonly<{ b: 0; c: 0 }>>]\n  >,\n  Type<Readonly<{ a: 0; b: 0 } | { b: 0; c: 0 }>>\n>('=');\n\nexpectType<\n  UnionType<\n    readonly [\n      Type<Readonly<{ a: 0; b: 0 }>>,\n      Type<Readonly<{ b: 0; c: 0 }>>,\n      Type<Readonly<{ e: 0; f: 0 }>>,\n    ]\n  >,\n  Type<Readonly<{ a: 0; b: 0 } | { b: 0; c: 0 } | { e: 0; f: 0 }>>\n>('=');\n"],"names":[],"mappings":"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"}

package/dist/entry-point.mjs

@@ -16,7 +16,9 @@ export { brandedString, simpleBrandedString } from './brand/branded-string.mjs';
 export { intersection } from './compose/intersection.mjs';
 export { union } from './compose/union.mjs';
 export { enumType } from './enum/enum.mjs';
+export { intRangeInclusive } from './enum/int-range-inclusive.mjs';
 export { intRange } from './enum/int-range.mjs';
+export { uintRangeInclusive } from './enum/uint-range-inclusive.mjs';
 export { uintRange } from './enum/uint-range.mjs';
 export { literal } from './other-types/literal.mjs';
 export { MapType } from './other-types/map.mjs';
@@ -81,5 +83,5 @@ export { createIsFn } from './utils/create-is-fn.mjs';
 export { createPrimitiveType } from './utils/create-primitive-type.mjs';
 export { createType } from './utils/create-type.mjs';
 export { toIntersectionString, toUnionKeyString, toUnionString } from './utils/to-union-string.mjs';
-export { createPrimitiveValidationError, prependIndexToValidationErrors, prependPathToValidationErrors, validationErrorToMessage, validationErrorsToMessages } from './utils/validation-error.mjs';
+export { UNION_MEMBER_LISTING_MAX_LENGTH, createPrimitiveValidationError, prependIndexToValidationErrors, prependPathToValidationErrors, runtimeTypeNameOf, validationErrorToMessage, validationErrorsToMessages } from './utils/validation-error.mjs';
 //# sourceMappingURL=entry-point.mjs.map

package/dist/entry-point.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"entry-point.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"entry-point.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/enum/index.d.mts

@@ -1,4 +1,6 @@
 export * from './enum.mjs';
+export * from './int-range-inclusive.mjs';
 export * from './int-range.mjs';
+export * from './uint-range-inclusive.mjs';
 export * from './uint-range.mjs';
 //# sourceMappingURL=index.d.mts.map

package/dist/enum/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/enum/index.mts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/enum/index.mts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC"}

package/dist/enum/index.mjs

@@ -1,4 +1,6 @@
 export { enumType } from './enum.mjs';
+export { intRangeInclusive } from './int-range-inclusive.mjs';
 export { intRange } from './int-range.mjs';
+export { uintRangeInclusive } from './uint-range-inclusive.mjs';
 export { uintRange } from './uint-range.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/enum/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/enum/int-range-inclusive.d.mts

@@ -0,0 +1,13 @@
+import { type Int11, type IntRangeInclusive } from 'ts-type-forge';
+import { type Type } from '../type.mjs';
+export type { IntRangeInclusive } from 'ts-type-forge';
+export declare const intRangeInclusive: <Start extends Int11, End extends Int11>(...args: readonly [start: Start, end: End, options?: Readonly<{
+    typeName?: string;
+    defaultValue?: IntRangeInclusive<Start, End>;
+}>] | readonly [options: Readonly<{
+    start: Start;
+    end: End;
+    typeName?: string;
+    defaultValue?: IntRangeInclusive<Start, End>;
+}>]) => Type<IntRangeInclusive<Start, End>>;
+//# sourceMappingURL=int-range-inclusive.d.mts.map

package/dist/enum/int-range-inclusive.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"int-range-inclusive.d.mts","sourceRoot":"","sources":["../../src/enum/int-range-inclusive.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAQxC,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAO,MAAM,iBAAiB,GAAI,KAAK,SAAS,KAAK,EAAE,GAAG,SAAS,KAAK,WAElE,SAAS,CACP,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CAC9C,CAAC,CACH,GACD,SAAS,CACP,OAAO,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CAC9C,CAAC,CACH,KACJ,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CAcpC,CAAC"}

package/dist/enum/int-range-inclusive.mjs

@@ -0,0 +1,61 @@
+import { memoizeFunction, isNumber, Num, Result } from 'ts-data-forge';
+import { createAssertFn } from '../utils/create-assert-fn.mjs';
+import { createCastFn } from '../utils/create-cast-fn.mjs';
+import { createIsFn } from '../utils/create-is-fn.mjs';
+import '@sindresorhus/is';
+
+const intRangeInclusive = (...args) => {
+  switch (args.length) {
+    case 1:
+      return intRangeInclusiveImpl(args[0].start, args[0].end, {
+        defaultValue: args[0].defaultValue,
+        typeName: args[0].typeName
+      });
+    case 2:
+      return intRangeInclusiveImpl(args[0], args[1]);
+    case 3:
+      return intRangeInclusiveImpl(args[0], args[1], args[2]);
+  }
+};
+const intRangeInclusiveImpl = (start, end, options) => {
+  const typeNameFilled = options?.typeName ?? `intRangeInclusive(${start}, ${end})`;
+  const getDefaultValue = memoizeFunction(
+    // eslint-disable-next-line total-functions/no-unsafe-type-assertion
+    () => options?.defaultValue ?? start
+  );
+  const validate = (a) => {
+    if (!(isNumber(a) && Number.isSafeInteger(a) && Num.isInRangeInclusive(start, end)(a))) {
+      return Result.err([
+        {
+          path: [],
+          actualValue: a,
+          expectedType: typeNameFilled,
+          typeName: typeNameFilled,
+          details: {
+            kind: "integer-range-inclusive",
+            start,
+            endInclusive: end
+          }
+        }
+      ]);
+    }
+    return Result.ok(a);
+  };
+  const is = createIsFn(validate);
+  const fill = (a) => is(a) ? a : getDefaultValue();
+  return {
+    typeName: typeNameFilled,
+    get defaultValue() {
+      return getDefaultValue();
+    },
+    fill,
+    prune: (a) => a,
+    validate,
+    is,
+    assertIs: createAssertFn(validate),
+    cast: createCastFn(validate)
+  };
+};
+
+export { intRangeInclusive };
+//# sourceMappingURL=int-range-inclusive.mjs.map

package/dist/enum/int-range-inclusive.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"int-range-inclusive.mjs","sources":["../../src/enum/int-range-inclusive.mts"],"sourcesContent":["import { isNumber, memoizeFunction, Num, Result } from 'ts-data-forge';\nimport { type Int11, type IntRangeInclusive } from 'ts-type-forge';\nimport { type Type } from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport type { IntRangeInclusive } from 'ts-type-forge';\n\nexport const intRangeInclusive = <Start extends Int11, End extends Int11>(\n  ...args:\n    | readonly [\n        start: Start,\n        end: End,\n        options?: Readonly<{\n          typeName?: string;\n          defaultValue?: IntRangeInclusive<Start, End>;\n        }>,\n      ]\n    | readonly [\n        options: Readonly<{\n          start: Start;\n          end: End;\n          typeName?: string;\n          defaultValue?: IntRangeInclusive<Start, End>;\n        }>,\n      ]\n): Type<IntRangeInclusive<Start, End>> => {\n  switch (args.length) {\n    case 1:\n      return intRangeInclusiveImpl(args[0].start, args[0].end, {\n        defaultValue: args[0].defaultValue,\n        typeName: args[0].typeName,\n      });\n\n    case 2:\n      return intRangeInclusiveImpl(args[0], args[1]);\n\n    case 3:\n      return intRangeInclusiveImpl(args[0], args[1], args[2]);\n  }\n};\n\nconst intRangeInclusiveImpl = <Start extends Int11, End extends Int11>(\n  start: Start,\n  end: End,\n  options?: Readonly<{\n    typeName?: string;\n    defaultValue?: IntRangeInclusive<Start, End>;\n  }>,\n): Type<IntRangeInclusive<Start, End>> => {\n  type T = IntRangeInclusive<Start, End>;\n\n  const typeNameFilled =\n    options?.typeName ?? `intRangeInclusive(${start}, ${end})`;\n\n  const getDefaultValue = memoizeFunction(\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    (): T => options?.defaultValue ?? (start as T),\n  );\n\n  const validate: Type<T>['validate'] = (a) => {\n    if (!(\n      isNumber(a) &&\n      Number.isSafeInteger(a) &&\n      Num.isInRangeInclusive(start, end)(a)\n    )) {\n      return Result.err([\n        {\n          path: [],\n          actualValue: a,\n          expectedType: typeNameFilled,\n          typeName: typeNameFilled,\n          details: {\n            kind: 'integer-range-inclusive',\n            start,\n            endInclusive: end,\n          },\n        } satisfies ValidationError,\n      ]);\n    }\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return Result.ok(a as T);\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : getDefaultValue());\n\n  return {\n    typeName: typeNameFilled,\n    get defaultValue() {\n      return getDefaultValue();\n    },\n    fill,\n    prune: (a) => a,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  };\n};\n"],"names":[],"mappings":";;;;;;AAYO,MAAM,iBAAA,GAAoB,IAC5B,IAAA,KAiBqC;AACxC,EAAA,QAAQ,KAAK,MAAA;AAAQ,IACnB,KAAK,CAAA;AACH,MAAA,OAAO,qBAAA,CAAsB,KAAK,CAAC,CAAA,CAAE,OAAO,IAAA,CAAK,CAAC,EAAE,GAAA,EAAK;AAAA,QACvD,YAAA,EAAc,IAAA,CAAK,CAAC,CAAA,CAAE,YAAA;AAAA,QACtB,QAAA,EAAU,IAAA,CAAK,CAAC,CAAA,CAAE;AAAA,OACnB,CAAA;AAAA,IAEH,KAAK,CAAA;AACH,MAAA,OAAO,sBAAsB,IAAA,CAAK,CAAC,CAAA,EAAG,IAAA,CAAK,CAAC,CAAC,CAAA;AAAA,IAE/C,KAAK,CAAA;AACH,MAAA,OAAO,qBAAA,CAAsB,KAAK,CAAC,CAAA,EAAG,KAAK,CAAC,CAAA,EAAG,IAAA,CAAK,CAAC,CAAC,CAAA;AAAA;AAE5D;AAEA,MAAM,qBAAA,GAAwB,CAC5B,KAAA,EACA,GAAA,EACA,OAAA,KAIwC;AAGxC,EAAA,MAAM,iBACJ,OAAA,EAAS,QAAA,IAAY,CAAA,kBAAA,EAAqB,KAAK,KAAK,GAAG,CAAA,CAAA,CAAA;AAEzD,EAAA,MAAM,eAAA,GAAkB,eAAA;AAAA;AAAA,IAEtB,MAAS,SAAS,YAAA,IAAiB;AAAA,GACrC;AAEA,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KAAM;AAC3C,IAAA,IAAI,EACF,QAAA,CAAS,CAAC,CAAA,IACV,OAAO,aAAA,CAAc,CAAC,CAAA,IACtB,GAAA,CAAI,kBAAA,CAAmB,KAAA,EAAO,GAAG,CAAA,CAAE,CAAC,CAAA,CAAA,EACnC;AACD,MAAA,OAAO,OAAO,GAAA,CAAI;AAAA,QAChB;AAAA,UACE,MAAM,EAAC;AAAA,UACP,WAAA,EAAa,CAAA;AAAA,UACb,YAAA,EAAc,cAAA;AAAA,UACd,QAAA,EAAU,cAAA;AAAA,UACV,OAAA,EAAS;AAAA,YACP,IAAA,EAAM,yBAAA;AAAA,YACN,KAAA;AAAA,YACA,YAAA,EAAc;AAAA;AAChB;AACF,OACD,CAAA;AAAA,IACH;AAGA,IAAA,OAAO,MAAA,CAAO,GAAG,CAAM,CAAA;AAAA,EACzB,CAAA;AAEA,EAAA,MAAM,EAAA,GAAK,WAAc,QAAQ,CAAA;AAEjC,EAAA,MAAM,OAAwB,CAAC,CAAA,KAAO,GAAG,CAAC,CAAA,GAAI,IAAI,eAAA,EAAgB;AAElE,EAAA,OAAO;AAAA,IACL,QAAA,EAAU,cAAA;AAAA,IACV,IAAI,YAAA,GAAe;AACjB,MAAA,OAAO,eAAA,EAAgB;AAAA,IACzB,CAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA,EAAO,CAAC,CAAA,KAAM,CAAA;AAAA,IACd,QAAA;AAAA,IACA,EAAA;AAAA,IACA,QAAA,EAAU,eAAe,QAAQ,CAAA;AAAA,IACjC,IAAA,EAAM,aAAa,QAAQ;AAAA,GAC7B;AACF,CAAA;;;;"}

package/dist/enum/int-range.d.mts

@@ -1,14 +1,13 @@
-import { type BoolAnd, type Index, type IndexInclusive, type Int8, type NegativeIndex, type TypeExtends, type UintRange } from 'ts-type-forge';
+import { type Int11, type IntRange } from 'ts-type-forge';
 import { type Type } from '../type.mjs';
-export declare const intRange: <Start extends Int8, End extends Int8 | 128>({ end, start, ...options }: Readonly<{
+export type { IntRange } from 'ts-type-forge';
+export declare const intRange: <Start extends Int11, End extends Int11 | 1024>(...args: readonly [start: Start, end: End, options?: Readonly<{
+    typeName?: string;
+    defaultValue?: IntRange<Start, End>;
+}>] | readonly [options: Readonly<{
     start: Start;
     end: End;
     typeName?: string;
     defaultValue?: IntRange<Start, End>;
-}>) => Type<IntRange<Start, End>>;
-type NegativeRange = NegativeIndex<128>;
-type PositiveRange = IndexInclusive<128>;
-export type IntRange<Start extends Int8, End extends Int8 | 128> = BoolAnd<TypeExtends<Start, PositiveRange>, TypeExtends<End, PositiveRange>> extends true ? UintRange<Start, End> : BoolAnd<TypeExtends<Start, NegativeRange>, TypeExtends<End, PositiveRange>> extends true ? NegativeIndex<NegativeToPositive<Start>> | Index<End> : BoolAnd<TypeExtends<Start, PositiveRange>, TypeExtends<End, NegativeRange>> extends true ? never : BoolAnd<TypeExtends<Start, NegativeRange>, TypeExtends<End, NegativeRange>> extends true ? Exclude<NegativeIndex<NegativeToPositive<Start>>, NegativeIndex<NegativeToPositive<End>>> : never;
-type NegativeToPositive<N extends number> = `${N}` extends `-${infer D extends number}` ? D : never;
-export {};
+}>]) => Type<IntRange<Start, End>>;
 //# sourceMappingURL=int-range.d.mts.map

package/dist/enum/int-range.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"int-range.d.mts","sourceRoot":"","sources":["../../src/enum/int-range.mts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,cAAc,EACnB,KAAK,IAAI,EACT,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAQxC,eAAO,MAAM,QAAQ,GAAI,KAAK,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,GAAG,8BAIhE,QAAQ,CAAC;IACV,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC,CAAC,KAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAmD7B,CAAC;AAEF,KAAK,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AAExC,KAAK,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;AAEzC,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,IAAI,EAAE,GAAG,SAAS,IAAI,GAAG,GAAG,IAC7D,OAAO,CACL,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,EACjC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAChC,SAAS,IAAI,GACV,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,GACrB,OAAO,CACH,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,EACjC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAChC,SAAS,IAAI,GACd,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GACrD,OAAO,CACH,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,EACjC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAChC,SAAS,IAAI,GACd,KAAK,GACL,OAAO,CACH,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,EACjC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAChC,SAAS,IAAI,GACd,OAAO,CACL,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EACxC,aAAa,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CACvC,GACD,KAAK,CAAC;AAElB,KAAK,kBAAkB,CAAC,CAAC,SAAS,MAAM,IACtC,GAAG,CAAC,EAAE,SAAS,IAAI,MAAM,CAAC,SAAS,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"int-range.d.mts","sourceRoot":"","sources":["../../src/enum/int-range.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAQxC,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,QAAQ,GAAI,KAAK,SAAS,KAAK,EAAE,GAAG,SAAS,KAAK,GAAG,IAAI,WAEhE,SAAS,CACP,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC,CAAC,CACH,GACD,SAAS,CACP,OAAO,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC,CAAC,CACH,KACJ,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAc3B,CAAC"}

package/dist/enum/int-range.mjs

@@ -2,16 +2,26 @@ import { memoizeFunction, isNumber, Num, Result } from 'ts-data-forge';
 import { createAssertFn } from '../utils/create-assert-fn.mjs';
 import { createCastFn } from '../utils/create-cast-fn.mjs';
 import { createIsFn } from '../utils/create-is-fn.mjs';
+import '@sindresorhus/is';
 
-const intRange = ({
-  end,
-  start,
-  ...options
-}) => {
-  const typeNameFilled = options.typeName ?? `intRange(${start}, ${end})`;
+const intRange = (...args) => {
+  switch (args.length) {
+    case 1:
+      return intRangeImpl(args[0].start, args[0].end, {
+        defaultValue: args[0].defaultValue,
+        typeName: args[0].typeName
+      });
+    case 2:
+      return intRangeImpl(args[0], args[1]);
+    case 3:
+      return intRangeImpl(args[0], args[1], args[2]);
+  }
+};
+const intRangeImpl = (start, end, options) => {
+  const typeNameFilled = options?.typeName ?? `intRange(${start}, ${end})`;
   const getDefaultValue = memoizeFunction(
     // eslint-disable-next-line total-functions/no-unsafe-type-assertion
-    () => options.defaultValue ?? start
+    () => options?.defaultValue ?? start
   );
   const validate = (a) => {
     if (!(isNumber(a) && Number.isSafeInteger(a) && Num.isInRange(start, end)(a))) {

package/dist/enum/int-range.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"int-range.mjs","sources":["../../src/enum/int-range.mts"],"sourcesContent":["import {\n  expectType,\n  isNumber,\n  memoizeFunction,\n  Num,\n  Result,\n} from 'ts-data-forge';\nimport {\n  type BoolAnd,\n  type Index,\n  type IndexInclusive,\n  type Int8,\n  type NegativeIndex,\n  type TypeExtends,\n  type UintRange,\n} from 'ts-type-forge';\nimport { type Type } from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport const intRange = <Start extends Int8, End extends Int8 | 128>({\n  end,\n  start,\n  ...options\n}: Readonly<{\n  start: Start;\n  end: End;\n  typeName?: string;\n  defaultValue?: IntRange<Start, End>;\n}>): Type<IntRange<Start, End>> => {\n  type T = IntRange<Start, End>;\n\n  const typeNameFilled = options.typeName ?? `intRange(${start}, ${end})`;\n\n  const getDefaultValue = memoizeFunction(\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    (): T => options.defaultValue ?? (start as T),\n  );\n\n  const validate: Type<T>['validate'] = (a) => {\n    if (!(\n      isNumber(a) &&\n      Number.isSafeInteger(a) &&\n      Num.isInRange(start, end)(a)\n    )) {\n      return Result.err([\n        {\n          path: [],\n          actualValue: a,\n          expectedType: typeNameFilled,\n          typeName: typeNameFilled,\n          details: {\n            kind: 'integer-range',\n            start,\n            endExclusive: end,\n          },\n        } satisfies ValidationError,\n      ]);\n    }\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return Result.ok(a as T);\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : getDefaultValue());\n\n  return {\n    typeName: typeNameFilled,\n    get defaultValue() {\n      return getDefaultValue();\n    },\n    fill,\n    prune: (a) => a,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  };\n};\n\ntype NegativeRange = NegativeIndex<128>;\n\ntype PositiveRange = IndexInclusive<128>;\n\nexport type IntRange<Start extends Int8, End extends Int8 | 128> =\n  BoolAnd<\n    TypeExtends<Start, PositiveRange>,\n    TypeExtends<End, PositiveRange>\n  > extends true\n    ? UintRange<Start, End>\n    : BoolAnd<\n          TypeExtends<Start, NegativeRange>,\n          TypeExtends<End, PositiveRange>\n        > extends true\n      ? NegativeIndex<NegativeToPositive<Start>> | Index<End>\n      : BoolAnd<\n            TypeExtends<Start, PositiveRange>,\n            TypeExtends<End, NegativeRange>\n          > extends true\n        ? never\n        : BoolAnd<\n              TypeExtends<Start, NegativeRange>,\n              TypeExtends<End, NegativeRange>\n            > extends true\n          ? Exclude<\n              NegativeIndex<NegativeToPositive<Start>>,\n              NegativeIndex<NegativeToPositive<End>>\n            >\n          : never;\n\ntype NegativeToPositive<N extends number> =\n  `${N}` extends `-${infer D extends number}` ? D : never;\n\nexpectType<NegativeToPositive<-3>, 3>('=');\n\nexpectType<IntRange<1, 5>, 1 | 2 | 3 | 4>('=');\n\nexpectType<IntRange<-3, 3>, -3 | -2 | -1 | 0 | 1 | 2>('=');\n\nexpectType<IntRange<3, -3>, never>('=');\n\nexpectType<IntRange<-5, -1>, -5 | -4 | -3 | -2>('=');\n"],"names":[],"mappings":";;;;;AAwBO,MAAM,WAAW,CAA6C;AAAA,EACnE,GAAA;AAAA,EACA,KAAA;AAAA,EACA,GAAG;AACL,CAAA,KAKmC;AAGjC,EAAA,MAAM,iBAAiB,OAAA,CAAQ,QAAA,IAAY,CAAA,SAAA,EAAY,KAAK,KAAK,GAAG,CAAA,CAAA,CAAA;AAEpE,EAAA,MAAM,eAAA,GAAkB,eAAA;AAAA;AAAA,IAEtB,MAAS,QAAQ,YAAA,IAAiB;AAAA,GACpC;AAEA,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KAAM;AAC3C,IAAA,IAAI,EACF,QAAA,CAAS,CAAC,CAAA,IACV,OAAO,aAAA,CAAc,CAAC,CAAA,IACtB,GAAA,CAAI,SAAA,CAAU,KAAA,EAAO,GAAG,CAAA,CAAE,CAAC,CAAA,CAAA,EAC1B;AACD,MAAA,OAAO,OAAO,GAAA,CAAI;AAAA,QAChB;AAAA,UACE,MAAM,EAAC;AAAA,UACP,WAAA,EAAa,CAAA;AAAA,UACb,YAAA,EAAc,cAAA;AAAA,UACd,QAAA,EAAU,cAAA;AAAA,UACV,OAAA,EAAS;AAAA,YACP,IAAA,EAAM,eAAA;AAAA,YACN,KAAA;AAAA,YACA,YAAA,EAAc;AAAA;AAChB;AACF,OACD,CAAA;AAAA,IAAA;AAIH,IAAA,OAAO,MAAA,CAAO,GAAG,CAAM,CAAA;AAAA,EAAA,CACzB;AAEA,EAAA,MAAM,EAAA,GAAK,WAAc,QAAQ,CAAA;AAEjC,EAAA,MAAM,OAAwB,CAAC,CAAA,KAAO,GAAG,CAAC,CAAA,GAAI,IAAI,eAAA,EAAgB;AAElE,EAAA,OAAO;AAAA,IACL,QAAA,EAAU,cAAA;AAAA,IACV,IAAI,YAAA,GAAe;AACjB,MAAA,OAAO,eAAA,EAAgB;AAAA,IAAA,CACzB;AAAA,IACA,IAAA;AAAA,IACA,KAAA,EAAO,CAAC,CAAA,KAAM,CAAA;AAAA,IACd,QAAA;AAAA,IACA,EAAA;AAAA,IACA,QAAA,EAAU,eAAe,QAAQ,CAAA;AAAA,IACjC,IAAA,EAAM,aAAa,QAAQ;AAAA,GAC7B;AACF;;;;"}
+{"version":3,"file":"int-range.mjs","sources":["../../src/enum/int-range.mts"],"sourcesContent":["import { isNumber, memoizeFunction, Num, Result } from 'ts-data-forge';\nimport { type Int11, type IntRange } from 'ts-type-forge';\nimport { type Type } from '../type.mjs';\nimport {\n  createAssertFn,\n  createCastFn,\n  createIsFn,\n  type ValidationError,\n} from '../utils/index.mjs';\n\nexport type { IntRange } from 'ts-type-forge';\n\nexport const intRange = <Start extends Int11, End extends Int11 | 1024>(\n  ...args:\n    | readonly [\n        start: Start,\n        end: End,\n        options?: Readonly<{\n          typeName?: string;\n          defaultValue?: IntRange<Start, End>;\n        }>,\n      ]\n    | readonly [\n        options: Readonly<{\n          start: Start;\n          end: End;\n          typeName?: string;\n          defaultValue?: IntRange<Start, End>;\n        }>,\n      ]\n): Type<IntRange<Start, End>> => {\n  switch (args.length) {\n    case 1:\n      return intRangeImpl(args[0].start, args[0].end, {\n        defaultValue: args[0].defaultValue,\n        typeName: args[0].typeName,\n      });\n\n    case 2:\n      return intRangeImpl(args[0], args[1]);\n\n    case 3:\n      return intRangeImpl(args[0], args[1], args[2]);\n  }\n};\n\nconst intRangeImpl = <Start extends Int11, End extends Int11 | 1024>(\n  start: Start,\n  end: End,\n  options?: Readonly<{\n    typeName?: string;\n    defaultValue?: IntRange<Start, End>;\n  }>,\n): Type<IntRange<Start, End>> => {\n  type T = IntRange<Start, End>;\n\n  const typeNameFilled = options?.typeName ?? `intRange(${start}, ${end})`;\n\n  const getDefaultValue = memoizeFunction(\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    (): T => options?.defaultValue ?? (start as T),\n  );\n\n  const validate: Type<T>['validate'] = (a) => {\n    if (!(\n      isNumber(a) &&\n      Number.isSafeInteger(a) &&\n      Num.isInRange(start, end)(a)\n    )) {\n      return Result.err([\n        {\n          path: [],\n          actualValue: a,\n          expectedType: typeNameFilled,\n          typeName: typeNameFilled,\n          details: {\n            kind: 'integer-range',\n            start,\n            endExclusive: end,\n          },\n        } satisfies ValidationError,\n      ]);\n    }\n\n    // eslint-disable-next-line total-functions/no-unsafe-type-assertion\n    return Result.ok(a as T);\n  };\n\n  const is = createIsFn<T>(validate);\n\n  const fill: Type<T>['fill'] = (a) => (is(a) ? a : getDefaultValue());\n\n  return {\n    typeName: typeNameFilled,\n    get defaultValue() {\n      return getDefaultValue();\n    },\n    fill,\n    prune: (a) => a,\n    validate,\n    is,\n    assertIs: createAssertFn(validate),\n    cast: createCastFn(validate),\n  };\n};\n"],"names":[],"mappings":";;;;;;AAYO,MAAM,QAAA,GAAW,IACnB,IAAA,KAiB4B;AAC/B,EAAA,QAAQ,KAAK,MAAA;AAAQ,IACnB,KAAK,CAAA;AACH,MAAA,OAAO,YAAA,CAAa,KAAK,CAAC,CAAA,CAAE,OAAO,IAAA,CAAK,CAAC,EAAE,GAAA,EAAK;AAAA,QAC9C,YAAA,EAAc,IAAA,CAAK,CAAC,CAAA,CAAE,YAAA;AAAA,QACtB,QAAA,EAAU,IAAA,CAAK,CAAC,CAAA,CAAE;AAAA,OACnB,CAAA;AAAA,IAEH,KAAK,CAAA;AACH,MAAA,OAAO,aAAa,IAAA,CAAK,CAAC,CAAA,EAAG,IAAA,CAAK,CAAC,CAAC,CAAA;AAAA,IAEtC,KAAK,CAAA;AACH,MAAA,OAAO,YAAA,CAAa,KAAK,CAAC,CAAA,EAAG,KAAK,CAAC,CAAA,EAAG,IAAA,CAAK,CAAC,CAAC,CAAA;AAAA;AAEnD;AAEA,MAAM,YAAA,GAAe,CACnB,KAAA,EACA,GAAA,EACA,OAAA,KAI+B;AAG/B,EAAA,MAAM,iBAAiB,OAAA,EAAS,QAAA,IAAY,CAAA,SAAA,EAAY,KAAK,KAAK,GAAG,CAAA,CAAA,CAAA;AAErE,EAAA,MAAM,eAAA,GAAkB,eAAA;AAAA;AAAA,IAEtB,MAAS,SAAS,YAAA,IAAiB;AAAA,GACrC;AAEA,EAAA,MAAM,QAAA,GAAgC,CAAC,CAAA,KAAM;AAC3C,IAAA,IAAI,EACF,QAAA,CAAS,CAAC,CAAA,IACV,OAAO,aAAA,CAAc,CAAC,CAAA,IACtB,GAAA,CAAI,SAAA,CAAU,KAAA,EAAO,GAAG,CAAA,CAAE,CAAC,CAAA,CAAA,EAC1B;AACD,MAAA,OAAO,OAAO,GAAA,CAAI;AAAA,QAChB;AAAA,UACE,MAAM,EAAC;AAAA,UACP,WAAA,EAAa,CAAA;AAAA,UACb,YAAA,EAAc,cAAA;AAAA,UACd,QAAA,EAAU,cAAA;AAAA,UACV,OAAA,EAAS;AAAA,YACP,IAAA,EAAM,eAAA;AAAA,YACN,KAAA;AAAA,YACA,YAAA,EAAc;AAAA;AAChB;AACF,OACD,CAAA;AAAA,IACH;AAGA,IAAA,OAAO,MAAA,CAAO,GAAG,CAAM,CAAA;AAAA,EACzB,CAAA;AAEA,EAAA,MAAM,EAAA,GAAK,WAAc,QAAQ,CAAA;AAEjC,EAAA,MAAM,OAAwB,CAAC,CAAA,KAAO,GAAG,CAAC,CAAA,GAAI,IAAI,eAAA,EAAgB;AAElE,EAAA,OAAO;AAAA,IACL,QAAA,EAAU,cAAA;AAAA,IACV,IAAI,YAAA,GAAe;AACjB,MAAA,OAAO,eAAA,EAAgB;AAAA,IACzB,CAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA,EAAO,CAAC,CAAA,KAAM,CAAA;AAAA,IACd,QAAA;AAAA,IACA,EAAA;AAAA,IACA,QAAA,EAAU,eAAe,QAAQ,CAAA;AAAA,IACjC,IAAA,EAAM,aAAa,QAAQ;AAAA,GAC7B;AACF,CAAA;;;;"}

package/dist/enum/uint-range-inclusive.d.mts

@@ -0,0 +1,13 @@
+import { type Uint11, type UintRangeInclusive } from 'ts-type-forge';
+import { type Type } from '../type.mjs';
+export type { UintRangeInclusive } from 'ts-type-forge';
+export declare const uintRangeInclusive: <Start extends Uint11, End extends Uint11>(...args: readonly [start: Start, end: End, options?: Readonly<{
+    typeName?: string;
+    defaultValue?: UintRangeInclusive<Start, End>;
+}>] | readonly [options: Readonly<{
+    start: Start;
+    end: End;
+    typeName?: string;
+    defaultValue?: UintRangeInclusive<Start, End>;
+}>]) => Type<UintRangeInclusive<Start, End>>;
+//# sourceMappingURL=uint-range-inclusive.d.mts.map

package/dist/enum/uint-range-inclusive.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uint-range-inclusive.d.mts","sourceRoot":"","sources":["../../src/enum/uint-range-inclusive.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAQxC,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,eAAO,MAAM,kBAAkB,GAAI,KAAK,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,WAErE,SAAS,CACP,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CAC/C,CAAC,CACH,GACD,SAAS,CACP,OAAO,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CAC/C,CAAC,CACH,KACJ,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAcrC,CAAC"}