@tbela99/css-parser 0.0.1 → 0.2.0

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

@@ -1,3 +1,8 @@
+import { EnumToken } from '../../ast/types.js';
+import '../../ast/minify.js';
+import '../../parser/parse.js';
+import '../sourcemap/lib/encode.js';
+
 // name to color
 const COLORS_NAMES = Object.seal({
     'aliceblue': '#f0f8ff',
@@ -310,18 +315,18 @@ function rgb2Hex(token) {
         // @ts-ignore
         t = token.chi[i];
         // @ts-ignore
-        value += Math.round(t.typ == 'Perc' ? 255 * t.val / 100 : t.val).toString(16).padStart(2, '0');
+        value += Math.round(t.typ == EnumToken.PercentageTokenType ? 255 * t.val / 100 : t.val).toString(16).padStart(2, '0');
     }
     // @ts-ignore
     if (token.chi.length == 7) {
         // @ts-ignore
         t = token.chi[6];
         // @ts-ignore
-        if ((t.typ == 'Number' && t.val < 1) ||
+        if ((t.typ == EnumToken.NumberTokenType && t.val < 1) ||
             // @ts-ignore
-            (t.typ == 'Perc' && t.val < 100)) {
+            (t.typ == EnumToken.PercentageTokenType && t.val < 100)) {
             // @ts-ignore
-            value += Math.round(255 * (t.typ == 'Perc' ? t.val / 100 : t.val)).toString(16).padStart(2, '0');
+            value += Math.round(255 * (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val)).toString(16).padStart(2, '0');
         }
     }
     return value;
@@ -333,21 +338,21 @@ function hsl2Hex(token) {
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    let s = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let s = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    let l = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let l = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     let a = null;
     if (token.chi?.length == 7) {
         // @ts-ignore
         t = token.chi[6];
         // @ts-ignore
-        if ((t.typ == 'Perc' && t.val < 100) ||
+        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
             // @ts-ignore
-            (t.typ == 'Number' && t.val < 1)) {
+            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
             // @ts-ignore
-            a = (t.typ == 'Perc' ? t.val / 100 : t.val);
+            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
         }
     }
     return `#${hsl2rgb(h, s, l, a).reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
@@ -359,21 +364,21 @@ function hwb2hex(token) {
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    let white = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let white = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    let black = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let black = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     let a = null;
     if (token.chi?.length == 7) {
         // @ts-ignore
         t = token.chi[6];
         // @ts-ignore
-        if ((t.typ == 'Perc' && t.val < 100) ||
+        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
             // @ts-ignore
-            (t.typ == 'Number' && t.val < 1)) {
+            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
             // @ts-ignore
-            a = (t.typ == 'Perc' ? t.val / 100 : t.val);
+            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
         }
     }
     const rgb = hsl2rgb(h, 1, .5, a);
@@ -390,19 +395,19 @@ function cmyk2hex(token) {
     // @ts-ignore
     let t = token.chi[0];
     // @ts-ignore
-    const c = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const c = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    const m = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const m = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    const y = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const y = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[6];
     // @ts-ignore
-    const k = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const k = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     const rgb = [
         Math.round(255 * (1 - Math.min(1, c * (1 - k) + k))),
         Math.round(255 * (1 - Math.min(1, m * (1 - k) + k))),
@@ -413,12 +418,12 @@ function cmyk2hex(token) {
         // @ts-ignore
         t = token.chi[8];
         // @ts-ignore
-        rgb.push(Math.round(255 * (t.typ == 'Perc' ? t.val / 100 : t.val)));
+        rgb.push(Math.round(255 * (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val)));
     }
     return `#${rgb.reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
 }
 function getAngle(token) {
-    if (token.typ == 'Angle') {
+    if (token.typ == EnumToken.AngleTokenType) {
         switch (token.unit) {
             case 'deg':
                 // @ts-ignore

package/dist/node/index.js

@@ -1,23 +1,38 @@
-export { combinators, hasDeclaration, minify, minifyRule, reduceSelector, splitRule } from '../lib/ast/minify.js';
+export { EnumToken } from '../lib/ast/types.js';
+export { minify } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.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';
-export { tokenize } from '../lib/parser/tokenize.js';
-export { isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNonPrintable, 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';
-import { transform as transform$1 } from '../lib/transform.js';
+export { expand } from '../lib/ast/expand.js';
+import { doRender } from '../lib/renderer/render.js';
+export { renderToken } from '../lib/renderer/render.js';
+import { doParse } from '../lib/parser/parse.js';
+export { parseString, parseTokens } from '../lib/parser/parse.js';
+import '../lib/renderer/utils/color.js';
+import { resolve, dirname } from '../lib/fs/resolve.js';
 import { load } from './load.js';
-import { resolve } from '../lib/fs/resolve.js';
-export { dirname, matchUrl } from '../lib/fs/resolve.js';
 
+function render(data, options = {}) {
+    return doRender(data, Object.assign(options, { load, resolve, dirname, cwd: options.cwd ?? process.cwd() }));
+}
 async function parse(iterator, opt = {}) {
-    return parse$1(iterator, Object.assign(opt, { load, resolve, cwd: opt.cwd ?? process.cwd() }));
+    return doParse(iterator, Object.assign(opt, { load, resolve, dirname, cwd: opt.cwd ?? process.cwd() }));
 }
 async function transform(css, options = {}) {
-    return transform$1(css, Object.assign(options, { load, resolve, cwd: options.cwd ?? process.cwd() }));
+    options = { minify: true, removeEmpty: true, removeCharset: true, ...options };
+    const startTime = performance.now();
+    return parse(css, options).then((parseResult) => {
+        const rendered = render(parseResult.ast, options);
+        return {
+            ...parseResult,
+            ...rendered,
+            errors: parseResult.errors.concat(rendered.errors),
+            stats: {
+                bytesOut: rendered.code.length,
+                ...parseResult.stats,
+                render: rendered.stats.total,
+                total: `${(performance.now() - startTime).toFixed(2)}ms`
+            }
+        };
+    });
 }
 
-export { load, parse, resolve, transform };
+export { dirname, load, parse, render, resolve, transform };

package/dist/web/index.js

@@ -1,31 +1,48 @@
-export { combinators, hasDeclaration, minify, minifyRule, reduceSelector, splitRule } from '../lib/ast/minify.js';
+export { EnumToken } from '../lib/ast/types.js';
+export { minify } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.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';
-export { tokenize } from '../lib/parser/tokenize.js';
-export { isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNonPrintable, 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';
-import { transform as transform$1 } from '../lib/transform.js';
-import { load } from './load.js';
+export { expand } from '../lib/ast/expand.js';
+import { doRender } from '../lib/renderer/render.js';
+export { renderToken } from '../lib/renderer/render.js';
+import { doParse } from '../lib/parser/parse.js';
+export { parseString, parseTokens } from '../lib/parser/parse.js';
+import '../lib/renderer/utils/color.js';
 import { resolve, dirname } from '../lib/fs/resolve.js';
-export { matchUrl } from '../lib/fs/resolve.js';
+import { load } from './load.js';
 
-async function parse(iterator, opt = {}) {
-    return parse$1(iterator, Object.assign(opt, {
+function render(data, options = {}) {
+    return doRender(data, Object.assign(options, {
         load,
         resolve,
-        cwd: opt.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
+        dirname,
+        cwd: options.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
     }));
 }
-async function transform(css, options = {}) {
-    return transform$1(css, Object.assign(options, {
+async function parse(iterator, opt = {}) {
+    return doParse(iterator, Object.assign(opt, {
         load,
         resolve,
-        cwd: options.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
+        dirname,
+        cwd: opt.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
     }));
 }
+async function transform(css, options = {}) {
+    options = { minify: true, removeEmpty: true, removeCharset: true, ...options };
+    const startTime = performance.now();
+    return parse(css, options).then((parseResult) => {
+        const rendered = render(parseResult.ast, options);
+        return {
+            ...parseResult,
+            ...rendered,
+            errors: parseResult.errors.concat(rendered.errors),
+            stats: {
+                bytesOut: rendered.code.length,
+                ...parseResult.stats,
+                render: rendered.stats.total,
+                total: `${(performance.now() - startTime).toFixed(2)}ms`
+            }
+        };
+    });
+}
 
-export { dirname, load, parse, resolve, transform };
+export { dirname, load, parse, render, resolve, transform };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "exports": {
     ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",
@@ -11,11 +11,12 @@
   "type": "module",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "rollup -c",
-    "test": "web-test-runner \"test/**/*.web-spec.js\" --node-resolve --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' \"test/**/*.spec.js\"",
-    "test:cov": "web-test-runner \"test/**/*.web-spec.js\" --node-resolve --root-dir=.  --coverage; c8 --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' \"test/**/*.spec.js\"",
+    "build": "rollup -c;./build.sh dist/index.d.ts 'declare interface' 'declare type'",
+    "test": "web-test-runner \"test/**/*.web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' \"test/**/*.node.spec.js\"",
+    "test:cov": "c8 --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' \"test/**/*.node.spec.js\"",
+    "test:web-cov": "web-test-runner --playwright --browsers chromium firefox webkit \"test/**/*.web.spec.js\" --node-resolve --root-dir=.  --coverage",
     "profile": "node --inspect-brk test/inspect.mjs",
-    "debug": "web-test-runner \"test/**/*.web.js\" --manual --open --node-resolve --root-dir=."
+    "debug": "web-test-runner \"test/**/*.web.spec.js\" --manual --open --node-resolve --root-dir=."
   },
   "repository": {
     "type": "git",
@@ -33,7 +34,8 @@
     "browser",
     "css-nesting",
     "css-compiler",
-    "nested-css"
+    "nested-css",
+    "walker"
   ],
   "author": "Thierry Bela",
   "license": "MIT OR LGPL-3.0",
@@ -51,6 +53,7 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.4.10",
     "@web/test-runner": "^0.17.0",
+    "@web/test-runner-playwright": "^0.11.0",
     "c8": "^8.0.1",
     "mocha": "^10.2.0",
     "rollup": "^3.28.0",

package/dist/lib/transform.js

@@ -1,24 +0,0 @@
-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 };
-    const startTime = performance.now();
-    return parse(css, options).then((parseResult) => {
-        const rendered = render(parseResult.ast, options);
-        return {
-            ...parseResult,
-            ...rendered,
-            errors: parseResult.errors.concat(rendered.errors),
-            stats: {
-                bytesOut: rendered.code.length,
-                ...parseResult.stats,
-                render: rendered.stats.total,
-                total: `${(performance.now() - startTime).toFixed(2)}ms`
-            }
-        };
-    });
-}
-
-export { transform };