string-remove-widows 3.0.5 → 3.0.6

package/dist/string-remove-widows.esm.js

@@ -1,7 +1,7 @@
 /**
  * @name string-remove-widows
  * @fileoverview Helps to prevent widow words in a text
- * @version 3.0.5
+ * @version 3.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-remove-widows/}
@@ -12,7 +12,7 @@ import { left, right } from 'string-left-right';
 import { Ranges } from 'ranges-push';
 import { rApply } from 'ranges-apply';
 
-var version$1 = "3.0.5";
+var version$1 = "3.0.6";
 
 const rawnbsp = "\u00A0";
 const encodedNbspHtml = " ";
@@ -26,334 +26,563 @@ const rawMdash = "\u2014";
 const encodedMdashHtml = "—";
 const encodedMdashCss = "\\2014";
 const encodedMdashJs = "\\u2014";
-const headsAndTailsJinja = [{
-  heads: "{{",
-  tails: "}}"
-}, {
-  heads: ["{% if", "{%- if"],
-  tails: ["{% endif", "{%- endif"]
-}, {
-  heads: ["{% for", "{%- for"],
-  tails: ["{% endfor", "{%- endfor"]
-}, {
-  heads: ["{%", "{%-"],
-  tails: ["%}", "-%}"]
-}, {
-  heads: "{#",
-  tails: "#}"
-}];
-const headsAndTailsHugo = [{
-  heads: "{{",
-  tails: "}}"
-}];
-const headsAndTailsHexo = [{
-  heads: ["<%", "<%=", "<%-"],
-  tails: ["%>", "=%>", "-%>"]
-}];
-const knownHTMLTags = ["abbr", "address", "area", "article", "aside", "audio", "base", "bdi", "bdo", "blockquote", "body", "br", "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "div", "dl", "doctype", "dt", "em", "embed", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hgroup", "hr", "html", "iframe", "img", "input", "ins", "kbd", "keygen", "label", "legend", "li", "link", "main", "map", "mark", "math", "menu", "menuitem", "meta", "meter", "nav", "noscript", "object", "ol", "optgroup", "option", "output", "param", "picture", "pre", "progress", "rb", "rp", "rt", "rtc", "ruby", "samp", "script", "section", "select", "slot", "small", "source", "span", "strong", "style", "sub", "summary", "sup", "svg", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "ul", "var", "video", "wbr", "xml"];
+const headsAndTailsJinja = [
+    {
+        heads: "{{",
+        tails: "}}",
+    },
+    {
+        heads: ["{% if", "{%- if"],
+        tails: ["{% endif", "{%- endif"],
+    },
+    {
+        heads: ["{% for", "{%- for"],
+        tails: ["{% endfor", "{%- endfor"],
+    },
+    {
+        heads: ["{%", "{%-"],
+        tails: ["%}", "-%}"],
+    },
+    {
+        heads: "{#",
+        tails: "#}",
+    },
+];
+const headsAndTailsHugo = [
+    {
+        heads: "{{",
+        tails: "}}",
+    },
+];
+const headsAndTailsHexo = [
+    {
+        heads: ["<%", "<%=", "<%-"],
+        tails: ["%>", "=%>", "-%>"],
+    },
+];
+const knownHTMLTags = [
+    "abbr",
+    "address",
+    "area",
+    "article",
+    "aside",
+    "audio",
+    "base",
+    "bdi",
+    "bdo",
+    "blockquote",
+    "body",
+    "br",
+    "button",
+    "canvas",
+    "caption",
+    "center",
+    "cite",
+    "code",
+    "col",
+    "colgroup",
+    "data",
+    "datalist",
+    "dd",
+    "del",
+    "details",
+    "dfn",
+    "dialog",
+    "div",
+    "dl",
+    "doctype",
+    "dt",
+    "em",
+    "embed",
+    "fieldset",
+    "figcaption",
+    "figure",
+    "footer",
+    "form",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "head",
+    "header",
+    "hgroup",
+    "hr",
+    "html",
+    "iframe",
+    "img",
+    "input",
+    "ins",
+    "kbd",
+    "keygen",
+    "label",
+    "legend",
+    "li",
+    "link",
+    "main",
+    "map",
+    "mark",
+    "math",
+    "menu",
+    "menuitem",
+    "meta",
+    "meter",
+    "nav",
+    "noscript",
+    "object",
+    "ol",
+    "optgroup",
+    "option",
+    "output",
+    "param",
+    "picture",
+    "pre",
+    "progress",
+    "rb",
+    "rp",
+    "rt",
+    "rtc",
+    "ruby",
+    "samp",
+    "script",
+    "section",
+    "select",
+    "slot",
+    "small",
+    "source",
+    "span",
+    "strong",
+    "style",
+    "sub",
+    "summary",
+    "sup",
+    "svg",
+    "table",
+    "tbody",
+    "td",
+    "template",
+    "textarea",
+    "tfoot",
+    "th",
+    "thead",
+    "time",
+    "title",
+    "tr",
+    "track",
+    "ul",
+    "var",
+    "video",
+    "wbr",
+    "xml",
+];
 
 const version = version$1;
 const defaults = {
-  removeWidowPreventionMeasures: false,
-  convertEntities: true,
-  targetLanguage: "html",
-  UKPostcodes: false,
-  hyphens: true,
-  minWordCount: 4,
-  minCharCount: 5,
-  ignore: [],
-  reportProgressFunc: null,
-  reportProgressFuncFrom: 0,
-  reportProgressFuncTo: 100,
-  tagRanges: []
+    removeWidowPreventionMeasures: false,
+    convertEntities: true,
+    targetLanguage: "html",
+    UKPostcodes: false,
+    hyphens: true,
+    minWordCount: 4,
+    minCharCount: 5,
+    ignore: [],
+    reportProgressFunc: null,
+    reportProgressFuncFrom: 0,
+    reportProgressFuncTo: 100,
+    tagRanges: [],
 };
 function removeWidows(str, originalOpts) {
-  const start = Date.now();
-  if (typeof str !== "string") {
-    if (str === undefined) {
-      throw new Error("string-remove-widows: [THROW_ID_01] the first input argument is completely missing! It should be given as string.");
-    } else {
-      throw new Error(`string-remove-widows: [THROW_ID_02] the first input argument must be string! It was given as "${typeof str}", equal to:\n${JSON.stringify(str, null, 4)}`);
-    }
-  }
-  if (originalOpts && typeof originalOpts !== "object") {
-    throw new Error(`string-remove-widows: [THROW_ID_03] the second input argument, options object, should be a plain object but it was given as type ${typeof originalOpts}, equal to ${JSON.stringify(originalOpts, null, 4)}`);
-  }
-  const isArr = Array.isArray;
-  const len = str.length;
-  const rangesArr = new Ranges({
-    mergeType: 2
-  });
-  const punctuationCharsToConsiderWidowIssue = ["."];
-  const postcodeRegexFront = /[A-Z]{1,2}[0-9][0-9A-Z]?$/;
-  const postcodeRegexEnd = /^[0-9][A-Z]{2}/;
-  const leavePercForLastStage = 0.06;
-  let currentPercentageDone;
-  let lastPercentage = 0;
-  let wordCount = 0;
-  let charCount = 0;
-  let secondToLastWhitespaceStartedAt;
-  let secondToLastWhitespaceEndedAt;
-  let lastWhitespaceStartedAt;
-  let lastWhitespaceEndedAt;
-  let lastEncodedNbspStartedAt;
-  let lastEncodedNbspEndedAt;
-  let doNothingUntil;
-  let bumpWordCountAt;
-  const opts = { ...defaults,
-    ...originalOpts
-  };
-  const whatWasDone = {
-    removeWidows: false,
-    convertEntities: false
-  };
-  if (!opts.ignore || !isArr(opts.ignore) && typeof opts.ignore !== "string") {
-    opts.ignore = [];
-  } else {
-    if (typeof opts.ignore === "string") {
-      opts.ignore = [opts.ignore];
-    }
-    if (opts.ignore.includes("all")) {
-      opts.ignore = opts.ignore.concat(headsAndTailsJinja.concat(headsAndTailsHexo));
-    } else if (opts.ignore.some(val => typeof val === "string")) {
-      let temp = [];
-      opts.ignore = opts.ignore.filter(val => {
-        if (typeof val === "string" && val.length) {
-          if (["nunjucks", "jinja", "liquid"].includes(val.trim().toLowerCase())) {
-            temp = temp.concat(headsAndTailsJinja);
-          } else if (["hugo"].includes(val.trim().toLowerCase())) {
-            temp = temp.concat(headsAndTailsHugo);
-          } else if (["hexo"].includes(val.trim().toLowerCase())) {
-            temp = temp.concat(headsAndTailsHexo);
-          }
-          return false;
+    const start = Date.now();
+    if (typeof str !== "string") {
+        if (str === undefined) {
+            throw new Error("string-remove-widows: [THROW_ID_01] the first input argument is completely missing! It should be given as string.");
         }
-        if (typeof val === "object") {
-          return true;
+        else {
+            throw new Error(`string-remove-widows: [THROW_ID_02] the first input argument must be string! It was given as "${typeof str}", equal to:\n${JSON.stringify(str, null, 4)}`);
         }
-      });
-      if (temp.length) {
-        opts.ignore = opts.ignore.concat(temp);
-      }
     }
-  }
-  let ceil;
-  if (opts.reportProgressFunc) {
-    ceil = Math.floor(opts.reportProgressFuncTo - (opts.reportProgressFuncTo - opts.reportProgressFuncFrom) * leavePercForLastStage - opts.reportProgressFuncFrom);
-  }
-  function push(finalStart, finalEnd) {
-    let finalWhatToInsert = rawnbsp;
-    if (opts.removeWidowPreventionMeasures) {
-      finalWhatToInsert = " ";
-    } else if (opts.convertEntities) {
-      finalWhatToInsert = encodedNbspHtml;
-      if (typeof opts.targetLanguage === "string") {
-        if (opts.targetLanguage.trim().toLowerCase() === "css") {
-          finalWhatToInsert = encodedNbspCss;
-        } else if (opts.targetLanguage.trim().toLowerCase() === "js") {
-          finalWhatToInsert = encodedNbspJs;
-        }
-      }
+    if (originalOpts && typeof originalOpts !== "object") {
+        throw new Error(`string-remove-widows: [THROW_ID_03] the second input argument, options object, should be a plain object but it was given as type ${typeof originalOpts}, equal to ${JSON.stringify(originalOpts, null, 4)}`);
     }
-    if (str.slice(finalStart, finalEnd) !== finalWhatToInsert) {
-      rangesArr.push(finalStart, finalEnd, finalWhatToInsert);
+    const isArr = Array.isArray;
+    const len = str.length;
+    const rangesArr = new Ranges({ mergeType: 2 });
+    const punctuationCharsToConsiderWidowIssue = ["."];
+    const postcodeRegexFront = /[A-Z]{1,2}[0-9][0-9A-Z]?$/;
+    const postcodeRegexEnd = /^[0-9][A-Z]{2}/;
+    const leavePercForLastStage = 0.06;
+    let currentPercentageDone;
+    let lastPercentage = 0;
+    let wordCount = 0;
+    let charCount = 0;
+    let secondToLastWhitespaceStartedAt;
+    let secondToLastWhitespaceEndedAt;
+    let lastWhitespaceStartedAt;
+    let lastWhitespaceEndedAt;
+    let lastEncodedNbspStartedAt;
+    let lastEncodedNbspEndedAt;
+    let doNothingUntil;
+    let bumpWordCountAt;
+    const opts = { ...defaults, ...originalOpts };
+    const whatWasDone = {
+        removeWidows: false,
+        convertEntities: false,
+    };
+    if (!opts.ignore ||
+        (!isArr(opts.ignore) && typeof opts.ignore !== "string")) {
+        opts.ignore = [];
     }
-  }
-  function resetAll() {
-    wordCount = 0;
-    charCount = 0;
-    secondToLastWhitespaceStartedAt = undefined;
-    secondToLastWhitespaceEndedAt = undefined;
-    lastWhitespaceStartedAt = undefined;
-    lastWhitespaceEndedAt = undefined;
-    lastEncodedNbspStartedAt = undefined;
-    lastEncodedNbspEndedAt = undefined;
-  }
-  resetAll();
-  for (let i = 0; i <= len; i++) {
-    if (!doNothingUntil && isArr(opts.ignore) && opts.ignore.length) {
-      opts.ignore.some((valObj, y) => {
-        if (isArr(valObj.heads) && valObj.heads.some(oneOfHeads => str.startsWith(oneOfHeads, i)) || typeof valObj.heads === "string" && str.startsWith(valObj.heads, i)) {
-          wordCount += 1;
-          doNothingUntil = opts.ignore[y].tails;
-          return true;
+    else {
+        if (typeof opts.ignore === "string") {
+            opts.ignore = [opts.ignore];
+        }
+        if (opts.ignore.includes("all")) {
+            opts.ignore = opts.ignore.concat(headsAndTailsJinja.concat(headsAndTailsHexo));
+        }
+        else if (opts.ignore.some((val) => typeof val === "string")) {
+            let temp = [];
+            opts.ignore = opts.ignore.filter((val) => {
+                if (typeof val === "string" && val.length) {
+                    if (["nunjucks", "jinja", "liquid"].includes(val.trim().toLowerCase())) {
+                        temp = temp.concat(headsAndTailsJinja);
+                    }
+                    else if (["hugo"].includes(val.trim().toLowerCase())) {
+                        temp = temp.concat(headsAndTailsHugo);
+                    }
+                    else if (["hexo"].includes(val.trim().toLowerCase())) {
+                        temp = temp.concat(headsAndTailsHexo);
+                    }
+                    return false;
+                }
+                if (typeof val === "object") {
+                    return true;
+                }
+            });
+            if (temp.length) {
+                opts.ignore = opts.ignore.concat(temp);
+            }
         }
-      });
-    }
-    if (!doNothingUntil && bumpWordCountAt && bumpWordCountAt === i) {
-      wordCount += 1;
-      bumpWordCountAt = undefined;
-    }
-    if (typeof opts.reportProgressFunc === "function") {
-      currentPercentageDone = opts.reportProgressFuncFrom + Math.floor(i / len * (ceil || 1));
-      if (currentPercentageDone !== lastPercentage) {
-        lastPercentage = currentPercentageDone;
-        opts.reportProgressFunc(currentPercentageDone);
-      }
-    }
-    if (!doNothingUntil && i && str[i] && str[i].trim() && (!str[i - 1] || str[i - 1] && !str[i - 1].trim())) {
-      lastWhitespaceEndedAt = i;
-    }
-    if (!doNothingUntil && str[i] && str[i].trim()) {
-      charCount += 1;
-    }
-    if (!doNothingUntil && opts.hyphens && (`-${rawMdash}${rawNdash}`.includes(str[i]) || str.startsWith(encodedNdashHtml, i) || str.startsWith(encodedNdashCss, i) || str.startsWith(encodedNdashJs, i) || str.startsWith(encodedMdashHtml, i) || str.startsWith(encodedMdashCss, i) || str.startsWith(encodedMdashJs, i)) && str[i + 1] && (!str[i + 1].trim() || str[i] === "&")) {
-      if (str[i - 1] && !str[i - 1].trim() && str[left(str, i)]) {
-        push(left(str, i) + 1, i);
-        whatWasDone.removeWidows = true;
-      }
-    }
-    if (!doNothingUntil && (str.startsWith("&nbsp;", i) || str.startsWith("&#160;", i))) {
-      lastEncodedNbspStartedAt = i;
-      lastEncodedNbspEndedAt = i + 6;
-      if (str[i + 6] && str[i + 6].trim()) {
-        bumpWordCountAt = i + 6;
-      }
-      if (!opts.convertEntities) {
-        rangesArr.push(i, i + 6, rawnbsp);
-        whatWasDone.convertEntities = true;
-      } else if (opts.targetLanguage === "css" || opts.targetLanguage === "js") {
-        rangesArr.push(i, i + 6, opts.targetLanguage === "css" ? encodedNbspCss : encodedNbspJs);
-        whatWasDone.convertEntities = true;
-      }
-    }
-    if (!doNothingUntil && str[i + 4] && str[i] === "\\" && str[i + 1] === "0" && str[i + 2] === "0" && str[i + 3].toUpperCase() === "A" && str[i + 4] === "0") {
-      lastEncodedNbspStartedAt = i;
-      lastEncodedNbspEndedAt = i + 5;
-      if (str[i + 5] && str[i + 5].trim()) {
-        bumpWordCountAt = i + 5;
-      }
-      if (!opts.convertEntities) {
-        rangesArr.push(i, i + 5, rawnbsp);
-        whatWasDone.convertEntities = true;
-      } else if (opts.targetLanguage === "html" || opts.targetLanguage === "js") {
-        rangesArr.push(i, i + 5, opts.targetLanguage === "html" ? encodedNbspHtml : encodedNbspJs);
-        whatWasDone.convertEntities = true;
-      }
-    }
-    if (!doNothingUntil && str[i] === "\\" && str[i + 1] && str[i + 1].toLowerCase() === "u" && str[i + 2] === "0" && str[i + 3] === "0" && str[i + 4] && str[i + 4].toUpperCase() === "A" && str[i + 5] === "0") {
-      lastEncodedNbspStartedAt = i;
-      lastEncodedNbspEndedAt = i + 6;
-      if (str[i + 6] && str[i + 6].trim()) {
-        bumpWordCountAt = i + 6;
-      }
-      if (!opts.convertEntities) {
-        rangesArr.push(i, i + 6, rawnbsp);
-      } else if (opts.targetLanguage === "html" || opts.targetLanguage === "css") {
-        rangesArr.push(i, i + 6, opts.targetLanguage === "html" ? encodedNbspHtml : encodedNbspCss);
-      }
-    }
-    if (!doNothingUntil && str[i] === rawnbsp) {
-      lastEncodedNbspStartedAt = i;
-      lastEncodedNbspEndedAt = i + 1;
-      if (opts.convertEntities) {
-        rangesArr.push(i, i + 1, opts.targetLanguage === "css" ? encodedNbspCss : opts.targetLanguage === "js" ? encodedNbspJs : encodedNbspHtml);
-      }
     }
-    if (!doNothingUntil && str[i] && str[i].trim() && (!str[i - 1] || !str[i - 1].trim())) {
-      wordCount += 1;
+    let ceil;
+    if (opts.reportProgressFunc) {
+        ceil = Math.floor(opts.reportProgressFuncTo -
+            (opts.reportProgressFuncTo - opts.reportProgressFuncFrom) *
+                leavePercForLastStage -
+            opts.reportProgressFuncFrom);
     }
-    if (!doNothingUntil && (!str[i] || `\r\n`.includes(str[i]) || (str[i] === "\n" || str[i] === "\r" || str[i] === "\r" && str[i + 1] === "\n") && left(str, i) && punctuationCharsToConsiderWidowIssue.includes(str[left(str, i)]))) {
-      if ((!opts.minWordCount || wordCount >= opts.minWordCount) && (!opts.minCharCount || charCount >= opts.minCharCount)) {
-        let finalStart;
-        let finalEnd;
-        if (lastWhitespaceStartedAt !== undefined && lastWhitespaceEndedAt !== undefined && lastEncodedNbspStartedAt !== undefined && lastEncodedNbspEndedAt !== undefined) {
-          if (lastWhitespaceStartedAt > lastEncodedNbspStartedAt) {
-            finalStart = lastWhitespaceStartedAt;
-            finalEnd = lastWhitespaceEndedAt;
-          } else {
-            finalStart = lastEncodedNbspStartedAt;
-            finalEnd = lastEncodedNbspEndedAt;
-          }
-        } else if (lastWhitespaceStartedAt !== undefined && lastWhitespaceEndedAt !== undefined) {
-          finalStart = lastWhitespaceStartedAt;
-          finalEnd = lastWhitespaceEndedAt;
-        } else if (lastEncodedNbspStartedAt !== undefined && lastEncodedNbspEndedAt !== undefined) {
-          finalStart = lastEncodedNbspStartedAt;
-          finalEnd = lastEncodedNbspEndedAt;
+    function push(finalStart, finalEnd) {
+        let finalWhatToInsert = rawnbsp;
+        if (opts.removeWidowPreventionMeasures) {
+            finalWhatToInsert = " ";
         }
-        if (!(finalStart && finalEnd) && secondToLastWhitespaceStartedAt && secondToLastWhitespaceEndedAt) {
-          finalStart = secondToLastWhitespaceStartedAt;
-          finalEnd = secondToLastWhitespaceEndedAt;
+        else if (opts.convertEntities) {
+            finalWhatToInsert = encodedNbspHtml;
+            if (typeof opts.targetLanguage === "string") {
+                if (opts.targetLanguage.trim().toLowerCase() === "css") {
+                    finalWhatToInsert = encodedNbspCss;
+                }
+                else if (opts.targetLanguage.trim().toLowerCase() === "js") {
+                    finalWhatToInsert = encodedNbspJs;
+                }
+            }
         }
-        if (finalStart && finalEnd) {
-          push(finalStart, finalEnd);
-          whatWasDone.removeWidows = true;
+        if (str.slice(finalStart, finalEnd) !== finalWhatToInsert) {
+            rangesArr.push(finalStart, finalEnd, finalWhatToInsert);
         }
-      }
-      resetAll();
-    }
-    if (opts.UKPostcodes && str[i] && !str[i].trim() && str[i - 1] && str[i - 1].trim() && postcodeRegexFront.test(str.slice(0, i)) && str[right(str, i)] && postcodeRegexEnd.test(str.slice(right(str, i)))) {
-      push(i, right(str, i));
-      whatWasDone.removeWidows = true;
     }
-    if (!doNothingUntil && str[i] && !str[i].trim() && str[i - 1] && str[i - 1].trim() && (lastWhitespaceStartedAt === undefined || str[lastWhitespaceStartedAt - 1] && str[lastWhitespaceStartedAt - 1].trim()) && !"/>".includes(str[right(str, i)]) && !str.slice(0, i).trim().endsWith("br") && !str.slice(0, i).trim().endsWith("hr") && !(str.slice(0, i).endsWith("<") && knownHTMLTags.some(tag => str.startsWith(tag, right(str, i))))) {
-      secondToLastWhitespaceStartedAt = lastWhitespaceStartedAt;
-      secondToLastWhitespaceEndedAt = lastWhitespaceEndedAt;
-      lastWhitespaceStartedAt = i;
-      lastWhitespaceEndedAt = undefined;
-      if (lastEncodedNbspStartedAt !== undefined || lastEncodedNbspEndedAt !== undefined) {
+    function resetAll() {
+        wordCount = 0;
+        charCount = 0;
+        secondToLastWhitespaceStartedAt = undefined;
+        secondToLastWhitespaceEndedAt = undefined;
+        lastWhitespaceStartedAt = undefined;
+        lastWhitespaceEndedAt = undefined;
         lastEncodedNbspStartedAt = undefined;
         lastEncodedNbspEndedAt = undefined;
-      }
     }
-    let tempTailFinding;
-    if (doNothingUntil) {
-      if (typeof doNothingUntil === "string" && (!doNothingUntil.length || str.startsWith(doNothingUntil, i))) {
-        doNothingUntil = undefined;
-      } else if (isArr(doNothingUntil) && (!doNothingUntil.length || doNothingUntil.some(val => {
-        if (str.startsWith(val, i)) {
-          tempTailFinding = val;
-          return true;
-        }
-      }))) {
-        doNothingUntil = undefined;
-        i += tempTailFinding.length;
-        if (isArr(opts.ignore) && opts.ignore.length && str[i + 1]) {
-          opts.ignore.some(oneOfHeadsTailsObjs => {
-            return matchRightIncl(str, i, oneOfHeadsTailsObjs.tails, {
-              trimBeforeMatching: true,
-              cb: (_char, _theRemainderOfTheString, index) => {
-                if (index) {
-                  i = index - 1;
-                  if (str[i + 1] && str[i + 1].trim()) {
+    resetAll();
+    for (let i = 0; i <= len; i++) {
+        if (!doNothingUntil && isArr(opts.ignore) && opts.ignore.length) {
+            opts.ignore.some((valObj, y) => {
+                if ((isArr(valObj.heads) &&
+                    valObj.heads.some((oneOfHeads) => str.startsWith(oneOfHeads, i))) ||
+                    (typeof valObj.heads === "string" && str.startsWith(valObj.heads, i))) {
                     wordCount += 1;
-                  }
+                    doNothingUntil = opts.ignore[y].tails;
+                    return true;
                 }
-                return true;
-              }
             });
-          });
         }
-      }
-    }
-    if (str[i] && `\r\n`.includes(str[i])) {
-      wordCount = 0;
-      charCount = 0;
+        if (!doNothingUntil && bumpWordCountAt && bumpWordCountAt === i) {
+            wordCount += 1;
+            bumpWordCountAt = undefined;
+        }
+        if (typeof opts.reportProgressFunc === "function") {
+            currentPercentageDone =
+                opts.reportProgressFuncFrom + Math.floor((i / len) * (ceil || 1));
+            if (currentPercentageDone !== lastPercentage) {
+                lastPercentage = currentPercentageDone;
+                opts.reportProgressFunc(currentPercentageDone);
+            }
+        }
+        if (!doNothingUntil &&
+            i &&
+            str[i] &&
+            str[i].trim() &&
+            (!str[i - 1] || (str[i - 1] && !str[i - 1].trim()))) {
+            lastWhitespaceEndedAt = i;
+        }
+        if (!doNothingUntil && str[i] && str[i].trim()) {
+            charCount += 1;
+        }
+        if (!doNothingUntil &&
+            opts.hyphens &&
+            (`-${rawMdash}${rawNdash}`.includes(str[i]) ||
+                str.startsWith(encodedNdashHtml, i) ||
+                str.startsWith(encodedNdashCss, i) ||
+                str.startsWith(encodedNdashJs, i) ||
+                str.startsWith(encodedMdashHtml, i) ||
+                str.startsWith(encodedMdashCss, i) ||
+                str.startsWith(encodedMdashJs, i)) &&
+            str[i + 1] &&
+            (!str[i + 1].trim() || str[i] === "&")) {
+            if (str[i - 1] && !str[i - 1].trim() && str[left(str, i)]) {
+                push(left(str, i) + 1, i);
+                whatWasDone.removeWidows = true;
+            }
+        }
+        if (!doNothingUntil &&
+            (str.startsWith("&nbsp;", i) || str.startsWith("&#160;", i))) {
+            lastEncodedNbspStartedAt = i;
+            lastEncodedNbspEndedAt = i + 6;
+            if (str[i + 6] && str[i + 6].trim()) {
+                bumpWordCountAt = i + 6;
+            }
+            if (!opts.convertEntities) {
+                rangesArr.push(i, i + 6, rawnbsp);
+                whatWasDone.convertEntities = true;
+            }
+            else if (opts.targetLanguage === "css" ||
+                opts.targetLanguage === "js") {
+                rangesArr.push(i, i + 6, opts.targetLanguage === "css" ? encodedNbspCss : encodedNbspJs);
+                whatWasDone.convertEntities = true;
+            }
+        }
+        if (!doNothingUntil &&
+            str[i + 4] &&
+            str[i] === "\\" &&
+            str[i + 1] === "0" &&
+            str[i + 2] === "0" &&
+            str[i + 3].toUpperCase() === "A" &&
+            str[i + 4] === "0") {
+            lastEncodedNbspStartedAt = i;
+            lastEncodedNbspEndedAt = i + 5;
+            if (str[i + 5] && str[i + 5].trim()) {
+                bumpWordCountAt = i + 5;
+            }
+            if (!opts.convertEntities) {
+                rangesArr.push(i, i + 5, rawnbsp);
+                whatWasDone.convertEntities = true;
+            }
+            else if (opts.targetLanguage === "html" ||
+                opts.targetLanguage === "js") {
+                rangesArr.push(i, i + 5, opts.targetLanguage === "html" ? encodedNbspHtml : encodedNbspJs);
+                whatWasDone.convertEntities = true;
+            }
+        }
+        if (!doNothingUntil &&
+            str[i] === "\\" &&
+            str[i + 1] &&
+            str[i + 1].toLowerCase() === "u" &&
+            str[i + 2] === "0" &&
+            str[i + 3] === "0" &&
+            str[i + 4] &&
+            str[i + 4].toUpperCase() === "A" &&
+            str[i + 5] === "0") {
+            lastEncodedNbspStartedAt = i;
+            lastEncodedNbspEndedAt = i + 6;
+            if (str[i + 6] && str[i + 6].trim()) {
+                bumpWordCountAt = i + 6;
+            }
+            if (!opts.convertEntities) {
+                rangesArr.push(i, i + 6, rawnbsp);
+            }
+            else if (opts.targetLanguage === "html" ||
+                opts.targetLanguage === "css") {
+                rangesArr.push(i, i + 6, opts.targetLanguage === "html" ? encodedNbspHtml : encodedNbspCss);
+            }
+        }
+        if (!doNothingUntil && str[i] === rawnbsp) {
+            lastEncodedNbspStartedAt = i;
+            lastEncodedNbspEndedAt = i + 1;
+            if (opts.convertEntities) {
+                rangesArr.push(i, i + 1, opts.targetLanguage === "css"
+                    ? encodedNbspCss
+                    : opts.targetLanguage === "js"
+                        ? encodedNbspJs
+                        : encodedNbspHtml);
+            }
+        }
+        if (!doNothingUntil &&
+            str[i] &&
+            str[i].trim() &&
+            (!str[i - 1] || !str[i - 1].trim())) {
+            wordCount += 1;
+        }
+        if (!doNothingUntil &&
+            (!str[i] ||
+                `\r\n`.includes(str[i]) ||
+                ((str[i] === "\n" ||
+                    str[i] === "\r" ||
+                    (str[i] === "\r" && str[i + 1] === "\n")) &&
+                    left(str, i) &&
+                    punctuationCharsToConsiderWidowIssue.includes(str[left(str, i)])))) {
+            if ((!opts.minWordCount || wordCount >= opts.minWordCount) &&
+                (!opts.minCharCount || charCount >= opts.minCharCount)) {
+                let finalStart;
+                let finalEnd;
+                if (lastWhitespaceStartedAt !== undefined &&
+                    lastWhitespaceEndedAt !== undefined &&
+                    lastEncodedNbspStartedAt !== undefined &&
+                    lastEncodedNbspEndedAt !== undefined) {
+                    if (lastWhitespaceStartedAt > lastEncodedNbspStartedAt) {
+                        finalStart = lastWhitespaceStartedAt;
+                        finalEnd = lastWhitespaceEndedAt;
+                    }
+                    else {
+                        finalStart = lastEncodedNbspStartedAt;
+                        finalEnd = lastEncodedNbspEndedAt;
+                    }
+                }
+                else if (lastWhitespaceStartedAt !== undefined &&
+                    lastWhitespaceEndedAt !== undefined) {
+                    finalStart = lastWhitespaceStartedAt;
+                    finalEnd = lastWhitespaceEndedAt;
+                }
+                else if (lastEncodedNbspStartedAt !== undefined &&
+                    lastEncodedNbspEndedAt !== undefined) {
+                    finalStart = lastEncodedNbspStartedAt;
+                    finalEnd = lastEncodedNbspEndedAt;
+                }
+                if (!(finalStart && finalEnd) &&
+                    secondToLastWhitespaceStartedAt &&
+                    secondToLastWhitespaceEndedAt) {
+                    finalStart = secondToLastWhitespaceStartedAt;
+                    finalEnd = secondToLastWhitespaceEndedAt;
+                }
+                if (finalStart && finalEnd) {
+                    push(finalStart, finalEnd);
+                    whatWasDone.removeWidows = true;
+                }
+            }
+            resetAll();
+        }
+        if (opts.UKPostcodes &&
+            str[i] &&
+            !str[i].trim() &&
+            str[i - 1] &&
+            str[i - 1].trim() &&
+            postcodeRegexFront.test(str.slice(0, i)) &&
+            str[right(str, i)] &&
+            postcodeRegexEnd.test(str.slice(right(str, i)))) {
+            push(i, right(str, i));
+            whatWasDone.removeWidows = true;
+        }
+        if (!doNothingUntil &&
+            str[i] &&
+            !str[i].trim() &&
+            str[i - 1] &&
+            str[i - 1].trim() &&
+            (lastWhitespaceStartedAt === undefined ||
+                (str[lastWhitespaceStartedAt - 1] &&
+                    str[lastWhitespaceStartedAt - 1].trim())) &&
+            !"/>".includes(str[right(str, i)]) &&
+            !str.slice(0, i).trim().endsWith("br") &&
+            !str.slice(0, i).trim().endsWith("hr") &&
+            !(str.slice(0, i).endsWith("<") &&
+                knownHTMLTags.some((tag) => str.startsWith(tag, right(str, i))))) {
+            secondToLastWhitespaceStartedAt = lastWhitespaceStartedAt;
+            secondToLastWhitespaceEndedAt = lastWhitespaceEndedAt;
+            lastWhitespaceStartedAt = i;
+            lastWhitespaceEndedAt = undefined;
+            if (lastEncodedNbspStartedAt !== undefined ||
+                lastEncodedNbspEndedAt !== undefined) {
+                lastEncodedNbspStartedAt = undefined;
+                lastEncodedNbspEndedAt = undefined;
+            }
+        }
+        let tempTailFinding;
+        if (doNothingUntil) {
+            if (typeof doNothingUntil === "string" &&
+                (!doNothingUntil.length || str.startsWith(doNothingUntil, i))) {
+                doNothingUntil = undefined;
+            }
+            else if (isArr(doNothingUntil) &&
+                (!doNothingUntil.length ||
+                    doNothingUntil.some((val) => {
+                        if (str.startsWith(val, i)) {
+                            tempTailFinding = val;
+                            return true;
+                        }
+                    }))) {
+                doNothingUntil = undefined;
+                i += tempTailFinding.length;
+                if (isArr(opts.ignore) && opts.ignore.length && str[i + 1]) {
+                    opts.ignore.some((oneOfHeadsTailsObjs) => {
+                        return matchRightIncl(str, i, oneOfHeadsTailsObjs.tails, {
+                            trimBeforeMatching: true,
+                            cb: (_char, _theRemainderOfTheString, index) => {
+                                if (index) {
+                                    i = index - 1;
+                                    if (str[i + 1] && str[i + 1].trim()) {
+                                        wordCount += 1;
+                                    }
+                                }
+                                return true;
+                            },
+                        });
+                    });
+                }
+            }
+        }
+        if (str[i] && `\r\n`.includes(str[i])) {
+            wordCount = 0;
+            charCount = 0;
+        }
+        if (isArr(opts.tagRanges) &&
+            opts.tagRanges.length &&
+            opts.tagRanges.some((rangeArr) => {
+                if (i >= rangeArr[0] && i <= rangeArr[1] && rangeArr[1] - 1 > i) {
+                    i = rangeArr[1] - 1;
+                    return true;
+                }
+            })) ;
     }
-    if (isArr(opts.tagRanges) && opts.tagRanges.length && opts.tagRanges.some(rangeArr => {
-      if (i >= rangeArr[0] && i <= rangeArr[1] && rangeArr[1] - 1 > i) {
-        i = rangeArr[1] - 1;
-        return true;
-      }
-    })) ;
-  }
-  rApply(str, rangesArr.current()).split("").forEach((key, i) => {
-  });
-  return {
-    res: rApply(str, rangesArr.current(), opts.reportProgressFunc ? incomingPerc => {
-      currentPercentageDone = Math.floor((opts.reportProgressFuncTo - opts.reportProgressFuncFrom) * (1 - leavePercForLastStage) + incomingPerc / 100 * (opts.reportProgressFuncTo - opts.reportProgressFuncFrom) * leavePercForLastStage);
-      if (currentPercentageDone !== lastPercentage) {
-        lastPercentage = currentPercentageDone;
-        opts.reportProgressFunc(currentPercentageDone);
-      }
-    } : undefined),
-    ranges: rangesArr.current(),
-    log: {
-      timeTakenInMilliseconds: Date.now() - start
-    },
-    whatWasDone
-  };
+    rApply(str, rangesArr.current())
+        .split("")
+        .forEach((key, i) => {
+    });
+    return {
+        res: rApply(str, rangesArr.current(), opts.reportProgressFunc
+            ? (incomingPerc) => {
+                currentPercentageDone = Math.floor((opts.reportProgressFuncTo - opts.reportProgressFuncFrom) *
+                    (1 - leavePercForLastStage) +
+                    (incomingPerc / 100) *
+                        (opts.reportProgressFuncTo - opts.reportProgressFuncFrom) *
+                        leavePercForLastStage);
+                if (currentPercentageDone !== lastPercentage) {
+                    lastPercentage = currentPercentageDone;
+                    opts.reportProgressFunc(currentPercentageDone);
+                }
+            }
+            : undefined),
+        ranges: rangesArr.current(),
+        log: {
+            timeTakenInMilliseconds: Date.now() - start,
+        },
+        whatWasDone,
+    };
 }
 
 export { defaults, removeWidows, version };

package/dist/string-remove-widows.umd.js

@@ -1,7 +1,7 @@
 /**
  * @name string-remove-widows
  * @fileoverview Helps to prevent widow words in a text
- * @version 3.0.5
+ * @version 3.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-remove-widows/}
@@ -11,7 +11,7 @@
 /**
  * @name arrayiffy-if-string
  * @fileoverview Put non-empty strings into arrays, turn empty-ones into empty arrays. Bypass everything else.
- * @version 4.0.5
+ * @version 4.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/arrayiffy-if-string/}
@@ -19,7 +19,7 @@
 /**
  * @name string-match-left-right
  * @fileoverview Match substrings on the left or right of a given index, ignoring whitespace
- * @version 8.0.5
+ * @version 8.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-match-left-right/}
@@ -28,7 +28,7 @@ function e(t){return t&&"object"==typeof t&&!Array.isArray(t)}function r(t){retu
 /**
  * @name string-left-right
  * @fileoverview Looks up the first non-whitespace character to the left/right of a given index
- * @version 5.0.5
+ * @version 5.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-left-right/}
@@ -37,7 +37,7 @@ const l=" ";function c(t,e=0){return function({str:t,idx:e=0,stopAtNewlines:r=!
 /**
  * @name string-collapse-leading-whitespace
  * @fileoverview Collapse the leading and trailing whitespace of a string
- * @version 6.0.5
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/string-collapse-leading-whitespace/}
@@ -45,7 +45,7 @@ const l=" ";function c(t,e=0){return function({str:t,idx:e=0,stopAtNewlines:r=!
 /**
  * @name ranges-push
  * @fileoverview Gather string index ranges
- * @version 6.0.5
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-push/}
@@ -53,7 +53,7 @@ const l=" ";function c(t,e=0){return function({str:t,idx:e=0,stopAtNewlines:r=!
 /**
  * @name ranges-sort
  * @fileoverview Sort string index ranges
- * @version 5.0.5
+ * @version 5.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-sort/}
@@ -61,7 +61,7 @@ const l=" ";function c(t,e=0){return function({str:t,idx:e=0,stopAtNewlines:r=!
 /**
  * @name ranges-merge
  * @fileoverview Merge and sort string index ranges
- * @version 8.0.5
+ * @version 8.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-merge/}
@@ -69,8 +69,8 @@ const l=" ";function c(t,e=0){return function({str:t,idx:e=0,stopAtNewlines:r=!
 /**
  * @name ranges-apply
  * @fileoverview Take an array of string index ranges, delete/replace the string according to them
- * @version 6.0.5
+ * @version 6.0.6
  * @author Roy Revelt, Codsen Ltd
  * @license MIT
  * {@link https://codsen.com/os/ranges-apply/}
- */function j(t,e,r){let n,o=0,i=0;if(0===arguments.length)throw new Error("ranges-apply: [THROW_ID_01] inputs missing!");if("string"!=typeof t)throw new TypeError(`ranges-apply: [THROW_ID_02] first input argument must be a string! Currently it's: ${typeof t}, equal to: ${JSON.stringify(t,null,4)}`);if(e&&!Array.isArray(e))throw new TypeError(`ranges-apply: [THROW_ID_03] second input argument must be an array (or null)! Currently it's: ${typeof e}, equal to: ${JSON.stringify(e,null,4)}`);if(r&&"function"!=typeof r)throw new TypeError(`ranges-apply: [THROW_ID_04] the third input argument must be a function (or falsey)! Currently it's: ${typeof r}, equal to: ${JSON.stringify(r,null,4)}`);if(!e||!e.filter((t=>t)).length)return t;n=Array.isArray(e)&&Number.isInteger(e[0])&&Number.isInteger(e[1])?[Array.from(e)]:Array.from(e);const s=n.length;let a=0;n.filter((t=>t)).forEach(((t,e)=>{if(r&&(o=Math.floor(a/s*10),o!==i&&(i=o,r(o))),!Array.isArray(t))throw new TypeError(`ranges-apply: [THROW_ID_05] ranges array, second input arg., has ${e}th element not an array: ${JSON.stringify(t,null,4)}, which is ${typeof t}`);if(!Number.isInteger(t[0])){if(!Number.isInteger(+t[0])||+t[0]<0)throw new TypeError(`ranges-apply: [THROW_ID_06] ranges array, second input arg. has ${e}th element, array ${JSON.stringify(t,null,0)}. Its first element is not an integer, string index, but ${typeof t[0]}, equal to: ${JSON.stringify(t[0],null,4)}.`);n[e][0]=+n[e][0]}if(!Number.isInteger(t[1])){if(!Number.isInteger(+t[1])||+t[1]<0)throw new TypeError(`ranges-apply: [THROW_ID_07] ranges array, second input arg. has ${e}th element, array ${JSON.stringify(t,null,0)}. Its second element is not an integer, string index, but ${typeof t[1]}, equal to: ${JSON.stringify(t[1],null,4)}.`);n[e][1]=+n[e][1]}a+=1}));const u=A(n,{progressFn:t=>{r&&(o=10+Math.floor(t/10),o!==i&&(i=o,r(o)))}}),l=Array.isArray(u)?u.length:0;if(l>0){const e=t.slice(u[l-1][1]);t=u.reduce(((e,n,s,a)=>{r&&(o=20+Math.floor(s/l*80),o!==i&&(i=o,r(o)));return e+t.slice(0===s?0:a[s-1][1],a[s][0])+(a[s][2]||"")}),""),t+=e}return t}const $=" ",E="&nbsp;",I="\\00A0",M="\\u00A0",R=[{heads:"{{",tails:"}}"},{heads:["{% if","{%- if"],tails:["{% endif","{%- endif"]},{heads:["{% for","{%- for"],tails:["{% endfor","{%- endfor"]},{heads:["{%","{%-"],tails:["%}","-%}"]},{heads:"{#",tails:"#}"}],W=[{heads:"{{",tails:"}}"}],F=[{heads:["<%","<%=","<%-"],tails:["%>","=%>","-%>"]}],C=["abbr","address","area","article","aside","audio","base","bdi","bdo","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","doctype","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","math","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","param","picture","pre","progress","rb","rp","rt","rtc","ruby","samp","script","section","select","slot","small","source","span","strong","style","sub","summary","sup","svg","table","tbody","td","template","textarea","tfoot","th","thead","time","title","tr","track","ul","var","video","wbr","xml"],N={removeWidowPreventionMeasures:!1,convertEntities:!0,targetLanguage:"html",UKPostcodes:!1,hyphens:!0,minWordCount:4,minCharCount:5,ignore:[],reportProgressFunc:null,reportProgressFuncFrom:0,reportProgressFuncTo:100,tagRanges:[]};t.defaults=N,t.removeWidows=function(t,e){const r=Date.now();if("string"!=typeof t)throw void 0===t?new Error("string-remove-widows: [THROW_ID_01] the first input argument is completely missing! It should be given as string."):new Error(`string-remove-widows: [THROW_ID_02] the first input argument must be string! It was given as "${typeof t}", equal to:\n${JSON.stringify(t,null,4)}`);if(e&&"object"!=typeof e)throw new Error(`string-remove-widows: [THROW_ID_03] the second input argument, options object, should be a plain object but it was given as type ${typeof e}, equal to ${JSON.stringify(e,null,4)}`);const n=Array.isArray,o=t.length,i=new v({mergeType:2}),a=["."],u=/[A-Z]{1,2}[0-9][0-9A-Z]?$/,l=/^[0-9][A-Z]{2}/,f=.06;let h,p,y,m,d,b,w,_,T,O=0,A=0,S=0;const L={...N,...e},x={removeWidows:!1,convertEntities:!1};if(!L.ignore||!n(L.ignore)&&"string"!=typeof L.ignore)L.ignore=[];else if("string"==typeof L.ignore&&(L.ignore=[L.ignore]),L.ignore.includes("all"))L.ignore=L.ignore.concat(R.concat(F));else if(L.ignore.some((t=>"string"==typeof t))){let t=[];L.ignore=L.ignore.filter((e=>"string"==typeof e&&e.length?(["nunjucks","jinja","liquid"].includes(e.trim().toLowerCase())?t=t.concat(R):["hugo"].includes(e.trim().toLowerCase())?t=t.concat(W):["hexo"].includes(e.trim().toLowerCase())&&(t=t.concat(F)),!1):"object"==typeof e||void 0)),t.length&&(L.ignore=L.ignore.concat(t))}let D;function B(e,r){let n=$;L.removeWidowPreventionMeasures?n=" ":L.convertEntities&&(n=E,"string"==typeof L.targetLanguage&&("css"===L.targetLanguage.trim().toLowerCase()?n=I:"js"===L.targetLanguage.trim().toLowerCase()&&(n=M))),t.slice(e,r)!==n&&i.push(e,r,n)}function H(){A=0,S=0,p=void 0,y=void 0,m=void 0,d=void 0,b=void 0,w=void 0}L.reportProgressFunc&&(D=Math.floor(L.reportProgressFuncTo-(L.reportProgressFuncTo-L.reportProgressFuncFrom)*f-L.reportProgressFuncFrom)),H();for(let e=0;e<=o;e++){if(!_&&n(L.ignore)&&L.ignore.length&&L.ignore.some(((r,o)=>{if(n(r.heads)&&r.heads.some((r=>t.startsWith(r,e)))||"string"==typeof r.heads&&t.startsWith(r.heads,e))return A+=1,_=L.ignore[o].tails,!0})),!_&&T&&T===e&&(A+=1,T=void 0),"function"==typeof L.reportProgressFunc&&(h=L.reportProgressFuncFrom+Math.floor(e/o*(D||1)),h!==O&&(O=h,L.reportProgressFunc(h))),!_&&e&&t[e]&&t[e].trim()&&(!t[e-1]||t[e-1]&&!t[e-1].trim())&&(d=e),!_&&t[e]&&t[e].trim()&&(S+=1),_||!L.hyphens||!("-—–".includes(t[e])||t.startsWith("&ndash;",e)||t.startsWith("\\2013",e)||t.startsWith("\\u2013",e)||t.startsWith("&mdash;",e)||t.startsWith("\\2014",e)||t.startsWith("\\u2014",e))||!t[e+1]||t[e+1].trim()&&"&"!==t[e]||t[e-1]&&!t[e-1].trim()&&t[g(t,e)]&&(B(g(t,e)+1,e),x.removeWidows=!0),_||!t.startsWith("&nbsp;",e)&&!t.startsWith("&#160;",e)||(b=e,w=e+6,t[e+6]&&t[e+6].trim()&&(T=e+6),L.convertEntities?"css"!==L.targetLanguage&&"js"!==L.targetLanguage||(i.push(e,e+6,"css"===L.targetLanguage?I:M),x.convertEntities=!0):(i.push(e,e+6,$),x.convertEntities=!0)),!_&&t[e+4]&&"\\"===t[e]&&"0"===t[e+1]&&"0"===t[e+2]&&"A"===t[e+3].toUpperCase()&&"0"===t[e+4]&&(b=e,w=e+5,t[e+5]&&t[e+5].trim()&&(T=e+5),L.convertEntities?"html"!==L.targetLanguage&&"js"!==L.targetLanguage||(i.push(e,e+5,"html"===L.targetLanguage?E:M),x.convertEntities=!0):(i.push(e,e+5,$),x.convertEntities=!0)),!_&&"\\"===t[e]&&t[e+1]&&"u"===t[e+1].toLowerCase()&&"0"===t[e+2]&&"0"===t[e+3]&&t[e+4]&&"A"===t[e+4].toUpperCase()&&"0"===t[e+5]&&(b=e,w=e+6,t[e+6]&&t[e+6].trim()&&(T=e+6),L.convertEntities?"html"!==L.targetLanguage&&"css"!==L.targetLanguage||i.push(e,e+6,"html"===L.targetLanguage?E:I):i.push(e,e+6,$)),_||t[e]!==$||(b=e,w=e+1,L.convertEntities&&i.push(e,e+1,"css"===L.targetLanguage?I:"js"===L.targetLanguage?M:E)),_||!t[e]||!t[e].trim()||t[e-1]&&t[e-1].trim()||(A+=1),!_&&(!t[e]||"\r\n".includes(t[e])||("\n"===t[e]||"\r"===t[e]||"\r"===t[e]&&"\n"===t[e+1])&&g(t,e)&&a.includes(t[g(t,e)]))){if((!L.minWordCount||A>=L.minWordCount)&&(!L.minCharCount||S>=L.minCharCount)){let t,e;void 0!==m&&void 0!==d&&void 0!==b&&void 0!==w?m>b?(t=m,e=d):(t=b,e=w):void 0!==m&&void 0!==d?(t=m,e=d):void 0!==b&&void 0!==w&&(t=b,e=w),t&&e||!p||!y||(t=p,e=y),t&&e&&(B(t,e),x.removeWidows=!0)}H()}let r;L.UKPostcodes&&t[e]&&!t[e].trim()&&t[e-1]&&t[e-1].trim()&&u.test(t.slice(0,e))&&t[c(t,e)]&&l.test(t.slice(c(t,e)))&&(B(e,c(t,e)),x.removeWidows=!0),_||!t[e]||t[e].trim()||!t[e-1]||!t[e-1].trim()||!(void 0===m||t[m-1]&&t[m-1].trim())||"/>".includes(t[c(t,e)])||t.slice(0,e).trim().endsWith("br")||t.slice(0,e).trim().endsWith("hr")||t.slice(0,e).endsWith("<")&&C.some((r=>t.startsWith(r,c(t,e))))||(p=m,y=d,m=e,d=void 0,void 0===b&&void 0===w||(b=void 0,w=void 0)),_&&("string"!=typeof _||_.length&&!t.startsWith(_,e)?!n(_)||_.length&&!_.some((n=>{if(t.startsWith(n,e))return r=n,!0}))||(_=void 0,e+=r.length,n(L.ignore)&&L.ignore.length&&t[e+1]&&L.ignore.some((r=>s(t,e,r.tails,{trimBeforeMatching:!0,cb:(r,n,o)=>(o&&(e=o-1,t[e+1]&&t[e+1].trim()&&(A+=1)),!0)})))):_=void 0),t[e]&&"\r\n".includes(t[e])&&(A=0,S=0),n(L.tagRanges)&&L.tagRanges.length&&L.tagRanges.some((t=>{if(e>=t[0]&&e<=t[1]&&t[1]-1>e)return e=t[1]-1,!0}))}return j(t,i.current()).split("").forEach(((t,e)=>{})),{res:j(t,i.current(),L.reportProgressFunc?t=>{h=Math.floor(.94*(L.reportProgressFuncTo-L.reportProgressFuncFrom)+t/100*(L.reportProgressFuncTo-L.reportProgressFuncFrom)*f),h!==O&&(O=h,L.reportProgressFunc(h))}:void 0),ranges:i.current(),log:{timeTakenInMilliseconds:Date.now()-r},whatWasDone:x}},t.version="3.0.5",Object.defineProperty(t,"__esModule",{value:!0})}));
+ */function j(t,e,r){let n,o=0,i=0;if(0===arguments.length)throw new Error("ranges-apply: [THROW_ID_01] inputs missing!");if("string"!=typeof t)throw new TypeError(`ranges-apply: [THROW_ID_02] first input argument must be a string! Currently it's: ${typeof t}, equal to: ${JSON.stringify(t,null,4)}`);if(e&&!Array.isArray(e))throw new TypeError(`ranges-apply: [THROW_ID_03] second input argument must be an array (or null)! Currently it's: ${typeof e}, equal to: ${JSON.stringify(e,null,4)}`);if(r&&"function"!=typeof r)throw new TypeError(`ranges-apply: [THROW_ID_04] the third input argument must be a function (or falsey)! Currently it's: ${typeof r}, equal to: ${JSON.stringify(r,null,4)}`);if(!e||!e.filter((t=>t)).length)return t;n=Array.isArray(e)&&Number.isInteger(e[0])&&Number.isInteger(e[1])?[Array.from(e)]:Array.from(e);const s=n.length;let a=0;n.filter((t=>t)).forEach(((t,e)=>{if(r&&(o=Math.floor(a/s*10),o!==i&&(i=o,r(o))),!Array.isArray(t))throw new TypeError(`ranges-apply: [THROW_ID_05] ranges array, second input arg., has ${e}th element not an array: ${JSON.stringify(t,null,4)}, which is ${typeof t}`);if(!Number.isInteger(t[0])){if(!Number.isInteger(+t[0])||+t[0]<0)throw new TypeError(`ranges-apply: [THROW_ID_06] ranges array, second input arg. has ${e}th element, array ${JSON.stringify(t,null,0)}. Its first element is not an integer, string index, but ${typeof t[0]}, equal to: ${JSON.stringify(t[0],null,4)}.`);n[e][0]=+n[e][0]}if(!Number.isInteger(t[1])){if(!Number.isInteger(+t[1])||+t[1]<0)throw new TypeError(`ranges-apply: [THROW_ID_07] ranges array, second input arg. has ${e}th element, array ${JSON.stringify(t,null,0)}. Its second element is not an integer, string index, but ${typeof t[1]}, equal to: ${JSON.stringify(t[1],null,4)}.`);n[e][1]=+n[e][1]}a+=1}));const u=A(n,{progressFn:t=>{r&&(o=10+Math.floor(t/10),o!==i&&(i=o,r(o)))}}),l=Array.isArray(u)?u.length:0;if(l>0){const e=t.slice(u[l-1][1]);t=u.reduce(((e,n,s,a)=>{r&&(o=20+Math.floor(s/l*80),o!==i&&(i=o,r(o)));return e+t.slice(0===s?0:a[s-1][1],a[s][0])+(a[s][2]||"")}),""),t+=e}return t}const $=" ",E="&nbsp;",I="\\00A0",M="\\u00A0",R=[{heads:"{{",tails:"}}"},{heads:["{% if","{%- if"],tails:["{% endif","{%- endif"]},{heads:["{% for","{%- for"],tails:["{% endfor","{%- endfor"]},{heads:["{%","{%-"],tails:["%}","-%}"]},{heads:"{#",tails:"#}"}],W=[{heads:"{{",tails:"}}"}],F=[{heads:["<%","<%=","<%-"],tails:["%>","=%>","-%>"]}],C=["abbr","address","area","article","aside","audio","base","bdi","bdo","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","doctype","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","math","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","param","picture","pre","progress","rb","rp","rt","rtc","ruby","samp","script","section","select","slot","small","source","span","strong","style","sub","summary","sup","svg","table","tbody","td","template","textarea","tfoot","th","thead","time","title","tr","track","ul","var","video","wbr","xml"],N={removeWidowPreventionMeasures:!1,convertEntities:!0,targetLanguage:"html",UKPostcodes:!1,hyphens:!0,minWordCount:4,minCharCount:5,ignore:[],reportProgressFunc:null,reportProgressFuncFrom:0,reportProgressFuncTo:100,tagRanges:[]};t.defaults=N,t.removeWidows=function(t,e){const r=Date.now();if("string"!=typeof t)throw void 0===t?new Error("string-remove-widows: [THROW_ID_01] the first input argument is completely missing! It should be given as string."):new Error(`string-remove-widows: [THROW_ID_02] the first input argument must be string! It was given as "${typeof t}", equal to:\n${JSON.stringify(t,null,4)}`);if(e&&"object"!=typeof e)throw new Error(`string-remove-widows: [THROW_ID_03] the second input argument, options object, should be a plain object but it was given as type ${typeof e}, equal to ${JSON.stringify(e,null,4)}`);const n=Array.isArray,o=t.length,i=new v({mergeType:2}),a=["."],u=/[A-Z]{1,2}[0-9][0-9A-Z]?$/,l=/^[0-9][A-Z]{2}/,f=.06;let h,p,y,m,d,b,w,_,T,O=0,A=0,S=0;const L={...N,...e},x={removeWidows:!1,convertEntities:!1};if(!L.ignore||!n(L.ignore)&&"string"!=typeof L.ignore)L.ignore=[];else if("string"==typeof L.ignore&&(L.ignore=[L.ignore]),L.ignore.includes("all"))L.ignore=L.ignore.concat(R.concat(F));else if(L.ignore.some((t=>"string"==typeof t))){let t=[];L.ignore=L.ignore.filter((e=>"string"==typeof e&&e.length?(["nunjucks","jinja","liquid"].includes(e.trim().toLowerCase())?t=t.concat(R):["hugo"].includes(e.trim().toLowerCase())?t=t.concat(W):["hexo"].includes(e.trim().toLowerCase())&&(t=t.concat(F)),!1):"object"==typeof e||void 0)),t.length&&(L.ignore=L.ignore.concat(t))}let D;function B(e,r){let n=$;L.removeWidowPreventionMeasures?n=" ":L.convertEntities&&(n=E,"string"==typeof L.targetLanguage&&("css"===L.targetLanguage.trim().toLowerCase()?n=I:"js"===L.targetLanguage.trim().toLowerCase()&&(n=M))),t.slice(e,r)!==n&&i.push(e,r,n)}function H(){A=0,S=0,p=void 0,y=void 0,m=void 0,d=void 0,b=void 0,w=void 0}L.reportProgressFunc&&(D=Math.floor(L.reportProgressFuncTo-(L.reportProgressFuncTo-L.reportProgressFuncFrom)*f-L.reportProgressFuncFrom)),H();for(let e=0;e<=o;e++){if(!_&&n(L.ignore)&&L.ignore.length&&L.ignore.some(((r,o)=>{if(n(r.heads)&&r.heads.some((r=>t.startsWith(r,e)))||"string"==typeof r.heads&&t.startsWith(r.heads,e))return A+=1,_=L.ignore[o].tails,!0})),!_&&T&&T===e&&(A+=1,T=void 0),"function"==typeof L.reportProgressFunc&&(h=L.reportProgressFuncFrom+Math.floor(e/o*(D||1)),h!==O&&(O=h,L.reportProgressFunc(h))),!_&&e&&t[e]&&t[e].trim()&&(!t[e-1]||t[e-1]&&!t[e-1].trim())&&(d=e),!_&&t[e]&&t[e].trim()&&(S+=1),_||!L.hyphens||!("-—–".includes(t[e])||t.startsWith("&ndash;",e)||t.startsWith("\\2013",e)||t.startsWith("\\u2013",e)||t.startsWith("&mdash;",e)||t.startsWith("\\2014",e)||t.startsWith("\\u2014",e))||!t[e+1]||t[e+1].trim()&&"&"!==t[e]||t[e-1]&&!t[e-1].trim()&&t[g(t,e)]&&(B(g(t,e)+1,e),x.removeWidows=!0),_||!t.startsWith("&nbsp;",e)&&!t.startsWith("&#160;",e)||(b=e,w=e+6,t[e+6]&&t[e+6].trim()&&(T=e+6),L.convertEntities?"css"!==L.targetLanguage&&"js"!==L.targetLanguage||(i.push(e,e+6,"css"===L.targetLanguage?I:M),x.convertEntities=!0):(i.push(e,e+6,$),x.convertEntities=!0)),!_&&t[e+4]&&"\\"===t[e]&&"0"===t[e+1]&&"0"===t[e+2]&&"A"===t[e+3].toUpperCase()&&"0"===t[e+4]&&(b=e,w=e+5,t[e+5]&&t[e+5].trim()&&(T=e+5),L.convertEntities?"html"!==L.targetLanguage&&"js"!==L.targetLanguage||(i.push(e,e+5,"html"===L.targetLanguage?E:M),x.convertEntities=!0):(i.push(e,e+5,$),x.convertEntities=!0)),!_&&"\\"===t[e]&&t[e+1]&&"u"===t[e+1].toLowerCase()&&"0"===t[e+2]&&"0"===t[e+3]&&t[e+4]&&"A"===t[e+4].toUpperCase()&&"0"===t[e+5]&&(b=e,w=e+6,t[e+6]&&t[e+6].trim()&&(T=e+6),L.convertEntities?"html"!==L.targetLanguage&&"css"!==L.targetLanguage||i.push(e,e+6,"html"===L.targetLanguage?E:I):i.push(e,e+6,$)),_||t[e]!==$||(b=e,w=e+1,L.convertEntities&&i.push(e,e+1,"css"===L.targetLanguage?I:"js"===L.targetLanguage?M:E)),_||!t[e]||!t[e].trim()||t[e-1]&&t[e-1].trim()||(A+=1),!_&&(!t[e]||"\r\n".includes(t[e])||("\n"===t[e]||"\r"===t[e]||"\r"===t[e]&&"\n"===t[e+1])&&g(t,e)&&a.includes(t[g(t,e)]))){if((!L.minWordCount||A>=L.minWordCount)&&(!L.minCharCount||S>=L.minCharCount)){let t,e;void 0!==m&&void 0!==d&&void 0!==b&&void 0!==w?m>b?(t=m,e=d):(t=b,e=w):void 0!==m&&void 0!==d?(t=m,e=d):void 0!==b&&void 0!==w&&(t=b,e=w),t&&e||!p||!y||(t=p,e=y),t&&e&&(B(t,e),x.removeWidows=!0)}H()}let r;L.UKPostcodes&&t[e]&&!t[e].trim()&&t[e-1]&&t[e-1].trim()&&u.test(t.slice(0,e))&&t[c(t,e)]&&l.test(t.slice(c(t,e)))&&(B(e,c(t,e)),x.removeWidows=!0),_||!t[e]||t[e].trim()||!t[e-1]||!t[e-1].trim()||!(void 0===m||t[m-1]&&t[m-1].trim())||"/>".includes(t[c(t,e)])||t.slice(0,e).trim().endsWith("br")||t.slice(0,e).trim().endsWith("hr")||t.slice(0,e).endsWith("<")&&C.some((r=>t.startsWith(r,c(t,e))))||(p=m,y=d,m=e,d=void 0,void 0===b&&void 0===w||(b=void 0,w=void 0)),_&&("string"!=typeof _||_.length&&!t.startsWith(_,e)?!n(_)||_.length&&!_.some((n=>{if(t.startsWith(n,e))return r=n,!0}))||(_=void 0,e+=r.length,n(L.ignore)&&L.ignore.length&&t[e+1]&&L.ignore.some((r=>s(t,e,r.tails,{trimBeforeMatching:!0,cb:(r,n,o)=>(o&&(e=o-1,t[e+1]&&t[e+1].trim()&&(A+=1)),!0)})))):_=void 0),t[e]&&"\r\n".includes(t[e])&&(A=0,S=0),n(L.tagRanges)&&L.tagRanges.length&&L.tagRanges.some((t=>{if(e>=t[0]&&e<=t[1]&&t[1]-1>e)return e=t[1]-1,!0}))}return j(t,i.current()).split("").forEach(((t,e)=>{})),{res:j(t,i.current(),L.reportProgressFunc?t=>{h=Math.floor(.94*(L.reportProgressFuncTo-L.reportProgressFuncFrom)+t/100*(L.reportProgressFuncTo-L.reportProgressFuncFrom)*f),h!==O&&(O=h,L.reportProgressFunc(h))}:void 0),ranges:i.current(),log:{timeTakenInMilliseconds:Date.now()-r},whatWasDone:x}},t.version="3.0.6",Object.defineProperty(t,"__esModule",{value:!0})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "string-remove-widows",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "Helps to prevent widow words in a text",
   "keywords": [
     "against",
@@ -39,13 +39,12 @@
   "types": "types/index.d.ts",
   "scripts": {
     "build": "rollup -c",
-    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent --output-file=testStats.md && npm run clean_cov",
-    "clean_cov": "../../scripts/leaveCoverageTotalOnly.js",
+    "build:esbuild": "node '../../scripts/esbuild.js'",
+    "build:esbuild:dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
+    "ci_test": "npm run build && npm run format && tap --no-only --reporter=silent",
     "clean_types": "../../scripts/cleanTypes.js",
     "dev": "rollup -c --dev",
     "devunittest": "npm run dev && tap --only -R 'base'",
-    "esbuild": "node '../../scripts/esbuild.js'",
-    "esbuild_dev": "cross-env MODE=dev node '../../scripts/esbuild.js'",
     "format": "npm run lect && npm run prettier && npm run lint",
     "lect": "lect",
     "lint": "../../node_modules/eslint/bin/eslint.js . --ext .js --ext .ts --fix --config \"../../.eslintrc.json\" --quiet",
@@ -54,17 +53,14 @@
     "republish": "npm publish || :",
     "tap": "tap",
     "pretest": "npm run build",
-    "test": "npm run lint && npm run unittest && npm run test:examples && npm run clean_cov && npm run format",
+    "test": "npm run test:ci && npm run perf",
+    "test:ci": "npm run unittest && npm run test:examples && npm run format",
     "test:examples": "../../scripts/test-examples.js && npm run lect && npm run prettier",
     "tsc": "tsc",
-    "unittest": "tap --no-only --output-file=testStats.md --reporter=terse && tsc -p tsconfig.json --noEmit && npm run clean_cov && npm run perf"
+    "unittest": "tap --no-only --reporter=terse && tsc -p tsconfig.json --noEmit"
   },
   "tap": {
     "check-coverage": false,
-    "coverage-report": [
-      "json-summary",
-      "text"
-    ],
     "node-arg": [
       "--no-warnings",
       "--experimental-loader",
@@ -84,11 +80,11 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.0",
-    "ranges-apply": "^6.0.5",
-    "ranges-push": "^6.0.5",
-    "string-left-right": "^5.0.5",
-    "string-match-left-right": "^8.0.5"
+    "@babel/runtime": "^7.16.3",
+    "ranges-apply": "^6.0.6",
+    "ranges-push": "^6.0.6",
+    "string-left-right": "^5.0.6",
+    "string-match-left-right": "^8.0.6"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
@@ -99,8 +95,8 @@
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
     "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
     "@babel/preset-typescript": "^7.16.0",
     "@babel/register": "^7.16.0",
     "@istanbuljs/esm-loader-hook": "^0.1.2",
@@ -110,25 +106,25 @@
     "@rollup/plugin-node-resolve": "^13.0.6",
     "@rollup/plugin-strip": "^2.1.0",
     "@rollup/plugin-typescript": "^8.3.0",
-    "@types/node": "^16.11.6",
+    "@types/node": "^16.11.9",
     "@types/tap": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.3.0",
-    "@typescript-eslint/parser": "^5.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
     "core-js": "^3.19.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.2.0",
-    "lect": "^0.18.5",
-    "rollup": "^2.59.0",
+    "eslint": "^8.3.0",
+    "lect": "^0.18.6",
+    "rollup": "^2.60.0",
     "rollup-plugin-ascii": "^0.0.3",
     "rollup-plugin-banner": "^0.2.1",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-dts": "^4.0.1",
     "rollup-plugin-terser": "^7.0.2",
-    "tap": "^15.0.10",
+    "tap": "^15.1.2",
     "tslib": "^2.3.1",
-    "typescript": "^4.4.4"
+    "typescript": "^4.5.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   }
 }