Reimplement Index Types

sinclairzx81 · Nov 22, 2023 · 336a2ef · 336a2ef
1 parent 1e92672
commit 336a2ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/typebox.ts b/src/typebox.ts
@@ -462,12 +462,16 @@ export type TIndexArray<T extends TSchema, K extends PropertyKey> =
 // prettier-ignore
 export type TIndexIntersect<T extends TSchema[], K extends PropertyKey> =
   T extends [infer L extends TSchema, ...infer R extends TSchema[]]
-    ? [...TIndexKeyResolve<L, K>, ...TIndexIntersect<R, K>]
+    ? L extends TUnion<infer U>
+      ? [TUnion<TIndexUnion<U, K>>, ...TIndexIntersect<R, K>]
+      : [...TIndexKeyResolve<L, K>, ...TIndexIntersect<R, K>]
     : []
 // prettier-ignore
 export type TIndexUnionGather<T extends TSchema[], K extends PropertyKey> =
   T extends [infer L extends TSchema, ...infer R extends TSchema[]]
-    ? [TIndexKeyResolve<L, K>, ...TIndexUnionGather<R, K>]
+    ? L extends TIntersect<infer U>
+      ? [TIntersect<TIndexIntersect<U, K>>, ...TIndexUnionGather<R, K>]
+      : [TIndexKeyResolve<L, K>, ...TIndexUnionGather<R, K>]
     : []
 // prettier-ignore
 export type TIndexUnionCheck<T extends TSchema[][]> =

diff --git a/test/static/indexed.ts b/test/static/indexed.ts
@@ -192,10 +192,9 @@ import { Type, Static } from '@sinclair/typebox'
   const I = Type.Intersect([Type.Union([A, B]), Type.Intersect([C, D])])
   const R = Type.Index(I, ['x', 'y'])
 
-  //
-  // TUnion<[TIntersect<[TString, TNumber]>, TIntersect<[TLiteral<1>, TNumber]>]>
-  // TUnion<[TIntersect<[TString, TNumber, TString, TString]>, TIntersect<[TLiteral<1>, TNumber, TNumber]>]>
+  // TUnion<[TIntersect<[TUnion<[TString, TNumber]>, TIntersect<[TString, TIntersect<[TString, TIntersect<[]>]>, TIntersect<[]>]>]>, TIntersect<...>]>
   // TUnion<[TIntersect<[TUnion<[TString, TNumber]>, TIntersect<[TString, TString]>]>, TIntersect<[TUnion<[TLiteral<1>, TNumber]>, TNumber]>]>
+  // TUnion<[TIntersect<[TUnion<[TString, TNumber]>, TString, TString]>, TIntersect<[TUnion<[TLiteral<1>, TNumber]>, TNumber]>]>
   type O = Static<typeof R>
   Expect(R).ToStatic<number | string>()
 }
@@ -212,7 +211,7 @@ import { Type, Static } from '@sinclair/typebox'
   const C = Type.Object({ x: Type.Literal('C'), y: Type.Number() })
   const D = Type.Object({ x: Type.Literal('D') })
   const I = Type.Union([A, B, C, D])
-  const R = Type.Index(I, Type.Union([Type.Literal('x')]))
+  const R = Type.Index(I, ['x'])
   type O = Static<typeof R>
   Expect(R).ToStatic<'A' | 'B' | 'C' | 'D'>()
 }