Revision 0.34.4 (#1085)

* Module Dereference Path for TEnum

* Version

* ChangeLog

changelog/0.34.0.md

@@ -1,5 +1,7 @@
 ### 0.34.0
 
+- [Revision 0.34.4](https://github.com/sinclairzx81/typebox/pull/1085)
+  - Inference Path for Enum within Modules
 - [Revision 0.34.3](https://github.com/sinclairzx81/typebox/pull/1083)
   - Retain Array Elements on Value Default
 - [Revision 0.34.2](https://github.com/sinclairzx81/typebox/pull/1082)

package.json

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

src/type/module/compute.ts

@@ -35,6 +35,7 @@ import { AsyncIterator, type TAsyncIterator } from '../async-iterator/index'
 import { TComputed } from '../computed/index'
 import { Constructor, type TConstructor } from '../constructor/index'
 import { Index, type TIndex } from '../indexed/index'
+import { TEnum, TEnumRecord } from '../enum/index'
 import { Function, type TFunction } from '../function/index'
 import { Intersect, type TIntersect, type TIntersectEvaluated } from '../intersect/index'
 import { Iterator, type TIterator } from '../iterator/index'
@@ -339,34 +340,35 @@ function FromRest<ModuleProperties extends TProperties, Types extends TSchema[]>
 // ------------------------------------------------------------------
 // prettier-ignore
 export type TFromType<ModuleProperties extends TProperties, Type extends TSchema> = (
-  Type extends TComputed<infer T extends string, infer S extends TSchema[]> ? TFromComputed<ModuleProperties, T, S> :
-  Type extends TObject<infer S extends TProperties> ? TFromObject<ModuleProperties, S> :
-  Type extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? TFromConstructor<ModuleProperties, S, R> :
-  Type extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? TFromFunction<ModuleProperties, S, R> :
-  Type extends TTuple<infer S extends TSchema[]> ? TFromTuple<ModuleProperties, S> :
-  Type extends TIntersect<infer S extends TSchema[]> ? TFromIntersect<ModuleProperties, S> :
-  Type extends TUnion<infer S extends TSchema[]> ? TFromUnion<ModuleProperties, S> :
-  Type extends TArray<infer S extends TSchema> ? TFromArray<ModuleProperties, S> :
-  Type extends TAsyncIterator<infer S extends TSchema> ? TFromAsyncIterator<ModuleProperties, S> :
-  Type extends TIterator<infer S extends TSchema> ? TFromIterator<ModuleProperties, S> :
+  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 TTuple<infer Types extends TSchema[]> ? TFromTuple<ModuleProperties, Types> :
+  Type extends TEnum<infer _ extends TEnumRecord> ? Type : // intercept enum before union
+  Type extends TUnion<infer Types extends TSchema[]> ? TFromUnion<ModuleProperties, Types> :
   Type
 )
 // prettier-ignore
 export function FromType<ModuleProperties extends TProperties, Type extends TSchema>(moduleProperties: ModuleProperties, type: Type): TFromType<ModuleProperties, Type> {
   return (
+    KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
+    KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
     // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
     // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
     // be a priority as there is a potential for the current inference to break on TS compiler changes.
     KindGuard.IsComputed(type) ? CreateType(FromComputed(moduleProperties, type.target, type.parameters) as never) :
-    KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
     KindGuard.IsConstructor(type) ? CreateType(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
     KindGuard.IsFunction(type) ? CreateType(FromFunction(moduleProperties, type.parameters, type.returns), type) :
-    KindGuard.IsTuple(type)? CreateType(FromTuple(moduleProperties, type.items || []), type) :
     KindGuard.IsIntersect(type) ? CreateType(FromIntersect(moduleProperties, type.allOf), type) :
-    KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
-    KindGuard.IsArray(type) ? CreateType(FromArray(moduleProperties, type.items), type) :
-    KindGuard.IsAsyncIterator(type) ? CreateType(FromAsyncIterator(moduleProperties, type.items), type) :
     KindGuard.IsIterator(type) ? CreateType(FromIterator(moduleProperties, type.items), type) :
+    KindGuard.IsObject(type) ? CreateType(FromObject(moduleProperties, type.properties), type) :
+    KindGuard.IsTuple(type)? CreateType(FromTuple(moduleProperties, type.items || []), type) :
+    KindGuard.IsUnion(type) ? CreateType(FromUnion(moduleProperties, type.anyOf), type) :
     type
   ) as never
 }

src/type/module/infer.ts

@@ -31,6 +31,7 @@ import { TSchema } from '../schema/index'
 import { TArray } from '../array/index'
 import { TAsyncIterator } from '../async-iterator/index'
 import { TConstructor } from '../constructor/index'
+import { TEnum, TEnumRecord } from '../enum/index'
 import { TFunction } from '../function/index'
 import { TIntersect } from '../intersect/index'
 import { TIterator } from '../iterator/index'
@@ -147,6 +148,7 @@ type TInfer<ModuleProperties extends TProperties, Type extends TSchema> = (
   Type extends TObject<infer Properties extends TProperties> ? TInferObject<ModuleProperties, Properties> :
   Type extends TRef<infer Ref extends string> ? TInferRef<ModuleProperties, Ref> :
   Type extends TTuple<infer Types extends TSchema[]> ? TInferTuple<ModuleProperties, Types> :
+  Type extends TEnum<infer _ extends TEnumRecord> ? Static<Type> : // intercept enum before union
   Type extends TUnion<infer Types extends TSchema[]> ? TInferUnion<ModuleProperties, Types> :
   Static<Type>
 )

test/static/import.ts

@@ -0,0 +1,40 @@
+import { Expect } from './assert'
+import { Type } from '@sinclair/typebox'
+
+// ------------------------------------------------------------------
+// Enum 1
+// ------------------------------------------------------------------
+{
+  enum Enum {
+    A,
+    B,
+  }
+
+  const T = Type.Module({
+    T: Type.Object({
+      value: Type.Enum(Enum),
+    }),
+  }).Import('T')
+
+  Expect(T).ToStatic<{
+    value: Enum
+  }>()
+}
+
+// ------------------------------------------------------------------
+// Enum 2
+// ------------------------------------------------------------------
+{
+  const T = Type.Module({
+    T: Type.Object({
+      value: Type.Enum({
+        x: 1,
+        y: 2,
+      }),
+    }),
+  }).Import('T')
+
+  Expect(T).ToStatic<{
+    value: 1 | 2
+  }>()
+}

test/static/index.ts

@@ -15,6 +15,7 @@ import './enum'
 import './extract'
 import './exclude'
 import './function'
+import './import'
 import './indexed'
 import './instance-type'
 import './intersect'