securemark 0.258.1 → 0.258.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.258.2
+
+- Refactoring.
+
 ## 0.258.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.258.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.258.2 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("DOMPurify"), require("Prism"));
@@ -2250,17 +2250,17 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.convert = void 0;
 
-const global_1 = __webpack_require__(4128);
+const parser_1 = __webpack_require__(6728);
 
 function convert(conv, parser) {
   return (source, context = {}) => {
     if (source === '') return;
-    source = conv(source);
-    if (source === '') return [[], ''];
+    const src = conv(source);
+    if (src === '') return [[], ''];
     const memo = context.memo;
-    context.memo = global_1.undefined;
-    const result = parser(source, context);
-    context.memo = memo;
+    memo && (memo.offset += source.length - src.length);
+    const result = parser(src, context);
+    memo && (memo.offset -= source.length - src.length);
     return result;
   };
 }
@@ -2543,9 +2543,9 @@ function focus(scope, parser) {
     const src = match(source);
     if (src === '') return;
     const memo = context.memo;
-    memo && (memo.offset = source.length - src.length);
+    memo && (memo.offset += source.length - src.length);
     const result = parser(src, context);
-    memo && (memo.offset = source.length + src.length);
+    memo && (memo.offset -= source.length - src.length);
     if (!result) return;
     return (0, parser_1.exec)(result).length < src.length ? [(0, parser_1.eval)(result), (0, parser_1.exec)(result) + source.slice(src.length)] : global_1.undefined;
   };
@@ -2562,9 +2562,9 @@ function rewrite(scope, parser) {
     context.memo = memo;
     if (!res1 || (0, parser_1.exec)(res1).length >= source.length) return;
     const src = source.slice(0, source.length - (0, parser_1.exec)(res1).length);
-    memo && (memo.offset = source.length - src.length);
+    memo && (memo.offset += source.length - src.length);
     const res2 = parser(src, context);
-    memo && (memo.offset = source.length + src.length);
+    memo && (memo.offset -= source.length - src.length);
     if (!res2) return;
     return (0, parser_1.exec)(res2).length < src.length ? [(0, parser_1.eval)(res2), (0, parser_1.exec)(res2) + (0, parser_1.exec)(res1)] : global_1.undefined;
   };
@@ -2866,21 +2866,19 @@ function syntax(syntax, precedence, cost, parser) {
     --resources.recursion;
     const pos = source.length;
     const cache = syntax && context.memo?.get(pos, syntax, state);
-    const result = cache ? [cache[0], source.slice(cache[1])] : parser(source, context);
+    const result = cache ? cache.length === 0 ? global_1.undefined : [cache[0], source.slice(cache[1])] : parser(source, context);
     ++resources.recursion;
 
-    if (result) {
-      if (!cache) {
-        resources.budget -= cost;
-      }
+    if (result && !cache) {
+      resources.budget -= cost;
+    }
 
-      if (syntax) {
-        if (state & context.backtrackable) {
-          context.memo ??= new memo_1.Memo();
-          cache ?? context.memo.set(pos, syntax, state, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result).length);
-        } else if (context.memo?.length >= pos) {
-          context.memo.clear(pos);
-        }
+    if (syntax) {
+      if (state & context.backtrackable) {
+        context.memo ??= new memo_1.Memo();
+        cache ?? context.memo.set(pos, syntax, state, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
+      } else if (result && context.memo?.length >= pos) {
+        context.memo.clear(pos);
       }
     }
 
@@ -3080,7 +3078,7 @@ class Memo {
 
   set(position, syntax, state, nodes, offset) {
     const record = this.memory[position + this.offset - 1] ??= {};
-    record[`${syntax}:${state}`] = [nodes.slice(), offset]; //console.log('set', position + this.offset, syntax, state);
+    record[`${syntax}:${state}`] = nodes ? [nodes.slice(), offset] : []; //console.log('set', position + this.offset, syntax, state);
   }
 
   clear(position) {
@@ -3088,7 +3086,7 @@ class Memo {
 
     for (let i = position + this.offset, len = memory.length; i < len; ++i) {
       memory.pop();
-    } //console.log(position);
+    } //console.log('clear', position);
 
   }
 
@@ -5947,26 +5945,26 @@ const dom_1 = __webpack_require__(3252);
 const array_1 = __webpack_require__(8112);
 
 const index = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
-exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.syntax)(0
+exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.syntax)(0
 /* Rule.none */
-, 2, (0, combinator_1.surround)((0, source_1.str)('('), (0, source_1.str)(index), (0, source_1.str)(')'))), (0, combinator_1.syntax)(128
+, 2, (0, source_1.str)(index)), (0, source_1.str)(')')), (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.syntax)(128
 /* Rule.bracket */
-, 2, (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)(inline_1.inline, ')', [[')', 2]]), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
+, 2, (0, combinator_1.some)(inline_1.inline, ')', [[')', 2]])), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
   class: 'paren'
-}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)([''], (0, array_1.unshift)(as, bs)), rest])), (0, combinator_1.syntax)(0
+}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)([''], (0, array_1.unshift)(as, bs)), rest]), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.syntax)(0
 /* Rule.none */
-, 2, (0, combinator_1.surround)((0, source_1.str)('（'), (0, source_1.str)(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))), (0, source_1.str)('）'))), (0, combinator_1.syntax)(128
+, 2, (0, source_1.str)(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0))))), (0, source_1.str)('）')), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.syntax)(128
 /* Rule.bracket */
-, 2, (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.some)(inline_1.inline, '）', [['）', 2]]), (0, source_1.str)('）'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
+, 2, (0, combinator_1.some)(inline_1.inline, '）', [['）', 2]])), (0, source_1.str)('）'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
   class: 'paren'
-}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])), (0, combinator_1.syntax)(128
+}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.syntax)(128
 /* Rule.bracket */
-, 2, (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)(inline_1.inline, ']', [[']', 2]]), (0, source_1.str)(']'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)([''], (0, array_1.unshift)(as, bs)), rest])), (0, combinator_1.syntax)(128
+, 2, (0, combinator_1.some)(inline_1.inline, ']', [[']', 2]])), (0, source_1.str)(']'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)([''], (0, array_1.unshift)(as, bs)), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.syntax)(128
 /* Rule.bracket */
-, 2, (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)(inline_1.inline, '}', [['}', 2]]), (0, source_1.str)('}'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])), // Control media blinking in editing rather than control confusion of pairs of quote marks.
-(0, combinator_1.syntax)(1
+, 2, (0, combinator_1.some)(inline_1.inline, '}', [['}', 2]])), (0, source_1.str)('}'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), // Control media blinking in editing rather than control confusion of pairs of quote marks.
+(0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.syntax)(1
 /* Rule.quote */
-, 8, (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.some)(inline_1.inline, '"', [['"', 8]]), (0, source_1.str)('"'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]))]));
+, 8, (0, combinator_1.some)(inline_1.inline, '"', [['"', 8]])), (0, source_1.str)('"'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])]));
 
 /***/ }),
 
@@ -6671,7 +6669,13 @@ exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'
   if (content[0] === '') return [content, rest];
   if (params.length === 0) return;
   if (content.length !== 0 && (0, visibility_1.trimNode)(content).length === 0) return;
-  if ((0, parser_1.eval)((0, combinator_1.some)(autolink_1.autolink)((0, util_1.stringify)(content), context))?.some(node => typeof node === 'object')) return;
+
+  for (let source = (0, util_1.stringify)(content); source;) {
+    const result = (0, autolink_1.autolink)(source, context);
+    if (typeof (0, parser_1.eval)(result)[0] === 'object') return;
+    source = (0, parser_1.exec)(result);
+  }
+
   const INSECURE_URI = params.shift();
   const el = elem(INSECURE_URI, (0, dom_1.defrag)(content), new url_1.ReadonlyURL(resolve(INSECURE_URI, context.host ?? global_1.location, context.url ?? context.host ?? global_1.location), context.host?.href || global_1.location.href), context.host?.origin || global_1.location.origin);
   if (el.classList.contains('invalid')) return [[el], rest];

package/package.json

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

package/src/combinator/control/manipulation/convert.ts

@@ -1,17 +1,17 @@
-import { undefined } from 'spica/global';
-import { Parser } from '../../data/parser';
+import { Parser, check } from '../../data/parser';
 
 export function convert<P extends Parser<unknown>>(conv: (source: string) => string, parser: P): P;
 export function convert<T>(conv: (source: string) => string, parser: Parser<T>): Parser<T> {
   assert(parser);
   return (source, context = {}) => {
     if (source === '') return;
-    source = conv(source);
-    if (source === '') return [[], ''];
+    const src = conv(source);
+    if (src === '') return [[], ''];
     const memo = context.memo;
-    context.memo = undefined;
-    const result = parser(source, context);
-    context.memo = memo;
+    memo && (memo.offset += source.length - src.length);
+    const result = parser(src, context);
+    assert(check(src, result));
+    memo && (memo.offset -= source.length - src.length);
     return result;
   };
 }

package/src/combinator/control/manipulation/scope.ts

@@ -14,10 +14,10 @@ export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
     assert(source.startsWith(src));
     if (src === '') return;
     const memo = context.memo;
-    memo && (memo.offset = source.length - src.length);
+    memo && (memo.offset += source.length - src.length);
     const result = parser(src, context);
     assert(check(src, result));
-    memo && (memo.offset = source.length + src.length);
+    memo && (memo.offset -= source.length - src.length);
     if (!result) return;
     assert(exec(result).length < src.length);
     return exec(result).length < src.length
@@ -42,10 +42,10 @@ export function rewrite<T>(scope: Parser<unknown>, parser: Parser<T>): Parser<T>
     const src = source.slice(0, source.length - exec(res1).length);
     assert(src !== '');
     assert(source.startsWith(src));
-    memo && (memo.offset = source.length - src.length);
+    memo && (memo.offset += source.length - src.length);
     const res2 = parser(src, context);
     assert(check(src, res2));
-    memo && (memo.offset = source.length + src.length);
+    memo && (memo.offset -= source.length - src.length);
     if (!res2) return;
     assert(exec(res2) === '');
     return exec(res2).length < src.length

package/src/combinator/data/parser/context/memo.ts

@@ -1,5 +1,5 @@
 export class Memo {
-  private memory: Record<string, readonly [any[], number]>[/* pos */] = [];
+  private memory: Record<string, readonly [any[], number] | readonly []>[/* pos */] = [];
   public get length(): number {
     return this.memory.length;
   }
@@ -8,7 +8,7 @@ export class Memo {
     position: number,
     syntax: number,
     state: number,
-  ): readonly [any[], number] | undefined {
+  ): readonly [any[], number] | readonly [] | undefined {
     //console.log('get', position + this.offset, syntax, state, this.memory[position + this.offset - 1]?.[`${syntax}:${state}`]);;
     return this.memory[position + this.offset - 1]?.[`${syntax}:${state}`];
   }
@@ -16,12 +16,14 @@ export class Memo {
     position: number,
     syntax: number,
     state: number,
-    nodes: any[],
+    nodes: any[] | undefined,
     offset: number,
   ): void {
     const record = this.memory[position + this.offset - 1] ??= {};
     assert(!record[`${syntax}:${state}`]);
-    record[`${syntax}:${state}`] = [nodes.slice(), offset];
+    record[`${syntax}:${state}`] = nodes
+      ? [nodes.slice(), offset]
+      : [];
     //console.log('set', position + this.offset, syntax, state);
   }
   public clear(position: number): void {
@@ -29,6 +31,6 @@ export class Memo {
     for (let i = position + this.offset, len = memory.length; i < len; ++i) {
       memory.pop();
     }
-    //console.log(position);
+    //console.log('clear', position);
   }
 }

package/src/combinator/data/parser/context.ts

@@ -76,24 +76,24 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
     const pos = source.length;
     const cache = syntax && context.memo?.get(pos, syntax, state);
     const result: Result<T> = cache
-      ? [cache[0], source.slice(cache[1])]
+      ? cache.length === 0
+        ? undefined
+        : [cache[0], source.slice(cache[1])]
       : parser!(source, context);
     ++resources.recursion;
-    if (result) {
-      if (!cache) {
-        assert(cost = cost as number);
-        resources.budget -= cost;
+    if (result && !cache) {
+      assert(cost = cost as number);
+      resources.budget -= cost;
+    }
+    if (syntax) {
+      if (state & context.backtrackable) {
+        context.memo ??= new Memo();
+        cache ?? context.memo.set(pos, syntax, state, eval(result), source.length - exec(result, '').length);
+        assert.deepStrictEqual(cache && cache, cache && context.memo.get(pos, syntax, state));
       }
-      if (syntax) {
-        if (state & context.backtrackable) {
-          context.memo ??= new Memo();
-          cache ?? context.memo.set(pos, syntax, state, eval(result), source.length - exec(result).length);
-          assert.deepStrictEqual(cache && cache, cache && context.memo.get(pos, syntax, state));
-        }
-        else if (context.memo?.length! >= pos) {
-          assert(!(state & context.backtrackable));
-          context.memo!.clear(pos);
-        }
+      else if (result && context.memo?.length! >= pos) {
+        assert(!(state & context.backtrackable));
+        context.memo!.clear(pos);
       }
     }
     context.precedence = p;

package/src/parser/inline/bracket.ts

@@ -10,22 +10,22 @@ import { unshift, push } from 'spica/array';
 const index = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
 
 export const bracket: BracketParser = lazy(() => union([
-  syntax(Rule.none, 2, surround(str('('), str(index), str(')'))),
-  syntax(Rule.bracket, 2, surround(str('('), some(inline, ')', [[')', 2]]), str(')'), true,
+  surround(str('('), syntax(Rule.none, 2, str(index)), str(')')),
+  surround(str('('), syntax(Rule.bracket, 2, some(inline, ')', [[')', 2]])), str(')'), true,
     ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
-    ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest])),
-  syntax(Rule.none, 2, surround(str('（'), str(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))), str('）'))),
-  syntax(Rule.bracket, 2, surround(str('（'), some(inline, '）', [['）', 2]]), str('）'), true,
+    ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest]),
+  surround(str('（'), syntax(Rule.none, 2, str(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0))))), str('）')),
+  surround(str('（'), syntax(Rule.bracket, 2, some(inline, '）', [['）', 2]])), str('）'), true,
     ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
-    ([as, bs = []], rest) => [unshift(as, bs), rest])),
-  syntax(Rule.bracket, 2, surround(str('['), some(inline, ']', [[']', 2]]), str(']'), true,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('['), syntax(Rule.bracket, 2, some(inline, ']', [[']', 2]])), str(']'), true,
     undefined,
-    ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest])),
-  syntax(Rule.bracket, 2, surround(str('{'), some(inline, '}', [['}', 2]]), str('}'), true,
+    ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest]),
+  surround(str('{'), syntax(Rule.bracket, 2, some(inline, '}', [['}', 2]])), str('}'), true,
     undefined,
-    ([as, bs = []], rest) => [unshift(as, bs), rest])),
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
   // Control media blinking in editing rather than control confusion of pairs of quote marks.
-  syntax(Rule.quote, 8, surround(str('"'), some(inline, '"', [['"', 8]]), str('"'), true,
+  surround(str('"'), syntax(Rule.quote, 8, some(inline, '"', [['"', 8]])), str('"'), true,
     undefined,
-    ([as, bs = []], rest) => [unshift(as, bs), rest])),
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));

package/src/parser/inline/link.ts

@@ -1,6 +1,6 @@
 import { undefined, location, encodeURI, decodeURI, Location } from 'spica/global';
 import { LinkParser, TextLinkParser } from '../inline';
-import { Result, eval } from '../../combinator/data/parser';
+import { Result, eval, exec } from '../../combinator/data/parser';
 import { union, inits, tails, subsequence, some, guard, syntax, state, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
@@ -42,7 +42,11 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], syntax(Rule.link
     if (params.length === 0) return;
     assert(params.every(p => typeof p === 'string'));
     if (content.length !== 0 && trimNode(content).length === 0) return;
-    if (eval(some(autolink)(stringify(content), context))?.some(node => typeof node === 'object')) return;
+    for (let source = stringify(content); source;) {
+      const result = autolink(source, context);
+      if (typeof eval(result!)[0] === 'object') return;
+      source = exec(result!);
+    }
     assert(!html('div', content).querySelector('a, .media, .annotation, .reference') || (content[0] as HTMLElement).matches('.media'));
     const INSECURE_URI = params.shift()!;
     assert(INSECURE_URI === INSECURE_URI.trim());