Merge pull request stitchesjs#689 from modulz/jn.roadmap-1-0-0

Resolve TS issues in canary
implydata · Jul 29, 2021 · f290b9d · f290b9d
2 parents b0ff0f2 + 34ada2e
commit f290b9d
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 46 deletions.
diff --git a/packages/core/types/create-css.d.ts b/packages/core/types/create-css.d.ts
@@ -79,7 +79,7 @@ type CreateCss = {
 		ThemeMap extends InterfaceOfThemeMap<ThemeMap, Theme>,
 		Utils extends InterfaceOfUtils<Utils>
 	>(
-		config: {
+		config?: {
 			prefix?: Prefix
 			media?: Media
 			theme?: Theme

diff --git a/packages/core/types/css-util.d.ts b/packages/core/types/css-util.d.ts
@@ -92,24 +92,7 @@ export type CSS<
 	}
 	// unknown css declaration styles
 	& {
-		[K in string]: (
-			K extends Util.Prefixed<'@', keyof Media>
-				? unknown
-			: K extends keyof CSSProperties
-				? unknown
-			: K extends keyof Utils
-				? unknown
-			: K extends keyof ThemeMap
-				? unknown
-			: K extends keyof { variants: unknown; defaultVariants: unknown; compoundVariants: unknown }
-				? unknown
-			: (
-				| CSS<Media, Theme, ThemeMap, Utils>
-				| CSS.Globals
-				| Util.Index
-				| any[]
-			)
-		)
+		[K in string]: number | string | CSS<Media, Theme, ThemeMap, Utils> | {}
 	}
 )
 

diff --git a/packages/core/types/index.d.ts b/packages/core/types/index.d.ts
@@ -3,6 +3,7 @@ import type Sheet from './sheet'
 
 import type * as CSSUtil from './css-util'
 import type * as Default from './default'
+import type * as StyledComponent from './styled-component'
 
 export type { CreateCss, Sheet }
 
@@ -15,6 +16,11 @@ export type CSS<
 		theme?: {}
 		themeMap?: {}
 		utils?: {}
+	} = {
+		media: {},
+		theme: {},
+		themeMap: {},
+		utils: {}
 	}
 > = CSSUtil.CSS<
 	Config['media'],

diff --git a/packages/core/types/styled-component.d.ts b/packages/core/types/styled-component.d.ts
@@ -13,11 +13,17 @@ export interface CssComponent<
 	TransformedProps = TransformProps<Props, Media>,
 	CSS = CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
 > {
-	(
+	<
+		Props extends {
+			css?: Props['css'] extends CSSUtil.CSS
+				? Props['css']
+			: CSS
+		}
+	>(
 		props?:
 			& Partial<TransformedProps>
 			& {
-				css?: CSS
+				css?: Props['css']
 			}
 			& {
 				[name in number | string]: any
@@ -28,6 +34,9 @@ export interface CssComponent<
 		props: object
 	}
 
+	className: string
+	selector: string
+
 	[$$StyledComponentType]: TagName
 	[$$StyledComponentProps]: Props
 	[$$StyledComponentMedia]: Media

diff --git a/packages/react/types/css-util.d.ts b/packages/react/types/css-util.d.ts
@@ -92,24 +92,7 @@ export type CSS<
 	}
 	// unknown css declaration styles
 	& {
-		[K in string]: (
-			K extends Util.Prefixed<'@', keyof Media>
-				? unknown
-			: K extends keyof CSSProperties
-				? unknown
-			: K extends keyof Utils
-				? unknown
-			: K extends keyof ThemeMap
-				? unknown
-			: K extends keyof { variants: unknown; defaultVariants: unknown; compoundVariants: unknown }
-				? unknown
-			: (
-				| CSS<Media, Theme, ThemeMap, Utils>
-				| CSS.Globals
-				| Util.Index
-				| any[]
-			)
-		)
+		[K in string]: number | string | CSS<Media, Theme, ThemeMap, Utils> | {}
 	}
 )
 

diff --git a/packages/react/types/index.d.ts b/packages/react/types/index.d.ts
@@ -16,6 +16,11 @@ export type CSS<
 		theme?: {}
 		themeMap?: {}
 		utils?: {}
+	} = {
+		media: {},
+		theme: {},
+		themeMap: {},
+		utils: {}
 	}
 > = CSSUtil.CSS<
 	Config['media'],

diff --git a/packages/react/types/styled-component.d.ts b/packages/react/types/styled-component.d.ts
@@ -14,13 +14,24 @@ export interface StyledComponent<
 	TransformedProps = TransformProps<Props, Media>,
 	CSS = CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
 > extends ForwardRefExoticComponent<Type, TransformedProps> {
-	<As = Type>(
-		props:
+	<
+		As = Type,
+		Props extends {
+			css?: Props['css'] extends CSSUtil.CSS
+				? Props['css']
+			: CSS
+		}
+	>(
+		props: (
 			As extends keyof JSX.IntrinsicElements
-				? Util.Assign<JSX.IntrinsicElements[As], Partial<TransformedProps> & { as?: As, css?: CSS }>
+				? Util.Assign<JSX.IntrinsicElements[As], Partial<TransformedProps>>
 			: As extends React.ComponentType<infer P>
-				? Util.Assign<P, Partial<TransformedProps> & { as?: As, css?: CSS }>
+				? Util.Assign<P, Partial<TransformedProps>>
 			: never
+		) & {
+			as?: As,
+			css?: Props['css']
+		}
 	): React.ReactElement | null
 
 	[$$StyledComponentType]: Type
@@ -39,11 +50,17 @@ export interface CssComponent<
 	TransformedProps = TransformProps<Props, Media>,
 	CSS = CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
 > {
-	(
+	<
+		Props extends {
+			css?: Props['css'] extends CSSUtil.CSS
+				? Props['css']
+			: CSS
+		}
+	>(
 		props?:
 			& Partial<TransformedProps>
 			& {
-				css?: CSS
+				css?: Props['css']
 			}
 			& {
 				[name in number | string]: any

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,7 +14,7 @@
     "strictNullChecks": true,
     "strictFunctionTypes": true,
     "strictPropertyInitialization": true,
-    "target": "es2021"
+    "target": "es2020"
   },
   "files": [
     "packages/core/types/index.d.ts",