From 298ce63a00bce264e0f53e9f70317c2bdcb8448e Mon Sep 17 00:00:00 2001
From: Thierry Bela Nanga <bnanga@gmail.com>
Date: Fri, 28 Feb 2025 00:14:37 -0500
Subject: [PATCH] minification passes #66

---
 README.md                                  |  7 +--
 dist/index-umd-web.js                      |  6 ++-
 dist/index.cjs                             |  6 ++-
 dist/index.d.ts                            | 29 +++++-----
 dist/lib/parser/parse.js                   |  6 ++-
 jsr.json                                   |  2 +-
 package.json                               |  3 +-
 src/@types/index.d.ts                      | 27 ++++++----
 src/lib/ast/features/calc.ts               |  4 +-
 src/lib/ast/features/inlinecssvariables.ts |  4 +-
 src/lib/ast/features/prefix.ts             |  4 +-
 src/lib/ast/features/shorthand.ts          |  4 +-
 src/lib/ast/minify.ts                      | 12 ++---
 src/lib/parser/parse.ts                    |  8 ++-
 test/specs/code/index.js                   |  3 +-
 test/specs/code/minify.js                  | 61 ++++++++++++++++++++++
 16 files changed, 139 insertions(+), 47 deletions(-)
 create mode 100644 test/specs/code/minify.js

diff --git a/README.md b/README.md
index 3d465f97..44e669c9 100644
--- 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
index 418210c4..c53beabf 100644
--- 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
index 02cb81df..77cc096f 100644
--- 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
index 47f9dde9..4839db69 100644
--- 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
index 83fd0dfe..b6429eaa 100644
--- 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
index e26f6a85..42af0939 100644
--- 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
index c419b580..e3375ba4 100644
--- 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
index 0e3e1d2b..63955c89 100644
--- 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,7 +76,7 @@ export declare interface ParserOptions extends ValidationOptions, PropertyListOp
     setParent?: boolean;
 }
 
-export declare interface MinifyOptions extends ParserOptions {
+export declare interface MinifyFeatureOptions extends ParserOptions {
 
     features: MinifyFeature[];
 }
@@ -79,7 +84,7 @@ export declare interface MinifyOptions extends ParserOptions {
 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
index 5d3e4e08..2f3fa06d 100644
--- 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
index 702c1e8c..00bbdbbf 100644
--- 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
index 2374ab4f..186e1af2 100644
--- 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
index 39a7cc54..41f34af9 100644
--- a/src/lib/ast/features/shorthand.ts
+++ b/src/lib/ast/features/shorthand.ts
@@ -1,6 +1,6 @@
 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 {
 
@@ -8,7 +8,7 @@ export class ComputeShorthandFeature {
         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
index 589f9833..4323f783 100644
--- 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
index 1a3ea5c7..d1a2b178 100644
--- 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
index f4f87cd5..68f18f07 100644
--- a/test/specs/code/index.js
+++ b/test/specs/code/index.js
@@ -18,4 +18,5 @@ export * as visitors from './visitors.js';
 export * as walk from './walk.js';
 export * as validation from './validation.js';
 export * as atRules from './at-rules.js';
-export * as lenient from './lenient.js'
\ No newline at end of file
+export * as lenient from './lenient.js'
+export * as minify from './minify.js'
\ No newline at end of file
diff --git a/test/specs/code/minify.js b/test/specs/code/minify.js
new file mode 100644
index 00000000..21218dc2
--- /dev/null
+++ b/test/specs/code/minify.js
@@ -0,0 +1,61 @@
+export function run(describe, expect, transform, parse, render, dirname, readFile) {
+
+    const css = `
+:root {
+--color: green;
+}
+._19_u :focus {
+    color:  hsl(from var(--color) calc(h * 2) s l);
+}
+:root {
+--preferred-width: 20px;
+}
+.foo-bar {
+    width: calc(calc(var(--preferred-width) + 1px) / 3 + 5px);
+    height: calc(100% / 4);}
+
+
+.foo {
+ width: 12px;
+ height: 25%
+}
+
+
+`;
+
+    describe('minify passes', function () {
+        it('single pass #1', function () {
+            return transform(css, {
+                beautify: true,
+                inlineCssVariables: true,
+                pass: 1
+            }).then((result) => expect(result.code).equals(`._19_u :focus {
+ color: navy
+}
+.foo-bar {
+ width: 12px;
+ height: 25%
+}
+.foo {
+ width: 12px;
+ height: 25%
+}`));
+        });
+
+        it('multiple passes #2', function () {
+
+            return transform(css, {
+                beautify: true,
+                inlineCssVariables: true,
+                pass: 2
+            }).then((result) => expect(result.code).equals(`._19_u :focus {
+ color: navy
+}
+.foo-bar,.foo {
+ width: 12px;
+ height: 25%
+}`));
+        });
+    });
+
+}
\ No newline at end of file