update types / improve theme typing

implydata · Jul 22, 2021 · 6bbce2e · 6bbce2e
1 parent 74fd16e
commit 6bbce2e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/packages/core/types/sheet.d.ts b/packages/core/types/sheet.d.ts
@@ -37,7 +37,7 @@ export default interface Sheet<
 			name: string
 		}
 	},
-	theme: {
+	theme: string & {
 		(
 			nameOrScalesArg0: (
 				| string
@@ -71,10 +71,13 @@ export default interface Sheet<
 					}
 				)
 			)
-		): {
-			className: string
-			selector: string
-		}
+		):
+			& string
+			& {
+				className: string
+				selector: string
+			}
+			& ThemeTokens<Extract<typeof nameOrScalesArg0 | typeof nameOrScalesArg1, { [scale: string] : unknown }>, Prefix>
 	} & {
 		[Scale in keyof Theme]: {
 			[Token in keyof Theme[Scale]]: ThemeUtil.Token<Extract<Token, string | number>, string, Extract<Scale, string>, Prefix>

diff --git a/packages/react/types/sheet.d.ts b/packages/react/types/sheet.d.ts
@@ -37,7 +37,7 @@ export default interface Sheet<
 			name: string
 		}
 	},
-	theme: {
+	theme: string & {
 		(
 			nameOrScalesArg0: (
 				| string
@@ -71,10 +71,13 @@ export default interface Sheet<
 					}
 				)
 			)
-		): {
-			className: string
-			selector: string
-		} & ThemeTokens<Extract<typeof nameOrScalesArg0 | typeof nameOrScalesArg1, { [scale: string] : unknown }>, Prefix>
+		):
+			& string
+			& {
+				className: string
+				selector: string
+			}
+			& ThemeTokens<Extract<typeof nameOrScalesArg0 | typeof nameOrScalesArg1, { [scale: string] : unknown }>, Prefix>
 	} & {
 		[Scale in keyof Theme]: {
 			[Token in keyof Theme[Scale]]: ThemeUtil.Token<Extract<Token, string | number>, string, Extract<Scale, string>, Prefix>