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

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,21 +372,30 @@ 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 => {
+    return parseTokens([...tokenize(src)].map(t => {
         const token = getTokenType(t.token, t.hint);
         if (options.location) {
             Object.assign(token, { loc: t.position });
         }
         return token;
-    });
+    }));
 }
 function getTokenType(val, hint) {
     if (val === '' && hint == null) {

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/parser/utils/type.js

@@ -1,3 +1,4 @@
+const funcList = ['clamp', 'calc'];
 function matchType(val, properties) {
     if (val.typ == 'Iden' && properties.keywords.includes(val.val) ||
         (properties.types.includes(val.typ))) {
@@ -6,6 +7,9 @@ function matchType(val, properties) {
     if (val.typ == 'Number' && val.val == '0') {
         return properties.types.some(type => type == 'Length' || type == 'Angle');
     }
+    if (val.typ == 'Func' && funcList.includes(val.val)) {
+        return val.chi.every((t => ['Literal', 'Comma', 'Whitespace', 'Start-parens', 'End-parens'].includes(t.typ) || matchType(t, properties)));
+    }
     return false;
 }
 

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 = []) {
@@ -32,6 +35,8 @@ function doRender(data, options, reducer, level = 0, indents = []) {
     const indent = indents[level];
     const indentSub = indents[level + 1];
     switch (data.typ) {
+        case 'Declaration':
+            return `${data.nam}:${options.indent}${data.val.reduce((acc, curr) => acc + renderToken(curr), '')}`;
         case 'Comment':
             return options.removeComments ? '' : data.val;
         case 'StyleSheet':
@@ -48,7 +53,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) => {
@@ -57,10 +62,14 @@ function doRender(data, options, reducer, level = 0, indents = []) {
                     str = options.removeComments ? '' : node.val;
                 }
                 else if (node.typ == 'Declaration') {
+                    if (node.val.length == 0) {
+                        console.error(`invalid declaration`, node);
+                        return '';
+                    }
                     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 +86,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 +236,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/dist/web/index.js

@@ -3,6 +3,7 @@ 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';
 import { transform as transform$1 } from '../lib/transform.js';
 export { combinators, hasDeclaration, minify, minifyRule, reduceSelector } from '../lib/ast/minify.js';

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-rc3",
   "exports": {
     ".": "./dist/index.js",
+    "./umd": "./dist/index-umd-web.js",
     "./web": "./dist/web/index.js",
     "./cjs": "./dist/index.cjs"
   },
@@ -40,20 +41,19 @@
   "homepage": "https://github.com/tbela99/css-parser#readme",
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@rollup/plugin-commonjs": "^25.0.2",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-typescript": "^11.1.2",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.10",
-    "@web/test-runner": "^0.16.1",
-    "@webref/css": "^6.5.9",
+    "@types/node": "^20.4.10",
+    "@web/test-runner": "^0.17.0",
     "c8": "^8.0.1",
     "mocha": "^10.2.0",
-    "rollup": "^3.20.1",
-    "rollup-plugin-dts": "^5.3.0",
-    "tslib": "^2.5.0"
+    "rollup": "^3.28.0",
+    "rollup-plugin-dts": "^5.3.1",
+    "tslib": "^2.6.1"
   }
 }

package/.gitattributes

@@ -1,22 +0,0 @@
-/test/ export-ignore
-/docs/ export-ignore
-/benchmark
-/tools/ export-ignore
-/package-lock.json export-ignore
-/.gitignore export-ignore
-/.gitattributes export-ignore
-/coverage/ export-ignore
-/rollup.config.mjs export-ignore
-/tsconfig.json export-ignore
-# exclude all files in test/ from stats
-/test/** linguist-vendored
-/docs/** linguist-vendored
-/tools/** linguist-vendored
-/dist/** linguist-vendored
-/coverage/** linguist-vendored
-#
-# do not replace lf by crlf
-*.css text
-*.json text
-text eol=lf
-