html-minifier-next 8.4.3 → 8.4.4

package/README.md

@@ -83,6 +83,8 @@ export default {
 };
 ```
 
+A module can also hold values JSON cannot express, like regular expressions (e.g., `ignoreCustomFragments: [/\{\{[\s\S]*?\}\}/]`) and functions (for `minifyCSS`, `minifyJS`, and `minifyURLs`, or in custom SVGO plugins for `minifySVG`). As functions cannot be passed to worker threads, a run using them minifies in-process.
+
 ### Node.js
 
 ```js

package/cli.js

@@ -262,6 +262,28 @@ const CONFIG_KEYS_EXTRA = new Set(['$schema', 'preset', 'fileExt', 'ignoreDir'])
 // `--config-file` isn’t specified
 const CONFIG_FILES_DEFAULT = ['html-minifier-next.config.json', 'htmlminifier.config.json'];
 
+/**
+ * Parse a config value—strings as on the command line, anything else as it is, since
+ * a JSON round trip would drop what only a module config can hold (functions, regexes)
+ * @param {string} key Option definition key
+ * @param {string} type Option definition type
+ * @param {unknown} value
+ */
+function parseConfigValue(key, type, value) {
+  if (typeof value === 'string') return getParser(key, type)(value);
+  switch (type) {
+    case 'int':
+      return getParser(key, type)(String(value));
+    // A single value is wrapped as its string form is; `null` and `undefined` leave the option unset
+    case 'regexpArray':
+      return value == null ? undefined : (Array.isArray(value) ? value : [value]).map(parseRegExp);
+    case 'jsonArray':
+      return value == null ? undefined : (Array.isArray(value) ? value : [value]);
+    default:
+      return value;
+  }
+}
+
 /**
  * Normalize and validate config object by applying parsers and transforming values.
  * @param {Record<string, any>} config - Raw config object
@@ -282,8 +304,7 @@ function normalizeConfig(config) {
   Object.entries(optionDefinitions).forEach(function ([key, { type }]) {
     if (key in normalized) {
       if (type !== 'boolean' && type !== 'invertedBoolean') {
-        const value = normalized[key];
-        normalized[key] = getParser(key, type)(typeof value === 'string' ? value : JSON.stringify(value));
+        normalized[key] = parseConfigValue(key, type, normalized[key]);
       }
     }
   });
@@ -554,7 +575,7 @@ program.helpOption('-h, --help', 'Display help for command');
 
   /**
    * A pool for this run, or `null` where one wouldn’t pay or wouldn’t work—in which case
-   * the caller minifies in process exactly as before
+   * the caller minifies in-process exactly as before
    * @param {string[]} files
    */
   async function createPool(files) {
@@ -564,7 +585,7 @@ program.helpOption('-h, --help', 'Display help for command');
     // Whether the run went wide is worth saying, since the default weighs the file
     // count and the bytes there are to share out, neither of which the caller sees
     const inProcess = () => {
-      if (isVerbose) console.error('Worker threads: none (minifying in process)');
+      if (isVerbose) console.error('Worker threads: none (minifying in-process)');
       return null;
     };
     // `availableParallelism` reports what this process may actually use, which under a
@@ -594,7 +615,7 @@ program.helpOption('-h, --help', 'Display help for command');
     }
 
     // `log` is a closure over this process’s console and is rebuilt inside the worker;
-    // anything else unclonable (which the CLI itself never produces) stays in process
+    // anything else unclonable (such as a function from a module config) stays in-process
     const { log, ...options } = createOptions();
     try {
       structuredClone(options);
@@ -603,7 +624,7 @@ program.helpOption('-h, --help', 'Display help for command');
     }
 
     // A pool this small has nothing to share out and still pays for its workers, so an
-    // explicit request for them lands in process as `--workers=1` does
+    // explicit request for them lands in-process as `--workers=1` does
     const poolSize = Math.min(size, fileCount);
     if (poolSize <= 1) {
       return inProcess();

package/dist/types/lib/utils.d.ts

@@ -2,6 +2,8 @@
  * General utility functions
  */
 /**
+ * Stringify with sorted keys, for cache keys—values that can behave differently must not
+ * stringify alike, so unquoted markers stand in for what JSON cannot express
  * @param {unknown} obj
  * @returns {string}
  */

package/dist/types/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,iBAAS,eAAe,CAAC,GAAG,EAHjB,OAGiB,GAFf,MAAM,CAYlB;AAID,cAAM,GAAG;IAEA,KAAK;IACL,IAAI;IACJ,IAAI;IACT,mCAAmC;IAC9B,GAAG,EADG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAJjC,YAAY,KAAK,SAAM,EAMtB;IACD,0BAA0B;IAC1B,GAAG,CAAC,GAAG,EADK,MACL,WAUN;IACD;;;OAGG;IACH,GAAG,CAAC,GAAG,EAHI,MAGJ,EAAE,KAAK,EAFH,OAEG,QAOb;IACD,0BAA0B;IAC1B,MAAM,CAAC,GAAG,EADE,MACF,QAA2B;IACrC,6EAA6E;IAC7E,KAAK,IADS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAGxE;CACF;AAKD,QAAA,MAAM,oBAAoB,QAAc,CAAC;AAIzC,0BAA0B;AAC1B,iBAAS,WAAW,CAAC,GAAG,EADZ,MACY,UAOvB;AAID,4BAA4B;AAC5B,iBAAS,QAAQ,CAAC,KAAK,EADX,MACW,UAMtB;AAID,4BAA4B;AAC5B,iBAAS,QAAQ,CAAC,KAAK,EADX,MACW,UAEtB;AAED;;;GAGG;AACH,iBAAS,UAAU,CAAC,KAAK,EAHd,OAGc,GAFZ,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,CAIrC;AAED,4BAA4B;AAC5B,iBAAS,SAAS,CAAC,KAAK,EADZ,MACY,UAEvB;AAGD,4BAA4B;AAC5B,iBAAS,SAAS,CAAC,KAAK,EADZ,MACY,UAEvB;AAID;;;;;;GAMG;AACH,iBAAe,YAAY,CAAC,GAAG,EALpB,MAKoB,EAAE,KAAK,EAJ3B,MAI2B,EAAE,OAAO,UAAA,GAFlC,OAAO,CAAC,MAAM,CAAC,CAe3B;AAID,qCAAqC;AACrC,iBAAS,WAAW,CAAC,KAAK,EADd,MAAM,GAAG,MACK,sBAUzB;AAyYD;;;;;;;;;GASG;AACH,iBAAS,QAAQ,CAAC,OAAO,EAJd,MAIc,GAHZ,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAqDlC;AAED;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAAC,OAAO,EAHjB,MAGiB,GAFf,MAAM,CAOlB;AAGE,YAA6D,MAAM,GAAzD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAA;CAAC,CAE7D;AAqKD;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,OAAO,EAL5B,MAAM,GAAG,MAKmB,GAH1B,MAAM,GAAG,IAAI,CAqBzB;AAED;;;;;;;GAOG;AACH,iBAAS,UAAU,CAAC,IAAI,EALb,MAKa,EAAE,GAAG,EAJlB,MAIkB,EAAE,KAAK,AAHjC,CACA,EADQ,MAGuC,GAFrC,MAAM,CAelB;AAED;;;;;;;;;GASG;AACH,iBAAS,yBAAyB,CAAC,KAAK,EAL7B,MAK6B,EAAE,SAAS,EAJxC,MAIwC,EAAE,KAAK,EAH/C,OAG+C,GAF7C,MAAM,CAYlB;AAID,OAAO,EACL,eAAe,EACf,UAAU,EACV,GAAG,EACH,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,SAAS,EACT,SAAS,EACT,YAAY,EACZ,WAAW,EACX,WAAW,EACX,QAAQ,EACR,sBAAsB,EACtB,yBAAyB,EAC1B,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils.js"],"names":[],"mappings":"AAAA;;GAEG;AAkBH;;;;;GAKG;AACH,iBAAS,eAAe,CAAC,GAAG,EAHjB,OAGiB,GAFf,MAAM,CAgBlB;AAID,cAAM,GAAG;IAEA,KAAK;IACL,IAAI;IACJ,IAAI;IACT,mCAAmC;IAC9B,GAAG,EADG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAJjC,YAAY,KAAK,SAAM,EAMtB;IACD,0BAA0B;IAC1B,GAAG,CAAC,GAAG,EADK,MACL,WAUN;IACD;;;OAGG;IACH,GAAG,CAAC,GAAG,EAHI,MAGJ,EAAE,KAAK,EAFH,OAEG,QAOb;IACD,0BAA0B;IAC1B,MAAM,CAAC,GAAG,EADE,MACF,QAA2B;IACrC,6EAA6E;IAC7E,KAAK,IADS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAGxE;CACF;AAKD,QAAA,MAAM,oBAAoB,QAAc,CAAC;AAIzC,0BAA0B;AAC1B,iBAAS,WAAW,CAAC,GAAG,EADZ,MACY,UAOvB;AAID,4BAA4B;AAC5B,iBAAS,QAAQ,CAAC,KAAK,EADX,MACW,UAMtB;AAID,4BAA4B;AAC5B,iBAAS,QAAQ,CAAC,KAAK,EADX,MACW,UAEtB;AAED;;;GAGG;AACH,iBAAS,UAAU,CAAC,KAAK,EAHd,OAGc,GAFZ,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,CAIrC;AAED,4BAA4B;AAC5B,iBAAS,SAAS,CAAC,KAAK,EADZ,MACY,UAEvB;AAGD,4BAA4B;AAC5B,iBAAS,SAAS,CAAC,KAAK,EADZ,MACY,UAEvB;AAID;;;;;;GAMG;AACH,iBAAe,YAAY,CAAC,GAAG,EALpB,MAKoB,EAAE,KAAK,EAJ3B,MAI2B,EAAE,OAAO,UAAA,GAFlC,OAAO,CAAC,MAAM,CAAC,CAe3B;AAID,qCAAqC;AACrC,iBAAS,WAAW,CAAC,KAAK,EADd,MAAM,GAAG,MACK,sBAUzB;AAyYD;;;;;;;;;GASG;AACH,iBAAS,QAAQ,CAAC,OAAO,EAJd,MAIc,GAHZ,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAqDlC;AAED;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAAC,OAAO,EAHjB,MAGiB,GAFf,MAAM,CAOlB;AAGE,YAA6D,MAAM,GAAzD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAA;CAAC,CAE7D;AAqKD;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,OAAO,EAL5B,MAAM,GAAG,MAKmB,GAH1B,MAAM,GAAG,IAAI,CAqBzB;AAED;;;;;;;GAOG;AACH,iBAAS,UAAU,CAAC,IAAI,EALb,MAKa,EAAE,GAAG,EAJlB,MAIkB,EAAE,KAAK,AAHjC,CACA,EADQ,MAGuC,GAFrC,MAAM,CAelB;AAED;;;;;;;;;GASG;AACH,iBAAS,yBAAyB,CAAC,KAAK,EAL7B,MAK6B,EAAE,SAAS,EAJxC,MAIwC,EAAE,KAAK,EAH/C,OAG+C,GAF7C,MAAM,CAYlB;AAID,OAAO,EACL,eAAe,EACf,UAAU,EACV,GAAG,EACH,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,SAAS,EACT,SAAS,EACT,YAAY,EACZ,WAAW,EACX,WAAW,EACX,QAAQ,EACR,sBAAsB,EACtB,yBAAyB,EAC1B,CAAC"}

package/package.json

@@ -21,7 +21,7 @@
     "eslint": "^10.10.0",
     "globals": "^17.12.0",
     "typescript": "^7.0.2",
-    "vite": "^8.2.2"
+    "vite": "^8.3.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -95,5 +95,5 @@
   },
   "type": "module",
   "types": "dist/types/htmlminifier.d.ts",
-  "version": "8.4.3"
+  "version": "8.4.4"
 }

package/src/lib/file-pool.js

@@ -15,7 +15,7 @@
  * worker runs its own isolate and warms up its own JIT, so the useful worker count tops
  * out well short of the core count.
  *
- * Node-only: cli.js loads this module lazily and minifies in process wherever worker
+ * Node-only: cli.js loads this module lazily and minifies in-process wherever worker
  * threads are unavailable or the options can’t cross a structured clone.
  */
 

package/src/lib/utils.js

@@ -2,13 +2,35 @@
  * General utility functions
  */
 
+// Functions and other non-plain objects have no structure to compare (closures with the
+// same source can behave differently), so they are told apart by identity
+/** @type {WeakMap<object, number>} */
+const objectIds = new WeakMap();
+let objectIdLast = 0;
+
+/** @param {object} obj */
+function objectId(obj) {
+  let id = objectIds.get(obj);
+  if (id === undefined) {
+    id = ++objectIdLast;
+    objectIds.set(obj, id);
+  }
+  return id;
+}
+
 /**
+ * Stringify with sorted keys, for cache keys—values that can behave differently must not
+ * stringify alike, so unquoted markers stand in for what JSON cannot express
  * @param {unknown} obj
  * @returns {string}
  */
 function stableStringify(obj) {
+  if (typeof obj === 'function') return 'function#' + objectId(obj);
   if (obj == null || typeof obj !== 'object') return JSON.stringify(obj);
+  if (obj instanceof RegExp) return String(obj);
   if (Array.isArray(obj)) return '[' + obj.map(stableStringify).join(',') + ']';
+  const proto = Object.getPrototypeOf(obj);
+  if (proto !== Object.prototype && proto !== null) return 'object#' + objectId(obj);
   const keys = Object.keys(obj).sort();
   let out = '{';
   for (let i = 0; i < keys.length; i++) {