htmlnano 3.1.0 → 3.2.1

package/dist/_modules/sortAttributesWithLists.d.mts

@@ -1,25 +1,70 @@
 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 & {
+type PostHTMLNodeLike = PostHTML.Node | string;
+type PostHTMLTreeLike = [PostHTMLNodeLike] & 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;
+    render(node: PostHTMLNodeLike | 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[];
+type HtmlnanoMinifyCssOptions = object;
+type HtmlnanoMinifyJsOptions = object;
+type HtmlnanoMinifySvgOptions = object;
+type HtmlnanoPurgeCssPattern = string | RegExp;
+type HtmlnanoPurgeCssExtractorResultDetailed = {
+    attributes: {
+        names: string[];
+        values: string[];
+    };
+    classes: string[];
+    ids: string[];
+    tags: string[];
+    undetermined: string[];
+};
+type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
+type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
+type HtmlnanoPurgeCssSourceMapOptions = {
+    absolute?: boolean;
+    annotation?: boolean | string;
+    from?: string;
+    inline?: boolean;
+    prev?: boolean | object | string;
+    sourcesContent?: boolean;
+    to?: string;
+};
+type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
+    standard?: HtmlnanoPurgeCssPattern[];
+    deep?: RegExp[];
+    greedy?: RegExp[];
+    variables?: HtmlnanoPurgeCssPattern[];
+    keyframes?: HtmlnanoPurgeCssPattern[];
+};
+interface HtmlnanoPurgeCssOptions {
+    tool: 'purgeCSS';
+    defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
+    fontFace?: boolean;
+    keyframes?: boolean;
+    output?: string;
+    rejected?: boolean;
+    rejectedCss?: boolean;
+    sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
+    stdin?: boolean;
+    stdout?: boolean;
+    variables?: boolean;
+    safelist?: HtmlnanoPurgeCssSafelist;
+    blocklist?: HtmlnanoPurgeCssPattern[];
+    skippedContentGlobs?: string[];
+    dynamicAttributes?: string[];
+}
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -34,16 +79,16 @@ interface HtmlnanoOptions {
     minifyUrls?: URL | string | false;
     mergeStyles?: boolean;
     mergeScripts?: boolean;
-    minifyCss?: Options | boolean;
+    minifyCss?: HtmlnanoMinifyCssOptions | boolean;
     minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
-    minifyJs?: MinifyOptions | boolean;
+    minifyJs?: HtmlnanoMinifyJsOptions | boolean;
     minifyJson?: boolean;
     minifyAttributes?: boolean | {
         metaContent?: boolean;
         redundantWhitespaces?: 'safe' | 'agressive' | false;
     };
-    minifySvg?: Config | boolean;
+    minifySvg?: HtmlnanoMinifySvgOptions | boolean;
     normalizeAttributeValues?: boolean;
     removeAttributeQuotes?: boolean | {
         force?: boolean;
@@ -55,9 +100,8 @@ interface HtmlnanoOptions {
     };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean | ({
-        tool: 'purgeCSS';
-    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+    removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
+        tool?: 'uncss';
         banner?: boolean;
         csspath?: string;
         htmlroot?: string;
@@ -77,7 +121,7 @@ interface HtmlnanoOptions {
 type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
 type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
 type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
-type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
+type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
 type HtmlnanoModule<Options = any> = {
     onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
     onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -85,6 +129,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

@@ -1,25 +1,70 @@
 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 & {
+type PostHTMLNodeLike = PostHTML.Node | string;
+type PostHTMLTreeLike = [PostHTMLNodeLike] & 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;
+    render(node: PostHTMLNodeLike | 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[];
+type HtmlnanoMinifyCssOptions = object;
+type HtmlnanoMinifyJsOptions = object;
+type HtmlnanoMinifySvgOptions = object;
+type HtmlnanoPurgeCssPattern = string | RegExp;
+type HtmlnanoPurgeCssExtractorResultDetailed = {
+    attributes: {
+        names: string[];
+        values: string[];
+    };
+    classes: string[];
+    ids: string[];
+    tags: string[];
+    undetermined: string[];
+};
+type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
+type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
+type HtmlnanoPurgeCssSourceMapOptions = {
+    absolute?: boolean;
+    annotation?: boolean | string;
+    from?: string;
+    inline?: boolean;
+    prev?: boolean | object | string;
+    sourcesContent?: boolean;
+    to?: string;
+};
+type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
+    standard?: HtmlnanoPurgeCssPattern[];
+    deep?: RegExp[];
+    greedy?: RegExp[];
+    variables?: HtmlnanoPurgeCssPattern[];
+    keyframes?: HtmlnanoPurgeCssPattern[];
+};
+interface HtmlnanoPurgeCssOptions {
+    tool: 'purgeCSS';
+    defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
+    fontFace?: boolean;
+    keyframes?: boolean;
+    output?: string;
+    rejected?: boolean;
+    rejectedCss?: boolean;
+    sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
+    stdin?: boolean;
+    stdout?: boolean;
+    variables?: boolean;
+    safelist?: HtmlnanoPurgeCssSafelist;
+    blocklist?: HtmlnanoPurgeCssPattern[];
+    skippedContentGlobs?: string[];
+    dynamicAttributes?: string[];
+}
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -34,16 +79,16 @@ interface HtmlnanoOptions {
     minifyUrls?: URL | string | false;
     mergeStyles?: boolean;
     mergeScripts?: boolean;
-    minifyCss?: Options | boolean;
+    minifyCss?: HtmlnanoMinifyCssOptions | boolean;
     minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
-    minifyJs?: MinifyOptions | boolean;
+    minifyJs?: HtmlnanoMinifyJsOptions | boolean;
     minifyJson?: boolean;
     minifyAttributes?: boolean | {
         metaContent?: boolean;
         redundantWhitespaces?: 'safe' | 'agressive' | false;
     };
-    minifySvg?: Config | boolean;
+    minifySvg?: HtmlnanoMinifySvgOptions | boolean;
     normalizeAttributeValues?: boolean;
     removeAttributeQuotes?: boolean | {
         force?: boolean;
@@ -55,9 +100,8 @@ interface HtmlnanoOptions {
     };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean | ({
-        tool: 'purgeCSS';
-    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+    removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
+        tool?: 'uncss';
         banner?: boolean;
         csspath?: string;
         htmlroot?: string;
@@ -77,7 +121,7 @@ interface HtmlnanoOptions {
 type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
 type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
 type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
-type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
+type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
 type HtmlnanoModule<Options = any> = {
     onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
     onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -85,6 +129,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;
 }