@sinclair/typebox 0.32.0-dev-10 → 0.32.0-dev-12

package/build/import/compiler/compiler.mjs

@@ -1,4 +1,4 @@
-import { Encode as TransformEncode, Decode as TransformDecode, HasTransform, TransformDecodeCheckError, TransformEncodeCheckError } from '../value/transform/index.mjs';
+import { TransformEncode, TransformDecode, HasTransform, TransformDecodeCheckError, TransformEncodeCheckError } from '../value/transform/index.mjs';
 import { IsArray, IsString, IsNumber, IsBigInt } from '../value/guard/index.mjs';
 import { Errors } from '../errors/index.mjs';
 import { TypeSystemPolicy } from '../system/index.mjs';
@@ -7,7 +7,7 @@ import { Hash } from '../value/hash/index.mjs';
 import { Kind } from '../type/symbols/index.mjs';
 import { TSchema as IsSchemaType } from '../type/guard/type.mjs';
 import { TypeRegistry, FormatRegistry } from '../type/registry/index.mjs';
-import { KeyOfStringResolvePattern } from '../type/keyof/index.mjs';
+import { KeyOfPattern } from '../type/keyof/index.mjs';
 import { ExtendsUndefinedCheck } from '../type/extends/extends-undefined.mjs';
 import { Never } from '../type/never/index.mjs';
 export class TypeCheck {
@@ -238,12 +238,12 @@ export var TypeCompiler;
     function* TIntersect(schema, references, value) {
         const check1 = schema.allOf.map((schema) => CreateExpression(schema, references, value)).join(' && ');
         if (schema.unevaluatedProperties === false) {
-            const keyCheck = CreateVariable(`${new RegExp(KeyOfStringResolvePattern(schema))};`);
+            const keyCheck = CreateVariable(`${new RegExp(KeyOfPattern(schema))};`);
             const check2 = `Object.getOwnPropertyNames(${value}).every(key => ${keyCheck}.test(key))`;
             yield `(${check1} && ${check2})`;
         }
         else if (IsSchemaType(schema.unevaluatedProperties)) {
-            const keyCheck = CreateVariable(`${new RegExp(KeyOfStringResolvePattern(schema))};`);
+            const keyCheck = CreateVariable(`${new RegExp(KeyOfPattern(schema))};`);
             const check2 = `Object.getOwnPropertyNames(${value}).every(key => ${keyCheck}.test(key) || ${CreateExpression(schema.unevaluatedProperties, references, `${value}[key]`)})`;
             yield `(${check1} && ${check2})`;
         }

package/build/import/errors/errors.mjs

@@ -1,6 +1,6 @@
 import { IsArray, IsUint8Array, IsDate, IsPromise, IsFunction, IsAsyncIterator, IsIterator, IsBoolean, IsNumber, IsBigInt, IsString, IsSymbol, IsInteger, IsNull, IsUndefined } from '../value/guard/index.mjs';
 import { TypeSystemPolicy } from '../system/index.mjs';
-import { KeyOfStringResolvePattern } from '../type/keyof/index.mjs';
+import { KeyOfPattern } from '../type/keyof/index.mjs';
 import { TypeRegistry, FormatRegistry } from '../type/registry/index.mjs';
 import { ExtendsUndefinedCheck } from '../type/extends/extends-undefined.mjs';
 import { GetErrorFunction } from './function.mjs';
@@ -224,7 +224,7 @@ function* TIntersect(schema, references, path, value) {
         }
     }
     if (schema.unevaluatedProperties === false) {
-        const keyCheck = new RegExp(KeyOfStringResolvePattern(schema));
+        const keyCheck = new RegExp(KeyOfPattern(schema));
         for (const valueKey of Object.getOwnPropertyNames(value)) {
             if (!keyCheck.test(valueKey)) {
                 yield Create(ValueErrorType.IntersectUnevaluatedProperties, schema, `${path}/${valueKey}`, value);
@@ -232,7 +232,7 @@ function* TIntersect(schema, references, path, value) {
         }
     }
     if (typeof schema.unevaluatedProperties === 'object') {
-        const keyCheck = new RegExp(KeyOfStringResolvePattern(schema));
+        const keyCheck = new RegExp(KeyOfPattern(schema));
         for (const valueKey of Object.getOwnPropertyNames(value)) {
             if (!keyCheck.test(valueKey)) {
                 const next = Visit(schema.unevaluatedProperties, references, `${path}/${valueKey}`, value[valueKey]).next();

package/build/import/index.d.mts

@@ -21,15 +21,15 @@ export { Extends, type TExtends, ExtendsCheck, ExtendsResult, ExtendsUndefinedCh
 export { Extract, type TExtract } 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, type TIndex, IndexedKeyResolve, IndexedTypeResolve } from './type/indexed/index.mjs';
+export { Index, type TIndex, type TMappedIndex, IndexedPropertyKeys, IndexedType, MappedIndex } 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 { Iterator, type TIterator } from './type/iterator/index.mjs';
 export { Capitalize, type TCapitalize, Lowercase, type TLowercase, Uncapitalize, type TUncapitalize, Uppercase, type TUppercase, IntrinsicResolve } from './type/intrinsic/index.mjs';
-export { KeyOf, type TKeyOf, KeyOfStringResolve, KeyOfStringResolvePattern, KeyOfTypeResolve } from './type/keyof/index.mjs';
+export { KeyOf, type TKeyOf, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index.mjs';
 export { Literal, type TLiteral } from './type/literal/index.mjs';
-export { Mapped, type TMappedKey, type MappedFunction, type TMappedResult } from './type/mapped/index.mjs';
+export { Mapped, type MappedKey as TMappedKey, type MappedFunction, type TMapped as TMappedResult } from './type/mapped/index.mjs';
 export { Never, type TNever } from './type/never/index.mjs';
 export { Not, type TNot } from './type/not/index.mjs';
 export { Null, type TNull } from './type/null/index.mjs';

package/build/import/index.mjs

@@ -21,13 +21,13 @@ 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, IndexedKeyResolve, IndexedTypeResolve } from './type/indexed/index.mjs';
+export { Index, IndexedPropertyKeys, IndexedType, MappedIndex } 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 { Iterator } from './type/iterator/index.mjs';
 export { Capitalize, Lowercase, Uncapitalize, Uppercase, IntrinsicResolve } from './type/intrinsic/index.mjs';
-export { KeyOf, KeyOfStringResolve, KeyOfStringResolvePattern, KeyOfTypeResolve } from './type/keyof/index.mjs';
+export { KeyOf, KeyOfPropertyKeys, KeyOfPattern } from './type/keyof/index.mjs';
 export { Literal } from './type/literal/index.mjs';
 export { Mapped } from './type/mapped/index.mjs';
 export { Never } from './type/never/index.mjs';

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

@@ -1,10 +1,10 @@
 import type { UnionToTuple, Assert, Evaluate } from '../helpers/index.mjs';
 import { type TObject, type ObjectOptions } from '../object/index.mjs';
 import { type TIntersect } from '../intersect/index.mjs';
-import { IndexedTypeResolve } from '../indexed/index.mjs';
+import { IndexedType } from '../indexed/index.mjs';
 type CompositeKeys<T extends TObject[]> = T extends [infer L extends TObject, ...infer R extends TObject[]] ? keyof L['properties'] | CompositeKeys<R> : never;
 type CompositeIndex<T extends TIntersect<TObject[]>, K extends string[]> = K extends [infer L extends string, ...infer R extends string[]] ? {
-    [_ in L]: IndexedTypeResolve<T, [L]>;
+    [_ in L]: IndexedType<T, [L]>;
 } & CompositeIndex<T, R> : {};
 type CompositeReduce<T extends TObject[]> = UnionToTuple<CompositeKeys<T>> extends infer K ? Evaluate<CompositeIndex<TIntersect<T>, Assert<K, string[]>>> : {};
 export type CompositeResolve<T extends TObject[]> = TIntersect<T> extends TIntersect ? TObject<CompositeReduce<T>> : TObject<{}>;

package/build/import/type/composite/composite.mjs

@@ -1,11 +1,11 @@
 import { Object } from '../object/index.mjs';
 import { Intersect } from '../intersect/index.mjs';
-import { KeyOfStringResolve } from '../keyof/index.mjs';
+import { KeyOfPropertyKeys } from '../keyof/index.mjs';
 import { Index } from '../indexed/index.mjs';
 import { CloneType } from '../clone/type.mjs';
 export function CompositeResolve(T) {
     const intersect = Intersect(T, {});
-    const keys = KeyOfStringResolve(intersect);
+    const keys = KeyOfPropertyKeys(intersect);
     const properties = keys.reduce((acc, key) => ({ ...acc, [key]: Index(intersect, [key]) }), {});
     return Object(properties);
 }

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

@@ -0,0 +1,13 @@
+import type { TSchema } 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 MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema> = ({
+    [K2 in keyof K]: TExtends<K[K2], U, L, R>;
+});
+declare function MappedResultExtendsPropertyKeys<K extends TProperties, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsPropertyKeys<K, U, L, R>;
+type MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema> = (MappedResultExtendsPropertyKeys<K['properties'], U, L, R>);
+declare function MappedResultExtendsProperties<K extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedResultExtendsProperties<K, U, L, R>;
+export type MappedResultExtends<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>> = (TMappedResult<P>);
+export declare function MappedResultExtends<T extends TMappedResult, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedResultExtendsProperties<T, U, L, R>>(T: T, U: U, L: L, R: R): TMappedResult<P>;
+export {};

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

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

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

@@ -0,0 +1,17 @@
+import type { TSchema } 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 MappedExtendsPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema> = {
+    [_ in K]: TExtends<TLiteral<Assert<K, TLiteralValue>>, U, L, R>;
+};
+declare function MappedExtendsPropertyKey<K extends PropertyKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedExtendsPropertyKey<K, U, L, R>;
+type MappedExtendsPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? MappedExtendsPropertyKey<LK, U, L, R> & MappedExtendsPropertyKeys<RK, U, L, R> : {});
+declare function MappedExtendsPropertyKeys<K extends PropertyKey[], U extends TSchema, L extends TSchema, R extends TSchema>(K: [...K], U: U, L: L, R: R): MappedExtendsPropertyKeys<K, U, L, R>;
+type MappedExtendsProperties<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema> = (MappedExtendsPropertyKeys<K['keys'], U, L, R>);
+declare function MappedExtendsProperties<K extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema>(K: K, U: U, L: L, R: R): MappedExtendsProperties<K, U, L, R>;
+export type MappedExtends<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedExtendsProperties<T, U, L, R>> = (TMappedResult<P>);
+export declare function MappedExtends<T extends TMappedKey, U extends TSchema, L extends TSchema, R extends TSchema, P extends TProperties = MappedExtendsProperties<T, U, L, R>>(T: T, U: U, L: L, R: R): TMappedResult<P>;
+export {};

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

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

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

@@ -1,8 +1,14 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 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';
-export 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);
-export 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>;
+import { MappedExtends } from './extends-mapped.mjs';
+import { MappedResultExtends } from './extends-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): MappedResultExtends<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): MappedExtends<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,13 +1,17 @@
+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';
-export function ExtendsResolve(left, right, trueType, falseType) {
+import { MappedExtends } from './extends-mapped.mjs';
+import { MappedResultExtends } from './extends-mapped-result.mjs';
+function ExtendsResolve(left, right, trueType, falseType) {
     const R = ExtendsCheck(left, right);
     return (R === ExtendsResult.Union ? Union([trueType, falseType]) :
         R === ExtendsResult.True ? trueType :
             falseType);
 }
 export function Extends(L, R, T, F, options = {}) {
-    const E = ExtendsResolve(L, R, T, F);
-    return CloneType(E, options);
+    return (IsMappedResultType(L) ? CloneType(MappedResultExtends(L, R, T, F), options) :
+        IsMappedKeyType(L) ? CloneType(MappedExtends(L, R, T, F), options) :
+            CloneType(ExtendsResolve(L, R, T, F), options));
 }

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

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

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

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

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

@@ -15,11 +15,12 @@ import type { TInteger } from '../integer/index.mjs';
 import type { TIntersect } from '../intersect/index.mjs';
 import type { TIterator } from '../iterator/index.mjs';
 import type { TLiteral } from '../literal/index.mjs';
+import type { TMappedKey, TMappedResult } from '../mapped/index.mjs';
 import type { TNever } from '../never/index.mjs';
 import type { TNot } from '../not/index.mjs';
 import type { TNull } from '../null/index.mjs';
 import type { TNumber } from '../number/index.mjs';
-import type { TObject } from '../object/index.mjs';
+import type { TObject, TProperties } from '../object/index.mjs';
 import type { TOptional } from '../optional/index.mjs';
 import type { TPromise } from '../promise/index.mjs';
 import type { TReadonly } from '../readonly/index.mjs';
@@ -47,6 +48,7 @@ export declare function TConstructor(schema: unknown): schema is TConstructor;
 export declare function TDate(schema: unknown): schema is TDate;
 export declare function TFunction(schema: unknown): schema is TFunction;
 export declare function TInteger(schema: unknown): schema is TInteger;
+export declare function TProperties(schema: unknown): schema is TProperties;
 export declare function TIntersect(schema: unknown): schema is TIntersect;
 export declare function TIterator(schema: unknown): schema is TIterator;
 export declare function TKindOf<T extends string>(schema: unknown, kind: T): schema is Record<PropertyKey, unknown> & {
@@ -56,6 +58,8 @@ export declare function TLiteralString(schema: unknown): schema is TLiteral<stri
 export declare function TLiteralNumber(schema: unknown): schema is TLiteral<number>;
 export declare function TLiteralBoolean(schema: unknown): schema is TLiteral<boolean>;
 export declare function TLiteral(schema: unknown): schema is TLiteral;
+export declare function TMappedKey(schema: unknown): schema is TMappedKey;
+export declare function TMappedResult(schema: unknown): schema is TMappedResult;
 export declare function TNever(schema: unknown): schema is TNever;
 export declare function TNot(schema: unknown): schema is TNot;
 export declare function TNull(schema: unknown): schema is TNull;

package/build/import/type/guard/type.mjs

@@ -16,6 +16,8 @@ const KnownTypes = [
     'Intersect',
     'Iterator',
     'Literal',
+    'MappedKey',
+    'MappedResult',
     'Not',
     'Null',
     'Number',
@@ -157,6 +159,10 @@ export function TInteger(schema) {
         IsOptionalNumber(schema.minimum) &&
         IsOptionalNumber(schema.multipleOf));
 }
+export function TProperties(schema) {
+    return (ValueGuard.IsObject(schema) &&
+        Object.entries(schema).every(([key, schema]) => IsControlCharacterFree(key) && TSchema(schema)));
+}
 export function TIntersect(schema) {
     return (TKindOf(schema, 'Intersect') &&
         (ValueGuard.IsString(schema.type) && schema.type !== 'object' ? false : true) &&
@@ -190,6 +196,15 @@ export function TLiteral(schema) {
         ValueGuard.IsNumber(schema.const) ||
         ValueGuard.IsString(schema.const)));
 }
+export function TMappedKey(schema) {
+    return (TKindOf(schema, 'MappedKey') &&
+        ValueGuard.IsArray(schema.keys) &&
+        schema.keys.every(key => ValueGuard.IsNumber(key) || ValueGuard.IsString(key)));
+}
+export function TMappedResult(schema) {
+    return (TKindOf(schema, 'MappedResult') &&
+        TProperties(schema.properties));
+}
 export function TNever(schema) {
     return (TKindOf(schema, 'Never') &&
         ValueGuard.IsObject(schema.not) &&
@@ -218,8 +233,7 @@ export function TObject(schema) {
     return (TKindOf(schema, 'Object') &&
         schema.type === 'object' &&
         IsOptionalString(schema.$id) &&
-        ValueGuard.IsObject(schema.properties) &&
-        Object.entries(schema.properties).every(([key, schema]) => IsControlCharacterFree(key) && TSchema(schema)) &&
+        TProperties(schema.properties) &&
         IsAdditionalProperties(schema.additionalProperties) &&
         IsOptionalNumber(schema.minProperties) &&
         IsOptionalNumber(schema.maxProperties));
@@ -343,6 +357,8 @@ export function TSchema(schema) {
         TIntersect(schema) ||
         TIterator(schema) ||
         TLiteral(schema) ||
+        TMappedKey(schema) ||
+        TMappedResult(schema) ||
         TNever(schema) ||
         TNot(schema) ||
         TNull(schema) ||

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

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

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

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

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

@@ -0,0 +1,16 @@
+import { type TSchema } from '../schema/index.mjs';
+import { type TProperties } from '../object/index.mjs';
+import { IndexedType } from './indexed-type.mjs';
+import { type TMappedResult, type TMappedKey } from '../mapped/index.mjs';
+import { Evaluate } from '../helpers/index.mjs';
+type MappedIndexPropertyKey<T extends TSchema, K extends PropertyKey> = {
+    [_ in K]: IndexedType<T, [K]>;
+};
+declare function MappedIndexPropertyKey<T extends TSchema, K extends PropertyKey>(T: T, K: K): 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>;
+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 TMappedIndex<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>> = TMappedResult<P>;
+export declare function MappedIndex<T extends TSchema, K extends TMappedKey, P extends TProperties = MappedIndexProperties<T, K>>(T: T, K: K): TMappedResult<P>;
+export {};

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

@@ -0,0 +1,18 @@
+import { IndexedType } from './indexed-type.mjs';
+import { MappedResult } from '../mapped/index.mjs';
+function MappedIndexPropertyKey(T, K) {
+    return { [K]: IndexedType(T, [K]) };
+}
+function MappedIndexPropertyKeys(T, K) {
+    const [L, ...R] = K;
+    return (K.length > 0
+        ? { ...MappedIndexPropertyKey(T, L), ...MappedIndexPropertyKeys(T, R) }
+        : {});
+}
+function MappedIndexProperties(T, K) {
+    return MappedIndexPropertyKeys(T, K.keys);
+}
+export function MappedIndex(T, K) {
+    const P = MappedIndexProperties(T, K);
+    return MappedResult(P);
+}

package/build/import/type/indexed/{indexed-key.d.mts → indexed-property-keys.d.mts}

@@ -6,11 +6,11 @@ import { type TSchema } from '../schema/index.mjs';
 import { type TUnion } from '../union/index.mjs';
 type FromTemplateLiteral<T extends TTemplateLiteral, F = IsTemplateLiteralFinite<T>> = (F extends true ? TemplateLiteralGenerate<T> extends infer R extends string[] ? R : [] : []);
 declare function FromTemplateLiteral<T extends TTemplateLiteral>(T: T): FromTemplateLiteral<T>;
-type FromUnion<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [...IndexedKeyResolve<L>, ...FromUnion<R>] : []);
+type FromUnion<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [...IndexedPropertyKeys<L>, ...FromUnion<R>] : []);
 declare function FromUnion<T extends TSchema[]>(T: T): FromUnion<T>;
 type FromLiteral<T extends TLiteralValue> = (T extends PropertyKey ? [`${T}`] : []);
 declare function FromLiteral<T extends TLiteralValue>(T: T): FromLiteral<T>;
-export type IndexedKeyResolve<T extends TSchema> = (T extends TTemplateLiteral ? FromTemplateLiteral<T> : T extends TUnion<infer S> ? FromUnion<S> : T extends TLiteral<infer S> ? FromLiteral<S> : T extends TNumber ? ['[number]'] : T extends TInteger ? ['[number]'] : [
+export type IndexedPropertyKeys<T extends TSchema> = (T extends TTemplateLiteral ? FromTemplateLiteral<T> : T extends TUnion<infer S> ? FromUnion<S> : T extends TLiteral<infer S> ? FromLiteral<S> : T extends TNumber ? ['[number]'] : T extends TInteger ? ['[number]'] : [
 ]);
-export declare function IndexedKeyResolve<T extends TSchema>(T: T): IndexedKeyResolve<T>;
+export declare function IndexedPropertyKeys<T extends TSchema>(T: T): IndexedPropertyKeys<T>;
 export {};

package/build/import/type/indexed/{indexed-key.mjs → indexed-property-keys.mjs}

@@ -13,13 +13,13 @@ function FromTemplateLiteral(T) {
 function FromUnion(T) {
     const [L, ...R] = T;
     return (T.length > 0
-        ? [...IndexedKeyResolve(L), ...FromUnion(R)]
+        ? [...IndexedPropertyKeys(L), ...FromUnion(R)]
         : []);
 }
 function FromLiteral(T) {
     return ([T.toString()]);
 }
-export function IndexedKeyResolve(T) {
+export function IndexedPropertyKeys(T) {
     return [...new Set((IsTemplateLiteralType(T) ? FromTemplateLiteral(T) :
             IsUnionType(T) ? FromUnion(T.anyOf) :
                 IsLiteralType(T) ? FromLiteral(T.const) :

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

@@ -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 IndexedTypeResolve<T extends TSchema, K extends PropertyKey[]> = (UnionResolve<FromKeys<T, K>>);
-export declare function IndexedTypeResolve<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): IndexedTypeResolve<T, K>;
+export type IndexedType<T extends TSchema, K extends PropertyKey[]> = (UnionResolve<FromKeys<T, K>>);
+export declare function IndexedType<T extends TSchema, K extends PropertyKey[]>(T: T, K: [...K]): IndexedType<T, K>;
 export {};

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

@@ -59,6 +59,6 @@ function FromKeys(T, K) {
         ? [FromKey(T, L), ...FromKeys(T, R)]
         : []);
 }
-export function IndexedTypeResolve(T, K) {
+export function IndexedType(T, K) {
     return (UnionResolve(FromKeys(T, K)));
 }

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

@@ -1,6 +1,9 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
-import { IndexedTypeResolve } from './indexed-type.mjs';
-import { IndexedKeyResolve } from './indexed-key.mjs';
-export type TIndex<T extends TSchema, K extends PropertyKey[]> = IndexedTypeResolve<T, K>;
-export declare function Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedKeyResolve<K>>(T: T, K: K, options?: SchemaOptions): TIndex<T, I>;
+import { IndexedType } from './indexed-type.mjs';
+import { IndexedPropertyKeys } from './indexed-property-keys.mjs';
+import { type TMappedIndex } from './indexed-mapped.mjs';
+import { TMappedKey } from '../mapped/index.mjs';
+export type TIndex<T extends TSchema, K extends PropertyKey[]> = IndexedType<T, K>;
+export declare function Index<T extends TSchema, K extends TMappedKey>(T: T, K: K): TMappedIndex<T, K>;
+export declare function Index<T extends TSchema, K extends TSchema, I extends PropertyKey[] = IndexedPropertyKeys<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/import/type/indexed/indexed.mjs

@@ -1,9 +1,10 @@
-import { IndexedTypeResolve } from './indexed-type.mjs';
-import { IndexedKeyResolve } from './indexed-key.mjs';
+import { TSchema as IsSchemaType, TMappedKey as IsMappedKey } from '../guard/type.mjs';
+import { IndexedType } from './indexed-type.mjs';
+import { IndexedPropertyKeys } from './indexed-property-keys.mjs';
+import { MappedIndex } from './indexed-mapped.mjs';
 import { CloneType } from '../clone/type.mjs';
-import { TSchema as IsSchemaType } from '../guard/type.mjs';
 export function Index(T, K, options = {}) {
-    const keys = IsSchemaType(K) ? IndexedKeyResolve(K) : K;
-    const type = IndexedTypeResolve(T, keys);
-    return CloneType(type, options);
+    return (IsMappedKey(K) ? CloneType(MappedIndex(T, K), options) :
+        IsSchemaType(K) ? CloneType(IndexedType(T, IndexedPropertyKeys(K)), options) :
+            CloneType(IndexedType(T, K), options));
 }

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

@@ -1,3 +1,2 @@
-export * from './keyof-string.mjs';
-export * from './keyof-type.mjs';
+export * from './keyof-property-keys.mjs';
 export * from './keyof.mjs';

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

@@ -1,3 +1,2 @@
-export * from './keyof-string.mjs';
-export * from './keyof-type.mjs';
+export * from './keyof-property-keys.mjs';
 export * from './keyof.mjs';

package/build/import/type/keyof/{keyof-string.d.mts → keyof-property-keys.d.mts}

@@ -7,7 +7,7 @@ import type { TTuple } from '../tuple/index.mjs';
 import type { TArray } from '../array/index.mjs';
 import type { TObject, TProperties } from '../object/index.mjs';
 import { OperatorUnionMany, OperatorIntersectMany } from '../operators/index.mjs';
-type FromRest<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [KeyOfStringResolve<L>, ...FromRest<R>] : []);
+type FromRest<T extends TSchema[]> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? [KeyOfPropertyKeys<L>, ...FromRest<R>] : []);
 declare function FromRest<T extends TSchema[]>(T: [...T]): FromRest<T>;
 type FromIntersect<T extends TSchema[], C extends PropertyKey[][] = FromRest<T>> = (OperatorUnionMany<C>);
 declare function FromIntersect<T extends TSchema[]>(T: [...T], C?: FromRest<T>): FromIntersect<T>;
@@ -21,8 +21,8 @@ type FromArray<_ extends TSchema> = ([
 declare function FromArray<_ extends TSchema>(_: _): FromArray<_>;
 type FromProperties<T extends TProperties> = (UnionToTuple<keyof T>);
 declare function FromProperties<T extends TProperties>(T: T): FromProperties<T>;
-export type KeyOfStringResolve<T extends TSchema> = (T extends TRecursive<infer S> ? KeyOfStringResolve<S> : T extends TIntersect<infer S> ? FromIntersect<S> : T extends TUnion<infer S> ? FromUnion<S> : T extends TTuple<infer S> ? FromTuple<S> : T extends TArray<infer S> ? FromArray<S> : T extends TObject<infer S> ? FromProperties<S> : [
+export type KeyOfPropertyKeys<T extends TSchema> = (T extends TRecursive<infer S> ? KeyOfPropertyKeys<S> : T extends TIntersect<infer S> ? FromIntersect<S> : T extends TUnion<infer S> ? FromUnion<S> : T extends TTuple<infer S> ? FromTuple<S> : T extends TArray<infer S> ? FromArray<S> : T extends TObject<infer S> ? FromProperties<S> : [
 ]);
-export declare function KeyOfStringResolve<T extends TSchema>(T: T): KeyOfStringResolve<T>;
-export declare function KeyOfStringResolvePattern(schema: TSchema): string;
+export declare function KeyOfPropertyKeys<T extends TSchema>(T: T): KeyOfPropertyKeys<T>;
+export declare function KeyOfPattern(schema: TSchema): string;
 export {};

package/build/import/type/keyof/{keyof-string.mjs → keyof-property-keys.mjs}

@@ -4,7 +4,7 @@ import { TIntersect as IsIntersectType, TUnion as IsUnionType, TTuple as IsTuple
 function FromRest(T) {
     const [L, ...R] = T;
     return (T.length > 0
-        ? [KeyOfStringResolve(L), ...FromRest(R)]
+        ? [KeyOfPropertyKeys(L), ...FromRest(R)]
         : []);
 }
 function FromIntersect(T, C = FromRest(T)) {
@@ -36,7 +36,7 @@ function FromPatternProperties(patternProperties) {
             : key;
     });
 }
-export function KeyOfStringResolve(T) {
+export function KeyOfPropertyKeys(T) {
     return (IsIntersectType(T) ? FromIntersect(T.allOf) :
         IsUnionType(T) ? FromUnion(T.anyOf) :
             IsTupleType(T) ? FromTuple(T.items ?? []) :
@@ -46,9 +46,9 @@ export function KeyOfStringResolve(T) {
                             []);
 }
 let includePatternProperties = false;
-export function KeyOfStringResolvePattern(schema) {
+export function KeyOfPattern(schema) {
     includePatternProperties = true;
-    const keys = KeyOfStringResolve(schema);
+    const keys = KeyOfPropertyKeys(schema);
     includePatternProperties = false;
     const pattern = keys.map((key) => `(${key})`);
     return `^(${pattern.join('|')})$`;

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

@@ -1,4 +1,12 @@
-import type { TSchema, SchemaOptions } from '../schema/index.mjs';
-import { KeyOfTypeResolve } from './keyof-type.mjs';
-export type TKeyOf<T extends TSchema> = KeyOfTypeResolve<T>;
-export declare function KeyOf<T extends TSchema>(schema: T, options?: SchemaOptions): KeyOfTypeResolve<T>;
+import type { TSchema } from '../schema/index.mjs';
+import type { Ensure } from '../helpers/index.mjs';
+import { type TLiteral, TLiteralValue } from '../literal/index.mjs';
+import { type TNumber } from '../number/index.mjs';
+import { type SchemaOptions } from '../schema/index.mjs';
+import { KeyOfPropertyKeys } from './keyof-property-keys.mjs';
+import { UnionResolve } from '../union/index.mjs';
+type FromLiterals<T extends TLiteralValue[]> = (T extends [infer L extends TLiteralValue, ...infer R extends TLiteralValue[]] ? L extends '[number]' ? [TNumber, ...FromLiterals<R>] : [TLiteral<L>, ...FromLiterals<R>] : []);
+declare function FromLiterals<T extends TLiteralValue[]>(T: [...T]): FromLiterals<T>;
+export type TKeyOf<T extends TSchema> = (Ensure<UnionResolve<FromLiterals<KeyOfPropertyKeys<T>>>>);
+export declare function KeyOf<T extends TSchema>(T: T, options?: SchemaOptions): TKeyOf<T>;
+export {};

package/build/import/type/keyof/keyof.mjs

@@ -1,6 +1,17 @@
-import { KeyOfTypeResolve } from './keyof-type.mjs';
+import { Literal } from '../literal/index.mjs';
+import { Number } from '../number/index.mjs';
+import { KeyOfPropertyKeys } from './keyof-property-keys.mjs';
+import { UnionResolve } from '../union/index.mjs';
 import { CloneType } from '../clone/type.mjs';
-export function KeyOf(schema, options = {}) {
-    const K = KeyOfTypeResolve(schema);
+function FromLiterals(T) {
+    const [L, ...R] = T;
+    return (T.length > 0
+        ? L === '[number]'
+            ? [Number(), ...FromLiterals(R)]
+            : [Literal(L), ...FromLiterals(R)]
+        : []);
+}
+export function KeyOf(T, options = {}) {
+    const K = UnionResolve(FromLiterals(KeyOfPropertyKeys(T)));
     return CloneType(K, options);
 }