htmlnano 3.0.0 → 3.2.0

package/dist/_modules/sortAttributes.d.mts

@@ -2,16 +2,24 @@ import PostHTML from 'posthtml';
 import { MinifyOptions } from 'terser';
 import { Options } from 'cssnano';
 import { Config } from 'svgo';
+import { UserDefinedOptions } from 'purgecss';
 
 type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
+        quoteStyle?: 0 | 1 | 2 | undefined;
+        replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
     render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type PostHTMLNodeLike = PostHTML.Node | string;
+type HtmlnanoTemplateRule = {
+    tag: string;
+    attrs?: Record<string, string | boolean | void>;
+};
+type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -27,17 +35,42 @@ interface HtmlnanoOptions {
     mergeStyles?: boolean;
     mergeScripts?: boolean;
     minifyCss?: Options | boolean;
+    minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
     minifyJs?: MinifyOptions | boolean;
     minifyJson?: boolean;
+    minifyAttributes?: boolean | {
+        metaContent?: boolean;
+        redundantWhitespaces?: 'safe' | 'agressive' | false;
+    };
     minifySvg?: Config | boolean;
     normalizeAttributeValues?: boolean;
-    removeAttributeQuotes?: boolean;
-    removeComments?: boolean | 'safe' | 'all' | RegExp | ((comment: string) => boolean);
+    removeAttributeQuotes?: boolean | {
+        force?: boolean;
+    };
+    removeComments?: boolean | RegExp | ((comment: string) => boolean) | string;
     removeEmptyAttributes?: boolean;
+    removeEmptyElements?: boolean | {
+        removeWithAttributes?: boolean;
+    };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean;
+    removeUnusedCss?: boolean | ({
+        tool: 'purgeCSS';
+    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+        banner?: boolean;
+        csspath?: string;
+        htmlroot?: string;
+        ignore?: (string | RegExp)[];
+        inject?: string;
+        jsdom?: object;
+        media?: string[];
+        report?: boolean;
+        strictSSL?: boolean;
+        timeout?: number;
+        uncssrc?: string;
+        userAgent?: string;
+    };
     sortAttributes?: boolean | 'alphabetical' | 'frequency';
     sortAttributesWithLists?: boolean | 'alphabetical' | 'frequency';
 }
@@ -52,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

@@ -2,16 +2,24 @@ import PostHTML from 'posthtml';
 import { MinifyOptions } from 'terser';
 import { Options } from 'cssnano';
 import { Config } from 'svgo';
+import { UserDefinedOptions } from 'purgecss';
 
 type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
+        quoteStyle?: 0 | 1 | 2 | undefined;
+        replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
     render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type PostHTMLNodeLike = PostHTML.Node | string;
+type HtmlnanoTemplateRule = {
+    tag: string;
+    attrs?: Record<string, string | boolean | void>;
+};
+type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -27,17 +35,42 @@ interface HtmlnanoOptions {
     mergeStyles?: boolean;
     mergeScripts?: boolean;
     minifyCss?: Options | boolean;
+    minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
     minifyJs?: MinifyOptions | boolean;
     minifyJson?: boolean;
+    minifyAttributes?: boolean | {
+        metaContent?: boolean;
+        redundantWhitespaces?: 'safe' | 'agressive' | false;
+    };
     minifySvg?: Config | boolean;
     normalizeAttributeValues?: boolean;
-    removeAttributeQuotes?: boolean;
-    removeComments?: boolean | 'safe' | 'all' | RegExp | ((comment: string) => boolean);
+    removeAttributeQuotes?: boolean | {
+        force?: boolean;
+    };
+    removeComments?: boolean | RegExp | ((comment: string) => boolean) | string;
     removeEmptyAttributes?: boolean;
+    removeEmptyElements?: boolean | {
+        removeWithAttributes?: boolean;
+    };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean;
+    removeUnusedCss?: boolean | ({
+        tool: 'purgeCSS';
+    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+        banner?: boolean;
+        csspath?: string;
+        htmlroot?: string;
+        ignore?: (string | RegExp)[];
+        inject?: string;
+        jsdom?: object;
+        media?: string[];
+        report?: boolean;
+        strictSSL?: boolean;
+        timeout?: number;
+        uncssrc?: string;
+        userAgent?: string;
+    };
     sortAttributes?: boolean | 'alphabetical' | 'frequency';
     sortAttributesWithLists?: boolean | 'alphabetical' | 'frequency';
 }
@@ -52,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)=>{
@@ -24,23 +25,41 @@ class AttributeTokenChain {
         const _sortOrder = [
             ...this.freqData.entries()
         ];
-        _sortOrder.sort((a, b)=>b[1] - a[1]);
+        _sortOrder.sort((a, b)=>{
+            const freqDiff = b[1] - a[1];
+            if (freqDiff !== 0) return freqDiff;
+            return a[0].localeCompare(b[0]);
+        });
         this.sortOrder = _sortOrder.map((i)=>i[0]);
     }
     sortFromNodeAttrs(nodeAttrs) {
         const newAttrs = {};
-        // Convert node.attrs attrName into lower case.
+        // Convert node.attrs attrName into lower case while preserving originals.
         const loweredNodeAttrs = {};
         Object.entries(nodeAttrs).forEach(([attrName, attrValue])=>{
-            loweredNodeAttrs[attrName.toLowerCase()] = attrValue;
+            const attrNameLower = attrName.toLowerCase();
+            if (!loweredNodeAttrs[attrNameLower]) {
+                loweredNodeAttrs[attrNameLower] = {
+                    name: attrName,
+                    value: attrValue
+                };
+            }
         });
         if (!this.sortOrder) {
             this.createSortOrder();
         }
+        const seen = new Set();
         this.sortOrder.forEach((attrNameLower)=>{
             // The attrName inside "sortOrder" has been lowered
-            if (loweredNodeAttrs[attrNameLower] != null) {
-                newAttrs[attrNameLower] = loweredNodeAttrs[attrNameLower];
+            const originalAttr = loweredNodeAttrs[attrNameLower];
+            if (originalAttr != null) {
+                newAttrs[originalAttr.name] = originalAttr.value;
+                seen.add(attrNameLower);
+            }
+        });
+        Object.entries(loweredNodeAttrs).forEach(([attrNameLower, originalAttr])=>{
+            if (!seen.has(attrNameLower)) {
+                newAttrs[originalAttr.name] = originalAttr.value;
             }
         });
         return newAttrs;
@@ -52,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)=>{
@@ -22,23 +23,41 @@ class AttributeTokenChain {
         const _sortOrder = [
             ...this.freqData.entries()
         ];
-        _sortOrder.sort((a, b)=>b[1] - a[1]);
+        _sortOrder.sort((a, b)=>{
+            const freqDiff = b[1] - a[1];
+            if (freqDiff !== 0) return freqDiff;
+            return a[0].localeCompare(b[0]);
+        });
         this.sortOrder = _sortOrder.map((i)=>i[0]);
     }
     sortFromNodeAttrs(nodeAttrs) {
         const newAttrs = {};
-        // Convert node.attrs attrName into lower case.
+        // Convert node.attrs attrName into lower case while preserving originals.
         const loweredNodeAttrs = {};
         Object.entries(nodeAttrs).forEach(([attrName, attrValue])=>{
-            loweredNodeAttrs[attrName.toLowerCase()] = attrValue;
+            const attrNameLower = attrName.toLowerCase();
+            if (!loweredNodeAttrs[attrNameLower]) {
+                loweredNodeAttrs[attrNameLower] = {
+                    name: attrName,
+                    value: attrValue
+                };
+            }
         });
         if (!this.sortOrder) {
             this.createSortOrder();
         }
+        const seen = new Set();
         this.sortOrder.forEach((attrNameLower)=>{
             // The attrName inside "sortOrder" has been lowered
-            if (loweredNodeAttrs[attrNameLower] != null) {
-                newAttrs[attrNameLower] = loweredNodeAttrs[attrNameLower];
+            const originalAttr = loweredNodeAttrs[attrNameLower];
+            if (originalAttr != null) {
+                newAttrs[originalAttr.name] = originalAttr.value;
+                seen.add(attrNameLower);
+            }
+        });
+        Object.entries(loweredNodeAttrs).forEach(([attrNameLower, originalAttr])=>{
+            if (!seen.has(attrNameLower)) {
+                newAttrs[originalAttr.name] = originalAttr.value;
             }
         });
         return newAttrs;
@@ -50,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

@@ -2,16 +2,24 @@ import PostHTML from 'posthtml';
 import { MinifyOptions } from 'terser';
 import { Options } from 'cssnano';
 import { Config } from 'svgo';
+import { UserDefinedOptions } from 'purgecss';
 
 type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
+        quoteStyle?: 0 | 1 | 2 | undefined;
+        replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
     render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type PostHTMLNodeLike = PostHTML.Node | string;
+type HtmlnanoTemplateRule = {
+    tag: string;
+    attrs?: Record<string, string | boolean | void>;
+};
+type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -27,17 +35,42 @@ interface HtmlnanoOptions {
     mergeStyles?: boolean;
     mergeScripts?: boolean;
     minifyCss?: Options | boolean;
+    minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
     minifyJs?: MinifyOptions | boolean;
     minifyJson?: boolean;
+    minifyAttributes?: boolean | {
+        metaContent?: boolean;
+        redundantWhitespaces?: 'safe' | 'agressive' | false;
+    };
     minifySvg?: Config | boolean;
     normalizeAttributeValues?: boolean;
-    removeAttributeQuotes?: boolean;
-    removeComments?: boolean | 'safe' | 'all' | RegExp | ((comment: string) => boolean);
+    removeAttributeQuotes?: boolean | {
+        force?: boolean;
+    };
+    removeComments?: boolean | RegExp | ((comment: string) => boolean) | string;
     removeEmptyAttributes?: boolean;
+    removeEmptyElements?: boolean | {
+        removeWithAttributes?: boolean;
+    };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean;
+    removeUnusedCss?: boolean | ({
+        tool: 'purgeCSS';
+    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+        banner?: boolean;
+        csspath?: string;
+        htmlroot?: string;
+        ignore?: (string | RegExp)[];
+        inject?: string;
+        jsdom?: object;
+        media?: string[];
+        report?: boolean;
+        strictSSL?: boolean;
+        timeout?: number;
+        uncssrc?: string;
+        userAgent?: string;
+    };
     sortAttributes?: boolean | 'alphabetical' | 'frequency';
     sortAttributesWithLists?: boolean | 'alphabetical' | 'frequency';
 }
@@ -52,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

@@ -2,16 +2,24 @@ import PostHTML from 'posthtml';
 import { MinifyOptions } from 'terser';
 import { Options } from 'cssnano';
 import { Config } from 'svgo';
+import { UserDefinedOptions } from 'purgecss';
 
 type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
+        quoteStyle?: 0 | 1 | 2 | undefined;
+        replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
     render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type PostHTMLNodeLike = PostHTML.Node | string;
+type HtmlnanoTemplateRule = {
+    tag: string;
+    attrs?: Record<string, string | boolean | void>;
+};
+type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -27,17 +35,42 @@ interface HtmlnanoOptions {
     mergeStyles?: boolean;
     mergeScripts?: boolean;
     minifyCss?: Options | boolean;
+    minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
     minifyJs?: MinifyOptions | boolean;
     minifyJson?: boolean;
+    minifyAttributes?: boolean | {
+        metaContent?: boolean;
+        redundantWhitespaces?: 'safe' | 'agressive' | false;
+    };
     minifySvg?: Config | boolean;
     normalizeAttributeValues?: boolean;
-    removeAttributeQuotes?: boolean;
-    removeComments?: boolean | 'safe' | 'all' | RegExp | ((comment: string) => boolean);
+    removeAttributeQuotes?: boolean | {
+        force?: boolean;
+    };
+    removeComments?: boolean | RegExp | ((comment: string) => boolean) | string;
     removeEmptyAttributes?: boolean;
+    removeEmptyElements?: boolean | {
+        removeWithAttributes?: boolean;
+    };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean;
+    removeUnusedCss?: boolean | ({
+        tool: 'purgeCSS';
+    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+        banner?: boolean;
+        csspath?: string;
+        htmlroot?: string;
+        ignore?: (string | RegExp)[];
+        inject?: string;
+        jsdom?: object;
+        media?: string[];
+        report?: boolean;
+        strictSSL?: boolean;
+        timeout?: number;
+        uncssrc?: string;
+        userAgent?: string;
+    };
     sortAttributes?: boolean | 'alphabetical' | 'frequency';
     sortAttributesWithLists?: boolean | 'alphabetical' | 'frequency';
 }
@@ -52,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,53 +2,69 @@ 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 (this.freqData.has(attrValue)) {
-                this.freqData.set(attrValue, this.freqData.get(attrValue) + 1);
+            if (!attrValue) {
+                return;
+            }
+            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]);
-        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 = [];
-        if (!this.sortOrder) {
+        const tokenCounts = new Map();
+        attrValuesArray.forEach((attrValue)=>{
+            var _tokenCounts_get;
+            if (!attrValue) {
+                return;
+            }
+            tokenCounts.set(attrValue, ((_tokenCounts_get = tokenCounts.get(attrValue)) != null ? _tokenCounts_get : 0) + 1);
+        });
+        if (!this.sortedTokens) {
             this.createSortOrder();
         }
-        this.sortOrder.forEach((k)=>{
-            if (attrValuesArray.includes(k)) {
+        this.sortedTokens.forEach((k)=>{
+            const count = tokenCounts.get(k);
+            if (!count) {
+                return;
+            }
+            for(let i = 0; i < count; i += 1){
                 resultArray.push(k);
             }
         });
         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);
         }
@@ -59,58 +75,51 @@ class AttributeTokenChain {
         return tree;
     }
 };
-function sortAttributesWithListsInAlphabeticalOrder(tree) {
+const splitListAttributeValues = (attrValue)=>attrValue.split(/\s+/).filter(Boolean);
+function walkListAttributes(tree, walkFn) {
     tree.walk((node)=>{
         if (!node.attrs) {
             return node;
         }
-        Object.keys(node.attrs).forEach((attrName)=>{
+        const tagName = node.tag ? node.tag.toLowerCase() : undefined;
+        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
             const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.attributesWithLists.has(attrNameLower)) {
+            if (!collapseAttributeWhitespace_js.isListAttribute(attrNameLower, tagName) || typeof attrValues !== 'string') {
                 return;
             }
-            const attrValues = node.attrs[attrName].split(/\s/);
-            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;
-        }
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.attributesWithLists.has(attrNameLower)) {
-                return;
-            }
-            tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new AttributeTokenChain();
-            tokenChainObj[attrNameLower].addFromNodeAttrsArray(attrValues.split(/\s/));
-        });
-        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;
         }
-        Object.entries(node.attrs).forEach(([attrName, attrValues])=>{
-            const attrNameLower = attrName.toLowerCase();
-            if (!collapseAttributeWhitespace_js.attributesWithLists.has(attrNameLower)) {
-                return;
-            }
-            if (tokenChainObj[attrNameLower]) {
-                node.attrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(attrValues.split(/\s/)).join(' ');
-            }
-        });
-        return node;
+        nodeAttrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(splitListAttributeValues(attrValues)).join(' ');
     });
     return tree;
 }