@tbela99/css-parser 0.0.1-rc6 → 0.0.1

package/dist/lib/ast/minify.js

@@ -1,13 +1,15 @@
 import { isIdentStart, isWhiteSpace, isIdent, isFunction } from '../parser/utils/syntax.js';
 import { PropertyList } from '../parser/declaration/list.js';
 import { eq } from '../parser/utils/eq.js';
-import { render } from '../renderer/render.js';
-import '../renderer/utils/color.js';
+import { render, renderToken } from '../renderer/render.js';
+import { parseString } from '../parser/parse.js';
+import { replaceCompound } from './expand.js';
+import { walkValues } from './walk.js';
 
 const combinators = ['+', '>', '~'];
 const notEndingWith = ['(', '['].concat(combinators);
 const definedPropertySettings = { configurable: true, enumerable: false, writable: true };
-function minify(ast, options = {}, recursive = false, errors) {
+function minify(ast, options = {}, recursive = false, errors, nestingContent) {
     function wrapNodes(previous, node, match, ast, i, nodeIndex) {
         // @ts-ignore
         let pSel = match.selector1.reduce(reducer, []).join(',');
@@ -296,8 +298,28 @@ function minify(ast, options = {}, recursive = false, errors) {
             selector2
         };
     }
+    function fixSelector(node) {
+        // @ts-ignore
+        if (node.sel.includes('&')) {
+            const attributes = parseString(node.sel);
+            for (const attr of walkValues(attributes)) {
+                if (attr.value.typ == 'Pseudo-class-func' && attr.value.val == ':is') {
+                    let i = attr.value.chi.length;
+                    while (i--) {
+                        if (attr.value.chi[i].typ == 'Literal' && attr.value.chi[i].val == '&') {
+                            attr.value.chi.splice(i, 1);
+                        }
+                    }
+                }
+            }
+            node.sel = attributes.reduce((acc, curr) => acc + renderToken(curr), '');
+        }
+    }
     // @ts-ignore
     if (('chi' in ast) && ast.chi?.length > 0) {
+        if (!nestingContent) {
+            nestingContent = options.nestingRules && ast.typ == 'Rule';
+        }
         let i = 0;
         let previous;
         let node;
@@ -312,7 +334,6 @@ function minify(ast, options = {}, recursive = false, errors) {
             node = ast.chi[i];
             // @ts-ignore
             if (previous == node) {
-                // console.error('idem!');
                 // @ts-ignore
                 ast.chi.splice(i, 1);
                 i--;
@@ -328,7 +349,6 @@ function minify(ast, options = {}, recursive = false, errors) {
                     i--;
                     continue;
                 }
-                // console.debug({previous, node});
                 // @ts-ignore
                 if (previous?.typ == 'AtRule' &&
                     previous.nam == node.nam &&
@@ -348,7 +368,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                     minifyRule(node);
                 }
                 else {
-                    minify(node, options, recursive, errors);
+                    minify(node, options, recursive, errors, nestingContent);
                 }
                 previous = node;
                 nodeIndex = i;
@@ -402,7 +422,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                         nodeIndex = --i;
                         // @ts-ignore
                         previous = ast.chi[nodeIndex];
-                        minify(wrapper, options, recursive, errors);
+                        minify(wrapper, options, recursive, errors, nestingContent);
                         continue;
                     }
                     // @ts-ignore
@@ -435,7 +455,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                     let wrap = true;
                     // @ts-ignore
                     const selector = node.optimized.selector.reduce((acc, curr) => {
-                        if (curr[0] == '&') {
+                        if (curr[0] == '&' && curr.length > 1) {
                             if (curr[1] == ' ') {
                                 curr.splice(0, 2);
                             }
@@ -459,7 +479,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                     if (!wrap) {
                         wrap = selector.some(s => s[0] != '&');
                     }
-                    const rule = selector.map(s => {
+                    let rule = selector.map(s => {
                         if (s[0] == '&') {
                             // @ts-ignore
                             s[0] = node.optimized.optimized[0];
@@ -467,7 +487,14 @@ function minify(ast, options = {}, recursive = false, errors) {
                         return s.join('');
                     }).join(',');
                     // @ts-ignore
-                    node.sel = wrap ? node.optimized.optimized[0] + `:is(${rule})` : rule;
+                    let sel = wrap ? node.optimized.optimized[0] + `:is(${rule})` : rule;
+                    if (rule.includes('&')) {
+                        // @ts-ignore
+                        rule = replaceCompound(rule, node.optimized.optimized[0]);
+                    }
+                    if (sel.length < node.sel.length) {
+                        node.sel = sel;
+                    }
                 }
             }
             // @ts-ignore
@@ -503,7 +530,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                                     minifyRule(node);
                                 }
                                 else {
-                                    minify(node, options, recursive, errors);
+                                    minify(node, options, recursive, errors, nestingContent);
                                 }
                                 i--;
                                 previous = node;
@@ -548,7 +575,7 @@ function minify(ast, options = {}, recursive = false, errors) {
                             minifyRule(previous);
                         }
                         else {
-                            minify(previous, options, recursive, errors);
+                            minify(previous, options, recursive, errors, nestingContent);
                         }
                     }
                 }
@@ -560,11 +587,19 @@ function minify(ast, options = {}, recursive = false, errors) {
                             minifyRule(previous);
                         }
                         else {
-                            minify(previous, options, recursive, errors);
+                            minify(previous, options, recursive, errors, nestingContent);
                         }
                     }
                 }
             }
+            if (!nestingContent &&
+                // @ts-ignore
+                previous != null &&
+                // previous.optimized != null &&
+                previous.typ == 'Rule' &&
+                previous.sel.includes('&')) {
+                fixSelector(previous);
+            }
             previous = node;
             nodeIndex = i;
         }
@@ -577,10 +612,18 @@ function minify(ast, options = {}, recursive = false, errors) {
             else {
                 // @ts-ignore
                 if (!(node.typ == 'AtRule' && node.nam != 'font-face')) {
-                    minify(node, options, recursive, errors);
+                    minify(node, options, recursive, errors, nestingContent);
                 }
             }
         }
+        if (!nestingContent &&
+            // @ts-ignore
+            node != null &&
+            // previous.optimized != null &&
+            node.typ == 'Rule' &&
+            node.sel.includes('&')) {
+            fixSelector(node);
+        }
     }
     return ast;
 }
@@ -819,7 +862,6 @@ function reduceRuleSelector(node) {
             Object.defineProperty(node, 'raw', { ...definedPropertySettings, value: raw });
         }
     }
-    // }
 }
 
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector, splitRule };

package/dist/lib/ast/walk.js

@@ -1,12 +1,8 @@
-function* walk(node) {
-    // @ts-ignore
-    yield* doWalk(node, null, null);
-}
-function* doWalk(node, parent, root) {
+function* walk(node, parent, root) {
     yield { node, parent, root };
     if ('chi' in node) {
         for (const child of node.chi) {
-            yield* doWalk(child, node, (root ?? node));
+            yield* walk(child, node, (root ?? node));
         }
     }
 }

package/dist/lib/parser/parse.js

@@ -204,7 +204,7 @@ async function parse(iterator, opt = {}) {
             if (delim.typ == 'Block-start') {
                 const position = map.get(tokens[0]);
                 const uniq = new Map;
-                parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
+                parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
                         if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                             trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -213,7 +213,7 @@ async function parse(iterator, opt = {}) {
                             return acc;
                         }
                     }
-                    let t = renderToken(curr, { minify: true });
+                    let t = renderToken(curr, { minify: false });
                     if (t == ',') {
                         acc.push([]);
                     }

package/dist/lib/parser/tokenize.js

@@ -121,12 +121,16 @@ function* tokenize(iterator) {
     }
     function next(count = 1) {
         let char = '';
-        while (count-- > 0 && ind < iterator.length) {
+        let chr = '';
+        if (count < 0) {
+            return '';
+        }
+        while (count-- && (chr = iterator.charAt(ind + 1))) {
+            char += chr;
             const codepoint = iterator.charCodeAt(++ind);
             if (isNaN(codepoint)) {
                 return char;
             }
-            char += iterator.charAt(ind);
             if (isNewLine(codepoint)) {
                 lin++;
                 col = 0;

package/dist/lib/parser/utils/eq.js

@@ -27,7 +27,7 @@ function eq(a, b) {
     }
     let key;
     for (key of k1) {
-        if (!eq(a[key], b[key])) {
+        if (!(key in b) || !eq(a[key], b[key])) {
             return false;
         }
     }

package/dist/lib/parser/utils/syntax.js

@@ -37,7 +37,7 @@ function isColor(token) {
     if (token.typ == 'Func' && token.chi.length > 0 && colorsFunc.includes(token.val)) {
         // @ts-ignore
         for (const v of token.chi) {
-            if (!['Number', 'Perc', 'Comma', 'Whitespace'].includes(v.typ)) {
+            if (!['Number', 'Angle', 'Perc', 'Comma', 'Whitespace', 'Literal'].includes(v.typ)) {
                 return false;
             }
         }

package/dist/lib/renderer/render.js

@@ -276,7 +276,8 @@ function renderToken(token, options = {}, reducer, errors) {
             }
             return val + unit;
         case 'Perc':
-            return token.val + '%';
+            const perc = reduceNumber(token.val);
+            return options.minify && perc == '0' ? '0' : perc + '%';
         case 'Number':
             return reduceNumber(token.val);
         case 'Comment':

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector, splitRule } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.js';
-export { expand } from '../lib/ast/expand.js';
+export { expand, replaceCompound } from '../lib/ast/expand.js';
 export { colorsFunc, render, renderToken } from '../lib/renderer/render.js';
 import { parse as parse$1 } from '../lib/parser/parse.js';
 export { parseString, urlTokenMatcher } from '../lib/parser/parse.js';

package/dist/web/index.js

@@ -1,6 +1,6 @@
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector, splitRule } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.js';
-export { expand } from '../lib/ast/expand.js';
+export { expand, replaceCompound } from '../lib/ast/expand.js';
 export { colorsFunc, render, renderToken } from '../lib/renderer/render.js';
 import { parse as parse$1 } from '../lib/parser/parse.js';
 export { parseString, urlTokenMatcher } from '../lib/parser/parse.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.0.1-rc6",
+  "version": "0.0.1",
   "exports": {
     ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",