@tbela99/css-parser 0.8.0 → 0.9.1

package/dist/lib/parser/tokenize.js

@@ -16,7 +16,13 @@ function consumeWhiteSpace(parseInfo) {
     return count;
 }
 function pushToken(token, parseInfo, hint) {
-    const result = { token, hint, position: { ...parseInfo.position }, bytesIn: parseInfo.currentPosition.ind + 1 };
+    const result = {
+        token,
+        len: parseInfo.currentPosition.ind - parseInfo.position.ind,
+        hint,
+        position: { ...parseInfo.position },
+        bytesIn: parseInfo.currentPosition.ind + 1
+    };
     parseInfo.position.ind = parseInfo.currentPosition.ind;
     parseInfo.position.lin = parseInfo.currentPosition.lin;
     parseInfo.position.col = Math.max(parseInfo.currentPosition.col, 1);
@@ -136,6 +142,10 @@ function next(parseInfo, count = 1) {
     }
     return char;
 }
+/**
+ * tokenize css string
+ * @param stream
+ */
 function* tokenize(stream) {
     const parseInfo = {
         stream,
@@ -184,8 +194,10 @@ function* tokenize(stream) {
                             buffer += value;
                         }
                     }
-                    yield pushToken(buffer, parseInfo, EnumToken.BadCommentTokenType);
-                    buffer = '';
+                    if (buffer.length > 0) {
+                        yield pushToken(buffer, parseInfo, EnumToken.BadCommentTokenType);
+                        buffer = '';
+                    }
                 }
                 break;
             case '&':

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

@@ -15,9 +15,9 @@ import { xyz2srgb, lsrgb2srgbvalues, srgb2lsrgbvalues, lch2srgb, oklab2srgb, lab
 import { prophotorgb2srgbvalues, srgb2prophotorgbvalues } from './prophotorgb.js';
 import { a98rgb2srgbvalues, srgb2a98values } from './a98rgb.js';
 import { rec20202srgb, srgb2rec2020values } from './rec2020.js';
-import { xyzd502srgb, srgb2xyz } from './xyz.js';
+import { srgb2xyz } from './xyz.js';
 import { p32srgbvalues, srgb2p3values } from './p3.js';
-import { XYZ_D65_to_D50 } from './xyzd50.js';
+import { xyzd502srgb, XYZ_D65_to_D50 } from './xyzd50.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -2,7 +2,7 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
-import { getNumber, minmax } from './color.js';
+import { minmax, getNumber } from './color.js';
 import { hsl2rgb, hwb2rgb, cmyk2rgb, oklab2rgb, oklch2rgb, lab2rgb, lch2rgb } from './rgb.js';
 import { NAMES_COLORS } from './utils/constants.js';
 import { getComponents } from './utils/components.js';

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

@@ -1,6 +1,6 @@
 import { hwb2hsv } from './hsv.js';
 import { getNumber } from './color.js';
-import { hex2rgb, lab2rgb, lch2rgb, oklab2rgb, oklch2rgb } from './rgb.js';
+import { lch2rgb, lab2rgb, oklch2rgb, oklab2rgb, hex2rgb } from './rgb.js';
 import './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { EnumToken } from '../../ast/types.js';

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

@@ -1,12 +1,12 @@
 import { hsl2hsv } from './hsv.js';
 import './utils/constants.js';
 import { getComponents } from './utils/components.js';
-import { getNumber, getAngle } from './color.js';
+import { getAngle, getNumber } from './color.js';
 import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
-import { lab2srgb, lch2srgb, oklab2srgb, oklch2srgb } from './srgb.js';
+import { lch2srgb, lab2srgb, oklch2srgb, oklab2srgb } from './srgb.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -1,7 +1,7 @@
 import { e, k, D50 } from './utils/constants.js';
 import { getComponents } from './utils/components.js';
-import { srgb2xyz, xyzd502srgb } from './xyz.js';
-import { hex2srgb, rgb2srgb, hsl2srgb, hwb2srgb, oklch2srgb } from './srgb.js';
+import { srgb2xyz } from './xyz.js';
+import { oklch2srgb, hwb2srgb, hsl2srgb, rgb2srgb, hex2srgb } from './srgb.js';
 import { getLCHComponents } from './lch.js';
 import { OKLab_to_XYZ, getOKLABComponents } from './oklab.js';
 import { getNumber } from './color.js';
@@ -9,6 +9,7 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import { xyzd502srgb } from './xyzd50.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -5,7 +5,7 @@ import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
-import { srgb2lab, xyz2lab, hex2lab, rgb2lab, hsl2lab, hwb2lab, getLABComponents, oklab2lab, oklch2lab } from './lab.js';
+import { srgb2lab, xyz2lab, oklch2lab, oklab2lab, getLABComponents, hwb2lab, hsl2lab, rgb2lab, hex2lab } from './lab.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -1,7 +1,7 @@
 import { multiplyMatrices } from './utils/matrix.js';
 import './utils/constants.js';
 import { getComponents } from './utils/components.js';
-import { srgb2lsrgbvalues, hex2srgb, rgb2srgb, hsl2srgb, hwb2srgb, lab2srgb, lch2srgb, lsrgb2srgbvalues } from './srgb.js';
+import { srgb2lsrgbvalues, lch2srgb, lab2srgb, hwb2srgb, hsl2srgb, rgb2srgb, hex2srgb, lsrgb2srgbvalues } from './srgb.js';
 import { getNumber } from './color.js';
 import { EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
@@ -106,7 +106,7 @@ function OKLab_to_sRGB(l, a, b) {
         1.2914855378640917399 * b, 3);
     return lsrgb2srgbvalues(
     /* r: */
-    +4.076741661347994 * L -
+    4.076741661347994 * L -
         3.307711590408193 * M +
         0.230969928729428 * S, 
     /*  g: */

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

@@ -6,7 +6,7 @@ import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
 import { lab2lchvalues } from './lch.js';
-import { srgb2oklab, hex2oklab, rgb2oklab, hsl2oklab, hwb2oklab, lab2oklab, lch2oklab, getOKLABComponents } from './oklab.js';
+import { srgb2oklab, lch2oklab, getOKLABComponents, lab2oklab, hwb2oklab, hsl2oklab, rgb2oklab, hex2oklab } from './oklab.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -1,4 +1,4 @@
-import { xyz2srgb, srgb2lsrgbvalues, lsrgb2srgbvalues } from './srgb.js';
+import { xyz2srgb, lsrgb2srgbvalues, srgb2lsrgbvalues } from './srgb.js';
 import { multiplyMatrices } from './utils/matrix.js';
 import './utils/constants.js';
 import '../../ast/types.js';

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

@@ -1,5 +1,5 @@
-import { xyzd502srgb, srgb2xyz } from './xyz.js';
-import { XYZ_D65_to_D50 } from './xyzd50.js';
+import { srgb2xyz } from './xyz.js';
+import { XYZ_D65_to_D50, xyzd502srgb } from './xyzd50.js';
 
 function prophotorgb2srgbvalues(r, g, b, a = null) {
     // @ts-ignore

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

@@ -1,5 +1,5 @@
-import { xyzd502srgb, srgb2xyz } from './xyz.js';
-import { XYZ_D65_to_D50 } from './xyzd50.js';
+import { srgb2xyz } from './xyz.js';
+import { XYZ_D65_to_D50, xyzd502srgb } from './xyzd50.js';
 
 function prophotorgb2srgbvalues(r, g, b, a = null) {
     // @ts-ignore

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

@@ -5,7 +5,7 @@ import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
 import { expandHexValue } from './hex.js';
-import { hwb2srgb, hslvalues, hsl2srgbvalues, cmyk2srgb, oklab2srgb, oklch2srgb, lab2srgb, lch2srgb } from './srgb.js';
+import { hslvalues, hsl2srgbvalues, hwb2srgb, cmyk2srgb, oklab2srgb, oklch2srgb, lab2srgb, lch2srgb } from './srgb.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 

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

@@ -6,8 +6,8 @@ import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
 import { expandHexValue } from './hex.js';
-import { lch2labvalues, getLABComponents, Lab_to_sRGB } from './lab.js';
-import { getOKLABComponents, OKLab_to_sRGB } from './oklab.js';
+import { lch2labvalues, Lab_to_sRGB, getLABComponents } from './lab.js';
+import { OKLab_to_sRGB, getOKLABComponents } from './oklab.js';
 import { getLCHComponents } from './lch.js';
 import { getOKLCHComponents } from './oklch.js';
 import { XYZ_to_lin_sRGB } from './xyz.js';

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

@@ -28,7 +28,7 @@ const colorRange = {
     }
 };
 const colorFuncColorSpace = ['srgb', 'srgb-linear', 'display-p3', 'prophoto-rgb', 'a98-rgb', 'rec2020', 'xyz', 'xyz-d65', 'xyz-d50'];
-({ typ: EnumToken.IdenTokenType, val: 'none' });
+({ typ: EnumToken.IdenTokenType});
 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);

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

@@ -4,26 +4,10 @@ import '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
-import { lsrgb2srgbvalues, srgb2lsrgbvalues } from './srgb.js';
+import { srgb2lsrgbvalues } from './srgb.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 
-function xyzd502srgb(x, y, z) {
-    // @ts-ignore
-    return lsrgb2srgbvalues(
-    /* r: */
-    x * 3.1341359569958707 -
-        y * 1.6173863321612538 -
-        0.4906619460083532 * z, 
-    /*  g: */
-    x * -0.978795502912089 +
-        y * 1.916254567259524 +
-        0.03344273116131949 * z, 
-    /*    b: */
-    x * 0.07195537988411677 -
-        y * 0.2289768264158322 +
-        1.405386058324125 * z);
-}
 function XYZ_to_lin_sRGB(x, y, z) {
     // convert XYZ to linear-light sRGB
     const M = [
@@ -63,4 +47,4 @@ function srgb2xyz(r, g, b, alpha) {
     return rgb;
 }
 
-export { XYZ_D50_to_D65, XYZ_to_lin_sRGB, srgb2xyz, xyzd502srgb };
+export { XYZ_D50_to_D65, XYZ_to_lin_sRGB, srgb2xyz };

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

@@ -1,3 +1,4 @@
+import { lsrgb2srgbvalues } from './srgb.js';
 import { multiplyMatrices } from './utils/matrix.js';
 import './utils/constants.js';
 import '../../ast/types.js';
@@ -10,11 +11,12 @@ import { XYZ_D50_to_D65 } from './xyz.js';
 import '../sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 
+/*
+*/
 function xyzd502lch(x, y, z, alpha) {
     // @ts-ignore
     const [l, a, b] = xyz2lab(...XYZ_D50_to_D65(x, y, z));
     // L in range [0,100]. For use in CSS, add a percent
-    // @ts-ignore
     return lab2lchvalues(l, a, b, alpha);
 }
 function XYZ_D65_to_D50(x, y, z) {
@@ -31,5 +33,21 @@ function XYZ_D65_to_D50(x, y, z) {
     ];
     return multiplyMatrices(M, [x, y, z]);
 }
+function xyzd502srgb(x, y, z) {
+    // @ts-ignore
+    return lsrgb2srgbvalues(
+    /* r: */
+    x * 3.1341359569958707 -
+        y * 1.6173863321612538 -
+        0.4906619460083532 * z, 
+    /*  g: */
+    x * -0.978795502912089 +
+        y * 1.916254567259524 +
+        0.03344273116131949 * z, 
+    /*    b: */
+    x * 0.07195537988411677 -
+        y * 0.2289768264158322 +
+        1.405386058324125 * z);
+}
 
-export { XYZ_D65_to_D50, xyzd502lch };
+export { XYZ_D65_to_D50, xyzd502lch, xyzd502srgb };

package/dist/lib/renderer/render.js

@@ -9,7 +9,7 @@ import { expand } from '../ast/expand.js';
 import { colorMix } from './color/colormix.js';
 import { parseRelativeColor } from './color/relativecolor.js';
 import { SourceMap } from './sourcemap/sourcemap.js';
-import { isColor, mathFuncs, isNewLine } from '../syntax/syntax.js';
+import { isColor, pseudoElements, mathFuncs, isNewLine } from '../syntax/syntax.js';
 
 const colorsFunc = ['rgb', 'rgba', 'hsl', 'hsla', 'hwb', 'device-cmyk', 'color-mix', 'color', 'oklab', 'lab', 'oklch', 'lch', 'light-dark'];
 function reduceNumber(val) {
@@ -41,17 +41,27 @@ function update(position, str) {
         }
     }
 }
+/**
+ * render ast
+ * @param data
+ * @param options
+ */
 function doRender(data, options = {}) {
+    const minify = options.minify ?? true;
+    const beautify = options.beautify ?? !minify;
     options = {
-        ...(options.minify ?? true ? {
+        ...(beautify ? {
+            indent: ' ',
+            newLine: '\n',
+        } : {
             indent: '',
             newLine: '',
+        }),
+        ...(minify ? {
             removeEmpty: true,
             removeComments: true
         } : {
-            indent: ' ',
-            newLine: '\n',
-            compress: false,
+            removeEmpty: false,
             removeComments: false,
         }), sourcemap: false, convertColor: true, expandNestingRules: false, preserveLicense: false, ...options
     };
@@ -119,7 +129,18 @@ function updateSourceMap(node, options, cache, sourcemap, position, str) {
     }
     update(position, str);
 }
-// @ts-ignore
+/**
+ * render ast node
+ * @param data
+ * @param options
+ * @param sourcemap
+ * @param position
+ * @param errors
+ * @param reducer
+ * @param cache
+ * @param level
+ * @param indents
+ */
 function renderAstNode(data, options, sourcemap, position, errors, reducer, cache, level = 0, indents = []) {
     if (indents.length < level + 1) {
         indents.push(options.indent.repeat(level));
@@ -212,8 +233,15 @@ function renderAstNode(data, options, sourcemap, position, errors, reducer, cach
             // return renderToken(data as Token, options, cache, reducer, errors);
             throw new Error(`render: unexpected token ${JSON.stringify(data, null, 1)}`);
     }
-    return '';
 }
+/**
+ * render ast token
+ * @param token
+ * @param options
+ * @param cache
+ * @param reducer
+ * @param errors
+ */
 function renderToken(token, options = {}, cache = Object.create(null), reducer, errors) {
     if (reducer == null) {
         reducer = function (acc, curr) {
@@ -561,8 +589,9 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
                 return '';
             }
         case EnumToken.PseudoClassTokenType:
+        case EnumToken.PseudoElementTokenType:
             // https://www.w3.org/TR/selectors-4/#single-colon-pseudos
-            if (token.typ == EnumToken.PseudoClassTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
+            if (token.typ == EnumToken.PseudoElementTokenType && pseudoElements.includes(token.val.slice(1))) {
                 return token.val.slice(1);
             }
         case EnumToken.UrlTokenTokenType:

package/dist/lib/renderer/sourcemap/sourcemap.js

@@ -1,11 +1,11 @@
 import { encode } from './lib/encode.js';
 
 class SourceMap {
+    lastLocation = null;
     #version = 3;
     #sources = [];
     #map = new Map;
     #line = -1;
-    lastLocation = null;
     add(source, original) {
         if (original.src !== '') {
             if (!this.#sources.includes(original.src)) {