@sinclair/typebox 0.34.25 → 0.34.27

package/build/esm/syntax/runtime.mjs

@@ -56,15 +56,15 @@ const GenericArgumentList = Runtime.Union([
 // GenericArguments
 // ------------------------------------------------------------------
 // prettier-ignore
-const GenericArgumentsContext = (args) => {
+const GenericArgumentsContext = (args, context) => {
     return args.reduce((result, arg, index) => {
         return { ...result, [arg]: t.Argument(index) };
-    }, {});
+    }, context);
 };
 // prettier-ignore
-const GenericArgumentsMapping = (results) => {
+const GenericArgumentsMapping = (results, context) => {
     return results.length === 3
-        ? GenericArgumentsContext(results[1])
+        ? GenericArgumentsContext(results[1], context)
         : {};
 };
 // prettier-ignore
@@ -72,7 +72,7 @@ const GenericArguments = Runtime.Tuple([
     Runtime.Const(LAngle),
     Runtime.Ref('GenericArgumentList'),
     Runtime.Const(RAngle),
-], results => GenericArgumentsMapping(results));
+], (results, context) => GenericArgumentsMapping(results, context));
 // ------------------------------------------------------------------
 // GenericReference
 // ------------------------------------------------------------------
@@ -282,7 +282,11 @@ const Expr = Runtime.Tuple([
 // ------------------------------------------------------------------
 // Type
 // ------------------------------------------------------------------
-const Type = Runtime.Ref('Expr');
+// prettier-ignore
+const Type = Runtime.Union([
+    Runtime.Context(Runtime.Ref('GenericArguments'), Runtime.Ref('Expr')),
+    Runtime.Ref('Expr')
+]);
 // ------------------------------------------------------------------
 // Properties
 // ------------------------------------------------------------------
@@ -649,12 +653,12 @@ const Uint8Array = Runtime.Const('Uint8Array', Runtime.As(t.Uint8Array()));
 // prettier-ignore
 export const Module = new Runtime.Module({
     // ----------------------------------------------------------------
-    // Generic Arguments
+    // Generics
     // ----------------------------------------------------------------
     GenericArgumentList,
     GenericArguments,
     // ----------------------------------------------------------------
-    // Type Expressions
+    // Type
     // ----------------------------------------------------------------
     Literal,
     Keyword,
@@ -667,7 +671,7 @@ export const Module = new Runtime.Module({
     ExprTerm,
     ExprTail,
     Expr,
-    Type, // Alias for Expr
+    Type,
     PropertyKey,
     Readonly,
     Optional,

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

@@ -52,13 +52,13 @@ type GenericArgumentList = Static.Union<[
     Static.Tuple<[Static.Ident]>,
     Static.Tuple<[]>
 ], GenericArgumentListMapping>;
-type GenericArgumentsContext<Args extends string[], Result extends t.TProperties = {}> = (Args extends [...infer Left extends string[], infer Right extends string] ? GenericArgumentsContext<Left, Result & {
+type GenericArgumentsContext<Args extends string[], Context extends t.TProperties, Result extends t.TProperties = {}> = (Args extends [...infer Left extends string[], infer Right extends string] ? GenericArgumentsContext<Left, Context, Result & {
     [_ in Right]: t.TArgument<Left['length']>;
-}> : t.Evaluate<Result>);
+}> : t.Evaluate<Result & Context>);
 interface GenericArgumentsMapping extends Static.IMapping {
-    output: this['input'] extends [LAngle, infer Args extends string[], RAngle] ? GenericArgumentsContext<Args> : never;
+    output: this['input'] extends [LAngle, infer Args extends string[], RAngle] ? this['context'] extends infer Context extends t.TProperties ? GenericArgumentsContext<Args, Context> : never : never;
 }
-export type GenericArguments = Static.Tuple<[
+type GenericArguments = Static.Tuple<[
     Static.Const<LAngle>,
     GenericArgumentList,
     Static.Const<RAngle>
@@ -204,7 +204,10 @@ type Expr = Static.Tuple<[
     ExprTerm,
     ExprTail
 ], ExprBinaryMapping>;
-export type Type = Expr;
+export type Type = Static.Union<[
+    Static.Context<GenericArguments, Expr>,
+    Expr
+]>;
 interface PropertyKeyStringMapping extends Static.IMapping {
     output: this['input'];
 }

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

@@ -1,13 +1,12 @@
 import * as t from '../type/index.mjs';
 import { Static } from '../parser/index.mjs';
-import { Type, GenericArguments } from './static.mjs';
-type TParseSyntax<Context extends Record<PropertyKey, t.TSchema>, Code extends string> = (Static.Parse<GenericArguments, Code, {}> extends [infer Args extends t.TProperties, infer Rest extends string] ? Static.Parse<Type, Rest, Context & Args> : Static.Parse<Type, Code, Context>);
+import { Type } from './static.mjs';
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type but does not infer schematics */
 export declare function NoInfer<Context extends Record<PropertyKey, t.TSchema>, Code extends string>(context: Context, code: Code, options?: t.SchemaOptions): t.TSchema;
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type but does not infer schematics */
 export declare function NoInfer<Code extends string>(code: Code, options?: t.SchemaOptions): t.TSchema;
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type */
-export type TSyntax<Context extends Record<PropertyKey, t.TSchema>, Code extends string> = (TParseSyntax<Context, Code> extends [infer Type extends t.TSchema, string] ? Type : t.TNever);
+export type TSyntax<Context extends Record<PropertyKey, t.TSchema>, Code extends string> = (Static.Parse<Type, Code, Context> extends [infer Type extends t.TSchema, string] ? Type : t.TNever);
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type */
 export declare function Syntax<Context extends Record<PropertyKey, t.TSchema>, Annotation extends string>(context: Context, annotation: Annotation, options?: t.SchemaOptions): TSyntax<Context, Annotation>;
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type */
@@ -28,4 +27,3 @@ export declare function ParseOnly<Context extends Record<PropertyKey, t.TSchema>
  * @deprecated Use NoInfer() function
  */
 export declare function ParseOnly<Code extends string>(code: Code, options?: t.SchemaOptions): t.TSchema | undefined;
-export {};

package/build/esm/syntax/syntax.mjs

@@ -1,18 +1,11 @@
 import * as t from '../type/index.mjs';
 import { Module } from './runtime.mjs';
-// prettier-ignore
-function ParseSyntax(context, code) {
-    const results = Module.Parse('GenericArguments', code, {}); // [ArgumentContext, Rest]
-    return (results.length === 2
-        ? Module.Parse('Type', results[1], { ...context, ...results[0] })
-        : Module.Parse('Type', code, context));
-}
 /** `[Experimental]` Parses a TypeScript annotation into a TypeBox type but does not infer schematics */
 // prettier-ignore
 export function NoInfer(...args) {
     const withContext = typeof args[0] === 'string' ? false : true;
     const [context, code, options] = withContext ? [args[0], args[1], args[2] || {}] : [{}, args[0], args[1] || {}];
-    const result = ParseSyntax(context, code)[0];
+    const result = Module.Parse('Type', code, context)[0];
     return t.KindGuard.IsSchema(result)
         ? t.CloneType(result, options)
         : t.Never(options);

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

@@ -20,11 +20,12 @@ import { TPartial } from '../partial/index.mjs';
 import { type TReadonly } from '../readonly/index.mjs';
 import { type TRecordOrObject, type TRecord } from '../record/index.mjs';
 import { type TRef } from '../ref/index.mjs';
-import { TRequired } from '../required/index.mjs';
+import { type TRequired } from '../required/index.mjs';
+import { type TTransform } from '../transform/index.mjs';
 import { type TTuple } from '../tuple/index.mjs';
 import { type TUnion, type TUnionEvaluated } from '../union/index.mjs';
-type TDerefParameters<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TRef<infer Key extends string> ? TDerefParameters<ModuleProperties, Right, [...Result, TDeref<ModuleProperties, Key>]> : TDerefParameters<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
-type TDeref<ModuleProperties extends TProperties, Ref extends string, Result extends TSchema = (Ref extends keyof ModuleProperties ? ModuleProperties[Ref] extends TRef<infer Ref2 extends string> ? TDeref<ModuleProperties, Ref2> : TFromType<ModuleProperties, ModuleProperties[Ref]> : TNever)> = Result;
+type TDereferenceParameters<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? Left extends TRef<infer Key extends string> ? TDereferenceParameters<ModuleProperties, Right, [...Result, TDereference<ModuleProperties, Key>]> : TDereferenceParameters<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
+type TDereference<ModuleProperties extends TProperties, Ref extends string, Result extends TSchema = (Ref extends keyof ModuleProperties ? ModuleProperties[Ref] extends TRef<infer Ref2 extends string> ? TDereference<ModuleProperties, Ref2> : TFromType<ModuleProperties, ModuleProperties[Ref]> : TNever)> = Result;
 type TFromAwaited<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TAwaited<T0> : never);
 type TFromIndex<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TIndex<T0, TIndexPropertyKeys<T1>> extends infer Result extends TSchema ? Result : never : never);
 type TFromKeyOf<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TKeyOf<T0> : never);
@@ -32,21 +33,22 @@ type TFromPartial<Parameters extends TSchema[]> = (Parameters extends [infer T0
 type TFromOmit<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TOmit<T0, T1> : never);
 type TFromPick<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema, infer T1 extends TSchema] ? TPick<T0, T1> : never);
 type TFromRequired<Parameters extends TSchema[]> = (Parameters extends [infer T0 extends TSchema] ? TRequired<T0> : never);
-type TFromComputed<ModuleProperties extends TProperties, Target extends string, Parameters extends TSchema[], Dereferenced extends TSchema[] = TDerefParameters<ModuleProperties, Parameters>> = (Target extends 'Awaited' ? TFromAwaited<Dereferenced> : Target extends 'Index' ? TFromIndex<Dereferenced> : Target extends 'KeyOf' ? TFromKeyOf<Dereferenced> : Target extends 'Partial' ? TFromPartial<Dereferenced> : Target extends 'Omit' ? TFromOmit<Dereferenced> : Target extends 'Pick' ? TFromPick<Dereferenced> : Target extends 'Required' ? TFromRequired<Dereferenced> : TNever);
+type TFromComputed<ModuleProperties extends TProperties, Target extends string, Parameters extends TSchema[], Dereferenced extends TSchema[] = TDereferenceParameters<ModuleProperties, Parameters>> = (Target extends 'Awaited' ? TFromAwaited<Dereferenced> : Target extends 'Index' ? TFromIndex<Dereferenced> : Target extends 'KeyOf' ? TFromKeyOf<Dereferenced> : Target extends 'Partial' ? TFromPartial<Dereferenced> : Target extends 'Omit' ? TFromOmit<Dereferenced> : Target extends 'Pick' ? TFromPick<Dereferenced> : Target extends 'Required' ? TFromRequired<Dereferenced> : TNever);
+type TFromArray<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<TArray<TFromType<ModuleProperties, Type>>>);
+type TFromAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TAsyncIterator<TFromType<ModuleProperties, Type>>);
+type TFromConstructor<ModuleProperties extends TProperties, Parameters extends TSchema[], InstanceType extends TSchema> = (TConstructor<TFromTypes<ModuleProperties, Parameters>, TFromType<ModuleProperties, InstanceType>>);
+type TFromFunction<ModuleProperties extends TProperties, Parameters extends TSchema[], ReturnType extends TSchema> = Ensure<Ensure<TFunction<TFromTypes<ModuleProperties, Parameters>, TFromType<ModuleProperties, ReturnType>>>>;
+type TFromIntersect<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TIntersectEvaluated<TFromTypes<ModuleProperties, Types>>>);
+type TFromIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TIterator<TFromType<ModuleProperties, Type>>);
 type TFromObject<ModuleProperties extends TProperties, Properties extends TProperties> = Ensure<TObject<Evaluate<{
     [Key in keyof Properties]: TFromType<ModuleProperties, Properties[Key]>;
 }>>>;
 type TFromRecord<ModuleProperties extends TProperties, Key extends TSchema, Value extends TSchema, Result extends TSchema = TRecordOrObject<Key, TFromType<ModuleProperties, Value>>> = Result;
-type TFromConstructor<ModuleProperties extends TProperties, Parameters extends TSchema[], InstanceType extends TSchema> = (TConstructor<TFromRest<ModuleProperties, Parameters>, TFromType<ModuleProperties, InstanceType>>);
-type TFromFunction<ModuleProperties extends TProperties, Parameters extends TSchema[], ReturnType extends TSchema> = Ensure<Ensure<TFunction<TFromRest<ModuleProperties, Parameters>, TFromType<ModuleProperties, ReturnType>>>>;
-type TFromTuple<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TTuple<TFromRest<ModuleProperties, Types>>>);
-type TFromIntersect<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TIntersectEvaluated<TFromRest<ModuleProperties, Types>>>);
-type TFromUnion<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TUnionEvaluated<TFromRest<ModuleProperties, Types>>>);
-type TFromArray<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<TArray<TFromType<ModuleProperties, Type>>>);
-type TFromAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TAsyncIterator<TFromType<ModuleProperties, Type>>);
-type TFromIterator<ModuleProperties extends TProperties, Type extends TSchema> = (TIterator<TFromType<ModuleProperties, Type>>);
-type TFromRest<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromRest<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
-export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TOptional<infer Type extends TSchema> ? TOptional<TFromType<ModuleProperties, Type>> : Type extends TReadonly<infer Type extends TSchema> ? TReadonly<TFromType<ModuleProperties, Type>> : Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TFromRecord<ModuleProperties, Key, Value> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
+type TFromTransform<ModuleProperties extends TProperties, Input extends TSchema, Output extends unknown, Result extends TSchema = Input extends TRef<infer Key extends string> ? TTransform<TDereference<ModuleProperties, Key>, Output> : TTransform<Input, Output>> = Result;
+type TFromTuple<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TTuple<TFromTypes<ModuleProperties, Types>>>);
+type TFromUnion<ModuleProperties extends TProperties, Types extends TSchema[]> = (Ensure<TUnionEvaluated<TFromTypes<ModuleProperties, Types>>>);
+type TFromTypes<ModuleProperties extends TProperties, Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TFromTypes<ModuleProperties, Right, [...Result, TFromType<ModuleProperties, Left>]> : Result);
+export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TOptional<infer Type extends TSchema> ? TOptional<TFromType<ModuleProperties, Type>> : Type extends TReadonly<infer Type extends TSchema> ? TReadonly<TFromType<ModuleProperties, Type>> : Type extends TTransform<infer Input extends TSchema, infer Output extends unknown> ? TFromTransform<ModuleProperties, Input, Output> : Type extends TArray<infer Type extends TSchema> ? TFromArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TFromAsyncIterator<ModuleProperties, Type> : Type extends TComputed<infer Target extends string, infer Parameters extends TSchema[]> ? TFromComputed<ModuleProperties, Target, Parameters> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TFromConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFromFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TFromIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TFromIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TFromObject<ModuleProperties, Properties> : Type extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TFromRecord<ModuleProperties, Key, Value> : Type extends TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> : Type extends TEnum<infer _ extends TEnumRecord> ? Type : Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> : Type);
 export declare function FromType<ModuleProperties extends TProperties, Type extends TSchema>(moduleProperties: ModuleProperties, type: Type): TFromType<ModuleProperties, Type>;
 export type TComputeType<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TFromType<ModuleProperties, ModuleProperties[Key]> : TNever);
 export declare function ComputeType<ModuleProperties extends TProperties, Key extends PropertyKey>(moduleProperties: ModuleProperties, key: Key): TComputeType<ModuleProperties, Key>;

package/build/esm/type/module/compute.mjs

@@ -19,24 +19,27 @@ import { RecordValue, RecordPattern } from '../record/index.mjs';
 import { Required } from '../required/index.mjs';
 import { Tuple } from '../tuple/index.mjs';
 import { Union } from '../union/index.mjs';
-import { OptionalKind, ReadonlyKind } from '../symbols/index.mjs';
+// ------------------------------------------------------------------
+// Symbols
+// ------------------------------------------------------------------
+import { TransformKind, OptionalKind, ReadonlyKind } from '../symbols/index.mjs';
 // ------------------------------------------------------------------
 // KindGuard
 // ------------------------------------------------------------------
 import * as KindGuard from '../guard/kind.mjs';
 // prettier-ignore
-function DerefParameters(moduleProperties, types) {
+function DereferenceParameters(moduleProperties, types) {
     return types.map((type) => {
         return KindGuard.IsRef(type)
-            ? Deref(moduleProperties, type.$ref)
+            ? Dereference(moduleProperties, type.$ref)
             : FromType(moduleProperties, type);
     });
 }
 // prettier-ignore
-function Deref(moduleProperties, ref) {
+function Dereference(moduleProperties, ref) {
     return (ref in moduleProperties
         ? KindGuard.IsRef(moduleProperties[ref])
-            ? Deref(moduleProperties, moduleProperties[ref].$ref)
+            ? Dereference(moduleProperties, moduleProperties[ref].$ref)
             : FromType(moduleProperties, moduleProperties[ref])
         : Never());
 }
@@ -70,7 +73,7 @@ function FromRequired(parameters) {
 }
 // prettier-ignore
 function FromComputed(moduleProperties, target, parameters) {
-    const dereferenced = DerefParameters(moduleProperties, parameters);
+    const dereferenced = DereferenceParameters(moduleProperties, parameters);
     return (target === 'Awaited' ? FromAwaited(dereferenced) :
         target === 'Index' ? FromIndex(dereferenced) :
             target === 'KeyOf' ? FromKeyOf(dereferenced) :
@@ -80,6 +83,26 @@ function FromComputed(moduleProperties, target, parameters) {
                             target === 'Required' ? FromRequired(dereferenced) :
                                 Never());
 }
+function FromArray(moduleProperties, type) {
+    return Array(FromType(moduleProperties, type));
+}
+function FromAsyncIterator(moduleProperties, type) {
+    return AsyncIterator(FromType(moduleProperties, type));
+}
+// prettier-ignore
+function FromConstructor(moduleProperties, parameters, instanceType) {
+    return Constructor(FromTypes(moduleProperties, parameters), FromType(moduleProperties, instanceType));
+}
+// prettier-ignore
+function FromFunction(moduleProperties, parameters, returnType) {
+    return FunctionType(FromTypes(moduleProperties, parameters), FromType(moduleProperties, returnType));
+}
+function FromIntersect(moduleProperties, types) {
+    return Intersect(FromTypes(moduleProperties, types));
+}
+function FromIterator(moduleProperties, type) {
+    return Iterator(FromType(moduleProperties, type));
+}
 function FromObject(moduleProperties, properties) {
     return Object(globalThis.Object.keys(properties).reduce((result, key) => {
         return { ...result, [key]: FromType(moduleProperties, properties[key]) };
@@ -93,53 +116,41 @@ function FromRecord(moduleProperties, type) {
     return result;
 }
 // prettier-ignore
-function FromConstructor(moduleProperties, parameters, instanceType) {
-    return Constructor(FromRest(moduleProperties, parameters), FromType(moduleProperties, instanceType));
-}
-// prettier-ignore
-function FromFunction(moduleProperties, parameters, returnType) {
-    return FunctionType(FromRest(moduleProperties, parameters), FromType(moduleProperties, returnType));
+function FromTransform(moduleProperties, transform) {
+    return (KindGuard.IsRef(transform))
+        ? { ...Dereference(moduleProperties, transform.$ref), [TransformKind]: transform[TransformKind] }
+        : transform;
 }
 function FromTuple(moduleProperties, types) {
-    return Tuple(FromRest(moduleProperties, types));
-}
-function FromIntersect(moduleProperties, types) {
-    return Intersect(FromRest(moduleProperties, types));
+    return Tuple(FromTypes(moduleProperties, types));
 }
 function FromUnion(moduleProperties, types) {
-    return Union(FromRest(moduleProperties, types));
-}
-function FromArray(moduleProperties, type) {
-    return Array(FromType(moduleProperties, type));
-}
-function FromAsyncIterator(moduleProperties, type) {
-    return AsyncIterator(FromType(moduleProperties, type));
-}
-function FromIterator(moduleProperties, type) {
-    return Iterator(FromType(moduleProperties, type));
+    return Union(FromTypes(moduleProperties, types));
 }
-function FromRest(moduleProperties, types) {
+function FromTypes(moduleProperties, types) {
     return types.map((type) => FromType(moduleProperties, type));
 }
 // prettier-ignore
 export function FromType(moduleProperties, type) {
     return (
-    // Modifier Unwrap - Reapplied via CreateType Options
+    // Modifiers
     KindGuard.IsOptional(type) ? CreateType(FromType(moduleProperties, Discard(type, [OptionalKind])), type) :
         KindGuard.IsReadonly(type) ? CreateType(FromType(moduleProperties, Discard(type, [ReadonlyKind])), type) :
-            // Traveral
-            KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
-                KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
-                    KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
-                        KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
-                            KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
-                                KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
-                                    KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
-                                        KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
-                                            KindGuard.IsRecord(type) ? CreateType(FromRecord(moduleProperties, type)) :
-                                                KindGuard.IsTuple(type) ? CreateType(FromTuple(moduleProperties, type.items || []), type) :
-                                                    KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
-                                                        type);
+            // Transform
+            KindGuard.IsTransform(type) ? CreateType(FromTransform(moduleProperties, type), type) :
+                // Types
+                KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
+                    KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
+                        KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters)) :
+                            KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
+                                KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
+                                    KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
+                                        KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
+                                            KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
+                                                KindGuard.IsRecord(type) ? CreateType(FromRecord(moduleProperties, type)) :
+                                                    KindGuard.IsTuple(type) ? CreateType(FromTuple(moduleProperties, type.items || []), type) :
+                                                        KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
+                                                            type);
 }
 // prettier-ignore
 export function ComputeType(moduleProperties, key) {

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

@@ -7,6 +7,7 @@ import type { TConstructor } from '../constructor/index.mjs';
 import type { TEnum } from '../enum/index.mjs';
 import type { TFunction } from '../function/index.mjs';
 import type { TIntersect } from '../intersect/index.mjs';
+import type { TImport } from '../module/index.mjs';
 import type { TIterator } from '../iterator/index.mjs';
 import type { TNot } from '../not/index.mjs';
 import type { TObject, TProperties } from '../object/index.mjs';
@@ -19,17 +20,20 @@ import type { TUnion } from '../union/index.mjs';
 import type { TUnsafe } from '../unsafe/index.mjs';
 import type { TSchema } from '../schema/index.mjs';
 import type { TTransform } from '../transform/index.mjs';
-export type TDecodeProperties<T extends TProperties> = {
-    [K in keyof T]: TDecodeType<T[K]>;
+import type { TNever } from '../never/index.mjs';
+type TDecodeImport<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TDecodeType<ModuleProperties[Key]> extends infer Type extends TSchema ? Type extends TRef<infer Ref extends string> ? TDecodeImport<ModuleProperties, Ref> : Type : TNever : TNever);
+type TDecodeProperties<Properties extends TProperties> = {
+    [Key in keyof Properties]: TDecodeType<Properties[Key]>;
 };
-export type TDecodeRest<T extends TSchema[], Acc extends TSchema[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TDecodeRest<R, [...Acc, TDecodeType<L>]> : Acc;
-export type TDecodeType<T extends TSchema> = (T extends TOptional<infer S extends TSchema> ? TOptional<TDecodeType<S>> : T extends TReadonly<infer S extends TSchema> ? TReadonly<TDecodeType<S>> : T extends TTransform<infer _, infer R> ? TUnsafe<R> : T extends TArray<infer S extends TSchema> ? TArray<TDecodeType<S>> : T extends TAsyncIterator<infer S extends TSchema> ? TAsyncIterator<TDecodeType<S>> : T extends TConstructor<infer P extends TSchema[], infer R extends TSchema> ? TConstructor<TDecodeRest<P>, TDecodeType<R>> : T extends TEnum<infer S> ? TEnum<S> : T extends TFunction<infer P extends TSchema[], infer R extends TSchema> ? TFunction<TDecodeRest<P>, TDecodeType<R>> : T extends TIntersect<infer S extends TSchema[]> ? TIntersect<TDecodeRest<S>> : T extends TIterator<infer S extends TSchema> ? TIterator<TDecodeType<S>> : T extends TNot<infer S extends TSchema> ? TNot<TDecodeType<S>> : T extends TObject<infer S> ? TObject<Evaluate<TDecodeProperties<S>>> : T extends TPromise<infer S extends TSchema> ? TPromise<TDecodeType<S>> : T extends TRecord<infer K, infer S> ? TRecord<K, TDecodeType<S>> : T extends TRecursive<infer S extends TSchema> ? TRecursive<TDecodeType<S>> : T extends TRef<infer S extends string> ? TRef<S> : T extends TTuple<infer S extends TSchema[]> ? TTuple<TDecodeRest<S>> : T extends TUnion<infer S extends TSchema[]> ? TUnion<TDecodeRest<S>> : T);
-export type StaticDecodeIsAny<T> = boolean extends (T extends TSchema ? true : false) ? true : false;
+type TDecodeTypes<Types extends TSchema[], Result extends TSchema[] = []> = (Types extends [infer Left extends TSchema, ...infer Right extends TSchema[]] ? TDecodeTypes<Right, [...Result, TDecodeType<Left>]> : Result);
+export type TDecodeType<Type extends TSchema> = (Type extends TOptional<infer Type extends TSchema> ? TOptional<TDecodeType<Type>> : Type extends TReadonly<infer Type extends TSchema> ? TReadonly<TDecodeType<Type>> : Type extends TTransform<infer _Input extends TSchema, infer Output> ? TUnsafe<Output> : Type extends TArray<infer Type extends TSchema> ? TArray<TDecodeType<Type>> : Type extends TAsyncIterator<infer Type extends TSchema> ? TAsyncIterator<TDecodeType<Type>> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TConstructor<TDecodeTypes<Parameters>, TDecodeType<InstanceType>> : Type extends TEnum<infer Values> ? TEnum<Values> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TFunction<TDecodeTypes<Parameters>, TDecodeType<ReturnType>> : Type extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TDecodeTypes<Types>> : Type extends TImport<infer ModuleProperties extends TProperties, infer Key> ? TDecodeImport<ModuleProperties, Key> : Type extends TIterator<infer Type extends TSchema> ? TIterator<TDecodeType<Type>> : Type extends TNot<infer Type extends TSchema> ? TNot<TDecodeType<Type>> : Type extends TObject<infer Properties extends TProperties> ? TObject<Evaluate<TDecodeProperties<Properties>>> : Type extends TPromise<infer Type extends TSchema> ? TPromise<TDecodeType<Type>> : Type extends TRecord<infer Key extends TSchema, infer Value extends TSchema> ? TRecord<Key, TDecodeType<Value>> : Type extends TRecursive<infer Type extends TSchema> ? TRecursive<TDecodeType<Type>> : Type extends TRef<infer Ref extends string> ? TRef<Ref> : Type extends TTuple<infer Types extends TSchema[]> ? TTuple<TDecodeTypes<Types>> : Type extends TUnion<infer Types extends TSchema[]> ? TUnion<TDecodeTypes<Types>> : Type);
+export type StaticDecodeIsAny<Type> = boolean extends (Type extends TSchema ? true : false) ? true : false;
 /** Creates an decoded static type from a TypeBox type */
-export type StaticDecode<T extends TSchema, P extends unknown[] = []> = StaticDecodeIsAny<T> extends true ? unknown : Static<TDecodeType<T>, P>;
+export type StaticDecode<Type extends TSchema, Params extends unknown[] = [], Result = StaticDecodeIsAny<Type> extends true ? unknown : Static<TDecodeType<Type>, Params>> = Result;
 /** Creates an encoded static type from a TypeBox type */
-export type StaticEncode<T extends TSchema, P extends unknown[] = []> = Static<T, P>;
+export type StaticEncode<Type extends TSchema, Params extends unknown[] = [], Result = Static<Type, Params>> = Result;
 /** Creates a static type from a TypeBox type */
-export type Static<T extends TSchema, P extends unknown[] = []> = (T & {
-    params: P;
-})['static'];
+export type Static<Type extends TSchema, Params extends unknown[] = [], Result = (Type & {
+    params: Params;
+})['static']> = Result;
+export {};

package/build/esm/value/transform/decode.mjs

@@ -78,12 +78,10 @@ function FromIntersect(schema, references, path, value) {
 }
 // prettier-ignore
 function FromImport(schema, references, path, value) {
-    const definitions = globalThis.Object.values(schema.$defs);
+    const additional = globalThis.Object.values(schema.$defs);
     const target = schema.$defs[schema.$ref];
-    const transform = schema[TransformKind];
-    // Note: we need to re-spec the target as TSchema + [TransformKind]
-    const transformTarget = { [TransformKind]: transform, ...target };
-    return Visit(transformTarget, [...references, ...definitions], path, value);
+    const result = Visit(target, [...references, ...additional], path, value);
+    return Default(schema, path, result);
 }
 function FromNot(schema, references, path, value) {
     return Default(schema, path, Visit(schema.not, references, path, value));

package/build/esm/value/transform/encode.mjs

@@ -55,12 +55,10 @@ function FromArray(schema, references, path, value) {
 }
 // prettier-ignore
 function FromImport(schema, references, path, value) {
-    const definitions = globalThis.Object.values(schema.$defs);
+    const additional = globalThis.Object.values(schema.$defs);
     const target = schema.$defs[schema.$ref];
-    const transform = schema[TransformKind];
-    // Note: we need to re-spec the target as TSchema + [TransformKind]
-    const transformTarget = { [TransformKind]: transform, ...target };
-    return Visit(transformTarget, [...references, ...definitions], path, value);
+    const result = Default(schema, path, value);
+    return Visit(target, [...references, ...additional], path, result);
 }
 // prettier-ignore
 function FromIntersect(schema, references, path, value) {

package/build/esm/value/transform/has.mjs

@@ -29,6 +29,12 @@ function FromIntersect(schema, references) {
     return IsTransform(schema) || IsTransform(schema.unevaluatedProperties) || schema.allOf.some((schema) => Visit(schema, references));
 }
 // prettier-ignore
+function FromImport(schema, references) {
+    const additional = globalThis.Object.getOwnPropertyNames(schema.$defs).reduce((result, key) => [...result, schema.$defs[key]], []);
+    const target = schema.$defs[schema.$ref];
+    return IsTransform(schema) || Visit(target, [...additional, ...references]);
+}
+// prettier-ignore
 function FromIterator(schema, references) {
     return IsTransform(schema) || Visit(schema.items, references);
 }
@@ -89,6 +95,8 @@ function Visit(schema, references) {
             return FromConstructor(schema_, references_);
         case 'Function':
             return FromFunction(schema_, references_);
+        case 'Import':
+            return FromImport(schema_, references_);
         case 'Intersect':
             return FromIntersect(schema_, references_);
         case 'Iterator':

package/package.json

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