htmlnano 2.1.1 → 2.1.3

package/lib/modules/sortAttributes.cjs

@@ -1,99 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = sortAttributes;
-var _timsort = require("timsort");
-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(); // <attr, frequency>[]
-  }
-  addFromNodeAttrs(nodeAttrs) {
-    Object.keys(nodeAttrs).forEach(attrName => {
-      const attrNameLower = attrName.toLowerCase();
-      if (this.freqData.has(attrNameLower)) {
-        this.freqData.set(attrNameLower, this.freqData.get(attrNameLower) + 1);
-      } else {
-        this.freqData.set(attrNameLower, 1);
-      }
-    });
-  }
-  createSortOrder() {
-    let _sortOrder = [...this.freqData.entries()];
-    (0, _timsort.sort)(_sortOrder, (a, b) => b[1] - a[1]);
-    this.sortOrder = _sortOrder.map(i => i[0]);
-  }
-  sortFromNodeAttrs(nodeAttrs) {
-    const newAttrs = {};
-
-    // Convert node.attrs attrName into lower case.
-    const loweredNodeAttrs = {};
-    Object.entries(nodeAttrs).forEach(([attrName, attrValue]) => {
-      loweredNodeAttrs[attrName.toLowerCase()] = attrValue;
-    });
-    if (!this.sortOrder) {
-      this.createSortOrder();
-    }
-    this.sortOrder.forEach(attrNameLower => {
-      // The attrName inside "sortOrder" has been lowered
-      if (loweredNodeAttrs[attrNameLower] != null) {
-        newAttrs[attrNameLower] = loweredNodeAttrs[attrNameLower];
-      }
-    });
-    return newAttrs;
-  }
-}
-
-/** Sort attibutes */
-function sortAttributes(tree, options, moduleOptions) {
-  const sortType = processModuleOptions(moduleOptions);
-  if (sortType === 'alphabetical') {
-    return sortAttributesInAlphabeticalOrder(tree);
-  }
-  if (sortType === 'frequency') {
-    return sortAttributesByFrequency(tree);
-  }
-
-  // Invalid configuration
-  return tree;
-}
-function sortAttributesInAlphabeticalOrder(tree) {
-  tree.walk(node => {
-    if (!node.attrs) {
-      return node;
-    }
-    const newAttrs = {};
-    Object.keys(node.attrs).sort((a, b) => typeof a.localeCompare === 'function' ? a.localeCompare(b) : a - b).forEach(attr => newAttrs[attr] = node.attrs[attr]);
-    node.attrs = newAttrs;
-    return node;
-  });
-  return tree;
-}
-function sortAttributesByFrequency(tree) {
-  const tokenchain = new AttributeTokenChain();
-
-  // Traverse through tree to get frequency
-  tree.walk(node => {
-    if (!node.attrs) {
-      return node;
-    }
-    tokenchain.addFromNodeAttrs(node.attrs);
-    return node;
-  });
-
-  // Traverse through tree again, this time sort the attributes
-  tree.walk(node => {
-    if (!node.attrs) {
-      return node;
-    }
-    node.attrs = tokenchain.sortFromNodeAttrs(node.attrs);
-    return node;
-  });
-  return tree;
-}

package/lib/modules/sortAttributesWithLists.cjs

@@ -1,115 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = collapseAttributeWhitespace;
-var _timsort = require("timsort");
-var _collapseAttributeWhitespace = require("./collapseAttributeWhitespace.cjs");
-// 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 = [...this.freqData.entries()];
-    (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, 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(attrName => {
-      const attrNameLower = attrName.toLowerCase();
-      if (!_collapseAttributeWhitespace.attributesWithLists.has(attrNameLower)) {
-        return;
-      }
-      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.cjs

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _safe = _interopRequireDefault(require("./safe.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * A safe preset for AMP pages (https://www.ampproject.org)
- */
-var _default = exports.default = {
-  ..._safe.default,
-  collapseBooleanAttributes: {
-    amphtml: true
-  },
-  minifyJs: false
-};

package/lib/presets/max.cjs

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _safe = _interopRequireDefault(require("./safe.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Maximal minification (might break some pages)
- */
-var _default = exports.default = {
-  ..._safe.default,
-  collapseWhitespace: 'all',
-  removeComments: 'all',
-  removeAttributeQuotes: true,
-  removeRedundantAttributes: true,
-  mergeScripts: true,
-  mergeStyles: true,
-  removeUnusedCss: {},
-  minifyCss: {
-    preset: 'default'
-  },
-  minifySvg: {},
-  minifyConditionalComments: true,
-  removeOptionalTags: true
-};

package/lib/presets/safe.cjs

@@ -1,65 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-/**
- * Minify HTML in a safe way without breaking anything.
- */
-var _default = exports.default = {
-  /* ----------------------------------------
-   * Attributes
-   * ---------------------------------------- */
-  // normalize the case of attribute names and values
-  // normalizeAttributeValues will also normalize property value with invalid value default
-  // See https://html.spec.whatwg.org/#invalid-value-default
-  normalizeAttributeValues: true,
-  removeEmptyAttributes: true,
-  collapseAttributeWhitespace: true,
-  // removeRedundantAttributes will remove attributes when missing value default matches the attribute's value
-  // See https://html.spec.whatwg.org/#missing-value-default
-  removeRedundantAttributes: false,
-  // collapseBooleanAttributes will also collapse those default state can be omitted
-  collapseBooleanAttributes: {
-    amphtml: false
-  },
-  deduplicateAttributeValues: true,
-  minifyUrls: false,
-  sortAttributes: false,
-  sortAttributesWithLists: 'alphabetical',
-  /* ----------------------------------------
-   * Minify HTML content
-   * ---------------------------------------- */
-  collapseWhitespace: 'conservative',
-  removeComments: 'safe',
-  minifyConditionalComments: false,
-  removeOptionalTags: false,
-  removeAttributeQuotes: false,
-  /* ----------------------------------------
-   * Minify inline <style>, <script> and <svg> tag
-   * ---------------------------------------- */
-  mergeStyles: false,
-  mergeScripts: false,
-  minifyCss: {
-    preset: 'default'
-  },
-  minifyJs: {},
-  minifyJson: {},
-  minifySvg: {
-    plugins: [{
-      name: 'preset-default',
-      params: {
-        overrides: {
-          collapseGroups: false,
-          convertShapeToPath: false
-        }
-      }
-    }]
-  },
-  removeUnusedCss: false,
-  /* ----------------------------------------
-   * Miscellaneous
-   * ---------------------------------------- */
-  custom: []
-};

package/test.js

@@ -1,48 +0,0 @@
-const htmlnano = require('.');
-// const posthtml = require('posthtml');
-const safePreset = require('./lib/presets/safe');
-// const options = {
-    // minifySvg: false,
-    // minifyJs: false,
-// };
-// // posthtml, posthtml-render, and posthtml-parse options
-// const postHtmlOptions = {
-//     sync: true, // https://github.com/posthtml/posthtml#usage
-//     lowerCaseTags: true, // https://github.com/posthtml/posthtml-parser#options
-//     quoteAllAttributes: false, // https://github.com/posthtml/posthtml-render#options
-// };
-
-// const html = `
-// <!doctype html>
-// <html lang="en">
-// <head>
-//   <meta charset="utf-8">
-//   <title></title>
-//   <script class="fob">alert(1)</script>
-//   <script>alert(2)</script>
-// </head>
-// <body>
-//     <script>alert(3)</script>
-//     <script>alert(4)</script>
-// </body>
-// </html>
-// `;
-
-const options = {
-    minifySvg: safePreset.minifySvg,
-};
-const html = `
-<input type="text" class="form-control" name="testInput" autofocus="" autocomplete="off" id="testId"><a id="testId" href="#" class="testClass"></a><img width="20" src="../images/image.png" height="40" alt="image" class="cls" id="id2">
-`;
-
-htmlnano
-    // "preset" arg might be skipped (see "Presets" section below for more info)
-    // "postHtmlOptions" arg might be skipped
-    .process(html)
-    .then(function (result) {
-        // result.html is minified
-        console.log(result.html);
-    })
-    .catch(function (err) {
-        console.error(err);
-    });