htmlnano 0.2.7 → 0.2.8

package/lib/modules/sortAttributesWithLists.js

@@ -3,28 +3,141 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = collapseAttributeWhitespace;
+exports.default = collapseAttributeWhitespace;
+
+var _timsort = require("timsort");
 
 var _collapseAttributeWhitespace = require("./collapseAttributeWhitespace");
 
+// class, rel, ping
+const validOptions = new Set(['frequency', 'alphabetical']);
+
+const processModuleOptions = options => {
+  if (options === true) return 'alphabetical';
+  return validOptions.has(options) ? options : false;
+};
+
+class AttributeTokenChain {
+  constructor() {
+    this.freqData = new Map(); // <attrValue, frequency>[]
+  }
+
+  addFromNodeAttrsArray(attrValuesArray) {
+    attrValuesArray.forEach(attrValue => {
+      if (this.freqData.has(attrValue)) {
+        this.freqData.set(attrValue, this.freqData.get(attrValue) + 1);
+      } else {
+        this.freqData.set(attrValue, 1);
+      }
+    });
+  }
+
+  createSortOrder() {
+    let _sortOrder = [];
+
+    for (const item of this.freqData.entries()) {
+      _sortOrder.push(item);
+    }
+
+    (0, _timsort.sort)(_sortOrder, (a, b) => b[1] - a[1]);
+    this.sortOrder = _sortOrder.map(i => i[0]);
+  }
+
+  sortFromNodeAttrsArray(attrValuesArray) {
+    const resultArray = [];
+
+    if (!this.sortOrder) {
+      this.createSortOrder();
+    }
+
+    this.sortOrder.forEach(k => {
+      if (attrValuesArray.includes(k)) {
+        resultArray.push(k);
+      }
+    });
+    return resultArray;
+  }
+
+}
 /** Sort values inside list-like attributes (e.g. class, rel) */
-function collapseAttributeWhitespace(tree) {
-  tree.walk(function (node) {
+
+
+function collapseAttributeWhitespace(tree, options, moduleOptions) {
+  const sortType = processModuleOptions(moduleOptions);
+
+  if (sortType === 'alphabetical') {
+    return sortAttributesWithListsInAlphabeticalOrder(tree);
+  }
+
+  if (sortType === 'frequency') {
+    return sortAttributesWithListsByFrequency(tree);
+  } // Invalid configuration
+
+
+  return tree;
+}
+
+function sortAttributesWithListsInAlphabeticalOrder(tree) {
+  tree.walk(node => {
     if (!node.attrs) {
       return node;
     }
 
-    Object.keys(node.attrs).forEach(function (attrName) {
-      var attrNameLower = attrName.toLowerCase();
+    Object.keys(node.attrs).forEach(attrName => {
+      const attrNameLower = attrName.toLowerCase();
 
       if (!_collapseAttributeWhitespace.attributesWithLists.has(attrNameLower)) {
         return;
       }
 
-      var attrValues = node.attrs[attrName].split(/\s/);
-      node.attrs[attrName] = attrValues.sort().join(' ');
+      const attrValues = node.attrs[attrName].split(/\s/);
+      node.attrs[attrName] = attrValues.sort((a, b) => {
+        return typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b;
+      }).join(' ');
     });
     return node;
   });
   return tree;
+}
+
+function sortAttributesWithListsByFrequency(tree) {
+  const tokenChainObj = {}; // <attrNameLower: AttributeTokenChain>[]
+  // Traverse through tree to get frequency
+
+  tree.walk(node => {
+    if (!node.attrs) {
+      return node;
+    }
+
+    Object.entries(node.attrs).forEach(([attrName, attrValues]) => {
+      const attrNameLower = attrName.toLowerCase();
+
+      if (!_collapseAttributeWhitespace.attributesWithLists.has(attrNameLower)) {
+        return;
+      }
+
+      tokenChainObj[attrNameLower] = tokenChainObj[attrNameLower] || new AttributeTokenChain();
+      tokenChainObj[attrNameLower].addFromNodeAttrsArray(attrValues.split(/\s/));
+    });
+    return node;
+  }); // Traverse through tree again, this time sort the attribute values
+
+  tree.walk(node => {
+    if (!node.attrs) {
+      return node;
+    }
+
+    Object.entries(node.attrs).forEach(([attrName, attrValues]) => {
+      const attrNameLower = attrName.toLowerCase();
+
+      if (!_collapseAttributeWhitespace.attributesWithLists.has(attrNameLower)) {
+        return;
+      }
+
+      if (tokenChainObj[attrNameLower]) {
+        node.attrs[attrName] = tokenChainObj[attrNameLower].sortFromNodeAttrsArray(attrValues.split(/\s/)).join(' ');
+      }
+    });
+    return node;
+  });
 }

package/lib/presets/ampSafe.js

@@ -3,74 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 var _safe = _interopRequireDefault(require("./safe"));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
-    "default": obj
+    default: obj
   };
 }
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    if (enumerableOnly) symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    });
-    keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-  }
-
-  return target;
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
 /**
  * A safe preset for AMP pages (https://www.ampproject.org)
  */
 
 
-var _default = _objectSpread(_objectSpread({}, _safe["default"]), {}, {
+var _default = { ..._safe.default,
   collapseBooleanAttributes: {
     amphtml: true
   },
   minifyJs: false
-});
-
-exports["default"] = _default;
+};
+exports.default = _default;

package/lib/presets/max.js

@@ -3,70 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 var _safe = _interopRequireDefault(require("./safe"));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
-    "default": obj
+    default: obj
   };
 }
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    if (enumerableOnly) symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    });
-    keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-  }
-
-  return target;
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
 /**
  * Maximal minification (might break some pages)
  */
 
 
-var _default = _objectSpread(_objectSpread({}, _safe["default"]), {}, {
+var _default = { ..._safe.default,
   collapseWhitespace: 'all',
   removeComments: 'all',
   removeAttributeQuotes: true,
@@ -75,7 +26,8 @@ var _default = _objectSpread(_objectSpread({}, _safe["default"]), {}, {
   minifyCss: {
     preset: 'default'
   },
-  minifySvg: {}
-});
-
-exports["default"] = _default;
+  minifySvg: {},
+  minifyConditionalComments: true,
+  removeOptionalTags: true
+};
+exports.default = _default;

package/lib/presets/safe.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 /**
  * Minify HTML in a safe way without breaking anything.
  */
 
 var _default = {
+  sortAttributes: false,
   collapseAttributeWhitespace: true,
   collapseBooleanAttributes: {
     amphtml: false
@@ -31,11 +32,13 @@ var _default = {
       convertShapeToPath: false
     }]
   },
+  minifyConditionalComments: false,
   removeEmptyAttributes: true,
   removeRedundantAttributes: false,
   removeComments: 'safe',
   removeAttributeQuotes: false,
-  sortAttributesWithLists: true,
-  minifyUrls: false
+  sortAttributesWithLists: 'alphabetical',
+  minifyUrls: false,
+  removeOptionalTags: false
 };
-exports["default"] = _default;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlnano",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "main": "index.js",
   "author": "Kirill Maltsev <maltsevkirill@gmail.com>",
@@ -28,17 +28,26 @@
   ],
   "babel": {
     "presets": [
-      "@babel/env"
+      [
+        "@babel/env",
+        {
+          "targets": {
+            "node": 10
+          }
+        }
+      ]
     ]
   },
   "dependencies": {
     "cssnano": "^4.1.10",
     "posthtml": "^0.13.4",
-    "posthtml-render": "^1.2.2",
+    "posthtml-render": "^1.3.0",
     "purgecss": "^2.3.0",
     "relateurl": "^0.2.7",
+    "srcset": "^3.0.0",
     "svgo": "^1.3.2",
     "terser": "^4.8.0",
+    "timsort": "^0.3.0",
     "uncss": "^0.17.3"
   },
   "devDependencies": {
@@ -47,10 +56,10 @@
     "@babel/preset-env": "^7.12.1",
     "@babel/register": "^7.12.1",
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.4.0",
-    "expect": "^26.1.0",
-    "mocha": "^8.2.0",
-    "release-it": "^14.1.0",
+    "eslint": "^7.13.0",
+    "expect": "^26.6.2",
+    "mocha": "^8.2.1",
+    "release-it": "^14.2.1",
     "rimraf": "^3.0.2"
   },
   "repository": {