fix(typing): reduce Token type complexity

z0al · Nov 29, 2020 · 84f9081 · 84f9081
1 parent b7a20d9
commit 84f9081
Show file tree

Hide file tree

Showing 2 changed files with 363 additions and 1,226 deletions.
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -1,11 +1,10 @@
 // Packages
-import { UnionToIntersection, ValueOf, LiteralUnion } from 'type-fest';
+import { UnionToIntersection, ValueOf } from 'type-fest';
 
 // Ours
 import { Theme } from './theme';
 import createStyles from './style';
 import createProps from './style/props';
-import { builtinVariants } from './variants';
 
 export type TokenInfo = {
 	variant: string;
@@ -22,17 +21,9 @@ export type Configuration = {
 type Styles = UnionToIntersection<ReturnType<typeof createStyles>>;
 type Props = UnionToIntersection<ReturnType<typeof createProps>>;
 
-type Variant = LiteralUnion<
-	keyof UnionToIntersection<typeof builtinVariants>,
-	string
->;
-
 type Token = keyof UnionToIntersection<Styles | Props>;
 
-type TokenWithVariant =
-	| Token
-	| `${Variant}:${Token}`
-	| `${Variant}:${Variant}:${Token}`;
+type TokenWithVariant = Token | `${string}:${Token}`;
 
 type ExtractToken<T extends string> = T extends `${string}:${infer V}`
 	? V extends Token