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

package/build/import/index.d.mts

@@ -16,18 +16,18 @@ export { ConstructorParameters, type TConstructorParameters } from './type/const
 export { Date, type TDate, type DateOptions } from './type/date/index.mjs';
 export { Deref, type TDeref } from './type/deref/index.mjs';
 export { Enum, type TEnum } from './type/enum/index.mjs';
-export { Exclude, type TExclude } from './type/exclude/index.mjs';
-export { Extends, type TExtends, ExtendsCheck, ExtendsResult, ExtendsUndefinedCheck } from './type/extends/index.mjs';
-export { Extract, type TExtract } from './type/extract/index.mjs';
+export { Exclude, type TExclude, type TExcludeFromMappedResult } from './type/exclude/index.mjs';
+export { Extends, type TExtends, type ExtendsFromMappedResult, type ExtendsFromMappedKey, ExtendsCheck, ExtendsResult, ExtendsUndefinedCheck } from './type/extends/index.mjs';
+export { Extract, type TExtract, type TExtractFromMappedResult } from './type/extract/index.mjs';
 export { Function, type TFunction } from './type/function/index.mjs';
 export { Increment, type Assert, type AssertType, type AssertRest, type AssertProperties, type Ensure, type Evaluate, type TupleToIntersect, type TupleToUnion, type UnionToTuple } from './type/helpers/index.mjs';
-export { Index, IndexPropertyKeys, IndexMappedResult, type TIndex, type TIndexPropertyKeys, type TIndexMappedResult } from './type/indexed/index.mjs';
+export { Index, IndexPropertyKeys, IndexFromMappedKey, type TIndex, type TIndexPropertyKeys, type TIndexFromMappedKey } from './type/indexed/index.mjs';
 export { InstanceType, type TInstanceType } from './type/instance-type/index.mjs';
 export { Integer, type TInteger, type IntegerOptions } from './type/integer/index.mjs';
-export { Intersect, type TIntersect, type IntersectOptions } from './type/intersect/index.mjs';
+export { Intersect, IntersectEvaluated, type TIntersect, type IntersectOptions } from './type/intersect/index.mjs';
 export { Iterator, type TIterator } from './type/iterator/index.mjs';
-export { Intrinsic, type TIntrinsic, Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase } from './type/intrinsic/index.mjs';
-export { KeyOf, type TKeyOf, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index.mjs';
+export { Intrinsic, IntrinsicFromMappedKey, type TIntrinsic, Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase } from './type/intrinsic/index.mjs';
+export { KeyOf, type TKeyOf, type KeyOfFromMappedResult, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index.mjs';
 export { Literal, type TLiteral } from './type/literal/index.mjs';
 export { Mapped, MappedKey, MappedResult, type TMapped, type TMappedKey, type TMappedResult, type TMappedFunction } from './type/mapped/index.mjs';
 export { Never, type TNever } from './type/never/index.mjs';
@@ -35,11 +35,11 @@ export { Not, type TNot } from './type/not/index.mjs';
 export { Null, type TNull } from './type/null/index.mjs';
 export { Number, type TNumber, type NumberOptions } from './type/number/index.mjs';
 export { Object, type TObject, type TProperties, type ObjectOptions } from './type/object/index.mjs';
-export { Omit, type TOmit, type TOmitMappedResult } from './type/omit/index.mjs';
+export { Omit, type TOmit, type TOmitFromMappedKey } from './type/omit/index.mjs';
 export { Optional, type TOptional } from './type/optional/index.mjs';
 export { Parameters, type TParameters } from './type/parameters/index.mjs';
-export { Partial, type TPartial } from './type/partial/index.mjs';
-export { Pick, type TPick, type TPickMappedResult } from './type/pick/index.mjs';
+export { Partial, PartialFromMappedResult, type TPartial, type TPartialFromMappedResult } from './type/partial/index.mjs';
+export { Pick, type TPick, type TPickFromMappedKey } from './type/pick/index.mjs';
 export { Promise, type TPromise } from './type/promise/index.mjs';
 export { Readonly, type TReadonly } from './type/readonly/index.mjs';
 export { ReadonlyOptional, type TReadonlyOptional } from './type/readonly-optional/index.mjs';
@@ -47,7 +47,7 @@ export { Record, type TRecord } from './type/record/index.mjs';
 export { Recursive, type TRecursive, type TThis } from './type/recursive/index.mjs';
 export { Ref, type TRef } from './type/ref/index.mjs';
 export { RegExp, type TRegExp } from './type/regexp/index.mjs';
-export { Required, type TRequired } from './type/required/index.mjs';
+export { Required, type TRequired, type TRequiredFromMappedResult } from './type/required/index.mjs';
 export { Rest, type TRest } from './type/rest/index.mjs';
 export { ReturnType, type TReturnType } from './type/return-type/index.mjs';
 export { type TSchema, type TKind, type SchemaOptions, type TAnySchema } from './type/schema/index.mjs';
@@ -60,7 +60,7 @@ export { Transform, type TTransform, type TransformOptions, type TransformFuncti
 export { Tuple, type TTuple } from './type/tuple/index.mjs';
 export { Uint8Array, type TUint8Array, type Uint8ArrayOptions } from './type/uint8array/index.mjs';
 export { Undefined, type TUndefined } from './type/undefined/index.mjs';
-export { Union, type TUnion } from './type/union/index.mjs';
+export { Union, UnionEvaluated, type TUnion } from './type/union/index.mjs';
 export { Unknown, type TUnknown } from './type/unknown/index.mjs';
 export { Unsafe, type TUnsafe } from './type/unsafe/index.mjs';
 export { Void, type TVoid } from './type/void/index.mjs';

package/build/import/index.mjs

@@ -21,12 +21,12 @@ export { Extends, ExtendsCheck, ExtendsResult, ExtendsUndefinedCheck } from './t
 export { Extract } from './type/extract/index.mjs';
 export { Function } from './type/function/index.mjs';
 export { Increment } from './type/helpers/index.mjs';
-export { Index, IndexPropertyKeys, IndexMappedResult } from './type/indexed/index.mjs';
+export { Index, IndexPropertyKeys, IndexFromMappedKey } from './type/indexed/index.mjs';
 export { InstanceType } from './type/instance-type/index.mjs';
 export { Integer } from './type/integer/index.mjs';
-export { Intersect } from './type/intersect/index.mjs';
+export { Intersect, IntersectEvaluated } from './type/intersect/index.mjs';
 export { Iterator } from './type/iterator/index.mjs';
-export { Intrinsic, Capitalize, Lowercase, Uncapitalize, Uppercase } from './type/intrinsic/index.mjs';
+export { Intrinsic, IntrinsicFromMappedKey, Capitalize, Lowercase, Uncapitalize, Uppercase } from './type/intrinsic/index.mjs';
 export { KeyOf, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index.mjs';
 export { Literal } from './type/literal/index.mjs';
 export { Mapped, MappedKey, MappedResult } from './type/mapped/index.mjs';
@@ -38,7 +38,7 @@ export { Object } from './type/object/index.mjs';
 export { Omit } from './type/omit/index.mjs';
 export { Optional } from './type/optional/index.mjs';
 export { Parameters } from './type/parameters/index.mjs';
-export { Partial } from './type/partial/index.mjs';
+export { Partial, PartialFromMappedResult } from './type/partial/index.mjs';
 export { Pick } from './type/pick/index.mjs';
 export { Promise } from './type/promise/index.mjs';
 export { Readonly } from './type/readonly/index.mjs';
@@ -58,7 +58,7 @@ export { Transform, TransformDecodeBuilder, TransformEncodeBuilder } from './typ
 export { Tuple } from './type/tuple/index.mjs';
 export { Uint8Array } from './type/uint8array/index.mjs';
 export { Undefined } from './type/undefined/index.mjs';
-export { Union } from './type/union/index.mjs';
+export { Union, UnionEvaluated } from './type/union/index.mjs';
 export { Unknown } from './type/unknown/index.mjs';
 export { Unsafe } from './type/unsafe/index.mjs';
 export { Void } from './type/void/index.mjs';

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

@@ -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/import/type/constructor/constructor.d.mts

@@ -2,12 +2,12 @@ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import type { Ensure } from '../helpers/index.mjs';
 import { Kind } from '../symbols/index.mjs';
-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/import/type/exclude/exclude-from-mapped-result.d.mts

@@ -0,0 +1,13 @@
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import { type TMappedResult } from '../mapped/index.mjs';
+import { type TExclude } from './exclude.mjs';
+type FromProperties<K extends TProperties, U extends TSchema> = ({
+    [K2 in keyof K]: TExclude<K[K2], U>;
+});
+declare function FromProperties<K extends TProperties, U extends TSchema>(K: K, U: U, options: SchemaOptions): FromProperties<K, U>;
+type FromMappedResult<K extends TMappedResult, U extends TSchema> = (FromProperties<K['properties'], U>);
+declare function FromMappedResult<K extends TMappedResult, U extends TSchema>(K: K, U: U, options: SchemaOptions): FromMappedResult<K, U>;
+export type TExcludeFromMappedResult<T extends TMappedResult, U extends TSchema, P extends TProperties = FromMappedResult<T, U>> = (TMappedResult<P>);
+export declare function ExcludeFromMappedResult<T extends TMappedResult, U extends TSchema, P extends TProperties = FromMappedResult<T, U>>(T: T, U: U, options: SchemaOptions): TMappedResult<P>;
+export {};

package/build/import/type/exclude/exclude-from-mapped-result.mjs

@@ -0,0 +1,14 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Exclude } from './exclude.mjs';
+function FromProperties(K, U, options) {
+    return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Exclude(K[K2], U, options) };
+    }, {});
+}
+function FromMappedResult(K, U, options) {
+    return FromProperties(K.properties, U, options);
+}
+export function ExcludeFromMappedResult(T, U, options) {
+    const P = FromMappedResult(T, U, options);
+    return MappedResult(P);
+}

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

@@ -1,20 +1,23 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { UnionToTuple, AssertRest, AssertType, Assert } from '../helpers/index.mjs';
+import type { TMappedResult } from '../mapped/index.mjs';
 import { type TTemplateLiteral } from '../template-literal/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { type TLiteral } from '../literal/index.mjs';
 import { type Static } from '../static/index.mjs';
-import { UnionResolve } from '../union/index.mjs';
-type ExcludeTemplateLiteralResult<T extends string> = UnionResolve<AssertRest<UnionToTuple<{
+import { UnionEvaluated } from '../union/index.mjs';
+import { type TExcludeFromMappedResult } from './exclude-from-mapped-result.mjs';
+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;
-export declare function ExcludeResolve<L extends TSchema, R extends TSchema>(L: L, R: R): ExcludeResolve<L, R>;
+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>;
+export declare function Exclude<L extends TMappedResult, R extends TSchema>(unionType: L, excludedMembers: R, options?: SchemaOptions): TExcludeFromMappedResult<L, R>;
 export declare function Exclude<L extends TSchema, R extends TSchema>(unionType: L, excludedMembers: R, options?: SchemaOptions): TExclude<L, R>;
 export {};

package/build/import/type/exclude/exclude.mjs

@@ -3,8 +3,9 @@ import { Union } from '../union/index.mjs';
 import { Never } from '../never/index.mjs';
 import { ExtendsCheck, ExtendsResult } from '../extends/index.mjs';
 import { CloneType } from '../clone/type.mjs';
-import { TTemplateLiteral as IsTemplateLiteralType, TUnion as IsUnionType } from '../guard/type.mjs';
-export function ExcludeResolve(L, R) {
+import { ExcludeFromMappedResult } from './exclude-from-mapped-result.mjs';
+import { TMappedResult as IsMappedResultType, TTemplateLiteral as IsTemplateLiteralType, TUnion as IsUnionType } from '../guard/type.mjs';
+function ExcludeResolve(L, R) {
     return (IsTemplateLiteralType(L) ? ExcludeResolve(TemplateLiteralToUnion(L), R) :
         IsTemplateLiteralType(R) ? ExcludeResolve(L, TemplateLiteralToUnion(R)) :
             IsUnionType(L) ? (() => {
@@ -15,6 +16,11 @@ export function ExcludeResolve(L, R) {
                     L);
 }
 export function Exclude(unionType, excludedMembers, options = {}) {
-    const E = ExcludeResolve(unionType, excludedMembers);
-    return CloneType(E, options);
+    if (IsMappedResultType(unionType)) {
+        return ExcludeFromMappedResult(unionType, excludedMembers, options);
+    }
+    else {
+        const E = ExcludeResolve(unionType, excludedMembers);
+        return CloneType(E, options);
+    }
 }

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

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

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

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

package/build/import/type/extends/extends-from-mapped-key.d.mts

@@ -0,0 +1,17 @@
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import type { Assert } from '../helpers/index.mjs';
+import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
+import { TLiteral, TLiteralValue } from '../literal/index.mjs';
+import { type TExtends } from './extends.mjs';
+type FromPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema> = {
+    [_ in K]: TExtends<TLiteral<Assert<K, TLiteralValue>>, U, L, R>;
+};
+declare function FromPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R, options: SchemaOptions): FromPropertyKey<K, U, L, R>;
+type FromPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? FromPropertyKey<LK, U, L, R> & FromPropertyKeys<RK, U, L, R> : {});
+declare function FromPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema>(K: [...K], U: U, L: L, R: R, options: SchemaOptions): FromPropertyKeys<K, U, L, R>;
+type FromMappedKey<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema> = (FromPropertyKeys<K['keys'], U, L, R>);
+declare function FromMappedKey<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R, options: SchemaOptions): FromMappedKey<K, U, L, R>;
+export type TExtendsFromMappedKey<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = FromMappedKey<T, U, L, R>> = (TMappedResult<P>);
+export declare function ExtendsFromMappedKey<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = FromMappedKey<T, U, L, R>>(T: T, U: U, L: L, R: R, options: SchemaOptions): TMappedResult<P>;
+export {};

package/build/import/type/extends/extends-from-mapped-key.mjs

@@ -0,0 +1,21 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Literal } from '../literal/index.mjs';
+import { Extends } from './extends.mjs';
+function FromPropertyKey(K, U, L, R, options) {
+    return {
+        [K]: Extends(Literal(K), U, L, R, options)
+    };
+}
+function FromPropertyKeys(K, U, L, R, options) {
+    const [LK, ...RK] = K;
+    return (K.length > 0
+        ? { ...FromPropertyKey(LK, U, L, R, options), ...FromPropertyKeys(RK, U, L, R, options) }
+        : {});
+}
+function FromMappedKey(K, U, L, R, options) {
+    return FromPropertyKeys(K.keys, U, L, R, options);
+}
+export function ExtendsFromMappedKey(T, U, L, R, options) {
+    const P = FromMappedKey(T, U, L, R, options);
+    return MappedResult(P);
+}

package/build/import/type/extends/extends-from-mapped-result.d.mts

@@ -0,0 +1,13 @@
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import { type TMappedResult } from '../mapped/index.mjs';
+import { type TExtends } from './extends.mjs';
+type FromProperties<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema> = ({
+    [K2 in keyof K]: TExtends<K[K2], U, L, R>;
+});
+declare function FromProperties<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R, options: SchemaOptions): FromProperties<K, U, L, R>;
+type FromMappedResult<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema> = (FromProperties<K['properties'], U, L, R>);
+declare function FromMappedResult<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R, options: SchemaOptions): FromMappedResult<K, U, L, R>;
+export type TExtendsFromMappedResult<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = FromMappedResult<T, U, L, R>> = (TMappedResult<P>);
+export declare function ExtendsFromMappedResult<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = FromMappedResult<T, U, L, R>>(T: T, U: U, L: L, R: R, options: SchemaOptions): TMappedResult<P>;
+export {};

package/build/import/type/extends/extends-from-mapped-result.mjs

@@ -0,0 +1,14 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Extends } from './extends.mjs';
+function FromProperties(K, U, L, R, options) {
+    return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Extends(K[K2], U, L, R, options) };
+    }, {});
+}
+function FromMappedResult(K, U, L, R, options) {
+    return FromProperties(K.properties, U, L, R, options);
+}
+export function ExtendsFromMappedResult(T, U, L, R, options) {
+    const P = FromMappedResult(T, U, L, R, options);
+    return MappedResult(P);
+}

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

@@ -3,12 +3,12 @@ import type { Static } from '../static/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { TMappedKey, TMappedResult } from '../mapped/index.mjs';
 import { UnionToTuple } from '../helpers/index.mjs';
-import { type TExtendsMappedResult } from './extends-mapped-result.mjs';
-import { type TExtendsMappedResultFromResult } from './extends-mapped-result-from-result.mjs';
+import { type TExtendsFromMappedKey } from './extends-from-mapped-key.mjs';
+import { type TExtendsFromMappedResult } from './extends-from-mapped-result.mjs';
 type ExtendsResolve<L extends TSchema, R extends TSchema, T extends TSchema, U extends TSchema> = ((Static<L> extends Static<R> ? T : U) extends infer O extends TSchema ? UnionToTuple<O> extends [infer X extends TSchema, infer Y extends TSchema] ? TUnion<[X, Y]> : O : never);
 declare function ExtendsResolve<L extends TSchema, R extends TSchema, T extends TSchema, U extends TSchema>(left: L, right: R, trueType: T, falseType: U): ExtendsResolve<L, R, T, U>;
 export type TExtends<L extends TSchema, R extends TSchema, T extends TSchema, F extends TSchema> = ExtendsResolve<L, R, T, F>;
-export declare function Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResultFromResult<L, R, T, F>;
-export declare function Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsMappedResult<L, R, T, F>;
+export declare function Extends<L extends TMappedResult, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsFromMappedResult<L, R, T, F>;
+export declare function Extends<L extends TMappedKey, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtendsFromMappedKey<L, R, T, F>;
 export declare function Extends<L extends TSchema, R extends TSchema, T extends TSchema, F extends TSchema>(L: L, R: R, T: T, F: F, options?: SchemaOptions): TExtends<L, R, T, F>;
 export {};

package/build/import/type/extends/extends.mjs

@@ -1,9 +1,9 @@
-import { TMappedKey as IsMappedKeyType, TMappedResult as IsMappedResultType } from '../guard/type.mjs';
 import { Union } from '../union/index.mjs';
 import { ExtendsCheck, ExtendsResult } from './extends-check.mjs';
 import { CloneType } from '../clone/type.mjs';
-import { ExtendsMappedResult } from './extends-mapped-result.mjs';
-import { ExtendsMappedResultFromResult } from './extends-mapped-result-from-result.mjs';
+import { ExtendsFromMappedKey } from './extends-from-mapped-key.mjs';
+import { ExtendsFromMappedResult } from './extends-from-mapped-result.mjs';
+import { TMappedKey as IsMappedKeyType, TMappedResult as IsMappedResultType } from '../guard/type.mjs';
 function ExtendsResolve(left, right, trueType, falseType) {
     const R = ExtendsCheck(left, right);
     return (R === ExtendsResult.Union ? Union([trueType, falseType]) :
@@ -11,7 +11,7 @@ function ExtendsResolve(left, right, trueType, falseType) {
             falseType);
 }
 export function Extends(L, R, T, F, options = {}) {
-    return (IsMappedResultType(L) ? CloneType(ExtendsMappedResultFromResult(L, R, T, F), options) :
-        IsMappedKeyType(L) ? CloneType(ExtendsMappedResult(L, R, T, F), options) :
+    return (IsMappedResultType(L) ? ExtendsFromMappedResult(L, R, T, F, options) :
+        IsMappedKeyType(L) ? CloneType(ExtendsFromMappedKey(L, R, T, F, options)) :
             CloneType(ExtendsResolve(L, R, T, F), options));
 }

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

@@ -1,5 +1,5 @@
 export * from './extends-check.mjs';
-export * from './extends-mapped-result-from-result.mjs';
-export * from './extends-mapped-result.mjs';
+export * from './extends-from-mapped-key.mjs';
+export * from './extends-from-mapped-result.mjs';
 export * from './extends-undefined.mjs';
 export * from './extends.mjs';

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

@@ -1,5 +1,5 @@
 export * from './extends-check.mjs';
-export * from './extends-mapped-result-from-result.mjs';
-export * from './extends-mapped-result.mjs';
+export * from './extends-from-mapped-key.mjs';
+export * from './extends-from-mapped-result.mjs';
 export * from './extends-undefined.mjs';
 export * from './extends.mjs';

package/build/import/type/extract/extract-from-mapped-result.d.mts

@@ -0,0 +1,13 @@
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import { type TMappedResult } from '../mapped/index.mjs';
+import { type TExtract } from './extract.mjs';
+type FromProperties<K extends TProperties, U extends TSchema> = ({
+    [K2 in keyof K]: TExtract<K[K2], U>;
+});
+declare function FromProperties<K extends TProperties, U extends TSchema>(K: K, U: U, options: SchemaOptions): FromProperties<K, U>;
+type FromMappedResult<K extends TMappedResult, U extends TSchema> = (FromProperties<K['properties'], U>);
+declare function FromMappedResult<K extends TMappedResult, U extends TSchema>(K: K, U: U, options: SchemaOptions): FromMappedResult<K, U>;
+export type TExtractFromMappedResult<T extends TMappedResult, U extends TSchema, P extends TProperties = FromMappedResult<T, U>> = (TMappedResult<P>);
+export declare function ExtractFromMappedResult<T extends TMappedResult, U extends TSchema, P extends TProperties = FromMappedResult<T, U>>(T: T, U: U, options: SchemaOptions): TMappedResult<P>;
+export {};

package/build/import/type/extract/extract-from-mapped-result.mjs

@@ -0,0 +1,14 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Extract } from './extract.mjs';
+function FromProperties(K, U, options) {
+    return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Extract(K[K2], U, options) };
+    }, {});
+}
+function FromMappedResult(K, U, options) {
+    return FromProperties(K.properties, U, options);
+}
+export function ExtractFromMappedResult(T, U, options) {
+    const P = FromMappedResult(T, U, options);
+    return MappedResult(P);
+}

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

@@ -1,19 +1,22 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Assert, AssertRest, AssertType, UnionToTuple } from '../helpers/index.mjs';
+import type { TMappedResult } from '../mapped/index.mjs';
 import { type TTemplateLiteral } from '../template-literal/index.mjs';
 import { type TLiteral } from '../literal/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type Static } from '../static/index.mjs';
-import { UnionResolve } from '../union/index.mjs';
-type FromTemplateLiteralResult<T extends string> = UnionResolve<AssertRest<UnionToTuple<{
+import { UnionEvaluated } from '../union/index.mjs';
+import { type TExtractFromMappedResult } from './extract-from-mapped-result.mjs';
+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>;
+export declare function Extract<L extends TMappedResult, R extends TSchema>(type: L, union: R, options?: SchemaOptions): TExtractFromMappedResult<L, R>;
 export declare function Extract<L extends TSchema, R extends TSchema>(type: L, union: R, options?: SchemaOptions): TExtract<L, R>;
 export {};

package/build/import/type/extract/extract.mjs

@@ -3,7 +3,8 @@ import { Union } from '../union/index.mjs';
 import { Never } from '../never/index.mjs';
 import { ExtendsCheck, ExtendsResult } from '../extends/index.mjs';
 import { CloneType } from '../clone/type.mjs';
-import { TTemplateLiteral as IsTemplateLiteralType, TUnion as IsUnionType } from '../guard/type.mjs';
+import { ExtractFromMappedResult } from './extract-from-mapped-result.mjs';
+import { TMappedResult as IsMappedResultType, TTemplateLiteral as IsTemplateLiteralType, TUnion as IsUnionType } from '../guard/type.mjs';
 export function ExtractResolve(L, R) {
     return (IsTemplateLiteralType(L) ? ExtractResolve(TemplateLiteralToUnion(L), R) :
         IsTemplateLiteralType(R) ? ExtractResolve(L, TemplateLiteralToUnion(R)) :
@@ -15,6 +16,11 @@ export function ExtractResolve(L, R) {
                     Never());
 }
 export function Extract(type, union, options = {}) {
-    const E = ExtractResolve(type, union);
-    return CloneType(E, options);
+    if (IsMappedResultType(type)) {
+        return ExtractFromMappedResult(type, union, options);
+    }
+    else {
+        const E = ExtractResolve(type, union);
+        return CloneType(E, options);
+    }
 }

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

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

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

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

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

@@ -2,12 +2,12 @@ import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import type { Ensure } from '../helpers/index.mjs';
 import { Kind } from '../symbols/index.mjs';
-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/import/type/indexed/index.d.mts

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

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

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

package/build/import/type/indexed/{indexed-mapped-result.d.mts → indexed-from-mapped-key.d.mts}

@@ -1,4 +1,4 @@
-import { type TSchema } from '../schema/index.mjs';
+import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import { type TProperties } from '../object/index.mjs';
 import { type TIndexResult } from './indexed-result.mjs';
 import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
@@ -6,11 +6,11 @@ import { Evaluate } from '../helpers/index.mjs';
 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/import/type/indexed/indexed-from-mapped-key.mjs

@@ -0,0 +1,18 @@
+import { IndexResult } from './indexed-result.mjs';
+import { MappedResult } from '../mapped/index.mjs';
+function MappedIndexPropertyKey(T, K, options) {
+    return { [K]: 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);
+}
+export function IndexFromMappedKey(T, K, options) {
+    const P = MappedIndexProperties(T, K, options);
+    return MappedResult(P);
+}

package/build/import/type/indexed/indexed-result.d.mts

@@ -1,4 +1,4 @@
-import { type TSchema } from '../schema/index.mjs';
+import { type TSchema, SchemaOptions } from '../schema/index.mjs';
 import { type TObject, type TProperties } from '../object/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { type TRecursive } from '../recursive/index.mjs';
@@ -6,19 +6,19 @@ import { type TIntersect } from '../intersect/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type TTuple } from '../tuple/index.mjs';
 import { type TArray } from '../array/index.mjs';
-import { IntersectResolve } from '../intersect/index.mjs';
-import { UnionResolve } from '../union/index.mjs';
+import { IntersectEvaluated } from '../intersect/index.mjs';
+import { UnionEvaluated } from '../union/index.mjs';
 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 {};