html-minifier-next 4.16.4 → 4.17.0

package/src/lib/elements.js

@@ -1,15 +1,15 @@
 // Imports
 
 import {
-  headerTags,
-  descriptionTags,
-  pBlockTags,
+  headerElements,
+  descriptionElements,
+  pBlockElements,
   rubyEndTagOmission,
   rubyRtcEndTagOmission,
-  optionTag,
-  tableContentTags,
-  tableSectionTags,
-  cellTags
+  optionElements,
+  tableContentElements,
+  tableSectionElements,
+  cellElements
 } from './constants.js';
 import { hasAttrName } from './attributes.js';
 
@@ -21,7 +21,7 @@ function canRemoveParentTag(optionalStartTag, tag) {
     case 'head':
       return true;
     case 'body':
-      return !headerTags.has(tag);
+      return !headerElements.has(tag);
     case 'colgroup':
       return tag === 'col';
     case 'tbody':
@@ -35,7 +35,7 @@ function isStartTagMandatory(optionalEndTag, tag) {
     case 'colgroup':
       return optionalEndTag === 'colgroup';
     case 'tbody':
-      return tableSectionTags.has(optionalEndTag);
+      return tableSectionElements.has(optionalEndTag);
   }
   return false;
 }
@@ -54,9 +54,9 @@ function canRemovePrecedingTag(optionalEndTag, tag) {
       return tag === optionalEndTag;
     case 'dt':
     case 'dd':
-      return descriptionTags.has(tag);
+      return descriptionElements.has(tag);
     case 'p':
-      return pBlockTags.has(tag);
+      return pBlockElements.has(tag);
     case 'rb':
     case 'rt':
     case 'rp':
@@ -64,15 +64,15 @@ function canRemovePrecedingTag(optionalEndTag, tag) {
     case 'rtc':
       return rubyRtcEndTagOmission.has(tag);
     case 'option':
-      return optionTag.has(tag);
+      return optionElements.has(tag);
     case 'thead':
     case 'tbody':
-      return tableContentTags.has(tag);
+      return tableContentElements.has(tag);
     case 'tfoot':
       return tag === 'tbody';
     case 'td':
     case 'th':
-      return cellTags.has(tag);
+      return cellElements.has(tag);
   }
   return false;
 }
@@ -175,7 +175,7 @@ function parseRemoveEmptyElementsExcept(input, options) {
     if (typeof item === 'string') {
       const spec = parseElementSpec(item, options);
       if (!spec && options.log) {
-        options.log('Warning: Unable to parse “removeEmptyElementsExcept” specification: "' + item + '"');
+        options.log('Warning: Unable to parse “removeEmptyElementsExcept” specification: “' + item + '”');
       }
       return spec;
     }

package/src/lib/options.js

@@ -26,8 +26,8 @@ function shouldMinifyInnerHTML(options) {
 /**
  * @param {Partial<MinifierOptions>} inputOptions - User-provided options
  * @param {Object} deps - Dependencies from htmlminifier.js
- * @param {Function} deps.getLightningCSS - Function to lazily load lightningcss
- * @param {Function} deps.getTerser - Function to lazily load terser
+ * @param {Function} deps.getLightningCSS - Function to lazily load Lightning CSS
+ * @param {Function} deps.getTerser - Function to lazily load Terser
  * @param {Function} deps.getSwc - Function to lazily load @swc/core
  * @param {LRU} deps.cssMinifyCache - CSS minification cache
  * @param {LRU} deps.jsMinifyCache - JS minification cache
@@ -64,7 +64,7 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, cssM
     if (typeof value === 'string') {
       return new RegExp(value.replace(/^\/(.*)\/$/, '$1'));
     }
-    return value; // Already a RegExp or other type
+    return value; // Already a RegExp or another type
   };
 
   const parseRegExpArray = (arr) => {
@@ -201,7 +201,7 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, cssM
       // Validate engine
       const supportedEngines = ['terser', 'swc'];
       if (!supportedEngines.includes(engine)) {
-        throw new Error(`Unsupported JS minifier engine: "${engine}". Supported engines: ${supportedEngines.join(', ')}`);
+        throw new Error(`Unsupported JS minifier engine: “${engine}”. Supported engines: ${supportedEngines.join(', ')}`);
       }
 
       // Extract engine-specific options (excluding `engine` field itself)
@@ -308,14 +308,14 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, cssM
         relateUrlOptions = {};
       }
 
-      // Cache RelateURL instance for reuse (expensive to create)
+      // Cache relateurl instance for reuse (expensive to create)
       const relateUrlInstance = new RelateURL(relateUrlOptions.site || '', relateUrlOptions);
 
       // Create instance-specific cache (results depend on site configuration)
       const instanceCache = urlMinifyCache ? new (urlMinifyCache.constructor)(500) : null;
 
       options.minifyURLs = function (text) {
-        // Fast-path: Skip if text doesn't look like a URL that needs processing
+        // Fast-path: Skip if text doesn’t look like a URL that needs processing
         // Only process if contains URL-like characters (`/`, `:`, `#`, `?`) or spaces that need encoding
         if (!/[/:?#\s]/.test(text)) {
           return text;
@@ -347,17 +347,17 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, cssM
       };
     } else if (key === 'minifySVG') {
       // Process SVG minification options
-      // Unlike minifyCSS/minifyJS, this is a simple options object, not a function
+      // Unlike `minifyCSS`/`minifyJS`, this is a simple options object, not a function
       // The actual minification is applied inline during attribute processing
       options.minifySVG = getSVGMinifierOptions(option);
     } else if (key === 'customAttrCollapse') {
-      // Single RegExp pattern
+      // Single regex pattern
       options[key] = parseRegExp(option);
     } else if (key === 'customAttrSurround') {
       // Nested array of RegExp pairs: `[[openRegExp, closeRegExp], …]`
       options[key] = parseNestedRegExpArray(option);
     } else if (['customAttrAssign', 'customEventAttributes', 'ignoreCustomComments', 'ignoreCustomFragments'].includes(key)) {
-      // Array of RegExp patterns
+      // Array of regex patterns
       options[key] = parseRegExpArray(option);
     } else {
       options[key] = option;

package/src/lib/svg.js

@@ -1,6 +1,5 @@
 /**
  * Lightweight SVG optimizations:
- *
  * - Numeric precision reduction for coordinates and path data
  * - Whitespace removal in attribute values (numeric sequences)
  * - Default attribute removal (safe, well-documented defaults)
@@ -9,6 +8,8 @@
  * - Path data space optimization
  */
 
+// Imports
+
 import { LRU } from './utils.js';
 import { RE_NUMERIC_VALUE } from './constants.js';
 
@@ -96,7 +97,7 @@ function minifyNumber(num, precision = 3) {
   if (num === '1.0' || num === '1.00' || num === '1.000') return '1';
 
   // Check cache
-  // (Note: uses input string as key, so “0.0000” and “0.00000” create separate entries.
+  // (Note: Uses input string as key, so “0.0000” and “0.00000” create separate entries.
   // This is intentional to avoid parsing overhead.
   // Real-world SVG files from export tools typically use consistent formats.)
   const cacheKey = `${num}:${precision}`;
@@ -135,15 +136,15 @@ function minifyPathData(pathData, precision = 3) {
 
   // Remove unnecessary spaces around path commands
   // Safe to remove space after a command letter when it’s followed by a number (which may be negative)
-  // M 10 20 → M10 20, L -5 -3 → L-5-3
+  // `M 10 20` → `M10 20`, `L -5 -3` → `L-5-3`
   result = result.replace(/([MLHVCSQTAZmlhvcsqtaz])\s+(?=-?\d)/g, '$1');
 
   // Safe to remove space before command letter when preceded by a number
-  // 0 L → 0L, 20 M → 20M
+  // `0 L` → `0L`, `20 M` → `20M`
   result = result.replace(/(\d)\s+([MLHVCSQTAZmlhvcsqtaz])/g, '$1$2');
 
   // Safe to remove space before negative number when preceded by a number
-  // 10 -20 → 10-20 (numbers are separated by the minus sign)
+  // `10 -20` → `10-20` (numbers are separated by the minus sign)
   result = result.replace(/(\d)\s+(-\d)/g, '$1$2');
 
   return result;
@@ -152,9 +153,9 @@ function minifyPathData(pathData, precision = 3) {
 /**
  * Minify whitespace in numeric attribute values
  * Examples:
- *   "10 , 20" → "10,20"
- *   "translate( 10 20 )" → "translate(10 20)"
- *   "100, 10  40,  198" → "100,10 40,198"
+ * - “10 , 20" → "10,20"
+ * - "translate( 10 20 )" → "translate(10 20)"
+ * - "100, 10  40,  198" → "100,10 40,198"
  *
  * @param {string} value - Attribute value to minify
  * @returns {string} Minified value
@@ -187,8 +188,7 @@ function minifyColor(color) {
 
   // Don’t process values that aren’t simple colors (preserve case-sensitive references)
   // `url(#id)`, `var(--name)`, `inherit`, `currentColor`, etc.
-  if (trimmed.includes('url(') || trimmed.includes('var(') ||
-      trimmed === 'inherit' || trimmed === 'currentColor') {
+  if (trimmed.includes('url(') || trimmed.includes('var(') || trimmed === 'inherit' || trimmed === 'currentColor') {
     return trimmed;
   }
 
@@ -196,7 +196,7 @@ function minifyColor(color) {
   const lower = trimmed.toLowerCase();
 
   // Shorten 6-digit hex to 3-digit when possible
-  // #aabbcc → #abc, #000000 → #000
+  // `#aabbcc` → `#abc`, `#000000` → `#000`
   const hexMatch = lower.match(/^#([0-9a-f]{6})$/);
   if (hexMatch) {
     const hex = hexMatch[1];
@@ -216,7 +216,7 @@ function minifyColor(color) {
     return NAMED_COLORS[lower] || lower;
   }
 
-  // Convert rgb(255,255,255) to hex
+  // Convert rgb() to hex
   const rgbMatch = lower.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/);
   if (rgbMatch) {
     const r = parseInt(rgbMatch[1], 10);
@@ -247,14 +247,14 @@ function minifyColor(color) {
 const NUMERIC_ATTRS = new Set([
   'd', // Path data
   'points', // Polygon/polyline points
-  'viewBox', // viewBox coordinates
+  'viewBox', // `viewBox` coordinates
   'transform', // Transform functions
   'x', 'y', 'x1', 'y1', 'x2', 'y2', // Coordinates
   'cx', 'cy', 'r', 'rx', 'ry', // Circle/ellipse
   'width', 'height', // Dimensions
   'dx', 'dy', // Text offsets
   'offset', // Gradient offset
-  'startOffset', // textPath
+  'startOffset', // `textPath`
   'pathLength', // Path length
   'stdDeviation', // Filter params
   'baseFrequency', // Turbulence

package/src/lib/whitespace.js

@@ -9,7 +9,8 @@ import {
   RE_NBSP_TRAILING_GROUP,
   RE_NBSP_TRAILING_STRIP,
   inlineElementsToKeepWhitespace,
-  inlineElementsToKeepWhitespaceWithin
+  inlineElementsToKeepWhitespaceWithin,
+  formControlElements
 } from './constants.js';
 
 // Trim whitespace
@@ -71,7 +72,7 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
   }
 
   if (trimLeft) {
-    // Non-breaking space is specifically handled inside the replacer function
+    // No-break space is specifically handled inside the replacer function
     str = str.replace(/^[ \n\r\t\f\xA0]+/, function (spaces) {
       const conservative = !lineBreakBefore && options.conservativeCollapse;
       if (conservative && spaces === '\t') {
@@ -82,7 +83,7 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
   }
 
   if (trimRight) {
-    // Non-breaking space is specifically handled inside the replacer function
+    // No-break space is specifically handled inside the replacer function
     str = str.replace(/[ \n\r\t\f\xA0]+$/, function (spaces) {
       const conservative = !lineBreakAfter && options.conservativeCollapse;
       if (conservative && spaces === '\t') {
@@ -106,11 +107,42 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
 
 // Collapse whitespace smartly based on surrounding tags
 
-function collapseWhitespaceSmart(str, prevTag, nextTag, options, inlineElements, inlineTextSet) {
+function collapseWhitespaceSmart(str, prevTag, nextTag, prevAttrs, nextAttrs, options, inlineElements, inlineTextSet) {
+  const prevTagName = prevTag && (prevTag.charAt(0) === '/' ? prevTag.slice(1) : prevTag);
+  const nextTagName = nextTag && (nextTag.charAt(0) === '/' ? nextTag.slice(1) : nextTag);
+
+  // Helper: Check if an input element has `type="hidden"`
+  const isHiddenInput = (tagName, attrs) => {
+    if (tagName !== 'input' || !attrs || !attrs.length) return false;
+    const typeAttr = attrs.find(attr => attr.name === 'type');
+    return typeAttr && typeAttr.value === 'hidden';
+  };
+
+  // Check if prev/next are non-rendering (hidden) elements
+  const prevIsHidden = isHiddenInput(prevTagName, prevAttrs);
+  const nextIsHidden = isHiddenInput(nextTagName, nextAttrs);
+
   let trimLeft = prevTag && !inlineElementsToKeepWhitespace.has(prevTag);
+
+  // Smart default behavior: Collapse space after non-rendering elements (`type="hidden"`)
+  // This happens even in basic `collapseWhitespace` mode (safe optimization)
+  if (!trimLeft && prevIsHidden && str && !/\S/.test(str)) {
+    trimLeft = true;
+  }
+
+  // Aggressive mode: Collapse between all form controls (pure whitespace only)
+  const isPureWhitespace = str && !/\S/.test(str);
+  if (!trimLeft && prevTagName && nextTagName &&
+      options.collapseInlineTagWhitespace &&
+      isPureWhitespace &&
+      formControlElements.has(prevTagName) && formControlElements.has(nextTagName)) {
+    trimLeft = true;
+  }
+
   if (trimLeft && !options.collapseInlineTagWhitespace) {
     trimLeft = prevTag.charAt(0) === '/' ? !inlineElements.has(prevTag.slice(1)) : !inlineTextSet.has(prevTag);
   }
+
   // When `collapseInlineTagWhitespace` is enabled, still preserve whitespace around inline text elements
   if (trimLeft && options.collapseInlineTagWhitespace) {
     const tagName = prevTag.charAt(0) === '/' ? prevTag.slice(1) : prevTag;
@@ -118,10 +150,26 @@ function collapseWhitespaceSmart(str, prevTag, nextTag, options, inlineElements,
       trimLeft = false;
     }
   }
+
   let trimRight = nextTag && !inlineElementsToKeepWhitespace.has(nextTag);
+
+  // Smart default behavior: Collapse space before non-rendering elements (`type="hidden"`)
+  if (!trimRight && nextIsHidden && str && !/\S/.test(str)) {
+    trimRight = true;
+  }
+
+  // Aggressive mode: Same as `trimLeft`
+  if (!trimRight && prevTagName && nextTagName &&
+      options.collapseInlineTagWhitespace &&
+      isPureWhitespace &&
+      formControlElements.has(prevTagName) && formControlElements.has(nextTagName)) {
+    trimRight = true;
+  }
+
   if (trimRight && !options.collapseInlineTagWhitespace) {
     trimRight = nextTag.charAt(0) === '/' ? !inlineTextSet.has(nextTag.slice(1)) : !inlineElements.has(nextTag);
   }
+
   // When `collapseInlineTagWhitespace` is enabled, still preserve whitespace around inline text elements
   if (trimRight && options.collapseInlineTagWhitespace) {
     const tagName = nextTag.charAt(0) === '/' ? nextTag.slice(1) : nextTag;
@@ -129,6 +177,7 @@ function collapseWhitespaceSmart(str, prevTag, nextTag, options, inlineElements,
       trimRight = false;
     }
   }
+
   return collapseWhitespace(str, options, trimLeft, trimRight, prevTag && nextTag);
 }
 

package/src/presets.js

@@ -1,9 +1,9 @@
 /**
- * Preset configurations for HTML Minifier Next
+ * Preset configurations
  *
  * Presets provide curated option sets for common use cases:
- * - conservative: Safe minification suitable for most projects
- * - comprehensive: Aggressive minification for maximum file size reduction
+ * - `conservative`: Safe minification suitable for most projects
+ * - `comprehensive`: Aggressive minification for maximum file size reduction
  */
 
 export const presets = {
@@ -49,7 +49,7 @@ export const presets = {
 
 /**
  * Get preset configuration by name
- * @param {string} name - Preset name ('conservative' or 'comprehensive')
+ * @param {string} name - Preset name (“conservative” or “comprehensive”)
  * @returns {object|null} Preset options object or null if not found
  */
 export function getPreset(name) {

package/src/tokenchain.js

@@ -35,7 +35,7 @@ class Sorter {
 
 class TokenChain {
   constructor() {
-    // Use Map instead of object properties for better performance
+    // Use map instead of object properties for better performance
     this.map = new Map();
   }
 
@@ -52,7 +52,7 @@ class TokenChain {
     const sorter = new Sorter();
     sorter.sorterMap = new Map();
 
-    // Convert Map entries to array and sort by frequency (descending) then alphabetically
+    // Convert map entries to array and sort by frequency (descending), then alphabetically
     const entries = Array.from(this.map.entries()).sort((a, b) => {
       const m = a[1].arrays.length;
       const n = b[1].arrays.length;

package/src/lib/index.js

@@ -1,20 +0,0 @@
-// Utils
-export * from './utils.js';
-
-// Constants
-export * from './constants.js';
-
-// Whitespace
-export * from './whitespace.js';
-
-// Attributes
-export * from './attributes.js';
-
-// Elements
-export * from './elements.js';
-
-// Content processors
-export * from './content.js';
-
-// Options
-export * from './options.js';