@master/css 2.0.0-rc.62 → 2.0.0-rc.63

package/dist/common.cjs

@@ -178,6 +178,7 @@ const AT_COMPARABLE_FEATURES = [
     'height',
     'resolution'
 ];
+const __UNSORTED__ = '__UNSORTED__';
 
 exports.ANIMATION_SIGN = ANIMATION_SIGN;
 exports.AT_COMPARABLE_FEATURES = AT_COMPARABLE_FEATURES;
@@ -206,3 +207,4 @@ exports.TRANSITION_SIGN = TRANSITION_SIGN;
 exports.UNIT_REGEX = UNIT_REGEX;
 exports.VALUE_DELIMITERS = VALUE_DELIMITERS;
 exports.VALUE_UNITS = VALUE_UNITS;
+exports.__UNSORTED__ = __UNSORTED__;

package/dist/common.d.ts

@@ -38,3 +38,4 @@ export declare const AT_LOGICAL_OPERATORS: {
 export declare const AT_IDENTIFIERS: string[];
 export declare const COMPARISION_OPERATORS: string[];
 export declare const AT_COMPARABLE_FEATURES: string[];
+export declare const __UNSORTED__ = "__UNSORTED__";

package/dist/common.mjs

@@ -176,5 +176,6 @@ const AT_COMPARABLE_FEATURES = [
     'height',
     'resolution'
 ];
+const __UNSORTED__ = '__UNSORTED__';
 
-export { ANIMATION_SIGN, AT_COMPARABLE_FEATURES, AT_COMPARISON_OPERATORS, AT_IDENTIFIERS, AT_LOGICAL_OPERATORS, AT_SIGN, BASE_UNIT_REGEX, BORDER_STYLE_VALUES, CLASS_ATTRIBUTES, CLASS_DECLARATIONS, CLASS_FUNCTIONS, COLOR_VALUE_REGEX, COMPARISION_OPERATORS, DELIMITER_SIGN, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, OFFICIAL_URL, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, SELECTOR_COMBINATORS, SELECTOR_SIGNS, SEPARATOR_SIGN, SEPARATOR_SIGNS, TRANSITION_SIGN, UNIT_REGEX, VALUE_DELIMITERS, VALUE_UNITS };
+export { ANIMATION_SIGN, AT_COMPARABLE_FEATURES, AT_COMPARISON_OPERATORS, AT_IDENTIFIERS, AT_LOGICAL_OPERATORS, AT_SIGN, BASE_UNIT_REGEX, BORDER_STYLE_VALUES, CLASS_ATTRIBUTES, CLASS_DECLARATIONS, CLASS_FUNCTIONS, COLOR_VALUE_REGEX, COMPARISION_OPERATORS, DELIMITER_SIGN, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, OFFICIAL_URL, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, SELECTOR_COMBINATORS, SELECTOR_SIGNS, SEPARATOR_SIGN, SEPARATOR_SIGNS, TRANSITION_SIGN, UNIT_REGEX, VALUE_DELIMITERS, VALUE_UNITS, __UNSORTED__ };

package/dist/index.cjs

@@ -70,6 +70,7 @@ exports.TRANSITION_SIGN = common.TRANSITION_SIGN;
 exports.UNIT_REGEX = common.UNIT_REGEX;
 exports.VALUE_DELIMITERS = common.VALUE_DELIMITERS;
 exports.VALUE_UNITS = common.VALUE_UNITS;
+exports.__UNSORTED__ = common.__UNSORTED__;
 exports.MasterCSS = core;
 exports.default = core;
 exports.SyntaxRule = syntaxRule.SyntaxRule;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 export { config } from './config/index.mjs';
-export { ANIMATION_SIGN, AT_COMPARABLE_FEATURES, AT_COMPARISON_OPERATORS, AT_IDENTIFIERS, AT_LOGICAL_OPERATORS, AT_SIGN, BASE_UNIT_REGEX, BORDER_STYLE_VALUES, CLASS_ATTRIBUTES, CLASS_DECLARATIONS, CLASS_FUNCTIONS, COLOR_VALUE_REGEX, COMPARISION_OPERATORS, DELIMITER_SIGN, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, OFFICIAL_URL, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, SELECTOR_COMBINATORS, SELECTOR_SIGNS, SEPARATOR_SIGN, SEPARATOR_SIGNS, TRANSITION_SIGN, UNIT_REGEX, VALUE_DELIMITERS, VALUE_UNITS } from './common.mjs';
+export { ANIMATION_SIGN, AT_COMPARABLE_FEATURES, AT_COMPARISON_OPERATORS, AT_IDENTIFIERS, AT_LOGICAL_OPERATORS, AT_SIGN, BASE_UNIT_REGEX, BORDER_STYLE_VALUES, CLASS_ATTRIBUTES, CLASS_DECLARATIONS, CLASS_FUNCTIONS, COLOR_VALUE_REGEX, COMPARISION_OPERATORS, DELIMITER_SIGN, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, OFFICIAL_URL, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, SELECTOR_COMBINATORS, SELECTOR_SIGNS, SEPARATOR_SIGN, SEPARATOR_SIGNS, TRANSITION_SIGN, UNIT_REGEX, VALUE_DELIMITERS, VALUE_UNITS, __UNSORTED__ } from './common.mjs';
 export { default as MasterCSS, default } from './core.mjs';
 export { SyntaxRule } from './syntax-rule.mjs';
 export { Rule } from './rule.mjs';

package/dist/utils/parse-selector.cjs

@@ -4,7 +4,7 @@ var common = require('../common.cjs');
 var core = require('../core.cjs');
 var parsePair = require('./parse-pair.cjs');
 
-const SELECTOR_REGEX = new RegExp(`(?:[a-zA-Z0-9-]+)|([${common.SELECTOR_COMBINATORS.join('')}.:,])|(a-zA-Z0-9-)`, 'g');
+const SELECTOR_REGEX = new RegExp(`(?:[a-zA-Z0-9-]+)|([${common.SELECTOR_COMBINATORS.join('')}.:,*])|(a-zA-Z0-9-)`, 'g');
 function parseSelector(token, css = new core(), isRaw = true) {
     const resolve = (eachToken)=>{
         const nodes = [];
@@ -44,6 +44,8 @@ function parseSelector(token, css = new core(), isRaw = true) {
                 }
             } else if (raw === ',') {
                 type = 'separator';
+            } else if (raw === '*') {
+                type = 'universal';
             } else if (currentPrefix === ':') {
                 type = 'pseudo-class';
             } else if (currentPrefix === '::') {

package/dist/utils/parse-selector.d.ts

@@ -1,6 +1,6 @@
 import MasterCSS from '../core';
 export declare type SelectorLiteralNode = {
-    type?: 'attribute' | 'pseudo-class' | 'pseudo-element' | 'class';
+    type?: 'attribute' | 'pseudo-class' | 'pseudo-element' | 'class' | 'universal';
     raw?: string;
     value?: string;
     children?: SelectorNode[];

package/dist/utils/parse-selector.mjs

@@ -2,7 +2,7 @@ import { SELECTOR_COMBINATORS } from '../common.mjs';
 import MasterCSS from '../core.mjs';
 import parsePair from './parse-pair.mjs';
 
-const SELECTOR_REGEX = new RegExp(`(?:[a-zA-Z0-9-]+)|([${SELECTOR_COMBINATORS.join('')}.:,])|(a-zA-Z0-9-)`, 'g');
+const SELECTOR_REGEX = new RegExp(`(?:[a-zA-Z0-9-]+)|([${SELECTOR_COMBINATORS.join('')}.:,*])|(a-zA-Z0-9-)`, 'g');
 function parseSelector(token, css = new MasterCSS(), isRaw = true) {
     const resolve = (eachToken)=>{
         const nodes = [];
@@ -42,6 +42,8 @@ function parseSelector(token, css = new MasterCSS(), isRaw = true) {
                 }
             } else if (raw === ',') {
                 type = 'separator';
+            } else if (raw === '*') {
+                type = 'universal';
             } else if (currentPrefix === ':') {
                 type = 'pseudo-class';
             } else if (currentPrefix === '::') {

package/dist/utils/sort-readable-classes.cjs

@@ -3,6 +3,7 @@
 var syntaxRuleType = require('../syntax-rule-type.cjs');
 var core = require('../core.cjs');
 var compareRulePriority = require('./compare-rule-priority.cjs');
+var common = require('../common.cjs');
 
 /**
  * Sorts classes in a consistent order
@@ -10,7 +11,16 @@ var compareRulePriority = require('./compare-rule-priority.cjs');
  * @param options
  * @returns consistent classes
  */ function sortReadableClasses(classes, css = new core()) {
-    css.add(...classes);
+    const shouldSortClasses = [];
+    const unsortedClasses = [];
+    for (const className of classes){
+        if (className.includes(common.__UNSORTED__)) {
+            unsortedClasses.push(className);
+        } else {
+            shouldSortClasses.push(className);
+        }
+    }
+    css.add(...shouldSortClasses);
     // 先去重 fixedClass for componentsLayer
     const seenFixed = new Set();
     const dedupedComponentRules = css.componentsLayer.rules.filter((rule)=>{
@@ -61,13 +71,15 @@ var compareRulePriority = require('./compare-rule-priority.cjs');
         return compareRulePriority.default(a.rule, b.rule);
     });
     const orderedClasses = sortedRules.map((entry)=>entry.rule.fixedClass || entry.rule.name);
-    const unknownClasses = classes.filter((className)=>orderedClasses.indexOf(className) === -1).sort((a, b)=>a.localeCompare(b, undefined, {
-            numeric: true
-        }));
-    css.remove(...classes);
+    css.remove(...shouldSortClasses);
     return [
         ...orderedClasses,
-        ...unknownClasses
+        ...[
+            ...shouldSortClasses.filter((className)=>orderedClasses.indexOf(className) === -1),
+            ...unsortedClasses
+        ].sort((a, b)=>a.localeCompare(b, undefined, {
+                numeric: true
+            }))
     ];
 }
 

package/dist/utils/sort-readable-classes.mjs

@@ -1,6 +1,7 @@
 import SyntaxRuleType from '../syntax-rule-type.mjs';
 import MasterCSS from '../core.mjs';
 import compareRulePriority from './compare-rule-priority.mjs';
+import { __UNSORTED__ } from '../common.mjs';
 
 /**
  * Sorts classes in a consistent order
@@ -8,7 +9,16 @@ import compareRulePriority from './compare-rule-priority.mjs';
  * @param options
  * @returns consistent classes
  */ function sortReadableClasses(classes, css = new MasterCSS()) {
-    css.add(...classes);
+    const shouldSortClasses = [];
+    const unsortedClasses = [];
+    for (const className of classes){
+        if (className.includes(__UNSORTED__)) {
+            unsortedClasses.push(className);
+        } else {
+            shouldSortClasses.push(className);
+        }
+    }
+    css.add(...shouldSortClasses);
     // 先去重 fixedClass for componentsLayer
     const seenFixed = new Set();
     const dedupedComponentRules = css.componentsLayer.rules.filter((rule)=>{
@@ -59,13 +69,15 @@ import compareRulePriority from './compare-rule-priority.mjs';
         return compareRulePriority(a.rule, b.rule);
     });
     const orderedClasses = sortedRules.map((entry)=>entry.rule.fixedClass || entry.rule.name);
-    const unknownClasses = classes.filter((className)=>orderedClasses.indexOf(className) === -1).sort((a, b)=>a.localeCompare(b, undefined, {
-            numeric: true
-        }));
-    css.remove(...classes);
+    css.remove(...shouldSortClasses);
     return [
         ...orderedClasses,
-        ...unknownClasses
+        ...[
+            ...shouldSortClasses.filter((className)=>orderedClasses.indexOf(className) === -1),
+            ...unsortedClasses
+        ].sort((a, b)=>a.localeCompare(b, undefined, {
+                numeric: true
+            }))
     ];
 }
 

package/package.json

@@ -1 +1 @@
-{"name":"@master/css","type":"module","scripts":{"build":"techor build \"src/**/*.ts\"","dev":"pnpm build --watch","test":"vitest","type-check":"tsc --noEmit","lint":"eslint"},"license":"MIT","description":"The CSS language and framework for rapidly building modern and high-performance websites","author":"Aoyue Design LLC.","funding":"https://rc.css.master.co/sponsor","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/core"},"keywords":["style","styles","html","variants","virtual","virtual-css","utility","css","ui","lightweight","class","webpack","plugin","integration","vite","parcel","build-tools","mastercss"],"sideEffects":false,"main":"./dist/index.cjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","module":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"types":"./dist/index.d.ts","require":"./dist/index.cjs","import":"./dist/index.mjs"}},"bin":"./dist/bin/index.mjs","files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/colors":"^2.1.1","@master/normal.css":"^3.1.0","@techor/extend":"^3.2.0","csstype":"^3.1.3"},"devDependencies":{"shared":"^2.0.0-rc.62"},"version":"2.0.0-rc.62"}
+{"name":"@master/css","type":"module","scripts":{"build":"techor build \"src/**/*.ts\"","dev":"pnpm build --watch","test":"vitest","type-check":"tsc --noEmit","lint":"eslint"},"license":"MIT","description":"The CSS language and framework for rapidly building modern and high-performance websites","author":"Aoyue Design LLC.","funding":"https://rc.css.master.co/sponsor","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/core"},"keywords":["style","styles","html","variants","virtual","virtual-css","utility","css","ui","lightweight","class","webpack","plugin","integration","vite","parcel","build-tools","mastercss"],"sideEffects":false,"main":"./dist/index.cjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","module":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"types":"./dist/index.d.ts","require":"./dist/index.cjs","import":"./dist/index.mjs"}},"bin":"./dist/bin/index.mjs","files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/colors":"^2.1.1","@master/normal.css":"^3.1.0","@techor/extend":"^3.2.0","csstype":"^3.1.3"},"devDependencies":{"shared":"^2.0.0-rc.63"},"version":"2.0.0-rc.63"}