styimat 10.3.0 → 11.1.0

package/README.md

@@ -332,8 +332,6 @@ body {
 }
 
 .container {
-  @grid(3, 20px);
-  // 也可以
   @grid: 3 20px;
 }
 ```
@@ -460,18 +458,6 @@ styimat.config({
   preserveOriginal: false
 });
 
-// 数学工具
-styimat.math.evaluate('100px/2'); // "calc(100px / 2)"
-styimat.math.evaluate('(16px*1.5)+4px'); // "calc((16px * 1.5) + 4px)"
-
-// 颜色工具
-const rgb = styimat.colorUtils.labToRGB(54.7, 77.9, 80.1);
-const p3 = styimat.colorUtils.labToP3(54.7, 77.9, 80.1);
-const lab = styimat.colorUtils.lchToLab(54.7, 78.9, 38.5);
-
-// 解析颜色
-const colorInfo = styimat.colorUtils.parseColor('lab(54.7 77.9 80.1 / 0.8)');
-
 // 导入工具
 styimat.imports.clearCache();            // 清除导入缓存
 styimat.imports.setBaseUrl('/css/');     // 设置导入基础URL
@@ -484,38 +470,59 @@ class compressPlugin extends styimat.Plugin {
     install() {
         // 下载时调用 (不必须)
     }
+    
     destroy() {
         // 删除时调用 (不必须)
     }
+    
     convert(css, config) {
-        // 必须，否则报错
+        // 必须写，否则报错
         return css.replace(/[\n\s]/g, "");
     }
+    
+    methods = {
+        parse(cssText){
+            return this.convert(cssText);
+        }
+    }
 }
 
 // 设置插件
 styimat.plugins.use(compressPlugin);
 
-styimat.plugins.remove("compress");        // 删除插件
+// 删除插件
+styimat.plugins.remove("compress");
+
+// 使用自定义方法
+styimat.compress.parse("color: red;  background-color: blue;")
 ```
 
 ### 插件的定义标准
 
 ```javascript
-export defult class extends styimat.Plugin{
+export defult class extends styimat.Plugin {
     name = "compress";
     install() {
         // 下载时调用
         // 在这里做初始化工作
     }
+    
     destroy() {
         // 删除时调用
         // 记得清理
     }
+    
     convert(css, config) {
         // 转换时调用，必须写
         return css.replace(/[\n\s]/g, "");
     }
+    
+    methods = {
+        // 一些自定义方法
+        parse(cssText){
+            return this.convert(cssText);
+        }
+    }
 }
 
 // 导入时

package/dist/build-manifest.json

@@ -1,53 +1,53 @@
 {
-  "generatedAt": "2026-01-08T02:20:22.011Z",
+  "generatedAt": "2026-01-11T01:23:49.092Z",
   "files": [
     {
       "name": "dist/styimat.js",
-      "size": "55.73 KB"
+      "size": "48.42 KB"
     },
     {
       "name": "dist/styimat.min.js",
-      "size": "17.43 KB"
+      "size": "14.91 KB"
     },
     {
       "name": "dist/styimat.mjs",
-      "size": "55.89 KB"
+      "size": "48.55 KB"
     },
     {
       "name": "dist/styimat.min.mjs",
-      "size": "17.55 KB"
+      "size": "15.01 KB"
     },
     {
       "name": "dist/styimat.cjs",
-      "size": "55.75 KB"
+      "size": "48.45 KB"
     },
     {
       "name": "dist/styimat.min.cjs",
-      "size": "17.45 KB"
+      "size": "14.94 KB"
     },
     {
       "name": "dist/styimat.umd.js",
-      "size": "56.07 KB"
+      "size": "48.76 KB"
     },
     {
       "name": "dist/styimat.umd.min.js",
-      "size": "17.66 KB"
+      "size": "15.15 KB"
     },
     {
       "name": "dist/styimat.amd.js",
-      "size": "55.75 KB"
+      "size": "48.44 KB"
     },
     {
       "name": "dist/styimat.amd.min.js",
-      "size": "17.45 KB"
+      "size": "14.94 KB"
     },
     {
       "name": "dist/styimat.browser.js",
-      "size": "55.88 KB"
+      "size": "48.58 KB"
     },
     {
       "name": "dist/styimat.browser.min.js",
-      "size": "17.54 KB"
+      "size": "15.02 KB"
     },
     {
       "name": "bin/cli.min.js",

package/dist/styimat.amd.js

@@ -2,19 +2,6 @@
  * MIT License
  * Copyright (c) 2025 王小玗
  */
-/**
- * CSS 变量预处理库 - 增强版
- * 支持 CSS 变量预处理、嵌套选择器和嵌套变量
- * 支持 Lab 和 LCH 颜色空间转换为 RGB（CSS标准格式）
- * 支持 lab# 和 lch# 十六进制语法
- * 支持 Display P3 广色域显示器
- * 增强 math() 函数，支持复杂数学计算
- * 支持配置头
- * 支持 @import 语法
- * 支持 @alias 语法
- * 支持 @macro 宏定义系统
- */
-
 
 const styimat = (function() {
     // 默认配置
@@ -95,7 +82,7 @@ const styimat = (function() {
      * 解析配置头
      */
     function parseConfigHeader(cssText) {
-        const config = { ...defaultConfig };
+        const config = Object.create(null);
         const lines = splitLines(cssText);
         const cleanLines = [];
         
@@ -283,6 +270,7 @@ const styimat = (function() {
         
         result = result.replace(REGEX.VARIABLE, (match, paramName) => {
             const paramValue = args.get(paramName);
+            
             if (paramValue) return args.get(paramName);
             return match;
         });
@@ -374,7 +362,7 @@ const styimat = (function() {
             declarations.push(currentDeclaration.trim());
         }
         
-        const result = {};
+        const result = Object.create(null);
         
         for (let declaration of declarations) {
             declaration = declaration.replace(REGEX.COMMENT, '');
@@ -403,6 +391,7 @@ const styimat = (function() {
             if (property.startsWith("@") && macros.get(property.slice(1))) {
                 const macro = macros.get(property.slice(1));
                 const args = parseMacroArguments(value, macro.params, ' ');
+                
                 property = applyMacro(macro.body, args, config);
                 value = "";
             }
@@ -851,7 +840,7 @@ const styimat = (function() {
 function parseNestedRules(cssText, config, aliases, macros) {
     const rootRules = [];
     const stack = [];
-    const globalVariables = {}; // 存储全局变量
+    const globalVariables = Object.create(null); // 存储全局变量
     
     let currentRule = null;
     let currentLine = '';
@@ -896,7 +885,7 @@ function parseNestedRules(cssText, config, aliases, macros) {
                 // 新规则开始
                 currentRule = {
                     selector: currentLine.trim(),
-                    properties: {},
+                    properties: Object.create(null),
                     children: []
                 };
                 stack.push(currentRule);
@@ -916,7 +905,7 @@ function parseNestedRules(cssText, config, aliases, macros) {
                 // 开始嵌套规则
                 const nestedRule = {
                     selector: currentLine.trim(),
-                    properties: {},
+                    properties: Object.create(null),
                     children: []
                 };
                 stack.push(nestedRule);
@@ -1034,13 +1023,14 @@ function parseNestedRules(cssText, config, aliases, macros) {
     if (Object.keys(globalVariables).length > 0) {
         const rootVarsRule = {
             selector: config.rootSelector,
-            properties: {},
+            properties: Object.create(null),
             children: []
         };
+        
         // 将变量转换为CSS属性
-        Object.entries(globalVariables).forEach(([name, value]) => {
-            rootVarsRule.properties["--" + name] = value;
-        });
+        for (const name in globalVariables) {
+            rootVarsRule.properties["--" + name] = globalVariables[name];
+        }
         
         // 添加到rootRules的开头
         rootRules.unshift(rootVarsRule);
@@ -1054,6 +1044,8 @@ function parseNestedRules(cssText, config, aliases, macros) {
      */
     function convertRulesToCSS(rules, config, parentSelector = '', aliases, macros, isRootAt = false) {
         let result = '';
+        const indentSize = " ".repeat(config.indentSize);
+        const rootIndentSize = (isRootAt ? indentSize : '');
         
         for (const rule of rules) {
             const isAt = rule.selector.startsWith("@");
@@ -1077,14 +1069,12 @@ function parseNestedRules(cssText, config, aliases, macros) {
             fullSelector = fullSelector;
             
             if (Object.keys(rule.properties).length > 0) {
-                result += (isRootAt ? " ".repeat(config.indentSize) : '') + fullSelector + ' {\n';
+                result += rootIndentSize + fullSelector + ' {\n';
                 for (let key in rule.properties) {
-                    if (rule.properties.hasOwnProperty(key)) {
-                        const value = processCSSValue(rule.properties[key], config);
-                        result += (isRootAt ? " ".repeat(config.indentSize) : '') + " ".repeat(config.indentSize) + (!value.length ? `${key}\n` : `${key}: ${value};\n`);
-                    }
+                    const value = processCSSValue(rule.properties[key], config);
+                    result += rootIndentSize + indentSize + (!value.length ? `${key}\n` : `${key}: ${value};\n`);
                 }
-                result += isRootAt ? " ".repeat(config.indentSize) + '}\n' : '}\n\n';
+                result += isRootAt ? indentSize + '}\n' : '}\n\n';
             }
             
             if (rule.children && rule.children.length > 0) {
@@ -1219,63 +1209,52 @@ function parseNestedRules(cssText, config, aliases, macros) {
         
         return content;
     }
-
+    
     /**
      * 主转换函数
      */
-/**
- * 主转换函数
- */
-async function convert(cssText, customConfig = {}) {
-    let { config: headerConfig, css: cleanedCSS } = parseConfigHeader(cssText);
-    const finalConfig = { ...defaultConfig, ...customConfig, ...headerConfig };
-    cleanedCSS = await processImports(cleanedCSS, finalConfig);
-    
-    let aliases = new Map();
-    
-    let cssWithMacros = cleanedCSS;
-    let macros = new Map();
-    if (finalConfig.enableMacros) {
-        const { macros: parsedMacros, css: cssWithoutMacros } = parseMacroStatements(cssWithMacros, finalConfig);
-        macros = parsedMacros;
-        cssWithMacros = cssWithoutMacros;
-        
-        for (const [name, macro] of macros) {
-            macroRegistry.set(name, macro);
-        }
-    }
-    
-    let processedCSS = cssWithMacros.trim();
-    if (finalConfig.enableNesting && cssWithMacros.includes('{')) {
-        try {
-            // parseNestedRules 现在会在内部处理 @alias 语句
-            processedCSS = parseNestedRules(cssWithMacros, finalConfig, aliases, macros);
-        } catch (error) {
-            console.warn('嵌套解析失败，使用原始CSS:', error);
+    async function convert(cssText, customConfig = {}) {
+        let { config: headerConfig, css: cleanedCSS } = parseConfigHeader(cssText);
+        const finalConfig = { ...defaultConfig, ...customConfig, ...headerConfig };
+        cleanedCSS = await processImports(cleanedCSS, finalConfig);
+        
+        let aliases = new Map();
+        
+        let cssWithMacros = cleanedCSS;
+        let macros = new Map();
+        if (finalConfig.enableMacros) {
+            const { macros: parsedMacros, css: cssWithoutMacros } = parseMacroStatements(cssWithMacros, finalConfig);
+            macros = parsedMacros;
+            cssWithMacros = cssWithoutMacros;
+            
+            for (const [name, macro] of macros) {
+                macroRegistry.set(name, macro);
+            }
         }
-    } else {
-        // 对于非嵌套CSS，仍然需要单独处理 @alias
-        if (finalConfig.enableAlias) {
-            const { aliases: parsedAliases, css: cssWithoutAliases } = parseAliasStatements(cssWithMacros);
-            aliases = parsedAliases;
-            cssWithMacros = cssWithoutAliases;
+        
+        let processedCSS = cssWithMacros.trim();
+        if (finalConfig.enableNesting && cssWithMacros.includes('{')) {
+            try {
+                processedCSS = parseNestedRules(cssWithMacros, finalConfig, aliases, macros);
+            } catch (error) {
+                console.warn('嵌套解析失败，使用原始CSS:', error);
+            }
         }
-    }
-    
-    let finalCSS = processedCSS;
-    
-    finalCSS = replaceVariableUses(finalCSS, finalConfig);
-    
-    for (const [name, plugin] of pluginMap) {
-        try {
-            finalCSS = plugin.convert(finalCSS, finalConfig);
-        } catch (error) {
-            console.error('插件处理失败:', error);
+        
+        let finalCSS = processedCSS;
+        
+        finalCSS = replaceVariableUses(finalCSS, finalConfig);
+        
+        for (const [name, plugin] of pluginMap) {
+            try {
+                finalCSS = plugin.convert(finalCSS, finalConfig);
+            } catch (error) {
+                console.error('插件处理失败:', error);
+            }
         }
+        
+        return finalCSS;
     }
-    
-    return finalCSS;
-}
 
     /**
      * 自动处理带有特定属性的 style 标签
@@ -1315,7 +1294,7 @@ async function convert(cssText, customConfig = {}) {
         return styleTags.length;
     }
 
-    function config(config = {}) {
+    function config(config) {
         defaultConfig = { ...defaultConfig, ...config };
     }
 
@@ -1377,7 +1356,20 @@ async function convert(cssText, customConfig = {}) {
         plugins: {
             use(plugin) {
                 const pluginObj = new plugin();
-                pluginMap.set(pluginObj.name ?? plugin.name, pluginObj);
+                const pluginName = pluginObj.name ?? plugin.name;
+                pluginMap.set(pluginName, pluginObj);
+                
+                // 为每个方法绑定 this
+                const boundMethods = {};
+                for (const [methodName, method] of Object.entries(pluginObj.methods || {})) {
+                    if (typeof method === 'function') {
+                        boundMethods[methodName] = method.bind(pluginObj);
+                    } else {
+                        boundMethods[methodName] = method;
+                    }
+                }
+                
+                styimat[pluginName] = boundMethods;
                 return true;
             },
             remove(name) {
@@ -1393,179 +1385,6 @@ async function convert(cssText, customConfig = {}) {
             clear: function() {
                 pluginMap.clear();
             }
-        },
-        
-        aliases: {
-            add: function(alias, property) {
-                aliasMap.set(alias, property);
-            },
-            remove: function(alias) {
-                aliasMap.delete(alias);
-            },
-            getAll: function() {
-                return Array.from(aliasMap.entries());
-            },
-            clear: function() {
-                aliasMap.clear();
-            }
-        },
-        
-        macros: {
-            define: function(name, body, params = []) {
-                if (typeof body === 'function') {
-                    const funcString = body.toString();
-                    const bodyMatch = funcString.match(/{([\s\S]*)}/);
-                    if (bodyMatch) {
-                        macroRegistry.set(name, {
-                            params: params.map(p => typeof p === 'string' ? { name: p } : p),
-                            body: bodyMatch[1].trim()
-                        });
-                    }
-                } else {
-                    macroRegistry.set(name, {
-                        params: params.map(p => typeof p === 'string' ? { name: p } : p),
-                        body: body
-                    });
-                }
-            },
-            
-            call: function(name, ...args) {
-                const macro = macroRegistry.get(name);
-                if (!macro) {
-                    throw new Error(`未定义的宏: ${name}`);
-                }
-                
-                const argsMap = new Map();
-                for (let i = 0, length = macro.params.length; i < length; i++) {
-                    const param = macro.params[i];
-                    const value = i < args.length ? args[i] : param.defaultValue;
-                    if (value === undefined && param.defaultValue === null) {
-                        throw new Error(`缺少必需参数: ${param.name}`);
-                    }
-                    argsMap.set(param.name, value !== undefined ? value : '');
-                }
-                
-                return applyMacro(macro.body, argsMap, defaultConfig);
-            },
-            
-            getAll: function() {
-                return Array.from(macroRegistry.entries());
-            },
-            
-            remove: function(name) {
-                macroRegistry.delete(name);
-            },
-            
-            clear: function() {
-                macroRegistry.clear();
-            },
-            
-            parse: function(cssText) {
-                const { macros } = parseMacroStatements(cssText, defaultConfig);
-                for (const [name, macro] of macros) {
-                    macroRegistry.set(name, macro);
-                }
-            }
-        },
-        
-        math: {
-            evaluate: function(expression) {
-                return evaluateMathExpression(expression, defaultConfig);
-            }
-        },
-        
-        colorUtils: {
-            labToRGB: preciseLabToRGB,
-            lchToLab: lchToLab,
-            lchToRGB: function(L, C, H) {
-                const lab = lchToLab(L, C, H);
-                return preciseLabToRGB(lab.L, lab.a, lab.b);
-            },
-            labToP3: labToP3,
-            lchToP3: function(L, C, H) {
-                const lab = lchToLab(L, C, H);
-                return labToP3(lab.L, lab.a, lab.b);
-            },
-            parseHexLab: function(hexString) {
-                const match = hexString.match(/lab#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})/i);
-                if (!match) return null;
-                
-                const L_hex = match[1];
-                const A_hex = match[2];
-                const B_hex = match[3];
-                
-                const L = parseInt(L_hex, 16) / 255 * 100;
-                const A = (parseInt(A_hex, 16) - 128) * 1.5;
-                const B = (parseInt(B_hex, 16) - 128) * 1.5;
-                
-                return preciseLabToRGB(L, A, B);
-            },
-            parseHexLch: function(hexString) {
-                const match = hexString.match(/lch#([0-9a-f]{2})([0-9a-f]{2})(\d{1,3})/i);
-                if (!match) return null;
-                
-                const L_hex = match[1];
-                const C_hex = match[2];
-                const H_dec = match[3];
-                
-                const L = parseInt(L_hex, 16) / 255 * 100;
-                const C = parseInt(C_hex, 16) / 255 * 150;
-                const H = parseInt(H_dec) / 100 * 360;
-                
-                const lab = lchToLab(L, C, H);
-                return preciseLabToRGB(lab.L, lab.a, lab.b);
-            },
-            generateColor: function(L, a, b, alpha = null, useP3 = true) {
-                return generateColorString(L, a, b, { enableP3: useP3 }, alpha);
-            },
-            parseColor: function(colorString) {
-                try {
-                    const labMatch = colorString.match(/lab\(\s*([\d.]+)(%?)\s+([\d.-]+)\s+([\d.-]+)(?:\s*\/\s*([\d.%]+))?\s*\)/i);
-                    if (labMatch) {
-                        let L = parseFloat(labMatch[1]);
-                        const A = parseFloat(labMatch[3]);
-                        const B = parseFloat(labMatch[4]);
-                        const alpha = labMatch[5] ? 
-                            (labMatch[5].includes('%') ? parseFloat(labMatch[5]) / 100 : parseFloat(labMatch[5])) : 
-                            null;
-                        
-                        const colorStr = generateColorString(L, A, B, defaultConfig, alpha);
-                        
-                        return {
-                            L, A, B, alpha,
-                            rgb: preciseLabToRGB(L, A, B),
-                            p3: labToP3(L, A, B),
-                            colorString: colorStr
-                        };
-                    }
-                    
-                    const lchMatch = colorString.match(/lch\(\s*([\d.]+)(%?)\s+([\d.]+)\s+([\d.]+)(deg)?(?:\s*\/\s*([\d.%]+))?\s*\)/i);
-                    if (lchMatch) {
-                        let L = parseFloat(lchMatch[1]);
-                        const C = parseFloat(lchMatch[3]);
-                        let H = parseFloat(lchMatch[4]);
-                        const alpha = lchMatch[6] ? 
-                            (lchMatch[6].includes('%') ? parseFloat(lchMatch[6]) / 100 : parseFloat(lchMatch[6])) : 
-                            null;
-                        
-                        const lab = lchToLab(L, C, H);
-                        const colorStr = generateColorString(lab.L, lab.a, lab.b, defaultConfig, alpha);
-                        
-                        return {
-                            L, C, H, alpha,
-                            lab: lab,
-                            rgb: preciseLabToRGB(lab.L, lab.a, lab.b),
-                            p3: labToP3(lab.L, lab.a, lab.b),
-                            colorString: colorStr
-                        };
-                    }
-                    
-                    return null;
-                } catch (error) {
-                    console.warn('无法解析颜色:', colorString, error);
-                    return null;
-                }
-            }
         }
     };
     
@@ -1609,6 +1428,8 @@ async function convert(cssText, customConfig = {}) {
         convert(cssText, config) {
             throw new Error(`${this.name}.convert() 必须被实现`);
         }
+        
+        methods = {};
     };
 
     // 创建主函数
@@ -1620,12 +1441,7 @@ async function convert(cssText, customConfig = {}) {
         const firstArg = args[0];
 
         if (typeof firstArg === 'string') {
-            const result = await convert(firstArg, args[1]);
-            
-            if (result && typeof result.then === 'function') {
-                return result;
-            }
-            return result;
+            return await convert(firstArg, args[1]);
         }
 
         if (typeof firstArg === 'object' && firstArg !== null) {
@@ -1657,13 +1473,8 @@ async function convert(cssText, customConfig = {}) {
 
             cssText += result + strings[i + 1];
         }
-
-        const result = await convert(cssText, defaultConfig);
         
-        if (result && typeof result.then === 'function') {
-            return result;
-        }
-        return result;
+        return await convert(cssText);
     }
 
     Object.assign(styimat, api);