Merge pull request #195 from SukkaW/on-attrs-module-type-guard

Fix: guard type of attributes' value
posthtml · May 15, 2022 · b8bcfed · b8bcfed
2 parents 1f693d2 + 34cdad7
commit b8bcfed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/modules/collapseAttributeWhitespace.es6 b/lib/modules/collapseAttributeWhitespace.es6
@@ -73,6 +73,8 @@ export function onAttrs() {
         const newAttrs = attrs;
 
         Object.entries(attrs).forEach(([attrName, attrValue]) => {
+            if (typeof attrValue !== 'string') return;
+
             if (attributesWithLists.has(attrName)) {
                 const newAttrValue = attrValue.replace(/\s+/g, ' ').trim();
                 newAttrs[attrName] = newAttrValue;
@@ -82,7 +84,7 @@ export function onAttrs() {
             if (
                 isEventHandler(attrName)
                 || (
-                    Object.hasOwnProperty.call(attributesWithSingleValue, attrName)
+                    Object.prototype.hasOwnProperty.call(attributesWithSingleValue, attrName)
                     && (
                         attributesWithSingleValue[attrName] === null
                         || attributesWithSingleValue[attrName].includes(node.tag)
@@ -98,5 +100,5 @@ export function onAttrs() {
 }
 
 function minifySingleAttributeValue(value) {
-    return typeof value === 'string' ? String(value).trim() : value;
+    return typeof value === 'string' ? value.trim() : value;
 }
diff --git a/lib/modules/deduplicateAttributeValues.es6 b/lib/modules/deduplicateAttributeValues.es6
@@ -9,6 +9,10 @@ export function onAttrs() {
                 return;
             }
 
+            if (typeof attrs[attrName] !== 'string') {
+                return;
+            }
+
             const attrValues = attrs[attrName].split(/\s/);
             const uniqeAttrValues = new Set();
             const deduplicatedAttrValues = [];

diff --git a/lib/modules/normalizeAttributeValues.es6 b/lib/modules/normalizeAttributeValues.es6
@@ -123,7 +123,7 @@ export function onAttrs() {
                     || caseInsensitiveAttributes[attrName].includes(node.tag)
                 )
             ) {
-                newAttrValue = attrValue.toLowerCase ? attrValue.toLowerCase() : attrValue;
+                newAttrValue = typeof attrValue.toLowerCase === 'function' ? attrValue.toLowerCase() : attrValue;
             }
 
             if (

diff --git a/lib/modules/removeEmptyAttributes.es6 b/lib/modules/removeEmptyAttributes.es6
@@ -108,8 +108,10 @@ export function onAttrs() {
                     )
                 )
             ) {
-                if (attrValue === '' || (attrValue || '').match(/^\s+$/)) {
-                    delete newAttrs[attrName];
+                if (typeof attrValue === 'string') {
+                    if (attrValue === '' || attrValue.trim() === '') {
+                        delete newAttrs[attrName];
+                    }
                 }
             }
         });