@tbela99/css-parser 1.2.0 → 1.3.1

package/dist/lib/ast/expand.js

@@ -5,30 +5,16 @@ import '../parser/utils/config.js';
 import { EnumToken } from './types.js';
 import { walkValues } from './walk.js';
 import { renderToken } from '../renderer/render.js';
+import '../renderer/sourcemap/lib/encode.js';
 import '../syntax/color/utils/constants.js';
 
 /**
- * expand nested css ast
+ * expand css nesting ast nodes
  * @param ast
+ *
+ * @private
  */
 function expand(ast) {
-    //
-    // if (![EnumToken.RuleNodeType, EnumToken.StyleSheetNodeType, EnumToken.AtRuleNodeType].includes(ast.typ)) {
-    //
-    //     return ast;
-    // }
-    // if (EnumToken.RuleNodeType == ast.typ) {
-    //
-    //     return <AstRuleStyleSheet>{
-    //         typ: EnumToken.StyleSheetNodeType,
-    //         chi: expandRule(<AstRule>ast)
-    //     }
-    // }
-    //
-    // if (!('chi' in ast)) {
-    //
-    //     return ast;
-    // }
     const result = { ...ast, chi: [] };
     // @ts-ignore
     for (let i = 0; i < ast.chi.length; i++) {
@@ -52,11 +38,6 @@ function expand(ast) {
             // @ts-ignore
             result.chi.push({ ...(hasRule ? expand(node) : node) });
         }
-        // else {
-        //
-        //     // @ts-ignore
-        //     result.chi.push(node);
-        // }
     }
     return result;
 }
@@ -70,14 +51,6 @@ function expandRule(node) {
                 const rule = ast.chi[i];
                 if (!rule.sel.includes('&')) {
                     const selRule = splitRule(rule.sel);
-                    // if (selRule.length > 1) {
-                    //
-                    //     const r: string = ':is(' + selRule.map(a => a.join('')).join(',') + ')';
-                    //     rule.sel = splitRule(ast.sel).reduce((a: string[], b: string[]): string[] => a.concat([b.join('') + r]), <string[]>[]).join(',');
-                    //
-                    // }
-                    // else {
-                    // selRule = splitRule(selRule.reduce((acc, curr) => acc + (acc.length > 0 ? ',' : '') + curr.join(''), ''));
                     const arSelf = splitRule(ast.sel).filter((r) => r.every((t) => t != ':before' && t != ':after' && !t.startsWith('::'))).reduce((acc, curr) => acc.concat([curr.join('')]), []).join(',');
                     if (arSelf.length == 0) {
                         ast.chi.splice(i--, 1);
@@ -115,10 +88,6 @@ function expandRule(node) {
                                         if (s == '&' || parentSelector) {
                                             withCompound.push(s);
                                         }
-                                        // else {
-                                        //
-                                        //     withoutCompound.push(s.slice(1));
-                                        // }
                                     }
                                 }
                                 else {
@@ -129,10 +98,6 @@ function expandRule(node) {
                                 withCompound.push(s);
                             }
                         }
-                        // else {
-                        //
-                        //     withoutCompound.push(s);
-                        // }
                     }
                     const selectors = [];
                     const selector = rules.length > 1 ? ':is(' + rules.map(a => a.join('')).join(',') + ')' : rules[0].join('');
@@ -164,13 +129,6 @@ function expandRule(node) {
                         if (withCompound.length == 1) {
                             selectors.push(replaceCompound(withCompound[0], selector));
                         }
-                        // else {
-                        //
-                        //     for (const w of withCompound) {
-                        //
-                        //         selectors.push(replaceCompound(w, selector));
-                        //     }
-                        // }
                     }
                     rule.sel = selectors.reduce((acc, curr) => curr.length == 0 ? acc : acc + (acc.length > 0 ? ',' : '') + curr, '');
                 }
@@ -211,11 +169,6 @@ function expandRule(node) {
                             // @ts-ignore
                             astAtRule.chi.push(...expandRule(r));
                         }
-                        // else {
-                        //
-                        //     // @ts-ignore
-                        //     astAtRule.chi.push(r);
-                        // }
                     }
                 }
                 // @ts-ignore
@@ -242,12 +195,6 @@ function replaceCompound(input, replace) {
                     if (replacement == null) {
                         replacement = parseString(replace);
                     }
-                    // if (tokens[1].typ == EnumToken.IdenTokenType) {
-                    //
-                    //
-                    //     (t.value as LiteralToken).val = (replacement as Token[]).length == 1 || (!replace.includes(' ') && replace.charAt(0).match(/[:.]/)) ? (tokens[1] as IdentToken).val + replace : replaceCompoundLiteral((tokens[1] as IdentToken).val + '&', replace);
-                    //     tokens.splice(1, 1);
-                    // } else {
                     t.value.val = replaceCompoundLiteral(t.value.val, replace);
                     // }
                     continue;
@@ -255,10 +202,6 @@ function replaceCompound(input, replace) {
                 const rule = splitRule(replace);
                 t.value.val = rule.length > 1 ? ':is(' + replace + ')' : replace;
             }
-            // else if ((t.value as LiteralToken).val.length > 1 && (t.value as LiteralToken).val.charAt(0) == '&') {
-            //
-            //     (t.value as LiteralToken).val = replaceCompoundLiteral((t.value as LiteralToken).val, replace);
-            // }
         }
     }
     return tokens.reduce((acc, curr) => acc + renderToken(curr), '');
@@ -271,10 +214,6 @@ function replaceCompoundLiteral(selector, replace) {
             tokens.push('&');
             tokens.push('');
         }
-        // else {
-        //
-        //     tokens[tokens.length - 1] += selector.charAt(i);
-        // }
     }
     return tokens.sort((a, b) => {
         if (a == '&') {

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

@@ -2,12 +2,12 @@ import { EnumToken } from '../types.js';
 import { walkValues, WalkerValueEvent, WalkerOptionEnum } from '../walk.js';
 import { evaluate } from '../math/expression.js';
 import { renderToken } from '../../renderer/render.js';
-import '../../syntax/color/utils/constants.js';
+import '../../renderer/sourcemap/lib/encode.js';
+import { mathFuncs } from '../../syntax/syntax.js';
 import '../minify.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import { mathFuncs } from '../../syntax/syntax.js';
 
 class ComputeCalcExpressionFeature {
     get ordering() {
@@ -56,8 +56,6 @@ class ComputeCalcExpressionFeature {
                     const slice = (node.typ == EnumToken.FunctionTokenType ? node.chi : (node.typ == EnumToken.DeclarationNodeType ? node.val : node.chi))?.slice();
                     if (slice != null && node.typ == EnumToken.FunctionTokenType && mathFuncs.includes(node.val)) {
                         // @ts-ignore
-                        const cp = (node.typ == EnumToken.FunctionTokenType && mathFuncs.includes(node.val) && node.val != 'calc' ? [node] : (node.typ == EnumToken.DeclarationNodeType ? node.val : node.chi)).slice();
-                        evaluate(cp);
                         const key = 'chi' in node ? 'chi' : 'val';
                         const str1 = renderToken({ ...node, [key]: slice });
                         const str2 = renderToken(node); // values.reduce((acc: string, curr: Token): string => acc + renderToken(curr), '');
@@ -65,11 +63,6 @@ class ComputeCalcExpressionFeature {
                             // @ts-ignore
                             node[key] = slice;
                         }
-                        // else {
-                        //
-                        //     // @ts-ignore
-                        //     node[key] = values;
-                        // }
                         return WalkerOptionEnum.Ignore;
                     }
                     return null;
@@ -85,20 +78,9 @@ class ComputeCalcExpressionFeature {
                             // @ts-ignore
                             const children = parent.typ == EnumToken.DeclarationNodeType ? parent.val : parent.chi;
                             if (values.length == 1 && values[0].typ != EnumToken.BinaryExpressionTokenType) {
-                                // if (parent.typ == EnumToken.BinaryExpressionTokenType) {
-                                //
-                                //     if ((parent as BinaryExpressionToken).l == value) {
-                                //
-                                //         (parent as BinaryExpressionToken).l = values[0];
-                                //     } else {
-                                //
-                                //         (parent as BinaryExpressionToken).r = values[0];
-                                //     }
-                                // } else {
                                 for (let i = 0; i < children.length; i++) {
                                     if (children[i] == value) {
-                                        // @ts-ignore
-                                        children.splice(i, 1, !(parent.typ == EnumToken.FunctionTokenType && parent.val == 'calc') && typeof values[0].val != 'string' ? {
+                                        children.splice(i, 1, !(parent.typ == EnumToken.FunctionTokenType && parent.val == 'calc') && (typeof values[0].val != 'number' && !(values[0].typ == EnumToken.FunctionTokenType && mathFuncs.includes(values[0].val))) ? {
                                             typ: EnumToken.FunctionTokenType,
                                             val: 'calc',
                                             chi: values
@@ -106,21 +88,15 @@ class ComputeCalcExpressionFeature {
                                         break;
                                     }
                                 }
-                                // }
                             }
                             else {
                                 for (let i = 0; i < children.length; i++) {
                                     if (children[i] == value) {
-                                        // if (parent.typ == EnumToken.FunctionTokenType && (parent as FunctionToken).val == 'calc') {
-                                        //
-                                        //     children.splice(i, 1, ...values);
-                                        // } else {
                                         children.splice(i, 1, {
                                             typ: EnumToken.FunctionTokenType,
                                             val: 'calc',
                                             chi: values
                                         });
-                                        // }
                                         break;
                                     }
                                 }

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

@@ -1,12 +1,12 @@
 import { EnumToken } from '../types.js';
 import { walkValues } from '../walk.js';
 import { renderToken } from '../../renderer/render.js';
-import '../../syntax/color/utils/constants.js';
+import '../../renderer/sourcemap/lib/encode.js';
+import { mathFuncs } from '../../syntax/syntax.js';
 import { splitRule } from '../minify.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import { mathFuncs } from '../../syntax/syntax.js';
 
 function inlineExpression(token) {
     const result = [];
@@ -106,25 +106,6 @@ class InlineCssVariablesFeature {
                         replace(node, variableScope);
                     }
                 }
-                // else {
-                //
-                //     const info: VariableScopeInfo = <VariableScopeInfo>variableScope.get((<AstDeclaration>node).nam);
-                //
-                //     info.globalScope = isRoot;
-                //
-                //     if (!isRoot) {
-                //
-                //         ++info.declarationCount;
-                //     }
-                //
-                //     if (info.replaceable) {
-                //
-                //         info.replaceable = isRoot && info.declarationCount == 1;
-                //     }
-                //
-                //     info.parent.add(ast);
-                //     info.node = (<AstDeclaration>node);
-                // }
             }
             else {
                 replace(node, variableScope);

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

@@ -9,9 +9,10 @@ import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
 import { pseudoAliasMap } from '../../syntax/syntax.js';
 import { renderToken } from '../../renderer/render.js';
-import { funcLike } from '../../syntax/color/utils/constants.js';
+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';
 
 const config = getSyntaxConfig();
 function replacePseudo(tokens) {

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

@@ -5,8 +5,9 @@ import '../walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import { filterValues, renderToken } from '../../renderer/render.js';
 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';
 
@@ -43,11 +44,11 @@ class TransformCssFeature {
             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') {
+                        if (curr.chi[2].val == 0) {
                             curr.chi.length = 1;
                             curr.val = 'skew';
                         }
-                        else if (curr.chi[0].val == '0') {
+                        else if (curr.chi[0].val == 0) {
                             curr.chi = [curr.chi[2]];
                             curr.val = 'skewY';
                         }

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

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