htmlnano 2.0.2 → 2.0.4

package/docs/package.json

@@ -13,10 +13,10 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.4",
-    "@docusaurus/preset-classic": "2.0.0-beta.4",
+    "@docusaurus/core": "2.2.0",
+    "@docusaurus/preset-classic": "2.2.0",
     "@mdx-js/react": "^1.6.21",
-    "@svgr/webpack": "^5.5.0",
+    "@svgr/webpack": "^6.5.1",
     "clsx": "^1.1.1",
     "file-loader": "^6.2.0",
     "prism-react-renderer": "^1.2.1",

package/docs/versioned_docs/version-1.1.1/010-introduction.md

@@ -5,18 +5,18 @@ slug: /
 
 # Introduction
 
-Modular HTML minifier, built on top of the [PostHTML](https://github.com/posthtml/posthtml). 
+Modular HTML minifier, built on top of the [PostHTML](https://github.com/posthtml/posthtml).
 Inspired by [cssnano](http://cssnano.co/).
 
 
 ## [Benchmark](https://github.com/maltsev/html-minifiers-benchmark/blob/master/README.md)
 [html-minifier-terser@5.1.1]: https://www.npmjs.com/package/html-minifier-terser
-[htmlnano@1.0.0]: https://www.npmjs.com/package/htmlnano
+[htmlnano@1.1.1]: https://www.npmjs.com/package/htmlnano
 
-| Website | Source (KB) | [html-minifier-terser@5.1.1] | [htmlnano@1.0.0] |
+| Website | Source (KB) | [html-minifier-terser@5.1.1] | [htmlnano@1.1.1] |
 |---------|------------:|----------------:|-----------:|
 | [stackoverflow.blog](https://stackoverflow.blog/) | 95 | 87 | 82 |
 | [github.com](https://github.com/) | 210 | 183 | 171 |
 | [en.wikipedia.org](https://en.wikipedia.org/wiki/Main_Page) | 78 | 72 | 72 |
 | [npmjs.com](https://www.npmjs.com/features) | 41 | 38 | 36 |
-| **Avg. minify rate** | 0% | **9%** | **13%** |
+| **Avg. minify rate** | 0% | **9%** | **13%** |

package/docs/versioned_docs/version-1.1.1/030-config.md

@@ -6,7 +6,7 @@ There are two main ways to configure htmlnano:
 This is the way described above in the examples.
 
 ## Using configuration file
-Alternatively, you might create a configuration file (e.g., `htmlanorc.json` or `htmlnanorc.js`) or save options to `package.json` with `htmlnano` key.
+Alternatively, you might create a configuration file (e.g., `htmlnanorc.json` or `htmlnanorc.js`) or save options to `package.json` with `htmlnano` key.
 `htmlnano` uses `cosmiconfig`, so refer to [its documentation](https://github.com/davidtheclark/cosmiconfig/blob/main/README.md) for a more detailed description.
 
 If you want to specify a preset that way, use `preset` key:

package/docs/versioned_docs/version-2.0.0/010-introduction.md

@@ -5,18 +5,18 @@ slug: /
 
 # Introduction
 
-Modular HTML minifier, built on top of the [PostHTML](https://github.com/posthtml/posthtml). 
+Modular HTML minifier, built on top of the [PostHTML](https://github.com/posthtml/posthtml).
 Inspired by [cssnano](http://cssnano.co/).
 
 
 ## [Benchmark](https://github.com/maltsev/html-minifiers-benchmark/blob/master/README.md)
 [html-minifier-terser@5.1.1]: https://www.npmjs.com/package/html-minifier-terser
-[htmlnano@1.0.0]: https://www.npmjs.com/package/htmlnano
+[htmlnano@2.0.0]: https://www.npmjs.com/package/htmlnano
 
-| Website | Source (KB) | [html-minifier-terser@5.1.1] | [htmlnano@1.0.0] |
+| Website | Source (KB) | [html-minifier-terser@5.1.1] | [htmlnano@2.0.0] |
 |---------|------------:|----------------:|-----------:|
 | [stackoverflow.blog](https://stackoverflow.blog/) | 95 | 87 | 82 |
 | [github.com](https://github.com/) | 210 | 183 | 171 |
 | [en.wikipedia.org](https://en.wikipedia.org/wiki/Main_Page) | 78 | 72 | 72 |
 | [npmjs.com](https://www.npmjs.com/features) | 41 | 38 | 36 |
-| **Avg. minify rate** | 0% | **9%** | **13%** |
+| **Avg. minify rate** | 0% | **9%** | **13%** |

package/docs/versioned_docs/version-2.0.0/030-config.md

@@ -6,7 +6,7 @@ There are two main ways to configure htmlnano:
 This is the way described above in the examples.
 
 ## Using configuration file
-Alternatively, you might create a configuration file (e.g., `htmlanorc.json` or `htmlnanorc.js`) or save options to `package.json` with `htmlnano` key.
+Alternatively, you might create a configuration file (e.g., `htmlnanorc.json` or `htmlnanorc.js`) or save options to `package.json` with `htmlnano` key.
 `htmlnano` uses `cosmiconfig`, so refer to [its documentation](https://github.com/davidtheclark/cosmiconfig/blob/main/README.md) for a more detailed description.
 
 If you want to specify a preset that way, use `preset` key:
@@ -18,4 +18,4 @@ If you want to specify a preset that way, use `preset` key:
 ```
 
 Configuration files have lower precedence than passing options to `htmlnano` directly.
-So if you use both ways, then the configuration file would be ignored.
+So if you use both ways, then the configuration file would be ignored.

package/index.d.ts

@@ -0,0 +1,93 @@
+import type PostHTML from "posthtml";
+import type terser from "terser";
+import type { Options as CssNanoOptions } from "cssnano";
+import type { OptimizeOptions as SvgoOptimizeOptions } from "svgo";
+
+export interface HtmlnanoOptions {
+  skipConfigLoading?: boolean;
+  collapseAttributeWhitespace?: boolean;
+  collapseBooleanAttributes?: {
+    amphtml?: boolean;
+  };
+  collapseWhitespace?: "conservative" | "all" | "aggressive";
+  custom?: (tree: PostHTML.Node, options?: any) => PostHTML.Node;
+  deduplicateAttributeValues?: boolean;
+  minifyUrls?: URL | string | false;
+  mergeStyles?: boolean;
+  mergeScripts?: boolean;
+  minifyCss?: CssNanoOptions | boolean;
+  minifyConditionalComments?: boolean;
+  minifyJs?: terser.FormatOptions | boolean;
+  minifyJson?: boolean;
+  minifySvg?: SvgoOptimizeOptions | boolean;
+  normalizeAttributeValues?: boolean;
+  removeAttributeQuotes?: boolean;
+  removeComments?: boolean | "safe" | "all" | RegExp | (() => boolean);
+  removeEmptyAttributes?: boolean;
+  removeRedundantAttributes?: boolean;
+  removeOptionalTags?: boolean;
+  removeUnusedCss?: boolean;
+  sortAttributes?: boolean | "alphabetical" | "frequency";
+  sortAttributesWithLists?: boolean | "alphabetical" | "frequency";
+}
+
+export interface HtmlnanoPreset extends Omit<HtmlnanoOptions, "skipConfigLoading"> {}
+
+export interface Presets {
+  safe: HtmlnanoPreset;
+  ampSafe: HtmlnanoPreset;
+  max: HtmlnanoPreset;
+}
+
+type Preset = Presets[keyof Presets];
+
+export function loadConfig(
+  options?: HtmlnanoOptions,
+  preset?: Preset,
+  configPath?: string
+): [HtmlnanoOptions | {}, Preset];
+
+declare function htmlnano<TMessage>(
+  options?: HtmlnanoOptions,
+  preset?: Preset
+): (tree: PostHTML.Node) => Promise<PostHTML.Result<TMessage>>;
+
+interface PostHtmlOptions {
+  directives?: Array<{
+    name: string | RegExp;
+    start: string;
+    end: string;
+  }>;
+  sourceLocations?: boolean;
+  recognizeNoValueAttribute?: boolean;
+  xmlMode?: boolean;
+  decodeEntities?: boolean;
+  lowerCaseTags?: boolean;
+  lowerCaseAttributeNames?: boolean;
+  recognizeCDATA?: boolean;
+  recognizeSelfClosing?: boolean;
+  Tokenizer?: any;
+}
+
+declare namespace htmlnano {
+  export function process<TMessage>(
+    html: string,
+    options?: HtmlnanoOptions,
+    preset?: Preset,
+    postHtmlOptions?: PostHtmlOptions
+  ): Promise<PostHTML.Result<TMessage>>;
+
+  export function getRequiredOptionalDependencies(
+    optionsRun?: HtmlnanoOptions,
+    presetRun?: Preset
+  ): string[];
+
+  export function htmlMinimizerWebpackPluginMinify(
+    input: { [file: string]: string },
+    minimizerOptions?: HtmlnanoOptions
+  ): any;
+
+  export const presets: Presets;
+}
+
+export default htmlnano;

package/lib/helpers.js

@@ -11,49 +11,43 @@ exports.isEventHandler = isEventHandler;
 exports.isStyleNode = isStyleNode;
 exports.optionalRequire = optionalRequire;
 const ampBoilerplateAttributes = ['amp-boilerplate', 'amp4ads-boilerplate', 'amp4email-boilerplate'];
-
 function isAmpBoilerplate(node) {
   if (!node.attrs) {
     return false;
   }
-
   for (const attr of ampBoilerplateAttributes) {
     if (attr in node.attrs) {
       return true;
     }
   }
-
   return false;
 }
-
 function isComment(content) {
-  return (content || '').trim().startsWith('<!--');
+  if (typeof content === 'string') {
+    return content.trim().startsWith('<!--');
+  }
+  return false;
 }
-
 function isConditionalComment(content) {
   return (content || '').trim().startsWith('<!--[if');
 }
-
 function isStyleNode(node) {
   return node.tag === 'style' && !isAmpBoilerplate(node) && 'content' in node && node.content.length > 0;
 }
-
 function extractCssFromStyleNode(node) {
   return Array.isArray(node.content) ? node.content.join(' ') : node.content;
 }
-
 function isEventHandler(attributeName) {
   return attributeName && attributeName.slice && attributeName.slice(0, 2).toLowerCase() === 'on' && attributeName.length >= 5;
 }
-
 function optionalRequire(moduleName) {
   try {
-    return require(moduleName);
+    const module = require(moduleName);
+    return module.default || module;
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
       return null;
     }
-
     throw e;
   }
 }

package/lib/htmlnano.js

@@ -5,84 +5,68 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.loadConfig = loadConfig;
-
 var _posthtml = _interopRequireDefault(require("posthtml"));
-
 var _cosmiconfig = require("cosmiconfig");
-
 var _safe = _interopRequireDefault(require("./presets/safe"));
-
 var _ampSafe = _interopRequireDefault(require("./presets/ampSafe"));
-
 var _max = _interopRequireDefault(require("./presets/max"));
-
 var _package = _interopRequireDefault(require("../package.json"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const presets = {
   safe: _safe.default,
   ampSafe: _ampSafe.default,
   max: _max.default
 };
-
 function loadConfig(options, preset, configPath) {
-  var _options;
-
-  if (!((_options = options) !== null && _options !== void 0 && _options.skipConfigLoading)) {
+  let {
+    skipConfigLoading = false,
+    ...rest
+  } = options || {};
+  if (!skipConfigLoading) {
     const explorer = (0, _cosmiconfig.cosmiconfigSync)(_package.default.name);
     const rc = configPath ? explorer.load(configPath) : explorer.search();
-
     if (rc) {
       const {
         preset: presetName
       } = rc.config;
-
       if (presetName) {
         if (!preset && presets[presetName]) {
           preset = presets[presetName];
         }
-
         delete rc.config.preset;
       }
-
       if (!options) {
-        options = rc.config;
+        rest = rc.config;
       }
     }
   }
-
-  return [options || {}, preset || _safe.default];
+  return [rest || {}, preset || _safe.default];
 }
-
 const optionalDependencies = {
   minifyCss: ['cssnano', 'postcss'],
   minifyJs: ['terser'],
   minifyUrl: ['relateurl', 'srcset', 'terser'],
   minifySvg: ['svgo']
 };
-
 function htmlnano(optionsRun, presetRun) {
   let [options, preset] = loadConfig(optionsRun, presetRun);
   return function minifier(tree) {
     const nodeHandlers = [];
     const attrsHandlers = [];
     const contentsHandlers = [];
-    options = { ...preset,
+    options = {
+      ...preset,
       ...options
     };
     let promise = Promise.resolve(tree);
-
     for (const [moduleName, moduleOptions] of Object.entries(options)) {
       if (!moduleOptions) {
         // The module is disabled
         continue;
       }
-
       if (_safe.default[moduleName] === undefined) {
         throw new Error('Module "' + moduleName + '" is not defined');
       }
-
       (optionalDependencies[moduleName] || []).forEach(dependency => {
         try {
           require(dependency);
@@ -94,30 +78,23 @@ function htmlnano(optionsRun, presetRun) {
           }
         }
       });
-
       const module = require('./modules/' + moduleName);
-
       if (typeof module.onAttrs === 'function') {
         attrsHandlers.push(module.onAttrs(options, moduleOptions));
       }
-
       if (typeof module.onContent === 'function') {
         contentsHandlers.push(module.onContent(options, moduleOptions));
       }
-
       if (typeof module.onNode === 'function') {
         nodeHandlers.push(module.onNode(options, moduleOptions));
       }
-
       if (typeof module.default === 'function') {
         promise = promise.then(tree => module.default(tree, options, moduleOptions));
       }
     }
-
     if (attrsHandlers.length + contentsHandlers.length + nodeHandlers.length === 0) {
       return promise;
     }
-
     return promise.then(tree => {
       tree.walk(node => {
         if (node) {
@@ -127,17 +104,13 @@ function htmlnano(optionsRun, presetRun) {
             Object.entries(node.attrs).forEach(([attrName, attrValue]) => {
               newAttrsObj[attrName.toLowerCase()] = attrValue;
             });
-
             for (const handler of attrsHandlers) {
               newAttrsObj = handler(newAttrsObj, node);
             }
-
             node.attrs = newAttrsObj;
           }
-
           if (node.content) {
             node.content = typeof node.content === 'string' ? [node.content] : node.content;
-
             if (Array.isArray(node.content) && node.content.length > 0) {
               for (const handler of contentsHandlers) {
                 const result = handler(node.content, node);
@@ -145,28 +118,33 @@ function htmlnano(optionsRun, presetRun) {
               }
             }
           }
-
           for (const handler of nodeHandlers) {
             node = handler(node);
           }
         }
-
         return node;
       });
       return tree;
     });
   };
 }
-
 htmlnano.getRequiredOptionalDependencies = function (optionsRun, presetRun) {
   const [options] = loadConfig(optionsRun, presetRun);
   return [...new Set(Object.keys(options).filter(moduleName => options[moduleName]).map(moduleName => optionalDependencies[moduleName]).flat())];
 };
-
 htmlnano.process = function (html, options, preset, postHtmlOptions) {
   return (0, _posthtml.default)([htmlnano(options, preset)]).process(html, postHtmlOptions);
 };
 
+// https://github.com/webpack-contrib/html-minimizer-webpack-plugin/blob/faca00f2219514bc671c5942685721f0b5dbaa70/src/utils.js#L74
+htmlnano.htmlMinimizerWebpackPluginMinify = function htmlNano(input, minimizerOptions = {}) {
+  const [[, code]] = Object.entries(input);
+  return htmlnano.process(code, minimizerOptions, presets.safe).then(result => {
+    return {
+      code: result.html
+    };
+  });
+};
 htmlnano.presets = presets;
 var _default = htmlnano;
 exports.default = _default;

package/lib/modules/collapseAttributeWhitespace.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.attributesWithLists = void 0;
 exports.onAttrs = onAttrs;
-
 var _helpers = require("../helpers");
-
-const attributesWithLists = new Set(['class', 'dropzone', 'rel', // a, area, link
-'ping', // a, area
-'sandbox', // iframe
-
+const attributesWithLists = new Set(['class', 'dropzone', 'rel',
+// a, area, link
+'ping',
+// a, area
+'sandbox',
+// iframe
 /**
  * https://github.com/posthtml/htmlnano/issues/180
  * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link#attr-sizes
@@ -21,8 +21,8 @@ const attributesWithLists = new Set(['class', 'dropzone', 'rel', // a, area, lin
 // 'sizes', // link
 'headers' // td, th
 ]);
-/** @type Record<string, string[] | null> */
 
+/** @type Record<string, string[] | null> */
 exports.attributesWithLists = attributesWithLists;
 const attributesWithSingleValue = {
   accept: ['input'],
@@ -63,26 +63,25 @@ const attributesWithSingleValue = {
   value: ['li', 'meter', 'progress'],
   width: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video']
 };
-/** Collapse whitespaces inside list-like attributes (e.g. class, rel) */
 
+/** Collapse whitespaces inside list-like attributes (e.g. class, rel) */
 function onAttrs() {
   return (attrs, node) => {
     const newAttrs = attrs;
     Object.entries(attrs).forEach(([attrName, attrValue]) => {
+      if (typeof attrValue !== 'string') return;
       if (attributesWithLists.has(attrName)) {
         const newAttrValue = attrValue.replace(/\s+/g, ' ').trim();
         newAttrs[attrName] = newAttrValue;
         return;
       }
-
-      if ((0, _helpers.isEventHandler)(attrName) || Object.hasOwnProperty.call(attributesWithSingleValue, attrName) && (attributesWithSingleValue[attrName] === null || attributesWithSingleValue[attrName].includes(node.tag))) {
+      if ((0, _helpers.isEventHandler)(attrName) || Object.prototype.hasOwnProperty.call(attributesWithSingleValue, attrName) && (attributesWithSingleValue[attrName] === null || attributesWithSingleValue[attrName].includes(node.tag))) {
         newAttrs[attrName] = minifySingleAttributeValue(attrValue);
       }
     });
     return newAttrs;
   };
 }
-
 function minifySingleAttributeValue(value) {
-  return typeof value === 'string' ? String(value).trim() : value;
+  return typeof value === 'string' ? value.trim() : value;
 }

package/lib/modules/collapseBooleanAttributes.js

@@ -5,34 +5,58 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onAttrs = onAttrs;
 // Source: https://github.com/kangax/html-minifier/issues/63
-const htmlBooleanAttributes = new Set(['allowfullscreen', 'allowpaymentrequest', 'allowtransparency', 'async', 'autofocus', 'autoplay', 'checked', 'compact', 'controls', 'declare', 'default', 'defaultchecked', 'defaultmuted', 'defaultselected', 'defer', 'disabled', 'enabled', 'formnovalidate', 'hidden', 'indeterminate', 'inert', 'ismap', 'itemscope', 'loop', 'multiple', 'muted', 'nohref', 'noresize', 'noshade', 'novalidate', 'nowrap', 'open', 'pauseonexit', 'readonly', 'required', 'reversed', 'scoped', 'seamless', 'selected', 'sortable', 'truespeed', 'typemustmatch', 'visible']);
+// https://html.spec.whatwg.org/#boolean-attribute
+// https://html.spec.whatwg.org/#attributes-1
+const htmlBooleanAttributes = new Set(['allowfullscreen', 'allowpaymentrequest', 'allowtransparency', 'async', 'autofocus', 'autoplay', 'checked', 'compact', 'controls', 'declare', 'default', 'defaultchecked', 'defaultmuted', 'defaultselected', 'defer', 'disabled', 'enabled', 'formnovalidate', 'hidden', 'indeterminate', 'inert', 'ismap', 'itemscope', 'loop', 'multiple', 'muted', 'nohref', 'nomodule', 'noresize', 'noshade', 'novalidate', 'nowrap', 'open', 'pauseonexit', 'playsinline', 'readonly', 'required', 'reversed', 'scoped', 'seamless', 'selected', 'sortable', 'truespeed', 'typemustmatch', 'visible']);
 const amphtmlBooleanAttributes = new Set(['⚡', 'amp', '⚡4ads', 'amp4ads', '⚡4email', 'amp4email', 'amp-custom', 'amp-boilerplate', 'amp4ads-boilerplate', 'amp4email-boilerplate', 'allow-blocked-ranges', 'amp-access-hide', 'amp-access-template', 'amp-keyframes', 'animate', 'arrows', 'data-block-on-consent', 'data-enable-refresh', 'data-multi-size', 'date-template', 'disable-double-tap', 'disable-session-states', 'disableremoteplayback', 'dots', 'expand-single-section', 'expanded', 'fallback', 'first', 'fullscreen', 'inline', 'lightbox', 'noaudio', 'noautoplay', 'noloading', 'once', 'open-after-clear', 'open-after-select', 'open-button', 'placeholder', 'preload', 'reset-on-refresh', 'reset-on-resize', 'resizable', 'rotate-to-fullscreen', 'second', 'standalone', 'stereo', 'submit-error', 'submit-success', 'submitting', 'subscriptions-actions', 'subscriptions-dialog']);
-
+const missingValueDefaultEmptyStringAttributes = {
+  // https://html.spec.whatwg.org/#attr-media-preload
+  audio: {
+    preload: 'auto'
+  },
+  video: {
+    preload: 'auto'
+  }
+};
+const tagsHasMissingValueDefaultEmptyStringAttributes = new Set(Object.keys(missingValueDefaultEmptyStringAttributes));
 function onAttrs(options, moduleOptions) {
   return (attrs, node) => {
     if (!node.tag) return attrs;
     const newAttrs = attrs;
-
+    if (tagsHasMissingValueDefaultEmptyStringAttributes.has(node.tag)) {
+      const tagAttributesCanBeReplacedWithEmptyString = missingValueDefaultEmptyStringAttributes[node.tag];
+      for (const attributesCanBeReplacedWithEmptyString of Object.keys(tagAttributesCanBeReplacedWithEmptyString)) {
+        if (Object.prototype.hasOwnProperty.call(attrs, attributesCanBeReplacedWithEmptyString) && attrs[attributesCanBeReplacedWithEmptyString] === tagAttributesCanBeReplacedWithEmptyString[attributesCanBeReplacedWithEmptyString]) {
+          attrs[attributesCanBeReplacedWithEmptyString] = true;
+        }
+      }
+    }
     for (const attrName of Object.keys(attrs)) {
       if (attrName === 'visible' && node.tag.startsWith('a-')) {
         continue;
       }
-
       if (htmlBooleanAttributes.has(attrName)) {
         newAttrs[attrName] = true;
       }
 
+      // Fast path optimization.
+      // The rest of tranformations are only for string type attrValue.
+      if (typeof newAttrs[attrName] !== 'string') continue;
       if (moduleOptions.amphtml && amphtmlBooleanAttributes.has(attrName) && attrs[attrName] === '') {
         newAttrs[attrName] = true;
-      } // collapse crossorigin attributes
-      // Specification: https://html.spec.whatwg.org/multipage/urls-and-fetching.html#cors-settings-attributes
-
+      }
+      // https://html.spec.whatwg.org/#a-quick-introduction-to-html
+      // The value, along with the "=" character, can be omitted altogether if the value is the empty string.
+      if (attrs[attrName] === '') {
+        newAttrs[attrName] = true;
+      }
 
-      if (attrName.toLowerCase() === 'crossorigin' && (attrs[attrName] === 'anonymous' || attrs[attrName] === '')) {
+      // collapse crossorigin attributes
+      // Specification: https://html.spec.whatwg.org/multipage/urls-and-fetching.html#cors-settings-attributes
+      if (attrName.toLowerCase() === 'crossorigin' && attrs[attrName] === 'anonymous') {
         newAttrs[attrName] = true;
       }
     }
-
     return newAttrs;
   };
 }

package/lib/modules/collapseWhitespace.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = collapseWhitespace;
-
 var _helpers = require("../helpers");
-
 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
+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
+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$/;
@@ -19,14 +20,13 @@ const multipleWhitespacePattern = /\s+/g;
 const NONE = '';
 const SINGLE_SPACE = ' ';
 const validOptions = ['all', 'aggressive', 'conservative'];
-/** Collapses redundant whitespaces */
 
+/** Collapses redundant whitespaces */
 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';
@@ -38,9 +38,7 @@ function collapseWhitespace(tree, options, collapseType, parent) {
       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,
@@ -48,37 +46,38 @@ function collapseWhitespace(tree, options, collapseType, parent) {
         nextNode
       });
     }
-
     tree[index] = node;
   });
   return tree;
 }
-
 function collapseRedundantWhitespaces(text, collapseType, shouldTrim = false, parent, prevNode, nextNode) {
   if (!text || text.length === 0) {
     return NONE;
   }
-
   if (!(0, _helpers.isComment)(text)) {
     text = text.replace(multipleWhitespacePattern, SINGLE_SPACE);
   }
-
   if (shouldTrim) {
     if (collapseType === 'aggressive') {
       if (!noTrimWhitespacesInsideElements.has(parent && parent.node && parent.node.tag)) {
-        if (!noTrimWhitespacesArroundElements.has(prevNode && prevNode.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
+          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
+          ||
+          // or the next node starts with a white space
           nextNode && nextNode.content && nextNode.content.length && !startsWithWhitespacePattern.test(nextNode.content[0]))) {
             text = text.trimStart();
           }
         }
-
-        if (!noTrimWhitespacesArroundElements.has(nextNode && nextNode.tag)) {
+        if (!nextNode || nextNode && nextNode.tag && !noTrimWhitespacesArroundElements.has(nextNode.tag)) {
           text = text.trimEnd();
         }
       } else {
@@ -96,6 +95,5 @@ function collapseRedundantWhitespaces(text, collapseType, shouldTrim = false, pa
       text = text.trim();
     }
   }
-
   return text;
 }