@gov-cy/govcy-frontend-renderer 1.29.0 → 1.30.0

package/README.md

@@ -121,10 +121,11 @@ const inputData =
         "description" : {"en":"Service description", "el":"Περιγραφή υπηρεσίας"},
         "url" : "https://gov.cy",
         "manifest": "/manifest.json",
-        "matomo": {
-            "url": "//wp.matomo.dits.dmrid.gov.cy/",
-            "siteId": "1234"
-        },
+        "matomo": {
+            "url": "//wp.matomo.dits.dmrid.gov.cy/",
+            "siteId": "1234",
+            "userId": "already-hashed-stable-id"
+        },
         "cdn" : {
             "dist" : "https://cdn.jsdelivr.net/gh/gov-cy/govcy-design-system@3.0.0/dist",
             "cssIntegrity" : "sha384-1zLHWOtnS0hOIz5mVEPZp0UH5gUE6eo0CQcCGA3sF2TyYhHyKOd3Ni8Iy/NjEASU",
@@ -251,10 +252,11 @@ const inputData =
         "description" : {"en":"Service description", "el":"Περιγραφή υπηρεσίας"},
         "url" : "https://gov.cy",
         "manifest": "manifest.json",
-        "matomo": {
-            "url": "//wp.matomo.dits.dmrid.gov.cy/",
-            "siteId": "1234"
-        },
+        "matomo": {
+            "url": "//wp.matomo.dits.dmrid.gov.cy/",
+            "siteId": "1234",
+            "userId": "already-hashed-stable-id"
+        },
         "cdn" : {
             "dist" : "https://cdn.jsdelivr.net/gh/gov-cy/govcy-design-system@3.0.0/dist",
             "cssIntegrity" : "sha384-1zLHWOtnS0hOIz5mVEPZp0UH5gUE6eo0CQcCGA3sF2TyYhHyKOd3Ni8Iy/NjEASU",
@@ -436,7 +438,7 @@ The `inputData` object has the following structure:
 - **site.description**: the description of the site. It is used in the `<meta name="description"`, `<meta property="og:description"` and `<meta property="twitter:description"` tags of the head.
 - **site.url**: the URL of the site. It is used in the `<meta property="og:url"` and `<meta property="twitter:url"` tags of the head.
 - **site.manifest**: the manifest of the site. It is used to add the manifest location to the page.
-- **site.matomo**: the matomo data. It is used to add the Matomo code to the page. If you don't want to use Matomo tracking, you can remove this value. Use `site.matomo.url` to define the URL of the Matomo server and `site.matomo.siteId` to define the site ID to be tracked.
+- **site.matomo**: the matomo data. It is used to add the Matomo code to the page. If you don't want to use Matomo tracking, you can remove this value. Use `site.matomo.url` to define the URL of the Matomo server and `site.matomo.siteId` to define the site ID to be tracked. Use `site.matomo.userId` only for authenticated users, when the consuming application can provide a stable unique identifier that has already been pseudonymized, for example a SHA-256/base64 or HMAC-SHA256 value based on an internal ID. Do not pass personally identifiable information such as email, full name or username. If the user is not authenticated, omit `site.matomo.userId`.
 - **site.cdn.dist**: the CDN of the site. It is used to define the URL of the CDN used for the CSS and JS files. If you need to change the version of the CDN, you can do it by changing this value (in this case you will need to change the `site.cdn.cssIntegrity` and `site.cdn.jsIntegrity` values as well)
 - **site.cdn.cssIntegrity**: the integrity of the CSS file. It is used to define the integrity of the CSS file. If you need to change the version of the CDN, you will need to change this value. https://www.srihash.org/ can help you generate the integrity value.
 - **site.cdn.jsIntegrity**: the integrity of the JS file. It is used to define the integrity of the JS file. If you need to change the version of the CDN, you will need to change this value. https://www.srihash.org/ can help you generate the integrity value.

package/dist/govcyFrontendRenderer.browser.js

@@ -8071,6 +8071,15 @@ var GovcyFrontendRendererBrowser = (function () {
 	function decodeHTML(str, mode = DecodingMode.Legacy) {
 	    return htmlDecoder(str, mode);
 	}
+	/**
+	 * Decodes an HTML string, requiring all entities to be terminated by a semicolon.
+	 *
+	 * @param str The string to decode.
+	 * @returns The decoded string.
+	 */
+	function decodeHTMLStrict(str) {
+	    return htmlDecoder(str, DecodingMode.Strict);
+	}
 
 	// Utilities
 	//
@@ -8250,6 +8259,10 @@ var GovcyFrontendRendererBrowser = (function () {
 	  return P.test(ch) || regex.test(ch)
 	}
 
+	function isPunctCharCode (code) {
+	  return isPunctChar(fromCodePoint(code))
+	}
+
 	// Markdown ASCII punctuation characters.
 	//
 	// !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, or ~
@@ -8311,6 +8324,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	  // (remove this when node v10 is no longer supported).
 	  //
 	  if ('ẞ'.toLowerCase() === 'Ṿ') {
+	    /* c8 ignore next 2 */
 	    str = str.replace(/ẞ/g, 'ß');
 	  }
 
@@ -8349,6 +8363,28 @@ var GovcyFrontendRendererBrowser = (function () {
 	  return str.toLowerCase().toUpperCase()
 	}
 
+	function isAsciiTrimmable (c) {
+	  return c === 0x20 || c === 0x09 || c === 0x0a || c === 0x0d
+	}
+
+	// "Light" .trim() for blocks (headers, paragraphs), where unicode spaces
+	// should be preserved.
+	function asciiTrim (str) {
+	  let start = 0;
+	  for (; start < str.length; start++) {
+	    if (!isAsciiTrimmable(str.charCodeAt(start))) {
+	      break
+	    }
+	  }
+	  let end = str.length - 1;
+	  for (; end >= start; end--) {
+	    if (!isAsciiTrimmable(str.charCodeAt(end))) {
+	      break
+	    }
+	  }
+	  return str.slice(start, end + 1)
+	}
+
 	// Re-export libraries commonly used in both markdown-it and its plugins,
 	// so plugins won't have to depend on them explicitly, which reduces their
 	// bundled size (e.g. a browser build).
@@ -8358,6 +8394,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	var utils$2 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
 		arrayReplaceAt: arrayReplaceAt,
+		asciiTrim: asciiTrim,
 		assign: assign$1,
 		escapeHtml: escapeHtml,
 		escapeRE: escapeRE$1,
@@ -8365,6 +8402,7 @@ var GovcyFrontendRendererBrowser = (function () {
 		has: has,
 		isMdAsciiPunct: isMdAsciiPunct,
 		isPunctChar: isPunctChar,
+		isPunctCharCode: isPunctCharCode,
 		isSpace: isSpace,
 		isString: isString$1,
 		isValidEntityCode: isValidEntityCode,
@@ -9728,14 +9766,36 @@ var GovcyFrontendRendererBrowser = (function () {
 	const QUOTE_RE = /['"]/g;
 	const APOSTROPHE = '\u2019'; /* ’ */
 
-	function replaceAt (str, index, ch) {
-	  return str.slice(0, index) + ch + str.slice(index + 1)
+	function addReplacement (replacements, tokenIdx, pos, ch) {
+	  if (!replacements[tokenIdx]) {
+	    replacements[tokenIdx] = [];
+	  }
+
+	  replacements[tokenIdx].push({ pos, ch });
+	}
+
+	function applyReplacements (str, replacements) {
+	  let result = '';
+	  let lastPos = 0;
+
+	  replacements.sort((a, b) => a.pos - b.pos);
+
+	  for (let i = 0; i < replacements.length; i++) {
+	    const replacement = replacements[i];
+
+	    result += str.slice(lastPos, replacement.pos) + replacement.ch;
+	    lastPos = replacement.pos + 1;
+	  }
+
+	  return result + str.slice(lastPos)
 	}
 
 	function process_inlines (tokens, state) {
 	  let j;
 
 	  const stack = [];
+	  // token index -> list of replacements in the original token content
+	  const replacements = {};
 
 	  for (let i = 0; i < tokens.length; i++) {
 	    const token = tokens[i];
@@ -9749,9 +9809,9 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	    if (token.type !== 'text') { continue }
 
-	    let text = token.content;
+	    const text = token.content;
 	    let pos = 0;
-	    let max = text.length;
+	    const max = text.length;
 
 	    /* eslint no-labels:0,block-scoped-var:0 */
 	    OUTER:
@@ -9799,8 +9859,8 @@ var GovcyFrontendRendererBrowser = (function () {
 	        }
 	      }
 
-	      const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-	      const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+	      const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctCharCode(lastChar);
+	      const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctCharCode(nextChar);
 
 	      const isLastWhiteSpace = isWhiteSpace(lastChar);
 	      const isNextWhiteSpace = isWhiteSpace(nextChar);
@@ -9843,7 +9903,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	      if (!canOpen && !canClose) {
 	        // middle of word
 	        if (isSingle) {
-	          token.content = replaceAt(token.content, t.index, APOSTROPHE);
+	          addReplacement(replacements, i, t.index, APOSTROPHE);
 	        }
 	        continue
 	      }
@@ -9866,18 +9926,8 @@ var GovcyFrontendRendererBrowser = (function () {
 	              closeQuote = state.md.options.quotes[1];
 	            }
 
-	            // replace token.content *before* tokens[item.token].content,
-	            // because, if they are pointing at the same token, replaceAt
-	            // could mess up indices when quote length != 1
-	            token.content = replaceAt(token.content, t.index, closeQuote);
-	            tokens[item.token].content = replaceAt(
-	              tokens[item.token].content, item.pos, openQuote);
-
-	            pos += closeQuote.length - 1;
-	            if (item.token === i) { pos += openQuote.length - 1; }
-
-	            text = token.content;
-	            max = text.length;
+	            addReplacement(replacements, i, t.index, closeQuote);
+	            addReplacement(replacements, item.token, item.pos, openQuote);
 
 	            stack.length = j;
 	            continue OUTER
@@ -9893,10 +9943,14 @@ var GovcyFrontendRendererBrowser = (function () {
 	          level: thisLevel
 	        });
 	      } else if (canClose && isSingle) {
-	        token.content = replaceAt(token.content, t.index, APOSTROPHE);
+	        addReplacement(replacements, i, t.index, APOSTROPHE);
 	      }
 	    }
 	  }
+
+	  Object.keys(replacements).forEach(function (tokenIdx) {
+	    tokens[tokenIdx].content = applyReplacements(tokens[tokenIdx].content, replacements[tokenIdx]);
+	  });
 	}
 
 	function smartquotes (state) {
@@ -11500,11 +11554,22 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	  let nextLine = startLine + 1;
 
+	  // Block types 6 and 7 (the only ones whose end condition is a blank line)
+	  // have `/^$/` as their closing regexp. For all other types (1-5, e.g.
+	  // `<!--` comments), a blank line is regular content and must not terminate
+	  // the block - it ends only when its closing sequence is found.
+	  const endsOnBlankLine = HTML_SEQUENCES[i][1].test('');
+
 	  // If we are here - we detected HTML block.
 	  // Let's roll down till block end.
 	  if (!HTML_SEQUENCES[i][1].test(lineText)) {
 	    for (; nextLine < endLine; nextLine++) {
-	      if (state.sCount[nextLine] < state.blkIndent) { break }
+	      if (state.sCount[nextLine] < state.blkIndent) {
+	        // An outdented blank line shouldn't end a block that doesn't end on a
+	        // blank line (e.g. a `<!--` comment inside a list item). Such blocks
+	        // must continue until their closing sequence regardless of indent.
+	        if (endsOnBlankLine || !state.isEmpty(nextLine)) { break }
+	      }
 
 	      pos = state.bMarks[nextLine] + state.tShift[nextLine];
 	      max = state.eMarks[nextLine];
@@ -11567,7 +11632,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	  token_o.map    = [startLine, state.line];
 
 	  const token_i    = state.push('inline', '', 0);
-	  token_i.content  = state.src.slice(pos, max).trim();
+	  token_i.content  = asciiTrim(state.src.slice(pos, max));
 	  token_i.map      = [startLine, state.line];
 	  token_i.children = [];
 
@@ -11579,6 +11644,7 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	// lheading (---, ===)
 
+
 	function lheading (state, startLine, endLine/*, silent */) {
 	  const terminatorRules = state.md.block.ruler.getRules('paragraph');
 
@@ -11636,10 +11702,11 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	  if (!level) {
 	    // Didn't find valid underline
+	    state.parentType = oldParentType;
 	    return false
 	  }
 
-	  const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+	  const content = asciiTrim(state.getLines(startLine, nextLine, state.blkIndent, false));
 
 	  state.line = nextLine + 1;
 
@@ -11662,6 +11729,7 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	// Paragraph
 
+
 	function paragraph (state, startLine, endLine) {
 	  const terminatorRules = state.md.block.ruler.getRules('paragraph');
 	  const oldParentType = state.parentType;
@@ -11688,7 +11756,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	    if (terminate) { break }
 	  }
 
-	  const content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+	  const content = asciiTrim(state.getLines(startLine, nextLine, state.blkIndent, false));
 
 	  state.line = nextLine;
 
@@ -11915,8 +11983,30 @@ var GovcyFrontendRendererBrowser = (function () {
 	  const max = this.posMax;
 	  const marker = this.src.charCodeAt(start);
 
-	  // treat beginning of the line as a whitespace
-	  const lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 0x20;
+	  // Astral characters below are combined manually, because .codePointAt()
+	  // does not guarantee numeric type output. And we don't wish JIT cache issues.
+	  // The broken surrogate pairs are evaluated as U+FFFD to prevent possible
+	  // crashes.
+
+	  let lastChar;
+	  if (start === 0) {
+	    // treat beginning of the line as a whitespace
+	    lastChar = 0x20;
+	  } else if (start === 1) {
+	    lastChar = this.src.charCodeAt(0);
+	    if ((lastChar & 0xF800) === 0xD800) { lastChar = 0xFFFD; }
+	  } else {
+	    lastChar = this.src.charCodeAt(start - 1);
+	    if ((lastChar & 0xFC00) === 0xDC00) {
+	      // low surrogate => add high one, replace broken pair with U+FFFD
+	      const highSurr = this.src.charCodeAt(start - 2);
+	      lastChar = (highSurr & 0xFC00) === 0xD800
+	        ? 0x10000 + ((highSurr - 0xD800) << 10) + (lastChar - 0xDC00)
+	        : 0xFFFD;
+	    } else if ((lastChar & 0xFC00) === 0xD800) {
+	      lastChar = 0xFFFD;
+	    }
+	  }
 
 	  let pos = start;
 	  while (pos < max && this.src.charCodeAt(pos) === marker) { pos++; }
@@ -11924,10 +12014,19 @@ var GovcyFrontendRendererBrowser = (function () {
 	  const count = pos - start;
 
 	  // treat end of the line as a whitespace
-	  const nextChar = pos < max ? this.src.charCodeAt(pos) : 0x20;
+	  let nextChar = pos < max ? this.src.charCodeAt(pos) : 0x20;
+	  if ((nextChar & 0xFC00) === 0xD800) {
+	    // high surrogate => add low one, replace broken pair with U+FFFD
+	    const lowSurr = this.src.charCodeAt(pos + 1);
+	    nextChar = (lowSurr & 0xFC00) === 0xDC00
+	      ? 0x10000 + ((nextChar - 0xD800) << 10) + (lowSurr - 0xDC00)
+	      : 0xFFFD;
+	  } else if ((nextChar & 0xFC00) === 0xDC00) {
+	    nextChar = 0xFFFD;
+	  }
 
-	  const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
-	  const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+	  const isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctCharCode(lastChar);
+	  const isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctCharCode(nextChar);
 
 	  const isLastWhiteSpace = isWhiteSpace(lastChar);
 	  const isNextWhiteSpace = isWhiteSpace(nextChar);
@@ -12954,7 +13053,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	  } else {
 	    const match = state.src.slice(pos).match(NAMED_RE);
 	    if (match) {
-	      const decoded = decodeHTML(match[0]);
+	      const decoded = decodeHTMLStrict(match[0]);
 	      if (decoded !== match[0]) {
 	        if (!silent) {
 	          const token   = state.push('text_special', '', 0);
@@ -13616,11 +13715,6 @@ var GovcyFrontendRendererBrowser = (function () {
 	// DON'T try to make PRs with changes. Extend TLDs with LinkifyIt.tlds() instead
 	const tlds_default = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
 
-	function resetScanCache (self) {
-	  self.__index__ = -1;
-	  self.__text_cache__ = '';
-	}
-
 	function createValidator (re) {
 	  return function (text, pos) {
 	    const tail = text.slice(pos);
@@ -13659,8 +13753,11 @@ var GovcyFrontendRendererBrowser = (function () {
 	  function untpl (tpl) { return tpl.replace('%TLDS%', re.src_tlds) }
 
 	  re.email_fuzzy = RegExp(untpl(re.tpl_email_fuzzy), 'i');
+	  re.email_fuzzy_global = RegExp(untpl(re.tpl_email_fuzzy), 'ig');
 	  re.link_fuzzy = RegExp(untpl(re.tpl_link_fuzzy), 'i');
+	  re.link_fuzzy_global = RegExp(untpl(re.tpl_link_fuzzy), 'ig');
 	  re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), 'i');
+	  re.link_no_ip_fuzzy_global = RegExp(untpl(re.tpl_link_no_ip_fuzzy), 'ig');
 	  re.host_fuzzy_test = RegExp(untpl(re.tpl_host_fuzzy_test), 'i');
 
 	  //
@@ -13754,12 +13851,6 @@ var GovcyFrontendRendererBrowser = (function () {
 	    '(' + self.re.schema_test.source + ')|(' + self.re.host_fuzzy_test.source + ')|@',
 	    'i'
 	  );
-
-	  //
-	  // Cleanup
-	  //
-
-	  resetScanCache(self);
 	}
 
 	/**
@@ -13767,55 +13858,45 @@ var GovcyFrontendRendererBrowser = (function () {
 	 *
 	 * Match result. Single element of array, returned by [[LinkifyIt#match]]
 	 **/
-	function Match (self, shift) {
-	  const start = self.__index__;
-	  const end = self.__last_index__;
-	  const text = self.__text_cache__.slice(start, end);
+	function Match (text, schema, index, lastIndex) {
+	  const raw = text.slice(index, lastIndex);
 
 	  /**
 	   * Match#schema -> String
 	   *
 	   * Prefix (protocol) for matched string.
 	   **/
-	  this.schema = self.__schema__.toLowerCase();
+	  this.schema = schema.toLowerCase();
 	  /**
 	   * Match#index -> Number
 	   *
 	   * First position of matched string.
 	   **/
-	  this.index = start + shift;
+	  this.index = index;
 	  /**
 	   * Match#lastIndex -> Number
 	   *
 	   * Next position after matched string.
 	   **/
-	  this.lastIndex = end + shift;
+	  this.lastIndex = lastIndex;
 	  /**
 	   * Match#raw -> String
 	   *
 	   * Matched string.
 	   **/
-	  this.raw = text;
+	  this.raw = raw;
 	  /**
 	   * Match#text -> String
 	   *
 	   * Notmalized text of matched string.
 	   **/
-	  this.text = text;
+	  this.text = raw;
 	  /**
 	   * Match#url -> String
 	   *
 	   * Normalized url of matched string.
 	   **/
-	  this.url = text;
-	}
-
-	function createMatch (self, shift) {
-	  const match = new Match(self, shift);
-
-	  self.__compiled__[match.schema].normalize(match, self);
-
-	  return match
+	  this.url = raw;
 	}
 
 	/**
@@ -13870,12 +13951,6 @@ var GovcyFrontendRendererBrowser = (function () {
 
 	  this.__opts__ = assign({}, defaultOptions$1, options);
 
-	  // Cache last tested result. Used to skip repeating steps on next `match` call.
-	  this.__index__ = -1;
-	  this.__last_index__ = -1; // Next scan position
-	  this.__schema__ = '';
-	  this.__text_cache__ = '';
-
 	  this.__schemas__ = assign({}, defaultSchemas, schemas);
 	  this.__compiled__ = {};
 
@@ -13917,69 +13992,38 @@ var GovcyFrontendRendererBrowser = (function () {
 	 * Searches linkifiable pattern and returns `true` on success or `false` on fail.
 	 **/
 	LinkifyIt.prototype.test = function test (text) {
-	  // Reset scan cache
-	  this.__text_cache__ = text;
-	  this.__index__ = -1;
-
 	  if (!text.length) { return false }
 
-	  let m, ml, me, len, shift, next, re, tld_pos, at_pos;
+	  let m, re;
 
 	  // try to scan for link with schema - that's the most simple rule
 	  if (this.re.schema_test.test(text)) {
 	    re = this.re.schema_search;
 	    re.lastIndex = 0;
 	    while ((m = re.exec(text)) !== null) {
-	      len = this.testSchemaAt(text, m[2], re.lastIndex);
-	      if (len) {
-	        this.__schema__ = m[2];
-	        this.__index__ = m.index + m[1].length;
-	        this.__last_index__ = m.index + m[0].length + len;
-	        break
-	      }
+	      if (this.testSchemaAt(text, m[2], re.lastIndex)) { return true }
 	    }
 	  }
 
 	  if (this.__opts__.fuzzyLink && this.__compiled__['http:']) {
 	    // guess schemaless links
-	    tld_pos = text.search(this.re.host_fuzzy_test);
-	    if (tld_pos >= 0) {
-	      // if tld is located after found link - no need to check fuzzy pattern
-	      if (this.__index__ < 0 || tld_pos < this.__index__) {
-	        if ((ml = text.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy)) !== null) {
-	          shift = ml.index + ml[1].length;
-
-	          if (this.__index__ < 0 || shift < this.__index__) {
-	            this.__schema__ = '';
-	            this.__index__ = shift;
-	            this.__last_index__ = ml.index + ml[0].length;
-	          }
-	        }
+	    if (text.search(this.re.host_fuzzy_test) >= 0) {
+	      if (text.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy) !== null) {
+	        return true
 	      }
 	    }
 	  }
 
 	  if (this.__opts__.fuzzyEmail && this.__compiled__['mailto:']) {
 	    // guess schemaless emails
-	    at_pos = text.indexOf('@');
-	    if (at_pos >= 0) {
+	    if (text.indexOf('@') >= 0) {
 	      // We can't skip this check, because this cases are possible:
 	      // 192.168.1.1@gmail.com, my.in@example.com
-	      if ((me = text.match(this.re.email_fuzzy)) !== null) {
-	        shift = me.index + me[1].length;
-	        next = me.index + me[0].length;
-
-	        if (this.__index__ < 0 || shift < this.__index__ ||
-	            (shift === this.__index__ && next > this.__last_index__)) {
-	          this.__schema__ = 'mailto:';
-	          this.__index__ = shift;
-	          this.__last_index__ = next;
-	        }
-	      }
+	      if (text.match(this.re.email_fuzzy) !== null) { return true }
 	    }
 	  }
 
-	  return this.__index__ >= 0
+	  return false
 	};
 
 	/**
@@ -14028,23 +14072,88 @@ var GovcyFrontendRendererBrowser = (function () {
 	 **/
 	LinkifyIt.prototype.match = function match (text) {
 	  const result = [];
-	  let shift = 0;
+	  const type_schemed = [];
+	  const type_fuzzy_link = [];
+	  const type_fuzzy_email = [];
+	  let m, len, re;
+
+	  function choose (a, b) {
+	    if (!a) { return b }
+	    if (!b) { return a }
+	    if (a.index !== b.index) { return a.index < b.index ? a : b }
+	    return a.lastIndex >= b.lastIndex ? a : b
+	  }
+
+	  if (!text.length) { return null }
+
+	  // scan for links with schema
+	  if (this.re.schema_test.test(text)) {
+	    re = this.re.schema_search;
+	    re.lastIndex = 0;
+	    while ((m = re.exec(text)) !== null) {
+	      len = this.testSchemaAt(text, m[2], re.lastIndex);
+	      if (len) {
+	        type_schemed.push({
+	          schema: m[2],
+	          index: m.index + m[1].length,
+	          lastIndex: m.index + m[0].length + len
+	        });
+	      }
+	    }
+	  }
+
+	  if (this.__opts__.fuzzyLink && this.__compiled__['http:']) {
+	    re = this.__opts__.fuzzyIP ? this.re.link_fuzzy_global : this.re.link_no_ip_fuzzy_global;
+	    re.lastIndex = 0;
+	    while ((m = re.exec(text)) !== null) {
+	      type_fuzzy_link.push({
+	        schema: '',
+	        index: m.index + m[1].length,
+	        lastIndex: m.index + m[0].length
+	      });
+	    }
+	  }
 
-	  // Try to take previous element from cache, if .test() called before
-	  if (this.__index__ >= 0 && this.__text_cache__ === text) {
-	    result.push(createMatch(this, shift));
-	    shift = this.__last_index__;
+	  if (this.__opts__.fuzzyEmail && this.__compiled__['mailto:']) {
+	    re = this.re.email_fuzzy_global;
+	    re.lastIndex = 0;
+	    while ((m = re.exec(text)) !== null) {
+	      type_fuzzy_email.push({
+	        schema: 'mailto:',
+	        index: m.index + m[1].length,
+	        lastIndex: m.index + m[0].length
+	      });
+	    }
 	  }
 
-	  // Cut head if cache was used
-	  let tail = shift ? text.slice(shift) : text;
+	  const indexes = [0, 0, 0];
+	  let lastIndex = 0;
+
+	  for (;;) {
+	    const candidates = [
+	      type_schemed[indexes[0]],
+	      type_fuzzy_email[indexes[1]],
+	      type_fuzzy_link[indexes[2]]
+	    ];
+
+	    const candidate = choose(choose(candidates[0], candidates[1]), candidates[2]);
 
-	  // Scan string until end reached
-	  while (this.test(tail)) {
-	    result.push(createMatch(this, shift));
+	    if (!candidate) { break }
 
-	    tail = tail.slice(this.__last_index__);
-	    shift += this.__last_index__;
+	    if (candidate === candidates[0]) {
+	      indexes[0]++;
+	    } else if (candidate === candidates[1]) {
+	      indexes[1]++;
+	    } else {
+	      indexes[2]++;
+	    }
+
+	    if (candidate.index < lastIndex) { continue }
+
+	    const match = new Match(text, candidate.schema, candidate.index, candidate.lastIndex);
+	    this.__compiled__[match.schema].normalize(match, this);
+	    result.push(match);
+	    lastIndex = candidate.lastIndex;
 	  }
 
 	  if (result.length) {
@@ -14061,10 +14170,6 @@ var GovcyFrontendRendererBrowser = (function () {
 	 * of the string, and null otherwise.
 	 **/
 	LinkifyIt.prototype.matchAtStart = function matchAtStart (text) {
-	  // Reset scan cache
-	  this.__text_cache__ = text;
-	  this.__index__ = -1;
-
 	  if (!text.length) return null
 
 	  const m = this.re.schema_at_start.exec(text);
@@ -14073,11 +14178,10 @@ var GovcyFrontendRendererBrowser = (function () {
 	  const len = this.testSchemaAt(text, m[2], m[0].length);
 	  if (!len) return null
 
-	  this.__schema__ = m[2];
-	  this.__index__ = m.index + m[1].length;
-	  this.__last_index__ = m.index + m[0].length + len;
+	  const match = new Match(text, m[2], m.index + m[1].length, m.index + m[0].length + len);
 
-	  return createMatch(this, 0)
+	  this.__compiled__[match.schema].normalize(match, this);
+	  return match
 	};
 
 	/** chainable
@@ -15129,7 +15233,7 @@ var GovcyFrontendRendererBrowser = (function () {
 	 * ```javascript
 	 * var md = require('markdown-it')()
 	 *             .set({ html: true, breaks: true })
-	 *             .set({ typographer, true });
+	 *             .set({ typographer: true });
 	 * ```
 	 *
 	 * __Note:__ To achieve the best possible performance, don't modify a