hopfylly nothing was broken in the process

implydata · Aug 12, 2021 · a23e077 · a23e077
1 parent d41d610
commit a23e077
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 34 deletions.
diff --git a/packages/react/types/css-util.d.ts b/packages/react/types/css-util.d.ts
@@ -17,7 +17,8 @@ export type CSS<
 	Media = Default.Media,
 	Theme = {},
 	ThemeMap = Default.ThemeMap,
-	Utils = {}
+	Utils = {},
+	isFlat= false
 > = (
 	// nested at-rule css styles
 	& {
@@ -97,7 +98,7 @@ export type CSS<
 		)
 	}
 	// unknown css declaration styles
-	& {
+	& (false extends isFlat ? {
 		/** Unknown property. */
 		[K in string]: (
 			| number
@@ -106,7 +107,7 @@ export type CSS<
 			| {}
 			| undefined
 		)
-	}
+	}: {})
 )
 
 /** Unique symbol used to reference a property value. */

diff --git a/packages/react/types/index.d.ts b/packages/react/types/index.d.ts
@@ -11,6 +11,7 @@ export type CSSProperties = CSSUtil.CSSProperties
 export type DefaultThemeMap = Default.ThemeMap
 
 /** Returns a Style interface from a configuration, leveraging the given media and style map. */
+
 export type CSS<
 	Config extends {
 		media?: {}
@@ -27,7 +28,8 @@ export type CSS<
 	Config['media'],
 	Config['theme'],
 	Config['themeMap'],
-	Config['utils']
+	Config['utils'],
+  false
 >
 
 /** Returns the properties, attributes, and children expected by a component. */

diff --git a/packages/react/types/stitches.d.ts b/packages/react/types/stitches.d.ts
@@ -123,10 +123,7 @@ export default interface Stitches<
 						? Composers[K]
 					: Composers[K] extends Util.Function
 						? Composers[K]
-					: Composers[K] extends {
-						[K2 in keyof Composers[K]]: Composers[K][K2]
-					}
-						? (
+					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils, true>  & (
 							& {
 								/** The **variants** property sets variants.
 								 *
@@ -158,17 +155,8 @@ export default interface Stitches<
 									: Util.WideObject
 								)
 							}
-							& {
-								[Prelude in keyof Composers[K]]:
-									Prelude extends keyof CSS | 'compoundVariants' | 'defaultVariants' | 'variants'
-										? unknown
-									: Composers[K][Prelude] extends Record<string, unknown>
-										? CSS
-									: boolean | number | string
-							}
-							& CSS
-						)
-					: never
+
+						) & {[K2 in keyof Composers[K]]:K2 extends 'variants' | 'defaultVariants' | 'compoundVariants' ? unknown : K2 extends keyof CSS ? CSS[K2] : unknown}
 				)
 			}
 		): StyledComponent.CssComponent<
@@ -205,10 +193,7 @@ export default interface Stitches<
 						? Composers[K]
 					: Composers[K] extends Util.Function
 						? Composers[K]
-					: Composers[K] extends {
-						[K2 in keyof Composers[K]]: Composers[K][K2]
-					}
-						? (
+					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils, true>  & (
 							& {
 								/** The **variants** property sets variants.
 								 *
@@ -240,17 +225,7 @@ export default interface Stitches<
 									: Util.WideObject
 								)
 							}
-							& {
-								[Prelude in keyof Composers[K]]:
-									Prelude extends keyof CSS | 'compoundVariants' | 'defaultVariants' | 'variants'
-										? unknown
-									: Composers[K][Prelude] extends Record<string, unknown>
-										? CSS
-									: boolean | number | string
-							}
-							& CSS
-						)
-					: never
+						) & {[K2 in keyof Composers[K]]:K2 extends 'variants' | 'defaultVariants' | 'compoundVariants' ? unknown : K2 extends keyof CSS ? CSS[K2] : unknown}				
 				)
 			}
 		): StyledComponent.StyledComponent<