securemark 0.295.6 → 0.295.7

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.295.7
+
+- Refactoring.
+
 ## 0.295.6
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.295.6 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.295.7 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -8609,7 +8609,7 @@ exports.strs = strs;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.isAlphanumeric = exports.backToEmailHead = exports.backToUrlHead = exports.backToWhitespace = exports.next = exports.canSkip = exports.txt = exports.text = exports.nonWhitespace = void 0;
+exports.isAlphanumeric = exports.next = exports.canSkip = exports.txt = exports.text = exports.nonWhitespace = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const dom_1 = __webpack_require__(394);
@@ -8687,26 +8687,18 @@ function next(source, position, state, delimiter) {
   if (delimiter) {
     delimiter.lastIndex = position + 1;
     delimiter.test(source);
-    index = delimiter.lastIndex;
+    index = delimiter.lastIndex || position;
   } else {
     index = seek(source, position, state);
   }
-  if (index === 0) return source.length;
+  if (index === position || index === source.length) return source.length;
   const char = source[index];
   switch (char) {
-    case '$':
-    case '*':
-    case '+':
-    case '~':
-    case '=':
-    case '/':
-      index = backToWhitespace(source, position, index);
-      break;
     case '%':
-      index += index - 1 > position && source.startsWith(' %]', index - 1) ? -1 : 0;
+      index += !delimiter && index - 1 > position ? -1 : 0;
       break;
     case '[':
-      index += index - 1 > position && source.startsWith(' [|', index - 1) ? -1 : 0;
+      index += !delimiter && index - 1 > position && source.startsWith(' [|', index - 1) ? -1 : 0;
       break;
     case ':':
       index = source.startsWith('//', index + 1) ? backToUrlHead(source, position, index) : index;
@@ -8718,11 +8710,6 @@ function next(source, position, state, delimiter) {
   return index;
 }
 exports.next = next;
-function backToWhitespace(source, position, index) {
-  const prev = index - 1;
-  return prev > position && /\s/.test(source[prev]) ? prev : index;
-}
-exports.backToWhitespace = backToWhitespace;
 function backToUrlHead(source, position, index) {
   const delim = index;
   let state = false;
@@ -8744,7 +8731,6 @@ function backToUrlHead(source, position, index) {
   }
   return index === position || source[index] !== 'h' ? delim : index;
 }
-exports.backToUrlHead = backToUrlHead;
 function backToEmailHead(source, position, index) {
   const delim = index;
   let state = false;
@@ -8767,7 +8753,6 @@ function backToEmailHead(source, position, index) {
   }
   return index === position ? delim : index;
 }
-exports.backToEmailHead = backToEmailHead;
 function isAlphanumeric(char) {
   if (char < '0' || '\x7F' < char) return false;
   return '0' <= char && char <= '9' || 'A' <= char && char <= 'Z' || 'a' <= char && char <= 'z';
@@ -8849,7 +8834,7 @@ function seek(source, position, state) {
         if (source[i + 1] === fst && source[i + 2] === fst) return i;
         continue;
       case '%':
-        if (source[i + 1] === ']') return i;
+        if (source[i + 1] === ']' && isWhitespace(source[i - 1], true)) return i;
         continue;
       case ':':
         if (source[i + 1] === '/' && source[i + 2] === '/') return i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.295.6",
+  "version": "0.295.7",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/inline/emphasis.test.ts

@@ -11,7 +11,7 @@ describe('Unit: parser/inline/emphasis', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser, input('*', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('*a', new Context())), [['*', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser, input('*a *', new Context())), [['*', 'a', ' ', '*'], '']);
+      assert.deepStrictEqual(inspect(parser, input('*a *', new Context())), [['*', 'a ', '*'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a  *', new Context())), [['*', 'a', ' ', '*'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a\n*', new Context())), [['*', 'a', '<br>', '*'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a\\ *', new Context())), [['*', 'a', ' ', '*'], '']);

package/src/parser/inline/emstrong.test.ts

@@ -11,7 +11,7 @@ describe('Unit: parser/inline/emstrong', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser, input('***', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('***a', new Context())), [['***a'], '']);
-      assert.deepStrictEqual(inspect(parser, input('***a ***', new Context())), [['***a', ' ', '***'], '']);
+      assert.deepStrictEqual(inspect(parser, input('***a ***', new Context())), [['***a ', '***'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a  ***', new Context())), [['***a', ' ', '***'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a\n***', new Context())), [['***a', '<br>', '***'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a\\ ***', new Context())), [['***a', ' ', '***'], '']);
@@ -66,7 +66,7 @@ describe('Unit: parser/inline/emstrong', () => {
       assert.deepStrictEqual(inspect(parser, input('***a*\\ **b****', new Context())), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a*&Tab;**b****', new Context())), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a*<wbr>**b****', new Context())), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('***a*b **', new Context())), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
+      assert.deepStrictEqual(inspect(parser, input('***a*b **', new Context())), [['**', '<em>a</em>', 'b ', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a*b\\ **', new Context())), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**b*', new Context())), [['<em><strong>a</strong>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**b*c', new Context())), [['<em><strong>a</strong>b</em>'], 'c']);
@@ -77,7 +77,7 @@ describe('Unit: parser/inline/emstrong', () => {
       assert.deepStrictEqual(inspect(parser, input('***a**\\ *b**', new Context())), [['<em><strong>a</strong> <em>b</em></em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**&Tab;*b**', new Context())), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**<wbr>*b**', new Context())), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('***a**b *', new Context())), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
+      assert.deepStrictEqual(inspect(parser, input('***a**b *', new Context())), [['*', '<strong>a</strong>', 'b ', '*'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**b\\ *', new Context())), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a*', new Context())), [['**', '<em>a</em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('***a**', new Context())), [['*', '<strong>a</strong>'], '']);
@@ -109,11 +109,11 @@ describe('Unit: parser/inline/emstrong', () => {
       assert.deepStrictEqual(inspect(parser, input('******a******', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('******a******b', new Context())), [['<em><strong><em><strong>a</strong></em></strong></em>'], 'b']);
       assert.deepStrictEqual(inspect(parser, input('******a*b', new Context())), [['*****', '<em>a</em>', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser, input('******a*b *', new Context())), [['*****', '<em>a</em>', 'b', ' ', '*'], '']);
-      assert.deepStrictEqual(inspect(parser, input('******a*b **', new Context())), [['*****', '<em>a</em>', 'b', ' ', '**'], '']);
-      assert.deepStrictEqual(inspect(parser, input('******a*b ***', new Context())), [['*****', '<em>a</em>', 'b', ' ', '***'], '']);
-      assert.deepStrictEqual(inspect(parser, input('******a*b ****', new Context())), [['*****', '<em>a</em>', 'b', ' ', '****'], '']);
-      assert.deepStrictEqual(inspect(parser, input('******a*b *****', new Context())), [['*****', '<em>a</em>', 'b', ' ', '*****'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*b *', new Context())), [['*****', '<em>a</em>', 'b ', '*'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*b **', new Context())), [['*****', '<em>a</em>', 'b ', '**'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*b ***', new Context())), [['*****', '<em>a</em>', 'b ', '***'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*b ****', new Context())), [['*****', '<em>a</em>', 'b ', '****'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*b *****', new Context())), [['*****', '<em>a</em>', 'b ', '*****'], '']);
     });
 
   });

package/src/parser/inline/italic.test.ts

@@ -11,7 +11,7 @@ describe('Unit: parser/inline/italic', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser, input('///', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('///a', new Context())), [['///', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser, input('///a ///', new Context())), [['///', 'a', ' ', '///'], '']);
+      assert.deepStrictEqual(inspect(parser, input('///a ///', new Context())), [['///', 'a ', '///'], '']);
       assert.deepStrictEqual(inspect(parser, input('///a  ///', new Context())), [['///', 'a', ' ', '///'], '']);
       assert.deepStrictEqual(inspect(parser, input('///a\n///', new Context())), [['///', 'a', '<br>', '///'], '']);
       assert.deepStrictEqual(inspect(parser, input('///a\\ ///', new Context())), [['///', 'a', ' ', '///'], '']);

package/src/parser/inline/mark.test.ts

@@ -14,7 +14,7 @@ describe('Unit: parser/inline/mark', () => {
       assert.deepStrictEqual(inspect(parser, input('==', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('==a', new Context())), [['==', 'a'], '']);
       assert.deepStrictEqual(inspect(parser, input('==a=', new Context())), [['==', 'a='], '']);
-      assert.deepStrictEqual(inspect(parser, input('==a ==', new Context())), [['==', 'a', ' ', '=='], '']);
+      assert.deepStrictEqual(inspect(parser, input('==a ==', new Context())), [['==', 'a ', '=='], '']);
       assert.deepStrictEqual(inspect(parser, input('==a  ==', new Context())), [['==', 'a', ' ', '=='], '']);
       assert.deepStrictEqual(inspect(parser, input('==a\n==', new Context())), [['==', 'a', '<br>', '=='], '']);
       assert.deepStrictEqual(inspect(parser, input('==a\\ ==', new Context())), [['==', 'a', ' ', '=='], '']);

package/src/parser/inline/math.test.ts

@@ -109,6 +109,7 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser, input('$a$[A](a)', new Context())), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '[A](a)']);
       assert.deepStrictEqual(inspect(parser, input('$A$', new Context())), [['<span class="math" translate="no" data-src="$A$">$A$</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$-a$', new Context())), [['<span class="math" translate="no" data-src="$-a$">$-a$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('$\\ $', new Context())), [['<span class="math" translate="no" data-src="$\\ $">$\\ $</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$\\$$', new Context())), [['<span class="math" translate="no" data-src="$\\$$">$\\$$</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$\\Pi$', new Context())), [['<span class="math" translate="no" data-src="$\\Pi$">$\\Pi$</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$\\ 0$', new Context())), [['<span class="math" translate="no" data-src="$\\ 0$">$\\ 0$</span>'], '']);

package/src/parser/inline/remark.test.ts

@@ -30,8 +30,8 @@ describe('Unit: parser/inline/remark', () => {
       assert.deepStrictEqual(inspect(parser, input('[%% a [% b', new Context())), [['<span class="invalid">[%%</span>'], ' a [% b']);
       assert.deepStrictEqual(inspect(parser, input('[%\\ a %]', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('[% a\\ %]', new Context())), [['[%', ' a', ' ', '%', ']'], '']);
-      assert.deepStrictEqual(inspect(parser, input('[% a%]', new Context())), [['[%', ' a', '%', ']'], '']);
-      assert.deepStrictEqual(inspect(parser, input('[% a %%]', new Context())), [['[%', ' a %', '%', ']'], '']);
+      assert.deepStrictEqual(inspect(parser, input('[% a%]', new Context())), [['[%', ' a%', ']'], '']);
+      assert.deepStrictEqual(inspect(parser, input('[% a %%]', new Context())), [['[%', ' a %%', ']'], '']);
       assert.deepStrictEqual(inspect(parser, input('[% [%% %]', new Context())), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">[%%</span> %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[%% [% %%]', new Context())), [['<span class="invalid">[%%</span>'], ' [% %%]']);
       assert.deepStrictEqual(inspect(parser, input('[%% a %]', new Context())), [['<span class="invalid">[%%</span>'], ' a %]']);

package/src/parser/inline/strong.test.ts

@@ -11,7 +11,7 @@ describe('Unit: parser/inline/strong', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser, input('**', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input('**a', new Context())), [['**', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser, input('**a **', new Context())), [['**', 'a', ' ', '**'], '']);
+      assert.deepStrictEqual(inspect(parser, input('**a **', new Context())), [['**', 'a ', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('**a  **', new Context())), [['**', 'a', ' ', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('**a\n**', new Context())), [['**', 'a', '<br>', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('**a\\ **', new Context())), [['**', 'a', ' ', '**'], '']);

package/src/parser/inline.test.ts

@@ -40,7 +40,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser, input('*a***b****', new Context())), [['<em>a</em>', '<strong>b</strong>', '**'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a***b****c', new Context())), [['<em>a</em>', '<strong>b</strong>', '**', 'c'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a *b**', new Context())), [['<em>a <em>b</em></em>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('*a *b**c', new Context())), [['*', 'a', ' ', '*', 'b', '**', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser, input('*a *b**c', new Context())), [['*', 'a ', '*', 'b', '**', 'c'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a **b***', new Context())), [['<em>a <strong>b</strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a **b***c', new Context())), [['<em>a <strong>b</strong></em>', 'c'], '']);
       assert.deepStrictEqual(inspect(parser, input('*a ***b****', new Context())), [['<em>a <em><strong>b</strong></em></em>'], '']);
@@ -101,8 +101,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser, input('[$1]', new Context())), [['[', '$1', ']'], '']);
       assert.deepStrictEqual(inspect(parser, input('[$1-2]', new Context())), [['[', '$1-2', ']'], '']);
       assert.deepStrictEqual(inspect(parser, input('[$-1][$-2]', new Context())), [['<a class="label" data-label="$-1">$-1</a>', '<a class="label" data-label="$-2">$-2</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('$-1, $-2', new Context())), [['<a class="label" data-label="$-1">$-1</a>', ',', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('$-1 and $-2', new Context())), [['<a class="label" data-label="$-1">$-1</a>', ' and', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('$-1, $-2', new Context())), [['<a class="label" data-label="$-1">$-1</a>', ', ', '<a class="label" data-label="$-2">$-2</a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('$-1 and $-2', new Context())), [['<a class="label" data-label="$-1">$-1</a>', ' and ', '<a class="label" data-label="$-2">$-2</a>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$$-1', new Context())), [['$', '<a class="label" data-label="$-1">$-1</a>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[#a]]', new Context())), [['<sup class="reference"><span><a class="hashtag" href="/hashtags/a">#a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[$-1]]', new Context())), [['<sup class="reference"><span><a class="label" data-label="$-1">$-1</a></span></sup>'], '']);

package/src/parser/source/text.ts

@@ -88,30 +88,23 @@ export function next(source: string, position: number, state: number, delimiter?
   if (delimiter) {
     delimiter.lastIndex = position + 1;
     delimiter.test(source);
-    index = delimiter.lastIndex;
+    index = delimiter.lastIndex || position;
   }
   else {
     index = seek(source, position, state);
   }
-  if (index === 0) return source.length;
+  if (index === position || index === source.length) return source.length;
   assert(index > position);
   const char = source[index];
   switch (char) {
-    case '$':
-    case '*':
-    case '+':
-    case '~':
-    case '=':
-    case '/':
-      index = backToWhitespace(source, position, index);
-      break;
     case '%':
-      index += index - 1 > position && source.startsWith(' %]', index - 1)
+      assert(source.startsWith('%]', index) && isWhitespace(source[index - 1], true) || delimiter);
+      index += !delimiter && index - 1 > position
         ? -1
         : 0;
       break;
     case '[':
-      index += index - 1 > position && source.startsWith(' [|', index - 1)
+      index += !delimiter && index - 1 > position && source.startsWith(' [|', index - 1)
         ? -1
         : 0;
       break;
@@ -129,13 +122,7 @@ export function next(source: string, position: number, state: number, delimiter?
   assert(index > position);
   return index;
 }
-export function backToWhitespace(source: string, position: number, index: number): number {
-  const prev = index - 1;
-  return prev > position && /\s/.test(source[prev])
-    ? prev
-    : index;
-}
-export function backToUrlHead(source: string, position: number, index: number): number {
+function backToUrlHead(source: string, position: number, index: number): number {
   const delim = index;
   let state = false;
   for (let i = index - 1; i >= position; --i) {
@@ -158,7 +145,7 @@ export function backToUrlHead(source: string, position: number, index: number):
     ? delim
     : index;
 }
-export function backToEmailHead(source: string, position: number, index: number): number {
+function backToEmailHead(source: string, position: number, index: number): number {
   const delim = index;
   let state = false;
   for (let i = index - 1; i >= position; --i) {
@@ -267,7 +254,7 @@ function seek(source: string, position: number, state: number): number {
         if (source[i + 1] === fst && source[i + 2] === fst) return i;
         continue;
       case '%':
-        if (source[i + 1] === ']') return i;
+        if (source[i + 1] === ']' && isWhitespace(source[i - 1], true)) return i;
         continue;
       case ':':
         if (source[i + 1] === '/' && source[i + 2] === '/') return i;