html-minifier-next 2.1.3 → 2.1.5

package/package.json

@@ -7,22 +7,21 @@
   "dependencies": {
     "change-case": "^4.1.2",
     "clean-css": "~5.3.3",
-    "commander": "^14.0.0",
+    "commander": "^14.0.1",
     "entities": "^7.0.0",
     "relateurl": "^0.2.7",
     "terser": "^5.44.0"
   },
-  "description": "Highly configurable, well-tested, JavaScript-based HTML minifier.",
+  "description": "Highly configurable, well-tested, JavaScript-based HTML minifier",
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
-    "@eslint/js": "^9.33.0",
+    "@eslint/js": "^9.35.0",
     "@jest/globals": "^30.1.2",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
-    "alpinejs": "^3.14.9",
-    "eslint": "^9.33.0",
+    "eslint": "^9.35.0",
     "jest": "^30.1.3",
     "rollup": "^4.50.0",
     "rollup-plugin-polyfill-node": "^0.13.0",
@@ -86,5 +85,5 @@
     "test:watch": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest --watch"
   },
   "type": "module",
-  "version": "2.1.3"
+  "version": "2.1.5"
 }

package/src/htmlminifier.js

@@ -2,7 +2,6 @@ import CleanCSS from 'clean-css';
 import { decodeHTMLStrict, decodeHTML } from 'entities';
 import RelateURL from 'relateurl';
 import { minify as terser } from 'terser';
-
 import { HTMLParser, endTag } from './htmlparser.js';
 import TokenChain from './tokenchain.js';
 import { replaceAsync } from './utils.js';

package/src/htmlparser.js

@@ -1,6 +1,6 @@
 /*!
  * HTML Parser By John Resig (ejohn.org)
- * Modified by Juriy "kangax" Zaytsev
+ * Modified by Juriy “kangax” Zaytsev
  * Original code by Erik Arvidsson, Mozilla Public License
  * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
  */
@@ -122,7 +122,7 @@ export class HTMLParser {
       if (!lastTag || !special.has(lastTag)) {
         let textEnd = html.indexOf('<');
         if (textEnd === 0) {
-          // Comment:
+          // Comment
           if (/^<!--/.test(html)) {
             const commentEnd = html.indexOf('-->');
 
@@ -150,7 +150,7 @@ export class HTMLParser {
             }
           }
 
-          // Doctype:
+          // Doctype
           const doctypeMatch = html.match(doctype);
           if (doctypeMatch) {
             if (handler.doctype) {
@@ -161,7 +161,7 @@ export class HTMLParser {
             continue;
           }
 
-          // End tag:
+          // End tag
           const endTagMatch = html.match(endTag);
           if (endTagMatch) {
             html = html.substring(endTagMatch[0].length);
@@ -170,7 +170,7 @@ export class HTMLParser {
             continue;
           }
 
-          // Start tag:
+          // Start tag
           const startTagMatch = parseStartTag(html);
           if (startTagMatch) {
             html = startTagMatch.rest;
@@ -263,11 +263,41 @@ export class HTMLParser {
       }
     }
 
-    async function closeIfFound(tagName) {
-      if (findTag(tagName) >= 0) {
-        await parseEndTag('', tagName);
+    function findTagInCurrentTable(tagName) {
+      let pos;
+      const needle = tagName.toLowerCase();
+      for (pos = stack.length - 1; pos >= 0; pos--) {
+        const currentTag = stack[pos].tag.toLowerCase();
+        if (currentTag === needle) {
+          return pos;
+        }
+        // Stop searching if we hit a table boundary
+        if (currentTag === 'table') {
+          break;
+        }
+      }
+      return -1;
+    }
+
+    async function parseEndTagAt(pos) {
+      // Close all open elements up to pos (mirrors parseEndTag’s core branch)
+      for (let i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          await handler.end(stack[i].tag, stack[i].attrs, true);
+        }
+      }
+      stack.length = pos;
+      lastTag = pos && stack[pos - 1].tag;
+    }
+
+    async function closeIfFoundInCurrentTable(tagName) {
+      const pos = findTagInCurrentTable(tagName);
+      if (pos >= 0) {
+        // Close at the specific index to avoid re-searching
+        await parseEndTagAt(pos);
         return true;
       }
+      return false;
     }
 
     async function handleStartTag(match) {
@@ -278,10 +308,15 @@ export class HTMLParser {
         if (lastTag === 'p' && nonPhrasing.has(tagName)) {
           await parseEndTag('', lastTag);
         } else if (tagName === 'tbody') {
-          await closeIfFound('thead');
+          await closeIfFoundInCurrentTable('thead');
         } else if (tagName === 'tfoot') {
-          if (!await closeIfFound('tbody')) {
-            await closeIfFound('thead');
+          if (!await closeIfFoundInCurrentTable('tbody')) {
+            await closeIfFoundInCurrentTable('thead');
+          }
+        } else if (tagName === 'thead') {
+          // If a `tbody` or `tfoot` is open in the current table, close it
+          if (!await closeIfFoundInCurrentTable('tbody')) {
+            await closeIfFoundInCurrentTable('tfoot');
           }
         }
         if (tagName === 'col' && findTag('colgroup') < 0) {