@sinclair/typebox 0.34.22 → 0.34.23

package/build/cjs/index.d.ts

@@ -52,7 +52,6 @@ export * from './type/record/index';
 export * from './type/recursive/index';
 export * from './type/ref/index';
 export * from './type/regexp/index';
-export * from './type/remap/index';
 export * from './type/required/index';
 export * from './type/rest/index';
 export * from './type/return-type/index';

package/build/cjs/index.js

@@ -75,7 +75,6 @@ __exportStar(require("./type/record/index"), exports);
 __exportStar(require("./type/recursive/index"), exports);
 __exportStar(require("./type/ref/index"), exports);
 __exportStar(require("./type/regexp/index"), exports);
-__exportStar(require("./type/remap/index"), exports);
 __exportStar(require("./type/required/index"), exports);
 __exportStar(require("./type/rest/index"), exports);
 __exportStar(require("./type/return-type/index"), exports);

package/build/cjs/syntax/runtime.js

@@ -43,10 +43,17 @@ const Dereference = (context, key) => {
 // GenericReference
 // ------------------------------------------------------------------
 function GenericReferenceMapping(results, context) {
-    const target = Dereference(context, results[0]);
-    return t.Instantiate(target, results[2]);
+    const type = Dereference(context, results[0]);
+    const args = results[2];
+    return t.Instantiate(type, args);
 }
-const GenericReference = index_1.Runtime.Tuple([index_1.Runtime.Ident(), index_1.Runtime.Const(LAngle), index_1.Runtime.Ref('Elements'), index_1.Runtime.Const(RAngle)], (results, context) => GenericReferenceMapping(results, context));
+// prettier-ignore
+const GenericReference = index_1.Runtime.Tuple([
+    index_1.Runtime.Ident(),
+    index_1.Runtime.Const(LAngle),
+    index_1.Runtime.Ref('Elements'),
+    index_1.Runtime.Const(RAngle)
+], (results, context) => GenericReferenceMapping(results, context));
 // ------------------------------------------------------------------
 // Reference
 // ------------------------------------------------------------------

package/build/cjs/syntax/static.d.ts

@@ -43,7 +43,7 @@ type Delimit<Parser extends Static.IParser, Delimiter extends Static.IParser> =
 ], DelimitMapping>);
 type Dereference<Context extends t.TProperties, Ref extends string> = (Ref extends keyof Context ? Context[Ref] : t.TRef<Ref>);
 interface GenericReferenceMapping extends Static.IMapping {
-    output: this['context'] extends t.TProperties ? this['input'] extends [infer Reference extends string, LAngle, infer Parameters extends t.TSchema[], RAngle] ? t.TInstantiate<Dereference<this['context'], Reference>, [...Parameters]> : never : never;
+    output: this['context'] extends t.TProperties ? this['input'] extends [infer Reference extends string, LAngle, infer Args extends t.TSchema[], RAngle] ? t.TInstantiate<Dereference<this['context'], Reference>, Args> : never : never;
 }
 type GenericReference = Static.Tuple<[
     Static.Ident,

package/build/cjs/type/instantiate/instantiate.d.ts

@@ -1,25 +1,50 @@
-import type { TSchema } from '../schema/index';
-import type { TArgument } from '../argument/index';
+import { type TSchema } from '../schema/index';
+import { type TArgument } from '../argument/index';
 import { type TNever } from '../never/index';
 import { type TReadonlyOptional } from '../readonly-optional/index';
 import { type TReadonly } from '../readonly/index';
 import { type TOptional } from '../optional/index';
-import { type TRemap, type TMapping as TRemapMapping } from '../remap/index';
-type TInstantiateArgument<Argument extends TArgument, Type extends TSchema, IsArgumentReadonly extends number = Argument extends TReadonly<TSchema> ? 1 : 0, IsArgumentOptional extends number = Argument extends TOptional<TSchema> ? 1 : 0, Result extends TSchema = ([
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [1, 1] ? TReadonlyOptional<Type> : [
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [0, 1] ? TOptional<Type> : [
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [1, 0] ? TReadonly<Type> : Type)> = Result;
-interface TInstantiateArguments<Arguments extends TSchema[]> extends TRemapMapping {
-    output: (this['input'] extends TArgument<infer Index extends number> ? Index extends keyof Arguments ? Arguments[Index] extends TSchema ? TInstantiateArgument<this['input'], Arguments[Index]> : TNever : TNever : this['input']);
-}
+import { type TConstructor } from '../constructor/index';
+import { type TFunction } from '../function/index';
+import { type TIntersect } from '../intersect/index';
+import { type TUnion } from '../union/index';
+import { type TTuple } from '../tuple/index';
+import { type TArray } from '../array/index';
+import { type TAsyncIterator } from '../async-iterator/index';
+import { type TIterator } from '../iterator/index';
+import { type TPromise } from '../promise/index';
+import { type TObject, type TProperties } from '../object/index';
+import { type TRecordOrObject, type TRecord } from '../record/index';
+type TFromConstructor<Args extends TSchema[], Parameters extends TSchema[], InstanceType extends TSchema, Result extends TConstructor = TConstructor<TFromTypes<Args, Parameters>, TFromType<Args, InstanceType>>> = Result;
+type TFromFunction<Args extends TSchema[], Parameters extends TSchema[], ReturnType extends TSchema, Result extends TFunction = TFunction<TFromTypes<Args, Parameters>, TFromType<Args, ReturnType>>> = Result;
+type TFromIntersect<Args extends TSchema[], Types extends TSchema[], Result extends TIntersect = TIntersect<TFromTypes<Args, Types>>> = Result;
+type TFromUnion<Args extends TSchema[], Types extends TSchema[], Result extends TUnion = TUnion<TFromTypes<Args, Types>>> = Result;
+type TFromTuple<Args extends TSchema[], Types extends TSchema[], Result extends TTuple = TTuple<TFromTypes<Args, Types>>> = Result;
+type TFromArray<Args extends TSchema[], Type extends TSchema, Result extends TArray = TArray<TFromType<Args, Type>>> = Result;
+type TFromAsyncIterator<Args extends TSchema[], Type extends TSchema, Result extends TAsyncIterator = TAsyncIterator<TFromType<Args, Type>>> = Result;
+type TFromIterator<Args extends TSchema[], Type extends TSchema, Result extends TIterator = TIterator<TFromType<Args, Type>>> = Result;
+type TFromPromise<Args extends TSchema[], Type extends TSchema, Result extends TPromise = TPromise<TFromType<Args, Type>>> = Result;
+type TFromObject<Args extends TSchema[], Properties extends TProperties, Result extends TObject = TObject<TFromProperties<Args, Properties>>> = Result;
+type TFromRecord<Args extends TSchema[], Key extends TSchema, Value extends TSchema, MappedKey extends TSchema = TFromType<Args, Key>, MappedValue extends TSchema = TFromType<Args, Value>, Result extends TSchema = TRecordOrObject<MappedKey, MappedValue>> = Result;
+type TFromArgument<Args extends TSchema[], Index extends number> = (Index extends keyof Args ? Args[Index] : TNever);
+type TFromProperty<Args extends TSchema[], Type extends TSchema, IsReadonly extends boolean = Type extends TReadonly<Type> ? true : false, IsOptional extends boolean = Type extends TOptional<Type> ? true : false, Mapped extends TSchema = TFromType<Args, Type>, Result extends TSchema = ([
+    IsReadonly,
+    IsOptional
+] extends [true, true] ? TReadonlyOptional<Mapped> : [
+    IsReadonly,
+    IsOptional
+] extends [true, false] ? TReadonly<Mapped> : [
+    IsReadonly,
+    IsOptional
+] extends [false, true] ? TOptional<Mapped> : Mapped)> = Result;
+type TFromProperties<Args extends TSchema[], Properties extends TProperties, Result extends TProperties = {
+    [Key in keyof Properties]: TFromProperty<Args, Properties[Key]>;
+}> = Result;
+export type TFromTypes<Args extends TSchema[], Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<Args, Right, [...Result, TFromType<Args, Left>]> : Result);
+export declare function FromTypes<Args extends TSchema[], Types extends TSchema[]>(args: [...Args], types: [...Types]): TFromTypes<Args, Types>;
+export type TFromType<Args extends TSchema[], Type extends TSchema> = (Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<Args, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<Args, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<Args, Types> : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<Args, Types> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<Args, Types> : Type extends TArray<infer Type extends TSchema> ? TFromArray<Args, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<Args, Type> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<Args, Type> : Type extends TPromise<infer Type extends TSchema> ? TFromPromise<Args, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<Args, Properties> : Type extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TFromRecord<Args, Key, Value> : Type extends TArgument<infer Index extends number> ? TFromArgument<Args, Index> : Type);
 /** `[JavaScript]` Instantiates a type with the given parameters */
-export type TInstantiate<Type extends TSchema, Arguments extends TSchema[]> = (TRemap<Type, TInstantiateArguments<Arguments>>);
+export type TInstantiate<Type extends TSchema, Args extends TSchema[], Result extends TSchema = TFromType<Args, Type>> = Result;
 /** `[JavaScript]` Instantiates a type with the given parameters */
-export declare function Instantiate<Type extends TSchema, Arguments extends TSchema[]>(type: Type, args: [...Arguments]): TInstantiate<Type, Arguments>;
+export declare function Instantiate<Type extends TSchema, Args extends TSchema[]>(type: Type, args: [...Args]): TInstantiate<Type, Args>;
 export {};

package/build/cjs/type/instantiate/instantiate.js

@@ -1,32 +1,119 @@
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromTypes = FromTypes;
 exports.Instantiate = Instantiate;
+const type_1 = require("../clone/type");
 const index_1 = require("../never/index");
 const index_2 = require("../readonly-optional/index");
 const index_3 = require("../readonly/index");
 const index_4 = require("../optional/index");
-const index_5 = require("../remap/index");
+const index_5 = require("../record/index");
+const ValueGuard = require("../guard/value");
 const KindGuard = require("../guard/kind");
 // prettier-ignore
-function InstantiateArgument(argument, type) {
-    const isReadonly = KindGuard.IsReadonly(argument);
-    const isOptional = KindGuard.IsOptional(argument);
-    return (isReadonly && isOptional ? (0, index_2.ReadonlyOptional)(type) :
-        isReadonly && !isOptional ? (0, index_3.Readonly)(type) :
-            !isReadonly && isOptional ? (0, index_4.Optional)(type) :
-                type);
+function FromConstructor(args, type) {
+    type.parameters = FromTypes(args, type.parameters);
+    type.returns = FromType(args, type.returns);
+    return type;
+}
+// prettier-ignore
+function FromFunction(args, type) {
+    type.parameters = FromTypes(args, type.parameters);
+    type.returns = FromType(args, type.returns);
+    return type;
+}
+// prettier-ignore
+function FromIntersect(args, type) {
+    type.allOf = FromTypes(args, type.allOf);
+    return type;
+}
+// prettier-ignore
+function FromUnion(args, type) {
+    type.anyOf = FromTypes(args, type.anyOf);
+    return type;
+}
+// prettier-ignore
+function FromTuple(args, type) {
+    if (ValueGuard.IsUndefined(type.items))
+        return type;
+    type.items = FromTypes(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromArray(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromAsyncIterator(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromIterator(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromPromise(args, type) {
+    type.item = FromType(args, type.item);
+    return type;
+}
+// prettier-ignore
+function FromObject(args, type) {
+    type.properties = FromProperties(args, type.properties);
+    return type;
+}
+// prettier-ignore
+function FromRecord(args, type) {
+    const mappedKey = FromType(args, (0, index_5.RecordKey)(type));
+    const mappedValue = FromType(args, (0, index_5.RecordValue)(type));
+    const result = (0, index_5.Record)(mappedKey, mappedValue);
+    return { ...type, ...result }; // retain options
+}
+// prettier-ignore
+function FromArgument(args, argument) {
+    return argument.index in args ? args[argument.index] : (0, index_1.Never)();
+}
+// prettier-ignore
+function FromProperty(args, type) {
+    const isReadonly = KindGuard.IsReadonly(type);
+    const isOptional = KindGuard.IsOptional(type);
+    const mapped = FromType(args, type);
+    return (isReadonly && isOptional ? (0, index_2.ReadonlyOptional)(mapped) :
+        isReadonly && !isOptional ? (0, index_3.Readonly)(mapped) :
+            !isReadonly && isOptional ? (0, index_4.Optional)(mapped) :
+                mapped);
+}
+// prettier-ignore
+function FromProperties(args, properties) {
+    return globalThis.Object.getOwnPropertyNames(properties).reduce((result, key) => {
+        return { ...result, [key]: FromProperty(args, properties[key]) };
+    }, {});
+}
+// prettier-ignore
+function FromTypes(args, types) {
+    return types.map(type => FromType(args, type));
+}
+// prettier-ignore
+function FromType(args, type) {
+    return (KindGuard.IsConstructor(type) ? FromConstructor(args, type) :
+        KindGuard.IsFunction(type) ? FromFunction(args, type) :
+            KindGuard.IsIntersect(type) ? FromIntersect(args, type) :
+                KindGuard.IsUnion(type) ? FromUnion(args, type) :
+                    KindGuard.IsTuple(type) ? FromTuple(args, type) :
+                        KindGuard.IsArray(type) ? FromArray(args, type) :
+                            KindGuard.IsAsyncIterator(type) ? FromAsyncIterator(args, type) :
+                                KindGuard.IsIterator(type) ? FromIterator(args, type) :
+                                    KindGuard.IsPromise(type) ? FromPromise(args, type) :
+                                        KindGuard.IsObject(type) ? FromObject(args, type) :
+                                            KindGuard.IsRecord(type) ? FromRecord(args, type) :
+                                                KindGuard.IsArgument(type) ? FromArgument(args, type) :
+                                                    type);
 }
 /** `[JavaScript]` Instantiates a type with the given parameters */
 // prettier-ignore
 function Instantiate(type, args) {
-    return (0, index_5.Remap)(type, (type) => {
-        return KindGuard.IsArgument(type)
-            ? type.index in args
-                ? KindGuard.IsSchema(args[type.index])
-                    ? InstantiateArgument(type, args[type.index])
-                    : (0, index_1.Never)()
-                : (0, index_1.Never)()
-            : type;
-    });
+    return FromType(args, (0, type_1.CloneType)(type));
 }

package/build/cjs/type/type/type.d.ts

@@ -43,7 +43,6 @@ export { Record } from '../record/index';
 export { Recursive } from '../recursive/index';
 export { Ref } from '../ref/index';
 export { RegExp } from '../regexp/index';
-export { Remap } from '../remap/index';
 export { Required } from '../required/index';
 export { Rest } from '../rest/index';
 export { ReturnType } from '../return-type/index';

package/build/cjs/type/type/type.js

@@ -1,8 +1,8 @@
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Required = exports.Remap = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.Module = exports.Mapped = exports.Literal = exports.KeyOf = exports.Iterator = exports.Uppercase = exports.Lowercase = exports.Uncapitalize = exports.Capitalize = exports.Intersect = exports.Integer = exports.Instantiate = exports.InstanceType = exports.Index = exports.Function = exports.Extract = exports.Extends = exports.Exclude = exports.Enum = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Argument = exports.Any = void 0;
-exports.Void = exports.Unsafe = exports.Unknown = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.Transform = exports.TemplateLiteral = exports.Symbol = exports.String = exports.ReturnType = exports.Rest = void 0;
+exports.Rest = exports.Required = exports.RegExp = exports.Ref = exports.Recursive = exports.Record = exports.ReadonlyOptional = exports.Readonly = exports.Promise = exports.Pick = exports.Partial = exports.Parameters = exports.Optional = exports.Omit = exports.Object = exports.Number = exports.Null = exports.Not = exports.Never = exports.Module = exports.Mapped = exports.Literal = exports.KeyOf = exports.Iterator = exports.Uppercase = exports.Lowercase = exports.Uncapitalize = exports.Capitalize = exports.Intersect = exports.Integer = exports.Instantiate = exports.InstanceType = exports.Index = exports.Function = exports.Extract = exports.Extends = exports.Exclude = exports.Enum = exports.Date = exports.ConstructorParameters = exports.Constructor = exports.Const = exports.Composite = exports.Boolean = exports.BigInt = exports.Awaited = exports.AsyncIterator = exports.Array = exports.Argument = exports.Any = void 0;
+exports.Void = exports.Unsafe = exports.Unknown = exports.Union = exports.Undefined = exports.Uint8Array = exports.Tuple = exports.Transform = exports.TemplateLiteral = exports.Symbol = exports.String = exports.ReturnType = void 0;
 // ------------------------------------------------------------------
 // Type: Module
 // ------------------------------------------------------------------
@@ -99,33 +99,31 @@ var index_44 = require("../ref/index");
 Object.defineProperty(exports, "Ref", { enumerable: true, get: function () { return index_44.Ref; } });
 var index_45 = require("../regexp/index");
 Object.defineProperty(exports, "RegExp", { enumerable: true, get: function () { return index_45.RegExp; } });
-var index_46 = require("../remap/index");
-Object.defineProperty(exports, "Remap", { enumerable: true, get: function () { return index_46.Remap; } });
-var index_47 = require("../required/index");
-Object.defineProperty(exports, "Required", { enumerable: true, get: function () { return index_47.Required; } });
-var index_48 = require("../rest/index");
-Object.defineProperty(exports, "Rest", { enumerable: true, get: function () { return index_48.Rest; } });
-var index_49 = require("../return-type/index");
-Object.defineProperty(exports, "ReturnType", { enumerable: true, get: function () { return index_49.ReturnType; } });
-var index_50 = require("../string/index");
-Object.defineProperty(exports, "String", { enumerable: true, get: function () { return index_50.String; } });
-var index_51 = require("../symbol/index");
-Object.defineProperty(exports, "Symbol", { enumerable: true, get: function () { return index_51.Symbol; } });
-var index_52 = require("../template-literal/index");
-Object.defineProperty(exports, "TemplateLiteral", { enumerable: true, get: function () { return index_52.TemplateLiteral; } });
-var index_53 = require("../transform/index");
-Object.defineProperty(exports, "Transform", { enumerable: true, get: function () { return index_53.Transform; } });
-var index_54 = require("../tuple/index");
-Object.defineProperty(exports, "Tuple", { enumerable: true, get: function () { return index_54.Tuple; } });
-var index_55 = require("../uint8array/index");
-Object.defineProperty(exports, "Uint8Array", { enumerable: true, get: function () { return index_55.Uint8Array; } });
-var index_56 = require("../undefined/index");
-Object.defineProperty(exports, "Undefined", { enumerable: true, get: function () { return index_56.Undefined; } });
-var index_57 = require("../union/index");
-Object.defineProperty(exports, "Union", { enumerable: true, get: function () { return index_57.Union; } });
-var index_58 = require("../unknown/index");
-Object.defineProperty(exports, "Unknown", { enumerable: true, get: function () { return index_58.Unknown; } });
-var index_59 = require("../unsafe/index");
-Object.defineProperty(exports, "Unsafe", { enumerable: true, get: function () { return index_59.Unsafe; } });
-var index_60 = require("../void/index");
-Object.defineProperty(exports, "Void", { enumerable: true, get: function () { return index_60.Void; } });
+var index_46 = require("../required/index");
+Object.defineProperty(exports, "Required", { enumerable: true, get: function () { return index_46.Required; } });
+var index_47 = require("../rest/index");
+Object.defineProperty(exports, "Rest", { enumerable: true, get: function () { return index_47.Rest; } });
+var index_48 = require("../return-type/index");
+Object.defineProperty(exports, "ReturnType", { enumerable: true, get: function () { return index_48.ReturnType; } });
+var index_49 = require("../string/index");
+Object.defineProperty(exports, "String", { enumerable: true, get: function () { return index_49.String; } });
+var index_50 = require("../symbol/index");
+Object.defineProperty(exports, "Symbol", { enumerable: true, get: function () { return index_50.Symbol; } });
+var index_51 = require("../template-literal/index");
+Object.defineProperty(exports, "TemplateLiteral", { enumerable: true, get: function () { return index_51.TemplateLiteral; } });
+var index_52 = require("../transform/index");
+Object.defineProperty(exports, "Transform", { enumerable: true, get: function () { return index_52.Transform; } });
+var index_53 = require("../tuple/index");
+Object.defineProperty(exports, "Tuple", { enumerable: true, get: function () { return index_53.Tuple; } });
+var index_54 = require("../uint8array/index");
+Object.defineProperty(exports, "Uint8Array", { enumerable: true, get: function () { return index_54.Uint8Array; } });
+var index_55 = require("../undefined/index");
+Object.defineProperty(exports, "Undefined", { enumerable: true, get: function () { return index_55.Undefined; } });
+var index_56 = require("../union/index");
+Object.defineProperty(exports, "Union", { enumerable: true, get: function () { return index_56.Union; } });
+var index_57 = require("../unknown/index");
+Object.defineProperty(exports, "Unknown", { enumerable: true, get: function () { return index_57.Unknown; } });
+var index_58 = require("../unsafe/index");
+Object.defineProperty(exports, "Unsafe", { enumerable: true, get: function () { return index_58.Unsafe; } });
+var index_59 = require("../void/index");
+Object.defineProperty(exports, "Void", { enumerable: true, get: function () { return index_59.Void; } });

package/build/esm/index.d.mts

@@ -52,7 +52,6 @@ export * from './type/record/index.mjs';
 export * from './type/recursive/index.mjs';
 export * from './type/ref/index.mjs';
 export * from './type/regexp/index.mjs';
-export * from './type/remap/index.mjs';
 export * from './type/required/index.mjs';
 export * from './type/rest/index.mjs';
 export * from './type/return-type/index.mjs';

package/build/esm/index.mjs

@@ -58,7 +58,6 @@ export * from './type/record/index.mjs';
 export * from './type/recursive/index.mjs';
 export * from './type/ref/index.mjs';
 export * from './type/regexp/index.mjs';
-export * from './type/remap/index.mjs';
 export * from './type/required/index.mjs';
 export * from './type/rest/index.mjs';
 export * from './type/return-type/index.mjs';

package/build/esm/syntax/runtime.mjs

@@ -39,10 +39,17 @@ const Dereference = (context, key) => {
 // GenericReference
 // ------------------------------------------------------------------
 function GenericReferenceMapping(results, context) {
-    const target = Dereference(context, results[0]);
-    return t.Instantiate(target, results[2]);
+    const type = Dereference(context, results[0]);
+    const args = results[2];
+    return t.Instantiate(type, args);
 }
-const GenericReference = Runtime.Tuple([Runtime.Ident(), Runtime.Const(LAngle), Runtime.Ref('Elements'), Runtime.Const(RAngle)], (results, context) => GenericReferenceMapping(results, context));
+// prettier-ignore
+const GenericReference = Runtime.Tuple([
+    Runtime.Ident(),
+    Runtime.Const(LAngle),
+    Runtime.Ref('Elements'),
+    Runtime.Const(RAngle)
+], (results, context) => GenericReferenceMapping(results, context));
 // ------------------------------------------------------------------
 // Reference
 // ------------------------------------------------------------------

package/build/esm/syntax/static.d.mts

@@ -43,7 +43,7 @@ type Delimit<Parser extends Static.IParser, Delimiter extends Static.IParser> =
 ], DelimitMapping>);
 type Dereference<Context extends t.TProperties, Ref extends string> = (Ref extends keyof Context ? Context[Ref] : t.TRef<Ref>);
 interface GenericReferenceMapping extends Static.IMapping {
-    output: this['context'] extends t.TProperties ? this['input'] extends [infer Reference extends string, LAngle, infer Parameters extends t.TSchema[], RAngle] ? t.TInstantiate<Dereference<this['context'], Reference>, [...Parameters]> : never : never;
+    output: this['context'] extends t.TProperties ? this['input'] extends [infer Reference extends string, LAngle, infer Args extends t.TSchema[], RAngle] ? t.TInstantiate<Dereference<this['context'], Reference>, Args> : never : never;
 }
 type GenericReference = Static.Tuple<[
     Static.Ident,

package/build/esm/type/instantiate/instantiate.d.mts

@@ -1,25 +1,50 @@
-import type { TSchema } from '../schema/index.mjs';
-import type { TArgument } from '../argument/index.mjs';
+import { type TSchema } from '../schema/index.mjs';
+import { type TArgument } from '../argument/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { type TReadonlyOptional } from '../readonly-optional/index.mjs';
 import { type TReadonly } from '../readonly/index.mjs';
 import { type TOptional } from '../optional/index.mjs';
-import { type TRemap, type TMapping as TRemapMapping } from '../remap/index.mjs';
-type TInstantiateArgument<Argument extends TArgument, Type extends TSchema, IsArgumentReadonly extends number = Argument extends TReadonly<TSchema> ? 1 : 0, IsArgumentOptional extends number = Argument extends TOptional<TSchema> ? 1 : 0, Result extends TSchema = ([
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [1, 1] ? TReadonlyOptional<Type> : [
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [0, 1] ? TOptional<Type> : [
-    IsArgumentReadonly,
-    IsArgumentOptional
-] extends [1, 0] ? TReadonly<Type> : Type)> = Result;
-interface TInstantiateArguments<Arguments extends TSchema[]> extends TRemapMapping {
-    output: (this['input'] extends TArgument<infer Index extends number> ? Index extends keyof Arguments ? Arguments[Index] extends TSchema ? TInstantiateArgument<this['input'], Arguments[Index]> : TNever : TNever : this['input']);
-}
+import { type TConstructor } from '../constructor/index.mjs';
+import { type TFunction } from '../function/index.mjs';
+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 { type TAsyncIterator } from '../async-iterator/index.mjs';
+import { type TIterator } from '../iterator/index.mjs';
+import { type TPromise } from '../promise/index.mjs';
+import { type TObject, type TProperties } from '../object/index.mjs';
+import { type TRecordOrObject, type TRecord } from '../record/index.mjs';
+type TFromConstructor<Args extends TSchema[], Parameters extends TSchema[], InstanceType extends TSchema, Result extends TConstructor = TConstructor<TFromTypes<Args, Parameters>, TFromType<Args, InstanceType>>> = Result;
+type TFromFunction<Args extends TSchema[], Parameters extends TSchema[], ReturnType extends TSchema, Result extends TFunction = TFunction<TFromTypes<Args, Parameters>, TFromType<Args, ReturnType>>> = Result;
+type TFromIntersect<Args extends TSchema[], Types extends TSchema[], Result extends TIntersect = TIntersect<TFromTypes<Args, Types>>> = Result;
+type TFromUnion<Args extends TSchema[], Types extends TSchema[], Result extends TUnion = TUnion<TFromTypes<Args, Types>>> = Result;
+type TFromTuple<Args extends TSchema[], Types extends TSchema[], Result extends TTuple = TTuple<TFromTypes<Args, Types>>> = Result;
+type TFromArray<Args extends TSchema[], Type extends TSchema, Result extends TArray = TArray<TFromType<Args, Type>>> = Result;
+type TFromAsyncIterator<Args extends TSchema[], Type extends TSchema, Result extends TAsyncIterator = TAsyncIterator<TFromType<Args, Type>>> = Result;
+type TFromIterator<Args extends TSchema[], Type extends TSchema, Result extends TIterator = TIterator<TFromType<Args, Type>>> = Result;
+type TFromPromise<Args extends TSchema[], Type extends TSchema, Result extends TPromise = TPromise<TFromType<Args, Type>>> = Result;
+type TFromObject<Args extends TSchema[], Properties extends TProperties, Result extends TObject = TObject<TFromProperties<Args, Properties>>> = Result;
+type TFromRecord<Args extends TSchema[], Key extends TSchema, Value extends TSchema, MappedKey extends TSchema = TFromType<Args, Key>, MappedValue extends TSchema = TFromType<Args, Value>, Result extends TSchema = TRecordOrObject<MappedKey, MappedValue>> = Result;
+type TFromArgument<Args extends TSchema[], Index extends number> = (Index extends keyof Args ? Args[Index] : TNever);
+type TFromProperty<Args extends TSchema[], Type extends TSchema, IsReadonly extends boolean = Type extends TReadonly<Type> ? true : false, IsOptional extends boolean = Type extends TOptional<Type> ? true : false, Mapped extends TSchema = TFromType<Args, Type>, Result extends TSchema = ([
+    IsReadonly,
+    IsOptional
+] extends [true, true] ? TReadonlyOptional<Mapped> : [
+    IsReadonly,
+    IsOptional
+] extends [true, false] ? TReadonly<Mapped> : [
+    IsReadonly,
+    IsOptional
+] extends [false, true] ? TOptional<Mapped> : Mapped)> = Result;
+type TFromProperties<Args extends TSchema[], Properties extends TProperties, Result extends TProperties = {
+    [Key in keyof Properties]: TFromProperty<Args, Properties[Key]>;
+}> = Result;
+export type TFromTypes<Args extends TSchema[], Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<Args, Right, [...Result, TFromType<Args, Left>]> : Result);
+export declare function FromTypes<Args extends TSchema[], Types extends TSchema[]>(args: [...Args], types: [...Types]): TFromTypes<Args, Types>;
+export type TFromType<Args extends TSchema[], Type extends TSchema> = (Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<Args, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<Args, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<Args, Types> : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<Args, Types> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<Args, Types> : Type extends TArray<infer Type extends TSchema> ? TFromArray<Args, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<Args, Type> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<Args, Type> : Type extends TPromise<infer Type extends TSchema> ? TFromPromise<Args, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<Args, Properties> : Type extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TFromRecord<Args, Key, Value> : Type extends TArgument<infer Index extends number> ? TFromArgument<Args, Index> : Type);
 /** `[JavaScript]` Instantiates a type with the given parameters */
-export type TInstantiate<Type extends TSchema, Arguments extends TSchema[]> = (TRemap<Type, TInstantiateArguments<Arguments>>);
+export type TInstantiate<Type extends TSchema, Args extends TSchema[], Result extends TSchema = TFromType<Args, Type>> = Result;
 /** `[JavaScript]` Instantiates a type with the given parameters */
-export declare function Instantiate<Type extends TSchema, Arguments extends TSchema[]>(type: Type, args: [...Arguments]): TInstantiate<Type, Arguments>;
+export declare function Instantiate<Type extends TSchema, Args extends TSchema[]>(type: Type, args: [...Args]): TInstantiate<Type, Args>;
 export {};

package/build/esm/type/instantiate/instantiate.mjs

@@ -1,28 +1,114 @@
+import { CloneType } from '../clone/type.mjs';
 import { Never } from '../never/index.mjs';
 import { ReadonlyOptional } from '../readonly-optional/index.mjs';
 import { Readonly } from '../readonly/index.mjs';
 import { Optional } from '../optional/index.mjs';
-import { Remap } from '../remap/index.mjs';
+import { Record, RecordKey, RecordValue } from '../record/index.mjs';
+import * as ValueGuard from '../guard/value.mjs';
 import * as KindGuard from '../guard/kind.mjs';
 // prettier-ignore
-function InstantiateArgument(argument, type) {
-    const isReadonly = KindGuard.IsReadonly(argument);
-    const isOptional = KindGuard.IsOptional(argument);
-    return (isReadonly && isOptional ? ReadonlyOptional(type) :
-        isReadonly && !isOptional ? Readonly(type) :
-            !isReadonly && isOptional ? Optional(type) :
-                type);
+function FromConstructor(args, type) {
+    type.parameters = FromTypes(args, type.parameters);
+    type.returns = FromType(args, type.returns);
+    return type;
+}
+// prettier-ignore
+function FromFunction(args, type) {
+    type.parameters = FromTypes(args, type.parameters);
+    type.returns = FromType(args, type.returns);
+    return type;
+}
+// prettier-ignore
+function FromIntersect(args, type) {
+    type.allOf = FromTypes(args, type.allOf);
+    return type;
+}
+// prettier-ignore
+function FromUnion(args, type) {
+    type.anyOf = FromTypes(args, type.anyOf);
+    return type;
+}
+// prettier-ignore
+function FromTuple(args, type) {
+    if (ValueGuard.IsUndefined(type.items))
+        return type;
+    type.items = FromTypes(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromArray(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromAsyncIterator(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromIterator(args, type) {
+    type.items = FromType(args, type.items);
+    return type;
+}
+// prettier-ignore
+function FromPromise(args, type) {
+    type.item = FromType(args, type.item);
+    return type;
+}
+// prettier-ignore
+function FromObject(args, type) {
+    type.properties = FromProperties(args, type.properties);
+    return type;
+}
+// prettier-ignore
+function FromRecord(args, type) {
+    const mappedKey = FromType(args, RecordKey(type));
+    const mappedValue = FromType(args, RecordValue(type));
+    const result = Record(mappedKey, mappedValue);
+    return { ...type, ...result }; // retain options
+}
+// prettier-ignore
+function FromArgument(args, argument) {
+    return argument.index in args ? args[argument.index] : Never();
+}
+// prettier-ignore
+function FromProperty(args, type) {
+    const isReadonly = KindGuard.IsReadonly(type);
+    const isOptional = KindGuard.IsOptional(type);
+    const mapped = FromType(args, type);
+    return (isReadonly && isOptional ? ReadonlyOptional(mapped) :
+        isReadonly && !isOptional ? Readonly(mapped) :
+            !isReadonly && isOptional ? Optional(mapped) :
+                mapped);
+}
+// prettier-ignore
+function FromProperties(args, properties) {
+    return globalThis.Object.getOwnPropertyNames(properties).reduce((result, key) => {
+        return { ...result, [key]: FromProperty(args, properties[key]) };
+    }, {});
+}
+// prettier-ignore
+export function FromTypes(args, types) {
+    return types.map(type => FromType(args, type));
+}
+// prettier-ignore
+function FromType(args, type) {
+    return (KindGuard.IsConstructor(type) ? FromConstructor(args, type) :
+        KindGuard.IsFunction(type) ? FromFunction(args, type) :
+            KindGuard.IsIntersect(type) ? FromIntersect(args, type) :
+                KindGuard.IsUnion(type) ? FromUnion(args, type) :
+                    KindGuard.IsTuple(type) ? FromTuple(args, type) :
+                        KindGuard.IsArray(type) ? FromArray(args, type) :
+                            KindGuard.IsAsyncIterator(type) ? FromAsyncIterator(args, type) :
+                                KindGuard.IsIterator(type) ? FromIterator(args, type) :
+                                    KindGuard.IsPromise(type) ? FromPromise(args, type) :
+                                        KindGuard.IsObject(type) ? FromObject(args, type) :
+                                            KindGuard.IsRecord(type) ? FromRecord(args, type) :
+                                                KindGuard.IsArgument(type) ? FromArgument(args, type) :
+                                                    type);
 }
 /** `[JavaScript]` Instantiates a type with the given parameters */
 // prettier-ignore
 export function Instantiate(type, args) {
-    return Remap(type, (type) => {
-        return KindGuard.IsArgument(type)
-            ? type.index in args
-                ? KindGuard.IsSchema(args[type.index])
-                    ? InstantiateArgument(type, args[type.index])
-                    : Never()
-                : Never()
-            : type;
-    });
+    return FromType(args, CloneType(type));
 }

package/build/esm/type/type/type.d.mts

@@ -43,7 +43,6 @@ export { Record } from '../record/index.mjs';
 export { Recursive } from '../recursive/index.mjs';
 export { Ref } from '../ref/index.mjs';
 export { RegExp } from '../regexp/index.mjs';
-export { Remap } from '../remap/index.mjs';
 export { Required } from '../required/index.mjs';
 export { Rest } from '../rest/index.mjs';
 export { ReturnType } from '../return-type/index.mjs';

package/build/esm/type/type/type.mjs

@@ -46,7 +46,6 @@ export { Record } from '../record/index.mjs';
 export { Recursive } from '../recursive/index.mjs';
 export { Ref } from '../ref/index.mjs';
 export { RegExp } from '../regexp/index.mjs';
-export { Remap } from '../remap/index.mjs';
 export { Required } from '../required/index.mjs';
 export { Rest } from '../rest/index.mjs';
 export { ReturnType } from '../return-type/index.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.34.22",
+  "version": "0.34.23",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",

package/readme.md

@@ -64,7 +64,6 @@ License MIT
 - [Types](#types)
   - [Json](#types-json)
   - [JavaScript](#types-javascript)
-  - [Import](#types-import)
   - [Options](#types-options)
   - [Properties](#types-properties)
   - [Generics](#types-generics)
@@ -97,9 +96,9 @@ License MIT
   - [Mutate](#values-mutate)
   - [Pointer](#values-pointer)
 - [Syntax](#syntax)
-  - [Type](#syntax-type)
-  - [Options](#syntax-options)
+  - [Create](#syntax-create)
   - [Parameters](#syntax-parameters)
+  - [Options](#syntax-options)
   - [Generics](#syntax-generics)
 - [TypeRegistry](#typeregistry)
   - [Type](#typeregistry-type)
@@ -107,6 +106,8 @@ License MIT
 - [TypeCheck](#typecheck)
   - [Ajv](#typecheck-ajv)
   - [TypeCompiler](#typecheck-typecompiler)
+- [TypeMap](#typemap)
+  - [Usage](#typemap-usage)
 - [TypeSystem](#typesystem)
   - [Policies](#typesystem-policies)
 - [Error Function](#error-function)
@@ -638,22 +639,6 @@ TypeBox provides an extended type set that can be used to create schematics for
 └────────────────────────────────┴─────────────────────────────┴────────────────────────────────┘
 ```
 
-<a name='types-import'></a>
-
-### Import
-
-Import the Type namespace to bring in the full TypeBox type system. This is recommended for most users.
-
-```typescript
-import { Type, type Static } from '@sinclair/typebox'
-```
-
-You can also selectively import types. This enables modern bundlers to tree shake for unused types.
-
-```typescript
-import { Object, Number, String, Boolean, type Static } from '@sinclair/typebox'
-```
-
 <a name='types-options'></a>
 
 ### Options
@@ -741,22 +726,6 @@ const Nullable = <T extends TSchema>(T: T) => {     // type Nullable<T> = T | nu
 const T = Nullable(Type.String())                  // type T = Nullable<string>
 ```
 
-Generic types can also be created with Argument types
-
-```typescript
-const Vector = Type.Object({                        // type Vector<A_0, A_1, A_2> = {
-  x: Type.Argument(0),                              //   x: A_0,
-  y: Type.Argument(1),                              //   y: A_1,
-  z: Type.Argument(2),                              //   z: A_2
-})                                                  // }
-
-const T = Type.Instantiate(Vector, [                // type T = Vector<
-  Type.Boolean(),                                   //   boolean, 
-  Type.Number(),                                    //   number,
-  Type.String()                                     //   string
-])                                                  // >
-```
-
 <a name='types-recursive'></a>
 
 ### Recursive Types
@@ -1337,30 +1306,50 @@ ValuePointer.Set(A, '/z', 1)                         // A' = { x: 1, y: 1, z: 1
 
 ## Syntax Types
 
-TypeBox provides optional support for runtime and type level parsing from TypeScript syntax.
+TypeBox has support for parsing TypeScript syntax at runtime as well as statically in the type system. This feature offers a syntactical frontend to the TypeBox type builder.
+
+Syntax types are available via optional import.
 
 ```typescript
 import { Syntax } from '@sinclair/typebox/syntax'
 ```
 
-<a name='syntax-type'></a>
+<a name='syntax-create'></a>
+
+### Create
+
+Use the Syntax function to create TypeBox types from TypeScript syntax
 
-### Type
+```typescript
+const T = Syntax(`{ x: number, y: number }`)        // const T: TObject<{
+                                                    //   x: TNumber,
+                                                    //   y: TNumber
+                                                    // }>
+```
+
+<a name="syntax-parameters"></a>
+
+### Parameters
 
-Use the Syntax function to create TypeBox type from TypeScript syntax.
+Syntax types can be parameterized to receive exterior types.
 
 ```typescript
 const T = Syntax(`{ x: number, y: number }`)        // const T: TObject<{
-                                                    //   x: TNumber
+                                                    //   x: TNumber,
                                                     //   y: TNumber
                                                     // }>
+
+const S = Syntax({ T }, `Partial<T>`)               // const S: TObject<{
+                                                    //   x: TOptional<TNumber>,
+                                                    //   y: TOptional<TNumber>
+                                                    // }>
 ```
 
 <a name='syntax-options'></a>
 
 ### Options
 
-Options can be passed to types on the last parameter
+Options can be passed via the last parameter
 
 ```typescript
 const T = Syntax(`number`, {                      // const T = {
@@ -1370,42 +1359,30 @@ const T = Syntax(`number`, {                      // const T = {
                                                   // }
 ```
 
-<a name="syntax-parameters"></a>
-
-### Parameters
-
-Syntax types can be parameterized to accept exterior types.
-
-```typescript
-const T = Syntax('number')
-
-const S = Syntax({ T }, `{ x: T, y: T, z: T }`)     // const S: TObject<{
-                                                    //   x: TNumber,
-                                                    //   y: TNumber,
-                                                    //   z: TNumber
-                                                    // }>
-```
-
 <a name="syntax-generics"></a>
 
 ### Generics
 
-Generic types can be created using Argument types.
+Generic types can be created using positional argument types ([Example](https://www.typescriptlang.org/play/?moduleResolution=99&module=199&ts=5.8.0-beta#code/JYWwDg9gTgLgBAbzgZQJ4DsYEMAecC+cAZlBCHAOQACAzsOgMYA2WwUA9DKmAKYBGEHOxoZsOCgChQkWIhTYYwBgWKly1OoxZtO3foMkSGEdDXgAVAAxwAvClG4AFBQCCUAOYBXED0wAeSwA+CgBKIxMzOHMARlt7TCdXD29fGD9o4LDjUwsAJji0BJxnNy8ff1zMiXCcuAA1HgYYaAKHYqQrABoo6O7zfPxugAMECTg4HAAuKMtOsbhUaZi58YAvJdyJfCGwmsiAISw6Ggam6BpWosckU+aoAmHR8an6xrv07tm4IJWF6dvoAFur1voFfutXmcoEDvsCwVsdtUuLw4IdjgCoBc7MgFEo-MieBAiKijsATm9zoFxtT2Ow4ASSeiKZi4k9qeyOZyudyeTzadSXkgXiDFrC4BDrIN5ryZbK5ez+eNRULpl9RSCJQ9pfKdbqFXS1tMVWLRV8IbF8Nq9da5fzCEA))
 
 ```typescript
-const Vector = Syntax(`{
-  x: Argument<0>,
-  y: Argument<1>,
-  z: Argument<2>
+const T0 = Syntax('Argument<0>')
+const T1 = Syntax('Argument<1>')
+const T2 = Syntax('Argument<2>')
+
+const Vector = Syntax({ T0, T1, T2 }, `{
+  x: T0,
+  y: T1,
+  z: T2
 }`)
 
-const Basis = Syntax({ Vector }, `{
+const BasisVectors = Syntax({ Vector }, `{
   x: Vector<1, 0, 0>,
   y: Vector<0, 1, 0>,
   z: Vector<0, 0, 1>,
 }`)
 
-type Basis = Static<typeof Basis>                   // type Basis = {
+type BasisVectors = Static<typeof BasisVectors>     // type BasisVectors = {
                                                     //   x: { x: 1, y: 0, z: 0 },
                                                     //   y: { x: 0, y: 1, z: 0 },
                                                     //   z: { x: 0, y: 0, z: 1 }
@@ -1573,6 +1550,44 @@ const C = TypeCompiler.Code(Type.String())           // const C = `return functi
                                                      // }`
 ```
 
+<a name='typemap'></a>
+
+## TypeMap
+
+TypeBox offers an external package for bi-directional mapping between TypeBox, Valibot, and Zod type libraries. It also includes syntax parsing support for Valibot and Zod and supports the Standard Schema specification. For more details on TypeMap, refer to the project repository.
+
+[TypeMap Repository](https://github.com/sinclairzx81/typemap)
+
+<a name='typemap-usage'></a>
+
+### Usage
+
+TypeMap needs to be installed seperately
+
+```bash
+$ npm install @sinclair/typemap
+```
+
+Once installed it offers advanced structural remapping between various runtime type libraries ([Example](https://www.typescriptlang.org/play/?moduleResolution=99&module=199&ts=5.8.0-beta#code/JYWwDg9gTgLgBAbzgFQJ5gKYCEIA8A0cAyqgHYwCGBcAWhACZwC+cAZlBCHAOQACAzsFIBjADYVgUAPQx0GEBTDcAUMuERS-eMjgBeFHJy4AFAAMkuAFxxSAVxAAjDFEKprdx88IAvd-adQzKYAlHBwUlJw6pra1sgA8g4AVhjCMAA8CMphObl5+QWFRcW5ETlWKABy-s4A3NkljU3NBWVhblU1UPUtvX3FbXC+nZ7dDf0TE2VMAHyq0VrEesRklCbIoS1lC-BE1twWfqOuRwE+p87MKmoaiwBKy3T0xkTBAHRgFFD8GMZ2oqJNnltrd4HdrFlJltImEKh4Aj0oU1Bh14XVxkiBjChhcxpjGtMwkA))
+
+```typescript
+import { TypeBox, Syntax, Zod } from '@sinclair/typemap'
+
+const T = TypeBox(`{ x: number, y: number, z: number }`)  // const T: TObject<{
+                                                          //   x: TNumber;
+                                                          //   y: TNumber;
+                                                          //   z: TNumber;
+                                                          // }>
+
+const S = Syntax(T)                // const S: '{ x: number, y: number, z: number }'
+
+const R = Zod(S).parse(null)       // const R: {
+                                   //   x: number;
+                                   //   y: number;
+                                   //   z: number;
+                                   // }                    
+```
+
 <a name='typesystem'></a>
 
 ## TypeSystem

package/build/cjs/type/remap/index.d.ts

@@ -1 +0,0 @@
-export * from './remap';

package/build/cjs/type/remap/index.js

@@ -1,18 +0,0 @@
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./remap"), exports);

package/build/cjs/type/remap/remap.d.ts

@@ -1,30 +0,0 @@
-import { TSchema } from '../schema/index';
-import { TObject, TProperties } from '../object/index';
-import { TConstructor } from '../constructor/index';
-import { TFunction } from '../function/index';
-import { TIntersect } from '../intersect/index';
-import { TUnion } from '../union/index';
-import { TTuple } from '../tuple/index';
-import { TArray } from '../array/index';
-import { TAsyncIterator } from '../async-iterator/index';
-import { TIterator } from '../iterator/index';
-import { TPromise } from '../promise/index';
-import { TRecord, TRecordOrObject } from '../record/index';
-export type TCallback = (schema: TSchema) => TSchema;
-export interface TMapping {
-    input: unknown;
-    output: unknown;
-}
-type TApply<Type extends TSchema, Mapping extends TMapping, Mapped = (Mapping & {
-    input: Type;
-})['output'], Result = Mapped extends TSchema ? Mapped : never> = Result;
-type TFromProperties<Properties extends TProperties, Mapping extends TMapping, Result extends TProperties = {
-    [Key in keyof Properties]: TRemap<Properties[Key], Mapping>;
-}> = Result;
-type TFromTypes<Types extends TSchema[], Mapping extends TMapping, Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<Right, Mapping, [...Result, TRemap<Left, Mapping>]> : Result);
-type TFromType<Type extends TSchema, Mapping extends TMapping, Result extends TSchema = (TApply<Type, Mapping>)> = Result;
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-export type TRemap<Type extends TSchema, Mapping extends TMapping, Mapped extends TSchema = TFromType<Type, Mapping>, Result extends TSchema = (Mapped extends TConstructor<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TConstructor<TFromTypes<Parameters, Mapping>, TFromType<ReturnType, Mapping>> : Mapped extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFunction<TFromTypes<Parameters, Mapping>, TFromType<ReturnType, Mapping>> : Mapped extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TFromTypes<Types, Mapping>> : Mapped extends TUnion<infer Types extends TSchema[]> ? TUnion<TFromTypes<Types, Mapping>> : Mapped extends TTuple<infer Types extends TSchema[]> ? TTuple<TFromTypes<Types, Mapping>> : Mapped extends TArray<infer Type extends TSchema> ? TArray<TFromType<Type, Mapping>> : Mapped extends TAsyncIterator<infer Type extends TSchema> ? TAsyncIterator<TFromType<Type, Mapping>> : Mapped extends TIterator<infer Type extends TSchema> ? TIterator<TFromType<Type, Mapping>> : Mapped extends TPromise<infer Type extends TSchema> ? TPromise<TFromType<Type, Mapping>> : Mapped extends TObject<infer Properties extends TProperties> ? TObject<TFromProperties<Properties, Mapping>> : Mapped extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TRecordOrObject<TFromType<Key, Mapping>, TFromType<Value, Mapping>> : Mapped)> = Result;
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-export declare function Remap(type: TSchema, callback: TCallback): TSchema;
-export {};

package/build/cjs/type/remap/remap.js

@@ -1,47 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Remap = Remap;
-const index_1 = require("../object/index");
-const index_2 = require("../constructor/index");
-const index_3 = require("../function/index");
-const index_4 = require("../intersect/index");
-const index_5 = require("../union/index");
-const index_6 = require("../tuple/index");
-const index_7 = require("../array/index");
-const index_8 = require("../async-iterator/index");
-const index_9 = require("../iterator/index");
-const index_10 = require("../promise/index");
-const index_11 = require("../record/index");
-const KindGuard = require("../guard/kind");
-const type_1 = require("../clone/type");
-function FromProperties(properties, func) {
-    return globalThis.Object.getOwnPropertyNames(properties).reduce((result, key) => {
-        return { ...result, [key]: Remap(properties[key], func) };
-    }, {});
-}
-function FromTypes(types, callback) {
-    return types.map((type) => Remap(type, callback));
-}
-function FromType(type, callback) {
-    return callback(type);
-}
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-// prettier-ignore
-function Remap(type, callback) {
-    // Map incoming type
-    const mapped = (0, type_1.CloneType)(FromType(type, callback));
-    // Return remapped interior
-    return (KindGuard.IsConstructor(type) ? (0, index_2.Constructor)(FromTypes(type.parameters, callback), FromType(type.returns, callback), mapped) :
-        KindGuard.IsFunction(type) ? (0, index_3.Function)(FromTypes(type.parameters, callback), FromType(type.returns, callback), mapped) :
-            KindGuard.IsIntersect(type) ? (0, index_4.Intersect)(FromTypes(type.allOf, callback), mapped) :
-                KindGuard.IsUnion(type) ? (0, index_5.Union)(FromTypes(type.anyOf, callback), mapped) :
-                    KindGuard.IsTuple(type) ? (0, index_6.Tuple)(FromTypes(type.items || [], callback), mapped) :
-                        KindGuard.IsArray(type) ? (0, index_7.Array)(FromType(type.items, callback), mapped) :
-                            KindGuard.IsAsyncIterator(type) ? (0, index_8.AsyncIterator)(FromType(type.items, callback), mapped) :
-                                KindGuard.IsIterator(type) ? (0, index_9.Iterator)(FromType(type.items, callback), mapped) :
-                                    KindGuard.IsPromise(type) ? (0, index_10.Promise)(FromType(type.items, callback), mapped) :
-                                        KindGuard.IsObject(type) ? (0, index_1.Object)(FromProperties(type.properties, callback), mapped) :
-                                            KindGuard.IsRecord(type) ? (0, index_11.Record)(FromType((0, index_11.RecordKey)(type), callback), FromType((0, index_11.RecordValue)(type), callback), mapped) :
-                                                (0, type_1.CloneType)(mapped));
-}

package/build/esm/type/remap/index.d.mts

@@ -1 +0,0 @@
-export * from './remap.mjs';

package/build/esm/type/remap/index.mjs

@@ -1 +0,0 @@
-export * from './remap.mjs';

package/build/esm/type/remap/remap.d.mts

@@ -1,30 +0,0 @@
-import { TSchema } from '../schema/index.mjs';
-import { TObject, TProperties } from '../object/index.mjs';
-import { TConstructor } from '../constructor/index.mjs';
-import { TFunction } from '../function/index.mjs';
-import { TIntersect } from '../intersect/index.mjs';
-import { TUnion } from '../union/index.mjs';
-import { TTuple } from '../tuple/index.mjs';
-import { TArray } from '../array/index.mjs';
-import { TAsyncIterator } from '../async-iterator/index.mjs';
-import { TIterator } from '../iterator/index.mjs';
-import { TPromise } from '../promise/index.mjs';
-import { TRecord, TRecordOrObject } from '../record/index.mjs';
-export type TCallback = (schema: TSchema) => TSchema;
-export interface TMapping {
-    input: unknown;
-    output: unknown;
-}
-type TApply<Type extends TSchema, Mapping extends TMapping, Mapped = (Mapping & {
-    input: Type;
-})['output'], Result = Mapped extends TSchema ? Mapped : never> = Result;
-type TFromProperties<Properties extends TProperties, Mapping extends TMapping, Result extends TProperties = {
-    [Key in keyof Properties]: TRemap<Properties[Key], Mapping>;
-}> = Result;
-type TFromTypes<Types extends TSchema[], Mapping extends TMapping, Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<Right, Mapping, [...Result, TRemap<Left, Mapping>]> : Result);
-type TFromType<Type extends TSchema, Mapping extends TMapping, Result extends TSchema = (TApply<Type, Mapping>)> = Result;
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-export type TRemap<Type extends TSchema, Mapping extends TMapping, Mapped extends TSchema = TFromType<Type, Mapping>, Result extends TSchema = (Mapped extends TConstructor<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TConstructor<TFromTypes<Parameters, Mapping>, TFromType<ReturnType, Mapping>> : Mapped extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFunction<TFromTypes<Parameters, Mapping>, TFromType<ReturnType, Mapping>> : Mapped extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TFromTypes<Types, Mapping>> : Mapped extends TUnion<infer Types extends TSchema[]> ? TUnion<TFromTypes<Types, Mapping>> : Mapped extends TTuple<infer Types extends TSchema[]> ? TTuple<TFromTypes<Types, Mapping>> : Mapped extends TArray<infer Type extends TSchema> ? TArray<TFromType<Type, Mapping>> : Mapped extends TAsyncIterator<infer Type extends TSchema> ? TAsyncIterator<TFromType<Type, Mapping>> : Mapped extends TIterator<infer Type extends TSchema> ? TIterator<TFromType<Type, Mapping>> : Mapped extends TPromise<infer Type extends TSchema> ? TPromise<TFromType<Type, Mapping>> : Mapped extends TObject<infer Properties extends TProperties> ? TObject<TFromProperties<Properties, Mapping>> : Mapped extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TRecordOrObject<TFromType<Key, Mapping>, TFromType<Value, Mapping>> : Mapped)> = Result;
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-export declare function Remap(type: TSchema, callback: TCallback): TSchema;
-export {};

package/build/esm/type/remap/remap.mjs

@@ -1,43 +0,0 @@
-import { Object } from '../object/index.mjs';
-import { Constructor } from '../constructor/index.mjs';
-import { Function } from '../function/index.mjs';
-import { Intersect } from '../intersect/index.mjs';
-import { Union } from '../union/index.mjs';
-import { Tuple } from '../tuple/index.mjs';
-import { Array } from '../array/index.mjs';
-import { AsyncIterator } from '../async-iterator/index.mjs';
-import { Iterator } from '../iterator/index.mjs';
-import { Promise } from '../promise/index.mjs';
-import { Record, RecordKey, RecordValue } from '../record/index.mjs';
-import * as KindGuard from '../guard/kind.mjs';
-import { CloneType } from '../clone/type.mjs';
-function FromProperties(properties, func) {
-    return globalThis.Object.getOwnPropertyNames(properties).reduce((result, key) => {
-        return { ...result, [key]: Remap(properties[key], func) };
-    }, {});
-}
-function FromTypes(types, callback) {
-    return types.map((type) => Remap(type, callback));
-}
-function FromType(type, callback) {
-    return callback(type);
-}
-/** `[Internal]` Applies a recursive conditional remapping of a type and its sub type constituents */
-// prettier-ignore
-export function Remap(type, callback) {
-    // Map incoming type
-    const mapped = CloneType(FromType(type, callback));
-    // Return remapped interior
-    return (KindGuard.IsConstructor(type) ? Constructor(FromTypes(type.parameters, callback), FromType(type.returns, callback), mapped) :
-        KindGuard.IsFunction(type) ? Function(FromTypes(type.parameters, callback), FromType(type.returns, callback), mapped) :
-            KindGuard.IsIntersect(type) ? Intersect(FromTypes(type.allOf, callback), mapped) :
-                KindGuard.IsUnion(type) ? Union(FromTypes(type.anyOf, callback), mapped) :
-                    KindGuard.IsTuple(type) ? Tuple(FromTypes(type.items || [], callback), mapped) :
-                        KindGuard.IsArray(type) ? Array(FromType(type.items, callback), mapped) :
-                            KindGuard.IsAsyncIterator(type) ? AsyncIterator(FromType(type.items, callback), mapped) :
-                                KindGuard.IsIterator(type) ? Iterator(FromType(type.items, callback), mapped) :
-                                    KindGuard.IsPromise(type) ? Promise(FromType(type.items, callback), mapped) :
-                                        KindGuard.IsObject(type) ? Object(FromProperties(type.properties, callback), mapped) :
-                                            KindGuard.IsRecord(type) ? Record(FromType(RecordKey(type), callback), FromType(RecordValue(type), callback), mapped) :
-                                                CloneType(mapped));
-}