Merge pull request #68 from tbela99/feature/minification_passes

tbela99 · web-flow · commit c4a2a1b876fb · 2025-02-28T21:33:06.000-05:00
minification passes #66
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![playground](https://img.shields.io/badge/playground-try%20it%20now-%230a7398
 )](https://tbela99.github.io/css-parser/playground/) [![npm](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Ftbela99%2Fcss-parser%2Fmaster%2Fpackage.json&query=version&logo=npm&label=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser) [![npm](https://img.shields.io/jsr/v/%40tbela99/css-parser?link=https%3A%2F%2Fjsr.io%2F%40tbela99%2Fcss-parser
-)](https://jsr.io/@tbela99/css-parser) [![cov](https://tbela99.github.io/css-parser/badges/coverage.svg)](https://github.com/tbela99/css-parser/actions) [![NPM Downloads](https://img.shields.io/npm/dm/%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser)
+)](https://jsr.io/@tbela99/css-parser) [![cov](https://tbela99.github.io/css-parser/badges/coverage.svg)](https://github.com/tbela99/css-parser/actions) [![NPM Downloads](https://img.shields.io/npm/dm/%40tbela99%2Fcss-parser)](https://www.npmjs.com/package/@tbela99/css-parser) [![bundle size](https://img.shields.io/bundlejs/size/%40tbela99/css-parser%400.9.0?exports=cjs)](https://www.npmjs.com/package/@tbela99/css-parser)
 
 # css-parser
 
@@ -65,7 +65,7 @@ import as a module
 
 ```javascript
 
-import {transform} from 'npm:@tbela99/css-parser';
+import {transform} from '@tbela99/css-parser';
 
 // ...
 ```
@@ -96,7 +96,7 @@ Javascript module from cdn
 
 <script type="module">
 
-    import {transform} from 'https://esm.sh/@tbela99/css-parser@0.4.0/web';
+    import {transform} from 'https://esm.sh/@tbela99/css-parser@0.9.0/web';
 
 
     const css = `
@@ -154,6 +154,7 @@ Include ParseOptions and RenderOptions
 > Minify Options
 
 - minify: boolean, optional. default to _true_. optimize ast.
+- pass: number, optional. minification pass. default to 1
 - nestingRules: boolean, optional. automatically generated nested rules.
 - expandNestingRules: boolean, optional. convert nesting rules into separate rules. will automatically set nestingRules
   to false.
diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js
@@ -15910,6 +15910,7 @@
             src: '',
             sourcemap: false,
             minify: true,
+            pass: 1,
             parseColor: true,
             nestingRules: false,
             resolveImport: false,
@@ -16089,7 +16090,10 @@
         }
         if (options.minify) {
             if (ast.chi.length > 0) {
-                minify(ast, options, true, errors, false);
+                let passes = options.pass ?? 1;
+                while (passes--) {
+                    minify(ast, options, true, errors, false);
+                }
             }
         }
         const endTime = performance.now();
diff --git a/dist/index.cjs b/dist/index.cjs
@@ -15909,6 +15909,7 @@ async function doParse(iterator, options = {}) {
         src: '',
         sourcemap: false,
         minify: true,
+        pass: 1,
         parseColor: true,
         nestingRules: false,
         resolveImport: false,
@@ -16088,7 +16089,10 @@ async function doParse(iterator, options = {}) {
     }
     if (options.minify) {
         if (ast.chi.length > 0) {
-            minify(ast, options, true, errors, false);
+            let passes = options.pass ?? 1;
+            while (passes--) {
+                minify(ast, options, true, errors, false);
+            }
         }
     }
     const endTime = performance.now();
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -129,7 +129,7 @@ declare enum EnumToken {
  * @param nestingContent
  * @param context
  */
-declare function minify(ast: AstNode, options?: ParserOptions | MinifyOptions, recursive?: boolean, errors?: ErrorDescription[], nestingContent?: boolean, context?: {
+declare function minify(ast: AstNode, options?: ParserOptions | MinifyFeatureOptions, recursive?: boolean, errors?: ErrorDescription[], nestingContent?: boolean, context?: {
     [key: string]: any;
 }): AstNode;
 
@@ -1035,24 +1035,29 @@ interface ValidationOptions {
     lenient?: boolean;
 }
 
-export declare interface ParserOptions extends ValidationOptions, PropertyListOptions {
+interface MinifyOptions {
 
     minify?: boolean;
-    src?: string;
-    sourcemap?: boolean;
     nestingRules?: boolean;
     expandNestingRules?: boolean;
-    removeCharset?: boolean;
+    removeDuplicateDeclarations?: boolean;
+    computeShorthand?: boolean;
+    computeCalcExpression?: boolean;
+    inlineCssVariables?: boolean;
     removeEmpty?: boolean;
+    pass?: number;
+}
+
+export declare interface ParserOptions extends MinifyOptions, ValidationOptions, PropertyListOptions {
+
+    src?: string;
+    sourcemap?: boolean;
+    removeCharset?: boolean;
     resolveUrls?: boolean;
     resolveImport?: boolean;
     cwd?: string;
     parseColor?: boolean;
-    removeDuplicateDeclarations?: boolean;
-    computeShorthand?: boolean;
     removePrefix?: boolean;
-    inlineCssVariables?: boolean;
-    computeCalcExpression?: boolean;
     load?: (url: string, currentUrl: string) => Promise<string>;
     dirname?: (path: string) => string;
     resolve?: (url: string, currentUrl: string, currentWorkingDirectory?: string) => {
@@ -1064,7 +1069,7 @@ export declare interface ParserOptions extends ValidationOptions, PropertyListOp
     setParent?: boolean;
 }
 
-export declare interface MinifyOptions extends ParserOptions {
+export declare interface MinifyFeatureOptions extends ParserOptions {
 
     features: MinifyFeature[];
 }
@@ -1073,7 +1078,7 @@ export declare interface MinifyFeature {
 
     ordering: number;
 
-    register(options: MinifyOptions | ParserOptions): void;
+    register(options: MinifyFeatureOptions | ParserOptions): void;
 
     // run(ast: AstRule | AstAtRule, options: ParserOptions = {}, parent: AstRule | AstAtRule | AstRuleStyleSheet, context: { [key: string]: any }): void;
 
@@ -1083,7 +1088,7 @@ export declare interface MinifyFeature {
 export declare interface MinifyFeature {
 
     ordering: number;
-    register: (options: MinifyOptions | ParserOptions) => void;
+    register: (options: MinifyFeatureOptions | ParserOptions) => void;
     run: (ast: AstRule | AstAtRule, options: ParserOptions, parent: AstRule | AstAtRule | AstRuleStyleSheet, context: {
         [key: string]: any
     }) => void;
diff --git a/dist/lib/parser/parse.js b/dist/lib/parser/parse.js
@@ -46,6 +46,7 @@ async function doParse(iterator, options = {}) {
         src: '',
         sourcemap: false,
         minify: true,
+        pass: 1,
         parseColor: true,
         nestingRules: false,
         resolveImport: false,
@@ -225,7 +226,10 @@ async function doParse(iterator, options = {}) {
     }
     if (options.minify) {
         if (ast.chi.length > 0) {
-            minify(ast, options, true, errors, false);
+            let passes = options.pass ?? 1;
+            while (passes--) {
+                minify(ast, options, true, errors, false);
+            }
         }
     }
     const endTime = performance.now();
diff --git a/jsr.json b/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@tbela99/css-parser",
-  "version": "0.9.0",
+  "version": "0.9.1-alpha1",
   "publish": {
     "include": [
       "src",
diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "v0.9.0",
+  "version": "v0.9.1-alpah1",
   "exports": {
     ".": "./dist/node/index.js",
+    "./node": "./dist/node/index.js",
     "./umd": "./dist/index-umd-web.js",
     "./web": "./dist/web/index.js",
     "./cjs": "./dist/index.cjs"
diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts
@@ -29,7 +29,7 @@ export declare interface MinifyFeature {
 
     ordering: number;
 
-    register(options: MinifyOptions | ParserOptions): void;
+    register(options: MinifyFeatureOptions | ParserOptions): void;
 
     // run(ast: AstRule | AstAtRule, options: ParserOptions = {}, parent: AstRule | AstAtRule | AstRuleStyleSheet, context: { [key: string]: any }): void;
 
@@ -42,24 +42,29 @@ export interface ValidationOptions {
     lenient?: boolean;
 }
 
-export declare interface ParserOptions extends ValidationOptions, PropertyListOptions {
+export interface MinifyOptions {
 
     minify?: boolean;
-    src?: string;
-    sourcemap?: boolean;
     nestingRules?: boolean;
     expandNestingRules?: boolean;
-    removeCharset?: boolean;
+    removeDuplicateDeclarations?: boolean;
+    computeShorthand?: boolean;
+    computeCalcExpression?: boolean;
+    inlineCssVariables?: boolean;
     removeEmpty?: boolean;
+    pass?: number;
+}
+
+export declare interface ParserOptions extends MinifyOptions, ValidationOptions, PropertyListOptions {
+
+    src?: string;
+    sourcemap?: boolean;
+    removeCharset?: boolean;
     resolveUrls?: boolean;
     resolveImport?: boolean;
     cwd?: string;
     parseColor?: boolean;
-    removeDuplicateDeclarations?: boolean;
-    computeShorthand?: boolean;
     removePrefix?: boolean;
-    inlineCssVariables?: boolean;
-    computeCalcExpression?: boolean;
     load?: (url: string, currentUrl: string) => Promise<string>;
     dirname?: (path: string) => string;
     resolve?: (url: string, currentUrl: string, currentWorkingDirectory?: string) => {
@@ -71,15 +76,15 @@ export declare interface ParserOptions extends ValidationOptions, PropertyListOp
     setParent?: boolean;
 }
 
-export declare interface MinifyOptions extends ParserOptions {
+export declare interface MinifyFeatureOptions extends ParserOptions {
 
     features: MinifyFeature[];
 }
 
 export declare interface MinifyFeature {
 
     ordering: number;
-    register: (options: MinifyOptions | ParserOptions) => void;
+    register: (options: MinifyFeatureOptions | ParserOptions) => void;
     run: (ast: AstRule | AstAtRule, options: ParserOptions, parent: AstRule | AstAtRule | AstRuleStyleSheet, context: {
         [key: string]: any
     }) => void;
diff --git a/src/lib/ast/features/calc.ts b/src/lib/ast/features/calc.ts
@@ -5,7 +5,7 @@ import type {
     AstRule,
     BinaryExpressionToken,
     FunctionToken,
-    MinifyOptions,
+    MinifyFeatureOptions,
     NumberToken,
     ParensToken,
     Token,
@@ -23,7 +23,7 @@ export class ComputeCalcExpressionFeature {
         return 1;
     }
 
-    static register(options: MinifyOptions): void {
+    static register(options: MinifyFeatureOptions): void {
 
         if (options.computeCalcExpression) {
 
diff --git a/src/lib/ast/features/inlinecssvariables.ts b/src/lib/ast/features/inlinecssvariables.ts
@@ -7,7 +7,7 @@ import type {
     AstRuleStyleSheet,
     CommentToken,
     FunctionToken,
-    MinifyOptions,
+    MinifyFeatureOptions,
     ParserOptions,
     VariableScopeInfo
 } from "../../../@types";
@@ -55,7 +55,7 @@ export class InlineCssVariablesFeature {
         return 0;
     }
 
-    static register(options: MinifyOptions): void {
+    static register(options: MinifyFeatureOptions): void {
 
         if (options.inlineCssVariables) {
 
diff --git a/src/lib/ast/features/prefix.ts b/src/lib/ast/features/prefix.ts
@@ -1,5 +1,5 @@
 import {EnumToken} from "../types";
-import type {AstAtRule, AstDeclaration, AstRule, MinifyOptions, Token} from "../../../@types";
+import type {AstAtRule, AstDeclaration, AstRule, MinifyFeatureOptions, Token} from "../../../@types";
 import {
     getSyntaxConfig,
     ValidationAmpersandToken,
@@ -21,7 +21,7 @@ export class ComputePrefixFeature {
         return 2;
     }
 
-    static register(options: MinifyOptions) {
+    static register(options: MinifyFeatureOptions) {
 
         if (options.removePrefix) {
 
diff --git a/src/lib/ast/features/shorthand.ts b/src/lib/ast/features/shorthand.ts
@@ -1,14 +1,14 @@
 import {PropertyList} from "../../parser/declaration";
 import {EnumToken} from "../types";
-import type {AstAtRule, AstRule, AstRuleStyleSheet, MinifyOptions, PropertyListOptions} from "../../../@types";
+import type {AstAtRule, AstRule, AstRuleStyleSheet, MinifyFeatureOptions, PropertyListOptions} from "../../../@types";
 
 export class ComputeShorthandFeature {
 
     static get ordering() {
         return 2;
     }
 
-    static register(options: MinifyOptions) {
+    static register(options: MinifyFeatureOptions) {
 
         if (options.computeShorthand) {
 
diff --git a/src/lib/ast/minify.ts b/src/lib/ast/minify.ts
@@ -14,7 +14,7 @@ import type {
     LiteralToken,
     MatchedSelector,
     MinifyFeature,
-    MinifyOptions,
+    MinifyFeatureOptions,
     OptimizedSelector,
     ParserOptions,
     RawSelectorTokens,
@@ -38,7 +38,7 @@ const features: MinifyFeature[] = <MinifyFeature[]>Object.values(allFeatures).so
  * @param nestingContent
  * @param context
  */
-export function minify(ast: AstNode, options: ParserOptions | MinifyOptions = {}, recursive: boolean = false, errors?: ErrorDescription[], nestingContent?: boolean, context: {
+export function minify(ast: AstNode, options: ParserOptions | MinifyFeatureOptions = {}, recursive: boolean = false, errors?: ErrorDescription[], nestingContent?: boolean, context: {
     [key: string]: any
 } = {}): AstNode {
 
@@ -54,10 +54,10 @@ export function minify(ast: AstNode, options: ParserOptions | MinifyOptions = {}
 
     context.nodes.add(ast);
 
-    if (!('features' in <MinifyOptions>options)) {
+    if (!('features' in <MinifyFeatureOptions>options)) {
 
         // @ts-ignore
-        options = <MinifyOptions>{
+        options = <MinifyFeatureOptions>{
             removeDuplicateDeclarations: true,
             computeShorthand: true,
             computeCalcExpression: true,
@@ -523,7 +523,7 @@ export function minify(ast: AstNode, options: ParserOptions | MinifyOptions = {}
 
                     Object.defineProperty(node, 'parent', {...definedPropertySettings, value: parent});
 
-                    for (const feature of (<MinifyOptions>options).features) {
+                    for (const feature of (<MinifyFeatureOptions>options).features) {
 
                         feature.run(<AstRule | AstAtRule>node, options, <AstRule | AstAtRule | AstRuleStyleSheet>parent, context);
                     }
@@ -539,7 +539,7 @@ export function minify(ast: AstNode, options: ParserOptions | MinifyOptions = {}
             }
         }
 
-        for (const feature of (<MinifyOptions>options).features) {
+        for (const feature of (<MinifyFeatureOptions>options).features) {
 
             if ('cleanup' in feature) {
 
diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts
@@ -142,6 +142,7 @@ export async function doParse(iterator: string, options: ParserOptions = {}): Pr
         src: '',
         sourcemap: false,
         minify: true,
+        pass: 1,
         parseColor: true,
         nestingRules: false,
         resolveImport: false,
@@ -391,7 +392,12 @@ export async function doParse(iterator: string, options: ParserOptions = {}): Pr
 
         if (ast.chi.length > 0) {
 
-            minify(ast, options, true, errors, false);
+            let passes: number = options.pass ?? 1 as number;
+
+            while (passes--) {
+
+                minify(ast, options, true, errors, false);
+            }
         }
     }
 
diff --git a/test/specs/code/index.js b/test/specs/code/index.js
diff --git a/test/specs/code/minify.js b/test/specs/code/minify.js

Original file line number	Diff line number	Diff line change
`@@ -15910,6 +15910,7 @@`
`15910`	`15910`	`src: '',`
`15911`	`15911`	`sourcemap: false,`
`15912`	`15912`	`minify: true,`
	`15913`	`+ pass: 1,`
`15913`	`15914`	`parseColor: true,`
`15914`	`15915`	`nestingRules: false,`
`15915`	`15916`	`resolveImport: false,`
`@@ -16089,7 +16090,10 @@`
`16089`	`16090`	`}`
`16090`	`16091`	`if (options.minify) {`
`16091`	`16092`	`if (ast.chi.length > 0) {`
`16092`		`- minify(ast, options, true, errors, false);`
	`16093`	`+ let passes = options.pass ?? 1;`
	`16094`	`+ while (passes--) {`
	`16095`	`+ minify(ast, options, true, errors, false);`
	`16096`	`+ }`
`16093`	`16097`	`}`
`16094`	`16098`	`}`
`16095`	`16099`	`const endTime = performance.now();`
Original file line number	Diff line number	Diff line change
`@@ -15909,6 +15909,7 @@ async function doParse(iterator, options = {}) {`
`15909`	`15909`	`src: '',`
`15910`	`15910`	`sourcemap: false,`
`15911`	`15911`	`minify: true,`
	`15912`	`+ pass: 1,`
`15912`	`15913`	`parseColor: true,`
`15913`	`15914`	`nestingRules: false,`
`15914`	`15915`	`resolveImport: false,`
`@@ -16088,7 +16089,10 @@ async function doParse(iterator, options = {}) {`
`16088`	`16089`	`}`
`16089`	`16090`	`if (options.minify) {`
`16090`	`16091`	`if (ast.chi.length > 0) {`
`16091`		`- minify(ast, options, true, errors, false);`
	`16092`	`+ let passes = options.pass ?? 1;`
	`16093`	`+ while (passes--) {`
	`16094`	`+ minify(ast, options, true, errors, false);`
	`16095`	`+ }`
`16092`	`16096`	`}`
`16093`	`16097`	`}`
`16094`	`16098`	`const endTime = performance.now();`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ async function doParse(iterator, options = {}) {`
`46`	`46`	`src: '',`
`47`	`47`	`sourcemap: false,`
`48`	`48`	`minify: true,`
	`49`	`+ pass: 1,`
`49`	`50`	`parseColor: true,`
`50`	`51`	`nestingRules: false,`
`51`	`52`	`resolveImport: false,`
`@@ -225,7 +226,10 @@ async function doParse(iterator, options = {}) {`
`225`	`226`	`}`
`226`	`227`	`if (options.minify) {`
`227`	`228`	`if (ast.chi.length > 0) {`
`228`		`- minify(ast, options, true, errors, false);`
	`229`	`+ let passes = options.pass ?? 1;`
	`230`	`+ while (passes--) {`
	`231`	`+ minify(ast, options, true, errors, false);`
	`232`	`+ }`
`229`	`233`	`}`
`230`	`234`	`}`
`231`	`235`	`const endTime = performance.now();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tbela99/css-parser",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1-alpha1",`
`4`	`4`	`"publish": {`
`5`	`5`	`"include": [`
`6`	`6`	`"src",`