Improve: Rename config.queries to config.at

master-co · May 27, 2024 · 361968f · 361968f
1 parent 0fddeaa
commit 361968f
Show file tree

Hide file tree

Showing 261 changed files with 326 additions and 336 deletions.
diff --git a/examples/angular-with-runtime-rendering/master.css.ts b/examples/angular-with-runtime-rendering/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/angular/master.css.ts b/examples/angular/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/astro-with-runtime-rendering/master.css.ts b/examples/astro-with-runtime-rendering/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/astro-with-static-extraction/master.css.ts b/examples/astro-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/blank/master.css.ts b/examples/blank/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/laravel-with-runtime-rendering/master.css.js b/examples/laravel-with-runtime-rendering/master.css.js
@@ -5,7 +5,7 @@ export default {
     variables: {},
     utilities: {},
     breakpoints: {},
-    queries: {},
+    at: {},
     keyframes: {},
     selectors: {},
     functions: {}

diff --git a/examples/laravel-with-static-extraction/master.css.js b/examples/laravel-with-static-extraction/master.css.js
@@ -5,7 +5,7 @@ export default {
     variables: {},
     utilities: {},
     breakpoints: {},
-    queries: {},
+    at: {},
     keyframes: {},
     selectors: {},
     functions: {}

diff --git a/examples/lit/master.css.ts b/examples/lit/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/next.js-with-runtime-rendering/master.css.ts b/examples/next.js-with-runtime-rendering/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/next.js-with-static-extraction/master.css.ts b/examples/next.js-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/next.js/master.css.ts b/examples/next.js/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/nuxt.js-with-runtime-rendering/master.css.ts b/examples/nuxt.js-with-runtime-rendering/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/nuxt.js-with-static-extraction/master.css.ts b/examples/nuxt.js-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/nuxt.js/master.css.ts b/examples/nuxt.js/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/react-with-static-extraction/master.css.ts b/examples/react-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/react/master.css.ts b/examples/react/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/svelte-with-runtime-rendering/master.css.ts b/examples/svelte-with-runtime-rendering/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/svelte-with-static-extraction/master.css.ts b/examples/svelte-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/svelte/master.css.ts b/examples/svelte/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/vite-with-static-extraction/master.css.ts b/examples/vite-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/vite/master.css.ts b/examples/vite/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/vue.js-with-static-extraction/master.css.ts b/examples/vue.js-with-static-extraction/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/vue.js/master.css.ts b/examples/vue.js/master.css.ts
@@ -5,7 +5,7 @@ export default {
     rules: {},
     variables: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/examples/webpack-with-static-extraction/master.css.js b/examples/webpack-with-static-extraction/master.css.js
@@ -5,7 +5,7 @@ module.exports = {
     variables: {},
     utilities: {},
     breakpoints: {},
-    queries: {},
+    at: {},
     keyframes: {},
     selectors: {},
     functions: {}

diff --git a/examples/webpack/master.css.js b/examples/webpack/master.css.js
@@ -5,7 +5,7 @@ module.exports = {
     variables: {},
     utilities: {},
     breakpoints: {},
-    queries: {},
+    at: {},
     keyframes: {},
     selectors: {},
     functions: {}

diff --git a/packages/cli/tests/extract/watch/test.ts b/packages/cli/tests/extract/watch/test.ts
@@ -46,7 +46,7 @@ const config: Config = {
     },
     rules: {},
     utilities: {},
-    queries: {},
+    at: {},
     animations: {},
     selectors: {},
     functions: {}

diff --git a/packages/core/src/config/queries.ts → packages/core/src/config/at.ts b/packages/core/src/config/queries.ts → packages/core/src/config/at.ts
@@ -1,6 +1,4 @@
-import screenSizes from '../tokens/screen-sizes'
-
-const queries = {
+const at = {
     all: 'media all',
     print: 'media print',
     screen: 'media screen',
@@ -9,7 +7,6 @@ const queries = {
     portrait: 'media (orientation:portrait)',
     motion: 'media (prefers-reduced-motion:no-preference)',
     'reduced-motion': 'media (prefers-reduced-motion:reduce)',
-    ...screenSizes,
 }
 
-export default queries
+export default at
diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -1,4 +1,4 @@
-import queries from './queries'
+import at from './at'
 import selectors from './selectors'
 import utilities from './utilities'
 import animations from './animations'
@@ -10,7 +10,7 @@ import type { PropertiesHyphen } from 'csstype'
 import type { Rule, RuleDefinition, ValueComponent } from '../rule'
 
 const config: Config = {
-    queries,
+    at,
     selectors,
     utilities,
     rules,
@@ -27,7 +27,7 @@ const config: Config = {
 
 export {
     config,
-    queries,
+    at,
     selectors,
     utilities,
     rules,
@@ -42,7 +42,7 @@ export type VariableDefinition = { [key in '' | `@${string}` | string]?: Variabl
 export type CSSKeyframes = { [key in 'from' | 'to' | string]: PropertiesHyphen }
 export type AnimationDefinitions = { [key: string]: CSSKeyframes }
 export type SelectorDefinitions = { [key: string]: string | string[] }
-export type MediaQueryDefinitions = { [key: string]: number | string | MediaQueryDefinitions }
+export type AtDefinitions = { [key: string]: number | string | AtDefinitions }
 export type StyleDefinitions = { [key: string]: string | StyleDefinitions }
 export type RuleDefinitions = { [key in keyof typeof rules | string]?: RuleDefinition }
 export type VariableDefinitions = { [key in keyof typeof rules]?: VariableDefinition } & { [key: string]: VariableDefinition }
@@ -57,7 +57,7 @@ export type FunctionDefinitions = { [key: string]: FunctionDefinition }
 export interface Config {
     extends?: (Config | any)[]
     styles?: StyleDefinitions
-    queries?: MediaQueryDefinitions
+    at?: AtDefinitions
     selectors?: SelectorDefinitions
     utilities?: UtilityDefinitions
     variables?: VariableDefinitions

diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
@@ -49,7 +49,7 @@ export default class MasterCSS {
         this.stylesBy = {}
         this.selectors = {}
         this.variables = {}
-        this.queries = {}
+        this.at = {}
         this.animations = {}
         this.Rules.length = 0
         this.variablesNativeRules = {}
@@ -60,7 +60,7 @@ export default class MasterCSS {
             transparent: undefined
         }
 
-        const { styles, selectors, variables, utilities, queries, rules, animations } = this.config
+        const { styles, selectors, variables, utilities, at, rules, animations } = this.config
 
         function escapeString(str: string) {
             return str.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
@@ -118,6 +118,12 @@ export default class MasterCSS {
                         }
                         colorVariableNames[flatName] = undefined
                     }
+                    /**
+                     * resolve `variables.screen-*` to `at.*`
+                     */
+                    if (variable.name.startsWith('screen-') && variable.type === 'number') {
+                        this.at[variable.name.slice(7)] = variable.value
+                    }
                     const currentMode = replacedMode ?? mode
                     if (currentMode !== undefined) {
                         if (Object.prototype.hasOwnProperty.call(this.variables, flatName)) {
@@ -252,8 +258,8 @@ export default class MasterCSS {
             }
         }
 
-        if (queries) {
-            this.queries = flattenObject(queries)
+        if (at) {
+            Object.assign(this.at, flattenObject(at))
         }
 
         if (animations) {
@@ -1215,7 +1221,7 @@ export default interface MasterCSS {
     stylesBy: Record<string, string[]>
     selectors: Record<string, [RegExp, string[]][]>
     variables: Record<string, Variable>
-    queries: Record<string, string | number>
+    at: Record<string, string | number>
     variablesNativeRules: Record<string, NativeRule>
     hasKeyframesRule: boolean
     animations: Record<string, AnimationDefinitions & { usage?: number, native?: NativeRule }>

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -10,7 +10,7 @@ export { default as MasterCSS, default } from './core'
 export { default as extendConfig } from './utils/extend-config'
 export { default as reorderForReadableClasses } from './utils/reorder-for-readable-classes'
 export { default as areRuleModesEqual } from './utils/are-rule-modes-equal'
-export { default as areRuleQueriesEqual } from './utils/are-rule-queries-equal'
+export { default as areRuleAtEqual } from './utils/are-rule-at-equal'
 export { default as areRuleSelectorsEqual } from './utils/are-rule-selectors-equal'
 export { default as areRuleStatesEqual } from './utils/are-rule-states-equal'
 export { default as areRulesDuplicated } from './utils/are-rules-duplicated'