securemark 0.280.2 → 0.280.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.280.4
+
+- Refactoring.
+
+## 0.280.3
+
+- Refactoring.
+
 ## 0.280.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.280.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.280.4 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"));
@@ -2682,7 +2682,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.block = void 0;
 const parser_1 = __webpack_require__(6728);
-const memo_1 = __webpack_require__(1090);
 const line_1 = __webpack_require__(9315);
 function block(parser, separation = true) {
   return ({
@@ -2690,7 +2689,6 @@ function block(parser, separation = true) {
     context
   }) => {
     if (source === '') return;
-    context.memo ??= new memo_1.Memo();
     const result = parser({
       source,
       context
@@ -2767,14 +2765,12 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.isBlank = exports.firstline = exports.line = void 0;
 const parser_1 = __webpack_require__(6728);
-const memo_1 = __webpack_require__(1090);
 function line(parser) {
   return ({
     source,
     context
   }) => {
     if (source === '') return;
-    context.memo ??= new memo_1.Memo();
     const line = firstline(source);
     context.offset ??= 0;
     context.offset += source.length - line.length;
@@ -2818,6 +2814,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.convert = void 0;
 const parser_1 = __webpack_require__(6728);
+const alias_1 = __webpack_require__(5406);
 function convert(conv, parser, empty = false) {
   return ({
     source,
@@ -2826,13 +2823,14 @@ function convert(conv, parser, empty = false) {
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
+    const offset = (0, alias_1.max)(source.length - src.length, 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     return result;
   };
 }
@@ -2927,7 +2925,7 @@ function fence(opener, limit, separation = true) {
       }
       rest = rest.slice(line.length);
     }
-    return [(0, array_1.unshift)([block, overflow, closer], matches), rest];
+    return [(0, array_1.push)([block, overflow, closer], matches), rest];
   };
 }
 exports.fence = fence;
@@ -2957,13 +2955,14 @@ function indent(opener, parser, separation = false) {
   return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(opener, (0, memoize_1.memoize)(([indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, ({
     source
   }) => [[source], '']))), ([indent]) => indent.length * 2 + +(indent[0] === ' '), {})), separation), (lines, rest, context) => {
+    const offset = rest.length;
     context.offset ??= 0;
-    context.offset += rest.length;
+    context.offset += offset;
     const result = parser({
       source: trimBlockEnd(lines.join('')),
       context
     });
-    context.offset -= rest.length;
+    context.offset -= offset;
     return result && (0, parser_1.exec)(result) === '' ? [(0, parser_1.eval)(result), rest] : undefined;
   });
 }
@@ -3084,13 +3083,14 @@ function focus(scope, parser) {
     if (source === '') return;
     const src = match(source);
     if (src === '') return;
+    const offset = source.length - src.length;
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (result === undefined) return;
     return (0, parser_1.exec)(result).length < src.length ? [(0, parser_1.eval)(result), (0, parser_1.exec)(result) + source.slice(src.length)] : undefined;
   };
@@ -3111,13 +3111,14 @@ function rewrite(scope, parser) {
     context.memo = memo;
     if (res1 === undefined || (0, parser_1.exec)(res1).length >= source.length) return;
     const src = source.slice(0, source.length - (0, parser_1.exec)(res1).length);
+    const offset = source.length - src.length;
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const res2 = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (res2 === undefined) 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)] : undefined;
   };
@@ -3384,16 +3385,15 @@ function syntax(syntax, prec, state, parser) {
     const position = source.length + context.offset;
     const stateOuter = context.state ?? 0;
     const stateInner = context.state = stateOuter | state;
-    const cache = syntax && stateInner & memo.targets && memo.get(position, syntax, stateInner);
+    const cache = syntax & memo.targets && stateInner && memo.get(position, syntax, stateInner);
     const result = cache ? cache.length === 0 ? undefined : [cache[0], source.slice(cache[1])] : parser({
       source,
       context
     });
-    if (syntax && stateOuter & memo.targets) {
-      cache ?? memo.set(position, syntax, stateInner, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
-    }
-    if (result && !stateOuter && memo.length >= position + 2) {
-      memo.resize(position + 2);
+    if (stateOuter && !cache && syntax & memo.targets) {
+      memo.set(position, syntax, stateInner, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
+    } else if (!stateOuter && result && memo.length >= position + memo.margin) {
+      memo.resize(position + memo.margin);
     }
     context.state = stateOuter;
     return result;
@@ -3626,20 +3626,23 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.Memo = void 0;
 class Memo {
-  constructor(targets = ~0) {
+  constructor(targets = ~0, margin = 0) {
     this.targets = targets;
+    this.margin = margin;
     this.memory = [];
-    this.targets = targets;
+    this.count = 0;
   }
   get length() {
     return this.memory.length;
   }
   get(position, syntax, state) {
+    if (this.count === 0) return;
     //console.log('get', position, syntax, state, this.memory[position - 1]?.[syntax]?.[state]);
     const cache = this.memory[position - 1]?.[syntax]?.[state];
     return cache?.length === 2 ? [cache[0].slice(), cache[1]] : cache;
   }
   set(position, syntax, state, nodes, offset) {
+    this.count += +!this.memory[position - 1];
     const record = this.memory[position - 1] ??= {};
     (record[syntax] ??= {})[state] = nodes ? [nodes.slice(), offset] : [];
     //console.log('set', position, syntax, state, record[syntax]?.[state]);
@@ -3647,14 +3650,15 @@ class Memo {
 
   resize(position) {
     const memory = this.memory;
-    for (let len = memory.length, i = position; i < len; ++i) {
-      memory.pop();
+    for (let i = memory.length; i > position; --i) {
+      this.count -= +memory.pop();
     }
     //console.log('resize', position + 1);
   }
 
   clear() {
     this.memory = [];
+    this.count = 0;
   }
 }
 exports.Memo = Memo;
@@ -3780,7 +3784,7 @@ function some(parser, end, delimiters = [], limit = -1) {
         context
       });
       if (result === undefined) break;
-      nodes = nodes ? nodes.length < (0, parser_1.eval)(result).length ? (0, array_1.unshift)(nodes, (0, parser_1.eval)(result)) : (0, array_1.push)(nodes, (0, parser_1.eval)(result)) : (0, parser_1.eval)(result);
+      nodes = nodes ? nodes.length < (0, parser_1.eval)(result).length / 8 ? (0, array_1.unshift)(nodes, (0, parser_1.eval)(result)) : (0, array_1.push)(nodes, (0, parser_1.eval)(result)) : (0, parser_1.eval)(result);
       rest = (0, parser_1.exec)(result);
       if (limit >= 0 && source.length - rest.length > limit) break;
     }
@@ -4376,7 +4380,7 @@ exports.block = (0, combinator_1.creation)(0, false, (0, combinator_1.reset)({
     clock: 20000,
     recursion: 20 + 1
   },
-  memo: new memo_1.Memo(472 /* State.backtrackers */)
+  memo: new memo_1.Memo(508 /* Syntax.targets */, 2)
 }, error((0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, mediablock_1.mediablock, reply_1.reply, paragraph_1.paragraph]))));
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', ({
@@ -5770,7 +5774,6 @@ const annotation_1 = __webpack_require__(2736);
 const reference_1 = __webpack_require__(3555);
 const template_1 = __webpack_require__(4695);
 const remark_1 = __webpack_require__(3217);
-const math_1 = __webpack_require__(8946);
 const extension_1 = __webpack_require__(8053);
 const ruby_1 = __webpack_require__(6705);
 const link_1 = __webpack_require__(9628);
@@ -5779,14 +5782,15 @@ const insertion_1 = __webpack_require__(2945);
 const deletion_1 = __webpack_require__(7501);
 const mark_1 = __webpack_require__(2480);
 const emstrong_1 = __webpack_require__(6132);
-const emphasis_1 = __webpack_require__(3867);
 const strong_1 = __webpack_require__(6578);
+const emphasis_1 = __webpack_require__(3867);
+const math_1 = __webpack_require__(8946);
 const code_1 = __webpack_require__(5771);
 const htmlentity_1 = __webpack_require__(1562);
 const autolink_1 = __webpack_require__(6051);
 const bracket_1 = __webpack_require__(5196);
 const source_1 = __webpack_require__(6743);
-exports.inline = (0, combinator_1.lazy)(() => (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, remark_1.remark, math_1.math, extension_1.extension, ruby_1.ruby, link_1.textlink, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, emstrong_1.emstrong, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, autolink_1.autolink, bracket_1.bracket, source_1.text]));
+exports.inline = (0, combinator_1.lazy)(() => (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, remark_1.remark, extension_1.extension, ruby_1.ruby, link_1.textlink, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, emstrong_1.emstrong, strong_1.strong, emphasis_1.emphasis, math_1.math, code_1.code, htmlentity_1.htmlentity, autolink_1.autolink, bracket_1.bracket, source_1.text]));
 var indexee_1 = __webpack_require__(1269);
 Object.defineProperty(exports, "indexee", ({
   enumerable: true,
@@ -5839,7 +5843,7 @@ const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.surround)('((', (0, combinator_1.constraint)(256 /* State.annotation */, false, (0, combinator_1.syntax)(0 /* Syntax.none */, 6, 256 /* State.annotation */ | 8 /* State.media */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[/^\\?\n/, 9], [')', 2], ['))', 6]])))), '))', false, ([, ns], rest) => [[(0, dom_1.html)('sup', {
+exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.surround)('((', (0, combinator_1.constraint)(256 /* State.annotation */, false, (0, combinator_1.syntax)(256 /* Syntax.annotation */, 6, 256 /* State.annotation */ | 8 /* State.media */, (0, visibility_1.trimBlankStart)((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.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest])));
 
@@ -5875,7 +5879,7 @@ exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:
 // Escape unmatched hashtag-like strings.
 (0, source_1.str)(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', hashtag_1.emoji), 'u')),
 // Escape invalid leading characters.
-(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])])))));
+(0, source_1.str)(/^[0-9a-z](?=>)/iu), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])])))));
 
 /***/ }),
 
@@ -6058,11 +6062,11 @@ const source_1 = __webpack_require__(6743);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 const index = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
-exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 2, 0 /* State.none */, (0, source_1.str)(index))), (0, source_1.str)(')')), (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ')', [[/^\\?\n/, 3], [')', 2]]))), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
+exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 2, 0 /* State.none */, (0, source_1.str)(index))), (0, source_1.str)(')')), (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ')', [[/^\\?\n/, 3], [')', 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.surround)((0, source_1.str)('（'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 2, 0 /* State.none */, (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.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '）', [[/^\\?\n/, 3], ['）', 2]]))), (0, source_1.str)('）'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
+}, (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.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 2, 0 /* State.none */, (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.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '）', [[/^\\?\n/, 3], ['）', 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.surround)((0, source_1.str)('['), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 3], [']', 2]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('［'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '］', [[/^\\?\n/, 3], ['］', 2]]))), (0, source_1.str)('］'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '}', [[/^\\?\n/, 3], ['}', 2]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('｛'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '｝', [[/^\\?\n/, 3], ['｝', 2]]))), (0, source_1.str)('｝'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '"', [[/^\\?\n/, 4], ['"', 3]]))), (0, source_1.str)('"'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('“'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '”', [[/^\\?\n/, 4], ['”', 3]]))), (0, source_1.str)('”'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('‘'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '’', [[/^\\?\n/, 4], ['’', 3]]))), (0, source_1.str)('’'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('「'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '」', [[/^\\?\n/, 4], ['」', 3]]))), (0, source_1.str)('」'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('『'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '』', [[/^\\?\n/, 4], ['』', 3]]))), (0, source_1.str)('』'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])]));
+}, (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.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 3], [']', 2]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('［'), (0, combinator_1.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '］', [[/^\\?\n/, 3], ['］', 2]]))), (0, source_1.str)('］'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '}', [[/^\\?\n/, 3], ['}', 2]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('｛'), (0, combinator_1.creation)((0, combinator_1.syntax)(4 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '｝', [[/^\\?\n/, 3], ['｝', 2]]))), (0, source_1.str)('｝'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '"', [[/^\\?\n/, 4], ['"', 3]]))), (0, source_1.str)('"'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('“'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '”', [[/^\\?\n/, 4], ['”', 3]]))), (0, source_1.str)('”'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('‘'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '’', [[/^\\?\n/, 4], ['’', 3]]))), (0, source_1.str)('’'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('「'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '」', [[/^\\?\n/, 4], ['」', 3]]))), (0, source_1.str)('」'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('『'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '』', [[/^\\?\n/, 4], ['』', 3]]))), (0, source_1.str)('』'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])]));
 
 /***/ }),
 
@@ -6204,7 +6208,7 @@ const indexee_1 = __webpack_require__(1269);
 const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.creation)((0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(64 /* State.index */, false, (0, combinator_1.syntax)(128 /* Syntax.index */, 2, 502 /* State.linkers */ | 8 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[/^\\?\n/, 9], [']', 2]])))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))], rest])), ([el]) => [(0, dom_1.define)(el, {
+exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.creation)((0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(64 /* State.index */, false, (0, combinator_1.syntax)(64 /* Syntax.index */, 2, 502 /* State.linkers */ | 8 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[/^\\?\n/, 9], [']', 2]])))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))], rest])), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : undefined,
   class: 'index',
   href: el.id ? `#${el.id}` : undefined
@@ -6406,7 +6410,7 @@ const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 // Don't use the symbols already used: !#$%@&*+~=|
 // All syntax surrounded by square brackets shouldn't contain line breaks.
-exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)((0, combinator_1.surround)((0, source_1.str)(/^\[[:^|]/), (0, combinator_1.syntax)(64 /* Syntax.placeholder */, 2, 0 /* State.none */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 2]]))), (0, source_1.str)(']'), false, ([, bs], rest) => [[(0, dom_1.html)('span', {
+exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)((0, combinator_1.surround)((0, source_1.str)(/^\[[:^|]/), (0, combinator_1.syntax)(32 /* Syntax.placeholder */, 2, 0 /* State.none */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 2]]))), (0, source_1.str)(']'), false, ([, bs], rest) => [[(0, dom_1.html)('span', {
   class: 'invalid',
   'data-invalid-syntax': 'extension',
   'data-invalid-type': 'syntax',
@@ -6517,7 +6521,7 @@ const parse = (0, memoize_1.reduce)((el => entity => {
   el.innerHTML = entity;
   const text = el.textContent;
   return entity === text ? undefined : text;
-})((0, dom_1.html)('b')));
+})((0, dom_1.html)('span')));
 
 /***/ }),
 
@@ -6564,11 +6568,11 @@ const optspec = {
 };
 Object.setPrototypeOf(optspec, null);
 exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([exports.medialink, exports.textlink])));
-exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(8 /* Syntax.link */, 2, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
   if (content.length !== 0 && (0, visibility_1.trimNodeEnd)(content = (0, dom_1.defrag)(content)).length === 0) return;
   return [[parse(content, params, context)], rest];
 })))));
-exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest])))));
+exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(8 /* Syntax.link */, 2, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest])))));
 exports.linemedialink = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.medialink]), /^(?=[^\S\n]*(?:$|\n))/);
 exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest]))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\s{}]+/)]);
@@ -6748,7 +6752,7 @@ const optspec = {
   rel: undefined
 };
 Object.setPrototypeOf(optspec, null);
-exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(10, (0, combinator_1.open)('!', (0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.syntax)(4 /* Syntax.media */, 2, ~16 /* State.link */, (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [[/^\\?\n/, 9]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/))]), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
+exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(10, (0, combinator_1.open)('!', (0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.syntax)(0 /* Syntax.none */, 2, ~16 /* State.link */, (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [[/^\\?\n/, 9]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/))]), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
   const INSECURE_URI = params.shift();
   const url = new url_1.ReadonlyURL((0, link_1.resolve)(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
   let cache;
@@ -6820,7 +6824,7 @@ const inline_1 = __webpack_require__(1160);
 const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.surround)('[[', (0, combinator_1.constraint)(128 /* State.reference */, false, (0, combinator_1.syntax)(256 /* Syntax.reference */, 6, 256 /* State.annotation */ | 128 /* State.reference */ | 8 /* State.media */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((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.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest])));
+exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.surround)('[[', (0, combinator_1.constraint)(128 /* State.reference */, false, (0, combinator_1.syntax)(128 /* Syntax.reference */, 6, 256 /* State.annotation */ | 128 /* State.reference */ | 8 /* State.media */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((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.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest])));
 // Chicago-Style
 const abbr = (0, combinator_1.creation)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]), /^\|?(?=]])|^\|[^\S\n]*/, true, ([, ns], rest) => ns ? [['\n', ns[0].trimEnd()], rest.replace(visibility_1.blank.start, '')] : [[''], `^${rest}`], ([,, rest]) => [[''], `^${rest}`]));
 function attributes(ns) {
@@ -6889,7 +6893,7 @@ const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
-exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)((0, combinator_1.syntax)(32 /* Syntax.ruby */, 2, -1 /* State.all */, (0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.sequence)([(0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']'), (0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')')]), ([texts, rubies], _, context) => [(0, parser_1.eval)(text({
+exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)((0, combinator_1.syntax)(16 /* Syntax.ruby */, 2, -1 /* State.all */, (0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.sequence)([(0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']'), (0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')')]), ([texts, rubies], _, context) => [(0, parser_1.eval)(text({
   source: texts,
   context
 }), [])[0] ?? '', (0, parser_1.eval)(text({

package/markdown.d.ts

@@ -661,7 +661,6 @@ export namespace MarkdownParser {
       InlineParser.ReferenceParser,
       InlineParser.TemplateParser,
       InlineParser.RemarkParser,
-      InlineParser.MathParser,
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
       InlineParser.LinkParser.TextLinkParser,
@@ -672,6 +671,7 @@ export namespace MarkdownParser {
       InlineParser.EmStrongParser,
       InlineParser.StrongParser,
       InlineParser.EmphasisParser,
+      InlineParser.MathParser,
       InlineParser.CodeParser,
       InlineParser.HTMLEntityParser,
       InlineParser.AutolinkParser,
@@ -743,27 +743,6 @@ export namespace MarkdownParser {
         InlineParser,
       ]> {
     }
-    export interface MathParser extends
-      // $expr$
-      // ${expr}$
-      Inline<'math'>,
-      Parser<HTMLElement, Context, [
-        MathParser.BracketParser,
-        Parser<string, Context, [
-          MathParser.BracketParser,
-          SourceParser.UnescapableSourceParser,
-        ]>,
-      ]> {
-    }
-    export namespace MathParser {
-      export interface BracketParser extends
-        Inline<'math/bracket'>,
-        Parser<HTMLElement, Context, [
-          BracketParser,
-          SourceParser.EscapableSourceParser,
-        ]> {
-      }
-    }
     export interface ExtensionParser extends
       Inline<'extension'>,
       Parser<HTMLElement | string, Context, [
@@ -1097,6 +1076,27 @@ export namespace MarkdownParser {
         ]>,
       ]> {
     }
+    export interface MathParser extends
+      // $expr$
+      // ${expr}$
+      Inline<'math'>,
+      Parser<HTMLElement, Context, [
+        MathParser.BracketParser,
+        Parser<string, Context, [
+          MathParser.BracketParser,
+          SourceParser.UnescapableSourceParser,
+        ]>,
+      ]> {
+    }
+    export namespace MathParser {
+      export interface BracketParser extends
+        Inline<'math/bracket'>,
+        Parser<HTMLElement, Context, [
+          BracketParser,
+          SourceParser.EscapableSourceParser,
+        ]> {
+      }
+    }
     export interface CodeParser extends
       // `abc`
       Inline<'code'>,

package/package.json

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

package/src/combinator/control/constraint/block.ts

@@ -1,5 +1,4 @@
 import { Parser, exec } from '../../data/parser';
-import { Memo } from '../../data/parser/context/memo';
 import { firstline, isBlank } from './line';
 
 export function block<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
@@ -7,7 +6,6 @@ export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
   assert(parser);
   return ({ source, context }) => {
     if (source === '') return;
-    context.memo ??= new Memo();
     const result = parser({ source, context });
     if (result === undefined) return;
     const rest = exec(result);

package/src/combinator/control/constraint/line.ts

@@ -1,12 +1,10 @@
 import { Parser, eval, exec, check } from '../../data/parser';
-import { Memo } from '../../data/parser/context/memo';
 
 export function line<P extends Parser<unknown>>(parser: P): P;
 export function line<T>(parser: Parser<T>): Parser<T> {
   assert(parser);
   return ({ source, context }) => {
     if (source === '') return;
-    context.memo ??= new Memo();
     const line = firstline(source);
     context.offset ??= 0;
     context.offset += source.length - line.length;

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

@@ -1,5 +1,8 @@
 import { Parser, Ctx, Context, check } from '../../data/parser';
+import { max } from 'spica/alias';
 
+// 設計上キャッシュが汚染されるが運用で回避可能
+// 変換の前または後のみキャッシュされるなら問題ない
 export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, empty?: boolean): P;
 export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>, empty = false): Parser<T> {
   assert(parser);
@@ -7,11 +10,13 @@ export function convert<T>(conv: (source: string, context: Ctx) => string, parse
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
+    const offset = max(source.length - src.length, 0);
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({ source: src, context });
     assert(check(src, result));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     return result;
   };
 }

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

@@ -1,6 +1,6 @@
 import { Parser, Ctx } from '../../data/parser';
 import { firstline, isBlank } from '../constraint/line';
-import { unshift } from 'spica/array';
+import { push } from 'spica/array';
 
 export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: RegExp, limit: number, separation = true): Parser<string, C, D> {
   return ({ source }) => {
@@ -42,6 +42,6 @@ export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: Reg
       }
       rest = rest.slice(line.length);
     }
-    return [unshift([block, overflow, closer], matches), rest];
+    return [push([block, overflow, closer], matches), rest];
   };
 }

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

@@ -20,10 +20,12 @@ export function indent<T>(opener: RegExp | Parser<T>, parser?: Parser<T> | boole
     ([indent]) => indent.length * 2 + +(indent[0] === ' '), {})), separation),
     (lines, rest, context) => {
       assert(parser = parser as Parser<T>);
+      const offset = rest.length;
+      assert(offset >= 0);
       context.offset ??= 0;
-      context.offset += rest.length;
+      context.offset += offset;
       const result = parser({ source: trimBlockEnd(lines.join('')), context });
-      context.offset -= rest.length;
+      context.offset -= offset;
       return result && exec(result) === ''
         ? [eval(result), rest]
         : undefined;

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

@@ -12,11 +12,13 @@ export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
     const src = match(source);
     assert(source.startsWith(src));
     if (src === '') return;
+    const offset = source.length - src.length;
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({ source: src, context });
     assert(check(src, result));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (result === undefined) return;
     assert(exec(result).length < src.length);
     return exec(result).length < src.length
@@ -41,11 +43,13 @@ 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));
+    const offset = source.length - src.length;
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const res2 = parser({ source: src, context });
     assert(check(src, res2));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (res2 === undefined) return;
     assert(exec(res2) === '');
     return exec(res2).length < src.length

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

@@ -1,10 +1,11 @@
 export class Memo {
   constructor(
     public readonly targets = ~0,
+    public readonly margin = 0,
   ) {
-    this.targets = targets;
   }
   private memory: Record<number, Record<number, readonly [any[], number] | readonly []>>[/* pos */] = [];
+  private count = 0;
   public get length(): number {
     return this.memory.length;
   }
@@ -13,6 +14,7 @@ export class Memo {
     syntax: number,
     state: number,
   ): readonly [any[], number] | readonly [] | undefined {
+    if (this.count === 0) return;
     //console.log('get', position, syntax, state, this.memory[position - 1]?.[syntax]?.[state]);
     const cache = this.memory[position - 1]?.[syntax]?.[state];
     return cache?.length === 2
@@ -26,6 +28,7 @@ export class Memo {
     nodes: any[] | undefined,
     offset: number,
   ): void {
+    this.count += +!this.memory[position - 1];
     const record = this.memory[position - 1] ??= {};
     assert(!record[syntax]?.[state]);
     (record[syntax] ??= {})[state] = nodes
@@ -35,12 +38,13 @@ export class Memo {
   }
   public resize(position: number): void {
     const memory = this.memory;
-    for (let len = memory.length, i = position; i < len; ++i) {
-      memory.pop();
+    for (let i = memory.length; i > position; --i) {
+      this.count -= +memory.pop()!;
     }
     //console.log('resize', position + 1);
   }
   public clear(): void {
     this.memory = [];
+    this.count = 0;
   }
 }

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

@@ -69,19 +69,17 @@ export function syntax<T>(syntax: number, prec: number, state: number, parser?:
     const position = source.length + context.offset!;
     const stateOuter = context.state ?? 0;
     const stateInner = context.state = stateOuter | state;
-    const cache = syntax && stateInner & memo.targets && memo.get(position, syntax, stateInner);
+    const cache = syntax & memo.targets && stateInner && memo.get(position, syntax, stateInner);
     const result: Result<T> = cache
       ? cache.length === 0
         ? undefined
         : [cache[0], source.slice(cache[1])]
       : parser!({ source, context });
-    if (syntax && stateOuter & memo.targets) {
-      cache ?? memo.set(position, syntax, stateInner, eval(result), source.length - exec(result, '').length);
-      assert.deepStrictEqual(cache && cache, cache && memo.get(position, syntax, stateInner));
+    if (stateOuter && !cache && syntax & memo.targets) {
+      memo.set(position, syntax, stateInner, eval(result), source.length - exec(result, '').length);
     }
-    if (result && !stateOuter && memo.length! >= position + 2) {
-      assert(!(stateOuter & memo.targets));
-      memo.resize(position + 2);
+    else if (!stateOuter && result && memo.length! >= position + memo.margin) {
+      memo.resize(position + memo.margin);
     }
     context.state = stateOuter;
     return result;

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

@@ -32,7 +32,7 @@ export function some<T>(parser: Parser<T>, end?: string | RegExp | number, delim
       assert.doesNotThrow(() => limit < 0 && check(rest, result));
       if (result === undefined) break;
       nodes = nodes
-        ? nodes.length < eval(result).length
+        ? nodes.length < eval(result).length / 8
           ? unshift(nodes, eval(result))
           : push(nodes, eval(result))
         : eval(result);

package/src/parser/block.ts

@@ -17,7 +17,7 @@ import { blockquote } from './block/blockquote';
 import { mediablock } from './block/mediablock';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
-import { State } from './context';
+import { Syntax } from './context';
 import { rnd0Z } from 'spica/random';
 import { html } from 'typed-dom/dom';
 
@@ -39,7 +39,10 @@ export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
 export const block: BlockParser = creation(0, false,
-  reset({ resources: { clock: 20000, recursion: 20 + 1 }, memo: new Memo(State.backtrackers) },
+  reset({
+    resources: { clock: 20000, recursion: 20 + 1 },
+    memo: new Memo(Syntax.targets, 2),
+  },
   error(union([
     emptyline,
     pagebreak,

package/src/parser/context.ts

@@ -1,13 +1,21 @@
 export const enum Syntax {
-  reference = 1 << 8,
-  index = 1 << 7,
-  placeholder = 1 << 6,
-  ruby = 1 << 5,
-  link = 1 << 4,
-  bracket = 1 << 3,
-  media = 1 << 2,
+  annotation = 1 << 8,
+  reference = 1 << 7,
+  index = 1 << 6,
+  placeholder = 1 << 5,
+  ruby = 1 << 4,
+  link = 1 << 3,
+  bracket = 1 << 2,
   autolink = 1 << 1,
   none = 0,
+  targets = 0
+    | Syntax.annotation
+    | Syntax.reference
+    | Syntax.index
+    | Syntax.placeholder
+    | Syntax.ruby
+    | Syntax.link
+    | Syntax.bracket,
 }
 
 export const enum State {
@@ -30,10 +38,4 @@ export const enum State {
     | State.link
     | State.mark
     | State.autolink,
-  backtrackers = 0
-    | State.annotation
-    | State.reference
-    | State.index
-    | State.link
-    | State.media,
 }

package/src/parser/inline/annotation.ts

@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
 export const annotation: AnnotationParser = lazy(() => creation(surround(
   '((',
   constraint(State.annotation, false,
-  syntax(Syntax.none, 6, State.annotation | State.media,
+  syntax(Syntax.annotation, 6, State.annotation | State.media,
   trimBlankStart(some(union([inline]), ')', [[/^\\?\n/, 9], [')', 2], ['))', 6]])))),
   '))',
   false,

package/src/parser/inline/autolink.ts

@@ -33,7 +33,7 @@ export const autolink: AutolinkParser = lazy(() =>
       // Escape unmatched hashtag-like strings.
       str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', emoji), 'u')),
       // Escape invalid leading characters.
-      str(/^[0-9\p{Sc}](?=>)/u),
+      str(/^[0-9a-z](?=>)/iu),
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),

package/src/parser/inline/htmlentity.ts

@@ -27,4 +27,4 @@ const parse = reduce((el => (entity: string): string | undefined => {
   return entity === text
     ? undefined
     : text;
-})(html('b')));
+})(html('span')));

package/src/parser/inline/media.ts

@@ -21,7 +21,7 @@ Object.setPrototypeOf(optspec, null);
 export const media: MediaParser = lazy(() => validate(['![', '!{'], creation(10, open(
   '!',
   constraint(State.media, false,
-  syntax(Syntax.media, 2, ~State.link,
+  syntax(Syntax.none, 2, ~State.link,
   bind(verify(fmap(tails([
     dup(surround(
       '[',
@@ -68,9 +68,12 @@ export const linemedia: MediaParser.LineMediaParser = surround(
   /^(?=[^\S\n]*(?:$|\n))/);
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union([
-  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('"'), precedence(3, some(union([unsafehtmlentity, txt]), '"')), str('"'), true),
 ])));
 

package/src/parser/inline/template.ts

@@ -13,8 +13,11 @@ export const template: TemplateParser = lazy(() => creation(surround(
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest])));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creation(union([
-  surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('['), some(union([bracket, escsource]), ']'), str(']'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('['), some(union([bracket, escsource]), ']'), str(']'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true,
+    undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('"'), precedence(3, some(escsource, /^"|^\\?\n/)), str('"'), true),
 ])));

package/src/parser/inline.ts

@@ -4,7 +4,6 @@ import { annotation } from './inline/annotation';
 import { reference } from './inline/reference';
 import { template } from './inline/template';
 import { remark } from './inline/remark';
-import { math } from './inline/math';
 import { extension } from './inline/extension';
 import { ruby } from './inline/ruby';
 import { textlink } from './inline/link';
@@ -13,8 +12,9 @@ import { insertion } from './inline/insertion';
 import { deletion } from './inline/deletion';
 import { mark } from './inline/mark';
 import { emstrong } from './inline/emstrong';
-import { emphasis } from './inline/emphasis';
 import { strong } from './inline/strong';
+import { emphasis } from './inline/emphasis';
+import { math } from './inline/math';
 import { code } from './inline/code';
 import { htmlentity } from './inline/htmlentity';
 import { autolink } from './inline/autolink';
@@ -26,7 +26,6 @@ export import AnnotationParser = InlineParser.AnnotationParser;
 export import ReferenceParser = InlineParser.ReferenceParser;
 export import TemplateParser = InlineParser.TemplateParser;
 export import RemarkParser = InlineParser.RemarkParser;
-export import MathParser = InlineParser.MathParser;
 export import ExtensionParser = InlineParser.ExtensionParser;
 export import RubyParser = InlineParser.RubyParser;
 export import LinkParser = InlineParser.LinkParser;
@@ -35,8 +34,9 @@ export import InsertionParser = InlineParser.InsertionParser;
 export import DeletionParser = InlineParser.DeletionParser;
 export import MarkParser = InlineParser.MarkParser;
 export import EmStrongParser = InlineParser.EmStrongParser;
-export import EmphasisParser = InlineParser.EmphasisParser;
 export import StrongParser = InlineParser.StrongParser;
+export import EmphasisParser = InlineParser.EmphasisParser;
+export import MathParser = InlineParser.MathParser;
 export import CodeParser = InlineParser.CodeParser;
 export import MediaParser = InlineParser.MediaParser;
 export import HTMLEntityParser = InlineParser.HTMLEntityParser;
@@ -50,7 +50,6 @@ export const inline: InlineParser = lazy(() => union([
   reference,
   template,
   remark,
-  math,
   extension,
   ruby,
   textlink,
@@ -61,6 +60,7 @@ export const inline: InlineParser = lazy(() => union([
   emstrong,
   strong,
   emphasis,
+  math,
   code,
   htmlentity,
   autolink,