feat: now allow for array simple tokens like Array<string(one,two)> o…

…r Array<number(1,2)

src/constants/TypeTokens.ts

@@ -97,7 +97,9 @@ export const SIMPLE_DICT_TOKENS = [
 export const SIMPLE_ARRAY_TOKENS = [
   "Array",
   "Array<string>",
+  "Array<string(TOKEN)>" as `Array<string(${string})>`,
   "Array<number>",
+  "Array<number(TOKEN)>" as `Array<number(${number}${`,${string}` | ""})>`,
   "Array<boolean>",
   "Array<unknown>",
   `Array<Dict>`,
@@ -279,5 +281,3 @@ export const TYPE_TOKEN_ALL = [
   ...TYPE_TOKEN_PARAM_STR,
   ...TYPE_TOKEN_PARAM_TIME
 ] as const;
-
-

src/types/runtime-types/SimpleType.ts

@@ -111,8 +111,12 @@ export type SimpleTypeArray<T extends SimpleArrayToken> = T extends "Array"
 ? any[]
 : T extends "Array<string>"
 ? string[]
+: T extends `Array<string(${infer StringUnion})>`
+? Array<SimpleTypeScalar<`string(${StringUnion})`>>
 : T extends "Array<number>"
 ? number[]
+: T extends `Array<number(${infer NumericUnion extends `${number}`})>`
+? Array<SimpleTypeScalar<`number(${NumericUnion})`>>
 : T extends "Array<boolean>"
 ? boolean[]
 : T extends "Array<unknown>"
@@ -122,12 +126,14 @@ export type SimpleTypeArray<T extends SimpleArrayToken> = T extends "Array"
 export type SimpleTypeMap<T extends SimpleMapToken> = T extends "Map"
 ? Map<any,any>
 : T extends `Map<${infer Key extends MapKeys}, ${infer Value extends MapValues}>`
+// eslint-disable-next-line no-use-before-define
 ? Map<SimpleType<Key>, SimpleType<Value>>
 : never;
 
 export type SimpleTypeSet<T extends SimpleSetToken> = T extends "Set"
 ? Set<any>
 : T extends `Set<${infer Type extends SetTypes}>`
+// eslint-disable-next-line no-use-before-define
 ? Set<SimpleType<Type>>
 : never;
 
@@ -160,6 +166,3 @@ export type SimpleType<T extends SimpleToken> = T extends SimpleScalarToken
 : never;
 
 export type StructuredStringType = any;
-
-
-

tests/runtime/SimpleType.test.ts

@@ -30,6 +30,24 @@ describe("SimpleType<T>", () => {
     ];
   });
 
+  it("String and Numeric literals", () => {
+    type Answer = SimpleType<"string(42)">;
+    type Answer2 = SimpleType<"number(42)">;
+
+    type FooBar = SimpleType<"string(foo,bar)">;
+    type OneTwo = SimpleType<"number(1,2)">;
+
+    type cases = [
+      Expect<Equal<Answer, "42">>, //
+      Expect<Equal<Answer2, 42>>, //
+      Expect<Equal<FooBar, "foo" | "bar">>, //
+      Expect<Equal<OneTwo, 1 | 2>>, //
+    ];
+    const cases: cases = [
+      true, true, true, true
+    ];
+  })
+
   it("optional types", () => {
     type Str = SimpleType<"Opt<string>">;
     type Num = SimpleType<"Opt<number>">;