htmlnano 2.1.2 → 2.1.3

package/lib/modules/collapseWhitespace.mjs

@@ -1,132 +0,0 @@
-import { isComment } from '../helpers.mjs';
-
-const noWhitespaceCollapseElements = new Set([
-    'script',
-    'style',
-    'pre',
-    'textarea'
-]);
-
-const noTrimWhitespacesArroundElements = new Set([
-    // non-empty tags that will maintain whitespace around them
-    'a', 'abbr', 'acronym', 'b', 'bdi', 'bdo', 'big', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i', 'ins', 'kbd', 'label', 'mark', 'math', 'nobr', 'object', 'q', 'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'svg', 'textarea', 'time', 'tt', 'u', 'var',
-    // self-closing tags that will maintain whitespace around them
-    'comment', 'img', 'input', 'wbr'
-]);
-
-const noTrimWhitespacesInsideElements = new Set([
-    // non-empty tags that will maintain whitespace within them
-    'a', 'abbr', 'acronym', 'b', 'big', 'del', 'em', 'font', 'i', 'ins', 'kbd', 'mark', 'nobr', 'rp', 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'time', 'tt', 'u', 'var'
-]);
-
-const startsWithWhitespacePattern = /^\s/;
-const endsWithWhitespacePattern = /\s$/;
-// See https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace and https://infra.spec.whatwg.org/#ascii-whitespace
-const multipleWhitespacePattern = /[\t\n\f\r ]+/g;
-const NONE = '';
-const SINGLE_SPACE = ' ';
-const validOptions = ['all', 'aggressive', 'conservative'];
-
-/** Collapses redundant whitespaces */
-export default function collapseWhitespace(tree, options, collapseType, parent) {
-    collapseType = validOptions.includes(collapseType) ? collapseType : 'conservative';
-
-    tree.forEach((node, index) => {
-        const prevNode = tree[index - 1];
-        const nextNode = tree[index + 1];
-
-        if (typeof node === 'string') {
-            const parentNodeTag = parent && parent.node && parent.node.tag;
-            const isTopLevel = !parentNodeTag || parentNodeTag === 'html' || parentNodeTag === 'head';
-            const shouldTrim = (
-                collapseType === 'all' ||
-                isTopLevel ||
-                /*
-                 * When collapseType is set to 'aggressive', and the tag is not inside 'noTrimWhitespacesInsideElements'.
-                 * the first & last space inside the tag will be trimmed
-                 */
-                collapseType === 'aggressive'
-            );
-
-            node = collapseRedundantWhitespaces(node, collapseType, shouldTrim, parent, prevNode, nextNode);
-        }
-
-        const isAllowCollapseWhitespace = !noWhitespaceCollapseElements.has(node.tag);
-        if (node.content && node.content.length && isAllowCollapseWhitespace) {
-            node.content = collapseWhitespace(node.content, options, collapseType, {
-                node,
-                prevNode,
-                nextNode
-            });
-        }
-
-        tree[index] = node;
-    });
-
-    return tree;
-}
-
-
-function collapseRedundantWhitespaces(text, collapseType, shouldTrim = false, parent, prevNode, nextNode) {
-    if (!text || text.length === 0) {
-        return NONE;
-    }
-
-    if (!isComment(text)) {
-        text = text.replace(multipleWhitespacePattern, SINGLE_SPACE);
-    }
-
-    if (shouldTrim) {
-        if (collapseType === 'aggressive') {
-            if (!noTrimWhitespacesInsideElements.has(parent && parent.node && parent.node.tag)) {
-                if (
-                    // It is the first child node of the parent
-                    !prevNode
-                    // It is not the first child node, and prevNode not a text node, and prevNode is safe to trim around
-                    || prevNode && prevNode.tag && !noTrimWhitespacesArroundElements.has(prevNode.tag)
-                ) {
-                    text = text.trimStart();
-                } else {
-                    // previous node is a "no trim whitespaces arround element"
-                    if (
-                        // but previous node ends with a whitespace
-                        prevNode && prevNode.content && prevNode.content.length
-                        && endsWithWhitespacePattern.test(prevNode.content[prevNode.content.length - 1])
-                        && (
-                            !nextNode // either the current node is the last child of the parent
-                            || (
-                                // or the next node starts with a white space
-                                nextNode && nextNode.content && nextNode.content.length
-                                && !startsWithWhitespacePattern.test(nextNode.content[0])
-                            )
-                        )
-                    ) {
-                        text = text.trimStart();
-                    }
-                }
-
-                if (
-                    !nextNode
-                    || nextNode && nextNode.tag && !noTrimWhitespacesArroundElements.has(nextNode.tag)
-                ) {
-                    text = text.trimEnd();
-                }
-            } else {
-                // now it is a textNode inside a "no trim whitespaces inside elements" node
-                if (
-                    !prevNode // it the textnode is the first child of the node
-                    && startsWithWhitespacePattern.test(text[0]) // it starts with white space
-                    && typeof parent.prevNode === 'string' // the prev of the node is a textNode as well
-                    && endsWithWhitespacePattern.test(parent.prevNode[parent.prevNode.length - 1]) // that prev is ends with a white
-                ) {
-                    text = text.trimStart();
-                }
-            }
-        } else {
-            // collapseType is 'all', trim spaces
-            text = text.trim();
-        }
-    }
-
-    return text;
-}

package/lib/modules/custom.cjs

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = custom;
-/** Meta-module that runs custom modules  */
-function custom(tree, options, customModules) {
-  if (!customModules) {
-    return tree;
-  }
-  if (!Array.isArray(customModules)) {
-    customModules = [customModules];
-  }
-  customModules.forEach(customModule => {
-    tree = customModule(tree, options);
-  });
-  return tree;
-}

package/lib/modules/custom.mjs

@@ -1,16 +0,0 @@
-/** Meta-module that runs custom modules  */
-export default function custom(tree, options, customModules) {
-    if (! customModules) {
-        return tree;
-    }
-
-    if (! Array.isArray(customModules)) {
-        customModules = [customModules];
-    }
-
-    customModules.forEach(customModule => {
-        tree = customModule(tree, options);
-    });
-
-    return tree;
-}

package/lib/modules/deduplicateAttributeValues.cjs

@@ -1,38 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.onAttrs = onAttrs;
-var _collapseAttributeWhitespace = require("./collapseAttributeWhitespace.cjs");
-/** Deduplicate values inside list-like attributes (e.g. class, rel) */
-function onAttrs() {
-  return attrs => {
-    const newAttrs = attrs;
-    Object.keys(attrs).forEach(attrName => {
-      if (!_collapseAttributeWhitespace.attributesWithLists.has(attrName)) {
-        return;
-      }
-      if (typeof attrs[attrName] !== 'string') {
-        return;
-      }
-      const attrValues = attrs[attrName].split(/\s/);
-      const uniqeAttrValues = new Set();
-      const deduplicatedAttrValues = [];
-      attrValues.forEach(attrValue => {
-        if (!attrValue) {
-          // Keep whitespaces
-          deduplicatedAttrValues.push('');
-          return;
-        }
-        if (uniqeAttrValues.has(attrValue)) {
-          return;
-        }
-        deduplicatedAttrValues.push(attrValue);
-        uniqeAttrValues.add(attrValue);
-      });
-      newAttrs[attrName] = deduplicatedAttrValues.join(' ');
-    });
-    return newAttrs;
-  };
-}

package/lib/modules/deduplicateAttributeValues.mjs

@@ -1,40 +0,0 @@
-import { attributesWithLists } from './collapseAttributeWhitespace.mjs';
-
-/** Deduplicate values inside list-like attributes (e.g. class, rel) */
-export function onAttrs() {
-    return (attrs) => {
-        const newAttrs = attrs;
-        Object.keys(attrs).forEach(attrName => {
-            if (! attributesWithLists.has(attrName)) {
-                return;
-            }
-
-            if (typeof attrs[attrName] !== 'string') {
-                return;
-            }
-
-            const attrValues = attrs[attrName].split(/\s/);
-            const uniqeAttrValues = new Set();
-            const deduplicatedAttrValues = [];
-
-            attrValues.forEach((attrValue) => {
-                if (! attrValue) {
-                    // Keep whitespaces
-                    deduplicatedAttrValues.push('');
-                    return;
-                }
-
-                if (uniqeAttrValues.has(attrValue)) {
-                    return;
-                }
-
-                deduplicatedAttrValues.push(attrValue);
-                uniqeAttrValues.add(attrValue);
-            });
-
-            newAttrs[attrName] = deduplicatedAttrValues.join(' ');
-        });
-
-        return newAttrs;
-    };
-}

package/lib/modules/example.cjs

@@ -1,85 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = example;
-exports.onAttrs = onAttrs;
-exports.onContent = onContent;
-exports.onNode = onNode;
-/**
- * It is an example htmlnano module.
- *
- * A htmlnano module can be modify the attributes of every node (through a "onAttrs" named export),
- * modify the content of every node (through an optional "onContent" named export), modify the node
- * itself (through an optional "onNode" named export), or modify the entire tree (through an optional
- * default export).
- */
-
-/**
- * Modify attributes of node. Optional.
- *
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes attribute object and the node (for the context), and returns the modified attribute object
- */
-function onAttrs(options, moduleOptions) {
-  return (attrs, node) => {
-    // You can modify "attrs" based on "node"
-    const newAttrs = {
-      ...attrs
-    };
-    return newAttrs; // ... then return the modified attrs
-  };
-}
-
-/**
- * Modify content of node. Optional.
- *
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes contents (an array of node and string) and the node (for the context), and returns the modified content array.
- */
-function onContent(options, moduleOptions) {
-  return (content, node) => {
-    // Same goes the "content"
-
-    return content; // ... return modified content here
-  };
-}
-
-/**
- * It is possible to modify entire ndde as well. Optional.
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes the node, and returns the new, modified node.
- */
-function onNode(options, moduleOptions) {
-  return node => {
-    return node; // ... return new node here
-  };
-}
-
-/**
- * Modify the entire tree. Optional.
- *
- * @param {object} tree - PostHTML tree (https://github.com/posthtml/posthtml/blob/master/README.md)
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {object | Proimse} - Return the modified tree.
- */
-function example(tree, options, moduleOptions) {
-  // Module filename (example.es6), exported default function name (example),
-  // and test filename (example.js) must be the same.
-
-  // You can traverse the tree...
-  tree.walk(node => {
-    // ...and make some minification
-  });
-
-  // At the end you must return the tree
-  return tree;
-
-  // Or a promise with the tree
-  return somePromise.then(() => tree);
-}

package/lib/modules/example.mjs

@@ -1,75 +0,0 @@
-/**
- * It is an example htmlnano module.
- *
- * A htmlnano module can be modify the attributes of every node (through a "onAttrs" named export),
- * modify the content of every node (through an optional "onContent" named export), modify the node
- * itself (through an optional "onNode" named export), or modify the entire tree (through an optional
- * default export).
- */
-
-/**
- * Modify attributes of node. Optional.
- *
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes attribute object and the node (for the context), and returns the modified attribute object
- */
-export function onAttrs(options, moduleOptions) {
-    return (attrs, node) => {
-        // You can modify "attrs" based on "node"
-        const newAttrs = { ...attrs };
-
-        return newAttrs; // ... then return the modified attrs
-    };
-}
-
-/**
- * Modify content of node. Optional.
- *
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes contents (an array of node and string) and the node (for the context), and returns the modified content array.
- */
-export function onContent(options, moduleOptions) {
-    return (content, node) => {
-        // Same goes the "content"
-
-        return content; // ... return modified content here
-    };
-}
-
-/**
- * It is possible to modify entire ndde as well. Optional.
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {Function} - Return a function that takes the node, and returns the new, modified node.
- */
-export function onNode(options, moduleOptions) {
-    return (node) => {
-        return node; // ... return new node here
-    };
-}
-
-/**
- * Modify the entire tree. Optional.
- *
- * @param {object} tree - PostHTML tree (https://github.com/posthtml/posthtml/blob/master/README.md)
- * @param {object} options - Options that were passed to htmlnano
- * @param moduleOptions — Module options. For most modules this is just "true" (indication that the module was enabled)
- * @return {object | Proimse} - Return the modified tree.
- */
-export default function example(tree, options, moduleOptions) {
-    // Module filename (example.es6), exported default function name (example),
-    // and test filename (example.js) must be the same.
-
-    // You can traverse the tree...
-    tree.walk(node => {
-        // ...and make some minification
-    });
-
-    // At the end you must return the tree
-    return tree;
-
-    // Or a promise with the tree
-    return somePromise.then(() => tree);
-}

package/lib/modules/mergeScripts.cjs

@@ -1,54 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = mergeScripts;
-/* Merge multiple <script> into one */
-function mergeScripts(tree) {
-  let scriptNodesIndex = {};
-  let scriptSrcIndex = 1;
-  tree.match({
-    tag: 'script'
-  }, node => {
-    const nodeAttrs = node.attrs || {};
-    if ('src' in nodeAttrs
-    // Skip SRI, reasons are documented in "minifyJs" module
-    || 'integrity' in nodeAttrs) {
-      scriptSrcIndex++;
-      return node;
-    }
-    const scriptType = nodeAttrs.type || 'text/javascript';
-    if (scriptType !== 'text/javascript' && scriptType !== 'application/javascript') {
-      return node;
-    }
-    const scriptKey = JSON.stringify({
-      id: nodeAttrs.id,
-      class: nodeAttrs.class,
-      type: scriptType,
-      defer: nodeAttrs.defer !== undefined,
-      async: nodeAttrs.async !== undefined,
-      index: scriptSrcIndex
-    });
-    if (!scriptNodesIndex[scriptKey]) {
-      scriptNodesIndex[scriptKey] = [];
-    }
-    scriptNodesIndex[scriptKey].push(node);
-    return node;
-  });
-  for (const scriptNodes of Object.values(scriptNodesIndex)) {
-    let lastScriptNode = scriptNodes.pop();
-    scriptNodes.reverse().forEach(scriptNode => {
-      let scriptContent = (scriptNode.content || []).join(' ');
-      scriptContent = scriptContent.trim();
-      if (scriptContent.slice(-1) !== ';') {
-        scriptContent += ';';
-      }
-      lastScriptNode.content = lastScriptNode.content || [];
-      lastScriptNode.content.unshift(scriptContent);
-      scriptNode.tag = false;
-      scriptNode.content = [];
-    });
-  }
-  return tree;
-}

package/lib/modules/mergeScripts.mjs

@@ -1,56 +0,0 @@
-/* Merge multiple <script> into one */
-export default function mergeScripts (tree) {
-    let scriptNodesIndex = {};
-    let scriptSrcIndex = 1;
-
-    tree.match({ tag: 'script' }, node => {
-        const nodeAttrs = node.attrs || {};
-        if (
-            'src' in nodeAttrs
-            // Skip SRI, reasons are documented in "minifyJs" module
-            || 'integrity' in nodeAttrs
-        ) {
-            scriptSrcIndex++;
-            return node;
-        }
-
-        const scriptType = nodeAttrs.type || 'text/javascript';
-        if (scriptType !== 'text/javascript' && scriptType !== 'application/javascript') {
-            return node;
-        }
-
-        const scriptKey = JSON.stringify({
-            id: nodeAttrs.id,
-            class: nodeAttrs.class,
-            type: scriptType,
-            defer: nodeAttrs.defer !== undefined,
-            async: nodeAttrs.async !== undefined,
-            index: scriptSrcIndex,
-        });
-        if (!scriptNodesIndex[scriptKey]) {
-            scriptNodesIndex[scriptKey] = [];
-        }
-
-        scriptNodesIndex[scriptKey].push(node);
-        return node;
-    });
-
-    for (const scriptNodes of Object.values(scriptNodesIndex)) {
-        let lastScriptNode = scriptNodes.pop();
-        scriptNodes.reverse().forEach(scriptNode => {
-            let scriptContent = (scriptNode.content || []).join(' ');
-            scriptContent = scriptContent.trim();
-            if (scriptContent.slice(-1) !== ';') {
-                scriptContent += ';';
-            }
-
-            lastScriptNode.content = lastScriptNode.content || [];
-            lastScriptNode.content.unshift(scriptContent);
-
-            scriptNode.tag = false;
-            scriptNode.content = [];
-        });
-    }
-
-    return tree;
-}

package/lib/modules/mergeStyles.cjs

@@ -1,38 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = mergeStyles;
-var _helpers = require("../helpers.cjs");
-/* Merge multiple <style> into one */
-function mergeStyles(tree) {
-  const styleNodes = {};
-  tree.match({
-    tag: 'style'
-  }, node => {
-    const nodeAttrs = node.attrs || {};
-    // Skip <style scoped></style>
-    // https://developer.mozilla.org/en/docs/Web/HTML/Element/style
-    //
-    // Also skip SRI, reasons are documented in "minifyJs" module
-    if ('scoped' in nodeAttrs || 'integrity' in nodeAttrs) {
-      return node;
-    }
-    if ((0, _helpers.isAmpBoilerplate)(node)) {
-      return node;
-    }
-    const styleType = nodeAttrs.type || 'text/css';
-    const styleMedia = nodeAttrs.media || 'all';
-    const styleKey = styleType + '_' + styleMedia;
-    if (styleNodes[styleKey]) {
-      const styleContent = (node.content || []).join(' ');
-      styleNodes[styleKey].content.push(' ' + styleContent);
-      return '';
-    }
-    node.content = node.content || [];
-    styleNodes[styleKey] = node;
-    return node;
-  });
-  return tree;
-}

package/lib/modules/mergeStyles.mjs

@@ -1,36 +0,0 @@
-import { isAmpBoilerplate } from '../helpers.mjs';
-
-/* Merge multiple <style> into one */
-export default function mergeStyles(tree) {
-    const styleNodes = {};
-
-    tree.match({tag: 'style'}, node => {
-        const nodeAttrs = node.attrs || {};
-        // Skip <style scoped></style>
-        // https://developer.mozilla.org/en/docs/Web/HTML/Element/style
-        //
-        // Also skip SRI, reasons are documented in "minifyJs" module
-        if ('scoped' in nodeAttrs || 'integrity' in nodeAttrs) {
-            return node;
-        }
-
-        if (isAmpBoilerplate(node)) {
-            return node;
-        }
-
-        const styleType = nodeAttrs.type || 'text/css';
-        const styleMedia = nodeAttrs.media || 'all';
-        const styleKey = styleType + '_' + styleMedia;
-        if (styleNodes[styleKey]) {
-            const styleContent = (node.content || []).join(' ');
-            styleNodes[styleKey].content.push(' ' + styleContent);
-            return '';
-        }
-
-        node.content = node.content || [];
-        styleNodes[styleKey] = node;
-        return node;
-    });
-
-    return tree;
-}

package/lib/modules/minifyConditionalComments.cjs

@@ -1,47 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = minifyConditionalComments;
-var _htmlnano = _interopRequireDefault(require("../htmlnano.cjs"));
-var _helpers = require("../helpers.cjs");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// Spec: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/compatibility/ms537512(v=vs.85)
-const CONDITIONAL_COMMENT_REGEXP = /(<!--\[if\s+?[^<>[\]]+?]>)([\s\S]+?)(<!\[endif\]-->)/gm;
-
-/** Minify content inside conditional comments */
-async function minifyConditionalComments(tree, htmlnanoOptions) {
-  // forEach, tree.walk, tree.match just don't support Promise.
-  for (let i = 0, len = tree.length; i < len; i++) {
-    const node = tree[i];
-    if (typeof node === 'string' && (0, _helpers.isConditionalComment)(node)) {
-      tree[i] = await minifycontentInsideConditionalComments(node, htmlnanoOptions);
-    }
-    if (node.content && node.content.length) {
-      tree[i].content = await minifyConditionalComments(node.content, htmlnanoOptions);
-    }
-  }
-  return tree;
-}
-async function minifycontentInsideConditionalComments(text, htmlnanoOptions) {
-  let match;
-  const matches = [];
-
-  // FIXME!
-  // String#matchAll is supported since Node.js 12
-  while ((match = CONDITIONAL_COMMENT_REGEXP.exec(text)) !== null) {
-    matches.push([match[1], match[2], match[3]]);
-  }
-  if (!matches.length) {
-    return Promise.resolve(text);
-  }
-  return Promise.all(matches.map(async match => {
-    const result = await _htmlnano.default.process(match[1], htmlnanoOptions, {}, {});
-    let minified = result.html;
-    if (match[1].includes('<html') && minified.includes('</html>')) {
-      minified = minified.replace('</html>', '');
-    }
-    return match[0] + minified + match[2];
-  }));
-}