@tbela99/css-parser 0.0.1-rc1 → 0.0.1-rc2

package/README.md

@@ -1,4 +1,4 @@
-[![cov](https://tbela99.github.io/css-parser/badges/coverage.svg)](https://github.com/tbela99/css-parser/actions)
+[![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)
 
 # css-parser
 
@@ -12,15 +12,15 @@ $ npm install @tbela99/css-parser
 
 ### Features
 
-- [x] fault tolerant parser, will try to fix invalid tokens according to the CSS syntax module 3 recommendations.
-- [x] efficient minification, see benchmark.
-- [x] replace @import at-rules with actual css content of the imported rule
-- [x] CSS nesting: automatically create nested rules.
-- [x] works the same way in node and web browser
+- fault tolerant parser, will try to fix invalid tokens according to the CSS syntax module 3 recommendations.
+- efficient minification, see [benchmark](https://tbela99.github.io/css-parser/benchmark/index.html)
+- replace @import at-rules with actual css content of the imported rule
+- automatically create nested css rules
+- works the same way in node and web browser
 
 ### Performance
 
-- [x] flatten @import
+- flatten @import
 
 ## Transform
 
@@ -50,7 +50,7 @@ Include ParseOptions and RenderOptions
 
 - src: string, optional. css file location to be used with sourcemap.
 - minify: boolean, optional. default to _true_. optimize ast.
-- nestingRules: boolean, optional. automatically nest rules.
+- nestingRules: boolean, optional. automatically generated nested rules.
 - removeEmpty: boolean, remove empty nodes from the ast.
 - location: boolean, optional. includes node location in the ast, required for sourcemap generation.
 - cwd: string, optional. the current working directory. when specified url() are resolved using this value
@@ -188,4 +188,4 @@ Single JavaScript file
 ### AtRuleStyleSheet
 
 - typ: string 'Stylesheet'
-- chi: array of children
+- chi: array of children

package/dist/index-umd-web.js

@@ -93,10 +93,7 @@
         if (name.charAt(0) != '#') {
             return false;
         }
-        if (isIdent(name.charAt(1))) {
-            return true;
-        }
-        return true;
+        return isIdent(name.charAt(1));
     }
     function isNumber(name) {
         if (name.length == 0) {
@@ -1566,6 +1563,7 @@
     }
 
     function render(data, opt = {}) {
+        const startTime = performance.now();
         const options = Object.assign(opt.minify ?? true ? {
             indent: '',
             newLine: '',
@@ -1584,7 +1582,9 @@
             }
             return acc + renderToken(curr, options);
         }
-        return { code: doRender(data, options, reducer, 0) };
+        return { code: doRender(data, options, reducer, 0), stats: {
+                total: `${(performance.now() - startTime).toFixed(2)}ms`
+            } };
     }
     // @ts-ignore
     function doRender(data, options, reducer, level = 0, indents = []) {
@@ -1613,7 +1613,7 @@
             case 'AtRule':
             case 'Rule':
                 if (data.typ == 'AtRule' && !('chi' in data)) {
-                    return `${indent}@${data.nam} ${data.val};`;
+                    return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                 }
                 // @ts-ignore
                 let children = data.chi.reduce((css, node) => {
@@ -1625,7 +1625,7 @@
                         str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                     }
                     else if (node.typ == 'AtRule' && !('chi' in node)) {
-                        str = `@${node.nam} ${node.val};`;
+                        str = `${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                     }
                     else {
                         str = doRender(node, options, reducer, level + 1, indents);
@@ -1642,7 +1642,7 @@
                     children = children.slice(0, -1);
                 }
                 if (data.typ == 'AtRule') {
-                    return `@${data.nam}${data.val ? ' ' + data.val + options.indent : ''}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
+                    return `@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val}${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
                 }
                 return data.sel + `${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
         }
@@ -1792,7 +1792,9 @@
             case 'Delim':
                 return /* options.minify && 'Pseudo-class' == token.typ && '::' == token.val.slice(0, 2) ? token.val.slice(1) :  */ token.val;
         }
-        throw new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+        console.error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+        // throw  new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+        return '';
     }
 
     function eq(a, b) {
@@ -2581,7 +2583,7 @@
                 // @ts-ignore
                 return null;
             }
-            return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node2 : node2 };
+            return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node1 : node2 };
         }
         function matchSelectors(selector1, selector2, parentType) {
             let match = [[]];
@@ -2769,11 +2771,27 @@
                 if (node.typ == 'AtRule' && node.nam == 'font-face') {
                     continue;
                 }
-                if (node.typ == 'AtRule' && node.val == 'all') {
+                if (node.typ == 'AtRule') {
+                    if (node.nam == 'media' && node.val == 'all') {
+                        // @ts-ignore
+                        ast.chi?.splice(i, 1, ...node.chi);
+                        i--;
+                        continue;
+                    }
+                    // console.debug({previous, node});
                     // @ts-ignore
-                    ast.chi?.splice(i, 1, ...node.chi);
-                    i--;
-                    continue;
+                    if (previous?.typ == 'AtRule' &&
+                        previous.nam == node.nam &&
+                        previous.val == node.val) {
+                        if ('chi' in node) {
+                            // @ts-ignore
+                            previous.chi.push(...node.chi);
+                        }
+                        // else {
+                        ast?.chi?.splice(i--, 1);
+                        continue;
+                        // }
+                    }
                 }
                 // @ts-ignore
                 if (node.typ == 'Rule') {
@@ -3288,10 +3306,11 @@
             }
             buffer += quoteStr;
             while (value = peek()) {
-                if (ind >= iterator.length) {
-                    yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-                    break;
-                }
+                // if (ind >= iterator.length) {
+                //
+                //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
+                //     break;
+                // }
                 if (value == '\\') {
                     const sequence = peek(6);
                     let escapeSequence = '';
@@ -3314,7 +3333,7 @@
                     // not hex or new line
                     // @ts-ignore
                     if (i == 1 && !isNewLine(codepoint)) {
-                        buffer += sequence[i];
+                        buffer += value + sequence[i];
                         next(2);
                         continue;
                     }
@@ -3334,11 +3353,12 @@
                         continue;
                     }
                     // buffer += value;
-                    if (ind >= iterator.length) {
-                        // drop '\\' at the end
-                        yield pushToken(buffer);
-                        break;
-                    }
+                    // if (ind >= iterator.length) {
+                    //
+                    //     // drop '\\' at the end
+                    //     yield pushToken(buffer);
+                    //     break;
+                    // }
                     buffer += next(2);
                     continue;
                 }
@@ -3507,7 +3527,7 @@
                         buffer = '';
                         break;
                     }
-                    buffer += value;
+                    buffer += prev() + value;
                     break;
                 case '"':
                 case "'":
@@ -3709,6 +3729,7 @@
      * @param opt
      */
     async function parse$1(iterator, opt = {}) {
+        const startTime = performance.now();
         const errors = [];
         const options = {
             src: '',
@@ -3847,7 +3868,7 @@
                                         src: options.resolve(url, options.src).absolute
                                     }));
                                 });
-                                bytesIn += root.bytesIn;
+                                bytesIn += root.stats.bytesIn;
                                 if (root.ast.chi.length > 0) {
                                     context.chi.push(...root.ast.chi);
                                 }
@@ -3893,13 +3914,6 @@
                 // rule
                 if (delim.typ == 'Block-start') {
                     const position = map.get(tokens[0]);
-                    // if (context.typ == 'Rule') {
-                    //
-                    //     if (tokens[0]?.typ == 'Iden') {
-                    //         errors.push({action: 'drop', message: 'invalid nesting rule', location: {src, ...position}});
-                    //         return null;
-                    //     }
-                    // }
                     const uniq = new Map;
                     parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                         if (curr.typ == 'Whitespace') {
@@ -4075,12 +4089,21 @@
         if (tokens.length > 0) {
             await parseNode(tokens);
         }
+        const endParseTime = performance.now();
         if (options.minify) {
             if (ast.chi.length > 0) {
                 minify(ast, options, true);
             }
         }
-        return { ast, errors, bytesIn };
+        const endTime = performance.now();
+        return {
+            ast, errors, stats: {
+                bytesIn,
+                parse: `${(endParseTime - startTime).toFixed(2)}ms`,
+                minify: `${(endTime - endParseTime).toFixed(2)}ms`,
+                total: `${(endTime - startTime).toFixed(2)}ms`
+            }
+        };
     }
     function parseString(src, options = { location: false }) {
         return [...tokenize(src)].map(t => {
@@ -4431,19 +4454,17 @@
     async function transform$1(css, options = {}) {
         options = { minify: true, removeEmpty: true, ...options };
         const startTime = performance.now();
-        const parseResult = await parse$1(css, options);
-        const renderTime = performance.now();
-        const rendered = render(parseResult.ast, options);
-        const endTime = performance.now();
-        return {
-            ...parseResult, ...rendered, stats: {
-                bytesIn: parseResult.bytesIn,
-                bytesOut: rendered.code.length,
-                parse: `${(renderTime - startTime).toFixed(2)}ms`,
-                render: `${(endTime - renderTime).toFixed(2)}ms`,
-                total: `${(endTime - startTime).toFixed(2)}ms`
-            }
-        };
+        return parse$1(css, options).then((parseResult) => {
+            const rendered = render(parseResult.ast, options);
+            return {
+                ...parseResult, ...rendered, stats: {
+                    bytesOut: rendered.code.length,
+                    ...parseResult.stats,
+                    render: rendered.stats.total,
+                    total: `${(performance.now() - startTime).toFixed(2)}ms`
+                }
+            };
+        });
     }
 
     const matchUrl = /^(https?:)?\/\//;

package/dist/index.cjs

@@ -91,10 +91,7 @@ function isHash(name) {
     if (name.charAt(0) != '#') {
         return false;
     }
-    if (isIdent(name.charAt(1))) {
-        return true;
-    }
-    return true;
+    return isIdent(name.charAt(1));
 }
 function isNumber(name) {
     if (name.length == 0) {
@@ -1564,6 +1561,7 @@ function hsl2rgb(h, s, l, a = null) {
 }
 
 function render(data, opt = {}) {
+    const startTime = performance.now();
     const options = Object.assign(opt.minify ?? true ? {
         indent: '',
         newLine: '',
@@ -1582,7 +1580,9 @@ function render(data, opt = {}) {
         }
         return acc + renderToken(curr, options);
     }
-    return { code: doRender(data, options, reducer, 0) };
+    return { code: doRender(data, options, reducer, 0), stats: {
+            total: `${(performance.now() - startTime).toFixed(2)}ms`
+        } };
 }
 // @ts-ignore
 function doRender(data, options, reducer, level = 0, indents = []) {
@@ -1611,7 +1611,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
         case 'AtRule':
         case 'Rule':
             if (data.typ == 'AtRule' && !('chi' in data)) {
-                return `${indent}@${data.nam} ${data.val};`;
+                return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
             }
             // @ts-ignore
             let children = data.chi.reduce((css, node) => {
@@ -1623,7 +1623,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                     str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                 }
                 else if (node.typ == 'AtRule' && !('chi' in node)) {
-                    str = `@${node.nam} ${node.val};`;
+                    str = `${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                 }
                 else {
                     str = doRender(node, options, reducer, level + 1, indents);
@@ -1640,7 +1640,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                 children = children.slice(0, -1);
             }
             if (data.typ == 'AtRule') {
-                return `@${data.nam}${data.val ? ' ' + data.val + options.indent : ''}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
+                return `@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val}${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
             }
             return data.sel + `${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
     }
@@ -1790,7 +1790,9 @@ function renderToken(token, options = {}) {
         case 'Delim':
             return /* options.minify && 'Pseudo-class' == token.typ && '::' == token.val.slice(0, 2) ? token.val.slice(1) :  */ token.val;
     }
-    throw new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    console.error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    // throw  new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    return '';
 }
 
 function eq(a, b) {
@@ -2579,7 +2581,7 @@ function minify(ast, options = {}, recursive = false) {
             // @ts-ignore
             return null;
         }
-        return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node2 : node2 };
+        return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node1 : node2 };
     }
     function matchSelectors(selector1, selector2, parentType) {
         let match = [[]];
@@ -2767,11 +2769,27 @@ function minify(ast, options = {}, recursive = false) {
             if (node.typ == 'AtRule' && node.nam == 'font-face') {
                 continue;
             }
-            if (node.typ == 'AtRule' && node.val == 'all') {
+            if (node.typ == 'AtRule') {
+                if (node.nam == 'media' && node.val == 'all') {
+                    // @ts-ignore
+                    ast.chi?.splice(i, 1, ...node.chi);
+                    i--;
+                    continue;
+                }
+                // console.debug({previous, node});
                 // @ts-ignore
-                ast.chi?.splice(i, 1, ...node.chi);
-                i--;
-                continue;
+                if (previous?.typ == 'AtRule' &&
+                    previous.nam == node.nam &&
+                    previous.val == node.val) {
+                    if ('chi' in node) {
+                        // @ts-ignore
+                        previous.chi.push(...node.chi);
+                    }
+                    // else {
+                    ast?.chi?.splice(i--, 1);
+                    continue;
+                    // }
+                }
             }
             // @ts-ignore
             if (node.typ == 'Rule') {
@@ -3286,10 +3304,11 @@ function* tokenize(iterator) {
         }
         buffer += quoteStr;
         while (value = peek()) {
-            if (ind >= iterator.length) {
-                yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-                break;
-            }
+            // if (ind >= iterator.length) {
+            //
+            //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
+            //     break;
+            // }
             if (value == '\\') {
                 const sequence = peek(6);
                 let escapeSequence = '';
@@ -3312,7 +3331,7 @@ function* tokenize(iterator) {
                 // not hex or new line
                 // @ts-ignore
                 if (i == 1 && !isNewLine(codepoint)) {
-                    buffer += sequence[i];
+                    buffer += value + sequence[i];
                     next(2);
                     continue;
                 }
@@ -3332,11 +3351,12 @@ function* tokenize(iterator) {
                     continue;
                 }
                 // buffer += value;
-                if (ind >= iterator.length) {
-                    // drop '\\' at the end
-                    yield pushToken(buffer);
-                    break;
-                }
+                // if (ind >= iterator.length) {
+                //
+                //     // drop '\\' at the end
+                //     yield pushToken(buffer);
+                //     break;
+                // }
                 buffer += next(2);
                 continue;
             }
@@ -3505,7 +3525,7 @@ function* tokenize(iterator) {
                     buffer = '';
                     break;
                 }
-                buffer += value;
+                buffer += prev() + value;
                 break;
             case '"':
             case "'":
@@ -3707,6 +3727,7 @@ const funcLike = ['Start-parens', 'Func', 'UrlFunc', 'Pseudo-class-func'];
  * @param opt
  */
 async function parse$1(iterator, opt = {}) {
+    const startTime = performance.now();
     const errors = [];
     const options = {
         src: '',
@@ -3845,7 +3866,7 @@ async function parse$1(iterator, opt = {}) {
                                     src: options.resolve(url, options.src).absolute
                                 }));
                             });
-                            bytesIn += root.bytesIn;
+                            bytesIn += root.stats.bytesIn;
                             if (root.ast.chi.length > 0) {
                                 context.chi.push(...root.ast.chi);
                             }
@@ -3891,13 +3912,6 @@ async function parse$1(iterator, opt = {}) {
             // rule
             if (delim.typ == 'Block-start') {
                 const position = map.get(tokens[0]);
-                // if (context.typ == 'Rule') {
-                //
-                //     if (tokens[0]?.typ == 'Iden') {
-                //         errors.push({action: 'drop', message: 'invalid nesting rule', location: {src, ...position}});
-                //         return null;
-                //     }
-                // }
                 const uniq = new Map;
                 parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
@@ -4073,12 +4087,21 @@ async function parse$1(iterator, opt = {}) {
     if (tokens.length > 0) {
         await parseNode(tokens);
     }
+    const endParseTime = performance.now();
     if (options.minify) {
         if (ast.chi.length > 0) {
             minify(ast, options, true);
         }
     }
-    return { ast, errors, bytesIn };
+    const endTime = performance.now();
+    return {
+        ast, errors, stats: {
+            bytesIn,
+            parse: `${(endParseTime - startTime).toFixed(2)}ms`,
+            minify: `${(endTime - endParseTime).toFixed(2)}ms`,
+            total: `${(endTime - startTime).toFixed(2)}ms`
+        }
+    };
 }
 function parseString(src, options = { location: false }) {
     return [...tokenize(src)].map(t => {
@@ -4429,19 +4452,17 @@ function parseTokens(tokens, options = {}) {
 async function transform$1(css, options = {}) {
     options = { minify: true, removeEmpty: true, ...options };
     const startTime = performance.now();
-    const parseResult = await parse$1(css, options);
-    const renderTime = performance.now();
-    const rendered = render(parseResult.ast, options);
-    const endTime = performance.now();
-    return {
-        ...parseResult, ...rendered, stats: {
-            bytesIn: parseResult.bytesIn,
-            bytesOut: rendered.code.length,
-            parse: `${(renderTime - startTime).toFixed(2)}ms`,
-            render: `${(endTime - renderTime).toFixed(2)}ms`,
-            total: `${(endTime - startTime).toFixed(2)}ms`
-        }
-    };
+    return parse$1(css, options).then((parseResult) => {
+        const rendered = render(parseResult.ast, options);
+        return {
+            ...parseResult, ...rendered, stats: {
+                bytesOut: rendered.code.length,
+                ...parseResult.stats,
+                render: rendered.stats.total,
+                total: `${(performance.now() - startTime).toFixed(2)}ms`
+            }
+        };
+    });
 }
 
 const matchUrl = /^(https?:)?\/\//;

package/dist/index.d.ts

@@ -487,11 +487,19 @@ interface TransformOptions extends ParserOptions, RenderOptions {
 interface ParseResult {
     ast: AstRuleStyleSheet;
     errors: ErrorDescription[];
-    bytesIn: number;
+    stats: {
+        bytesIn: number;
+        parse: string;
+        minify: string;
+        total: string;
+    }
 }
 
 interface RenderResult {
     code: string ;
+    stats: {
+        total: string;
+    }
 }
 
 interface TransformResult extends ParseResult, RenderResult {
@@ -500,6 +508,7 @@ interface TransformResult extends ParseResult, RenderResult {
         bytesIn: number;
         bytesOut: number;
         parse: string;
+        minify: string;
         render: string;
         total: string;
     }

package/dist/lib/ast/minify.js

@@ -135,7 +135,7 @@ function minify(ast, options = {}, recursive = false) {
             // @ts-ignore
             return null;
         }
-        return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node2 : node2 };
+        return { result, node1: exchanged ? node2 : node1, node2: exchanged ? node1 : node2 };
     }
     function matchSelectors(selector1, selector2, parentType) {
         let match = [[]];
@@ -323,11 +323,27 @@ function minify(ast, options = {}, recursive = false) {
             if (node.typ == 'AtRule' && node.nam == 'font-face') {
                 continue;
             }
-            if (node.typ == 'AtRule' && node.val == 'all') {
+            if (node.typ == 'AtRule') {
+                if (node.nam == 'media' && node.val == 'all') {
+                    // @ts-ignore
+                    ast.chi?.splice(i, 1, ...node.chi);
+                    i--;
+                    continue;
+                }
+                // console.debug({previous, node});
                 // @ts-ignore
-                ast.chi?.splice(i, 1, ...node.chi);
-                i--;
-                continue;
+                if (previous?.typ == 'AtRule' &&
+                    previous.nam == node.nam &&
+                    previous.val == node.val) {
+                    if ('chi' in node) {
+                        // @ts-ignore
+                        previous.chi.push(...node.chi);
+                    }
+                    // else {
+                    ast?.chi?.splice(i--, 1);
+                    continue;
+                    // }
+                }
             }
             // @ts-ignore
             if (node.typ == 'Rule') {

package/dist/lib/parser/parse.js

@@ -12,6 +12,7 @@ const funcLike = ['Start-parens', 'Func', 'UrlFunc', 'Pseudo-class-func'];
  * @param opt
  */
 async function parse(iterator, opt = {}) {
+    const startTime = performance.now();
     const errors = [];
     const options = {
         src: '',
@@ -150,7 +151,7 @@ async function parse(iterator, opt = {}) {
                                     src: options.resolve(url, options.src).absolute
                                 }));
                             });
-                            bytesIn += root.bytesIn;
+                            bytesIn += root.stats.bytesIn;
                             if (root.ast.chi.length > 0) {
                                 context.chi.push(...root.ast.chi);
                             }
@@ -196,13 +197,6 @@ async function parse(iterator, opt = {}) {
             // rule
             if (delim.typ == 'Block-start') {
                 const position = map.get(tokens[0]);
-                // if (context.typ == 'Rule') {
-                //
-                //     if (tokens[0]?.typ == 'Iden') {
-                //         errors.push({action: 'drop', message: 'invalid nesting rule', location: {src, ...position}});
-                //         return null;
-                //     }
-                // }
                 const uniq = new Map;
                 parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
@@ -378,12 +372,21 @@ async function parse(iterator, opt = {}) {
     if (tokens.length > 0) {
         await parseNode(tokens);
     }
+    const endParseTime = performance.now();
     if (options.minify) {
         if (ast.chi.length > 0) {
             minify(ast, options, true);
         }
     }
-    return { ast, errors, bytesIn };
+    const endTime = performance.now();
+    return {
+        ast, errors, stats: {
+            bytesIn,
+            parse: `${(endParseTime - startTime).toFixed(2)}ms`,
+            minify: `${(endTime - endParseTime).toFixed(2)}ms`,
+            total: `${(endTime - startTime).toFixed(2)}ms`
+        }
+    };
 }
 function parseString(src, options = { location: false }) {
     return [...tokenize(src)].map(t => {

package/dist/lib/parser/tokenize.js

@@ -36,10 +36,11 @@ function* tokenize(iterator) {
         }
         buffer += quoteStr;
         while (value = peek()) {
-            if (ind >= iterator.length) {
-                yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-                break;
-            }
+            // if (ind >= iterator.length) {
+            //
+            //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
+            //     break;
+            // }
             if (value == '\\') {
                 const sequence = peek(6);
                 let escapeSequence = '';
@@ -62,7 +63,7 @@ function* tokenize(iterator) {
                 // not hex or new line
                 // @ts-ignore
                 if (i == 1 && !isNewLine(codepoint)) {
-                    buffer += sequence[i];
+                    buffer += value + sequence[i];
                     next(2);
                     continue;
                 }
@@ -82,11 +83,12 @@ function* tokenize(iterator) {
                     continue;
                 }
                 // buffer += value;
-                if (ind >= iterator.length) {
-                    // drop '\\' at the end
-                    yield pushToken(buffer);
-                    break;
-                }
+                // if (ind >= iterator.length) {
+                //
+                //     // drop '\\' at the end
+                //     yield pushToken(buffer);
+                //     break;
+                // }
                 buffer += next(2);
                 continue;
             }
@@ -255,7 +257,7 @@ function* tokenize(iterator) {
                     buffer = '';
                     break;
                 }
-                buffer += value;
+                buffer += prev() + value;
                 break;
             case '"':
             case "'":

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

@@ -87,10 +87,7 @@ function isHash(name) {
     if (name.charAt(0) != '#') {
         return false;
     }
-    if (isIdent(name.charAt(1))) {
-        return true;
-    }
-    return true;
+    return isIdent(name.charAt(1));
 }
 function isNumber(name) {
     if (name.length == 0) {

package/dist/lib/renderer/render.js

@@ -1,6 +1,7 @@
 import { COLORS_NAMES, rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex, NAMES_COLORS } from './utils/color.js';
 
 function render(data, opt = {}) {
+    const startTime = performance.now();
     const options = Object.assign(opt.minify ?? true ? {
         indent: '',
         newLine: '',
@@ -19,7 +20,9 @@ function render(data, opt = {}) {
         }
         return acc + renderToken(curr, options);
     }
-    return { code: doRender(data, options, reducer, 0) };
+    return { code: doRender(data, options, reducer, 0), stats: {
+            total: `${(performance.now() - startTime).toFixed(2)}ms`
+        } };
 }
 // @ts-ignore
 function doRender(data, options, reducer, level = 0, indents = []) {
@@ -48,7 +51,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
         case 'AtRule':
         case 'Rule':
             if (data.typ == 'AtRule' && !('chi' in data)) {
-                return `${indent}@${data.nam} ${data.val};`;
+                return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
             }
             // @ts-ignore
             let children = data.chi.reduce((css, node) => {
@@ -60,7 +63,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                     str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                 }
                 else if (node.typ == 'AtRule' && !('chi' in node)) {
-                    str = `@${node.nam} ${node.val};`;
+                    str = `${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                 }
                 else {
                     str = doRender(node, options, reducer, level + 1, indents);
@@ -77,7 +80,7 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                 children = children.slice(0, -1);
             }
             if (data.typ == 'AtRule') {
-                return `@${data.nam}${data.val ? ' ' + data.val + options.indent : ''}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
+                return `@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val}${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
             }
             return data.sel + `${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
     }
@@ -227,7 +230,9 @@ function renderToken(token, options = {}) {
         case 'Delim':
             return /* options.minify && 'Pseudo-class' == token.typ && '::' == token.val.slice(0, 2) ? token.val.slice(1) :  */ token.val;
     }
-    throw new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    console.error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    // throw  new Error(`unexpected token ${JSON.stringify(token, null, 1)}`);
+    return '';
 }
 
 export { render, renderToken };

package/dist/lib/transform.js

@@ -4,19 +4,17 @@ import { render } from './renderer/render.js';
 async function transform(css, options = {}) {
     options = { minify: true, removeEmpty: true, ...options };
     const startTime = performance.now();
-    const parseResult = await parse(css, options);
-    const renderTime = performance.now();
-    const rendered = render(parseResult.ast, options);
-    const endTime = performance.now();
-    return {
-        ...parseResult, ...rendered, stats: {
-            bytesIn: parseResult.bytesIn,
-            bytesOut: rendered.code.length,
-            parse: `${(renderTime - startTime).toFixed(2)}ms`,
-            render: `${(endTime - renderTime).toFixed(2)}ms`,
-            total: `${(endTime - startTime).toFixed(2)}ms`
-        }
-    };
+    return parse(css, options).then((parseResult) => {
+        const rendered = render(parseResult.ast, options);
+        return {
+            ...parseResult, ...rendered, stats: {
+                bytesOut: rendered.code.length,
+                ...parseResult.stats,
+                render: rendered.stats.total,
+                total: `${(performance.now() - startTime).toFixed(2)}ms`
+            }
+        };
+    });
 }
 
 export { transform };

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.0.1-rc1",
+  "version": "0.0.1-rc2",
   "exports": {
     ".": "./dist/index.js",
+    "./umd": "./dist/index-umd-web.js",
     "./web": "./dist/web/index.js",
     "./cjs": "./dist/index.cjs"
   },