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

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

@@ -1 +1,2 @@
+export * from './extract-from-mapped-result';
 export * from './extract';

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

@@ -14,4 +14,5 @@ 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("./extract-from-mapped-result"), exports);
 __exportStar(require("./extract"), exports);

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/index.d.ts

@@ -1,4 +1,4 @@
-export * from './indexed-mapped-result';
+export * from './indexed-from-mapped-key';
 export * from './indexed-property-keys';
 export * from './indexed-result';
 export * from './indexed';

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

@@ -14,7 +14,7 @@ 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("./indexed-mapped-result"), exports);
+__exportStar(require("./indexed-from-mapped-key"), exports);
 __exportStar(require("./indexed-property-keys"), exports);
 __exportStar(require("./indexed-result"), exports);
 __exportStar(require("./indexed"), exports);

package/build/require/type/indexed/{indexed-mapped-result.d.ts → indexed-from-mapped-key.d.ts}

@@ -1,4 +1,4 @@
-import { type TSchema } from '../schema/index';
+import type { TSchema, SchemaOptions } from '../schema/index';
 import { type TProperties } from '../object/index';
 import { type TIndexResult } from './indexed-result';
 import { type TMappedResult, type TMappedKey } from '../mapped/index';
@@ -6,11 +6,11 @@ import { Evaluate } from '../helpers/index';
 type MappedIndexPropertyKey<T extends TSchema, K extends PropertyKey> = {
     [_ in K]: TIndexResult<T, [K]>;
 };
-declare function MappedIndexPropertyKey<T extends TSchema, K extends PropertyKey>(T: T, K: K): MappedIndexPropertyKey<T, K>;
+declare function MappedIndexPropertyKey<T extends TSchema, K extends PropertyKey>(T: T, K: K, options: SchemaOptions): MappedIndexPropertyKey<T, K>;
 type MappedIndexPropertyKeys<T extends TSchema, K extends PropertyKey[]> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? MappedIndexPropertyKey<T, L> & MappedIndexPropertyKeys<T, R> : {});
-declare function MappedIndexPropertyKeys<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): MappedIndexPropertyKeys<T, K>;
+declare function MappedIndexPropertyKeys<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K], options: SchemaOptions): MappedIndexPropertyKeys<T, K>;
 type MappedIndexProperties<T extends TSchema, K extends TMappedKey> = Evaluate<MappedIndexPropertyKeys<T, K['keys']>>;
-declare function MappedIndexProperties<T extends TSchema, K extends TMappedKey>(T: T, K: K): MappedIndexProperties<T, K>;
-export type TIndexMappedResult<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>> = (TMappedResult<P>);
-export declare function IndexMappedResult<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>>(T: T, K: K): TMappedResult<P>;
+declare function MappedIndexProperties<T extends TSchema, K extends TMappedKey>(T: T, K: K, options: SchemaOptions): MappedIndexProperties<T, K>;
+export type TIndexFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>> = (TMappedResult<P>);
+export declare function IndexFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>>(T: T, K: K, options: SchemaOptions): TMappedResult<P>;
 export {};

package/build/require/type/indexed/indexed-from-mapped-key.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IndexFromMappedKey = void 0;
+const indexed_result_1 = require("./indexed-result");
+const index_1 = require("../mapped/index");
+function MappedIndexPropertyKey(T, K, options) {
+    return { [K]: (0, indexed_result_1.IndexResult)(T, [K], options) };
+}
+function MappedIndexPropertyKeys(T, K, options) {
+    const [L, ...R] = K;
+    return (K.length > 0
+        ? { ...MappedIndexPropertyKey(T, L, options), ...MappedIndexPropertyKeys(T, R, options) }
+        : {});
+}
+function MappedIndexProperties(T, K, options) {
+    return MappedIndexPropertyKeys(T, K.keys, options);
+}
+function IndexFromMappedKey(T, K, options) {
+    const P = MappedIndexProperties(T, K, options);
+    return (0, index_1.MappedResult)(P);
+}
+exports.IndexFromMappedKey = IndexFromMappedKey;

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

@@ -1,4 +1,4 @@
-import { type TSchema } from '../schema/index';
+import { type TSchema, SchemaOptions } from '../schema/index';
 import { type TObject, type TProperties } from '../object/index';
 import { type TNever } from '../never/index';
 import { type TRecursive } from '../recursive/index';
@@ -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 declare function IndexResult<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): TIndexResult<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

@@ -4,7 +4,8 @@ exports.IndexResult = void 0;
 const index_1 = require("../never/index");
 const index_2 = require("../intersect/index");
 const index_3 = require("../union/index");
-const type_1 = require("../guard/type");
+const type_1 = require("../clone/type");
+const type_2 = require("../guard/type");
 function FromRest(T, K) {
     const [L, ...R] = T;
     return (T.length > 0
@@ -14,28 +15,28 @@ function FromRest(T, K) {
 function FromIntersectRest(T) {
     const [L, ...R] = T;
     return (T.length > 0
-        ? (0, type_1.TNever)(L)
+        ? (0, type_2.TNever)(L)
             ? [...FromIntersectRest(R)]
             : [L, ...FromIntersectRest(R)]
         : []);
 }
 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;
     return (T.length > 0
-        ? (0, type_1.TNever)(L)
+        ? (0, type_2.TNever)(L)
             ? []
             : FromUnionRest(R, S)
         : 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) {
@@ -49,11 +50,11 @@ function FromProperty(T, K) {
         : (0, index_1.Never)());
 }
 function FromKey(T, K) {
-    return ((0, type_1.TIntersect)(T) ? FromIntersect(T.allOf, K) :
-        (0, type_1.TUnion)(T) ? FromUnion(T.anyOf, K) :
-            (0, type_1.TTuple)(T) ? FromTuple(T.items ?? [], K) :
-                (0, type_1.TArray)(T) ? FromArray(T.items, K) :
-                    (0, type_1.TObject)(T) ? FromProperty(T.properties, K) :
+    return ((0, type_2.TIntersect)(T) ? FromIntersect(T.allOf, K) :
+        (0, type_2.TUnion)(T) ? FromUnion(T.anyOf, K) :
+            (0, type_2.TTuple)(T) ? FromTuple(T.items ?? [], K) :
+                (0, type_2.TArray)(T) ? FromArray(T.items, K) :
+                    (0, type_2.TObject)(T) ? FromProperty(T.properties, K) :
                         (0, index_1.Never)());
 }
 function FromKeys(T, K) {
@@ -62,7 +63,7 @@ function FromKeys(T, K) {
         ? [FromKey(T, L), ...FromKeys(T, R)]
         : []);
 }
-function IndexResult(T, K) {
-    return ((0, index_3.UnionResolve)(FromKeys(T, K)));
+function IndexResult(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.d.ts

@@ -1,9 +1,9 @@
 import type { TSchema, SchemaOptions } from '../schema/index';
 import { type TIndexResult } from './indexed-result';
 import { type TIndexPropertyKeys } from './indexed-property-keys';
-import { type TIndexMappedResult } from './indexed-mapped-result';
+import { type TIndexFromMappedKey } from './indexed-from-mapped-key';
 import { TMappedKey } from '../mapped/index';
 export type TIndex<T extends TSchema, K extends PropertyKey[]> = TIndexResult<T, K>;
-export declare function Index<T extends TSchema, K extends TMappedKey>(T: T, K: K): TIndexMappedResult<T, K>;
+export declare function Index<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TIndexFromMappedKey<T, K>;
 export declare function Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TIndex<T, I>;
 export declare function Index<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TIndex<T, K>;

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_mapped_result_1 = require("./indexed-mapped-result");
-const type_2 = require("../clone/type");
+const indexed_from_mapped_key_1 = require("./indexed-from-mapped-key");
+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_mapped_result_1.IndexMappedResult)(T, K), options) :
-        (0, type_1.TSchema)(K) ? (0, type_2.CloneType)((0, indexed_result_1.IndexResult)(T, (0, indexed_property_keys_1.IndexPropertyKeys)(K)), options) :
-            (0, type_2.CloneType)((0, indexed_result_1.IndexResult)(T, 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>;

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

@@ -1,30 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Intersect = exports.IntersectResolve = void 0;
-const index_1 = require("../never/index");
-const index_2 = require("../modifiers/index");
-const index_3 = require("../symbols/index");
+exports.Intersect = void 0;
 const type_1 = require("../clone/type");
+const index_1 = require("../never/index");
+const intersect_create_1 = require("./intersect-create");
 const type_2 = require("../guard/type");
-function IntersectResolve(T) {
-    return (T.length === 0
-        ? (0, index_1.Never)()
-        : T.length === 1
-            ? T[0]
-            : (0, index_2.OptionalFromIntersect)(T));
-}
-exports.IntersectResolve = IntersectResolve;
 function Intersect(T, options = {}) {
     if (T.length === 0)
-        return (0, index_1.Never)();
+        return (0, index_1.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');
-    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_3.Kind]: 'Intersect', type: 'object', allOf: (0, type_1.CloneRest)(T) }
-        : { ...options, ...clonedUnevaluatedProperties, [index_3.Kind]: 'Intersect', allOf: (0, type_1.CloneRest)(T) });
+    return (0, intersect_create_1.IntersectCreate)(T, options);
 }
 exports.Intersect = Intersect;

package/build/require/type/intrinsic/capitalize.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Capitalize = void 0;
 const intrinsic_1 = require("./intrinsic");
-const type_1 = require("../clone/type");
 function Capitalize(T, options = {}) {
-    return (0, type_1.CloneType)((0, intrinsic_1.Intrinsic)(T, 'Capitalize'), options);
+    return (0, intrinsic_1.Intrinsic)(T, 'Capitalize', options);
 }
 exports.Capitalize = Capitalize;

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

@@ -1,5 +1,5 @@
 export * from './capitalize';
-export * from './intrinsic-mapped-result';
+export * from './intrinsic-from-mapped-key';
 export * from './intrinsic';
 export * from './lowercase';
 export * from './uncapitalize';

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

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./capitalize"), exports);
-__exportStar(require("./intrinsic-mapped-result"), exports);
+__exportStar(require("./intrinsic-from-mapped-key"), exports);
 __exportStar(require("./intrinsic"), exports);
 __exportStar(require("./lowercase"), exports);
 __exportStar(require("./uncapitalize"), exports);

package/build/require/type/intrinsic/{intrinsic-mapped-result.d.ts → intrinsic-from-mapped-key.d.ts}

@@ -1,3 +1,4 @@
+import type { SchemaOptions } from '../schema/index';
 import type { TProperties } from '../object/index';
 import { type TMappedResult, type TMappedKey } from '../mapped/index';
 import { type TIntrinsic, type IntrinsicMode } from './intrinsic';
@@ -5,11 +6,11 @@ import { TLiteral, TLiteralValue } from '../literal/index';
 type MappedIntrinsicPropertyKey<K extends PropertyKey, M extends IntrinsicMode, P extends TLiteralValue = K extends TLiteralValue ? K : never> = {
     [_ in K]: TIntrinsic<TLiteral<P>, M>;
 };
-declare function MappedIntrinsicPropertyKey<K extends PropertyKey, M extends IntrinsicMode>(K: K, M: M): MappedIntrinsicPropertyKey<K, M>;
+declare function MappedIntrinsicPropertyKey<K extends PropertyKey, M extends IntrinsicMode>(K: K, M: M, options: SchemaOptions): MappedIntrinsicPropertyKey<K, M>;
 type MappedIntrinsicPropertyKeys<K extends PropertyKey[], M extends IntrinsicMode> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? MappedIntrinsicPropertyKey<L, M> & MappedIntrinsicPropertyKeys<R, M> : {});
-declare function MappedIntrinsicPropertyKeys<K extends PropertyKey[], M extends IntrinsicMode>(K: [...K], M: M): MappedIntrinsicPropertyKeys<K, M>;
+declare function MappedIntrinsicPropertyKeys<K extends PropertyKey[], M extends IntrinsicMode>(K: [...K], M: M, options: SchemaOptions): MappedIntrinsicPropertyKeys<K, M>;
 type MappedIntrinsicProperties<K extends TMappedKey, M extends IntrinsicMode> = (MappedIntrinsicPropertyKeys<K['keys'], M>);
-declare function MappedIntrinsicProperties<K extends TMappedKey, M extends IntrinsicMode>(T: K, M: M): MappedIntrinsicProperties<K, M>;
-export type TIntrinsicMappedResult<K extends TMappedKey, M extends IntrinsicMode, P extends TProperties = MappedIntrinsicProperties<K, M>> = (TMappedResult<P>);
-export declare function IntrinsicMappedResult<K extends TMappedKey, M extends IntrinsicMode, P extends TProperties = MappedIntrinsicProperties<K, M>>(T: K, M: M): TMappedResult<P>;
+declare function MappedIntrinsicProperties<K extends TMappedKey, M extends IntrinsicMode>(T: K, M: M, options: SchemaOptions): MappedIntrinsicProperties<K, M>;
+export type TIntrinsicFromMappedKey<K extends TMappedKey, M extends IntrinsicMode, P extends TProperties = MappedIntrinsicProperties<K, M>> = (TMappedResult<P>);
+export declare function IntrinsicFromMappedKey<K extends TMappedKey, M extends IntrinsicMode, P extends TProperties = MappedIntrinsicProperties<K, M>>(T: K, M: M, options: SchemaOptions): TMappedResult<P>;
 export {};

package/build/require/type/intrinsic/intrinsic-from-mapped-key.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntrinsicFromMappedKey = void 0;
+const index_1 = require("../mapped/index");
+const intrinsic_1 = require("./intrinsic");
+const index_2 = require("../literal/index");
+function MappedIntrinsicPropertyKey(K, M, options) {
+    return {
+        [K]: (0, intrinsic_1.Intrinsic)((0, index_2.Literal)(K), M, options)
+    };
+}
+function MappedIntrinsicPropertyKeys(K, M, options) {
+    const [L, ...R] = K;
+    return (K.length > 0
+        ? { ...MappedIntrinsicPropertyKey(L, M, options), ...MappedIntrinsicPropertyKeys(R, M, options) }
+        : {});
+}
+function MappedIntrinsicProperties(T, M, options) {
+    return MappedIntrinsicPropertyKeys(T['keys'], M, options);
+}
+function IntrinsicFromMappedKey(T, M, options) {
+    const P = MappedIntrinsicProperties(T, M, options);
+    return (0, index_1.MappedResult)(P);
+}
+exports.IntrinsicFromMappedKey = IntrinsicFromMappedKey;

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

@@ -1,17 +1,17 @@
-import type { TSchema } from '../schema/index';
+import type { TSchema, SchemaOptions } from '../schema/index';
 import { type TTemplateLiteral, type TTemplateLiteralKind } from '../template-literal/index';
-import { type TIntrinsicMappedResult } from './intrinsic-mapped-result';
+import { type TIntrinsicFromMappedKey } from './intrinsic-from-mapped-key';
 import { type TLiteral, type TLiteralValue } from '../literal/index';
 import { type TUnion } from '../union/index';
 import { type TMappedKey } from '../mapped/index';
 export type IntrinsicMode = 'Uppercase' | 'Lowercase' | 'Capitalize' | 'Uncapitalize';
 type FromTemplateLiteral<T extends TTemplateLiteralKind[], M extends IntrinsicMode> = M extends IntrinsicMode ? T extends [infer L extends TTemplateLiteralKind, ...infer R extends TTemplateLiteralKind[]] ? [TIntrinsic<L, M>, ...FromTemplateLiteral<R, M>] : T : T;
-declare function FromTemplateLiteral<T extends TTemplateLiteralKind[], M extends IntrinsicMode>(schema: TTemplateLiteral, mode: IntrinsicMode): FromTemplateLiteral<T, M>;
+declare function FromTemplateLiteral<T extends TTemplateLiteralKind[], M extends IntrinsicMode>(schema: TTemplateLiteral, mode: IntrinsicMode, options: SchemaOptions): FromTemplateLiteral<T, M>;
 type FromLiteralValue<T, M extends IntrinsicMode> = (T extends string ? M extends 'Uncapitalize' ? Uncapitalize<T> : M extends 'Capitalize' ? Capitalize<T> : M extends 'Uppercase' ? Uppercase<T> : M extends 'Lowercase' ? Lowercase<T> : string : T);
 declare function FromLiteralValue(value: TLiteralValue, mode: IntrinsicMode): string;
 type FromRest<T extends TSchema[], M extends IntrinsicMode> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [TIntrinsic<L, M>, ...FromRest<R, M>] : [];
 declare function FromRest<T extends TSchema[], M extends IntrinsicMode>(T: [...T], mode: M): FromRest<T, M>;
-export type TIntrinsic<T extends TSchema, M extends IntrinsicMode> = T extends TMappedKey ? TIntrinsicMappedResult<T, M> : T extends TTemplateLiteral<infer S> ? TTemplateLiteral<FromTemplateLiteral<S, M>> : T extends TUnion<infer S> ? TUnion<FromRest<S, M>> : T extends TLiteral<infer S> ? TLiteral<FromLiteralValue<S, M>> : T;
-export declare function Intrinsic<T extends TMappedKey, M extends IntrinsicMode>(schema: T, mode: M): TIntrinsicMappedResult<T, M>;
-export declare function Intrinsic<T extends TSchema, M extends IntrinsicMode>(schema: T, mode: M): TIntrinsic<T, M>;
+export type TIntrinsic<T extends TSchema, M extends IntrinsicMode> = T extends TMappedKey ? TIntrinsicFromMappedKey<T, M> : T extends TTemplateLiteral<infer S> ? TTemplateLiteral<FromTemplateLiteral<S, M>> : T extends TUnion<infer S> ? TUnion<FromRest<S, M>> : T extends TLiteral<infer S> ? TLiteral<FromLiteralValue<S, M>> : T;
+export declare function Intrinsic<T extends TMappedKey, M extends IntrinsicMode>(schema: T, mode: M, options?: SchemaOptions): TIntrinsicFromMappedKey<T, M>;
+export declare function Intrinsic<T extends TSchema, M extends IntrinsicMode>(schema: T, mode: M, options?: SchemaOptions): TIntrinsic<T, M>;
 export {};

package/build/require/type/intrinsic/intrinsic.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Intrinsic = void 0;
 const index_1 = require("../template-literal/index");
-const intrinsic_mapped_result_1 = require("./intrinsic-mapped-result");
+const intrinsic_from_mapped_key_1 = require("./intrinsic-from-mapped-key");
 const index_2 = require("../literal/index");
 const index_3 = require("../union/index");
 const type_1 = require("../guard/type");
@@ -20,7 +20,7 @@ function ApplyUppercase(value) {
 function ApplyLowercase(value) {
     return value.toLowerCase();
 }
-function FromTemplateLiteral(schema, mode) {
+function FromTemplateLiteral(schema, mode, options) {
     const expression = (0, index_1.TemplateLiteralParseExact)(schema.pattern);
     const finite = (0, index_1.IsTemplateLiteralFinite)(expression);
     if (!finite)
@@ -29,7 +29,7 @@ function FromTemplateLiteral(schema, mode) {
     const literals = strings.map((value) => (0, index_2.Literal)(value));
     const mapped = FromRest(literals, mode);
     const union = (0, index_3.Union)(mapped);
-    return (0, index_1.TemplateLiteral)([union]);
+    return (0, index_1.TemplateLiteral)([union], options);
 }
 function FromLiteralValue(value, mode) {
     return (typeof value === 'string' ? (mode === 'Uncapitalize' ? ApplyUncapitalize(value) :
@@ -42,11 +42,11 @@ function FromRest(T, mode) {
     const [L, ...R] = T;
     return (T.length > 0 ? [Intrinsic(L, mode), ...FromRest(R, mode)] : []);
 }
-function Intrinsic(schema, mode) {
-    return ((0, type_1.TMappedKey)(schema) ? (0, intrinsic_mapped_result_1.IntrinsicMappedResult)(schema, mode) :
-        (0, type_1.TTemplateLiteral)(schema) ? FromTemplateLiteral(schema, mode) :
-            (0, type_1.TUnion)(schema) ? (0, index_3.Union)(FromRest(schema.anyOf, mode)) :
-                (0, type_1.TLiteral)(schema) ? (0, index_2.Literal)(FromLiteralValue(schema.const, mode)) :
+function Intrinsic(schema, mode, options = {}) {
+    return ((0, type_1.TMappedKey)(schema) ? (0, intrinsic_from_mapped_key_1.IntrinsicFromMappedKey)(schema, mode, options) :
+        (0, type_1.TTemplateLiteral)(schema) ? FromTemplateLiteral(schema, mode, schema) :
+            (0, type_1.TUnion)(schema) ? (0, index_3.Union)(FromRest(schema.anyOf, mode), options) :
+                (0, type_1.TLiteral)(schema) ? (0, index_2.Literal)(FromLiteralValue(schema.const, mode), options) :
                     schema);
 }
 exports.Intrinsic = Intrinsic;

package/build/require/type/intrinsic/lowercase.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lowercase = void 0;
 const intrinsic_1 = require("./intrinsic");
-const type_1 = require("../clone/type");
 function Lowercase(T, options = {}) {
-    return (0, type_1.CloneType)((0, intrinsic_1.Intrinsic)(T, 'Lowercase'), options);
+    return (0, intrinsic_1.Intrinsic)(T, 'Lowercase', options);
 }
 exports.Lowercase = Lowercase;

package/build/require/type/intrinsic/uncapitalize.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uncapitalize = void 0;
 const intrinsic_1 = require("./intrinsic");
-const type_1 = require("../clone/type");
 function Uncapitalize(T, options = {}) {
-    return (0, type_1.CloneType)((0, intrinsic_1.Intrinsic)(T, 'Uncapitalize'), options);
+    return (0, intrinsic_1.Intrinsic)(T, 'Uncapitalize', options);
 }
 exports.Uncapitalize = Uncapitalize;

package/build/require/type/intrinsic/uppercase.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uppercase = void 0;
 const intrinsic_1 = require("./intrinsic");
-const type_1 = require("../clone/type");
 function Uppercase(T, options = {}) {
-    return (0, type_1.CloneType)((0, intrinsic_1.Intrinsic)(T, 'Uppercase'), options);
+    return (0, intrinsic_1.Intrinsic)(T, 'Uppercase', options);
 }
 exports.Uppercase = Uppercase;

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

@@ -1,2 +1,3 @@
+export * from './keyof-from-mapped-result';
 export * from './keyof-property-keys';
 export * from './keyof';