@sinclair/typebox 0.32.0-dev-15 → 0.32.0-dev-16

package/build/import/type/tuple/tuple.d.mts

@@ -1,11 +1,11 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import { Kind } from '../symbols/index.mjs';
-type FromRest<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...FromRest<R, P>] : [];
-type TupleResolve<T extends TSchema[], P extends unknown[], R extends unknown[] = FromRest<T, P>> = R;
+type TupleStaticRest<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...TupleStaticRest<R, P>] : [];
+type TupleStatic<T extends TSchema[], P extends unknown[], R extends unknown[] = TupleStaticRest<T, P>> = R;
 export interface TTuple<T extends TSchema[] = TSchema[]> extends TSchema {
     [Kind]: 'Tuple';
-    static: TupleResolve<T, this['params']>;
+    static: TupleStatic<T, this['params']>;
     type: 'array';
     items?: T;
     additionalItems?: false;

package/build/import/type/type/json.d.mts

@@ -10,7 +10,7 @@ import { type TExtends, type TExtendsFromMappedKey, type TExtendsFromMappedResul
 import { type TExtract, type TExtractFromMappedResult } from '../extract/index.mjs';
 import { TIndex, type TIndexPropertyKeys, type TIndexFromMappedKey } from '../indexed/index.mjs';
 import { type IntegerOptions, type TInteger } from '../integer/index.mjs';
-import { type IntersectOptions, type IntersectResolve } from '../intersect/index.mjs';
+import { Intersect, type IntersectOptions } from '../intersect/index.mjs';
 import { type TCapitalize, type TUncapitalize, type TLowercase, type TUppercase } from '../intrinsic/index.mjs';
 import { type TKeyOf, type TKeyOfFromMappedResult } from '../keyof/index.mjs';
 import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
@@ -37,7 +37,7 @@ import { type TString, type StringOptions } from '../string/index.mjs';
 import { type TTemplateLiteral, type TTemplateLiteralKind, type TemplateLiteralSyntax } from '../template-literal/index.mjs';
 import { TransformDecodeBuilder } from '../transform/index.mjs';
 import { type TTuple } from '../tuple/index.mjs';
-import { type UnionResolve } from '../union/index.mjs';
+import { Union } from '../union/index.mjs';
 import { type TUnknown } from '../unknown/index.mjs';
 import { type TUnsafe, type UnsafeOptions } from '../unsafe/index.mjs';
 export declare class JsonTypeBuilder {
@@ -64,7 +64,7 @@ export declare class JsonTypeBuilder {
     Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TIndex<T, I>;
     Index<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TIndex<T, K>;
     Integer(options?: IntegerOptions): TInteger;
-    Intersect<T extends TSchema[]>(T: [...T], options?: IntersectOptions): IntersectResolve<T>;
+    Intersect<T extends TSchema[]>(T: [...T], options?: IntersectOptions): Intersect<T>;
     KeyOf<T extends TMappedResult>(schema: T, options?: SchemaOptions): TKeyOfFromMappedResult<T>;
     KeyOf<T extends TSchema>(schema: T, options?: SchemaOptions): TKeyOf<T>;
     Literal<T extends TLiteralValue>(value: T, options?: SchemaOptions): TLiteral<T>;
@@ -97,7 +97,7 @@ export declare class JsonTypeBuilder {
     Transform<I extends TSchema>(schema: I): TransformDecodeBuilder<I>;
     Tuple<T extends TSchema[]>(items: [...T], options?: SchemaOptions): TTuple<T>;
     Uncapitalize<T extends TSchema>(schema: T, options?: SchemaOptions): TUncapitalize<T>;
-    Union<T extends TSchema[]>(schemas: [...T], options?: SchemaOptions): UnionResolve<T>;
+    Union<T extends TSchema[]>(schemas: [...T], options?: SchemaOptions): Union<T>;
     Unknown(options?: SchemaOptions): TUnknown;
     Unsafe<T>(options?: UnsafeOptions): TUnsafe<T>;
     Uppercase<T extends TSchema>(schema: T, options?: SchemaOptions): TUppercase<T>;

package/build/import/type/union/index.d.mts

@@ -1 +1,3 @@
+export * from './union-evaluated.mjs';
+export * from './union-type.mjs';
 export * from './union.mjs';

package/build/import/type/union/index.mjs

@@ -1 +1,3 @@
+export * from './union-evaluated.mjs';
+export * from './union-type.mjs';
 export * from './union.mjs';

package/build/import/type/union/union-create.d.mts

@@ -0,0 +1,3 @@
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
+import { TUnion } from './union-type.mjs';
+export declare function UnionCreate<T extends TSchema[]>(T: [...T], options: SchemaOptions): TUnion<T>;

package/build/import/type/union/union-create.mjs

@@ -0,0 +1,5 @@
+import { CloneRest } from '../clone/type.mjs';
+import { Kind } from '../symbols/index.mjs';
+export function UnionCreate(T, options) {
+    return { ...options, [Kind]: 'Union', anyOf: CloneRest(T) };
+}

package/build/import/type/union/union-evaluated.d.mts

@@ -0,0 +1,16 @@
+import type { SchemaOptions, TSchema } from '../schema/index.mjs';
+import { type TNever } from '../never/index.mjs';
+import { type TOptional } from '../optional/index.mjs';
+import type { TReadonly } from '../readonly/index.mjs';
+import type { TUnion } from './union-type.mjs';
+type IsUnionOptional<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TOptional<TSchema> ? true : IsUnionOptional<R> : false);
+declare function IsUnionOptional<T extends TSchema[]>(T: T): IsUnionOptional<T>;
+type RemoveOptionalFromRest<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TOptional<infer S extends TSchema> ? [RemoveOptionalFromType<S>, ...RemoveOptionalFromRest<R>] : [L, ...RemoveOptionalFromRest<R>] : []);
+declare function RemoveOptionalFromRest<T extends TSchema[]>(T: T): RemoveOptionalFromRest<T>;
+type RemoveOptionalFromType<T extends TSchema> = (T extends TReadonly<infer S extends TSchema> ? TReadonly<RemoveOptionalFromType<S>> : T extends TOptional<infer S extends TSchema> ? RemoveOptionalFromType<S> : T);
+declare function RemoveOptionalFromType<T extends TSchema>(T: T): RemoveOptionalFromType<T>;
+type ResolveUnion<T extends TSchema[], R extends TSchema[] = RemoveOptionalFromRest<T>> = (IsUnionOptional<T> extends true ? TOptional<TUnion<R>> : TUnion<R>);
+declare function ResolveUnion<T extends TSchema[]>(T: T, options: SchemaOptions): ResolveUnion<T>;
+export type UnionEvaluated<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : ResolveUnion<T>);
+export declare function UnionEvaluated<T extends TSchema[], R = UnionEvaluated<T>>(T: [...T], options?: SchemaOptions): R;
+export {};

package/build/import/type/union/union-evaluated.mjs

@@ -0,0 +1,31 @@
+import { OptionalKind } from '../symbols/index.mjs';
+import { CloneType } from '../clone/type.mjs';
+import { Discard } from '../discard/index.mjs';
+import { Never } from '../never/index.mjs';
+import { Optional } from '../optional/index.mjs';
+import { UnionCreate } from './union-create.mjs';
+import { TOptional as IsOptionalType } from '../guard/type.mjs';
+function IsUnionOptional(T) {
+    const [L, ...R] = T;
+    return (T.length > 0
+        ? IsOptionalType(L)
+            ? true
+            : IsUnionOptional(R)
+        : false);
+}
+function RemoveOptionalFromRest(T) {
+    return (T.map(T => RemoveOptionalFromType(T)));
+}
+function RemoveOptionalFromType(T) {
+    return (Discard(T, [OptionalKind]));
+}
+function ResolveUnion(T, options) {
+    return (IsUnionOptional(T)
+        ? Optional(UnionCreate(RemoveOptionalFromRest(T), options))
+        : UnionCreate(RemoveOptionalFromRest(T), options));
+}
+export function UnionEvaluated(T, options = {}) {
+    return (T.length === 0 ? Never(options) :
+        T.length === 1 ? CloneType(T[0], options) :
+            ResolveUnion(T, options));
+}

package/build/import/type/union/union-type.d.mts

@@ -0,0 +1,12 @@
+import type { TSchema } from '../schema/index.mjs';
+import type { Static } from '../static/index.mjs';
+import { Kind } from '../symbols/index.mjs';
+type UnionStatic<T extends TSchema[], P extends unknown[]> = {
+    [K in keyof T]: T[K] extends TSchema ? Static<T[K], P> : never;
+}[number];
+export interface TUnion<T extends TSchema[] = TSchema[]> extends TSchema {
+    [Kind]: 'Union';
+    static: UnionStatic<T, this['params']>;
+    anyOf: T;
+}
+export {};

package/build/import/type/union/union-type.mjs

@@ -0,0 +1 @@
+import { Kind } from '../symbols/index.mjs';

package/build/import/type/union/union.d.mts

@@ -1,15 +1,5 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
-import type { Static } from '../static/index.mjs';
 import { type TNever } from '../never/index.mjs';
-import { OptionalFromUnion } from '../modifiers/index.mjs';
-import { Kind } from '../symbols/index.mjs';
-export type UnionResolve<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : OptionalFromUnion<T>);
-export declare function UnionResolve<T extends TSchema[]>(T: [...T]): UnionResolve<T>;
-export interface TUnion<T extends TSchema[] = TSchema[]> extends TSchema {
-    [Kind]: 'Union';
-    static: {
-        [K in keyof T]: T[K] extends TSchema ? Static<T[K], this['params']> : never;
-    }[number];
-    anyOf: T;
-}
-export declare function Union<T extends TSchema[]>(T: [...T], options?: SchemaOptions): UnionResolve<T>;
+import type { TUnion } from './union-type.mjs';
+export type Union<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : TUnion<T>);
+export declare function Union<T extends TSchema[]>(T: [...T], options?: SchemaOptions): Union<T>;

package/build/import/type/union/union.mjs

@@ -1,15 +1,8 @@
 import { Never } from '../never/index.mjs';
-import { OptionalFromUnion } from '../modifiers/index.mjs';
-import { CloneType, CloneRest } from '../clone/type.mjs';
-import { Kind } from '../symbols/index.mjs';
-export function UnionResolve(T) {
-    return (T.length === 0 ? Never() :
-        T.length === 1 ? T[0] :
-            OptionalFromUnion(T));
-}
+import { CloneType } from '../clone/type.mjs';
+import { UnionCreate } from './union-create.mjs';
 export function Union(T, options = {}) {
     return (T.length === 0 ? Never(options) :
         T.length === 1 ? CloneType(T[0], options) :
-            { ...options, [Kind]: 'Union', anyOf: CloneRest(T)
-            });
+            UnionCreate(T, options));
 }

package/build/import/value/delta/delta.d.mts

@@ -17,7 +17,7 @@ export declare const Delete: import("../../type/object/object.mjs").TObject<{
     path: import("../../type/string/string.mjs").TString;
 }>;
 export type Edit = Static<typeof Edit>;
-export declare const Edit: import("../../type/union/union.mjs").TUnion<[import("../../type/object/object.mjs").TObject<{
+export declare const Edit: import("../../type/union/union-type.mjs").TUnion<[import("../../type/object/object.mjs").TObject<{
     type: import("../../type/literal/literal.mjs").TLiteral<"insert">;
     path: import("../../type/string/string.mjs").TString;
     value: import("../../type/unknown/unknown.mjs").TUnknown;

package/build/require/index.d.ts

@@ -24,7 +24,7 @@ export { Increment, type Assert, type AssertType, type AssertRest, type AssertPr
 export { Index, IndexPropertyKeys, IndexFromMappedKey, type TIndex, type TIndexPropertyKeys, type TIndexFromMappedKey } from './type/indexed/index';
 export { InstanceType, type TInstanceType } from './type/instance-type/index';
 export { Integer, type TInteger, type IntegerOptions } from './type/integer/index';
-export { Intersect, type TIntersect, type IntersectOptions } from './type/intersect/index';
+export { Intersect, IntersectEvaluated, type TIntersect, type IntersectOptions } from './type/intersect/index';
 export { Iterator, type TIterator } from './type/iterator/index';
 export { Intrinsic, IntrinsicFromMappedKey, type TIntrinsic, Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase } from './type/intrinsic/index';
 export { KeyOf, type TKeyOf, type KeyOfFromMappedResult, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index';
@@ -60,7 +60,7 @@ export { Transform, type TTransform, type TransformOptions, type TransformFuncti
 export { Tuple, type TTuple } from './type/tuple/index';
 export { Uint8Array, type TUint8Array, type Uint8ArrayOptions } from './type/uint8array/index';
 export { Undefined, type TUndefined } from './type/undefined/index';
-export { Union, type TUnion } from './type/union/index';
+export { Union, UnionEvaluated, type TUnion } from './type/union/index';
 export { Unknown, type TUnknown } from './type/unknown/index';
 export { Unsafe, type TUnsafe } from './type/unsafe/index';
 export { Void, type TVoid } from './type/void/index';

package/build/require/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Uncapitalize = exports.Lowercase = exports.Capitalize = exports.IntrinsicFromMappedKey = exports.Intrinsic = exports.Iterator = exports.Intersect = exports.Integer = exports.InstanceType = exports.IndexFromMappedKey = exports.IndexPropertyKeys = exports.Index = exports.Increment = exports.Function = exports.Extract = exports.ExtendsUndefinedCheck = exports.ExtendsResult = exports.ExtendsCheck = exports.Extends = exports.Exclude = exports.Enum = exports.Deref = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Any = exports.CloneRest = exports.CloneType = exports.ValueGuard = exports.TypeGuard = exports.FormatRegistry = exports.TypeRegistry = exports.PatternStringExact = exports.PatternString = exports.PatternNumberExact = exports.PatternNumber = exports.PatternBooleanExact = exports.PatternBoolean = exports.TransformKind = exports.OptionalKind = exports.ReadonlyKind = exports.Hint = exports.Kind = void 0;
-exports.JavaScriptTypeBuilder = exports.JsonTypeBuilder = exports.Type = exports.Void = exports.Unsafe = exports.Unknown = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.TransformEncodeBuilder = exports.TransformDecodeBuilder = exports.Transform = exports.TemplateLiteralGenerate = exports.TemplateLiteralParseExact = exports.TemplateLiteralParse = exports.IsTemplateLiteralFinite = exports.TemplateLiteral = exports.Symbol = exports.String = exports.Strict = exports.ReturnType = exports.Rest = exports.Required = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.PartialFromMappedResult = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.MappedResult = exports.MappedKey = exports.Mapped = exports.Literal = exports.KeyOfPattern = exports.KeyOfPropertyKeys = exports.KeyOf = exports.Uppercase = void 0;
+exports.Lowercase = exports.Capitalize = exports.IntrinsicFromMappedKey = exports.Intrinsic = exports.Iterator = exports.IntersectEvaluated = exports.Intersect = exports.Integer = exports.InstanceType = exports.IndexFromMappedKey = exports.IndexPropertyKeys = exports.Index = exports.Increment = exports.Function = exports.Extract = exports.ExtendsUndefinedCheck = exports.ExtendsResult = exports.ExtendsCheck = exports.Extends = exports.Exclude = exports.Enum = exports.Deref = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Any = exports.CloneRest = exports.CloneType = exports.ValueGuard = exports.TypeGuard = exports.FormatRegistry = exports.TypeRegistry = exports.PatternStringExact = exports.PatternString = exports.PatternNumberExact = exports.PatternNumber = exports.PatternBooleanExact = exports.PatternBoolean = exports.TransformKind = exports.OptionalKind = exports.ReadonlyKind = exports.Hint = exports.Kind = void 0;
+exports.Type = exports.Void = exports.Unsafe = exports.Unknown = exports.UnionEvaluated = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.TransformEncodeBuilder = exports.TransformDecodeBuilder = exports.Transform = exports.TemplateLiteralGenerate = exports.TemplateLiteralParseExact = exports.TemplateLiteralParse = exports.IsTemplateLiteralFinite = exports.TemplateLiteral = exports.Symbol = exports.String = exports.Strict = exports.ReturnType = exports.Rest = exports.Required = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.PartialFromMappedResult = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.MappedResult = exports.MappedKey = exports.Mapped = exports.Literal = exports.KeyOfPattern = exports.KeyOfPropertyKeys = exports.KeyOf = exports.Uppercase = exports.Uncapitalize = void 0;
+exports.JavaScriptTypeBuilder = exports.JsonTypeBuilder = void 0;
 var index_1 = require("./type/symbols/index");
 Object.defineProperty(exports, "Kind", { enumerable: true, get: function () { return index_1.Kind; } });
 Object.defineProperty(exports, "Hint", { enumerable: true, get: function () { return index_1.Hint; } });
@@ -73,6 +74,7 @@ var index_25 = require("./type/integer/index");
 Object.defineProperty(exports, "Integer", { enumerable: true, get: function () { return index_25.Integer; } });
 var index_26 = require("./type/intersect/index");
 Object.defineProperty(exports, "Intersect", { enumerable: true, get: function () { return index_26.Intersect; } });
+Object.defineProperty(exports, "IntersectEvaluated", { enumerable: true, get: function () { return index_26.IntersectEvaluated; } });
 var index_27 = require("./type/iterator/index");
 Object.defineProperty(exports, "Iterator", { enumerable: true, get: function () { return index_27.Iterator; } });
 var index_28 = require("./type/intrinsic/index");
@@ -157,6 +159,7 @@ var index_59 = require("./type/undefined/index");
 Object.defineProperty(exports, "Undefined", { enumerable: true, get: function () { return index_59.Undefined; } });
 var index_60 = require("./type/union/index");
 Object.defineProperty(exports, "Union", { enumerable: true, get: function () { return index_60.Union; } });
+Object.defineProperty(exports, "UnionEvaluated", { enumerable: true, get: function () { return index_60.UnionEvaluated; } });
 var index_61 = require("./type/unknown/index");
 Object.defineProperty(exports, "Unknown", { enumerable: true, get: function () { return index_61.Unknown; } });
 var index_62 = require("./type/unsafe/index");

package/build/require/type/array/array.d.ts

@@ -11,7 +11,7 @@ export interface ArrayOptions extends SchemaOptions {
 }
 export interface TArray<T extends TSchema = TSchema> extends TSchema, ArrayOptions {
     [Kind]: 'Array';
-    static: Static<T, this['params']>[];
+    static: Array<Static<T, this['params']>>;
     type: 'array';
     items: T;
 }

package/build/require/type/constructor/constructor.d.ts

@@ -2,12 +2,12 @@ import type { TSchema, SchemaOptions } from '../schema/index';
 import type { Static } from '../static/index';
 import type { Ensure } from '../helpers/index';
 import { Kind } from '../symbols/index';
-type TConstructorReturnTypeResolve<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type TConstructorParametersResolve<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...TConstructorParametersResolve<R, P>] : [];
-export type TConstructorResolve<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<new (...param: TConstructorParametersResolve<T, P>) => TConstructorReturnTypeResolve<U, P>>);
+type TConstructorStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
+type TConstructorStaticParameters<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...TConstructorStaticParameters<R, P>] : [];
+export type TConstructorStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<new (...param: TConstructorStaticParameters<T, P>) => TConstructorStaticReturnType<U, P>>);
 export interface TConstructor<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Constructor';
-    static: TConstructorResolve<T, U, this['params']>;
+    static: TConstructorStatic<T, U, this['params']>;
     type: 'Constructor';
     parameters: T;
     returns: U;

package/build/require/type/exclude/exclude.d.ts

@@ -6,15 +6,15 @@ import { type TUnion } from '../union/index';
 import { type TNever } from '../never/index';
 import { type TLiteral } from '../literal/index';
 import { type Static } from '../static/index';
-import { UnionResolve } from '../union/index';
+import { UnionEvaluated } from '../union/index';
 import { type TExcludeFromMappedResult } from './exclude-from-mapped-result';
-type ExcludeTemplateLiteralResult<T extends string> = UnionResolve<AssertRest<UnionToTuple<{
+type ExcludeTemplateLiteralResult<T extends string> = UnionEvaluated<AssertRest<UnionToTuple<{
     [K in T]: TLiteral<K>;
 }[T]>>>;
 type ExcludeTemplateLiteral<T extends TTemplateLiteral, U extends TSchema> = (Exclude<Static<T>, Static<U>> extends infer S ? ExcludeTemplateLiteralResult<Assert<S, string>> : never);
 type ExcludeArray<T extends TSchema[], U extends TSchema> = AssertRest<UnionToTuple<{
     [K in keyof T]: Static<AssertType<T[K]>> extends Static<U> ? never : T[K];
-}[number]>> extends infer R extends TSchema[] ? UnionResolve<R> : never;
+}[number]>> extends infer R extends TSchema[] ? UnionEvaluated<R> : never;
 type ExcludeResolve<T extends TSchema, U extends TSchema> = T extends TTemplateLiteral ? ExcludeTemplateLiteral<T, U> : T extends TUnion<infer S> ? ExcludeArray<S, U> : T extends U ? TNever : T;
 declare function ExcludeResolve<L extends TSchema, R extends TSchema>(L: L, R: R): ExcludeResolve<L, R>;
 export type TExclude<T extends TSchema, U extends TSchema> = ExcludeResolve<T, U>;

package/build/require/type/extends/extends.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Extends = void 0;
-const type_1 = require("../guard/type");
 const index_1 = require("../union/index");
 const extends_check_1 = require("./extends-check");
-const type_2 = require("../clone/type");
+const type_1 = require("../clone/type");
 const extends_from_mapped_key_1 = require("./extends-from-mapped-key");
 const extends_from_mapped_result_1 = require("./extends-from-mapped-result");
+const type_2 = require("../guard/type");
 function ExtendsResolve(left, right, trueType, falseType) {
     const R = (0, extends_check_1.ExtendsCheck)(left, right);
     return (R === extends_check_1.ExtendsResult.Union ? (0, index_1.Union)([trueType, falseType]) :
@@ -14,8 +14,8 @@ function ExtendsResolve(left, right, trueType, falseType) {
             falseType);
 }
 function Extends(L, R, T, F, options = {}) {
-    return ((0, type_1.TMappedResult)(L) ? (0, extends_from_mapped_result_1.ExtendsFromMappedResult)(L, R, T, F, options) :
-        (0, type_1.TMappedKey)(L) ? (0, type_2.CloneType)((0, extends_from_mapped_key_1.ExtendsFromMappedKey)(L, R, T, F, options)) :
-            (0, type_2.CloneType)(ExtendsResolve(L, R, T, F), options));
+    return ((0, type_2.TMappedResult)(L) ? (0, extends_from_mapped_result_1.ExtendsFromMappedResult)(L, R, T, F, options) :
+        (0, type_2.TMappedKey)(L) ? (0, type_1.CloneType)((0, extends_from_mapped_key_1.ExtendsFromMappedKey)(L, R, T, F, options)) :
+            (0, type_1.CloneType)(ExtendsResolve(L, R, T, F), options));
 }
 exports.Extends = Extends;

package/build/require/type/extract/extract.d.ts

@@ -5,15 +5,15 @@ import { type TTemplateLiteral } from '../template-literal/index';
 import { type TLiteral } from '../literal/index';
 import { type TUnion } from '../union/index';
 import { type Static } from '../static/index';
-import { UnionResolve } from '../union/index';
+import { UnionEvaluated } from '../union/index';
 import { type TExtractFromMappedResult } from './extract-from-mapped-result';
-type FromTemplateLiteralResult<T extends string> = UnionResolve<AssertRest<UnionToTuple<{
+type FromTemplateLiteralResult<T extends string> = UnionEvaluated<AssertRest<UnionToTuple<{
     [K in T]: TLiteral<K>;
 }[T]>>>;
 type FromTemplateLiteral<T extends TTemplateLiteral, U extends TSchema> = Extract<Static<T>, Static<U>> extends infer S ? FromTemplateLiteralResult<Assert<S, string>> : never;
 type FromArray<T extends TSchema[], U extends TSchema> = AssertRest<UnionToTuple<{
     [K in keyof T]: Static<AssertType<T[K]>> extends Static<U> ? T[K] : never;
-}[number]>> extends infer R extends TSchema[] ? UnionResolve<R> : never;
+}[number]>> extends infer R extends TSchema[] ? UnionEvaluated<R> : never;
 export type ExtractResolve<T extends TSchema, U extends TSchema> = (T extends TTemplateLiteral ? FromTemplateLiteral<T, U> : T extends TUnion<infer S> ? FromArray<S, U> : T extends U ? T : T);
 export declare function ExtractResolve<L extends TSchema, R extends TSchema>(L: L, R: R): ExtractResolve<L, R>;
 export type TExtract<T extends TSchema, U extends TSchema> = ExtractResolve<T, U>;

package/build/require/type/function/function.d.ts

@@ -2,12 +2,12 @@ import type { TSchema, SchemaOptions } from '../schema/index';
 import type { Static } from '../static/index';
 import type { Ensure } from '../helpers/index';
 import { Kind } from '../symbols/index';
-type FunctionReturnTypeResolve<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type FunctionParametersResolve<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...FunctionParametersResolve<R, P>] : [];
-type FunctionResolve<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<(...param: FunctionParametersResolve<T, P>) => FunctionReturnTypeResolve<U, P>>);
+type FunctionStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
+type FunctionStaticParameters<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [Static<L, P>, ...FunctionStaticParameters<R, P>] : [];
+type FunctionStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<(...param: FunctionStaticParameters<T, P>) => FunctionStaticReturnType<U, P>>);
 export interface TFunction<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Function';
-    static: FunctionResolve<T, U, this['params']>;
+    static: FunctionStatic<T, U, this['params']>;
     type: 'Function';
     parameters: T;
     returns: U;

package/build/require/type/indexed/indexed-result.d.ts

@@ -6,19 +6,19 @@ import { type TIntersect } from '../intersect/index';
 import { type TUnion } from '../union/index';
 import { type TTuple } from '../tuple/index';
 import { type TArray } from '../array/index';
-import { IntersectResolve } from '../intersect/index';
-import { UnionResolve } from '../union/index';
+import { IntersectEvaluated } from '../intersect/index';
+import { UnionEvaluated } from '../union/index';
 type FromRest<T extends TSchema[], K extends PropertyKey> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [FromKey<L, K>, ...FromRest<R, K>] : []);
 declare function FromRest<T extends TSchema[], K extends PropertyKey>(T: [...T], K: K): FromRest<T, K>;
 type FromIntersectRest<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? [...FromIntersectRest<R>] : [L, ...FromIntersectRest<R>] : []);
 declare function FromIntersectRest<T extends TSchema[]>(T: [...T]): FromIntersectRest<T>;
-type FromIntersect<T extends TSchema[], K extends PropertyKey> = (IntersectResolve<FromIntersectRest<FromRest<T, K>>>);
+type FromIntersect<T extends TSchema[], K extends PropertyKey> = (IntersectEvaluated<FromIntersectRest<FromRest<T, K>>>);
 declare function FromIntersect<T extends TSchema[], K extends PropertyKey>(T: [...T], K: K): FromIntersect<T, K>;
 type FromUnionRest<T extends TSchema[], S = T> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? [] : FromUnionRest<R, S> : S);
 declare function FromUnionRest<T extends TSchema[]>(T: [...T], S?: [...T]): FromUnionRest<T>;
-type FromUnion<T extends TSchema[], K extends PropertyKey> = (UnionResolve<FromUnionRest<FromRest<T, K>>>);
+type FromUnion<T extends TSchema[], K extends PropertyKey> = (UnionEvaluated<FromUnionRest<FromRest<T, K>>>);
 declare function FromUnion<T extends TSchema[], K extends PropertyKey>(T: [...T], K: K): FromUnion<T, K>;
-type FromTuple<T extends TSchema[], K extends PropertyKey> = (K extends keyof T ? T[K] : K extends '[number]' ? UnionResolve<T> : TNever);
+type FromTuple<T extends TSchema[], K extends PropertyKey> = (K extends keyof T ? T[K] : K extends '[number]' ? UnionEvaluated<T> : TNever);
 declare function FromTuple<T extends TSchema[], K extends PropertyKey>(T: [...T], K: K): FromTuple<T, K>;
 type FromArray<T extends TSchema, K extends PropertyKey> = (K extends '[number]' ? T : TNever);
 declare function FromArray<T extends TSchema, K extends PropertyKey>(T: T, K: K): FromArray<T, K>;
@@ -28,6 +28,6 @@ type FromKey<T extends TSchema, K extends PropertyKey> = (T extends TRecursive<i
 declare function FromKey<T extends TSchema, K extends PropertyKey>(T: T, K: K): FromKey<T, K>;
 type FromKeys<T extends TSchema, K extends PropertyKey[]> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? [FromKey<T, L>, ...FromKeys<T, R>] : []);
 declare function FromKeys<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): FromKeys<T, K>;
-export type TIndexResult<T extends TSchema, K extends PropertyKey[]> = (UnionResolve<FromKeys<T, K>>);
+export type TIndexResult<T extends TSchema, K extends PropertyKey[]> = (UnionEvaluated<FromKeys<T, K>>);
 export declare function IndexResult<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K], options: SchemaOptions): TIndexResult<T, K>;
 export {};

package/build/require/type/indexed/indexed-result.js

@@ -21,7 +21,7 @@ function FromIntersectRest(T) {
         : []);
 }
 function FromIntersect(T, K) {
-    return ((0, index_2.IntersectResolve)(FromIntersectRest(FromRest(T, K))));
+    return ((0, index_2.IntersectEvaluated)(FromIntersectRest(FromRest(T, K))));
 }
 function FromUnionRest(T, S = T) {
     const [L, ...R] = T;
@@ -32,11 +32,11 @@ function FromUnionRest(T, S = T) {
         : S);
 }
 function FromUnion(T, K) {
-    return ((0, index_3.UnionResolve)(FromUnionRest(FromRest(T, K))));
+    return ((0, index_3.UnionEvaluated)(FromUnionRest(FromRest(T, K))));
 }
 function FromTuple(T, K) {
     return (K in T ? T[K] :
-        K === '[number]' ? (0, index_3.UnionResolve)(T) :
+        K === '[number]' ? (0, index_3.UnionEvaluated)(T) :
             (0, index_1.Never)());
 }
 function FromArray(T, K) {
@@ -64,6 +64,6 @@ function FromKeys(T, K) {
         : []);
 }
 function IndexResult(T, K, options) {
-    return ((0, type_1.CloneType)((0, index_3.UnionResolve)(FromKeys(T, K)), options));
+    return ((0, type_1.CloneType)((0, index_3.UnionEvaluated)(FromKeys(T, K)), options));
 }
 exports.IndexResult = IndexResult;

package/build/require/type/indexed/indexed.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Index = void 0;
-const type_1 = require("../guard/type");
 const indexed_result_1 = require("./indexed-result");
 const indexed_property_keys_1 = require("./indexed-property-keys");
 const indexed_from_mapped_key_1 = require("./indexed-from-mapped-key");
-const type_2 = require("../clone/type");
+const type_1 = require("../clone/type");
+const type_2 = require("../guard/type");
 function Index(T, K, options = {}) {
-    return ((0, type_1.TMappedKey)(K) ? (0, type_2.CloneType)((0, indexed_from_mapped_key_1.IndexFromMappedKey)(T, K, options)) :
-        (0, type_1.TSchema)(K) ? (0, indexed_result_1.IndexResult)(T, (0, indexed_property_keys_1.IndexPropertyKeys)(K), options) :
+    return ((0, type_2.TMappedKey)(K) ? (0, type_1.CloneType)((0, indexed_from_mapped_key_1.IndexFromMappedKey)(T, K, options)) :
+        (0, type_2.TSchema)(K) ? (0, indexed_result_1.IndexResult)(T, (0, indexed_property_keys_1.IndexPropertyKeys)(K), options) :
             (0, indexed_result_1.IndexResult)(T, K, options));
 }
 exports.Index = Index;

package/build/require/type/intersect/index.d.ts

@@ -1 +1,3 @@
+export * from './intersect-evaluated';
+export * from './intersect-type';
 export * from './intersect';

package/build/require/type/intersect/index.js

@@ -14,4 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./intersect-evaluated"), exports);
+__exportStar(require("./intersect-type"), exports);
 __exportStar(require("./intersect"), exports);

package/build/require/type/intersect/intersect-create.d.ts

@@ -0,0 +1,3 @@
+import type { TSchema } from '../schema/index';
+import type { TIntersect, IntersectOptions } from './intersect-type';
+export declare function IntersectCreate<T extends TSchema[]>(T: [...T], options: IntersectOptions): TIntersect<T>;

package/build/require/type/intersect/intersect-create.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntersectCreate = void 0;
+const index_1 = require("../symbols/index");
+const type_1 = require("../clone/type");
+const type_2 = require("../guard/type");
+function IntersectCreate(T, options) {
+    const allObjects = T.every((schema) => (0, type_2.TObject)(schema));
+    const clonedUnevaluatedProperties = (0, type_2.TSchema)(options.unevaluatedProperties)
+        ? { unevaluatedProperties: (0, type_1.CloneType)(options.unevaluatedProperties) }
+        : {};
+    return ((options.unevaluatedProperties === false || (0, type_2.TSchema)(options.unevaluatedProperties) || allObjects
+        ? { ...options, ...clonedUnevaluatedProperties, [index_1.Kind]: 'Intersect', type: 'object', allOf: (0, type_1.CloneRest)(T) }
+        : { ...options, ...clonedUnevaluatedProperties, [index_1.Kind]: 'Intersect', allOf: (0, type_1.CloneRest)(T) }));
+}
+exports.IntersectCreate = IntersectCreate;

package/build/require/type/intersect/intersect-evaluated.d.ts

@@ -0,0 +1,16 @@
+import type { SchemaOptions, TSchema } from '../schema/index';
+import { type TNever } from '../never/index';
+import { type TOptional } from '../optional/index';
+import type { TReadonly } from '../readonly/index';
+import { TIntersect, IntersectOptions } from './intersect-type';
+type IsIntersectOptional<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TOptional<TSchema> ? IsIntersectOptional<R> : false : true);
+declare function IsIntersectOptional<T extends TSchema[]>(T: T): IsIntersectOptional<T>;
+type RemoveOptionalFromRest<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TOptional<infer S extends TSchema> ? [RemoveOptionalFromType<S>, ...RemoveOptionalFromRest<R>] : [L, ...RemoveOptionalFromRest<R>] : []);
+declare function RemoveOptionalFromRest<T extends TSchema[]>(T: T): RemoveOptionalFromRest<T>;
+type RemoveOptionalFromType<T extends TSchema> = (T extends TReadonly<infer S extends TSchema> ? TReadonly<RemoveOptionalFromType<S>> : T extends TOptional<infer S extends TSchema> ? RemoveOptionalFromType<S> : T);
+declare function RemoveOptionalFromType<T extends TSchema>(T: T): RemoveOptionalFromType<T>;
+type ResolveIntersect<T extends TSchema[]> = (IsIntersectOptional<T> extends true ? TOptional<TIntersect<RemoveOptionalFromRest<T>>> : TIntersect<RemoveOptionalFromRest<T>>);
+declare function ResolveIntersect<T extends TSchema[]>(T: [...T], options: SchemaOptions): ResolveIntersect<T>;
+export type IntersectEvaluated<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : ResolveIntersect<T>);
+export declare function IntersectEvaluated<T extends TSchema[], R = IntersectEvaluated<T>>(T: [...T], options?: IntersectOptions): R;
+export {};

package/build/require/type/intersect/intersect-evaluated.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntersectEvaluated = void 0;
+const index_1 = require("../symbols/index");
+const type_1 = require("../clone/type");
+const index_2 = require("../discard/index");
+const index_3 = require("../never/index");
+const index_4 = require("../optional/index");
+const intersect_create_1 = require("./intersect-create");
+const type_2 = require("../guard/type");
+function IsIntersectOptional(T) {
+    const [L, ...R] = T;
+    return (T.length > 0
+        ? (0, type_2.TOptional)(L)
+            ? IsIntersectOptional(R)
+            : false
+        : true);
+}
+function RemoveOptionalFromRest(T) {
+    return (T.map(T => RemoveOptionalFromType(T)));
+}
+function RemoveOptionalFromType(T) {
+    return ((0, index_2.Discard)(T, [index_1.OptionalKind]));
+}
+function ResolveIntersect(T, options) {
+    return (IsIntersectOptional(T)
+        ? (0, index_4.Optional)((0, intersect_create_1.IntersectCreate)(RemoveOptionalFromRest(T), options))
+        : (0, intersect_create_1.IntersectCreate)(RemoveOptionalFromRest(T), options));
+}
+function IntersectEvaluated(T, options = {}) {
+    if (T.length === 0)
+        return (0, index_3.Never)(options);
+    if (T.length === 1)
+        return (0, type_1.CloneType)(T[0], options);
+    if (T.some((schema) => (0, type_2.TTransform)(schema)))
+        throw new Error('Cannot intersect transform types');
+    return ResolveIntersect(T, options);
+}
+exports.IntersectEvaluated = IntersectEvaluated;

package/build/require/type/intersect/intersect-type.d.ts

@@ -0,0 +1,15 @@
+import type { TSchema, SchemaOptions } from '../schema/index';
+import type { Static } from '../static/index';
+import { Kind } from '../symbols/index';
+type IntersectStatic<T extends TSchema[], P extends unknown[]> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? Static<L, P> & IntersectStatic<R, P> : unknown;
+export type TUnevaluatedProperties = undefined | TSchema | boolean;
+export interface IntersectOptions extends SchemaOptions {
+    unevaluatedProperties?: TUnevaluatedProperties;
+}
+export interface TIntersect<T extends TSchema[] = TSchema[]> extends TSchema, IntersectOptions {
+    [Kind]: 'Intersect';
+    static: IntersectStatic<T, this['params']>;
+    type?: 'object';
+    allOf: [...T];
+}
+export {};

package/build/require/type/intersect/intersect-type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("../symbols/index");

package/build/require/type/intersect/intersect.d.ts

@@ -1,21 +1,5 @@
-import type { TupleToIntersect, AssertType } from '../helpers/index';
-import type { TSchema, SchemaOptions } from '../schema/index';
-import type { Static } from '../static/index';
+import type { TSchema } from '../schema/index';
 import { type TNever } from '../never/index';
-import { OptionalFromIntersect } from '../modifiers/index';
-import { Kind } from '../symbols/index';
-export type IntersectResolve<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : OptionalFromIntersect<T>);
-export declare function IntersectResolve<T extends TSchema[]>(T: T): IntersectResolve<T>;
-export type TUnevaluatedProperties = undefined | TSchema | boolean;
-export interface IntersectOptions extends SchemaOptions {
-    unevaluatedProperties?: TUnevaluatedProperties;
-}
-export interface TIntersect<T extends TSchema[] = TSchema[]> extends TSchema, IntersectOptions {
-    [Kind]: 'Intersect';
-    static: TupleToIntersect<{
-        [K in keyof T]: Static<AssertType<T[K]>, this['params']>;
-    }>;
-    type?: 'object';
-    allOf: [...T];
-}
-export declare function Intersect<T extends TSchema[]>(T: [...T], options?: IntersectOptions): IntersectResolve<T>;
+import { TIntersect, IntersectOptions } from './intersect-type';
+export type Intersect<T extends TSchema[]> = (T extends [] ? TNever : T extends [TSchema] ? T[0] : TIntersect<T>);
+export declare function Intersect<T extends TSchema[]>(T: [...T], options?: IntersectOptions): Intersect<T>;