@sinclair/typebox 0.32.0-dev-26 → 0.32.0-dev-28

package/build/import/type/mapped/mapped.mjs

@@ -16,6 +16,8 @@ import { Promise } from '../promise/index.mjs';
 import { Readonly } from '../readonly/index.mjs';
 import { Tuple } from '../tuple/index.mjs';
 import { Union } from '../union/index.mjs';
+// operator
+import { SetIncludes } from '../sets/index.mjs';
 // mapping types
 import { MappedResult } from './mapped-result.mjs';
 // ------------------------------------------------------------------
@@ -30,11 +32,20 @@ function FromMappedResult(K, P) {
         : MappedResult(P));
 }
 // prettier-ignore
-function MappedKeyToMappedResultProperties(K, P, Acc = {}) {
-    const [L, ...R] = P;
-    return (P.length > 0
-        ? MappedKeyToMappedResultProperties(K, R, { ...Acc, [L]: Literal(L) })
-        : Acc);
+function MappedKeyToKnownMappedResultProperties(K) {
+    return { [K]: Literal(K) };
+}
+// prettier-ignore
+function MappedKeyToUnknownMappedResultProperties(P) {
+    return P.reduce((Acc, L) => {
+        return { ...Acc, [L]: Literal(L) };
+    }, {});
+}
+// prettier-ignore
+function MappedKeyToMappedResultProperties(K, P) {
+    return (SetIncludes(P, K)
+        ? MappedKeyToKnownMappedResultProperties(K)
+        : MappedKeyToUnknownMappedResultProperties(P));
 }
 // prettier-ignore
 function FromMappedKey(K, P) {
@@ -42,11 +53,8 @@ function FromMappedKey(K, P) {
     return FromMappedResult(K, R);
 }
 // prettier-ignore
-function FromRest(K, T, Acc = []) {
-    const [L, ...R] = T;
-    return (T.length > 0
-        ? FromRest(K, R, [...Acc, FromSchemaType(K, L)])
-        : Acc);
+function FromRest(K, T) {
+    return T.map(L => FromSchemaType(K, L));
 }
 // prettier-ignore
 function FromProperties(K, T) {
@@ -78,10 +86,9 @@ function FromSchemaType(K, T) {
 }
 // prettier-ignore
 function FromMappedFunctionReturnType(K, T, Acc = {}) {
-    const [L, ...R] = K;
-    return (K.length > 0
-        ? FromMappedFunctionReturnType(R, T, { ...Acc, [L]: FromSchemaType(L, T) })
-        : Acc);
+    return K.reduce((Acc, L) => {
+        return { ...Acc, [L]: FromSchemaType(L, T) };
+    }, {});
 }
 /** `[Json]` Creates a Mapped object type */
 export function Mapped(key, map, options = {}) {

package/build/import/type/not/not.mjs

@@ -1,5 +1,5 @@
-import { Kind } from '../symbols/index.mjs';
 import { CloneType } from '../clone/type.mjs';
+import { Kind } from '../symbols/index.mjs';
 /** `[Json]` Creates a Not type */
 export function Not(schema, options) {
     return {

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

@@ -15,7 +15,7 @@ type OptionalPropertyKeys<T extends TProperties> = {
 }[keyof T];
 type RequiredPropertyKeys<T extends TProperties> = keyof Omit<T, ReadonlyOptionalPropertyKeys<T> | ReadonlyPropertyKeys<T> | OptionalPropertyKeys<T>>;
 type ObjectStaticProperties<T extends TProperties, R extends Record<keyof any, unknown>> = Evaluate<(Readonly<Partial<Pick<R, ReadonlyOptionalPropertyKeys<T>>>> & Readonly<Pick<R, ReadonlyPropertyKeys<T>>> & Partial<Pick<R, OptionalPropertyKeys<T>>> & Required<Pick<R, RequiredPropertyKeys<T>>>)>;
-export type ObjectStatic<T extends TProperties, P extends unknown[]> = ObjectStaticProperties<T, {
+type ObjectStatic<T extends TProperties, P extends unknown[]> = ObjectStaticProperties<T, {
     [K in keyof T]: Static<T[K], P>;
 }>;
 export type TPropertyKey = string | number;

package/build/import/type/object/object.mjs

@@ -3,7 +3,6 @@ import { Kind } from '../symbols/index.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
-// prettier-ignore
 import { IsOptional, IsSchema } from '../guard/type.mjs';
 /** `[Json]` Creates an Object type */
 export function _Object(properties, options = {}) {

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

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

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

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

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

@@ -7,11 +7,10 @@ function FromPropertyKey(T, K, options) {
     };
 }
 // prettier-ignore
-function FromPropertyKeys(T, K, options, Acc = {}) {
-    const [LK, ...RK] = K;
-    return (K.length > 0
-        ? FromPropertyKeys(T, RK, options, { ...Acc, ...FromPropertyKey(T, LK, options) })
-        : Acc);
+function FromPropertyKeys(T, K, options) {
+    return K.reduce((Acc, LK) => {
+        return { ...Acc, ...FromPropertyKey(T, LK, options) };
+    }, {});
 }
 // prettier-ignore
 function FromMappedKey(T, K, options) {

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

@@ -0,0 +1,11 @@
+import type { SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import { type TMappedResult } from '../mapped/index.mjs';
+import { type TOmit } from './omit.mjs';
+type TFromProperties<P extends TProperties, K extends PropertyKey[]> = ({
+    [K2 in keyof P]: TOmit<P[K2], K>;
+});
+type TFromMappedResult<R extends TMappedResult, K extends PropertyKey[]> = (TFromProperties<R['properties'], K>);
+export type TOmitFromMappedResult<T extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<T, K>> = (TMappedResult<P>);
+export declare function OmitFromMappedResult<R extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<R, K>>(R: R, K: [...K], options: SchemaOptions): TMappedResult<P>;
+export {};

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

@@ -0,0 +1,17 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Omit } from './omit.mjs';
+// prettier-ignore
+function FromProperties(P, K, options) {
+    return globalThis.Object.getOwnPropertyNames(P).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Omit(P[K2], K, options) };
+    }, {});
+}
+// prettier-ignore
+function FromMappedResult(R, K, options) {
+    return FromProperties(R.properties, K, options);
+}
+// prettier-ignore
+export function OmitFromMappedResult(R, K, options) {
+    const P = FromMappedResult(R, K, options);
+    return MappedResult(P);
+}

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

@@ -1,20 +1,23 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { TupleToUnion, Evaluate } from '../helpers/index.mjs';
 import { type TRecursive } from '../recursive/index.mjs';
+import type { TMappedKey, TMappedResult } from '../mapped/index.mjs';
 import { type TIntersect } from '../intersect/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type TObject, type TProperties } from '../object/index.mjs';
 import { type TIndexPropertyKeys } from '../indexed/index.mjs';
-import { TMappedKey } from '../mapped/index.mjs';
 import { type TOmitFromMappedKey } from './omit-from-mapped-key.mjs';
+import { type TOmitFromMappedResult } from './omit-from-mapped-result.mjs';
 type TFromIntersect<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, K, [...Acc, TOmitResolve<L, K>]> : Acc);
 type TFromUnion<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, K, [...Acc, TOmitResolve<L, K>]> : Acc);
 type TFromProperties<T extends TProperties, K extends PropertyKey[], I extends PropertyKey = TupleToUnion<K>> = Evaluate<Omit<T, I>>;
 export type TOmitResolve<T extends TProperties, K extends PropertyKey[]> = T extends TRecursive<infer S> ? TRecursive<TOmitResolve<S, K>> : T extends TIntersect<infer S> ? TIntersect<TFromIntersect<S, K>> : T extends TUnion<infer S> ? TUnion<TFromUnion<S, K>> : T extends TObject<infer S> ? TObject<TFromProperties<S, K>> : TObject<{}>;
 export declare function OmitResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): TOmitResolve<T, K>;
 export type TOmit<T extends TSchema, K extends PropertyKey[]> = TOmitResolve<T, K>;
-/** `[Json]` Constructs a type whose keys are picked from the given type */
-export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K): TOmitFromMappedKey<T, K>;
+/** `[Json]` Constructs a type whose keys are omitted from the given type */
+export declare function Omit<T extends TMappedResult, K extends PropertyKey[]>(T: T, K: [...K], options?: SchemaOptions): TOmitFromMappedResult<T, K>;
+/** `[Json]` Constructs a type whose keys are omitted from the given type */
+export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TOmitFromMappedKey<T, K>;
 /** `[Json]` Constructs a type whose keys are omitted from the given type */
 export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
 /** `[Json]` Constructs a type whose keys are omitted from the given type */

package/build/import/type/omit/omit.mjs

@@ -6,10 +6,11 @@ import { Discard } from '../discard/index.mjs';
 import { TransformKind } from '../symbols/index.mjs';
 import { CloneType } from '../clone/type.mjs';
 import { OmitFromMappedKey } from './omit-from-mapped-key.mjs';
+import { OmitFromMappedResult } from './omit-from-mapped-result.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
-import { IsMappedKey, IsIntersect, IsUnion, IsObject, IsSchema } from '../guard/type.mjs';
+import { IsMappedKey, IsIntersect, IsUnion, IsObject, IsSchema, IsMappedResult } from '../guard/type.mjs';
 // prettier-ignore
 function FromIntersect(T, K) {
     return T.map((T) => OmitResolve(T, K));
@@ -40,13 +41,14 @@ export function OmitResolve(T, K) {
                 Object({}));
 }
 export function Omit(T, K, options = {}) {
-    if (IsMappedKey(K)) {
+    // mapped
+    if (IsMappedKey(K))
         return OmitFromMappedKey(T, K, options);
-    }
-    else {
-        const I = IsSchema(K) ? IndexPropertyKeys(K) : K;
-        const D = Discard(T, [TransformKind, '$id', 'required']);
-        const R = CloneType(OmitResolve(T, I), options);
-        return { ...D, ...R };
-    }
+    if (IsMappedResult(T))
+        return OmitFromMappedResult(T, K, options);
+    // non-mapped
+    const I = IsSchema(K) ? IndexPropertyKeys(K) : K;
+    const D = Discard(T, [TransformKind, '$id', 'required']);
+    const R = CloneType(OmitResolve(T, I), options);
+    return { ...D, ...R };
 }

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

@@ -1,10 +1,10 @@
 import type { TProperties } from '../object/index.mjs';
 import { type TMappedResult } from '../mapped/index.mjs';
 import { type TOptionalWithFlag } from './optional.mjs';
-type TFromProperties<K extends TProperties, F extends boolean> = ({
-    [K2 in keyof K]: TOptionalWithFlag<K[K2], F>;
+type TFromProperties<P extends TProperties, F extends boolean> = ({
+    [K2 in keyof P]: TOptionalWithFlag<P[K2], F>;
 });
-type TFromMappedResult<K extends TMappedResult, F extends boolean> = (TFromProperties<K['properties'], F>);
-export type TOptionalFromMappedResult<T extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<T, F>> = (TMappedResult<P>);
-export declare function OptionalFromMappedResult<T extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<T, F>>(T: T, F: F): TMappedResult<P>;
+type TFromMappedResult<R extends TMappedResult, F extends boolean> = (TFromProperties<R['properties'], F>);
+export type TOptionalFromMappedResult<R extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<R, F>> = (TMappedResult<P>);
+export declare function OptionalFromMappedResult<R extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<R, F>>(R: R, F: F): TMappedResult<P>;
 export {};

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

@@ -1,17 +1,17 @@
 import { MappedResult } from '../mapped/index.mjs';
 import { Optional } from './optional.mjs';
 // prettier-ignore
-function FromProperties(K, F) {
-    return globalThis.Object.getOwnPropertyNames(K).reduce((Acc, K2) => {
-        return { ...Acc, [K2]: Optional(K[K2], F) };
+function FromProperties(P, F) {
+    return globalThis.Object.getOwnPropertyNames(P).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Optional(P[K2], F) };
     }, {});
 }
 // prettier-ignore
-function FromMappedResult(K, F) {
-    return FromProperties(K.properties, F);
+function FromMappedResult(R, F) {
+    return FromProperties(R.properties, F);
 }
 // prettier-ignore
-export function OptionalFromMappedResult(T, F) {
-    const P = FromMappedResult(T, F);
+export function OptionalFromMappedResult(R, F) {
+    const P = FromMappedResult(R, F);
     return MappedResult(P);
 }

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

@@ -2,10 +2,10 @@ import type { SchemaOptions } from '../schema/index.mjs';
 import type { TProperties } from '../object/index.mjs';
 import { type TMappedResult } from '../mapped/index.mjs';
 import { type TPartial } from './partial.mjs';
-type TFromProperties<K extends TProperties> = ({
-    [K2 in keyof K]: TPartial<K[K2]>;
+type TFromProperties<P extends TProperties> = ({
+    [K2 in keyof P]: TPartial<P[K2]>;
 });
-type TFromMappedResult<K extends TMappedResult> = (TFromProperties<K['properties']>);
-export type TPartialFromMappedResult<T extends TMappedResult, P extends TProperties = TFromMappedResult<T>> = (TMappedResult<P>);
-export declare function PartialFromMappedResult<T extends TMappedResult, P extends TProperties = TFromMappedResult<T>>(T: T, options: SchemaOptions): TMappedResult<P>;
+type TFromMappedResult<R extends TMappedResult> = (TFromProperties<R['properties']>);
+export type TPartialFromMappedResult<R extends TMappedResult, P extends TProperties = TFromMappedResult<R>> = (TMappedResult<P>);
+export declare function PartialFromMappedResult<R extends TMappedResult, P extends TProperties = TFromMappedResult<R>>(R: R, options: SchemaOptions): TMappedResult<P>;
 export {};

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

@@ -7,11 +7,11 @@ function FromProperties(K, options) {
     }, {});
 }
 // prettier-ignore
-function FromMappedResult(K, options) {
-    return FromProperties(K.properties, options);
+function FromMappedResult(R, options) {
+    return FromProperties(R.properties, options);
 }
 // prettier-ignore
-export function PartialFromMappedResult(T, options) {
-    const P = FromMappedResult(T, options);
+export function PartialFromMappedResult(R, options) {
+    const P = FromMappedResult(R, options);
     return MappedResult(P);
 }

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

@@ -9,12 +9,11 @@ import { type TObject, type TProperties } from '../object/index.mjs';
 import { type TIntersect } from '../intersect/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type TPartialFromMappedResult } from './partial-from-mapped-result.mjs';
-type TFromIntersect<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, [...Acc, PartialResolve<L>]> : Acc);
-type TFromUnion<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, [...Acc, PartialResolve<L>]> : Acc);
+type TFromRest<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromRest<R, [...Acc, PartialResolve<L>]> : Acc);
 type TFromProperties<T extends TProperties> = Evaluate<{
     [K in keyof T]: T[K] extends (TReadonlyOptional<infer S>) ? TReadonlyOptional<S> : T[K] extends (TReadonly<infer S>) ? TReadonlyOptional<S> : T[K] extends (TOptional<infer S>) ? TOptional<S> : TOptional<T[K]>;
 }>;
-type PartialResolve<T extends TSchema> = (T extends TRecursive<infer S> ? TRecursive<PartialResolve<S>> : T extends TIntersect<infer S> ? TIntersect<TFromIntersect<S>> : T extends TUnion<infer S> ? TUnion<TFromUnion<S>> : T extends TObject<infer S> ? TObject<TFromProperties<S>> : TObject<{}>);
+type PartialResolve<T extends TSchema> = (T extends TRecursive<infer S> ? TRecursive<PartialResolve<S>> : T extends TIntersect<infer S> ? TIntersect<TFromRest<S>> : T extends TUnion<infer S> ? TUnion<TFromRest<S>> : T extends TObject<infer S> ? TObject<TFromProperties<S>> : TObject<{}>);
 declare function PartialResolve<T extends TSchema>(T: T): PartialResolve<T>;
 export type TPartial<T extends TSchema> = PartialResolve<T>;
 /** `[Json]` Constructs a type where all properties are optional */

package/build/import/type/partial/partial.mjs

@@ -11,18 +11,8 @@ import { PartialFromMappedResult } from './partial-from-mapped-result.mjs';
 // ------------------------------------------------------------------
 import { IsMappedResult, IsIntersect, IsUnion, IsObject } from '../guard/type.mjs';
 // prettier-ignore
-function FromIntersect(T, Acc = []) {
-    const [L, ...R] = T;
-    return (T.length > 0
-        ? FromIntersect(R, [...Acc, PartialResolve(L)])
-        : Acc);
-}
-// prettier-ignore
-function FromUnion(T, Acc = []) {
-    const [L, ...R] = T;
-    return (T.length > 0
-        ? FromUnion(R, [...Acc, PartialResolve(L)])
-        : Acc);
+function FromRest(T) {
+    return T.map(L => PartialResolve(L));
 }
 // prettier-ignore
 function FromProperties(T) {
@@ -32,19 +22,16 @@ function FromProperties(T) {
 }
 // prettier-ignore
 function PartialResolve(T) {
-    return (IsIntersect(T) ? Intersect(FromIntersect(T.allOf)) :
-        IsUnion(T) ? Union(FromUnion(T.anyOf)) :
+    return (IsIntersect(T) ? Intersect(FromRest(T.allOf)) :
+        IsUnion(T) ? Union(FromRest(T.anyOf)) :
             IsObject(T) ? Object(FromProperties(T.properties)) :
                 Object({}));
 }
 /** `[Json]` Constructs a type where all properties are optional */
 export function Partial(T, options = {}) {
-    if (IsMappedResult(T)) {
+    if (IsMappedResult(T))
         return PartialFromMappedResult(T, options);
-    }
-    else {
-        const D = Discard(T, [TransformKind, '$id', 'required']);
-        const R = CloneType(PartialResolve(T), options);
-        return { ...D, ...R };
-    }
+    const D = Discard(T, [TransformKind, '$id', 'required']);
+    const R = CloneType(PartialResolve(T), options);
+    return { ...D, ...R };
 }

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

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

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

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

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

@@ -7,11 +7,10 @@ function FromPropertyKey(T, K, options) {
     };
 }
 // prettier-ignore
-function FromPropertyKeys(T, K, options, Acc = {}) {
-    const [LK, ...RK] = K;
-    return (K.length > 0
-        ? FromPropertyKeys(T, RK, options, { ...Acc, ...FromPropertyKey(T, LK, options) })
-        : Acc);
+function FromPropertyKeys(T, K, options) {
+    return K.reduce((Acc, LK) => {
+        return { ...Acc, ...FromPropertyKey(T, LK, options) };
+    }, {});
 }
 // prettier-ignore
 function FromMappedKey(T, K, options) {

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

@@ -0,0 +1,11 @@
+import type { SchemaOptions } from '../schema/index.mjs';
+import type { TProperties } from '../object/index.mjs';
+import { type TMappedResult } from '../mapped/index.mjs';
+import { type TPick } from './pick.mjs';
+type TFromProperties<P extends TProperties, K extends PropertyKey[]> = ({
+    [K2 in keyof P]: TPick<P[K2], K>;
+});
+type TFromMappedResult<R extends TMappedResult, K extends PropertyKey[]> = (TFromProperties<R['properties'], K>);
+export type TPickFromMappedResult<T extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<T, K>> = (TMappedResult<P>);
+export declare function PickFromMappedResult<R extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<R, K>>(R: R, K: [...K], options: SchemaOptions): TMappedResult<P>;
+export {};

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

@@ -0,0 +1,17 @@
+import { MappedResult } from '../mapped/index.mjs';
+import { Pick } from './pick.mjs';
+// prettier-ignore
+function FromProperties(P, K, options) {
+    return globalThis.Object.getOwnPropertyNames(P).reduce((Acc, K2) => {
+        return { ...Acc, [K2]: Pick(P[K2], K, options) };
+    }, {});
+}
+// prettier-ignore
+function FromMappedResult(R, K, options) {
+    return FromProperties(R.properties, K, options);
+}
+// prettier-ignore
+export function PickFromMappedResult(R, K, options) {
+    const P = FromMappedResult(R, K, options);
+    return MappedResult(P);
+}

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

@@ -4,9 +4,10 @@ import { type TRecursive } from '../recursive/index.mjs';
 import { type TIntersect } from '../intersect/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 import { type TObject, type TProperties } from '../object/index.mjs';
+import type { TMappedKey, TMappedResult } from '../mapped/index.mjs';
 import { type TIndexPropertyKeys } from '../indexed/index.mjs';
-import { TMappedKey } from '../mapped/index.mjs';
 import { type TPickFromMappedKey } from './pick-from-mapped-key.mjs';
+import { type TPickFromMappedResult } from './pick-from-mapped-result.mjs';
 type FromIntersect<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? FromIntersect<R, K, [...Acc, PickResolve<L, K>]> : Acc;
 declare function FromIntersect<T extends TSchema[], K extends PropertyKey[]>(T: T, K: K): FromIntersect<T, K, []>;
 type FromUnion<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? FromUnion<R, K, [...Acc, PickResolve<L, K>]> : Acc;
@@ -17,7 +18,9 @@ export type PickResolve<T extends TProperties, K extends PropertyKey[]> = T exte
 export declare function PickResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): PickResolve<T, K>;
 export type TPick<T extends TSchema, K extends PropertyKey[]> = PickResolve<T, K>;
 /** `[Json]` Constructs a type whose keys are picked from the given type */
-export declare function Pick<T extends TSchema, K extends TMappedKey>(T: T, K: K): TPickFromMappedKey<T, K>;
+export declare function Pick<T extends TMappedResult, K extends PropertyKey[]>(T: T, K: [...K], options?: SchemaOptions): TPickFromMappedResult<T, K>;
+/** `[Json]` Constructs a type whose keys are picked from the given type */
+export declare function Pick<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TPickFromMappedKey<T, K>;
 /** `[Json]` Constructs a type whose keys are picked from the given type */
 export declare function Pick<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TPick<T, I>;
 /** `[Json]` Constructs a type whose keys are picked from the given type */

package/build/import/type/pick/pick.mjs

@@ -6,11 +6,11 @@ import { Discard } from '../discard/index.mjs';
 import { TransformKind } from '../symbols/index.mjs';
 import { CloneType } from '../clone/type.mjs';
 import { PickFromMappedKey } from './pick-from-mapped-key.mjs';
+import { PickFromMappedResult } from './pick-from-mapped-result.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
-// prettier-ignore
-import { IsMappedKey, IsIntersect, IsUnion, IsObject, IsSchema, } from '../guard/type.mjs';
+import { IsMappedKey, IsMappedResult, IsIntersect, IsUnion, IsObject, IsSchema } from '../guard/type.mjs';
 function FromIntersect(T, K) {
     return T.map((T) => PickResolve(T, K));
 }
@@ -32,13 +32,14 @@ export function PickResolve(T, K) {
                 Object({}));
 }
 export function Pick(T, K, options = {}) {
-    if (IsMappedKey(K)) {
+    // mapped
+    if (IsMappedKey(K))
         return PickFromMappedKey(T, K, options);
-    }
-    else {
-        const I = IsSchema(K) ? IndexPropertyKeys(K) : K;
-        const D = Discard(T, [TransformKind, '$id', 'required']);
-        const R = CloneType(PickResolve(T, I), options);
-        return { ...D, ...R };
-    }
+    if (IsMappedResult(T))
+        return PickFromMappedResult(T, K, options);
+    // non-mapped
+    const I = IsSchema(K) ? IndexPropertyKeys(K) : K;
+    const D = Discard(T, [TransformKind, '$id', 'required']);
+    const R = CloneType(PickResolve(T, I), options);
+    return { ...D, ...R };
 }

package/build/import/type/promise/promise.mjs

@@ -1,5 +1,5 @@
-import { Kind } from '../symbols/index.mjs';
 import { CloneType } from '../clone/type.mjs';
+import { Kind } from '../symbols/index.mjs';
 /** `[JavaScript]` Creates a Promise type */
 export function Promise(item, options = {}) {
     return {

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

@@ -1,10 +1,10 @@
 import type { TProperties } from '../object/index.mjs';
 import { type TMappedResult } from '../mapped/index.mjs';
 import { type TReadonlyWithFlag } from './readonly.mjs';
-type TFromProperties<K extends TProperties, F extends boolean> = ({
-    [K2 in keyof K]: TReadonlyWithFlag<K[K2], F>;
+type TFromProperties<P extends TProperties, F extends boolean> = ({
+    [K2 in keyof P]: TReadonlyWithFlag<P[K2], F>;
 });
-type TFromMappedResult<K extends TMappedResult, F extends boolean> = (TFromProperties<K['properties'], F>);
-export type TReadonlyFromMappedResult<T extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<T, F>> = (TMappedResult<P>);
-export declare function ReadonlyFromMappedResult<T extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<T, F>>(T: T, F: F): TMappedResult<P>;
+type TFromMappedResult<R extends TMappedResult, F extends boolean> = (TFromProperties<R['properties'], F>);
+export type TReadonlyFromMappedResult<R extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<R, F>> = (TMappedResult<P>);
+export declare function ReadonlyFromMappedResult<R extends TMappedResult, F extends boolean, P extends TProperties = TFromMappedResult<R, F>>(R: R, F: F): TMappedResult<P>;
 export {};

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

@@ -7,11 +7,11 @@ function FromProperties(K, F) {
     }, {});
 }
 // prettier-ignore
-function FromMappedResult(K, F) {
-    return FromProperties(K.properties, F);
+function FromMappedResult(R, F) {
+    return FromProperties(R.properties, F);
 }
 // prettier-ignore
-export function ReadonlyFromMappedResult(T, F) {
-    const P = FromMappedResult(T, F);
+export function ReadonlyFromMappedResult(R, F) {
+    const P = FromMappedResult(R, F);
     return MappedResult(P);
 }

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

@@ -2,14 +2,15 @@ import type { TSchema } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import type { Evaluate, Ensure, Assert } from '../helpers/index.mjs';
 import { type TObject, type TProperties, type TAdditionalProperties, type ObjectOptions } from '../object/index.mjs';
-import { type TLiteral, TLiteralValue } from '../literal/index.mjs';
+import { type TLiteral, type TLiteralValue } from '../literal/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { type TUnion } from '../union/index.mjs';
+import { type TRegExp } from '../regexp/index.mjs';
 import { type TString } from '../string/index.mjs';
 import { type TInteger } from '../integer/index.mjs';
 import { type TNumber } from '../number/index.mjs';
 import { type TEnum } from '../enum/index.mjs';
-import { TTemplateLiteral, TIsTemplateLiteralFinite } from '../template-literal/index.mjs';
+import { TIsTemplateLiteralFinite, type TTemplateLiteral } from '../template-literal/index.mjs';
 import { Kind } from '../symbols/index.mjs';
 type TFromTemplateLiteralKeyInfinite<K extends TTemplateLiteral, T extends TSchema> = Ensure<TRecord<K, T>>;
 type TFromTemplateLiteralKeyFinite<K extends TTemplateLiteral, T extends TSchema, I extends string = Static<K>> = (Ensure<TObject<Evaluate<{
@@ -30,6 +31,7 @@ type TFromUnionKey<K extends TSchema[], T extends TSchema, P extends TProperties
 type TFromLiteralKey<K extends TLiteralValue, T extends TSchema> = (Ensure<TObject<{
     [_ in Assert<K, PropertyKey>]: T;
 }>>);
+type TFromRegExpKey<_ extends TRegExp, T extends TSchema> = (Ensure<TRecord<TRegExp, T>>);
 type TFromStringKey<_ extends TString, T extends TSchema> = (Ensure<TRecord<TString, T>>);
 type TFromIntegerKey<_ extends TSchema, T extends TSchema> = (Ensure<TRecord<TNumber, T>>);
 type TFromNumberKey<_ extends TSchema, T extends TSchema> = (Ensure<TRecord<TNumber, T>>);
@@ -43,7 +45,7 @@ export interface TRecord<K extends TSchema = TSchema, T extends TSchema = TSchem
     };
     additionalProperties: TAdditionalProperties;
 }
-export type TRecordOrObject<K extends TSchema, T extends TSchema> = K extends TTemplateLiteral ? TFromTemplateLiteralKey<K, T> : K extends TEnum<infer S> ? TFromEnumKey<S, T> : K extends TUnion<infer S> ? TFromUnionKey<S, T> : K extends TLiteral<infer S> ? TFromLiteralKey<S, T> : K extends TInteger ? TFromIntegerKey<K, T> : K extends TNumber ? TFromNumberKey<K, T> : K extends TString ? TFromStringKey<K, T> : TNever;
+export type TRecordOrObject<K extends TSchema, T extends TSchema> = K extends TTemplateLiteral ? TFromTemplateLiteralKey<K, T> : K extends TEnum<infer S> ? TFromEnumKey<S, T> : K extends TUnion<infer S> ? TFromUnionKey<S, T> : K extends TLiteral<infer S> ? TFromLiteralKey<S, T> : K extends TInteger ? TFromIntegerKey<K, T> : K extends TNumber ? TFromNumberKey<K, T> : K extends TRegExp ? TFromRegExpKey<K, T> : K extends TString ? TFromStringKey<K, T> : TNever;
 /** `[Json]` Creates a Record type */
 export declare function Record<K extends TSchema, T extends TSchema>(K: K, T: T, options?: ObjectOptions): TRecordOrObject<K, T>;
 export {};

package/build/import/type/record/record.mjs

@@ -6,11 +6,14 @@ import { PatternStringExact, PatternNumberExact } from '../patterns/index.mjs';
 import { IndexPropertyKeys } from '../indexed/index.mjs';
 import { Kind, Hint } from '../symbols/index.mjs';
 import { CloneType } from '../clone/type.mjs';
+// ------------------------------------------------------------------
+// ValueGuard
+// ------------------------------------------------------------------
 import { IsUndefined } from '../guard/value.mjs';
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
-import { IsInteger, IsLiteral, IsNumber, IsString, IsTemplateLiteral, IsUnion } from '../guard/type.mjs';
+import { IsInteger, IsLiteral, IsNumber, IsString, IsRegExp, IsTemplateLiteral, IsUnion } from '../guard/type.mjs';
 // ------------------------------------------------------------------
 // RecordCreateFromPattern
 // ------------------------------------------------------------------
@@ -46,6 +49,10 @@ function FromLiteralKey(K, T, options) {
     return RecordCreateFromKeys([K.toString()], T, options);
 }
 // prettier-ignore
+function FromRegExpKey(K, T, options) {
+    return RecordCreateFromPattern(K.source, T, options);
+}
+// prettier-ignore
 function FromStringKey(K, T, options) {
     const pattern = IsUndefined(K.pattern) ? PatternStringExact : K.pattern;
     return RecordCreateFromPattern(pattern, T, options);
@@ -67,8 +74,9 @@ export function Record(K, T, options = {}) {
     return (IsUnion(K) ? FromUnionKey(K.anyOf, T, options) :
         IsTemplateLiteral(K) ? FromTemplateLiteralKey(K, T, options) :
             IsLiteral(K) ? FromLiteralKey(K.const, T, options) :
-                IsString(K) ? FromStringKey(K, T, options) :
-                    IsInteger(K) ? FromIntegerKey(K, T, options) :
-                        IsNumber(K) ? FromNumberKey(K, T, options) :
-                            Never(options));
+                IsInteger(K) ? FromIntegerKey(K, T, options) :
+                    IsNumber(K) ? FromNumberKey(K, T, options) :
+                        IsRegExp(K) ? FromRegExpKey(K, T, options) :
+                            IsString(K) ? FromStringKey(K, T, options) :
+                                Never(options));
 }

package/build/import/type/ref/ref.mjs

@@ -1,6 +1,6 @@
 import { Kind } from '../symbols/index.mjs';
 // ------------------------------------------------------------------
-// TypeGuard
+// ValueGuard
 // ------------------------------------------------------------------
 import { IsString, IsUndefined } from '../guard/value.mjs';
 /** `[Json]` Creates a Ref type. */