Fix Embedded TemplateLiteral Generation

sinclairzx81 · Jun 22, 2024 · b0f2ccf · b0f2ccf
1 parent f065cfc
commit b0f2ccf
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/src/type/template-literal/generate.ts b/src/type/template-literal/generate.ts
@@ -83,6 +83,7 @@ type TFromTemplateLiteralUnionKinds<T extends TTemplateLiteralKind[]> =
 type TFromTemplateLiteralKinds<T extends TTemplateLiteralKind[], Acc extends TLiteralValue[][] = []> = 
  T extends [infer L extends TTemplateLiteralKind, ...infer R extends TTemplateLiteralKind[]]
  ? (
+ L extends TTemplateLiteral<infer S extends TTemplateLiteralKind[]> ? TFromTemplateLiteralKinds<[...S, ...R], Acc> : 
  L extends TLiteral<infer S extends TLiteralValue> ? TFromTemplateLiteralKinds<R, [...Acc, [S]]> : 
  L extends TUnion<infer S extends TTemplateLiteralKind[]> ? TFromTemplateLiteralKinds<R, [...Acc, TFromTemplateLiteralUnionKinds<S>]> : 
  L extends TBoolean ? TFromTemplateLiteralKinds<R, [...Acc, ['true', 'false']]> : 

diff --git a/test/runtime/type/guard/type/template-literal.ts b/test/runtime/type/guard/type/template-literal.ts
@@ -1,5 +1,5 @@
 import { TypeGuard } from '@sinclair/typebox'
-import { Type } from '@sinclair/typebox'
+import { Type, TemplateLiteralGenerate } from '@sinclair/typebox'
 import { Assert } from '../../../assert/index'
 
 describe('guard/type/TTemplateLiteral', () => {
@@ -44,4 +44,39 @@ describe('guard/type/TTemplateLiteral', () => {
  T.pattern = T.pattern.slice(0, T.pattern.length - 1)
  Assert.IsFalse(TypeGuard.IsTemplateLiteral(T))
  })
+ // ----------------------------------------------------------------
+ // issue: https://github.com/sinclairzx81/typebox/issues/913
+ // ----------------------------------------------------------------
+ it('Should generate embedded template literal 1', () => {
+ const A = Type.TemplateLiteral([Type.Union([Type.Literal('A'), Type.Literal('B')])])
+ const B = Type.TemplateLiteral([Type.Union([Type.Literal('X'), Type.Literal('Y')])])
+ const L = Type.TemplateLiteral([Type.Literal('KEY'), A, B])
+ const T = TemplateLiteralGenerate(L)
+ Assert.IsEqual(T, ['KEYAX', 'KEYAY', 'KEYBX', 'KEYBY'])
+ })
+ it('Should generate embedded template literal 2', () => {
+ const A = Type.TemplateLiteral([Type.Union([Type.Literal('A'), Type.Literal('B')])])
+ const B = Type.TemplateLiteral([Type.Union([Type.Literal('X'), Type.Literal('Y')])])
+ const L = Type.TemplateLiteral([A, Type.Literal('KEY'), B])
+ const T = TemplateLiteralGenerate(L)
+ Assert.IsEqual(T, ['AKEYX', 'AKEYY', 'BKEYX', 'BKEYY'])
+ })
+ it('Should generate embedded template literal 3', () => {
+ const A = Type.TemplateLiteral([Type.Union([Type.Literal('A'), Type.Literal('B')])])
+ const B = Type.TemplateLiteral([Type.Union([Type.Literal('X'), Type.Literal('Y')])])
+ const L = Type.TemplateLiteral([A, B, Type.Literal('KEY')])
+ const T = TemplateLiteralGenerate(L)
+ Assert.IsEqual(T, ['AXKEY', 'AYKEY', 'BXKEY', 'BYKEY'])
+ })
+ it('Should map embedded template literal', () => {
+ const A = Type.TemplateLiteral([Type.Union([Type.Literal('A'), Type.Literal('B')])])
+ const B = Type.TemplateLiteral([Type.Union([Type.Literal('X'), Type.Literal('Y')])])
+ const L = Type.TemplateLiteral([Type.Literal('KEY'), A, B])
+ const T = Type.Mapped(L, (K) => Type.Null())
+ Assert.IsTrue(TypeGuard.IsObject(T))
+ Assert.IsTrue(TypeGuard.IsNull(T.properties.KEYAX))
+ Assert.IsTrue(TypeGuard.IsNull(T.properties.KEYAY))
+ Assert.IsTrue(TypeGuard.IsNull(T.properties.KEYBX))
+ Assert.IsTrue(TypeGuard.IsNull(T.properties.KEYBY))
+ })
 })
diff --git a/test/static/template-literal.ts b/test/static/template-literal.ts
@@ -112,3 +112,18 @@ import { Type } from '@sinclair/typebox'
  '$propAx}Yx' | '$propBx}Yx' | '$propCx}Yx'
  >()
 }
+// ---------------------------------------------------------------------
+// issue: https://github.com/sinclairzx81/typebox/issues/913
+// ---------------------------------------------------------------------
+{
+ const A = Type.TemplateLiteral([Type.Union([Type.Literal('A'), Type.Literal('B')])])
+ const B = Type.TemplateLiteral([Type.Union([Type.Literal('X'), Type.Literal('Y')])])
+ const L = Type.TemplateLiteral([Type.Literal('KEY'), A, B])
+ const T = Type.Mapped(L, (K) => Type.Null())
+ Expect(T).ToStatic<{
+ KEYAX: null
+ KEYAY: null
+ KEYBX: null
+ KEYBY: null
+ }>()
+}