@tbela99/css-parser 1.3.2 → 1.3.4

package/dist/lib/ast/expand.js

@@ -16,14 +16,11 @@ import '../syntax/color/utils/constants.js';
  */
 function expand(ast) {
     const result = { ...ast, chi: [] };
-    // @ts-ignore
     for (let i = 0; i < ast.chi.length; i++) {
-        // @ts-ignore
         const node = ast.chi[i];
         if (node.typ == EnumToken.RuleNodeType) {
             // @ts-ignore
             result.chi.push(...expandRule(node));
-            // i += expanded.length - 1;
         }
         else if (node.typ == EnumToken.AtRuleNodeType && 'chi' in node) {
             let hasRule = false;
@@ -38,6 +35,10 @@ function expand(ast) {
             // @ts-ignore
             result.chi.push({ ...(hasRule ? expand(node) : node) });
         }
+        else {
+            // @ts-ignore
+            result.chi.push(node);
+        }
     }
     return result;
 }
@@ -220,13 +221,7 @@ function replaceCompoundLiteral(selector, replace) {
             return 1;
         }
         return b == '&' ? -1 : 0;
-    }).reduce((acc, curr) => {
-        // if (acc.length > 0 && curr == '&' && (replace.charAt(0) != '.' || replace.includes(' '))) {
-        //
-        //     return acc + ':is(' + replace + ')';
-        // }
-        return acc + (curr == '&' ? replace : curr);
-    }, '');
+    }).reduce((acc, curr) => acc + (curr == '&' ? replace : curr), '');
 }
 
 export { expand, replaceCompound };

package/dist/lib/ast/features/calc.js

@@ -1,5 +1,5 @@
 import { EnumToken } from '../types.js';
-import { walkValues, WalkerValueEvent, WalkerOptionEnum } from '../walk.js';
+import { walkValues, WalkerEvent, WalkerOptionEnum } from '../walk.js';
 import { evaluate } from '../math/expression.js';
 import { renderToken } from '../../renderer/render.js';
 import '../../renderer/sourcemap/lib/encode.js';
@@ -8,16 +8,15 @@ import '../minify.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
+import { FeatureWalkMode } from './type.js';
 
 class ComputeCalcExpressionFeature {
+    accept = new Set([EnumToken.RuleNodeType, EnumToken.AtRuleNodeType]);
     get ordering() {
         return 1;
     }
-    get preProcess() {
-        return false;
-    }
-    get postProcess() {
-        return true;
+    get processMode() {
+        return FeatureWalkMode.Post;
     }
     static register(options) {
         if (options.computeCalcExpression) {
@@ -27,7 +26,7 @@ class ComputeCalcExpressionFeature {
     }
     run(ast) {
         if (!('chi' in ast)) {
-            return;
+            return null;
         }
         for (const node of ast.chi) {
             if (node.typ != EnumToken.DeclarationNodeType) {
@@ -35,7 +34,7 @@ class ComputeCalcExpressionFeature {
             }
             const set = new Set;
             for (const { value, parent } of walkValues(node.val, node, {
-                event: WalkerValueEvent.Enter,
+                event: WalkerEvent.Enter,
                 // @ts-ignore
                 fn(node, parent) {
                     if (parent != null &&
@@ -106,6 +105,7 @@ class ComputeCalcExpressionFeature {
                 }
             }
         }
+        return null;
     }
 }
 

package/dist/lib/ast/features/inlinecssvariables.js

@@ -7,6 +7,7 @@ import { splitRule } from '../minify.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
+import { FeatureWalkMode } from './type.js';
 
 function inlineExpression(token) {
     const result = [];
@@ -51,14 +52,12 @@ function replace(node, variableScope) {
     }
 }
 class InlineCssVariablesFeature {
+    accept = new Set([EnumToken.RuleNodeType, EnumToken.AtRuleNodeType]);
     get ordering() {
         return 0;
     }
-    get preProcess() {
-        return true;
-    }
-    get postProcess() {
-        return false;
+    get processMode() {
+        return FeatureWalkMode.Pre;
     }
     static register(options) {
         if (options.inlineCssVariables) {
@@ -67,9 +66,10 @@ class InlineCssVariablesFeature {
         }
     }
     run(ast, options = {}, parent, context) {
-        if (!('chi' in ast)) {
-            return;
-        }
+        // if (!('chi' in ast)) {
+        //
+        //     return null;
+        // }
         if (!('variableScope' in context)) {
             context.variableScope = new Map;
         }
@@ -111,6 +111,7 @@ class InlineCssVariablesFeature {
                 replace(node, variableScope);
             }
         }
+        return null;
     }
     cleanup(ast, options = {}, context) {
         const variableScope = context.variableScope;

package/dist/lib/ast/features/prefix.js

@@ -1,6 +1,5 @@
 import { EnumToken, SyntaxValidationResult } from '../types.js';
 import { getSyntaxConfig } from '../../validation/config.js';
-import '../../validation/parser/types.js';
 import '../../validation/parser/parse.js';
 import { splitRule } from '../minify.js';
 import { walkValues } from '../walk.js';
@@ -13,6 +12,7 @@ import '../../renderer/sourcemap/lib/encode.js';
 import '../../validation/syntaxes/complex-selector.js';
 import { evaluateSyntax } from '../../validation/syntax.js';
 import { funcLike } from '../../syntax/color/utils/constants.js';
+import { FeatureWalkMode } from './type.js';
 
 const config = getSyntaxConfig();
 function replacePseudo(tokens) {
@@ -59,11 +59,8 @@ class ComputePrefixFeature {
     get ordering() {
         return 2;
     }
-    get preProcess() {
-        return true;
-    }
-    get postProcess() {
-        return false;
+    get processMode() {
+        return FeatureWalkMode.Pre;
     }
     static register(options) {
         if (options.removePrefix) {
@@ -123,12 +120,13 @@ class ComputePrefixFeature {
                         }
                     }
                 }
+                // @ts-ignore
                 if (SyntaxValidationResult.Valid == evaluateSyntax({ ...node, val: nodes }, {}).valid) {
                     node.val = nodes;
                 }
             }
         }
-        else if (node.typ == EnumToken.AtRuleNodeType || node.typ == EnumToken.KeyframeAtRuleNodeType) {
+        else if (node.typ == EnumToken.AtRuleNodeType || node.typ == EnumToken.KeyframesAtRuleNodeType) {
             if (node.nam.startsWith('-')) {
                 const match = node.nam.match(/^-([^-]+)-(.+)$/);
                 if (match != null && '@' + match[2] in config.atRules) {
@@ -136,14 +134,6 @@ class ComputePrefixFeature {
                 }
             }
             if (node.typ == EnumToken.AtRuleNodeType && node.val !== '') {
-                // if ((node as AstAtRule).tokens == null) {
-                //
-                //     Object.defineProperty(node, 'tokens', {
-                //         // @ts-ignore
-                //         ...definedPropertySettings,
-                //         value: parseAtRulePrelude(parseString((node as AstAtRule).val), node as AstAtRule),
-                //     })
-                // }
                 if (replaceAstNodes(node.tokens)) {
                     node.val = node.tokens.reduce((acc, curr) => acc + renderToken(curr), '');
                 }

package/dist/lib/ast/features/shorthand.js

@@ -7,16 +7,15 @@ import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
 import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
+import { FeatureWalkMode } from './type.js';
 
 class ComputeShorthandFeature {
+    accept = new Set([EnumToken.RuleNodeType, EnumToken.AtRuleNodeType, EnumToken.KeyFramesRuleNodeType]);
     get ordering() {
         return 3;
     }
-    get preProcess() {
-        return false;
-    }
-    get postProcess() {
-        return true;
+    get processMode() {
+        return FeatureWalkMode.Post;
     }
     static register(options) {
         if (options.computeShorthand) {
@@ -26,7 +25,7 @@ class ComputeShorthandFeature {
     }
     run(ast, options = {}, parent, context) {
         if (!('chi' in ast)) {
-            return ast;
+            return null;
         }
         // @ts-ignore
         const j = ast.chi.length;

package/dist/lib/ast/features/transform.js

@@ -9,17 +9,16 @@ import '../../syntax/color/utils/constants.js';
 import { filterValues, renderToken } from '../../renderer/render.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { compute } from '../transform/compute.js';
-import { eqMatrix } from '../transform/minify.js';
+import { minifyTransformFunctions, eqMatrix } from '../transform/minify.js';
+import { FeatureWalkMode } from './type.js';
 
 class TransformCssFeature {
+    accept = new Set([EnumToken.RuleNodeType, EnumToken.KeyFramesRuleNodeType]);
     get ordering() {
         return 4;
     }
-    get preProcess() {
-        return false;
-    }
-    get postProcess() {
-        return true;
+    get processMode() {
+        return FeatureWalkMode.Post;
     }
     static register(options) {
         // @ts-ignore
@@ -30,7 +29,7 @@ class TransformCssFeature {
     }
     run(ast) {
         if (!('chi' in ast)) {
-            return;
+            return null;
         }
         let i = 0;
         let node;
@@ -41,28 +40,21 @@ class TransformCssFeature {
             if (node.typ != EnumToken.DeclarationNodeType || !node.nam.match(/^(-[a-z]+-)?transform$/)) {
                 continue;
             }
-            const children = node.val.reduce((acc, curr) => {
-                if (curr.typ == EnumToken.FunctionTokenType && 'skew' == curr.val.toLowerCase()) {
-                    if (curr.chi.length == 3) {
-                        if (curr.chi[2].val == 0) {
-                            curr.chi.length = 1;
-                            curr.val = 'skew';
-                        }
-                        else if (curr.chi[0].val == 0) {
-                            curr.chi = [curr.chi[2]];
-                            curr.val = 'skewY';
-                        }
-                    }
-                }
-                acc.push(curr);
-                return acc;
-            }, []);
+            const children = [];
+            for (const child of node.val) {
+                children.push(child.typ == EnumToken.FunctionTokenType ? minifyTransformFunctions(child) : child);
+            }
             consumeWhitespace(children);
-            let { matrix, cumulative, minified } = compute(children) ?? {};
+            let { matrix, cumulative, minified } = compute(children) ?? {
+                matrix: null,
+                cumulative: null,
+                minified: null
+            };
             if (matrix == null || cumulative == null || minified == null) {
+                node.val = children;
                 continue;
             }
-            let r = [filterValues(node.val.slice())];
+            let r = [filterValues(children)];
             if (eqMatrix(matrix, cumulative)) {
                 r.push(cumulative);
             }
@@ -77,6 +69,7 @@ class TransformCssFeature {
                 return acc;
             }, [matrix]);
         }
+        return null;
     }
 }
 

package/dist/lib/ast/features/type.js

@@ -1,16 +1,18 @@
 /**
  * feature walk mode
+ *
+ * @internal
  */
 var FeatureWalkMode;
 (function (FeatureWalkMode) {
     /**
      * pre process
      */
-    FeatureWalkMode[FeatureWalkMode["Pre"] = 0] = "Pre";
+    FeatureWalkMode[FeatureWalkMode["Pre"] = 1] = "Pre";
     /**
      * post process
      */
-    FeatureWalkMode[FeatureWalkMode["Post"] = 1] = "Post";
+    FeatureWalkMode[FeatureWalkMode["Post"] = 2] = "Post";
 })(FeatureWalkMode || (FeatureWalkMode = {}));
 
 export { FeatureWalkMode };