@tbela99/css-parser 0.4.0 → 0.5.0

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

@@ -1,12 +1,11 @@
 import { multiplyMatrices } from './utils/matrix.js';
-import { powerlessColorComponent } from './utils/constants.js';
+import './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { srgb2lsrgbvalues, hex2srgb, rgb2srgb, hsl2srgb, hwb2srgb, lab2srgb, lch2srgb, lsrgb2srgbvalues } from './srgb.js';
 import { getNumber } from './color.js';
 import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../parser/parse.js';
-import { eq } from '../../parser/utils/eq.js';
 import { lch2labvalues } from './lab.js';
 import { getOKLCHComponents } from './oklch.js';
 import '../sourcemap/lib/encode.js';
@@ -66,7 +65,7 @@ function getOKLABComponents(token) {
     // @ts-ignore
     t = components[3];
     // @ts-ignore
-    const alpha = t == null || eq(t, powerlessColorComponent) ? 1 : getNumber(t);
+    const alpha = t == null || (t.typ == EnumToken.IdenTokenType && t.val == 'none') ? 1 : getNumber(t);
     const rgb = [l, a, b];
     if (alpha != 1 && alpha != null) {
         rgb.push(alpha);

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

@@ -1,4 +1,4 @@
-import { powerlessColorComponent } from './utils/constants.js';
+import './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { getNumber, getAngle } from './color.js';
 import { EnumToken } from '../../ast/types.js';
@@ -6,7 +6,6 @@ import '../../ast/minify.js';
 import '../../parser/parse.js';
 import { lab2lchvalues } from './lch.js';
 import { srgb2oklab, hex2oklab, rgb2oklab, hsl2oklab, hwb2oklab, lab2oklab, lch2oklab, getOKLABComponents } from './oklab.js';
-import { eq } from '../../parser/utils/eq.js';
 import '../sourcemap/lib/encode.js';
 
 function hex2oklch(token) {
@@ -58,7 +57,7 @@ function getOKLCHComponents(token) {
     // @ts-ignore
     t = components[3];
     // @ts-ignore
-    const alpha = t == null || eq(t, powerlessColorComponent) ? 1 : getNumber(t);
+    const alpha = t == null || (t.typ == EnumToken.IdenTokenType && t.val == 'none') ? 1 : getNumber(t);
     return [l, c, h, alpha];
 }
 

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

@@ -5,7 +5,6 @@ import { walkValues } from '../../ast/walk.js';
 import '../../parser/parse.js';
 import { reduceNumber } from '../render.js';
 import { colorRange } from './utils/constants.js';
-import { eq } from '../../parser/utils/eq.js';
 import { evaluate } from '../../ast/math/expression.js';
 
 function parseRelativeColor(relativeKeys, original, rExp, gExp, bExp, aExp) {
@@ -29,10 +28,7 @@ function parseRelativeColor(relativeKeys, original, rExp, gExp, bExp, aExp) {
         [names[1]]: getValue(g, converted, names[1]), // string,
         [names[2]]: getValue(b, converted, names[2]),
         // @ts-ignore
-        alpha: alpha == null || eq(alpha, {
-            typ: EnumToken.IdenTokenType,
-            val: 'none'
-        }) ? {
+        alpha: alpha == null || (alpha.typ == EnumToken.IdenTokenType && alpha.val == 'none') ? {
             typ: EnumToken.NumberTokenType,
             val: '1'
         } : (alpha.typ == EnumToken.PercentageTokenType ? {
@@ -45,7 +41,7 @@ function parseRelativeColor(relativeKeys, original, rExp, gExp, bExp, aExp) {
         [names[1]]: getValue(gExp, converted, names[1]),
         [names[2]]: getValue(bExp, converted, names[2]),
         // @ts-ignore
-        alpha: getValue(aExp == null || eq(aExp, { typ: EnumToken.IdenTokenType, val: 'none' }) ? {
+        alpha: getValue(aExp == null || (aExp.typ == EnumToken.IdenTokenType && aExp.val == 'none') ? {
             typ: EnumToken.NumberTokenType,
             val: '1'
         } : aExp)

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

@@ -10,7 +10,6 @@ import { getOKLABComponents, OKLab_to_sRGB } from './oklab.js';
 import { getLCHComponents } from './lch.js';
 import { getOKLCHComponents } from './oklch.js';
 import { XYZ_to_lin_sRGB } from './xyz.js';
-import { eq } from '../../parser/utils/eq.js';
 import '../sourcemap/lib/encode.js';
 
 // from https://www.w3.org/TR/css-color-4/#color-conversion-code
@@ -43,10 +42,7 @@ function srgbvalues(token) {
     return null;
 }
 function rgb2srgb(token) {
-    return getComponents(token).map((t, index) => index == 3 ? (eq(t, {
-        typ: EnumToken.IdenTokenType,
-        val: 'none'
-    }) ? 1 : getNumber(t)) : (t.typ == EnumToken.PercentageTokenType ? 255 : 1) * getNumber(t) / 255);
+    return getComponents(token).map((t, index) => index == 3 ? ((t.typ == EnumToken.IdenTokenType && t.val == 'none') ? 1 : getNumber(t)) : (t.typ == EnumToken.PercentageTokenType ? 255 : 1) * getNumber(t) / 255);
 }
 function hex2srgb(token) {
     const value = expandHexValue(token.kin == 'lit' ? COLORS_NAMES[token.val.toLowerCase()] : token.val);

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

@@ -26,7 +26,7 @@ const colorRange = {
     }
 };
 const colorFuncColorSpace = ['srgb', 'srgb-linear', 'display-p3', 'prophoto-rgb', 'a98-rgb', 'rec2020', 'xyz', 'xyz-d65', 'xyz-d50'];
-const powerlessColorComponent = { typ: EnumToken.IdenTokenType, val: 'none' };
+({ typ: EnumToken.IdenTokenType, val: 'none' });
 const D50 = [0.3457 / 0.3585, 1.00000, (1.0 - 0.3457 - 0.3585) / 0.3585];
 const k = Math.pow(29, 3) / Math.pow(3, 3);
 const e = Math.pow(6, 3) / Math.pow(29, 3);
@@ -188,4 +188,4 @@ const NAMES_COLORS = Object.seal(Object.entries(COLORS_NAMES).reduce((acc, [key,
     return acc;
 }, Object.create(null)));
 
-export { COLORS_NAMES, D50, NAMES_COLORS, colorFuncColorSpace, colorRange, e, k, powerlessColorComponent };
+export { COLORS_NAMES, D50, NAMES_COLORS, colorFuncColorSpace, colorRange, e, k };

package/dist/lib/renderer/render.js

@@ -54,6 +54,19 @@ function doRender(data, options = {}) {
             removeComments: false,
         }), sourcemap: false, convertColor: true, expandNestingRules: false, preserveLicense: false, ...options
     };
+    if (options.withParents) {
+        // @ts-ignore
+        let parent = data.parent;
+        // @ts-ignore
+        while (data.parent != null) {
+            // @ts-ignore
+            parent = { ...data.parent, chi: [{ ...data }] };
+            // @ts-ignore
+            parent.parent = data.parent.parent;
+            // @ts-ignore
+            data = parent;
+        }
+    }
     const startTime = performance.now();
     const errors = [];
     const sourcemap = options.sourcemap ? new SourceMap : null;
@@ -120,7 +133,7 @@ function renderAstNode(data, options, sourcemap, position, errors, reducer, cach
             return `${data.nam}:${options.indent}${data.val.reduce(reducer, '')}`;
         case EnumToken.CommentNodeType:
         case EnumToken.CDOCOMMNodeType:
-            if (data.val.startsWith('# sourceMappingURL=')) {
+            if (data.val.startsWith('/*# sourceMappingURL=')) {
                 // ignore sourcemap
                 return '';
             }
@@ -132,12 +145,12 @@ function renderAstNode(data, options, sourcemap, position, errors, reducer, cach
                     return css;
                 }
                 if (css === '') {
-                    if (sourcemap != null) {
+                    if (sourcemap != null && node.loc != null) {
                         updateSourceMap(node, options, cache, sourcemap, position, str);
                     }
                     return str;
                 }
-                if (sourcemap != null) {
+                if (sourcemap != null && node.loc != null) {
                     update(position, options.newLine);
                     updateSourceMap(node, options, cache, sourcemap, position, str);
                 }

package/dist/web/load.js

@@ -13,8 +13,10 @@ async function load(url, currentFile) {
     if (matchUrl.test(currentFile)) {
         return fetch(new URL(url, currentFile)).then(parseResponse);
     }
+    const path = resolve(url, currentFile).absolute;
+    const t = new URL(path, self.origin);
     // return fetch(new URL(url, new URL(currentFile, self.location.href).href)).then(parseResponse);
-    return fetch(resolve(url, currentFile).absolute).then(parseResponse);
+    return fetch(url, t.origin != self.location.origin ? { mode: 'cors' } : {}).then(parseResponse);
 }
 
 export { load };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "exports": {
     ".": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",
@@ -13,9 +13,10 @@
   "scripts": {
     "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:node": "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 \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=. --coverage",
-    "profile": "node --inspect-brk test/inspect.mjs",
+    "profile": "node --enable-source-maps --inspect-brk test/inspect.js",
     "debug": "web-test-runner \"test/**/web.spec.js\" --manual --open --node-resolve --root-dir=."
   },
   "repository": {

package/quickjs.sh

@@ -1 +0,0 @@
-qjsc -e -o c/css.c dist/index-umd-web.js