@tbela99/css-parser 0.9.1 → 1.1.0

package/dist/lib/ast/walk.js

@@ -1,5 +1,10 @@
-import { EnumToken } from './types.js';
-
+var WalkerOptionEnum;
+(function (WalkerOptionEnum) {
+    WalkerOptionEnum[WalkerOptionEnum["Ignore"] = 0] = "Ignore";
+    WalkerOptionEnum[WalkerOptionEnum["Stop"] = 1] = "Stop";
+    WalkerOptionEnum[WalkerOptionEnum["Children"] = 2] = "Children";
+    WalkerOptionEnum[WalkerOptionEnum["IgnoreChildren"] = 3] = "IgnoreChildren";
+})(WalkerOptionEnum || (WalkerOptionEnum = {}));
 var WalkerValueEvent;
 (function (WalkerValueEvent) {
     WalkerValueEvent[WalkerValueEvent["Enter"] = 0] = "Enter";
@@ -18,10 +23,10 @@ function* walk(node, filter) {
         let option = null;
         if (filter != null) {
             option = filter(node);
-            if (option === 'ignore') {
+            if (option === WalkerOptionEnum.Ignore) {
                 continue;
             }
-            if (option === 'stop') {
+            if (option === WalkerOptionEnum.Stop) {
                 break;
             }
         }
@@ -30,7 +35,7 @@ function* walk(node, filter) {
             // @ts-ignore
             yield { node, parent: map.get(node), root };
         }
-        if (option !== 'ignore-children' && 'chi' in node) {
+        if (option !== WalkerOptionEnum.IgnoreChildren && 'chi' in node) {
             parents.unshift(...node.chi);
             for (const child of node.chi.slice()) {
                 map.set(child, node);
@@ -39,7 +44,7 @@ function* walk(node, filter) {
     }
 }
 /**
- * walk ast values
+ * walk ast node value tokens
  * @param values
  * @param root
  * @param filter
@@ -62,19 +67,20 @@ function* walkValues(values, root = null, filter, reverse) {
             event: WalkerValueEvent.Enter
         };
     }
+    const eventType = filter.event ?? WalkerValueEvent.Enter;
     while (stack.length > 0) {
         let value = reverse ? stack.pop() : stack.shift();
         let option = null;
-        if (filter.fn != null && filter.event == WalkerValueEvent.Enter) {
+        if (filter.fn != null && eventType == WalkerValueEvent.Enter) {
             const isValid = filter.type == null || value.typ == filter.type ||
                 (Array.isArray(filter.type) && filter.type.includes(value.typ)) ||
                 (typeof filter.type == 'function' && filter.type(value));
             if (isValid) {
-                option = filter.fn(value, map.get(value) ?? root, WalkerValueEvent.Enter);
-                if (option === 'ignore') {
+                option = filter.fn(value, map.get(value) ?? root);
+                if (option === WalkerOptionEnum.Ignore) {
                     continue;
                 }
-                if (option === 'stop') {
+                if (option === WalkerOptionEnum.Stop) {
                     break;
                 }
                 // @ts-ignore
@@ -83,8 +89,7 @@ function* walkValues(values, root = null, filter, reverse) {
                 }
             }
         }
-        // @ts-ignore
-        if (filter.event == WalkerValueEvent.Enter && option !== 'children') {
+        if (eventType == WalkerValueEvent.Enter && option !== WalkerOptionEnum.Children) {
             yield {
                 value,
                 parent: map.get(value) ?? root,
@@ -94,7 +99,7 @@ function* walkValues(values, root = null, filter, reverse) {
                 root: root ?? null
             };
         }
-        if (option !== 'ignore-children' && 'chi' in value) {
+        if (option !== WalkerOptionEnum.IgnoreChildren && 'chi' in value) {
             const sliced = value.chi.slice();
             for (const child of sliced) {
                 map.set(child, value);
@@ -106,25 +111,52 @@ function* walkValues(values, root = null, filter, reverse) {
                 stack.unshift(...sliced);
             }
         }
-        else if (value.typ == EnumToken.BinaryExpressionTokenType) {
-            map.set(value.l, map.get(value) ?? root);
-            map.set(value.r, map.get(value) ?? root);
-            stack.unshift(value.l, value.r);
+        else {
+            const values = [];
+            if ('l' in value && value.l != null) {
+                // @ts-ignore
+                values.push(value.l);
+                // @ts-ignore
+                map.set(value.l, value);
+            }
+            if ('op' in value && typeof value.op == 'object') {
+                values.push(value.op);
+                // @ts-ignore
+                map.set(value.op, value);
+            }
+            if ('r' in value && value.r != null) {
+                if (Array.isArray(value.r)) {
+                    for (const r of value.r) {
+                        // @ts-ignore
+                        values.push(r);
+                        // @ts-ignore
+                        map.set(r, value);
+                    }
+                }
+                else {
+                    // @ts-ignore
+                    values.push(value.r);
+                    // @ts-ignore
+                    map.set(value.r, value);
+                }
+            }
+            if (values.length > 0) {
+                stack.unshift(...values);
+            }
         }
-        if (filter.event == WalkerValueEvent.Leave && filter.fn != null) {
+        if (eventType == WalkerValueEvent.Leave && filter.fn != null) {
             const isValid = filter.type == null || value.typ == filter.type ||
                 (Array.isArray(filter.type) && filter.type.includes(value.typ)) ||
                 (typeof filter.type == 'function' && filter.type(value));
             if (isValid) {
-                option = filter.fn(value, map.get(value), WalkerValueEvent.Leave);
+                option = filter.fn(value, map.get(value));
                 // @ts-ignore
                 if (option != null && 'typ' in option) {
                     map.set(option, map.get(value) ?? root);
                 }
             }
         }
-        // @ts-ignore
-        if (filter.event == WalkerValueEvent.Leave && option !== 'children') {
+        if (eventType == WalkerValueEvent.Leave && option !== WalkerOptionEnum.Children) {
             yield {
                 value,
                 parent: map.get(value) ?? root,
@@ -138,4 +170,4 @@ function* walkValues(values, root = null, filter, reverse) {
     }
 }
 
-export { WalkerValueEvent, walk, walkValues };
+export { WalkerOptionEnum, WalkerValueEvent, walk, walkValues };

package/dist/lib/fs/resolve.js

@@ -1,4 +1,8 @@
 const matchUrl = /^(https?:)?\/\//;
+/**
+ * return the directory name of a path
+ * @param path
+ */
 function dirname(path) {
     if (path == '/' || path === '') {
         return path;
@@ -47,6 +51,12 @@ function splitPath(result) {
     }
     return { parts, i };
 }
+/**
+ * resolve path
+ * @param url
+ * @param currentDirectory
+ * @param cwd
+ */
 function resolve(url, currentDirectory, cwd) {
     if (matchUrl.test(url)) {
         return {

package/dist/lib/parser/declaration/list.js

@@ -4,6 +4,7 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import { parseString } from '../parse.js';
+import '../tokenize.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { PropertyMap } from './map.js';
@@ -23,61 +24,63 @@ class PropertyList {
             val: Array.isArray(value) ? value : parseString(String(value))
         });
     }
-    add(declaration) {
-        if (declaration.typ != EnumToken.DeclarationNodeType || !this.options.removeDuplicateDeclarations) {
-            this.declarations.set(Number(Math.random().toString().slice(2)).toString(36), declaration);
-            return this;
-        }
-        if (!this.options.computeShorthand) {
-            this.declarations.set(declaration.nam, declaration);
-            return this;
-        }
-        let propertyName = declaration.nam;
-        let shortHandType;
-        let shorthand;
-        if (propertyName in config.properties) {
-            // @ts-ignore
-            if ('map' in config.properties[propertyName]) {
-                shortHandType = 'map';
+    add(...declarations) {
+        for (const declaration of declarations) {
+            if (declaration.typ != EnumToken.DeclarationNodeType || !this.options.removeDuplicateDeclarations) {
+                this.declarations.set(Number(Math.random().toString().slice(2)).toString(36), declaration);
+                continue;
+            }
+            if (!this.options.computeShorthand) {
+                this.declarations.set(declaration.nam, declaration);
+                continue;
+            }
+            let propertyName = declaration.nam;
+            let shortHandType;
+            let shorthand;
+            if (propertyName in config.properties) {
                 // @ts-ignore
-                shorthand = config.properties[propertyName].map;
+                if ('map' in config.properties[propertyName]) {
+                    shortHandType = 'map';
+                    // @ts-ignore
+                    shorthand = config.properties[propertyName].map;
+                }
+                else {
+                    shortHandType = 'set';
+                    // @ts-ignore
+                    shorthand = config.properties[propertyName].shorthand;
+                }
             }
-            else {
-                shortHandType = 'set';
+            else if (propertyName in config.map) {
+                shortHandType = 'map';
                 // @ts-ignore
-                shorthand = config.properties[propertyName].shorthand;
+                shorthand = config.map[propertyName].shorthand;
             }
-        }
-        else if (propertyName in config.map) {
-            shortHandType = 'map';
             // @ts-ignore
-            shorthand = config.map[propertyName].shorthand;
-        }
-        // @ts-ignore
-        if (shortHandType == 'map') {
-            // @ts-ignore
-            if (!this.declarations.has(shorthand)) {
+            if (shortHandType == 'map') {
+                // @ts-ignore
+                if (!this.declarations.has(shorthand)) {
+                    // @ts-ignore
+                    this.declarations.set(shorthand, new PropertyMap(config.map[shorthand]));
+                }
                 // @ts-ignore
-                this.declarations.set(shorthand, new PropertyMap(config.map[shorthand]));
+                this.declarations.get(shorthand).add(declaration);
+                // return this;
             }
             // @ts-ignore
-            this.declarations.get(shorthand).add(declaration);
-            // return this;
-        }
-        // @ts-ignore
-        else if (shortHandType == 'set') {
-            // @ts-ignore
-            // const shorthand: string = <string>config.properties[propertyName].shorthand;
-            if (!this.declarations.has(shorthand)) {
+            else if (shortHandType == 'set') {
                 // @ts-ignore
-                this.declarations.set(shorthand, new PropertySet(config.properties[shorthand]));
+                // const shorthand: string = <string>config.properties[propertyName].shorthand;
+                if (!this.declarations.has(shorthand)) {
+                    // @ts-ignore
+                    this.declarations.set(shorthand, new PropertySet(config.properties[shorthand]));
+                }
+                // @ts-ignore
+                this.declarations.get(shorthand).add(declaration);
+                // return this;
+            }
+            else {
+                this.declarations.set(propertyName, declaration);
             }
-            // @ts-ignore
-            this.declarations.get(shorthand).add(declaration);
-            // return this;
-        }
-        else {
-            this.declarations.set(propertyName, declaration);
         }
         return this;
     }

package/dist/lib/parser/declaration/map.js

@@ -5,6 +5,7 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import { parseString } from '../parse.js';
+import '../tokenize.js';
 import { renderToken } from '../../renderer/render.js';
 import '../../renderer/color/utils/constants.js';
 import { PropertySet } from './set.js';

package/dist/lib/parser/declaration/set.js

@@ -3,8 +3,9 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../parse.js';
-import { isLength } from '../../syntax/syntax.js';
+import '../tokenize.js';
 import '../utils/config.js';
+import { isLength } from '../../syntax/syntax.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';