fix: additional global at-rules

implydata · Aug 20, 2021 · 8d0def7 · 8d0def7
1 parent 331050d
commit 8d0def7
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 17 deletions.
diff --git a/.task/build-csstype.js b/.task/build-csstype.js
@@ -23,6 +23,7 @@ const generateType = async (packageUrl) => {
 		.withFixedMatchingSelector
 		.withFixedNestingSelectors
 		.withFixedProperties
+		.withFixedPropertyAtRule
 		.withFixedStretchValue
 		.withFixedSystemColor
 
@@ -128,6 +129,16 @@ class ModifiedString extends String {
 		)
 	}
 
+	get withFixedPropertyAtRule() {
+		return this.replace(
+			'type Inherits = "false" | "true";',
+			'type Inherits = "false" | "true" | boolean;'
+		).replace(
+			'initialValue?: string;',
+			'initialValue?: boolean | number | string',
+		)
+	}
+
 	get withFixedMatchingSelector() {
 		return this.replace(
 			/matches\(\)/g,
@@ -248,6 +259,8 @@ class ModifiedString extends String {
 			/"-[^"]+" *\| *\n?/g, ''
 		).replace(
 			/\n? *\| *"-[^\n]+(?=\n)/g, ''
+		).replace(
+			/\n    MozFontFeatureSettings?: FontFeatureSettings;/, ''
 		)
 	}
 }

diff --git a/packages/core/types/css-util.d.ts b/packages/core/types/css-util.d.ts
@@ -1,10 +1,12 @@
-import type * as CSS from './css'
+import type * as Native from './css'
 import type * as Config from './config'
 import type * as ThemeUtil from './theme'
 import type * as Util from './util'
 
+export { Native }
+
 /** CSS style declaration object. */
-export interface CSSProperties extends CSS.StandardLonghandProperties, CSS.StandardShorthandProperties, CSS.SvgProperties {}
+export interface CSSProperties extends Native.StandardLonghandProperties, Native.StandardShorthandProperties, Native.SvgProperties {}
 
 type ValueByPropertyName<PropertyName> = PropertyName extends keyof CSSProperties ? CSSProperties[PropertyName] : never
 
@@ -29,7 +31,7 @@ export type CSS<
 		[K in keyof CSSProperties]?: (
 			| ValueByPropertyName<K>
 			| TokenByPropertyName<K, Theme, ThemeMap>
-			| CSS.Globals
+			| Native.Globals
 			| ThemeUtil.ScaleValue
 			| undefined
 		)
@@ -48,7 +50,7 @@ export type CSS<
 									? (
 										| ValueByPropertyName<P[0][$$PropertyValue]>
 										| TokenByPropertyName<P[0][$$PropertyValue], Theme, ThemeMap>
-										| CSS.Globals
+										| Native.Globals
 										| ThemeUtil.ScaleValue
 										| undefined
 									)
@@ -66,7 +68,7 @@ export type CSS<
 						? (
 							| ValueByPropertyName<P[$$PropertyValue]>
 							| TokenByPropertyName<P[$$PropertyValue], Theme, ThemeMap>
-							| CSS.Globals
+							| Native.Globals
 							| undefined
 						)
 					: $$ScaleValue extends keyof P
@@ -91,7 +93,7 @@ export type CSS<
 			: K extends keyof Utils
 				? unknown
 			: (
-				| CSS.Globals
+				| Native.Globals
 				| Util.Index
 				| undefined
 			)

diff --git a/packages/core/types/css.d.ts b/packages/core/types/css.d.ts
@@ -9344,7 +9344,7 @@ export namespace AtRule {
 
   export interface Property {
     inherits?: Inherits;
-    initialValue?: string;
+    initialValue?: boolean | OnlyStringNumeric
     syntax?: string;
   }
 
@@ -9452,7 +9452,7 @@ export namespace AtRule {
 
   type Size = DataType.PageSize | "auto" | "landscape" | "portrait" | OnlyStringNumeric;
 
-  type Inherits = "false" | "true";
+  type Inherits = "false" | "true" | boolean;
 
   type Height = DataType.ViewportLength | OnlyString;
 

diff --git a/packages/react/types/css-util.d.ts b/packages/react/types/css-util.d.ts
@@ -1,10 +1,12 @@
-import type * as CSS from './css'
+import type * as Native from './css'
 import type * as Config from './config'
 import type * as ThemeUtil from './theme'
 import type * as Util from './util'
 
+export { Native }
+
 /** CSS style declaration object. */
-export interface CSSProperties extends CSS.StandardLonghandProperties, CSS.StandardShorthandProperties, CSS.SvgProperties {}
+export interface CSSProperties extends Native.StandardLonghandProperties, Native.StandardShorthandProperties, Native.SvgProperties {}
 
 type ValueByPropertyName<PropertyName> = PropertyName extends keyof CSSProperties ? CSSProperties[PropertyName] : never
 
@@ -29,7 +31,7 @@ export type CSS<
 		[K in keyof CSSProperties]?: (
 			| ValueByPropertyName<K>
 			| TokenByPropertyName<K, Theme, ThemeMap>
-			| CSS.Globals
+			| Native.Globals
 			| ThemeUtil.ScaleValue
 			| undefined
 		)
@@ -48,7 +50,7 @@ export type CSS<
 									? (
 										| ValueByPropertyName<P[0][$$PropertyValue]>
 										| TokenByPropertyName<P[0][$$PropertyValue], Theme, ThemeMap>
-										| CSS.Globals
+										| Native.Globals
 										| ThemeUtil.ScaleValue
 										| undefined
 									)
@@ -66,7 +68,7 @@ export type CSS<
 						? (
 							| ValueByPropertyName<P[$$PropertyValue]>
 							| TokenByPropertyName<P[$$PropertyValue], Theme, ThemeMap>
-							| CSS.Globals
+							| Native.Globals
 							| undefined
 						)
 					: $$ScaleValue extends keyof P
@@ -91,7 +93,7 @@ export type CSS<
 			: K extends keyof Utils
 				? unknown
 			: (
-				| CSS.Globals
+				| Native.Globals
 				| Util.Index
 				| undefined
 			)

diff --git a/packages/react/types/css.d.ts b/packages/react/types/css.d.ts
@@ -9344,7 +9344,7 @@ export namespace AtRule {
 
   export interface Property {
     inherits?: Inherits;
-    initialValue?: string;
+    initialValue?: boolean | OnlyStringNumeric
     syntax?: string;
   }
 
@@ -9452,7 +9452,7 @@ export namespace AtRule {
 
   type Size = DataType.PageSize | "auto" | "landscape" | "portrait" | OnlyStringNumeric;
 
-  type Inherits = "false" | "true";
+  type Inherits = "false" | "true" | boolean;
 
   type Height = DataType.ViewportLength | OnlyString;
 

diff --git a/packages/react/types/stitches.d.ts b/packages/react/types/stitches.d.ts
@@ -28,8 +28,20 @@ export default interface Stitches<
 			style: {
 				/** The **@import** CSS at-rule imports style rules from other style sheets. */
 				'@import'?: unknown
+				/** The **@font-face** CSS at-rule specifies a custom font with which to display text. */
+				'@font-face'?: unknown
 			} & {
-				[K in Prelude]: K extends '@import' ? string : CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
+				[K in Prelude]: K extends '@import'
+					? string
+				: K extends '@font-face'
+					? CSSUtil.Native.AtRule.FontFace | CSSUtil.Native.AtRule.FontFace[]
+				: K extends `@keyframes ${string}`
+					? {
+						[KeyFrame in string]: CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
+					}
+				: K extends `@property ${string}`
+					? CSSUtil.Native.AtRule.Property
+				: CSSUtil.CSS<Media, Theme, ThemeMap, Utils>
 			}
 		): {
 			(): string