@master/css 2.0.0-rc.53 → 2.0.0-rc.55

package/dist/config/rules.cjs

@@ -919,6 +919,9 @@ const rules = {
         type: syntaxRuleType.Native,
         unit: 'em'
     },
+    hyphens: {
+        type: syntaxRuleType.Native
+    },
     'user-drag': {
         type: syntaxRuleType.Native,
         declare (value) {

package/dist/config/rules.d.ts

@@ -103,6 +103,7 @@ declare const rules: {
     'touch-action': SyntaxRuleDefinition;
     'word-break': SyntaxRuleDefinition;
     'word-spacing': SyntaxRuleDefinition;
+    hyphens: SyntaxRuleDefinition;
     'user-drag': SyntaxRuleDefinition;
     'user-select': SyntaxRuleDefinition;
     'text-shadow': SyntaxRuleDefinition;

package/dist/config/rules.mjs

@@ -917,6 +917,9 @@ const rules = {
         type: SyntaxRuleType.Native,
         unit: 'em'
     },
+    hyphens: {
+        type: SyntaxRuleType.Native
+    },
     'user-drag': {
         type: SyntaxRuleType.Native,
         declare (value) {

package/dist/core.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var syntaxRule = require('./syntax-rule.cjs');
 var index = require('./config/index.cjs');
 var hexToRgb = require('./utils/hex-to-rgb.cjs');
@@ -12,13 +10,14 @@ var rule = require('./rule.cjs');
 var syntaxRuleType = require('./syntax-rule-type.cjs');
 var layer = require('./layer.cjs');
 var nonLayer = require('./non-layer.cjs');
+var registerGlobal = require('./register-global.cjs');
 
 class MasterCSS {
     customConfig;
     static config = index.config;
     definedRules;
     config;
-    classUsages;
+    classCounts;
     layerStatementRule;
     rules;
     animationsNonLayer;
@@ -45,7 +44,7 @@ class MasterCSS {
     constructor(customConfig){
         this.customConfig = customConfig;
         this.definedRules = [];
-        this.classUsages = new Map();
+        this.classCounts = new Map();
         this.layerStatementRule = new rule.Rule('layer-statement', [
             {
                 text: '@layer base,theme,preset,components,general;'
@@ -62,9 +61,6 @@ class MasterCSS {
         this.generalLayer = new syntaxLayer('general', this);
         this.config = customConfig?.override ? extendConfig(customConfig) : extendConfig(index.config, customConfig);
         this.resolve();
-        if (this.constructor === MasterCSS) {
-            masterCSSs.push(this);
-        }
     }
     resolve() {
         this.components = {};
@@ -656,7 +652,6 @@ class MasterCSS {
                 if (syntaxRules.length) return syntaxRules;
             }
         }
-        return [];
     }
     /**
      * 根據蒐集到的所有 DOM class 重新 create
@@ -673,7 +668,7 @@ class MasterCSS {
         /**
          * 拿當前所有的 classNames 按照最新的 colors, config.rules 匹配並生成新的 style
          * 所以 refresh 過後 rules 可能會變多也可能會變少
-         */ this.classUsages.forEach((_, className)=>{
+         */ this.classCounts.forEach((_, className)=>{
             this.add(className);
         });
         return this;
@@ -689,8 +684,7 @@ class MasterCSS {
     }
     destroy() {
         this.reset();
-        this.classUsages.clear();
-        masterCSSs.splice(masterCSSs.indexOf(this), 1);
+        this.classCounts.clear();
         return this;
     }
     add(...classNames) {
@@ -738,11 +732,8 @@ class MasterCSS {
         }
     }
 }
-const masterCSSs = [];
-(()=>{
-    globalThis.MasterCSS = MasterCSS;
-    globalThis.masterCSSs = masterCSSs;
-})();
+(function(MasterCSS) {
+    registerGlobal(MasterCSS);
+})(MasterCSS);
 
-exports.default = MasterCSS;
-exports.masterCSSs = masterCSSs;
+module.exports = MasterCSS;

package/dist/core.d.ts

@@ -1,5 +1,4 @@
 import { SyntaxRule } from './syntax-rule';
-import './types/global';
 import SyntaxLayer from './syntax-layer';
 import { Rule } from './rule';
 import Layer from './layer';
@@ -12,7 +11,7 @@ export default class MasterCSS {
     static config: Config;
     readonly definedRules: DefinedRule[];
     readonly config: Config;
-    readonly classUsages: Map<string, number>;
+    readonly classCounts: Map<string, number>;
     readonly layerStatementRule: Rule;
     readonly rules: (Layer | Rule)[];
     readonly animationsNonLayer: NonLayer;
@@ -47,7 +46,7 @@ export default class MasterCSS {
      * Create syntax rule from given selector text
      * @param selectorText
      */
-    createFromSelectorText(selectorText: string): SyntaxRule[];
+    createFromSelectorText(selectorText: string): SyntaxRule[] | undefined;
     /**
      * 根據蒐集到的所有 DOM class 重新 create
      */
@@ -58,7 +57,6 @@ export default class MasterCSS {
     remove(...classNames: string[]): void;
     getModeSelector(modeName: string): string | undefined;
 }
-export declare const masterCSSs: MasterCSS[];
 export default interface MasterCSS {
     supportVendors: Set<Vendors>;
     style: HTMLStyleElement | null;

package/dist/core.mjs

@@ -8,13 +8,14 @@ import { Rule } from './rule.mjs';
 import SyntaxRuleType from './syntax-rule-type.mjs';
 import Layer from './layer.mjs';
 import NonLayer from './non-layer.mjs';
+import registerGlobal from './register-global.mjs';
 
 class MasterCSS {
     customConfig;
     static config = config;
     definedRules;
     config;
-    classUsages;
+    classCounts;
     layerStatementRule;
     rules;
     animationsNonLayer;
@@ -41,7 +42,7 @@ class MasterCSS {
     constructor(customConfig){
         this.customConfig = customConfig;
         this.definedRules = [];
-        this.classUsages = new Map();
+        this.classCounts = new Map();
         this.layerStatementRule = new Rule('layer-statement', [
             {
                 text: '@layer base,theme,preset,components,general;'
@@ -58,9 +59,6 @@ class MasterCSS {
         this.generalLayer = new SyntaxLayer('general', this);
         this.config = customConfig?.override ? extendConfig(customConfig) : extendConfig(config, customConfig);
         this.resolve();
-        if (this.constructor === MasterCSS) {
-            masterCSSs.push(this);
-        }
     }
     resolve() {
         this.components = {};
@@ -652,7 +650,6 @@ class MasterCSS {
                 if (syntaxRules.length) return syntaxRules;
             }
         }
-        return [];
     }
     /**
      * 根據蒐集到的所有 DOM class 重新 create
@@ -669,7 +666,7 @@ class MasterCSS {
         /**
          * 拿當前所有的 classNames 按照最新的 colors, config.rules 匹配並生成新的 style
          * 所以 refresh 過後 rules 可能會變多也可能會變少
-         */ this.classUsages.forEach((_, className)=>{
+         */ this.classCounts.forEach((_, className)=>{
             this.add(className);
         });
         return this;
@@ -685,8 +682,7 @@ class MasterCSS {
     }
     destroy() {
         this.reset();
-        this.classUsages.clear();
-        masterCSSs.splice(masterCSSs.indexOf(this), 1);
+        this.classCounts.clear();
         return this;
     }
     add(...classNames) {
@@ -734,10 +730,8 @@ class MasterCSS {
         }
     }
 }
-const masterCSSs = [];
-(()=>{
-    globalThis.MasterCSS = MasterCSS;
-    globalThis.masterCSSs = masterCSSs;
-})();
+(function(MasterCSS) {
+    registerGlobal(MasterCSS);
+})(MasterCSS);
 
-export { MasterCSS as default, masterCSSs };
+export { MasterCSS as default };

package/dist/index.cjs

@@ -53,9 +53,8 @@ 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.MasterCSS = core.default;
-exports.default = core.default;
-exports.masterCSSs = core.masterCSSs;
+exports.MasterCSS = core;
+exports.default = core;
 exports.SyntaxRule = syntaxRule.SyntaxRule;
 exports.Rule = rule.Rule;
 exports.Layer = layer;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 export { config } from './config/index.mjs';
 export { ANIMATION_SIGN, AT_SIGN, BASE_UNIT_REGEX, BORDER_STYLE_VALUES, CLASS_ATTRIBUTES, CLASS_DECLARATIONS, CLASS_FUNCTIONS, COLOR_VALUE_REGEX, DELIMITER_SIGN, IMAGE_VALUE_REGEX, NUMBER_VALUE_REGEX, OFFICIAL_URL, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, SELECTOR_SIGNS, SEPARATOR_SIGN, SEPARATOR_SIGNS, TRANSITION_SIGN, UNIT_REGEX, VALUE_DELIMITERS, VALUE_UNITS } from './common.mjs';
-export { default as MasterCSS, default, masterCSSs } from './core.mjs';
+export { default as MasterCSS, default } from './core.mjs';
 export { SyntaxRule } from './syntax-rule.mjs';
 export { Rule } from './rule.mjs';
 export { default as Layer } from './layer.mjs';

package/dist/register-global.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+function registerGlobal(MasterCSS) {
+    if (!globalThis.MasterCSS) globalThis.MasterCSS = MasterCSS;
+}
+
+module.exports = registerGlobal;

package/dist/register-global.d.ts

@@ -0,0 +1,5 @@
+import type Core from './core';
+declare global {
+    var MasterCSS: typeof Core;
+}
+export default function registerGlobal(MasterCSS: typeof Core): void;

package/dist/register-global.mjs

@@ -0,0 +1,5 @@
+function registerGlobal(MasterCSS) {
+    if (!globalThis.MasterCSS) globalThis.MasterCSS = MasterCSS;
+}
+
+export { registerGlobal as default };

package/dist/utils/generate-css.cjs

@@ -2,7 +2,7 @@
 
 var core = require('../core.cjs');
 
-function generateCSS(classes, css = new core.default()) {
+function generateCSS(classes, css = new core()) {
     let text = '';
     css.add(...classes);
     text = css.text;

package/dist/utils/reorder-for-readable-classes.cjs

@@ -8,7 +8,7 @@ var core = require('../core.cjs');
  * @param classes
  * @param options
  * @returns consistent classes
- */ function reorderForReadableClasses(classes, css = new core.default()) {
+ */ function reorderForReadableClasses(classes, css = new core()) {
     css.add(...classes);
     const orderedClasses = css.generalLayer.rules// 只保留樣式語法相關的 rules, 排除 keyframes 與 variables 在外
     .filter((eachRule)=>eachRule.type).sort((a, b)=>{

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.0","@master/normal.css":"^3.1.0","@techor/extend":"^3.1.7","csstype":"^3.1.3"},"devDependencies":{"shared":"^2.0.0-rc.53"},"version":"2.0.0-rc.53"}
+{"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.0","@master/normal.css":"^3.1.0","@techor/extend":"^3.2.0","csstype":"^3.1.3"},"devDependencies":{"shared":"^2.0.0-rc.55"},"version":"2.0.0-rc.55"}

package/dist/types/global.cjs

@@ -1,2 +0,0 @@
-'use strict';
-

package/dist/types/global.d.ts

@@ -1,5 +0,0 @@
-import type Core from '../core';
-declare global {
-    var masterCSSs: Core[];
-    var MasterCSS: typeof Core;
-}

package/dist/types/global.mjs

@@ -1 +0,0 @@
-