htmlnano 3.1.0 → 3.2.0

package/README.md

@@ -5,28 +5,6 @@
 
 Modular HTML minifier, built on top of the [PostHTML](https://github.com/posthtml/posthtml). Inspired by [cssnano](https://github.com/cssnano/cssnano).
 
-## Benchmarks
-
-[html-minifier-terser]: https://www.npmjs.com/package/html-minifier-terser/v/7.2.0
-[html-minifier-next]: https://www.npmjs.com/package/html-minifier-next/v/4.15.2
-[htmlnano]: https://www.npmjs.com/package/htmlnano/v/3.1.0
-[minify]: https://www.npmjs.com/package/@tdewolff/minify/v/2.24.8
-[minify-html]: https://www.npmjs.com/package/@minify-html/node/v/0.18.1
-
-| Website                                                       | Source (KB) | [html-minifier-terser] | [html-minifier-next] | [htmlnano] |  [minify] | [minify-html] |
-| ------------------------------------------------------------- | ----------: | ---------------------: | -------------------: | ---------: | --------: | ------------: |
-| [stackoverflow.blog](https://stackoverflow.blog/)             |         142 |                   3.7% |                32.3% |       6.8% |      4.5% |          4.6% |
-| [github.com](https://github.com/)                             |         549 |                   2.9% |                42.2% |      16.6% |      7.3% |          5.7% |
-| [en.wikipedia.org](https://en.wikipedia.org/wiki/Main_Page)   |         218 |                   4.6% |                 7.7% |       7.4% |      6.2% |          2.9% |
-| [developer.mozilla.org](https://developer.mozilla.org/en-US/) |         109 |                  37.9% |                42.0% |      52.7% |     40.1% |         39.9% |
-| [tc39.es](https://tc39.es/ecma262/)                           |        7243 |                   8.5% |                11.8% |       9.3% |      9.5% |          9.1% |
-| [apple.com](https://www.apple.com/)                           |         210 |                   9.2% |                14.4% |      11.2% |     10.3% |          9.8% |
-| [w3.org](https://www.w3.org/)                                 |          50 |                  19.0% |                24.6% |      23.4% |     24.4% |         20.3% |
-| [weather.com](https://weather.com)                            |        1960 |                   0.4% |                11.2% |      19.8% |     11.6% |          0.6% |
-| **Avg. minify rate**                                          |             |              **10.8%** |            **23.3%** |  **18.4%** | **14.2%** |     **11.6%** |
-
-Latest benchmarks: https://github.com/maltsev/html-minifiers-benchmark (updated daily).
-
 ## Documentation
 https://htmlnano.netlify.app
 
@@ -68,4 +46,40 @@ Also, you can use it as CLI tool:
 node_modules/.bin/htmlnano --help
 ```
 
-More usage examples (PostHTML, Gulp, Webpack): https://htmlnano.netlify.app/next/usage
+More usage examples (PostHTML, CLI, Webpack): https://htmlnano.netlify.app/usage
+
+
+## Benchmarks
+
+[html-minifier-terser]: https://www.npmjs.com/package/html-minifier-terser/v/7.2.0
+[html-minifier-next]: https://www.npmjs.com/package/html-minifier-next/v/5.0.3
+[htmlnano]: https://www.npmjs.com/package/htmlnano/v/3.1.0
+[minify]: https://www.npmjs.com/package/@tdewolff/minify/v/2.24.8
+[minify-html]: https://www.npmjs.com/package/@minify-html/node/v/0.18.1
+
+| Website                                                         | Source (KB) | [html-minifier-terser] | [html-minifier-next] | [htmlnano] |  [minify] | [minify-html] |
+| --------------------------------------------------------------- | ----------: | ---------------------: | -------------------: | ---------: | --------: | ------------: |
+| [alistapart.com](https://alistapart.com/)                       |          63 |                   7.6% |                11.6% |      34.6% |     11.1% |          8.6% |
+| [developer.mozilla.org](https://developer.mozilla.org/en-US/)   |         109 |                  38.0% |                41.7% |      52.8% |     40.1% |         39.9% |
+| [css-tricks.com](https://css-tricks.com)                        |          11 |                   8.2% |                34.1% |      37.2% |     18.8% |          8.5% |
+| [en.wikipedia.org](https://en.wikipedia.org/wiki/Main_Page)     |         224 |                   4.5% |                 7.4% |       7.2% |     60.6% |          2.9% |
+| [github.com](https://github.com/)                               |         546 |                   3.0% |                 9.7% |      16.7% |      7.3% |          5.7% |
+| [edri.org](https://edri.org)                                    |          80 |                   7.7% |                12.3% |      30.6% |     12.3% |          8.2% |
+| [leanpub.com](https://leanpub.com)                              |         251 |                   1.3% |                 6.9% |       6.3% |      6.0% |          1.7% |
+| [stackoverflow.blog](https://stackoverflow.blog/)               |         139 |                   3.9% |                 5.7% |       7.0% |      4.6% |          4.7% |
+| [html.spec.whatwg.org](https://html.spec.whatwg.org/multipage/) |         149 |                  -3.9% |                 0.7% |      -2.6% |      0.3% |          0.2% |
+| [eff.org](https://eff.org)                                      |          54 |                   8.8% |                14.7% |      10.9% |     13.4% |          9.7% |
+| [apple.com](https://apple.com/)                                 |         229 |                   8.9% |                12.5% |      11.5% |     10.4% |          9.5% |
+| [w3.org](https://w3.org/)                                       |          50 |                  19.0% |                24.6% |      23.4% |     24.4% |         20.3% |
+| [mastodon.social](https://mastodon.social/explore)              |          37 |                   3.4% |                 6.8% |      14.6% |      5.9% |          3.6% |
+| [bbc.co.uk](https://bbc.co.uk)                                  |         694 |                   0.8% |                 6.3% |       5.9% |      4.7% |          1.2% |
+| [un.org](https://un.org/en/)                                    |         151 |                  14.2% |                22.5% |      41.2% |     20.0% |         15.0% |
+| [lafrenchtech.gouv.fr](https://lafrenchtech.gouv.fr/)           |         152 |                  13.2% |                17.9% |      64.1% |     17.0% |         13.8% |
+| [sitepoint.com](https://sitepoint.com)                          |         497 |                   0.8% |                 7.4% |      12.9% |      6.1% |          0.9% |
+| [faz.net](https://faz.net/aktuell/)                             |        1572 |                   3.4% |                 8.0% |      15.8% |      4.8% |          3.6% |
+| [weather.com](https://weather.com)                              |        2395 |                   0.3% |                11.4% |      18.1% |     11.0% |          0.6% |
+| [tc39.es](https://tc39.es/ecma262/)                             |        7254 |                   8.5% |                11.3% |       9.3% |      9.5% |          9.1% |
+| [home.cern](https://home.cern)                                  |         151 |                  37.1% |                46.4% |      40.2% |     38.9% |         39.5% |
+| **Avg. minify rate**                                            |             |               **9.0%** |            **15.2%** |  **21.8%** | **15.6%** |      **9.9%** |
+
+Latest benchmarks: https://github.com/maltsev/html-minifiers-benchmark (updated daily).

package/dist/_modules/mergeScripts.js

@@ -2,6 +2,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers_js = require('../helpers.js');
 
+function normalizeAttrsForKey(attrs, config) {
+    const normalized = {
+        ...config.baseAttrs
+    };
+    for (const [key, value] of Object.entries(attrs || {})){
+        if (config.skippedAttrs.has(key) || value === undefined) {
+            continue;
+        }
+        if (config.booleanAttrs.has(key)) {
+            normalized[key] = true;
+            continue;
+        }
+        normalized[key] = value;
+    }
+    return normalized;
+}
+
 function normalizeAsyncAttr(attrs) {
     if (!attrs) {
         return;
@@ -25,24 +42,19 @@ const booleanAttrs = new Set([
     'defer',
     'nomodule'
 ]);
+const skippedAttrs = new Set([
+    'src',
+    'integrity',
+    'type'
+]);
 function normalizeScriptAttrsForKey(attrs, scriptType) {
-    const normalized = {
-        type: scriptType
-    };
-    for (const [key, value] of Object.entries(attrs)){
-        if (key === 'src' || key === 'integrity' || key === 'type') {
-            continue;
-        }
-        if (value === undefined) {
-            continue;
-        }
-        if (booleanAttrs.has(key)) {
-            normalized[key] = true;
-            continue;
-        }
-        normalized[key] = value;
-    }
-    return normalized;
+    return normalizeAttrsForKey(attrs, {
+        baseAttrs: {
+            type: scriptType
+        },
+        booleanAttrs,
+        skippedAttrs
+    });
 }
 function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
     const normalizedAttrs = normalizeScriptAttrsForKey(attrs, scriptType);

package/dist/_modules/mergeScripts.mjs

@@ -1,5 +1,22 @@
 import { extractTextContentFromNode } from '../helpers.mjs';
 
+function normalizeAttrsForKey(attrs, config) {
+    const normalized = {
+        ...config.baseAttrs
+    };
+    for (const [key, value] of Object.entries(attrs || {})){
+        if (config.skippedAttrs.has(key) || value === undefined) {
+            continue;
+        }
+        if (config.booleanAttrs.has(key)) {
+            normalized[key] = true;
+            continue;
+        }
+        normalized[key] = value;
+    }
+    return normalized;
+}
+
 function normalizeAsyncAttr(attrs) {
     if (!attrs) {
         return;
@@ -23,24 +40,19 @@ const booleanAttrs = new Set([
     'defer',
     'nomodule'
 ]);
+const skippedAttrs = new Set([
+    'src',
+    'integrity',
+    'type'
+]);
 function normalizeScriptAttrsForKey(attrs, scriptType) {
-    const normalized = {
-        type: scriptType
-    };
-    for (const [key, value] of Object.entries(attrs)){
-        if (key === 'src' || key === 'integrity' || key === 'type') {
-            continue;
-        }
-        if (value === undefined) {
-            continue;
-        }
-        if (booleanAttrs.has(key)) {
-            normalized[key] = true;
-            continue;
-        }
-        normalized[key] = value;
-    }
-    return normalized;
+    return normalizeAttrsForKey(attrs, {
+        baseAttrs: {
+            type: scriptType
+        },
+        booleanAttrs,
+        skippedAttrs
+    });
 }
 function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
     const normalizedAttrs = normalizeScriptAttrsForKey(attrs, scriptType);

package/dist/_modules/mergeStyles.js

@@ -2,10 +2,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers_js = require('../helpers.js');
 
+function normalizeAttrsForKey(attrs, config) {
+    const normalized = {
+        ...config.baseAttrs
+    };
+    for (const [key, value] of Object.entries(attrs || {})){
+        if (config.skippedAttrs.has(key) || value === undefined) {
+            continue;
+        }
+        if (config.booleanAttrs.has(key)) {
+            normalized[key] = true;
+            continue;
+        }
+        normalized[key] = value;
+    }
+    return normalized;
+}
+
 const booleanAttrs = new Set([
     'amp-custom',
     'disabled'
 ]);
+const skippedAttrs = new Set([
+    'type',
+    'media'
+]);
 function normalizeStyleType(attrs) {
     if (!attrs || typeof attrs.type !== 'string') {
         return 'text/css';
@@ -21,21 +42,10 @@ function normalizeStyleMedia(attrs) {
     return media ? media.replace(/\s+/g, ' ').toLowerCase() : 'all';
 }
 function normalizeStyleAttrsForKey(attrs) {
-    const normalized = {};
-    for (const [key, value] of Object.entries(attrs || {})){
-        if (key === 'type' || key === 'media') {
-            continue;
-        }
-        if (value === undefined) {
-            continue;
-        }
-        if (booleanAttrs.has(key)) {
-            normalized[key] = true;
-            continue;
-        }
-        normalized[key] = value;
-    }
-    return normalized;
+    return normalizeAttrsForKey(attrs, {
+        booleanAttrs,
+        skippedAttrs
+    });
 }
 function buildStyleKey(attrs) {
     const keyObject = {

package/dist/_modules/mergeStyles.mjs

@@ -1,9 +1,30 @@
 import { isAmpBoilerplate, extractTextContentFromNode } from '../helpers.mjs';
 
+function normalizeAttrsForKey(attrs, config) {
+    const normalized = {
+        ...config.baseAttrs
+    };
+    for (const [key, value] of Object.entries(attrs || {})){
+        if (config.skippedAttrs.has(key) || value === undefined) {
+            continue;
+        }
+        if (config.booleanAttrs.has(key)) {
+            normalized[key] = true;
+            continue;
+        }
+        normalized[key] = value;
+    }
+    return normalized;
+}
+
 const booleanAttrs = new Set([
     'amp-custom',
     'disabled'
 ]);
+const skippedAttrs = new Set([
+    'type',
+    'media'
+]);
 function normalizeStyleType(attrs) {
     if (!attrs || typeof attrs.type !== 'string') {
         return 'text/css';
@@ -19,21 +40,10 @@ function normalizeStyleMedia(attrs) {
     return media ? media.replace(/\s+/g, ' ').toLowerCase() : 'all';
 }
 function normalizeStyleAttrsForKey(attrs) {
-    const normalized = {};
-    for (const [key, value] of Object.entries(attrs || {})){
-        if (key === 'type' || key === 'media') {
-            continue;
-        }
-        if (value === undefined) {
-            continue;
-        }
-        if (booleanAttrs.has(key)) {
-            normalized[key] = true;
-            continue;
-        }
-        normalized[key] = value;
-    }
-    return normalized;
+    return normalizeAttrsForKey(attrs, {
+        booleanAttrs,
+        skippedAttrs
+    });
 }
 function buildStyleKey(attrs) {
     const keyObject = {

package/dist/_modules/minifyJs.js

@@ -192,10 +192,22 @@ function processNodeWithOnAttrs(node, terserOptions, terser) {
                 const minifiedJs = code.substring(jsWrapperStart.length, code.length - jsWrapperEnd.length);
                 node.attrs[attrName] = minifiedJs;
             }
+        }).catch((error)=>{
+            // Skip invalid inline handler code and preserve the original value.
+            if (isTerserParseError(error)) {
+                return;
+            }
+            throw error;
         });
         promises.push(promise);
     }
     return promises;
 }
+function isTerserParseError(error) {
+    if (!(error instanceof Error)) {
+        return false;
+    }
+    return error.name === 'SyntaxError' || error.message.includes('JS_Parse_Error');
+}
 
 exports.default = mod;

package/dist/_modules/minifyJs.mjs

@@ -190,10 +190,22 @@ function processNodeWithOnAttrs(node, terserOptions, terser) {
                 const minifiedJs = code.substring(jsWrapperStart.length, code.length - jsWrapperEnd.length);
                 node.attrs[attrName] = minifiedJs;
             }
+        }).catch((error)=>{
+            // Skip invalid inline handler code and preserve the original value.
+            if (isTerserParseError(error)) {
+                return;
+            }
+            throw error;
         });
         promises.push(promise);
     }
     return promises;
 }
+function isTerserParseError(error) {
+    if (!(error instanceof Error)) {
+        return false;
+    }
+    return error.name === 'SyntaxError' || error.message.includes('JS_Parse_Error');
+}
 
 export { mod as default };

package/dist/_modules/removeUnusedCss.js

@@ -112,13 +112,14 @@ function runPurgecss(tree, css, userOptions, purgecss, extractor) {
 }
 /** Remove unused CSS */ const mod = {
     async default (tree, options, userOptions) {
+        var _resolvedOptions_tool;
         const promises = [];
         let html;
         let extractor;
         const purgecss = await helpers_js.optionalImport('purgecss');
         const uncss = await helpers_js.optionalImport('uncss');
         const resolvedOptions = resolveUserOptions(userOptions);
-        const tool = resolvedOptions.tool;
+        const tool = (_resolvedOptions_tool = resolvedOptions.tool) != null ? _resolvedOptions_tool : 'purgeCSS';
         const toolOptions = stripToolOption(resolvedOptions);
         tree.walk((node)=>{
             if (helpers_js.isStyleNode(node) && helpers_js.isCssStyleType(node)) {
@@ -127,7 +128,7 @@ function runPurgecss(tree, css, userOptions, purgecss, extractor) {
                         extractor != null ? extractor : extractor = purgeFromHtml(tree);
                         promises.push(processStyleNodePurgeCSS(tree, node, toolOptions, purgecss, extractor));
                     }
-                } else {
+                } else if (tool === 'uncss') {
                     if (uncss) {
                         html != null ? html : html = tree.render(tree);
                         promises.push(processStyleNodeUnCSS(html, node, toolOptions, uncss));

package/dist/_modules/removeUnusedCss.mjs

@@ -110,13 +110,14 @@ function runPurgecss(tree, css, userOptions, purgecss, extractor) {
 }
 /** Remove unused CSS */ const mod = {
     async default (tree, options, userOptions) {
+        var _resolvedOptions_tool;
         const promises = [];
         let html;
         let extractor;
         const purgecss = await optionalImport('purgecss');
         const uncss = await optionalImport('uncss');
         const resolvedOptions = resolveUserOptions(userOptions);
-        const tool = resolvedOptions.tool;
+        const tool = (_resolvedOptions_tool = resolvedOptions.tool) != null ? _resolvedOptions_tool : 'purgeCSS';
         const toolOptions = stripToolOption(resolvedOptions);
         tree.walk((node)=>{
             if (isStyleNode(node) && isCssStyleType(node)) {
@@ -125,7 +126,7 @@ function runPurgecss(tree, css, userOptions, purgecss, extractor) {
                         extractor != null ? extractor : extractor = purgeFromHtml(tree);
                         promises.push(processStyleNodePurgeCSS(tree, node, toolOptions, purgecss, extractor));
                     }
-                } else {
+                } else if (tool === 'uncss') {
                     if (uncss) {
                         html != null ? html : html = tree.render(tree);
                         promises.push(processStyleNodeUnCSS(html, node, toolOptions, uncss));

package/dist/_modules/sortAttributes.d.mts

@@ -85,7 +85,8 @@ type HtmlnanoModule<Options = any> = {
     default?: (tree: PostHTMLTreeLike, options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => PostHTMLTreeLike | Promise<PostHTMLTreeLike>;
 };
 
-type ValidOptions = 'alphabetical' | 'frequency';
-declare const mod: HtmlnanoModule<boolean | ValidOptions>;
+type SortAttributesOption = 'alphabetical' | 'frequency';
+
+declare const mod: HtmlnanoModule<boolean | SortAttributesOption>;
 
 export { mod as default };

package/dist/_modules/sortAttributes.d.ts

@@ -85,7 +85,8 @@ type HtmlnanoModule<Options = any> = {
     default?: (tree: PostHTMLTreeLike, options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => PostHTMLTreeLike | Promise<PostHTMLTreeLike>;
 };
 
-type ValidOptions = 'alphabetical' | 'frequency';
-declare const mod: HtmlnanoModule<boolean | ValidOptions>;
+type SortAttributesOption = 'alphabetical' | 'frequency';
+
+declare const mod: HtmlnanoModule<boolean | SortAttributesOption>;
 
 export { mod as default };

package/dist/_modules/sortAttributes.js

@@ -4,11 +4,12 @@ const validOptions = new Set([
     'frequency',
     'alphabetical'
 ]);
-const processModuleOptions = (options)=>{
+function resolveSortType(options) {
     if (options === true) return 'alphabetical';
     if (options === false) return false;
     return validOptions.has(options) ? options : false;
-};
+}
+
 class AttributeTokenChain {
     addFromNodeAttrs(nodeAttrs) {
         Object.keys(nodeAttrs).forEach((attrName)=>{
@@ -70,7 +71,7 @@ class AttributeTokenChain {
 }
 /** Sort attibutes */ const mod = {
     default (tree, options, moduleOptions) {
-        const sortType = processModuleOptions(moduleOptions);
+        const sortType = resolveSortType(moduleOptions);
         if (sortType === 'alphabetical') {
             return sortAttributesInAlphabeticalOrder(tree);
         }

package/dist/_modules/sortAttributes.mjs

@@ -2,11 +2,12 @@ const validOptions = new Set([
     'frequency',
     'alphabetical'
 ]);
-const processModuleOptions = (options)=>{
+function resolveSortType(options) {
     if (options === true) return 'alphabetical';
     if (options === false) return false;
     return validOptions.has(options) ? options : false;
-};
+}
+
 class AttributeTokenChain {
     addFromNodeAttrs(nodeAttrs) {
         Object.keys(nodeAttrs).forEach((attrName)=>{
@@ -68,7 +69,7 @@ class AttributeTokenChain {
 }
 /** Sort attibutes */ const mod = {
     default (tree, options, moduleOptions) {
-        const sortType = processModuleOptions(moduleOptions);
+        const sortType = resolveSortType(moduleOptions);
         if (sortType === 'alphabetical') {
             return sortAttributesInAlphabeticalOrder(tree);
         }

package/dist/_modules/sortAttributesWithLists.d.mts

@@ -85,6 +85,8 @@ type HtmlnanoModule<Options = any> = {
     default?: (tree: PostHTMLTreeLike, options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => PostHTMLTreeLike | Promise<PostHTMLTreeLike>;
 };
 
-declare const mod: HtmlnanoModule<boolean | 'alphabetical' | 'frequency'>;
+type SortAttributesOption = 'alphabetical' | 'frequency';
+
+declare const mod: HtmlnanoModule<boolean | SortAttributesOption>;
 
 export { mod as default };

package/dist/_modules/sortAttributesWithLists.d.ts

@@ -85,6 +85,8 @@ type HtmlnanoModule<Options = any> = {
     default?: (tree: PostHTMLTreeLike, options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => PostHTMLTreeLike | Promise<PostHTMLTreeLike>;
 };
 
-declare const mod: HtmlnanoModule<boolean | 'alphabetical' | 'frequency'>;
+type SortAttributesOption = 'alphabetical' | 'frequency';
+
+declare const mod: HtmlnanoModule<boolean | SortAttributesOption>;
 
 export { mod as default };

package/dist/_modules/sortAttributesWithLists.js

@@ -2,35 +2,36 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var collapseAttributeWhitespace_js = require('./collapseAttributeWhitespace.js');
 
-// class, rel, ping
 const validOptions = new Set([
     'frequency',
     'alphabetical'
 ]);
-const processModuleOptions = (options)=>{
+function resolveSortType(options) {
     if (options === true) return 'alphabetical';
     if (options === false) return false;
     return validOptions.has(options) ? options : false;
-};
-class AttributeTokenChain {
+}
+
+// class, rel, ping
+class ListAttributeTokenChain {
     addFromNodeAttrsArray(attrValuesArray) {
         attrValuesArray.forEach((attrValue)=>{
             if (!attrValue) {
                 return;
             }
-            if (this.freqData.has(attrValue)) {
-                this.freqData.set(attrValue, this.freqData.get(attrValue) + 1);
+            if (this.tokenCounts.has(attrValue)) {
+                this.tokenCounts.set(attrValue, this.tokenCounts.get(attrValue) + 1);
             } else {
-                this.freqData.set(attrValue, 1);
+                this.tokenCounts.set(attrValue, 1);
             }
         });
     }
     createSortOrder() {
-        const _sortOrder = [
-            ...this.freqData.entries()
+        const nextSortOrder = [
+            ...this.tokenCounts.entries()
         ];
-        _sortOrder.sort((a, b)=>b[1] - a[1] || a[0].localeCompare(b[0]));
-        this.sortOrder = _sortOrder.map((i)=>i[0]);
+        nextSortOrder.sort((a, b)=>b[1] - a[1] || a[0].localeCompare(b[0]));
+        this.sortedTokens = nextSortOrder.map((i)=>i[0]);
     }
     sortFromNodeAttrsArray(attrValuesArray) {
         const resultArray = [];
@@ -42,10 +43,10 @@ class AttributeTokenChain {
             }
             tokenCounts.set(attrValue, ((_tokenCounts_get = tokenCounts.get(attrValue)) != null ? _tokenCounts_get : 0) + 1);
         });
-        if (!this.sortOrder) {
+        if (!this.sortedTokens) {
             this.createSortOrder();
         }
-        this.sortOrder.forEach((k)=>{
+        this.sortedTokens.forEach((k)=>{
             const count = tokenCounts.get(k);
             if (!count) {
                 return;
@@ -57,13 +58,13 @@ class AttributeTokenChain {
         return resultArray;
     }
     constructor(){
-        /** <attr, frequency> */ this.freqData = new Map();
-        this.sortOrder = null;
+        /** <attr, frequency> */ this.tokenCounts = new Map();
+        this.sortedTokens = null;
     }
 }
 /** Sort values inside list-like attributes (e.g. class, rel) */ const mod = {
     default (tree, options, moduleOptions) {
-        const sortType = processModuleOptions(moduleOptions);
+        const sortType = resolveSortType(moduleOptions);
         if (sortType === 'alphabetical') {
             return sortAttributesWithListsInAlphabeticalOrder(tree);
         }
@@ -75,64 +76,50 @@ class AttributeTokenChain {
     }
 };
 const splitListAttributeValues = (attrValue)=>attrValue.split(/\s+/).filter(Boolean);
-function sortAttributesWithListsInAlphabeticalOrder(tree) {
+function walkListAttributes(tree, walkFn) {
     tree.walk((node)=>{
         if (!node.attrs) {
             return node;
         }
         const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.keys(node.attrs).forEach((attrName)=>{
+        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
             const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            const attrValues = splitListAttributeValues(node.attrs[attrName]);
-            if (attrValues.length < 2) {
+            if (!collapseAttributeWhitespace_js.isListAttribute(attrNameLower, tagName) || typeof attrValues !== 'string') {
                 return;
             }
-            node.attrs[attrName] = attrValues.sort((a, b)=>{
-                // @ts-expect-error -- deliberately use minus operator to sort things
-                return typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b;
-            }).join(' ');
+            walkFn(node.attrs, attrName, attrValues);
         });
         return node;
     });
+}
+function sortAttributesWithListsInAlphabeticalOrder(tree) {
+    walkListAttributes(tree, (nodeAttrs, attrName, attrValues)=>{
+        const values = splitListAttributeValues(attrValues);
+        if (values.length < 2) {
+            return;
+        }
+        nodeAttrs[attrName] = values.sort((a, b)=>{
+            // @ts-expect-error -- deliberately use minus operator to sort things
+            return typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b;
+        }).join(' ');
+    });
     return tree;
 }
 function sortAttributesWithListsByFrequency(tree) {
-    const tokenChainObj = {}; // <attrNameLower: AttributeTokenChain>[]
+    const tokenChainObj = {};
     // Traverse through tree to get frequency
-    tree.walk((node)=>{
-        if (!node.attrs) {
-            return node;
-        }
-        const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new AttributeTokenChain();
-            tokenChainObj[attrNameLower].addFromNodeAttrsArray(splitListAttributeValues(attrValues));
-        });
-        return node;
+    walkListAttributes(tree, (_nodeAttrs, attrName, attrValues)=>{
+        const attrNameLower = attrName.toLowerCase();
+        tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new ListAttributeTokenChain();
+        tokenChainObj[attrNameLower].addFromNodeAttrsArray(splitListAttributeValues(attrValues));
     });
     // Traverse through tree again, this time sort the attribute values
-    tree.walk((node)=>{
-        if (!node.attrs) {
-            return node;
+    walkListAttributes(tree, (nodeAttrs, attrName, attrValues)=>{
+        const attrNameLower = attrName.toLowerCase();
+        if (!tokenChainObj[attrNameLower]) {
+            return;
         }
-        const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            if (tokenChainObj[attrNameLower]) {
-                node.attrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(splitListAttributeValues(attrValues)).join(' ');
-            }
-        });
-        return node;
+        nodeAttrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(splitListAttributeValues(attrValues)).join(' ');
     });
     return tree;
 }

package/dist/_modules/sortAttributesWithLists.mjs

@@ -1,34 +1,35 @@
 import { isListAttribute } from './collapseAttributeWhitespace.mjs';
 
-// class, rel, ping
 const validOptions = new Set([
     'frequency',
     'alphabetical'
 ]);
-const processModuleOptions = (options)=>{
+function resolveSortType(options) {
     if (options === true) return 'alphabetical';
     if (options === false) return false;
     return validOptions.has(options) ? options : false;
-};
-class AttributeTokenChain {
+}
+
+// class, rel, ping
+class ListAttributeTokenChain {
     addFromNodeAttrsArray(attrValuesArray) {
         attrValuesArray.forEach((attrValue)=>{
             if (!attrValue) {
                 return;
             }
-            if (this.freqData.has(attrValue)) {
-                this.freqData.set(attrValue, this.freqData.get(attrValue) + 1);
+            if (this.tokenCounts.has(attrValue)) {
+                this.tokenCounts.set(attrValue, this.tokenCounts.get(attrValue) + 1);
             } else {
-                this.freqData.set(attrValue, 1);
+                this.tokenCounts.set(attrValue, 1);
             }
         });
     }
     createSortOrder() {
-        const _sortOrder = [
-            ...this.freqData.entries()
+        const nextSortOrder = [
+            ...this.tokenCounts.entries()
         ];
-        _sortOrder.sort((a, b)=>b[1] - a[1] || a[0].localeCompare(b[0]));
-        this.sortOrder = _sortOrder.map((i)=>i[0]);
+        nextSortOrder.sort((a, b)=>b[1] - a[1] || a[0].localeCompare(b[0]));
+        this.sortedTokens = nextSortOrder.map((i)=>i[0]);
     }
     sortFromNodeAttrsArray(attrValuesArray) {
         const resultArray = [];
@@ -40,10 +41,10 @@ class AttributeTokenChain {
             }
             tokenCounts.set(attrValue, ((_tokenCounts_get = tokenCounts.get(attrValue)) != null ? _tokenCounts_get : 0) + 1);
         });
-        if (!this.sortOrder) {
+        if (!this.sortedTokens) {
             this.createSortOrder();
         }
-        this.sortOrder.forEach((k)=>{
+        this.sortedTokens.forEach((k)=>{
             const count = tokenCounts.get(k);
             if (!count) {
                 return;
@@ -55,13 +56,13 @@ class AttributeTokenChain {
         return resultArray;
     }
     constructor(){
-        /** <attr, frequency> */ this.freqData = new Map();
-        this.sortOrder = null;
+        /** <attr, frequency> */ this.tokenCounts = new Map();
+        this.sortedTokens = null;
     }
 }
 /** Sort values inside list-like attributes (e.g. class, rel) */ const mod = {
     default (tree, options, moduleOptions) {
-        const sortType = processModuleOptions(moduleOptions);
+        const sortType = resolveSortType(moduleOptions);
         if (sortType === 'alphabetical') {
             return sortAttributesWithListsInAlphabeticalOrder(tree);
         }
@@ -73,64 +74,50 @@ class AttributeTokenChain {
     }
 };
 const splitListAttributeValues = (attrValue)=>attrValue.split(/\s+/).filter(Boolean);
-function sortAttributesWithListsInAlphabeticalOrder(tree) {
+function walkListAttributes(tree, walkFn) {
     tree.walk((node)=>{
         if (!node.attrs) {
             return node;
         }
         const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.keys(node.attrs).forEach((attrName)=>{
+        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
             const attrNameLower = attrName.toLowerCase();
-            if (!isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            const attrValues = splitListAttributeValues(node.attrs[attrName]);
-            if (attrValues.length < 2) {
+            if (!isListAttribute(attrNameLower, tagName) || typeof attrValues !== 'string') {
                 return;
             }
-            node.attrs[attrName] = attrValues.sort((a, b)=>{
-                // @ts-expect-error -- deliberately use minus operator to sort things
-                return typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b;
-            }).join(' ');
+            walkFn(node.attrs, attrName, attrValues);
         });
         return node;
     });
+}
+function sortAttributesWithListsInAlphabeticalOrder(tree) {
+    walkListAttributes(tree, (nodeAttrs, attrName, attrValues)=>{
+        const values = splitListAttributeValues(attrValues);
+        if (values.length < 2) {
+            return;
+        }
+        nodeAttrs[attrName] = values.sort((a, b)=>{
+            // @ts-expect-error -- deliberately use minus operator to sort things
+            return typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b;
+        }).join(' ');
+    });
     return tree;
 }
 function sortAttributesWithListsByFrequency(tree) {
-    const tokenChainObj = {}; // <attrNameLower: AttributeTokenChain>[]
+    const tokenChainObj = {};
     // Traverse through tree to get frequency
-    tree.walk((node)=>{
-        if (!node.attrs) {
-            return node;
-        }
-        const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new AttributeTokenChain();
-            tokenChainObj[attrNameLower].addFromNodeAttrsArray(splitListAttributeValues(attrValues));
-        });
-        return node;
+    walkListAttributes(tree, (_nodeAttrs, attrName, attrValues)=>{
+        const attrNameLower = attrName.toLowerCase();
+        tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new ListAttributeTokenChain();
+        tokenChainObj[attrNameLower].addFromNodeAttrsArray(splitListAttributeValues(attrValues));
     });
     // Traverse through tree again, this time sort the attribute values
-    tree.walk((node)=>{
-        if (!node.attrs) {
-            return node;
+    walkListAttributes(tree, (nodeAttrs, attrName, attrValues)=>{
+        const attrNameLower = attrName.toLowerCase();
+        if (!tokenChainObj[attrNameLower]) {
+            return;
         }
-        const tagName = node.tag ? node.tag.toLowerCase() : undefined;
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!isListAttribute(attrNameLower, tagName)) {
-                return;
-            }
-            if (tokenChainObj[attrNameLower]) {
-                node.attrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(splitListAttributeValues(attrValues)).join(' ');
-            }
-        });
-        return node;
+        nodeAttrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(splitListAttributeValues(attrValues)).join(' ');
     });
     return tree;
 }

package/dist/presets/max.js

@@ -10,23 +10,27 @@ var safePreset__default = /*#__PURE__*/_interopDefault(safePreset);
  * Maximal minification (might break some pages)
  */ var max = {
     ...safePreset__default.default,
+    removeRedundantAttributes: true,
+    sortAttributes: true,
     collapseWhitespace: 'all',
     removeComments: 'all',
+    removeEmptyElements: true,
+    minifyConditionalComments: true,
+    removeOptionalTags: true,
     removeAttributeQuotes: true,
-    removeRedundantAttributes: true,
     minifyAttributes: {
         metaContent: true,
         redundantWhitespaces: 'agressive'
     },
     mergeScripts: true,
     mergeStyles: true,
-    removeUnusedCss: {},
+    removeUnusedCss: {
+        tool: 'purgeCSS'
+    },
     minifyCss: {
         preset: 'default'
     },
-    minifySvg: {},
-    minifyConditionalComments: true,
-    removeOptionalTags: true
+    minifySvg: {}
 };
 
 exports.default = max;

package/dist/presets/max.mjs

@@ -4,23 +4,27 @@ import safePreset from './safe.mjs';
  * Maximal minification (might break some pages)
  */ var max = {
     ...safePreset,
+    removeRedundantAttributes: true,
+    sortAttributes: true,
     collapseWhitespace: 'all',
     removeComments: 'all',
+    removeEmptyElements: true,
+    minifyConditionalComments: true,
+    removeOptionalTags: true,
     removeAttributeQuotes: true,
-    removeRedundantAttributes: true,
     minifyAttributes: {
         metaContent: true,
         redundantWhitespaces: 'agressive'
     },
     mergeScripts: true,
     mergeStyles: true,
-    removeUnusedCss: {},
+    removeUnusedCss: {
+        tool: 'purgeCSS'
+    },
     minifyCss: {
         preset: 'default'
     },
-    minifySvg: {},
-    minifyConditionalComments: true,
-    removeOptionalTags: true
+    minifySvg: {}
 };
 
 export { max as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlnano",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "author": "Kirill Maltsev <maltsevkirill@gmail.com>",
   "license": "MIT",
@@ -9,7 +9,10 @@
     "build": "npm run clean && bunchee",
     "postbuild": "chmod +x dist/bin.js",
     "compile": "npm run build",
-    "lint": "eslint --fix .",
+    "lint:eslint": "eslint --fix .",
+    "lint:duplicates": "jscpd",
+    "lint:knip": "knip",
+    "lint": "npm run lint:eslint && npm run lint:duplicates && npm run lint:knip",
     "test:mocha": "mocha --timeout 5000 --require @swc-node/register --recursive --check-leaks --globals addresses 'test/**/*.ts'",
     "pretest": "npm run lint && npm run compile",
     "test": "c8 -r text -r html npm run test:mocha",
@@ -69,15 +72,16 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.0.0",
     "bunchee": "^6.5.1",
-    "c8": "^10.1.3",
+    "c8": "^11.0.0",
     "cssnano": "^7.0.0",
     "eslint": "^9.25.1",
     "eslint-config-flat-gitignore": "^2.1.0",
-    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-import-x": "^4.11.0",
     "eslint-plugin-unused-imports": "^4.1.4",
     "expect": "^30.1.1",
     "globals": "^17.0.0",
+    "jscpd": "^4.0.8",
+    "knip": "^5.83.1",
     "mocha": "^11.0.1",
     "postcss": "^8.3.11",
     "purgecss": "^8.0.0",