htmlnano 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -2,7 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2] - 2022-04-06
+
+### Fixed
+- JSON-LD crash [#182]
+
+
 ## [2.0.1] - 2022-04-04
+**This version contains a critical bug [#182].**
+**Don't use it.**
 
 ### Changed
 - Speed improvements [#127]
@@ -239,6 +247,7 @@ Otherwise, you have to adapt the config according to the new [PurgeCSS@3](https:
 - Remove attributes that contains only white spaces.
 
 
+[2.0.2]: https://github.com/posthtml/htmlnano/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/posthtml/htmlnano/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/posthtml/htmlnano/compare/1.1.1...2.0.0
 [1.1.1]: https://github.com/posthtml/htmlnano/compare/1.1.0...1.1.1
@@ -266,6 +275,7 @@ Otherwise, you have to adapt the config according to the new [PurgeCSS@3](https:
 [0.1.2]: https://github.com/posthtml/htmlnano/compare/0.1.1...0.1.2
 [0.1.1]: https://github.com/posthtml/htmlnano/compare/0.1.0...0.1.1
 
+[#182]: https://github.com/posthtml/htmlnano/issues/182
 [#180]: https://github.com/posthtml/htmlnano/issues/180
 [#170]: https://github.com/posthtml/htmlnano/issues/170
 [#168]: https://github.com/posthtml/htmlnano/issues/168

package/lib/htmlnano.js

@@ -97,19 +97,19 @@ function htmlnano(optionsRun, presetRun) {
 
       const module = require('./modules/' + moduleName);
 
-      if (module.onAttrs) {
+      if (typeof module.onAttrs === 'function') {
         attrsHandlers.push(module.onAttrs(options, moduleOptions));
       }
 
-      if (module.onContent) {
+      if (typeof module.onContent === 'function') {
         contentsHandlers.push(module.onContent(options, moduleOptions));
       }
 
-      if (module.onNode) {
+      if (typeof module.onNode === 'function') {
         nodeHandlers.push(module.onNode(options, moduleOptions));
       }
 
-      if (module.default) {
+      if (typeof module.default === 'function') {
         promise = promise.then(tree => module.default(tree, options, moduleOptions));
       }
     }
@@ -120,28 +120,35 @@ function htmlnano(optionsRun, presetRun) {
 
     return promise.then(tree => {
       tree.walk(node => {
-        if (node.attrs) {
-          // Convert all attrs' key to lower case
-          let newAttrsObj = {};
-          Object.entries(node.attrs).forEach(([attrName, attrValue]) => {
-            newAttrsObj[attrName.toLowerCase()] = attrValue;
-          });
-
-          for (const handler of attrsHandlers) {
-            newAttrsObj = handler(newAttrsObj, node);
+        if (node) {
+          if (node.attrs && typeof node.attrs === 'object') {
+            // Convert all attrs' key to lower case
+            let newAttrsObj = {};
+            Object.entries(node.attrs).forEach(([attrName, attrValue]) => {
+              newAttrsObj[attrName.toLowerCase()] = attrValue;
+            });
+
+            for (const handler of attrsHandlers) {
+              newAttrsObj = handler(newAttrsObj, node);
+            }
+
+            node.attrs = newAttrsObj;
           }
 
-          node.attrs = newAttrsObj;
-        }
+          if (node.content) {
+            node.content = typeof node.content === 'string' ? [node.content] : node.content;
 
-        if (node.content) {
-          for (const handler of contentsHandlers) {
-            node.content = handler(node.content, node);
+            if (Array.isArray(node.content) && node.content.length > 0) {
+              for (const handler of contentsHandlers) {
+                const result = handler(node.content, node);
+                node.content = typeof result === 'string' ? [result] : result;
+              }
+            }
           }
-        }
 
-        for (const handler of nodeHandlers) {
-          node = handler(node, node);
+          for (const handler of nodeHandlers) {
+            node = handler(node);
+          }
         }
 
         return node;

package/lib/modules/minifyJson.js

@@ -8,15 +8,14 @@ const rNodeAttrsTypeJson = /(\/|\+)json/;
 
 function onContent() {
   return (content, node) => {
-    let newContent = content;
-
     if (node.attrs && node.attrs.type && rNodeAttrsTypeJson.test(node.attrs.type)) {
       try {
-        newContent = JSON.stringify(JSON.parse((content || []).join('')));
+        // cast minified JSON to an array
+        return [JSON.stringify(JSON.parse((content || []).join('')))];
       } catch (error) {// Invalid JSON
       }
     }
 
-    return newContent;
+    return content;
   };
 }

package/lib/modules/minifySvg.js

@@ -21,8 +21,9 @@ function minifySvg(tree, options, svgoOptions = {}) {
     });
     const result = svgo.optimize(svgStr, svgoOptions);
     node.tag = false;
-    node.attrs = {};
-    node.content = result.data;
+    node.attrs = {}; // result.data is a string, we need to cast it to an array
+
+    node.content = [result.data];
     return node;
   });
   return tree;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlnano",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "main": "index.js",
   "author": "Kirill Maltsev <maltsevkirill@gmail.com>",