@tbela99/css-parser 1.3.3 → 1.4.0

package/dist/node.js

@@ -1,7 +1,8 @@
 import process from 'node:process';
-export { ColorType, EnumToken, ValidationLevel } from './lib/ast/types.js';
+import { ModuleScopeEnumOptions } from './lib/ast/types.js';
+export { ColorType, EnumToken, ModuleCaseTransformEnum, ValidationLevel } from './lib/ast/types.js';
 export { minify } from './lib/ast/minify.js';
-export { WalkerOptionEnum, WalkerValueEvent, walk, walkValues } from './lib/ast/walk.js';
+export { WalkerEvent, WalkerOptionEnum, walk, walkValues } from './lib/ast/walk.js';
 export { expand } from './lib/ast/expand.js';
 import { doRender } from './lib/renderer/render.js';
 export { renderToken } from './lib/renderer/render.js';
@@ -14,42 +15,58 @@ export { convertColor } from './lib/syntax/color/color.js';
 import './lib/syntax/color/utils/constants.js';
 export { isOkLabClose, okLabDistance } from './lib/syntax/color/utils/distance.js';
 import './lib/validation/config.js';
-import './lib/validation/parser/types.js';
 import './lib/validation/parser/parse.js';
 import './lib/validation/syntaxes/complex-selector.js';
 import './lib/validation/syntax.js';
 import { resolve, matchUrl, dirname } from './lib/fs/resolve.js';
 import { Readable } from 'node:stream';
 import { createReadStream } from 'node:fs';
-import { lstat } from 'node:fs/promises';
+import { readFile, lstat } from 'node:fs/promises';
+import { ResponseType } from './types.js';
 export { FeatureWalkMode } from './lib/ast/features/type.js';
 
 /**
  * load file or url as stream
  * @param url
  * @param currentFile
+ * @param responseType
  * @throws Error file not found
  *
  * @private
  */
-async function load(url, currentFile = '.') {
+async function load(url, currentFile = '.', responseType = false) {
     const resolved = resolve(url, currentFile);
-    // @ts-ignore
+    if (typeof responseType == 'boolean') {
+        responseType = responseType ? ResponseType.ReadableStream : ResponseType.Text;
+    }
     if (matchUrl.test(resolved.absolute)) {
-        return fetch(resolved.absolute).then((response) => {
+        return fetch(resolved.absolute).then(async (response) => {
             if (!response.ok) {
                 throw new Error(`${response.status} ${response.statusText} ${response.url}`);
             }
-            return response.body;
+            if (responseType == ResponseType.ArrayBuffer) {
+                return response.arrayBuffer();
+            }
+            return responseType == ResponseType.ReadableStream ? response.body : await response.text();
         });
     }
     try {
+        if (responseType == ResponseType.Text) {
+            return readFile(resolved.absolute, 'utf-8');
+        }
+        if (responseType == ResponseType.ArrayBuffer) {
+            return readFile(resolved.absolute).then(buffer => buffer.buffer);
+        }
         const stats = await lstat(resolved.absolute);
         if (stats.isFile()) {
-            return Readable.toWeb(createReadStream(resolved.absolute));
+            return Readable.toWeb(createReadStream(resolved.absolute, {
+                encoding: 'utf-8',
+                highWaterMark: 64 * 1024
+            }));
         }
     }
     catch (error) {
+        console.warn(error);
     }
     throw new Error(`File not found: '${resolved.absolute || url}'`);
 }
@@ -57,6 +74,7 @@ async function load(url, currentFile = '.') {
  * render the ast tree
  * @param data
  * @param options
+ * @param mapping
  *
  * Example:
  *
@@ -81,13 +99,14 @@ async function load(url, currentFile = '.') {
  * // }
  * ```
  */
-function render(data, options = {}) {
-    return doRender(data, Object.assign(options, { resolve, dirname, cwd: options.cwd ?? process.cwd() }));
+function render(data, options = {}, mapping) {
+    return doRender(data, Object.assign(options, { resolve, dirname, cwd: options.cwd ?? process.cwd() }), mapping);
 }
 /**
  * parse css file
  * @param file url or path
  * @param options
+ * @param asStream load file as stream
  *
  * @throws Error file not found
  *
@@ -106,8 +125,8 @@ function render(data, options = {}) {
  * console.log(result.ast);
  * ```
  */
-async function parseFile(file, options = {}) {
-    return load(file).then(stream => parse(stream, { src: file, ...options }));
+async function parseFile(file, options = {}, asStream = false) {
+    return Promise.resolve((options.load ?? load)(file, '.', asStream)).then(stream => parse(stream, { src: file, ...options }));
 }
 /**
  * parse css
@@ -156,14 +175,24 @@ async function parse(stream, options = {}) {
     return doParse(stream instanceof ReadableStream ? tokenizeStream(stream) : tokenize({
         stream,
         buffer: '',
+        offset: 0,
         position: { ind: 0, lin: 1, col: 1 },
         currentPosition: { ind: -1, lin: 1, col: 0 }
-    }), Object.assign(options, { load, resolve, dirname, cwd: options.cwd ?? process.cwd() }));
+    }), Object.assign(options, {
+        load,
+        resolve,
+        dirname,
+        cwd: options.cwd ?? process.cwd()
+    })).then(result => {
+        const { revMapping, ...res } = result;
+        return res;
+    });
 }
 /**
  * transform css file
  * @param file url or path
  * @param options
+ * @param asStream load file as stream
  *
  * @throws Error file not found
  *
@@ -182,8 +211,8 @@ async function parse(stream, options = {}) {
  * console.log(result.code);
  * ```
  */
-async function transformFile(file, options = {}) {
-    return load(file).then(stream => transform(stream, { src: file, ...options }));
+async function transformFile(file, options = {}, asStream = false) {
+    return Promise.resolve((options.load ?? load)(file, '.', asStream)).then(stream => transform(stream, { src: file, ...options }));
 }
 /**
  * transform css
@@ -232,8 +261,21 @@ async function transform(css, options = {}) {
     options = { minify: true, removeEmpty: true, removeCharset: true, ...options };
     const startTime = performance.now();
     return parse(css, options).then((parseResult) => {
+        let mapping = null;
+        let importMapping = null;
+        if (typeof options.module == 'number' && (options.module & ModuleScopeEnumOptions.ICSS)) {
+            mapping = parseResult.mapping;
+            importMapping = parseResult.importMapping;
+        }
+        else if (typeof options.module == 'object' && typeof options.module.scoped == 'number' && (options.module.scoped & ModuleScopeEnumOptions.ICSS)) {
+            mapping = parseResult.mapping;
+            importMapping = parseResult.importMapping;
+        }
         // ast already expanded by parse
-        const rendered = render(parseResult.ast, { ...options, expandNestingRules: false });
+        const rendered = render(parseResult.ast, {
+            ...options,
+            expandNestingRules: false
+        }, mapping != null ? { mapping, importMapping } : null);
         return {
             ...parseResult,
             ...rendered,
@@ -248,4 +290,4 @@ async function transform(css, options = {}) {
     });
 }
 
-export { dirname, load, parse, parseFile, render, resolve, transform, transformFile };
+export { ModuleScopeEnumOptions, ResponseType, dirname, load, parse, parseFile, render, resolve, transform, transformFile };

package/dist/types.d.ts

@@ -0,0 +1,17 @@
+/**
+ * response type
+ */
+export declare enum ResponseType {
+    /**
+     * return text
+     */
+    Text = 0,
+    /**
+     * return a readable stream
+     */
+    ReadableStream = 1,
+    /**
+     * return an arraybuffer
+     */
+    ArrayBuffer = 2
+}

package/dist/types.js

@@ -0,0 +1,20 @@
+/**
+ * response type
+ */
+var ResponseType;
+(function (ResponseType) {
+    /**
+     * return text
+     */
+    ResponseType[ResponseType["Text"] = 0] = "Text";
+    /**
+     * return a readable stream
+     */
+    ResponseType[ResponseType["ReadableStream"] = 1] = "ReadableStream";
+    /**
+     * return an arraybuffer
+     */
+    ResponseType[ResponseType["ArrayBuffer"] = 2] = "ArrayBuffer";
+})(ResponseType || (ResponseType = {}));
+
+export { ResponseType };

package/dist/web.js

@@ -1,6 +1,7 @@
-export { ColorType, EnumToken, ValidationLevel } from './lib/ast/types.js';
+import { ModuleScopeEnumOptions } from './lib/ast/types.js';
+export { ColorType, EnumToken, ModuleCaseTransformEnum, ValidationLevel } from './lib/ast/types.js';
 export { minify } from './lib/ast/minify.js';
-export { WalkerOptionEnum, WalkerValueEvent, walk, walkValues } from './lib/ast/walk.js';
+export { WalkerEvent, WalkerOptionEnum, walk, walkValues } from './lib/ast/walk.js';
 export { expand } from './lib/ast/expand.js';
 import { doRender } from './lib/renderer/render.js';
 export { renderToken } from './lib/renderer/render.js';
@@ -13,11 +14,11 @@ export { convertColor } from './lib/syntax/color/color.js';
 import './lib/syntax/color/utils/constants.js';
 export { isOkLabClose, okLabDistance } from './lib/syntax/color/utils/distance.js';
 import './lib/validation/config.js';
-import './lib/validation/parser/types.js';
 import './lib/validation/parser/parse.js';
 import './lib/validation/syntaxes/complex-selector.js';
 import './lib/validation/syntax.js';
 import { matchUrl, resolve, dirname } from './lib/fs/resolve.js';
+import { ResponseType } from './types.js';
 export { FeatureWalkMode } from './lib/ast/features/type.js';
 
 /**
@@ -25,9 +26,13 @@ export { FeatureWalkMode } from './lib/ast/features/type.js';
  * @param url
  * @param currentFile
  *
+ * @param responseType
  * @private
  */
-async function load(url, currentFile = '.') {
+async function load(url, currentFile = '.', responseType = false) {
+    if (typeof responseType == 'boolean') {
+        responseType = responseType ? ResponseType.ReadableStream : ResponseType.Text;
+    }
     let t;
     if (matchUrl.test(url)) {
         t = new URL(url);
@@ -37,21 +42,23 @@ async function load(url, currentFile = '.') {
     }
     else {
         const path = resolve(url, currentFile).absolute;
-        // @ts-ignore
         t = new URL(path, self.origin);
     }
-    // @ts-ignore
-    return fetch(t, t.origin != self.origin ? { mode: 'cors' } : {}).then((response) => {
+    return fetch(t, t.origin != self.origin ? { mode: 'cors' } : {}).then(async (response) => {
         if (!response.ok) {
             throw new Error(`${response.status} ${response.statusText} ${response.url}`);
         }
-        return response.body;
+        if (responseType == ResponseType.ArrayBuffer) {
+            return response.arrayBuffer();
+        }
+        return responseType == ResponseType.ReadableStream ? response.body : await response.text();
     });
 }
 /**
  * render the ast tree
  * @param data
  * @param options
+ * @param mapping
  *
  * Example:
  *
@@ -76,17 +83,18 @@ async function load(url, currentFile = '.') {
  * // }
  * ```
  */
-function render(data, options = {}) {
+function render(data, options = {}, mapping) {
     return doRender(data, Object.assign(options, {
         resolve,
         dirname,
         cwd: options.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
-    }));
+    }), mapping);
 }
 /**
  * parse css file
  * @param file url or path
  * @param options
+ * @param asStream load file as stream
  *
  * @throws Error file not found
  *
@@ -105,8 +113,8 @@ function render(data, options = {}) {
  * console.log(result.ast);
  * ```
  */
-async function parseFile(file, options = {}) {
-    return load(file).then(stream => parse(stream, { src: file, ...options }));
+async function parseFile(file, options = {}, asStream = false) {
+    return Promise.resolve((options.load ?? load)(file, '.', asStream)).then(stream => parse(stream, { src: file, ...options }));
 }
 /**
  * parse css
@@ -140,6 +148,7 @@ async function parse(stream, options = {}) {
     return doParse(stream instanceof ReadableStream ? tokenizeStream(stream) : tokenize({
         stream,
         buffer: '',
+        offset: 0,
         position: { ind: 0, lin: 1, col: 1 },
         currentPosition: { ind: -1, lin: 1, col: 0 }
     }), Object.assign(options, {
@@ -147,12 +156,16 @@ async function parse(stream, options = {}) {
         resolve,
         dirname,
         cwd: options.cwd ?? self.location.pathname.endsWith('/') ? self.location.pathname : dirname(self.location.pathname)
-    }));
+    })).then(result => {
+        const { revMapping, ...res } = result;
+        return res;
+    });
 }
 /**
  * transform css file
  * @param file url or path
  * @param options
+ * @param asStream load file as stream
  *
  * Example:
  *
@@ -169,8 +182,8 @@ async function parse(stream, options = {}) {
  * console.log(result.code);
  * ```
  */
-async function transformFile(file, options = {}) {
-    return load(file).then(stream => transform(stream, { src: file, ...options }));
+async function transformFile(file, options = {}, asStream = false) {
+    return Promise.resolve((options.load ?? load)(file, '.', asStream)).then(stream => transform(stream, { src: file, ...options }));
 }
 /**
  * transform css
@@ -198,8 +211,21 @@ async function transform(css, options = {}) {
     options = { minify: true, removeEmpty: true, removeCharset: true, ...options };
     const startTime = performance.now();
     return parse(css, options).then((parseResult) => {
+        let mapping = null;
+        let importMapping = null;
+        if (typeof options.module == 'number' && (options.module & ModuleScopeEnumOptions.ICSS)) {
+            mapping = parseResult.mapping;
+            importMapping = parseResult.importMapping;
+        }
+        else if (typeof options.module == 'object' && typeof options.module.scoped == 'number' && (options.module.scoped & ModuleScopeEnumOptions.ICSS)) {
+            mapping = parseResult.mapping;
+            importMapping = parseResult.importMapping;
+        }
         // ast already expanded by parse
-        const rendered = render(parseResult.ast, { ...options, expandNestingRules: false });
+        const rendered = render(parseResult.ast, {
+            ...options,
+            expandNestingRules: false
+        }, mapping != null ? { mapping, importMapping } : null);
         return {
             ...parseResult,
             ...rendered,
@@ -214,4 +240,4 @@ async function transform(css, options = {}) {
     });
 }
 
-export { dirname, load, parse, parseFile, render, resolve, transform, transformFile };
+export { ModuleScopeEnumOptions, ResponseType, dirname, load, parse, parseFile, render, resolve, transform, transformFile };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser, minifier and validator for node and the browser",
-  "version": "v1.3.3",
+  "version": "v1.4.0",
   "exports": {
     ".": "./dist/node.js",
     "./node": "./dist/node.js",
@@ -15,15 +15,15 @@
   },
   "scripts": {
     "doc": "typedoc --tsconfig typedoc-tsconfig.jsonc",
-    "build": "rollup -c;./build.sh dist/index.d.ts 'declare interface' 'declare type'",
-    "test": "web-test-runner \"test/**/web.spec.js\" --timeout=10000 --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
-    "test:web": "web-test-runner \"test/**/web.spec.js\" --timeout 30000 --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.",
+    "build": "rollup -c;./build.sh ./dist/index.d.ts 'declare interface' 'declare type'",
+    "test": "web-test-runner \"./test/**/web.spec.js\" --timeout=10000 --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
+    "test:web": "web-test-runner \"./test/**/web.spec.js\" --timeout 30000 --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.",
     "test:node": "mocha -p --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
     "test:cov": "c8 -x 'test/specs/**/*.js' --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
     "test:web-cov": "web-test-runner -x 'test/specs/**/*.js' \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=. --coverage",
     "profile": "node --enable-source-maps --inspect-brk test/inspect.js",
     "syntax-update": "esno tools/validation.ts",
-    "debug": "web-test-runner \"test/**/web.spec.js\" --manual --open --node-resolve --root-dir=."
+    "debug": "web-test-runner \"./test/**/web.spec.js\" --manual --open --node-resolve --root-dir=."
   },
   "repository": {
     "type": "git",
@@ -42,7 +42,10 @@
     "css-nesting",
     "css-compiler",
     "nested-css",
-    "walker"
+    "walker",
+    "stream",
+    "streaming",
+    "streaming-parser"
   ],
   "author": "Thierry Bela",
   "license": "MIT OR LGPL-3.0",
@@ -52,24 +55,24 @@
   "homepage": "https://github.com/tbela99/css-parser#readme",
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@rollup/plugin-commonjs": "^28.0.6",
+    "@rollup/plugin-commonjs": "^28.0.8",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.4",
-    "@types/chai": "^5.2.2",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.0.10",
-    "@types/web": "^0.0.245",
+    "@types/node": "^24.9.1",
+    "@types/web": "^0.0.274",
     "@web/test-runner": "^0.20.2",
     "@web/test-runner-playwright": "^0.11.1",
     "c8": "^10.1.3",
     "esno": "^4.8.0",
-    "mocha": "^11.7.1",
-    "playwright": "^1.55.0",
-    "rollup": "^4.48.0",
-    "rollup-plugin-dts": "^6.2.1",
+    "mocha": "^11.7.4",
+    "playwright": "^1.56.1",
+    "rollup": "^4.52.5",
+    "rollup-plugin-dts": "^6.2.3",
     "tslib": "^2.8.1",
-    "typedoc": "^0.28.10",
+    "typedoc": "^0.28.14",
     "typedoc-material-theme": "^1.4.0"
   }
 }

package/dist/lib/validation/parser/types.js

@@ -1,54 +0,0 @@
-var ValidationTokenEnum;
-(function (ValidationTokenEnum) {
-    ValidationTokenEnum[ValidationTokenEnum["Root"] = 0] = "Root";
-    ValidationTokenEnum[ValidationTokenEnum["Keyword"] = 1] = "Keyword";
-    ValidationTokenEnum[ValidationTokenEnum["PropertyType"] = 2] = "PropertyType";
-    ValidationTokenEnum[ValidationTokenEnum["DeclarationType"] = 3] = "DeclarationType";
-    ValidationTokenEnum[ValidationTokenEnum["AtRule"] = 4] = "AtRule";
-    ValidationTokenEnum[ValidationTokenEnum["ValidationFunctionDefinition"] = 5] = "ValidationFunctionDefinition";
-    ValidationTokenEnum[ValidationTokenEnum["OpenBracket"] = 6] = "OpenBracket";
-    ValidationTokenEnum[ValidationTokenEnum["CloseBracket"] = 7] = "CloseBracket";
-    ValidationTokenEnum[ValidationTokenEnum["OpenParenthesis"] = 8] = "OpenParenthesis";
-    ValidationTokenEnum[ValidationTokenEnum["CloseParenthesis"] = 9] = "CloseParenthesis";
-    ValidationTokenEnum[ValidationTokenEnum["Comma"] = 10] = "Comma";
-    ValidationTokenEnum[ValidationTokenEnum["Pipe"] = 11] = "Pipe";
-    ValidationTokenEnum[ValidationTokenEnum["Column"] = 12] = "Column";
-    ValidationTokenEnum[ValidationTokenEnum["Star"] = 13] = "Star";
-    ValidationTokenEnum[ValidationTokenEnum["OpenCurlyBrace"] = 14] = "OpenCurlyBrace";
-    ValidationTokenEnum[ValidationTokenEnum["CloseCurlyBrace"] = 15] = "CloseCurlyBrace";
-    ValidationTokenEnum[ValidationTokenEnum["HashMark"] = 16] = "HashMark";
-    ValidationTokenEnum[ValidationTokenEnum["QuestionMark"] = 17] = "QuestionMark";
-    ValidationTokenEnum[ValidationTokenEnum["Function"] = 18] = "Function";
-    ValidationTokenEnum[ValidationTokenEnum["Number"] = 19] = "Number";
-    ValidationTokenEnum[ValidationTokenEnum["Whitespace"] = 20] = "Whitespace";
-    ValidationTokenEnum[ValidationTokenEnum["Parenthesis"] = 21] = "Parenthesis";
-    ValidationTokenEnum[ValidationTokenEnum["Bracket"] = 22] = "Bracket";
-    ValidationTokenEnum[ValidationTokenEnum["Block"] = 23] = "Block";
-    ValidationTokenEnum[ValidationTokenEnum["AtLeastOnce"] = 24] = "AtLeastOnce";
-    ValidationTokenEnum[ValidationTokenEnum["Separator"] = 25] = "Separator";
-    ValidationTokenEnum[ValidationTokenEnum["Exclamation"] = 26] = "Exclamation";
-    ValidationTokenEnum[ValidationTokenEnum["Ampersand"] = 27] = "Ampersand";
-    ValidationTokenEnum[ValidationTokenEnum["PipeToken"] = 28] = "PipeToken";
-    ValidationTokenEnum[ValidationTokenEnum["ColumnToken"] = 29] = "ColumnToken";
-    ValidationTokenEnum[ValidationTokenEnum["AmpersandToken"] = 30] = "AmpersandToken";
-    ValidationTokenEnum[ValidationTokenEnum["Parens"] = 31] = "Parens";
-    ValidationTokenEnum[ValidationTokenEnum["PseudoClassToken"] = 32] = "PseudoClassToken";
-    ValidationTokenEnum[ValidationTokenEnum["PseudoClassFunctionToken"] = 33] = "PseudoClassFunctionToken";
-    ValidationTokenEnum[ValidationTokenEnum["StringToken"] = 34] = "StringToken";
-    ValidationTokenEnum[ValidationTokenEnum["AtRuleDefinition"] = 35] = "AtRuleDefinition";
-    ValidationTokenEnum[ValidationTokenEnum["DeclarationNameToken"] = 36] = "DeclarationNameToken";
-    ValidationTokenEnum[ValidationTokenEnum["DeclarationDefinitionToken"] = 37] = "DeclarationDefinitionToken";
-    ValidationTokenEnum[ValidationTokenEnum["SemiColon"] = 38] = "SemiColon";
-    ValidationTokenEnum[ValidationTokenEnum["Character"] = 39] = "Character";
-    ValidationTokenEnum[ValidationTokenEnum["InfinityToken"] = 40] = "InfinityToken";
-})(ValidationTokenEnum || (ValidationTokenEnum = {}));
-var ValidationSyntaxGroupEnum;
-(function (ValidationSyntaxGroupEnum) {
-    ValidationSyntaxGroupEnum["Declarations"] = "declarations";
-    ValidationSyntaxGroupEnum["Functions"] = "functions";
-    ValidationSyntaxGroupEnum["Syntaxes"] = "syntaxes";
-    ValidationSyntaxGroupEnum["Selectors"] = "selectors";
-    ValidationSyntaxGroupEnum["AtRules"] = "atRules";
-})(ValidationSyntaxGroupEnum || (ValidationSyntaxGroupEnum = {}));
-
-export { ValidationSyntaxGroupEnum, ValidationTokenEnum };