@tbela99/css-parser 0.0.1-rc3 → 0.0.1-rc4

package/dist/lib/parser/parse.js

@@ -5,6 +5,7 @@ import { minify, combinators } from '../ast/minify.js';
 import { tokenize } from './tokenize.js';
 
 const urlTokenMatcher = /^(["']?)[a-zA-Z0-9_/.-][a-zA-Z0-9_/:.#?-]+(\1)$/;
+const trimWhiteSpace = ['Gt', 'Gte', 'Lt', 'Lte'];
 const funcLike = ['Start-parens', 'Func', 'UrlFunc', 'Pseudo-class-func'];
 /**
  *
@@ -51,6 +52,10 @@ async function parse(iterator, opt = {}) {
         let tokens = results.map(mapToken);
         let i;
         let loc;
+        // if ((<Token>tokens.at(-1))?.typ == 'EOF') {
+        //
+        //     tokens.pop();
+        // }
         for (i = 0; i < tokens.length; i++) {
             if (tokens[i].typ == 'Comment') {
                 // @ts-ignore
@@ -169,7 +174,7 @@ async function parse(iterator, opt = {}) {
             // https://www.w3.org/TR/css-nesting-1/#conditionals
             // allowed nesting at-rules
             // there must be a top level rule in the stack
-            const raw = tokens.reduce((acc, curr) => {
+            const raw = parseTokens(tokens, { minify: options.minify }).reduce((acc, curr) => {
                 acc.push(renderToken(curr, { removeComments: true }));
                 return acc;
             }, []);
@@ -200,8 +205,8 @@ async function parse(iterator, opt = {}) {
                 const uniq = new Map;
                 parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
-                        if (array[index - 1]?.typ == 'Gt' ||
-                            array[index + 1]?.typ == 'Gt' ||
+                        if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
+                            trimWhiteSpace.includes(array[index + 1]?.typ) ||
                             combinators.includes(array[index - 1]?.val) ||
                             combinators.includes(array[index + 1]?.val)) {
                             return acc;
@@ -405,7 +410,7 @@ function getTokenType(val, hint) {
         return ([
             'Whitespace', 'Semi-colon', 'Colon', 'Block-start',
             'Block-start', 'Attr-start', 'Attr-end', 'Start-parens', 'End-parens',
-            'Comma', 'Gt', 'Lt'
+            'Comma', 'Gt', 'Lt', 'Gte', 'Lte', 'EOF'
         ].includes(hint) ? { typ: hint } : { typ: hint, val });
     }
     if (val == ' ') {
@@ -533,11 +538,12 @@ function parseTokens(tokens, options = {}) {
         const t = tokens[i];
         if (t.typ == 'Whitespace' && ((i == 0 ||
             i + 1 == tokens.length ||
-            ['Comma'].includes(tokens[i + 1].typ) ||
+            ['Comma', 'Gte', 'Lte'].includes(tokens[i + 1].typ)) ||
             (i > 0 &&
-                tokens[i + 1]?.typ != 'Literal' &&
-                funcLike.includes(tokens[i - 1].typ) &&
-                !['var', 'calc'].includes(tokens[i - 1].val))))) {
+                // tokens[i + 1]?.typ != 'Literal' ||
+                // funcLike.includes(tokens[i - 1].typ) &&
+                // !['var', 'calc'].includes((<FunctionToken>tokens[i - 1]).val)))) &&
+                trimWhiteSpace.includes(tokens[i - 1].typ)))) {
             tokens.splice(i--, 1);
             continue;
         }
@@ -654,7 +660,7 @@ function parseTokens(tokens, options = {}) {
                     let m = t.chi.length;
                     while (m-- > 0) {
                         // @ts-ignore
-                        if (t.chi[m].typ == 'Literal') {
+                        if (['Literal'].concat(trimWhiteSpace).includes(t.chi[m].typ)) {
                             // @ts-ignore
                             if (t.chi[m + 1]?.typ == 'Whitespace') {
                                 // @ts-ignore

package/dist/lib/parser/tokenize.js

@@ -36,11 +36,6 @@ function* tokenize(iterator) {
         }
         buffer += quoteStr;
         while (value = peek()) {
-            // if (ind >= iterator.length) {
-            //
-            //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-            //     break;
-            // }
             if (value == '\\') {
                 const sequence = peek(6);
                 let escapeSequence = '';
@@ -60,9 +55,23 @@ function* tokenize(iterator) {
                     }
                     break;
                 }
+                // @ts-ignore
+                if (isNewLine(codepoint)) {
+                    if (i == 1) {
+                        buffer += value + escapeSequence.slice(0, i);
+                        next(i + 1);
+                        continue;
+                    }
+                    // else {
+                    yield pushToken(buffer + value + escapeSequence.slice(0, i), 'Bad-string');
+                    buffer = '';
+                    // }
+                    next(i + 1);
+                    break;
+                }
                 // not hex or new line
                 // @ts-ignore
-                if (i == 1 && !isNewLine(codepoint)) {
+                else if (i == 1) {
                     buffer += value + sequence[i];
                     next(2);
                     continue;
@@ -82,13 +91,6 @@ function* tokenize(iterator) {
                     next(escapeSequence.length + 1);
                     continue;
                 }
-                // buffer += value;
-                // if (ind >= iterator.length) {
-                //
-                //     // drop '\\' at the end
-                //     yield pushToken(buffer);
-                //     break;
-                // }
                 buffer += next(2);
                 continue;
             }
@@ -98,20 +100,28 @@ function* tokenize(iterator) {
                 next();
                 // i += value.length;
                 buffer = '';
-                break;
+                return;
             }
             if (isNewLine(value.charCodeAt(0))) {
                 hasNewLine = true;
             }
             if (hasNewLine && value == ';') {
-                yield pushToken(buffer, 'Bad-string');
+                yield pushToken(buffer + value, 'Bad-string');
                 buffer = '';
+                next();
                 break;
             }
             buffer += value;
-            // i += value.length;
             next();
         }
+        if (hasNewLine) {
+            yield pushToken(buffer, 'Bad-string');
+        }
+        else {
+            // EOF - 'Unclosed-string' fixed
+            yield pushToken(buffer + quote, 'String');
+        }
+        buffer = '';
     }
     function peek(count = 1) {
         if (count == 1) {
@@ -225,6 +235,11 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
+                if (peek() == '=') {
+                    yield pushToken('', 'Lte');
+                    next();
+                    break;
+                }
                 buffer += value;
                 value = next();
                 if (ind >= iterator.length) {
@@ -293,7 +308,13 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
-                yield pushToken('', 'Gt');
+                if (peek() == '=') {
+                    yield pushToken('', 'Gte');
+                    next();
+                }
+                else {
+                    yield pushToken('', 'Gt');
+                }
                 consumeWhiteSpace();
                 break;
             case '.':
@@ -335,7 +356,7 @@ function* tokenize(iterator) {
                 break;
             case '(':
                 if (buffer.length == 0) {
-                    yield pushToken('', 'Start-parens');
+                    yield pushToken(value);
                     break;
                 }
                 buffer += value;
@@ -449,6 +470,7 @@ function* tokenize(iterator) {
     if (buffer.length > 0) {
         yield pushToken(buffer);
     }
+    // yield pushToken('', 'EOF');
 }
 
 export { tokenize };

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

@@ -159,37 +159,30 @@ function isNumber(name) {
     return true;
 }
 function isDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    if (index == 0 || index > 3) {
-        return false;
-    }
-    const number = name.slice(0, -index);
-    return number.length > 0 && isIdentStart(name.charCodeAt(name.length - index)) && isNumber(number);
+    const number = name.slice(0, index);
+    return number.length > 0 && isIdentStart(name.charCodeAt(index)) && isNumber(number);
 }
 function isPercentage(name) {
     return name.endsWith('%') && isNumber(name.slice(0, -1));
 }
 function parseDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    const dimension = { typ: 'Dimension', val: name.slice(0, -index), unit: name.slice(-index) };
+    const dimension = { typ: 'Dimension', val: name.slice(0, index), unit: name.slice(index) };
     if (isAngle(dimension)) {
         // @ts-ignore
         dimension.typ = 'Angle';

package/dist/lib/renderer/render.js

@@ -1,5 +1,22 @@
-import { COLORS_NAMES, rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex, NAMES_COLORS } from './utils/color.js';
+import { getAngle, COLORS_NAMES, rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex, NAMES_COLORS } from './utils/color.js';
 
+function reduceNumber(val) {
+    val = (+val).toString();
+    if (val === '0') {
+        return '0';
+    }
+    const chr = val.charAt(0);
+    if (chr == '-') {
+        const slice = val.slice(0, 2);
+        if (slice == '-0') {
+            return val.length == 2 ? '0' : '-' + val.slice(2);
+        }
+    }
+    if (chr == '0') {
+        return val.slice(1);
+    }
+    return val;
+}
 function render(data, opt = {}) {
     const startTime = performance.now();
     const options = Object.assign(opt.minify ?? true ? {
@@ -12,17 +29,19 @@ function render(data, opt = {}) {
         compress: false,
         removeComments: false,
     }, { colorConvert: true, preserveLicense: false }, opt);
-    function reducer(acc, curr, index, original) {
-        if (curr.typ == 'Comment' && options.removeComments) {
-            if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
-                return acc;
+    return {
+        code: doRender(data, options, function reducer(acc, curr) {
+            if (curr.typ == 'Comment' && options.removeComments) {
+                if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
+                    return acc;
+                }
+                return acc + curr.val;
             }
-        }
-        return acc + renderToken(curr, options);
-    }
-    return { code: doRender(data, options, reducer, 0), stats: {
+            return acc + renderToken(curr, options, reducer);
+        }, 0), stats: {
             total: `${(performance.now() - startTime).toFixed(2)}ms`
-        } };
+        }
+    };
 }
 // @ts-ignore
 function doRender(data, options, reducer, level = 0, indents = []) {
@@ -36,9 +55,9 @@ function doRender(data, options, reducer, level = 0, indents = []) {
     const indentSub = indents[level + 1];
     switch (data.typ) {
         case 'Declaration':
-            return `${data.nam}:${options.indent}${data.val.reduce((acc, curr) => acc + renderToken(curr), '')}`;
+            return `${data.nam}:${options.indent}${data.val.reduce(reducer, '')}`;
         case 'Comment':
-            return options.removeComments ? '' : data.val;
+            return !options.removeComments || (options.preserveLicense && data.val.startsWith('/*!')) ? data.val : '';
         case 'StyleSheet':
             return data.chi.reduce((css, node) => {
                 const str = doRender(node, options, reducer, level, indents);
@@ -59,7 +78,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
             let children = data.chi.reduce((css, node) => {
                 let str;
                 if (node.typ == 'Comment') {
-                    str = options.removeComments ? '' : node.val;
+                    str = options.removeComments && (!options.preserveLicense || !node.val.startsWith('/*!')) ? '' : node.val;
                 }
                 else if (node.typ == 'Declaration') {
                     if (node.val.length == 0) {
@@ -92,7 +111,18 @@ function doRender(data, options, reducer, level = 0, indents = []) {
     }
     return '';
 }
-function renderToken(token, options = {}) {
+function renderToken(token, options = {}, reducer) {
+    if (reducer == null) {
+        reducer = function (acc, curr) {
+            if (curr.typ == 'Comment' && options.removeComments) {
+                if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
+                    return acc;
+                }
+                return acc + curr.val;
+            }
+            return acc + renderToken(curr, options, reducer);
+        };
+    }
     switch (token.typ) {
         case 'Color':
             if (options.minify || options.colorConvert) {
@@ -143,22 +173,19 @@ function renderToken(token, options = {}) {
         case 'UrlFunc':
         case 'Pseudo-class-func':
             // @ts-ignore
-            return ( /* options.minify && 'Pseudo-class-func' == token.typ && token.val.slice(0, 2) == '::' ? token.val.slice(1) :*/token.val ?? '') + '(' + token.chi.reduce((acc, curr) => {
-                if (options.removeComments && curr.typ == 'Comment') {
-                    if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
-                        return acc;
-                    }
-                }
-                return acc + renderToken(curr, options);
-            }, '') + ')';
+            return ( /* options.minify && 'Pseudo-class-func' == token.typ && token.val.slice(0, 2) == '::' ? token.val.slice(1) :*/token.val ?? '') + '(' + token.chi.reduce(reducer, '') + ')';
         case 'Includes':
             return '~=';
         case 'Dash-match':
             return '|=';
         case 'Lt':
             return '<';
+        case 'Lte':
+            return '<=';
         case 'Gt':
             return '>';
+        case 'Gte':
+            return '>=';
         case 'End-parens':
             return ')';
         case 'Attr-start':
@@ -176,37 +203,73 @@ function renderToken(token, options = {}) {
         case 'Important':
             return '!important';
         case 'Attr':
-            return '[' + token.chi.reduce((acc, curr) => acc + renderToken(curr, options), '') + ']';
+            return '[' + token.chi.reduce(reducer, '') + ']';
         case 'Time':
-        case 'Frequency':
         case 'Angle':
         case 'Length':
         case 'Dimension':
-            const val = (+token.val).toString();
+        case 'Frequency':
+        case 'Resolution':
+            let val = reduceNumber(token.val);
+            let unit = token.unit;
+            if (token.typ == 'Angle') {
+                const angle = getAngle(token);
+                let v;
+                let value = val + unit;
+                for (const u of ['turn', 'deg', 'rad', 'grad']) {
+                    if (token.unit == u) {
+                        continue;
+                    }
+                    switch (u) {
+                        case 'turn':
+                            v = reduceNumber(angle);
+                            if (v.length + 4 < value.length) {
+                                val = v;
+                                unit = u;
+                                value = v + u;
+                            }
+                            break;
+                        case 'deg':
+                            v = reduceNumber(angle * 360);
+                            if (v.length + 3 < value.length) {
+                                val = v;
+                                unit = u;
+                                value = v + u;
+                            }
+                            break;
+                        case 'rad':
+                            v = reduceNumber(angle * (2 * Math.PI));
+                            if (v.length + 3 < value.length) {
+                                val = v;
+                                unit = u;
+                                value = v + u;
+                            }
+                            break;
+                        case 'grad':
+                            v = reduceNumber(angle * 400);
+                            if (v.length + 4 < value.length) {
+                                val = v;
+                                unit = u;
+                                value = v + u;
+                            }
+                            break;
+                    }
+                }
+            }
             if (val === '0') {
-                if (token.typ == 'Time') {
+                if (unit == 'Time') {
                     return '0s';
                 }
-                if (token.typ == 'Frequency') {
+                if (unit == 'Frequency') {
                     return '0Hz';
                 }
                 // @ts-ignore
-                if (token.typ == 'Resolution') {
+                if (unit == 'Resolution') {
                     return '0x';
                 }
                 return '0';
             }
-            const chr = val.charAt(0);
-            if (chr == '-') {
-                const slice = val.slice(0, 2);
-                if (slice == '-0') {
-                    return (val.length == 2 ? '0' : '-' + val.slice(2)) + token.unit;
-                }
-            }
-            else if (chr == '0') {
-                return val.slice(1) + token.unit;
-            }
-            return val + token.unit;
+            return val + unit;
         case 'Perc':
             return token.val + '%';
         case 'Number':
@@ -223,7 +286,7 @@ function renderToken(token, options = {}) {
             }
             return num;
         case 'Comment':
-            if (options.removeComments) {
+            if (options.removeComments && (!options.preserveLicense || !token.val.startsWith('/*!'))) {
                 return '';
             }
         case 'Url-token':

package/dist/lib/renderer/utils/color.js

@@ -418,7 +418,7 @@ function cmyk2hex(token) {
     return `#${rgb.reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
 }
 function getAngle(token) {
-    if (token.typ == 'Dimension') {
+    if (token.typ == 'Angle') {
         switch (token.unit) {
             case 'deg':
                 // @ts-ignore
@@ -491,4 +491,4 @@ function hsl2rgb(h, s, l, a = null) {
     return values;
 }
 
-export { COLORS_NAMES, NAMES_COLORS, cmyk2hex, hsl2Hex, hwb2hex, rgb2Hex };
+export { COLORS_NAMES, NAMES_COLORS, cmyk2hex, getAngle, hsl2Hex, hwb2hex, rgb2Hex };

package/dist/node/index.js

@@ -1,7 +1,13 @@
 import { parse as parse$1 } from '../lib/parser/parse.js';
 export { parseString, urlTokenMatcher } from '../lib/parser/parse.js';
-import '../lib/renderer/utils/color.js';
+export { tokenize } from '../lib/parser/tokenize.js';
+export { isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension } from '../lib/parser/utils/syntax.js';
+export { getConfig } from '../lib/parser/utils/config.js';
+export { matchType } from '../lib/parser/utils/type.js';
+export { render, renderToken } from '../lib/renderer/render.js';
 import { transform as transform$1 } from '../lib/transform.js';
+export { combinators, hasDeclaration, minify, minifyRule, reduceSelector } from '../lib/ast/minify.js';
+export { walk } from '../lib/ast/walk.js';
 import { load } from './load.js';
 import { resolve } from '../lib/fs/resolve.js';
 export { dirname, matchUrl } from '../lib/fs/resolve.js';

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.0.1-rc3",
+  "version": "0.0.1-rc4",
   "exports": {
-    ".": "./dist/index.js",
+    ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",
     "./web": "./dist/web/index.js",
     "./cjs": "./dist/index.cjs"
@@ -24,14 +24,16 @@
   "keywords": [
     "parser",
     "css",
-    "css parser",
     "css-parser",
     "node",
     "ast",
+    "nesting",
+    "nested",
+    "compiler",
     "browser",
-    "css nesting",
-    "css compiler",
-    "nested css"
+    "css-nesting",
+    "css-compiler",
+    "nested-css"
   ],
   "author": "Thierry Bela",
   "license": "MIT OR LGPL-3.0",
@@ -44,7 +46,6 @@
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.1.2",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",

package/dist/index.js

@@ -1,11 +0,0 @@
-export { parse, transform } from './node/index.js';
-export { parseString, urlTokenMatcher } from './lib/parser/parse.js';
-export { tokenize } from './lib/parser/tokenize.js';
-export { isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension } from './lib/parser/utils/syntax.js';
-export { getConfig } from './lib/parser/utils/config.js';
-export { matchType } from './lib/parser/utils/type.js';
-export { render, renderToken } from './lib/renderer/render.js';
-export { combinators, hasDeclaration, minify, minifyRule, reduceSelector } from './lib/ast/minify.js';
-export { walk } from './lib/ast/walk.js';
-export { load } from './node/load.js';
-export { dirname, matchUrl, resolve } from './lib/fs/resolve.js';