@tbela99/css-parser 0.5.0 → 0.5.2

package/README.md

@@ -1,4 +1,4 @@
-[![npm](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Ftbela99%2Fcss-parser%2Fmaster%2Fpackage.json&query=version&logo=npm&label=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser) [![cov](https://tbela99.github.io/css-parser/badges/coverage.svg)](https://github.com/tbela99/css-parser/actions) [![NPM Downloads](https://img.shields.io/npm/dy/%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser)
+[![npm](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Ftbela99%2Fcss-parser%2Fmaster%2Fpackage.json&query=version&logo=npm&label=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser) [![cov](https://tbela99.github.io/css-parser/badges/coverage.svg)](https://github.com/tbela99/css-parser/actions) [![NPM Downloads](https://img.shields.io/npm/dm/%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser)
 
 # css-parser
 
@@ -497,30 +497,36 @@ for (const {node, parent, root} of walk(ast)) {
 
 ### Comment
 
-- typ: string 'Comment'
+- typ: number 
 - val: string, the comment
 
 ### Declaration
 
-- typ: string 'Declaration'
+- typ: number
 - nam: string, declaration name
 - val: array of tokens
 
 ### Rule
 
-- typ: string 'Rule'
+- typ: number
 - sel: string, css selector
 - chi: array of children
 
 ### AtRule
 
-- typ: string 'AtRule'
+- typ: number
 - nam: string. AtRule name
 - val: rule prelude
 
 ### AtRuleStyleSheet
 
-- typ: string 'Stylesheet'
+- typ: number
+- chi: array of children
+
+### KeyFrameRule
+
+- typ: number
+- sel: string, css selector
 - chi: array of children
 
 ## Sourcemap

package/dist/index-umd-web.js

@@ -81,6 +81,7 @@
         EnumToken[EnumToken["FractionTokenType"] = 69] = "FractionTokenType";
         EnumToken[EnumToken["IdenListTokenType"] = 70] = "IdenListTokenType";
         EnumToken[EnumToken["GridTemplateFuncTokenType"] = 71] = "GridTemplateFuncTokenType";
+        EnumToken[EnumToken["KeyFrameRuleNodeType"] = 72] = "KeyFrameRuleNodeType";
         /* aliases */
         EnumToken[EnumToken["Time"] = 25] = "Time";
         EnumToken[EnumToken["Iden"] = 7] = "Iden";
@@ -2510,7 +2511,15 @@
      * @param tokens
      */
     function evaluate(tokens) {
-        const nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+        let nodes;
+        try {
+            nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+        }
+        catch (e) {
+            // console.error({tokens});
+            // console.error(e);
+            return tokens;
+        }
         if (nodes.length <= 1) {
             return nodes;
         }
@@ -3036,7 +3045,7 @@
         return result;
     }
     function updateSourceMap(node, options, cache, sourcemap, position, str) {
-        if ([exports.EnumToken.RuleNodeType, exports.EnumToken.AtRuleNodeType].includes(node.typ)) {
+        if ([exports.EnumToken.RuleNodeType, exports.EnumToken.AtRuleNodeType, exports.EnumToken.KeyFrameRuleNodeType].includes(node.typ)) {
             let src = node.loc?.src ?? '';
             let output = options.output ?? '';
             if (!(src in cache)) {
@@ -3096,6 +3105,7 @@
                 }, '');
             case exports.EnumToken.AtRuleNodeType:
             case exports.EnumToken.RuleNodeType:
+            case exports.EnumToken.KeyFrameRuleNodeType:
                 if (data.typ == exports.EnumToken.AtRuleNodeType && !('chi' in data)) {
                     return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                 }
@@ -6371,12 +6381,16 @@
             }
             if (atRule.val == 'import') {
                 // @ts-ignore
-                if (tokens[0].typ == exports.EnumToken.UrlFunctionTokenType && tokens[1].typ == exports.EnumToken.UrlTokenTokenType) {
-                    tokens.shift();
-                    // @ts-ignore
-                    tokens[0].typ = exports.EnumToken.StringTokenType;
-                    // @ts-ignore
-                    tokens[0].val = `"${tokens[0].val}"`;
+                if (tokens[0].typ == exports.EnumToken.UrlFunctionTokenType) {
+                    if (tokens[1].typ == exports.EnumToken.UrlTokenTokenType || tokens[1].typ == exports.EnumToken.StringTokenType) {
+                        tokens.shift();
+                        if (tokens[1].typ == exports.EnumToken.UrlTokenTokenType) {
+                            // @ts-ignore
+                            tokens[0].typ = exports.EnumToken.StringTokenType;
+                            // @ts-ignore
+                            tokens[0].val = `"${tokens[0].val}"`;
+                        }
+                    }
                 }
                 // @ts-ignore
                 if (tokens[0].typ == exports.EnumToken.StringTokenType) {
@@ -6442,6 +6456,9 @@
                 const position = map.get(tokens[0]);
                 const uniq = new Map;
                 parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
+                    if (curr.typ == exports.EnumToken.CommentTokenType) {
+                        return acc;
+                    }
                     if (curr.typ == exports.EnumToken.WhitespaceTokenType) {
                         if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                             trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -6463,7 +6480,7 @@
                     return acc;
                 }, uniq);
                 const node = {
-                    typ: exports.EnumToken.RuleNodeType,
+                    typ: context.typ == exports.EnumToken.AtRuleNodeType && context.nam == 'keyframes' ? exports.EnumToken.KeyFrameRuleNodeType : exports.EnumToken.RuleNodeType,
                     // @ts-ignore
                     sel: [...uniq.keys()].join(','),
                     chi: []
@@ -8402,7 +8419,7 @@
     const features = Object.values(allFeatures).sort((a, b) => a.ordering - b.ordering);
     function minify(ast, options = {}, recursive = false, errors, nestingContent, context = {}) {
         if (!('nodes' in context)) {
-            context.nodes = new WeakSet;
+            context.nodes = new Set;
         }
         if (context.nodes.has(ast)) {
             return ast;
@@ -8431,7 +8448,7 @@
                     curr.splice(0, 2);
                 }
                 else if (combinators.includes(curr[1])) {
-                    curr.splice(0, 1);
+                    curr.shift();
                 }
             }
             else if (ast.typ == exports.EnumToken.RuleNodeType && (isIdent(curr[0]) || isFunction(curr[0]))) {
@@ -8633,7 +8650,7 @@
                             }
                             if (shouldMerge) {
                                 // @ts-ignore
-                                if ((node.typ == exports.EnumToken.RuleNodeType && node.sel == previous.sel) ||
+                                if (((node.typ == exports.EnumToken.RuleNodeType || node.typ == exports.EnumToken.KeyFrameRuleNodeType) && node.sel == previous.sel) ||
                                     // @ts-ignore
                                     (node.typ == exports.EnumToken.AtRuleNodeType) && node.val != 'font-face' && node.val == previous.val) {
                                     // @ts-ignore
@@ -8652,32 +8669,33 @@
                                     nodeIndex = i;
                                     continue;
                                 }
-                                else if (node.typ == exports.EnumToken.RuleNodeType && previous?.typ == exports.EnumToken.RuleNodeType) {
+                                else if (node.typ == previous?.typ && [exports.EnumToken.KeyFrameRuleNodeType, exports.EnumToken.RuleNodeType].includes(node.typ)) {
                                     const intersect = diff(previous, node, reducer, options);
                                     if (intersect != null) {
                                         if (intersect.node1.chi.length == 0) {
                                             // @ts-ignore
                                             ast.chi.splice(i--, 1);
                                             // @ts-ignore
-                                            node = ast.chi[i];
+                                            // node = ast.chi[i];
                                         }
                                         else {
                                             // @ts-ignore
                                             ast.chi.splice(i, 1, intersect.node1);
-                                            node = intersect.node1;
+                                            // node = ast.chi intersect.node1;
                                         }
                                         if (intersect.node2.chi.length == 0) {
                                             // @ts-ignore
                                             ast.chi.splice(nodeIndex, 1, intersect.result);
-                                            previous = intersect.result;
                                         }
                                         else {
                                             // @ts-ignore
                                             ast.chi.splice(nodeIndex, 1, intersect.result, intersect.node2);
-                                            previous = intersect.result;
                                             // @ts-ignore
-                                            i = nodeIndex;
+                                            i = (nodeIndex ?? 0) + 1;
                                         }
+                                        reduceRuleSelector(intersect.result);
+                                        previous = intersect.result;
+                                        nodeIndex = i;
                                     }
                                 }
                             }
@@ -8807,11 +8825,16 @@
         // combinator
         if (combinators.includes(optimized.at(-1))) {
             const combinator = optimized.pop();
-            selector.forEach(selector => selector.unshift(combinator));
+            selector.forEach((selector) => selector.unshift(combinator));
         }
         let reducible = optimized.length == 1;
-        if (optimized[0] == '&' && optimized[1] == ' ') {
-            optimized.splice(0, 2);
+        if (optimized[0] == '&') {
+            if (optimized[1] == ' ') {
+                optimized.splice(0, 2);
+            }
+            // else if (combinators.includes(optimized[1])) {
+            //
+            // }
         }
         if (optimized.length == 0 ||
             (optimized[0].charAt(0) == '&' ||
@@ -8819,7 +8842,7 @@
             return {
                 match: false,
                 optimized,
-                selector: selector.map(selector => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : selector),
+                selector: selector.map((selector) => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : (selector)),
                 reducible: selector.length > 1 && selector.every((selector) => !combinators.includes(selector[0]))
             };
         }
@@ -8899,6 +8922,18 @@
                 result.push([]);
                 continue;
             }
+            if (chr == ':') {
+                if (str !== '') {
+                    // @ts-ignore
+                    result.at(-1).push(str);
+                    str = '';
+                }
+                if (buffer.charAt(i + 1) == ':') {
+                    chr += buffer.charAt(++i);
+                }
+                str += chr;
+                continue;
+            }
             str += chr;
             if (chr == '\\') {
                 str += buffer.charAt(++i);
@@ -9200,6 +9235,52 @@
         const raw1 = node1.raw;
         // @ts-ignore
         const raw2 = node2.raw;
+        if (raw1 != null && raw2 != null) {
+            const prefixes1 = new Set;
+            const prefixes2 = new Set;
+            for (const token1 of raw1) {
+                for (const t of token1) {
+                    if (t[0] == ':') {
+                        const matches = t.match(/::?-([a-z]+)-/);
+                        if (matches == null) {
+                            continue;
+                        }
+                        prefixes1.add(matches[1]);
+                        if (prefixes1.size > 1) {
+                            break;
+                        }
+                    }
+                }
+                if (prefixes1.size > 1) {
+                    break;
+                }
+            }
+            for (const token2 of raw2) {
+                for (const t of token2) {
+                    if (t[0] == ':') {
+                        const matches = t.match(/::?-([a-z]+)-/);
+                        if (matches == null) {
+                            continue;
+                        }
+                        prefixes2.add(matches[1]);
+                        if (prefixes2.size > 1) {
+                            break;
+                        }
+                    }
+                }
+                if (prefixes2.size > 1) {
+                    break;
+                }
+            }
+            if (prefixes1.size != prefixes2.size) {
+                return null;
+            }
+            for (const prefix of prefixes1) {
+                if (!prefixes2.has(prefix)) {
+                    return null;
+                }
+            }
+        }
         // @ts-ignore
         node1 = { ...node1, chi: node1.chi.slice() };
         node2 = { ...node2, chi: node2.chi.slice() };
@@ -9236,7 +9317,7 @@
         const result = (intersect.length == 0 ? null : {
             ...node1,
             // @ts-ignore
-            sel: [...new Set([...(n1?.raw?.reduce(reducer, []) || splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) || splitRule(n2.sel))])].join(','),
+            sel: [...new Set([...(n1?.raw?.reduce(reducer, []) ?? splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) ?? splitRule(n2.sel))])].join(','),
             chi: intersect.reverse()
         });
         if (result == null || [n1, n2].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0) <= [node1, node2, result].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0)) {
@@ -9260,6 +9341,11 @@
             Object.defineProperty(node, 'optimized', { ...definedPropertySettings, value: optimized });
         }
         if (optimized != null && optimized.match && optimized.reducible && optimized.selector.length > 1) {
+            for (const selector of optimized.selector) {
+                if (selector.length > 1 && selector[0] == '&' && combinators.includes(selector[1])) {
+                    selector.shift();
+                }
+            }
             const raw = [
                 [
                     optimized.optimized[0], ':is('
@@ -9387,16 +9473,18 @@
         return response.text();
     }
     async function load(url, currentFile) {
+        let t;
         if (matchUrl.test(url)) {
-            return fetch(url).then(parseResponse);
+            t = new URL(url);
+        }
+        else if (matchUrl.test(currentFile)) {
+            t = new URL(url, currentFile);
         }
-        if (matchUrl.test(currentFile)) {
-            return fetch(new URL(url, currentFile)).then(parseResponse);
+        else {
+            const path = resolve(url, currentFile).absolute;
+            t = new URL(path, self.origin);
         }
-        const path = resolve(url, currentFile).absolute;
-        const t = new URL(path, self.origin);
-        // return fetch(new URL(url, new URL(currentFile, self.location.href).href)).then(parseResponse);
-        return fetch(url, t.origin != self.location.origin ? { mode: 'cors' } : {}).then(parseResponse);
+        return fetch(t, t.origin != self.origin ? { mode: 'cors' } : {}).then(parseResponse);
     }
 
     function render(data, options = {}) {

package/dist/index.cjs

@@ -79,6 +79,7 @@ exports.EnumToken = void 0;
     EnumToken[EnumToken["FractionTokenType"] = 69] = "FractionTokenType";
     EnumToken[EnumToken["IdenListTokenType"] = 70] = "IdenListTokenType";
     EnumToken[EnumToken["GridTemplateFuncTokenType"] = 71] = "GridTemplateFuncTokenType";
+    EnumToken[EnumToken["KeyFrameRuleNodeType"] = 72] = "KeyFrameRuleNodeType";
     /* aliases */
     EnumToken[EnumToken["Time"] = 25] = "Time";
     EnumToken[EnumToken["Iden"] = 7] = "Iden";
@@ -2508,7 +2509,15 @@ function simplify(a, b) {
  * @param tokens
  */
 function evaluate(tokens) {
-    const nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+    let nodes;
+    try {
+        nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+    }
+    catch (e) {
+        // console.error({tokens});
+        // console.error(e);
+        return tokens;
+    }
     if (nodes.length <= 1) {
         return nodes;
     }
@@ -3034,7 +3043,7 @@ function doRender(data, options = {}) {
     return result;
 }
 function updateSourceMap(node, options, cache, sourcemap, position, str) {
-    if ([exports.EnumToken.RuleNodeType, exports.EnumToken.AtRuleNodeType].includes(node.typ)) {
+    if ([exports.EnumToken.RuleNodeType, exports.EnumToken.AtRuleNodeType, exports.EnumToken.KeyFrameRuleNodeType].includes(node.typ)) {
         let src = node.loc?.src ?? '';
         let output = options.output ?? '';
         if (!(src in cache)) {
@@ -3094,6 +3103,7 @@ function renderAstNode(data, options, sourcemap, position, errors, reducer, cach
             }, '');
         case exports.EnumToken.AtRuleNodeType:
         case exports.EnumToken.RuleNodeType:
+        case exports.EnumToken.KeyFrameRuleNodeType:
             if (data.typ == exports.EnumToken.AtRuleNodeType && !('chi' in data)) {
                 return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
             }
@@ -6369,12 +6379,16 @@ async function parseNode(results, context, stats, options, errors, src, map) {
         }
         if (atRule.val == 'import') {
             // @ts-ignore
-            if (tokens[0].typ == exports.EnumToken.UrlFunctionTokenType && tokens[1].typ == exports.EnumToken.UrlTokenTokenType) {
-                tokens.shift();
-                // @ts-ignore
-                tokens[0].typ = exports.EnumToken.StringTokenType;
-                // @ts-ignore
-                tokens[0].val = `"${tokens[0].val}"`;
+            if (tokens[0].typ == exports.EnumToken.UrlFunctionTokenType) {
+                if (tokens[1].typ == exports.EnumToken.UrlTokenTokenType || tokens[1].typ == exports.EnumToken.StringTokenType) {
+                    tokens.shift();
+                    if (tokens[1].typ == exports.EnumToken.UrlTokenTokenType) {
+                        // @ts-ignore
+                        tokens[0].typ = exports.EnumToken.StringTokenType;
+                        // @ts-ignore
+                        tokens[0].val = `"${tokens[0].val}"`;
+                    }
+                }
             }
             // @ts-ignore
             if (tokens[0].typ == exports.EnumToken.StringTokenType) {
@@ -6440,6 +6454,9 @@ async function parseNode(results, context, stats, options, errors, src, map) {
             const position = map.get(tokens[0]);
             const uniq = new Map;
             parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
+                if (curr.typ == exports.EnumToken.CommentTokenType) {
+                    return acc;
+                }
                 if (curr.typ == exports.EnumToken.WhitespaceTokenType) {
                     if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                         trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -6461,7 +6478,7 @@ async function parseNode(results, context, stats, options, errors, src, map) {
                 return acc;
             }, uniq);
             const node = {
-                typ: exports.EnumToken.RuleNodeType,
+                typ: context.typ == exports.EnumToken.AtRuleNodeType && context.nam == 'keyframes' ? exports.EnumToken.KeyFrameRuleNodeType : exports.EnumToken.RuleNodeType,
                 // @ts-ignore
                 sel: [...uniq.keys()].join(','),
                 chi: []
@@ -8400,7 +8417,7 @@ const notEndingWith = ['(', '['].concat(combinators);
 const features = Object.values(allFeatures).sort((a, b) => a.ordering - b.ordering);
 function minify(ast, options = {}, recursive = false, errors, nestingContent, context = {}) {
     if (!('nodes' in context)) {
-        context.nodes = new WeakSet;
+        context.nodes = new Set;
     }
     if (context.nodes.has(ast)) {
         return ast;
@@ -8429,7 +8446,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                 curr.splice(0, 2);
             }
             else if (combinators.includes(curr[1])) {
-                curr.splice(0, 1);
+                curr.shift();
             }
         }
         else if (ast.typ == exports.EnumToken.RuleNodeType && (isIdent(curr[0]) || isFunction(curr[0]))) {
@@ -8631,7 +8648,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                         }
                         if (shouldMerge) {
                             // @ts-ignore
-                            if ((node.typ == exports.EnumToken.RuleNodeType && node.sel == previous.sel) ||
+                            if (((node.typ == exports.EnumToken.RuleNodeType || node.typ == exports.EnumToken.KeyFrameRuleNodeType) && node.sel == previous.sel) ||
                                 // @ts-ignore
                                 (node.typ == exports.EnumToken.AtRuleNodeType) && node.val != 'font-face' && node.val == previous.val) {
                                 // @ts-ignore
@@ -8650,32 +8667,33 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                                 nodeIndex = i;
                                 continue;
                             }
-                            else if (node.typ == exports.EnumToken.RuleNodeType && previous?.typ == exports.EnumToken.RuleNodeType) {
+                            else if (node.typ == previous?.typ && [exports.EnumToken.KeyFrameRuleNodeType, exports.EnumToken.RuleNodeType].includes(node.typ)) {
                                 const intersect = diff(previous, node, reducer, options);
                                 if (intersect != null) {
                                     if (intersect.node1.chi.length == 0) {
                                         // @ts-ignore
                                         ast.chi.splice(i--, 1);
                                         // @ts-ignore
-                                        node = ast.chi[i];
+                                        // node = ast.chi[i];
                                     }
                                     else {
                                         // @ts-ignore
                                         ast.chi.splice(i, 1, intersect.node1);
-                                        node = intersect.node1;
+                                        // node = ast.chi intersect.node1;
                                     }
                                     if (intersect.node2.chi.length == 0) {
                                         // @ts-ignore
                                         ast.chi.splice(nodeIndex, 1, intersect.result);
-                                        previous = intersect.result;
                                     }
                                     else {
                                         // @ts-ignore
                                         ast.chi.splice(nodeIndex, 1, intersect.result, intersect.node2);
-                                        previous = intersect.result;
                                         // @ts-ignore
-                                        i = nodeIndex;
+                                        i = (nodeIndex ?? 0) + 1;
                                     }
+                                    reduceRuleSelector(intersect.result);
+                                    previous = intersect.result;
+                                    nodeIndex = i;
                                 }
                             }
                         }
@@ -8805,11 +8823,16 @@ function reduceSelector(selector) {
     // combinator
     if (combinators.includes(optimized.at(-1))) {
         const combinator = optimized.pop();
-        selector.forEach(selector => selector.unshift(combinator));
+        selector.forEach((selector) => selector.unshift(combinator));
     }
     let reducible = optimized.length == 1;
-    if (optimized[0] == '&' && optimized[1] == ' ') {
-        optimized.splice(0, 2);
+    if (optimized[0] == '&') {
+        if (optimized[1] == ' ') {
+            optimized.splice(0, 2);
+        }
+        // else if (combinators.includes(optimized[1])) {
+        //
+        // }
     }
     if (optimized.length == 0 ||
         (optimized[0].charAt(0) == '&' ||
@@ -8817,7 +8840,7 @@ function reduceSelector(selector) {
         return {
             match: false,
             optimized,
-            selector: selector.map(selector => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : selector),
+            selector: selector.map((selector) => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : (selector)),
             reducible: selector.length > 1 && selector.every((selector) => !combinators.includes(selector[0]))
         };
     }
@@ -8897,6 +8920,18 @@ function splitRule(buffer) {
             result.push([]);
             continue;
         }
+        if (chr == ':') {
+            if (str !== '') {
+                // @ts-ignore
+                result.at(-1).push(str);
+                str = '';
+            }
+            if (buffer.charAt(i + 1) == ':') {
+                chr += buffer.charAt(++i);
+            }
+            str += chr;
+            continue;
+        }
         str += chr;
         if (chr == '\\') {
             str += buffer.charAt(++i);
@@ -9198,6 +9233,52 @@ function diff(n1, n2, reducer, options = {}) {
     const raw1 = node1.raw;
     // @ts-ignore
     const raw2 = node2.raw;
+    if (raw1 != null && raw2 != null) {
+        const prefixes1 = new Set;
+        const prefixes2 = new Set;
+        for (const token1 of raw1) {
+            for (const t of token1) {
+                if (t[0] == ':') {
+                    const matches = t.match(/::?-([a-z]+)-/);
+                    if (matches == null) {
+                        continue;
+                    }
+                    prefixes1.add(matches[1]);
+                    if (prefixes1.size > 1) {
+                        break;
+                    }
+                }
+            }
+            if (prefixes1.size > 1) {
+                break;
+            }
+        }
+        for (const token2 of raw2) {
+            for (const t of token2) {
+                if (t[0] == ':') {
+                    const matches = t.match(/::?-([a-z]+)-/);
+                    if (matches == null) {
+                        continue;
+                    }
+                    prefixes2.add(matches[1]);
+                    if (prefixes2.size > 1) {
+                        break;
+                    }
+                }
+            }
+            if (prefixes2.size > 1) {
+                break;
+            }
+        }
+        if (prefixes1.size != prefixes2.size) {
+            return null;
+        }
+        for (const prefix of prefixes1) {
+            if (!prefixes2.has(prefix)) {
+                return null;
+            }
+        }
+    }
     // @ts-ignore
     node1 = { ...node1, chi: node1.chi.slice() };
     node2 = { ...node2, chi: node2.chi.slice() };
@@ -9234,7 +9315,7 @@ function diff(n1, n2, reducer, options = {}) {
     const result = (intersect.length == 0 ? null : {
         ...node1,
         // @ts-ignore
-        sel: [...new Set([...(n1?.raw?.reduce(reducer, []) || splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) || splitRule(n2.sel))])].join(','),
+        sel: [...new Set([...(n1?.raw?.reduce(reducer, []) ?? splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) ?? splitRule(n2.sel))])].join(','),
         chi: intersect.reverse()
     });
     if (result == null || [n1, n2].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0) <= [node1, node2, result].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0)) {
@@ -9258,6 +9339,11 @@ function reduceRuleSelector(node) {
         Object.defineProperty(node, 'optimized', { ...definedPropertySettings, value: optimized });
     }
     if (optimized != null && optimized.match && optimized.reducible && optimized.selector.length > 1) {
+        for (const selector of optimized.selector) {
+            if (selector.length > 1 && selector[0] == '&' && combinators.includes(selector[1])) {
+                selector.shift();
+            }
+        }
         const raw = [
             [
                 optimized.optimized[0], ':is('

package/dist/index.d.ts

@@ -71,6 +71,7 @@ declare enum EnumToken {
     FractionTokenType = 69,
     IdenListTokenType = 70,
     GridTemplateFuncTokenType = 71,
+    KeyFrameRuleNodeType = 72,
     Time = 25,
     Iden = 7,
     EOF = 47,
@@ -664,6 +665,7 @@ export declare interface AstDeclaration extends Node {
     typ: EnumToken.DeclarationNodeType
 }
 
+
 export declare interface AstRule extends Node {
 
     typ: EnumToken.RuleNodeType;

package/dist/lib/ast/math/expression.js

@@ -7,7 +7,15 @@ import { reduceNumber } from '../../renderer/render.js';
  * @param tokens
  */
 function evaluate(tokens) {
-    const nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+    let nodes;
+    try {
+        nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
+    }
+    catch (e) {
+        // console.error({tokens});
+        // console.error(e);
+        return tokens;
+    }
     if (nodes.length <= 1) {
         return nodes;
     }

package/dist/lib/ast/minify.js

@@ -14,7 +14,7 @@ const notEndingWith = ['(', '['].concat(combinators);
 const features = Object.values(index).sort((a, b) => a.ordering - b.ordering);
 function minify(ast, options = {}, recursive = false, errors, nestingContent, context = {}) {
     if (!('nodes' in context)) {
-        context.nodes = new WeakSet;
+        context.nodes = new Set;
     }
     if (context.nodes.has(ast)) {
         return ast;
@@ -43,7 +43,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                 curr.splice(0, 2);
             }
             else if (combinators.includes(curr[1])) {
-                curr.splice(0, 1);
+                curr.shift();
             }
         }
         else if (ast.typ == EnumToken.RuleNodeType && (isIdent(curr[0]) || isFunction(curr[0]))) {
@@ -245,7 +245,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                         }
                         if (shouldMerge) {
                             // @ts-ignore
-                            if ((node.typ == EnumToken.RuleNodeType && node.sel == previous.sel) ||
+                            if (((node.typ == EnumToken.RuleNodeType || node.typ == EnumToken.KeyFrameRuleNodeType) && node.sel == previous.sel) ||
                                 // @ts-ignore
                                 (node.typ == EnumToken.AtRuleNodeType) && node.val != 'font-face' && node.val == previous.val) {
                                 // @ts-ignore
@@ -264,32 +264,33 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
                                 nodeIndex = i;
                                 continue;
                             }
-                            else if (node.typ == EnumToken.RuleNodeType && previous?.typ == EnumToken.RuleNodeType) {
+                            else if (node.typ == previous?.typ && [EnumToken.KeyFrameRuleNodeType, EnumToken.RuleNodeType].includes(node.typ)) {
                                 const intersect = diff(previous, node, reducer, options);
                                 if (intersect != null) {
                                     if (intersect.node1.chi.length == 0) {
                                         // @ts-ignore
                                         ast.chi.splice(i--, 1);
                                         // @ts-ignore
-                                        node = ast.chi[i];
+                                        // node = ast.chi[i];
                                     }
                                     else {
                                         // @ts-ignore
                                         ast.chi.splice(i, 1, intersect.node1);
-                                        node = intersect.node1;
+                                        // node = ast.chi intersect.node1;
                                     }
                                     if (intersect.node2.chi.length == 0) {
                                         // @ts-ignore
                                         ast.chi.splice(nodeIndex, 1, intersect.result);
-                                        previous = intersect.result;
                                     }
                                     else {
                                         // @ts-ignore
                                         ast.chi.splice(nodeIndex, 1, intersect.result, intersect.node2);
-                                        previous = intersect.result;
                                         // @ts-ignore
-                                        i = nodeIndex;
+                                        i = (nodeIndex ?? 0) + 1;
                                     }
+                                    reduceRuleSelector(intersect.result);
+                                    previous = intersect.result;
+                                    nodeIndex = i;
                                 }
                             }
                         }
@@ -419,11 +420,16 @@ function reduceSelector(selector) {
     // combinator
     if (combinators.includes(optimized.at(-1))) {
         const combinator = optimized.pop();
-        selector.forEach(selector => selector.unshift(combinator));
+        selector.forEach((selector) => selector.unshift(combinator));
     }
     let reducible = optimized.length == 1;
-    if (optimized[0] == '&' && optimized[1] == ' ') {
-        optimized.splice(0, 2);
+    if (optimized[0] == '&') {
+        if (optimized[1] == ' ') {
+            optimized.splice(0, 2);
+        }
+        // else if (combinators.includes(optimized[1])) {
+        //
+        // }
     }
     if (optimized.length == 0 ||
         (optimized[0].charAt(0) == '&' ||
@@ -431,7 +437,7 @@ function reduceSelector(selector) {
         return {
             match: false,
             optimized,
-            selector: selector.map(selector => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : selector),
+            selector: selector.map((selector) => selector[0] == '&' && selector[1] == ' ' ? selector.slice(2) : (selector)),
             reducible: selector.length > 1 && selector.every((selector) => !combinators.includes(selector[0]))
         };
     }
@@ -511,6 +517,18 @@ function splitRule(buffer) {
             result.push([]);
             continue;
         }
+        if (chr == ':') {
+            if (str !== '') {
+                // @ts-ignore
+                result.at(-1).push(str);
+                str = '';
+            }
+            if (buffer.charAt(i + 1) == ':') {
+                chr += buffer.charAt(++i);
+            }
+            str += chr;
+            continue;
+        }
         str += chr;
         if (chr == '\\') {
             str += buffer.charAt(++i);
@@ -812,6 +830,52 @@ function diff(n1, n2, reducer, options = {}) {
     const raw1 = node1.raw;
     // @ts-ignore
     const raw2 = node2.raw;
+    if (raw1 != null && raw2 != null) {
+        const prefixes1 = new Set;
+        const prefixes2 = new Set;
+        for (const token1 of raw1) {
+            for (const t of token1) {
+                if (t[0] == ':') {
+                    const matches = t.match(/::?-([a-z]+)-/);
+                    if (matches == null) {
+                        continue;
+                    }
+                    prefixes1.add(matches[1]);
+                    if (prefixes1.size > 1) {
+                        break;
+                    }
+                }
+            }
+            if (prefixes1.size > 1) {
+                break;
+            }
+        }
+        for (const token2 of raw2) {
+            for (const t of token2) {
+                if (t[0] == ':') {
+                    const matches = t.match(/::?-([a-z]+)-/);
+                    if (matches == null) {
+                        continue;
+                    }
+                    prefixes2.add(matches[1]);
+                    if (prefixes2.size > 1) {
+                        break;
+                    }
+                }
+            }
+            if (prefixes2.size > 1) {
+                break;
+            }
+        }
+        if (prefixes1.size != prefixes2.size) {
+            return null;
+        }
+        for (const prefix of prefixes1) {
+            if (!prefixes2.has(prefix)) {
+                return null;
+            }
+        }
+    }
     // @ts-ignore
     node1 = { ...node1, chi: node1.chi.slice() };
     node2 = { ...node2, chi: node2.chi.slice() };
@@ -848,7 +912,7 @@ function diff(n1, n2, reducer, options = {}) {
     const result = (intersect.length == 0 ? null : {
         ...node1,
         // @ts-ignore
-        sel: [...new Set([...(n1?.raw?.reduce(reducer, []) || splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) || splitRule(n2.sel))])].join(','),
+        sel: [...new Set([...(n1?.raw?.reduce(reducer, []) ?? splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) ?? splitRule(n2.sel))])].join(','),
         chi: intersect.reverse()
     });
     if (result == null || [n1, n2].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0) <= [node1, node2, result].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + doRender(curr, options).code.length, 0)) {
@@ -872,6 +936,11 @@ function reduceRuleSelector(node) {
         Object.defineProperty(node, 'optimized', { ...definedPropertySettings, value: optimized });
     }
     if (optimized != null && optimized.match && optimized.reducible && optimized.selector.length > 1) {
+        for (const selector of optimized.selector) {
+            if (selector.length > 1 && selector[0] == '&' && combinators.includes(selector[1])) {
+                selector.shift();
+            }
+        }
         const raw = [
             [
                 optimized.optimized[0], ':is('

package/dist/lib/ast/types.js

@@ -75,6 +75,7 @@ var EnumToken;
     EnumToken[EnumToken["FractionTokenType"] = 69] = "FractionTokenType";
     EnumToken[EnumToken["IdenListTokenType"] = 70] = "IdenListTokenType";
     EnumToken[EnumToken["GridTemplateFuncTokenType"] = 71] = "GridTemplateFuncTokenType";
+    EnumToken[EnumToken["KeyFrameRuleNodeType"] = 72] = "KeyFrameRuleNodeType";
     /* aliases */
     EnumToken[EnumToken["Time"] = 25] = "Time";
     EnumToken[EnumToken["Iden"] = 7] = "Iden";

package/dist/lib/parser/parse.js

@@ -346,12 +346,16 @@ async function parseNode(results, context, stats, options, errors, src, map) {
         }
         if (atRule.val == 'import') {
             // @ts-ignore
-            if (tokens[0].typ == EnumToken.UrlFunctionTokenType && tokens[1].typ == EnumToken.UrlTokenTokenType) {
-                tokens.shift();
-                // @ts-ignore
-                tokens[0].typ = EnumToken.StringTokenType;
-                // @ts-ignore
-                tokens[0].val = `"${tokens[0].val}"`;
+            if (tokens[0].typ == EnumToken.UrlFunctionTokenType) {
+                if (tokens[1].typ == EnumToken.UrlTokenTokenType || tokens[1].typ == EnumToken.StringTokenType) {
+                    tokens.shift();
+                    if (tokens[1].typ == EnumToken.UrlTokenTokenType) {
+                        // @ts-ignore
+                        tokens[0].typ = EnumToken.StringTokenType;
+                        // @ts-ignore
+                        tokens[0].val = `"${tokens[0].val}"`;
+                    }
+                }
             }
             // @ts-ignore
             if (tokens[0].typ == EnumToken.StringTokenType) {
@@ -417,6 +421,9 @@ async function parseNode(results, context, stats, options, errors, src, map) {
             const position = map.get(tokens[0]);
             const uniq = new Map;
             parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
+                if (curr.typ == EnumToken.CommentTokenType) {
+                    return acc;
+                }
                 if (curr.typ == EnumToken.WhitespaceTokenType) {
                     if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                         trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -438,7 +445,7 @@ async function parseNode(results, context, stats, options, errors, src, map) {
                 return acc;
             }, uniq);
             const node = {
-                typ: EnumToken.RuleNodeType,
+                typ: context.typ == EnumToken.AtRuleNodeType && context.nam == 'keyframes' ? EnumToken.KeyFrameRuleNodeType : EnumToken.RuleNodeType,
                 // @ts-ignore
                 sel: [...uniq.keys()].join(','),
                 chi: []

package/dist/lib/renderer/render.js

@@ -98,7 +98,7 @@ function doRender(data, options = {}) {
     return result;
 }
 function updateSourceMap(node, options, cache, sourcemap, position, str) {
-    if ([EnumToken.RuleNodeType, EnumToken.AtRuleNodeType].includes(node.typ)) {
+    if ([EnumToken.RuleNodeType, EnumToken.AtRuleNodeType, EnumToken.KeyFrameRuleNodeType].includes(node.typ)) {
         let src = node.loc?.src ?? '';
         let output = options.output ?? '';
         if (!(src in cache)) {
@@ -158,6 +158,7 @@ function renderAstNode(data, options, sourcemap, position, errors, reducer, cach
             }, '');
         case EnumToken.AtRuleNodeType:
         case EnumToken.RuleNodeType:
+        case EnumToken.KeyFrameRuleNodeType:
             if (data.typ == EnumToken.AtRuleNodeType && !('chi' in data)) {
                 return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
             }

package/dist/web/load.js

@@ -7,16 +7,18 @@ function parseResponse(response) {
     return response.text();
 }
 async function load(url, currentFile) {
+    let t;
     if (matchUrl.test(url)) {
-        return fetch(url).then(parseResponse);
+        t = new URL(url);
     }
-    if (matchUrl.test(currentFile)) {
-        return fetch(new URL(url, currentFile)).then(parseResponse);
+    else if (matchUrl.test(currentFile)) {
+        t = new URL(url, currentFile);
     }
-    const path = resolve(url, currentFile).absolute;
-    const t = new URL(path, self.origin);
-    // return fetch(new URL(url, new URL(currentFile, self.location.href).href)).then(parseResponse);
-    return fetch(url, t.origin != self.location.origin ? { mode: 'cors' } : {}).then(parseResponse);
+    else {
+        const path = resolve(url, currentFile).absolute;
+        t = new URL(path, self.origin);
+    }
+    return fetch(t, t.origin != self.origin ? { mode: 'cors' } : {}).then(parseResponse);
 }
 
 export { load };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "exports": {
     ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",
@@ -10,6 +10,9 @@
   },
   "type": "module",
   "typings": "dist/index.d.ts",
+  "directories": {
+    "test": "test"
+  },
   "scripts": {
     "build": "rollup -c;./build.sh dist/index.d.ts 'declare interface' 'declare type'",
     "test": "web-test-runner \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' \"test/**/node.spec.js\"",