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

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

@@ -13,4 +13,4 @@ function matchType(val, properties) {
     return false;
 }
 
-export { matchType };
+export { funcList, matchType };

package/dist/lib/renderer/render.js

@@ -1,5 +1,23 @@
-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';
 
+const colorsFunc = ['rgb', 'rgba', 'hsl', 'hsla', 'hwb', 'device-cmyk'];
+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 +30,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 +56,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 +79,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 +112,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 +174,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,13 +204,59 @@ 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') {
                     return '0s';
@@ -196,17 +270,7 @@ function renderToken(token, options = {}) {
                 }
                 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 +287,7 @@ function renderToken(token, options = {}) {
             }
             return num;
         case 'Comment':
-            if (options.removeComments) {
+            if (options.removeComments && (!options.preserveLicense || !token.val.startsWith('/*!'))) {
                 return '';
             }
         case 'Url-token':
@@ -241,4 +305,4 @@ function renderToken(token, options = {}) {
     return '';
 }
 
-export { render, renderToken };
+export { colorsFunc, render, renderToken };

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/lib/transform.js

@@ -1,5 +1,6 @@
 import { parse } from './parser/parse.js';
 import { render } from './renderer/render.js';
+import './renderer/utils/color.js';
 
 async function transform(css, options = {}) {
     options = { minify: true, removeEmpty: true, ...options };

package/dist/node/index.js

@@ -1,15 +1,21 @@
 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, isColor, 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 { funcList, matchType } from '../lib/parser/utils/type.js';
+export { colorsFunc, 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';
 
-function parse(iterator, opt = {}) {
+async function parse(iterator, opt = {}) {
     return parse$1(iterator, Object.assign(opt, { load, resolve, cwd: opt.cwd ?? process.cwd() }));
 }
-function transform(css, options = {}) {
+async function transform(css, options = {}) {
     return transform$1(css, Object.assign(options, { load, resolve, cwd: options.cwd ?? process.cwd() }));
 }
 

package/dist/web/index.js

@@ -1,10 +1,10 @@
 import { parse as parse$1 } from '../lib/parser/parse.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 { isAngle, isAtKeyword, isColor, 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 { funcList, matchType } from '../lib/parser/utils/type.js';
+export { colorsFunc, 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';
@@ -12,14 +12,14 @@ import { load } from './load.js';
 import { resolve, dirname } from '../lib/fs/resolve.js';
 export { matchUrl } from '../lib/fs/resolve.js';
 
-function parse(iterator, opt = {}) {
+async function parse(iterator, opt = {}) {
     return parse$1(iterator, Object.assign(opt, {
         load,
         resolve,
         cwd: opt.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
     }));
 }
-function transform(css, options = {}) {
+async function transform(css, options = {}) {
     return transform$1(css, Object.assign(options, {
         load,
         resolve,

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-rc5",
   "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';