securemark 0.258.0 → 0.258.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.258.1
+
+- Refactoring.
+
 ## 0.258.0
 
 - Introduce memoization.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.258.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.258.1 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"));
@@ -2543,9 +2543,9 @@ function focus(scope, parser) {
     const src = match(source);
     if (src === '') return;
     const memo = context.memo;
-    context.memo = global_1.undefined;
+    memo && (memo.offset = source.length - src.length);
     const result = parser(src, context);
-    context.memo = memo;
+    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);
-    context.memo = global_1.undefined;
+    memo && (memo.offset = source.length - src.length);
     const res2 = parser(src, context);
-    context.memo = memo;
+    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;
   };
@@ -2851,10 +2851,8 @@ function syntax(syntax, precedence, cost, parser) {
 
   return (source, context) => {
     if (source === '') return;
-    const r = context.rule ?? 0;
-    context.rule = r | syntax;
     context.backtrackable ??= ~0;
-    context.state ??= 0;
+    const state = context.state ??= 0;
     const p = context.precedence;
     context.precedence = precedence;
     const {
@@ -2867,7 +2865,7 @@ function syntax(syntax, precedence, cost, parser) {
     if (resources.recursion <= 0) throw new Error('Too much recursion');
     --resources.recursion;
     const pos = source.length;
-    const cache = context.memo?.get(pos, context.rule, syntax, context.state);
+    const cache = syntax && context.memo?.get(pos, syntax, state);
     const result = cache ? [cache[0], source.slice(cache[1])] : parser(source, context);
     ++resources.recursion;
 
@@ -2877,9 +2875,9 @@ function syntax(syntax, precedence, cost, parser) {
       }
 
       if (syntax) {
-        if (r & context.backtrackable) {
+        if (state & context.backtrackable) {
           context.memo ??= new memo_1.Memo();
-          cache ?? context.memo.set(pos, context.rule, syntax, context.state, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result).length);
+          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);
         }
@@ -2887,7 +2885,6 @@ function syntax(syntax, precedence, cost, parser) {
     }
 
     context.precedence = p;
-    context.rule = r;
     return result;
   };
 }
@@ -3056,7 +3053,7 @@ Delimiters.matcher = (0, memoize_1.memoize)(pattern => {
 /***/ }),
 
 /***/ 1090:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
@@ -3066,28 +3063,33 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.Memo = void 0;
 
-const array_1 = __webpack_require__(8112);
-
 class Memo {
   constructor() {
     this.memory = [];
+    this.offset = 0;
   }
 
   get length() {
     return this.memory.length;
   }
 
-  get(position, rule, syntax, state) {
-    return this.memory[position - 1]?.[`${rule}:${syntax}:${state}`];
+  get(position, syntax, state) {
+    //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}`];
   }
 
-  set(position, rule, syntax, state, nodes, offset) {
-    const record = this.memory[position - 1] ??= {};
-    record[`${rule}:${syntax}:${state}`] = [nodes, offset];
+  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);
   }
 
   clear(position) {
-    (0, array_1.splice)(this.memory, position, this.memory.length - position);
+    const memory = this.memory;
+
+    for (let i = position + this.offset, len = memory.length; i < len; ++i) {
+      memory.pop();
+    } //console.log(position);
+
   }
 
 }
@@ -3113,7 +3115,7 @@ const parser_1 = __webpack_require__(6728);
 
 const array_1 = __webpack_require__(8112);
 
-function inits(parsers) {
+function inits(parsers, resume) {
   if (parsers.length === 1) return parsers[0];
   return (source, context) => {
     let rest = source;
@@ -3126,6 +3128,7 @@ function inits(parsers) {
       if (!result) break;
       nodes = nodes ? (0, array_1.push)(nodes, (0, parser_1.eval)(result)) : (0, parser_1.eval)(result);
       rest = (0, parser_1.exec)(result);
+      if (resume?.((0, parser_1.eval)(result), (0, parser_1.exec)(result)) === false) break;
     }
 
     return nodes && rest.length < source.length ? [nodes, rest] : global_1.undefined;
@@ -3153,7 +3156,7 @@ const parser_1 = __webpack_require__(6728);
 
 const array_1 = __webpack_require__(8112);
 
-function sequence(parsers) {
+function sequence(parsers, resume) {
   if (parsers.length === 1) return parsers[0];
   return (source, context) => {
     let rest = source;
@@ -3166,6 +3169,7 @@ function sequence(parsers) {
       if (!result) return;
       nodes = nodes ? (0, array_1.push)(nodes, (0, parser_1.eval)(result)) : (0, parser_1.eval)(result);
       rest = (0, parser_1.exec)(result);
+      if (resume?.((0, parser_1.eval)(result), (0, parser_1.exec)(result)) === false) return;
     }
 
     return nodes && rest.length < source.length ? [nodes, rest] : global_1.undefined;
@@ -3251,8 +3255,8 @@ const union_1 = __webpack_require__(6366);
 
 const inits_1 = __webpack_require__(2491);
 
-function subsequence(parsers) {
-  return (0, union_1.union)(parsers.map((_, i) => i + 1 < parsers.length ? (0, inits_1.inits)([parsers[i], subsequence(parsers.slice(i + 1))]) : parsers[i]));
+function subsequence(parsers, resume) {
+  return (0, union_1.union)(parsers.map((_, i) => i + 1 < parsers.length ? (0, inits_1.inits)([parsers[i], subsequence(parsers.slice(i + 1), resume)], resume) : parsers[i]));
 }
 
 exports.subsequence = subsequence;
@@ -3274,8 +3278,8 @@ const union_1 = __webpack_require__(6366);
 
 const sequence_1 = __webpack_require__(2287);
 
-function tails(parsers) {
-  return (0, union_1.union)(parsers.map((_, i) => (0, sequence_1.sequence)(parsers.slice(i))));
+function tails(parsers, resume) {
+  return (0, union_1.union)(parsers.map((_, i) => (0, sequence_1.sequence)(parsers.slice(i), resume)));
 }
 
 exports.tails = tails;
@@ -5482,16 +5486,16 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.backtrackable = void 0;
-exports.backtrackable = 0 | 32
-/* Rule.annotation */
-| 4096
-/* Rule.reference */
-| 1024
-/* Rule.index */
-| 256
-/* Rule.link */
-| 64
-/* Rule.media */
+exports.backtrackable = 0 | 64
+/* State.annotation */
+| 32
+/* State.reference */
+| 16
+/* State.index */
+| 4
+/* State.link */
+| 2
+/* State.media */
 ;
 
 /***/ }),
@@ -5678,7 +5682,7 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('((
   delimiters: global_1.undefined
 }, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[/^\\?\n/, 9], [')', 2], ['))', 6]])), ')'))), '))', false, ([, ns], rest) => [[(0, dom_1.html)('sup', {
   class: 'annotation'
-}, [(0, dom_1.html)('span', (0, visibility_1.trimNode)((0, dom_1.defrag)(ns)))])], rest], ([, ns, rest], next) => next[0] === ')' ? global_1.undefined : (0, link_1.optimize)('((', ns, rest)))));
+}, [(0, dom_1.html)('span', (0, visibility_1.trimNode)((0, dom_1.defrag)(ns)))])], rest], ([, ns, rest], next) => next[0] === ')' ? global_1.undefined : (0, link_1.optimize)('((', ns, rest, next)))));
 
 /***/ }),
 
@@ -6663,10 +6667,9 @@ exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'
 /* State.media */
 | 1
 /* State.autolink */
-, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2]])), ']', true, global_1.undefined, ([, ns = [], rest], next) => next[0] === ']' ? global_1.undefined : optimize('[', ns, rest))]))), // 全体の失敗が確定した時も解析し予算を浪費している
-(0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))]), ([as, bs = []]) => bs[0] === '\r' && bs.shift() ? [as, bs] : as[0] === '\r' && as.shift() ? [[], as] : [as, []])), ([content, params], rest, context) => {
-  if (params.length === 0) return;
+, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2]])), ']', true, global_1.undefined, ([, ns = [], rest], next) => next[0] === ']' ? global_1.undefined : optimize('[', ns, rest, next))]))), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))], nodes => nodes[0][0] !== ''), ([as, bs = []]) => bs[0] === '\r' && bs.shift() ? [as, bs] : as[0] === '\r' && as.shift() ? [[], as] : [as, []])), ([content, params], rest, context) => {
   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;
   const INSECURE_URI = params.shift();
@@ -6760,12 +6763,15 @@ function decode(uri) {
   }
 }
 
-function optimize(opener, ns, rest) {
+function optimize(opener, ns, rest, next) {
+  if (next[+(next[0] === '\\')] === '\n') return;
   let count = 0;
 
   for (let i = 0; i < ns.length - 1; i += 2) {
-    if (ns[i] !== '' || ns[i + 1] !== opener[0]) break;
-    ++count;
+    const fst = ns[i];
+    const snd = ns[i + 1];
+    if (fst !== '' || snd[0] !== opener[0]) break;
+    count += snd.length;
   }
 
   return [['', opener[0].repeat(opener.length + count)], rest.slice(count)];
@@ -6990,7 +6996,7 @@ exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[['
 /* State.media */
 , (0, visibility_1.startLoose)((0, combinator_1.context)({
   delimiters: global_1.undefined
-}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)((0, source_1.stropt)(/^(?=\^)/), (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])), (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])])), ']'))), ']]', false, ([, ns], rest) => [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, visibility_1.trimNode)((0, dom_1.defrag)(ns)))])], rest], ([, ns, rest], next) => next[0] === ']' ? global_1.undefined : (0, link_1.optimize)('[[', ns, rest)))));
+}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)((0, source_1.stropt)(/^(?=\^)/), (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])), (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])])), ']'))), ']]', false, ([, ns], rest) => [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, visibility_1.trimNode)((0, dom_1.defrag)(ns)))])], rest], ([, ns, rest], next) => next[0] === ']' ? global_1.undefined : (0, link_1.optimize)('[[', ns, rest, next)))));
 const abbr = (0, combinator_1.creator)((0, combinator_1.bind)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]*/), ([source], rest) => [[(0, dom_1.html)('abbr', source)], rest.replace(visibility_1.regBlankStart, '')]));
 
 function attributes(ns) {
@@ -7191,7 +7197,7 @@ exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.syntax)(0
 /* Rule.none */
 , 2, (0, combinator_1.surround)('{{', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}'), '}}', true, ([, ns = []], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
-}, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest], ([, ns = [], rest], next) => next[0] === '}' ? global_1.undefined : (0, link_1.optimize)('{{', ns, rest))));
+}, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest], ([, ns = [], rest], next) => next[0] === '}' ? global_1.undefined : (0, link_1.optimize)('{{', ns, rest, next))));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')'), (0, source_1.str)(')'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']'), (0, source_1.str)(']'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}'), (0, source_1.str)('}'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(8, (0, combinator_1.some)(source_1.escsource, /^"|^\\?\n/)), (0, source_1.str)('"'), true)])));
 
 /***/ }),

package/package.json

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

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;
-    context.memo = undefined;
+    memo && (memo.offset = source.length - src.length);
     const result = parser(src, context);
     assert(check(src, result));
-    context.memo = memo;
+    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));
-    context.memo = undefined;
+    memo && (memo.offset = source.length - src.length);
     const res2 = parser(src, context);
     assert(check(src, res2));
-    context.memo = memo;
+    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,30 +1,34 @@
-import { splice } from 'spica/array';
-
 export class Memo {
   private memory: Record<string, readonly [any[], number]>[/* pos */] = [];
   public get length(): number {
     return this.memory.length;
   }
+  public offset = 0;
   public get(
     position: number,
-    rule: number,
     syntax: number,
     state: number,
   ): readonly [any[], number] | undefined {
-    return this.memory[position - 1]?.[`${rule}:${syntax}:${state}`];
+    //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}`];
   }
   public set(
     position: number,
-    rule: number,
     syntax: number,
     state: number,
     nodes: any[],
     offset: number,
   ): void {
-    const record = this.memory[position - 1] ??= {};
-    record[`${rule}:${syntax}:${state}`] = [nodes, offset];
+    const record = this.memory[position + this.offset - 1] ??= {};
+    assert(!record[`${syntax}:${state}`]);
+    record[`${syntax}:${state}`] = [nodes.slice(), offset];
+    //console.log('set', position + this.offset, syntax, state);
   }
   public clear(position: number): void {
-    splice(this.memory, position, this.memory.length - position);
+    const memory = this.memory;
+    for (let i = position + this.offset, len = memory.length; i < len; ++i) {
+      memory.pop();
+    }
+    //console.log(position);
   }
 }

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

@@ -65,10 +65,8 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
   }
   return (source, context) => {
     if (source === '') return;
-    const r = context.rule ?? 0;
-    context.rule = r | syntax;
     context.backtrackable ??= ~0;
-    context.state ??= 0;
+    const state = context.state ??= 0;
     const p = context.precedence;
     context.precedence = precedence;
     const { resources = { budget: 1, recursion: 1 } } = context;
@@ -76,7 +74,7 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
     if (resources.recursion <= 0) throw new Error('Too much recursion');
     --resources.recursion;
     const pos = source.length;
-    const cache = context.memo?.get(pos, context.rule, syntax, context.state);
+    const cache = syntax && context.memo?.get(pos, syntax, state);
     const result: Result<T> = cache
       ? [cache[0], source.slice(cache[1])]
       : parser!(source, context);
@@ -86,20 +84,19 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
         assert(cost = cost as number);
         resources.budget -= cost;
       }
-      if (syntax ) {
-        if (r & context.backtrackable) {
+      if (syntax) {
+        if (state & context.backtrackable) {
           context.memo ??= new Memo();
-          cache ?? context.memo.set(pos, context.rule, syntax, context.state, eval(result), source.length - exec(result).length);
-          assert.deepStrictEqual(cache && cache, cache && context.memo.get(pos, context.rule, syntax, context.state));
+          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(!(r & context.backtrackable));
+          assert(!(state & context.backtrackable));
           context.memo!.clear(pos);
         }
       }
     }
     context.precedence = p;
-    context.rule = r;
     return result;
   };
 }

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

@@ -2,8 +2,8 @@ import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree, eval, exec, check } from '../parser';
 import { push } from 'spica/array';
 
-export function inits<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
-export function inits<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
+export function inits<P extends Parser<unknown>>(parsers: SubParsers<P>, resume?: (nodes: SubTree<P>[], rest: string) => boolean): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
+export function inits<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes: T[], rest: string) => boolean): Parser<T, Ctx, D> {
   assert(parsers.every(f => f));
   if (parsers.length === 1) return parsers[0];
   return (source, context) => {
@@ -19,6 +19,7 @@ export function inits<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
         ? push(nodes, eval(result))
         : eval(result);
       rest = exec(result);
+      if (resume?.(eval(result), exec(result)) === false) break;
     }
     assert(rest.length <= source.length);
     return nodes && rest.length < source.length

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

@@ -2,8 +2,8 @@ import { undefined } from 'spica/global';
 import { Parser, Ctx, Tree, Context, SubParsers, SubTree, eval, exec, check } from '../parser';
 import { push } from 'spica/array';
 
-export function sequence<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
-export function sequence<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
+export function sequence<P extends Parser<unknown>>(parsers: SubParsers<P>, resume?: (nodes: SubTree<P>[], rest: string) => boolean): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
+export function sequence<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes: T[], rest: string) => boolean): Parser<T, Ctx, D> {
   assert(parsers.every(f => f));
   if (parsers.length === 1) return parsers[0];
   return (source, context) => {
@@ -19,6 +19,7 @@ export function sequence<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D
         ? push(nodes, eval(result))
         : eval(result);
       rest = exec(result);
+      if (resume?.(eval(result), exec(result)) === false) return;
     }
     assert(rest.length <= source.length);
     return nodes && rest.length < source.length

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

@@ -2,12 +2,12 @@ import { Parser, Ctx, Tree, Context, SubParsers, SubTree } from '../parser';
 import { union } from './union';
 import { inits } from './inits';
 
-export function subsequence<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
-export function subsequence<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
+export function subsequence<P extends Parser<unknown>>(parsers: SubParsers<P>, resume?: (nodes: SubTree<P>[], rest: string) => boolean): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
+export function subsequence<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes: T[], rest: string) => boolean): Parser<T, Ctx, D> {
   assert(parsers.every(f => f));
   return union(
     parsers.map((_, i) =>
       i + 1 < parsers.length
-        ? inits([parsers[i], subsequence(parsers.slice(i + 1))])
+        ? inits([parsers[i], subsequence(parsers.slice(i + 1), resume)], resume)
         : parsers[i]) as D);
 }

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

@@ -2,7 +2,7 @@ import { Parser, Ctx, Tree, Context, SubParsers, SubTree } from '../parser';
 import { union } from './union';
 import { sequence } from './sequence';
 
-export function tails<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
-export function tails<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
-  return union(parsers.map((_, i) => sequence(parsers.slice(i))) as D);
+export function tails<P extends Parser<unknown>>(parsers: SubParsers<P>, resume?: (nodes: SubTree<P>[], rest: string) => boolean): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
+export function tails<T, D extends Parser<T>[]>(parsers: D, resume?: (nodes: T[], rest: string) => boolean): Parser<T, Ctx, D> {
+  return union(parsers.map((_, i) => sequence(parsers.slice(i), resume)) as D);
 }

package/src/combinator/data/parser.ts

@@ -15,7 +15,6 @@ export interface Ctx {
   precedence?: number;
   delimiters?: Delimiters;
   state?: number;
-  rule?: number;
   backtrackable?: number;
   memo?: Memo;
 }

package/src/parser/api/parse.test.ts

@@ -234,6 +234,15 @@ describe('Unit: parser/api/parse', () => {
     });
 
     it('recursion', () => {
+      assert.deepStrictEqual(
+        [...parse('{'.repeat(20)).children].map(el => el.outerHTML),
+        [`<p>${'{'.repeat(20)}</p>`]);
+      assert.deepStrictEqual(
+        [...parse('{'.repeat(21)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [
+          '<h1 id="error:rnd" class="error">Error: Too much recursion</h1>',
+          `<pre class="error" translate="no">${'{'.repeat(21)}</pre>`,
+        ]);
       assert.deepStrictEqual(
         [...parse('('.repeat(20)).children].map(el => el.outerHTML),
         [`<p>${'('.repeat(20)}</p>`]);
@@ -253,14 +262,8 @@ describe('Unit: parser/api/parse', () => {
           `<pre class="error" translate="no">${'['.repeat(21)}</pre>`,
         ]);
       assert.deepStrictEqual(
-        [...parse('{'.repeat(20)).children].map(el => el.outerHTML),
-        [`<p>${'{'.repeat(20)}</p>`]);
-      assert.deepStrictEqual(
-        [...parse('{'.repeat(21)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
-        [
-          '<h1 id="error:rnd" class="error">Error: Too much recursion</h1>',
-          `<pre class="error" translate="no">${'{'.repeat(21)}</pre>`,
-        ]);
+        [...parse('['.repeat(17) + '\na').children].map(el => el.outerHTML),
+        [`<p>${'['.repeat(17)}<br>a</p>`]);
     });
 
     if (!navigator.userAgent.includes('Chrome')) return;

package/src/parser/context.ts

@@ -14,12 +14,6 @@ export const enum Rule {
   quote = 1 << 0,
   none = 0,
 }
-export const backtrackable = 0
-  | Rule.annotation
-  | Rule.reference
-  | Rule.index
-  | Rule.link
-  | Rule.media;
 
 export const enum State {
   annotation = 1 << 6,
@@ -30,3 +24,9 @@ export const enum State {
   media = 1 << 1,
   autolink = 1 << 0,
 }
+export const backtrackable = 0
+  | State.annotation
+  | State.reference
+  | State.index
+  | State.link
+  | State.media;

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

@@ -18,11 +18,11 @@ describe('Unit: parser/inline/annotation', () => {
       assert.deepStrictEqual(inspect(parser('((\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\na))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\\na))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((a\n))')), [['', '(('], 'a\n))']);
-      assert.deepStrictEqual(inspect(parser('((a\\\n))')), [['', '(('], 'a\\\n))']);
-      assert.deepStrictEqual(inspect(parser('((a\nb))')), [['', '(('], 'a\nb))']);
-      assert.deepStrictEqual(inspect(parser('((a\\\nb))')), [['', '(('], 'a\\\nb))']);
-      assert.deepStrictEqual(inspect(parser('((*a\nb*))')), [['', '(('], '*a\nb*))']);
+      assert.deepStrictEqual(inspect(parser('((a\n))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((a\\\n))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((a\nb))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((a\\\nb))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((*a\nb*))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a)b))')), undefined);
       assert.deepStrictEqual(inspect(parser('(((a))')), undefined);

package/src/parser/inline/annotation.ts

@@ -17,4 +17,4 @@ export const annotation: AnnotationParser = lazy(() => validate('((', syntax(Rul
   '))',
   false,
   ([, ns], rest) => [[html('sup', { class: 'annotation' }, [html('span', trimNode(defrag(ns)))])], rest],
-  ([, ns, rest], next) => next[0] === ')' ? undefined : optimize('((', ns, rest)))));
+  ([, ns, rest], next) => next[0] === ')' ? undefined : optimize('((', ns, rest, next)))));

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

@@ -45,6 +45,7 @@ describe('Unit: parser/inline/link', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);
       assert.deepStrictEqual(inspect(parser('{}')), undefined);
+      assert.deepStrictEqual(inspect(parser('[{b}')), [['', '[', '<a href="b">b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[]')), undefined);
       assert.deepStrictEqual(inspect(parser('[]{}')), undefined);
       assert.deepStrictEqual(inspect(parser('[]{ }')), undefined);
@@ -64,7 +65,7 @@ describe('Unit: parser/inline/link', () => {
       assert.deepStrictEqual(inspect(parser('[\\ ]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[\\\n]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[&Tab;]{b}')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[]{b}')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[]{b}')), [['', '[', '<a href="b">b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[]]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('[a]{}')), undefined);
       assert.deepStrictEqual(inspect(parser('[a\nb]{b}')), undefined);

package/src/parser/inline/link.ts

@@ -31,16 +31,15 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], syntax(Rule.link
         ']',
         true,
         undefined,
-        ([, ns = [], rest], next) => next[0] === ']' ? undefined : optimize('[', ns, rest)),
+        ([, ns = [], rest], next) => next[0] === ']' ? undefined : optimize('[', ns, rest, next)),
     ]))),
-    // 全体の失敗が確定した時も解析し予算を浪費している
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
-  ]),
+  ], nodes => nodes[0][0] !== ''),
   ([as, bs = []]) => bs[0] === '\r' && bs.shift() ? [as, bs] : as[0] === '\r' && as.shift() ? [[], as] : [as, []])),
   ([content, params]: [(HTMLElement | string)[], string[]], rest, context) => {
-    if (params.length === 0) return;
     assert(content[0] !== '' || params.length === 0);
     if (content[0] === '') return [content, rest];
+    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;
@@ -187,11 +186,15 @@ function decode(uri: string): string {
   }
 }
 
-export function optimize(opener: string, ns: readonly (string | HTMLElement)[], rest: string): Result<string> {
+export function optimize(opener: string, ns: readonly (string | HTMLElement)[], rest: string, next: string): Result<string> {
+  if (next[+(next[0] === '\\')] === '\n') return;
   let count = 0;
   for (let i = 0; i < ns.length - 1; i += 2) {
-    if (ns[i] !== '' || ns[i + 1] !== opener[0]) break;
-    ++count;
+    const fst = ns[i];
+    const snd = ns[i + 1] as string;
+    assert(typeof snd === 'string');
+    if (fst !== '' || snd[0] !== opener[0]) break;
+    count += snd.length;
   }
   return [['', opener[0].repeat(opener.length + count)], rest.slice(count)];
 }

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

@@ -22,6 +22,7 @@ describe('Unit: parser/inline/media', () => {
       assert.deepStrictEqual(inspect(parser('{}')), undefined);
       assert.deepStrictEqual(inspect(parser('[]')), undefined);
       assert.deepStrictEqual(inspect(parser('!{}')), undefined);
+      assert.deepStrictEqual(inspect(parser('![{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('![]')), undefined);
       assert.deepStrictEqual(inspect(parser('![]{}')), undefined);
       assert.deepStrictEqual(inspect(parser('![]{ }')), undefined);

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

@@ -18,11 +18,11 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[\n]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\na]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\\na]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[a\n]]')), [['', '[['], 'a\n]]']);
-      assert.deepStrictEqual(inspect(parser('[[a\\\n]]')), [['', '[['], 'a\\\n]]']);
-      assert.deepStrictEqual(inspect(parser('[[a\nb]]')), [['', '[['], 'a\nb]]']);
-      assert.deepStrictEqual(inspect(parser('[[a\\\nb]]')), [['', '[['], 'a\\\nb]]']);
-      assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), [['', '[['], '*a\nb*]]']);
+      assert.deepStrictEqual(inspect(parser('[[a\n]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[a\\\n]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[a\nb]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[a\\\nb]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[[a]]')), undefined);

package/src/parser/inline/reference.ts

@@ -23,7 +23,7 @@ export const reference: ReferenceParser = lazy(() => validate('[[', syntax(Rule.
   ']]',
   false,
   ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNode(defrag(ns)))])], rest],
-  ([, ns, rest], next) => next[0] === ']' ? undefined : optimize('[[', ns, rest)))));
+  ([, ns, rest], next) => next[0] === ']' ? undefined : optimize('[[', ns, rest, next)))));
 
 const abbr: ReferenceParser.AbbrParser = creator(bind(surround(
   '^',

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

@@ -8,6 +8,7 @@ describe('Unit: parser/inline/ruby', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);
+      assert.deepStrictEqual(inspect(parser('[(b)')), undefined);
       assert.deepStrictEqual(inspect(parser('[]()')), undefined);
       assert.deepStrictEqual(inspect(parser('[](b)')), undefined);
       assert.deepStrictEqual(inspect(parser('[ ](b)')), undefined);

package/src/parser/inline/template.ts

@@ -10,7 +10,7 @@ import { unshift } from 'spica/array';
 export const template: TemplateParser = lazy(() => syntax(Rule.none, 2, surround(
   '{{', some(union([bracket, escsource]), '}'), '}}', true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest],
-  ([, ns = [], rest], next) => next[0] === '}' ? undefined : optimize('{{', ns, rest))));
+  ([, ns = [], rest], next) => next[0] === '}' ? undefined : optimize('{{', ns, rest, next))));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creator(union([
   surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),

package/src/parser/inline.test.ts

@@ -159,6 +159,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[[${]]}$')), [['', '[[', '<span class="math" translate="no" data-src="${]]}$">${]]}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('"[[""]]')), [['"', '<sup class="reference"><span>""</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[a](b)]{c}')), [['<a href="c"><ruby>a<rp>(</rp><rt>b</rt><rp>)</rp></ruby></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['', '[[[[[[[', '<a href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('<http://host>')), [['<', '<a href="http://host" target="_blank">http://host</a>', '>'], '']);
       assert.deepStrictEqual(inspect(parser('[~http://host')), [['', '[', '~', '<a href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[~a@b')), [['', '[', '~', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
@@ -167,7 +168,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[^a@b')), [['[^', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a*b\nc*]')), [['[', '<a href="/hashtags/a" class="hashtag">#a</a>', '<em>b<br>c</em>', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), [['[', '<em>a<br>b</em>', ']', '<a href="/">/</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), [['', '[[', '<em>a<br>b</em>', ']', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), [['[', '[', '<em>a<br>b</em>', ']', ']'], '']);
       assert.deepStrictEqual(inspect(parser('"[% *"*"*')), [['"', '[%', ' ', '*', '"', '*', '"', '*'], '']);
       assert.deepStrictEqual(inspect(parser('"[% "*"* %]')), [['"', '[%', ' ', '"', '*', '"', '*', ' ', '%', ']'], '']);
     });