securemark 0.289.0 → 0.289.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.289.2
+
+- Refactoring.
+
+## 0.289.1
+
+- Refactoring.
+
 ## 0.289.0
 
 - Improve bracket parser.

package/README.md

@@ -69,7 +69,7 @@ Secure markdown renderer working on browsers for user input data.
 |-|------------------------------|
 |9| \n                           |
 |6| `                            |
-|5| ${}$                         |
+|5| \${}$                        |
 |4| [% %]                        |
 |3| \<tag>\</tag>                |
 |2| $, "                         |

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.289.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.289.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("Prism"), require("DOMPurify"));
@@ -3160,7 +3160,7 @@ exports.clear = exports.close = exports.open = exports.surround = void 0;
 const parser_1 = __webpack_require__(605);
 const fmap_1 = __webpack_require__(2705);
 const array_1 = __webpack_require__(6876);
-function surround(opener, parser, closer, optional = false, f, g, backtracks = [], bstate = 0) {
+function surround(opener, parser, closer, optional = false, f, g, backtracks = [], backtrackstate = 0) {
   switch (typeof opener) {
     case 'string':
     case 'object':
@@ -3171,6 +3171,7 @@ function surround(opener, parser, closer, optional = false, f, g, backtracks = [
     case 'object':
       closer = match(closer);
   }
+  const statesize = 2;
   return ({
     source,
     context
@@ -3199,21 +3200,20 @@ function surround(opener, parser, closer, optional = false, f, g, backtracks = [
           if (source[i] !== source[0]) break;
           const pos = source.length + offset - i - 1;
           if (!(pos in backtracks)) continue;
-          // bracket only
-          const shift = backtrack >>> 2 === state >>> 2 ? state & 3 : 0;
-          if (backtracks[pos] & 1 << (backtrack >>> 2) + shift) return void revert(context, linebreak);
+          const shift = backtrack >>> statesize & state >>> statesize ? state & (1 << statesize) - 1 : 0;
+          if (backtracks[pos] & 1 << size(backtrack >>> statesize) + shift) return void revert(context, linebreak);
         }
       }
     }
     const {
-      backtrack: state = 0
+      backtrack = 0
     } = context;
-    context.backtrack = state | bstate;
+    context.backtrack = backtrack | backtrackstate;
     const res2 = mr_ !== '' ? parser({
       source: mr_,
       context
     }) : undefined;
-    context.backtrack = state;
+    context.backtrack = backtrack;
     const rm = (0, parser_1.eval)(res2);
     const r_ = (0, parser_1.exec)(res2, mr_);
     if (!rm && !optional) return void revert(context, linebreak);
@@ -3231,9 +3231,8 @@ function surround(opener, parser, closer, optional = false, f, g, backtracks = [
           backtrack: state = 0,
           offset = 0
         } = context;
-        // bracket only
-        const shift = backtrack >>> 2 === state >>> 2 ? state & 3 : 0;
-        backtracks[source.length + offset - 1] |= 1 << (backtrack >>> 2) + shift;
+        const shift = backtrack >>> statesize & state >>> statesize ? state & (1 << statesize) - 1 : 0;
+        backtracks[source.length + offset - 1] |= 1 << size(backtrack >>> statesize) + shift;
       }
     }
     context.recent = [lmr_.slice(0, lmr_.length - mr_.length), mr_.slice(0, mr_.length - r_.length), r_.slice(0, r_.length - rest.length)];
@@ -3262,6 +3261,15 @@ function match(pattern) {
       };
   }
 }
+function size(bits) {
+  if (bits === 0) return 0;
+  let p = 0;
+  for (let s = 32 / 2; s > 0; s >>>= 1) {
+    if (bits >>> p + s === 0) continue;
+    p += s;
+  }
+  return p + 1;
+}
 function revert(context, linebreak) {
   context.linebreak = linebreak;
 }
@@ -5889,7 +5897,7 @@ const visibility_1 = __webpack_require__(6364);
 const dom_1 = __webpack_require__(394);
 exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, false, (0, combinator_1.surround)('((', (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 4 /* State.media */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [['\n', 9], [')', 1]])))), '))', false, ([, ns], rest) => (0, visibility_1.trimBlankNodeEnd)(ns).length > 0 ? [[(0, dom_1.html)('sup', {
   class: 'annotation'
-}, [(0, dom_1.html)('span', (0, dom_1.defrag)(ns))])], rest] : undefined, undefined, [3 | 16 /* Backtrack.linedoublebracket */, 1 | 12 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)));
+}, [(0, dom_1.html)('span', (0, dom_1.defrag)(ns))])], rest] : undefined, undefined, [3 | 32 /* Backtrack.linedoublebracket */, 1 | 16 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)));
 
 /***/ },
 
@@ -6121,17 +6129,17 @@ const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 const indexA = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*$/;
 const indexF = new RegExp(indexA.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0) + 0xFEE0)));
-exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, ')', [[')', 1]]))), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest, {
+exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, ')', [[')', 1]]))), (0, source_1.str)(')'), true, ([as, bs = [], cs], rest, {
   recent = []
 }) => [indexA.test(recent[1]) ? recent : [(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], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, '）', [['）', 1]]))), (0, source_1.str)('）'), true, ([as, bs = [], cs], 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], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '）', [['）', 1]]))), (0, source_1.str)('）'), true, ([as, bs = [], cs], rest, {
   recent = []
 }) => [indexF.test(recent[1]) ? recent : [(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.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('［'), (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, '］', [['］', 1]]))), (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.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, '}', [['}', 1]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('｛'), (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.some)(inline_1.inline, '｝', [['｝', 1]]))), (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.recursion)(5 /* Recursion.bracket */, (0, combinator_1.precedence)(2, (0, combinator_1.some)(inline_1.inline, '"', [['"', 2, false]]))), (0, source_1.str)('"'), true, ([as, bs = [], cs], 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.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('［'), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '］', [['］', 1]]))), (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.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '}', [['}', 1]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [2 | 8 /* Backtrack.bracket */]), (0, combinator_1.surround)((0, source_1.str)('｛'), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '｝', [['｝', 1]]))), (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.precedence)(2, (0, combinator_1.recursion)(5 /* Recursion.bracket */, (0, combinator_1.some)(inline_1.inline, '"', [['"', 2, false]]))), (0, source_1.str)('"'), true, ([as, bs = [], cs], rest, {
   linebreak = 0
 }) => linebreak > rest.length ? [(0, array_1.unshift)(as, bs), cs[0] + rest] : [(0, array_1.push)((0, array_1.unshift)(as, bs), cs), rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [2 | 8 /* Backtrack.bracket */])]));
 
@@ -6313,7 +6321,7 @@ const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(32 /* State.index */, false, (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.precedence)(1, (0, combinator_1.state)(251 /* State.linkers */ | 4 /* State.media */, (0, visibility_1.tightStart)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [['\n', 9], [']', 1]])))), ']', false, ([, ns], rest) => (0, visibility_1.trimBlankNodeEnd)(ns).length > 0 ? [[(0, dom_1.html)('a', {
   'data-index': dataindex(ns)
-}, (0, dom_1.defrag)(ns))], rest] : undefined, undefined, [3 | 12 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)), ([el]) => [(0, dom_1.define)(el, {
+}, (0, dom_1.defrag)(ns))], rest] : undefined, undefined, [3 | 16 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : undefined,
   class: 'index',
   href: el.id ? `#${el.id}` : undefined
@@ -6518,7 +6526,7 @@ const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 const body = (0, source_1.str)(/^\$[A-Za-z]*(?:(?:-[A-Za-z][0-9A-Za-z]*)+|-(?:(?:0|[1-9][0-9]*)\.)*(?:0|[1-9][0-9]*)(?![0-9A-Za-z]))/);
 exports.segment = (0, combinator_1.clear)((0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']'), body]));
-exports.label = (0, combinator_1.constraint)(16 /* State.label */, false, (0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']', false, undefined, undefined, [1 | 12 /* Backtrack.linebracket */, 1]), body]), ([text]) => [(0, dom_1.html)('a', {
+exports.label = (0, combinator_1.constraint)(16 /* State.label */, false, (0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']', false, undefined, undefined, [1 | 16 /* Backtrack.linebracket */, 1]), body]), ([text]) => [(0, dom_1.html)('a', {
   class: 'label',
   'data-label': text.slice(text[1] === '-' ? 0 : 1).toLowerCase()
 }, text)]));
@@ -6734,7 +6742,7 @@ const optspec = {
   rel: ['nofollow']
 };
 Object.setPrototypeOf(optspec, null);
-exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(8 /* State.link */, false, (0, combinator_1.creation)(10, (0, combinator_1.precedence)(1, (0, combinator_1.state)(251 /* State.linkers */ | 4 /* 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], [']', 1]])), ']', true, undefined, undefined, [1 | 12 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/, false, undefined, undefined, [3 | 24 /* Backtrack.link */]))])), ([params, content = []], rest, context) => {
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(8 /* State.link */, false, (0, combinator_1.creation)(10, (0, combinator_1.precedence)(1, (0, combinator_1.state)(251 /* State.linkers */ | 4 /* 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], [']', 1]])), ']', true, undefined, undefined, [1 | 16 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/, false, undefined, undefined, [3 | 128 /* Backtrack.link */]))])), ([params, content = []], rest, context) => {
   if (content.length !== 0 && (0, visibility_1.trimBlankNodeEnd)(content).length === 0) return;
   return [[parse((0, dom_1.defrag)(content), params, context)], rest];
 }))))));
@@ -6917,7 +6925,7 @@ const optspec = {
   rel: undefined
 };
 Object.setPrototypeOf(optspec, null);
-exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(4 /* State.media */, false, (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(10, (0, combinator_1.open)('!', (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.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [['\n', 9]])), ']', true, undefined, undefined, [3 | 4 /* Backtrack.lineescbracket */])), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/, false, undefined, undefined, [3 | 24 /* Backtrack.link */]))]), ([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.constraint)(4 /* State.media */, false, (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(10, (0, combinator_1.open)('!', (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.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [['\n', 9]])), ']', true, undefined, undefined, [3 | 4 /* Backtrack.lineescbracket */])), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/, false, undefined, undefined, [3 | 128 /* Backtrack.link */]))]), ([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;
@@ -6997,7 +7005,7 @@ const array_1 = __webpack_require__(6876);
 const util_1 = __webpack_require__(4992);
 exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64 /* State.reference */, false, (0, combinator_1.surround)((0, source_1.str)('[['), (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */ | 4 /* State.media */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, ']', [['\n', 9], [']', 1]]))]))), ']]', false, ([, ns], rest) => (0, visibility_1.trimBlankNodeEnd)(ns).length > 0 ? [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, dom_1.defrag)(ns))])], rest] : undefined, ([as, bs], rest, {
   state = 0
-}) => state & 128 /* State.annotation */ ? [(0, array_1.unshift)(as, bs), rest] : undefined, [3 | 16 /* Backtrack.linedoublebracket */, 1 | 12 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)));
+}) => state & 128 /* State.annotation */ ? [(0, array_1.unshift)(as, bs), rest] : undefined, [3 | 32 /* Backtrack.linedoublebracket */, 1 | 16 /* Backtrack.linebracket */], 8 /* Backtrack.bracket */ | 1 /* BacktrackState.nobreak */)));
 // Chicago-Style
 const abbr = (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) {
@@ -7073,13 +7081,13 @@ exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinato
   }), [undefined])[0];
   ns && ns.at(-1) === '' && ns.pop();
   return ns && (0, visibility_1.isTightNodeStart)(ns) ? [ns, rest] : undefined;
-}, undefined, [3 | 20 /* Backtrack.ruby */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/u), ')', false, ([, [source]], rest, context) => {
+}, undefined, [3 | 64 /* Backtrack.ruby */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/u), ')', false, ([, [source]], rest, context) => {
   const ns = (0, parser_1.eval)(text({
     source,
     context
   }), [undefined])[0];
   return ns && [ns, rest];
-}, undefined, [3 | 20 /* Backtrack.ruby */]))]), ([texts, rubies]) => {
+}, undefined, [3 | 64 /* Backtrack.ruby */]))]), ([texts, rubies]) => {
   switch (true) {
     case rubies.length <= texts.length:
       return [(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)(texts.reduce((acc, _, i) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), [])))];
@@ -7201,7 +7209,7 @@ const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('{{', (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}', [['\n', 9]])), '}}', true, ([, ns = []], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
-}, `{{${ns.join('')}}}`)], rest], undefined, [3 | 16 /* Backtrack.linedoublebracket */, 1 | 4 /* Backtrack.lineescbracket */]));
+}, `{{${ns.join('')}}}`)], rest], undefined, [3 | 32 /* Backtrack.linedoublebracket */, 1 | 4 /* Backtrack.lineescbracket */]));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')')), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']')), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.escsource, '"'))), (0, source_1.str)('"'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */])]));
 
 /***/ },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.289.0",
+  "version": "0.289.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/surround.ts

@@ -8,7 +8,7 @@ export function surround<P extends Parser<unknown>, S = string>(
   f?: (rss: [S[], SubTree<P>[], S[]], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [S[], SubTree<P>[], string], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
-  bstate?: number,
+  backtrackstate?: number,
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
@@ -16,7 +16,7 @@ export function surround<P extends Parser<unknown>, S = string>(
   f?: (rss: [S[], SubTree<P>[] | undefined, S[]], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [S[], SubTree<P>[] | undefined, string], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
-  bstate?: number,
+  backtrackstate?: number,
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
@@ -24,7 +24,7 @@ export function surround<P extends Parser<unknown>, S = string>(
   f?: (rss: [S[], Tree<P>[], S[]], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [S[], Tree<P>[], string], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
-  bstate?: number,
+  backtrackstate?: number,
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
@@ -32,7 +32,7 @@ export function surround<P extends Parser<unknown>, S = string>(
   f?: (rss: [S[], Tree<P>[] | undefined, S[]], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [S[], Tree<P>[] | undefined, string], rest: string, context: Context<P>) => Result<Tree<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
-  bstate?: number,
+  backtrackstate?: number,
 ): P;
 export function surround<T>(
   opener: string | RegExp | Parser<T>, parser: Parser<T>, closer: string | RegExp | Parser<T>,
@@ -40,7 +40,7 @@ export function surround<T>(
   f?: (rss: [T[], T[], T[]], rest: string, context: Ctx) => Result<T>,
   g?: (rss: [T[], T[], string], rest: string, context: Ctx) => Result<T>,
   backtracks: readonly number[] = [],
-  bstate: number = 0,
+  backtrackstate: number = 0,
 ): Parser<T> {
   switch (typeof opener) {
     case 'string':
@@ -52,6 +52,7 @@ export function surround<T>(
     case 'object':
       closer = match(closer);
   }
+  const statesize = 2;
   return ({ source, context }) => {
     const lmr_ = source;
     if (lmr_ === '') return;
@@ -69,17 +70,16 @@ export function surround<T>(
           if (source[i] !== source[0]) break;
           const pos = source.length + offset - i - 1;
           if (!(pos in backtracks)) continue;
-          // bracket only
-          const shift = backtrack >>> 2 === state >>> 2 ? state & 3 : 0;
-          if (backtracks[pos] & 1 << (backtrack >>> 2) + shift) return void revert(context, linebreak);
+          const shift = backtrack >>> statesize & state >>> statesize ? state & (1 << statesize) - 1 : 0;
+          if (backtracks[pos] & 1 << size(backtrack >>> statesize) + shift) return void revert(context, linebreak);
         }
       }
     }
-    const { backtrack: state = 0 } = context;
-    context.backtrack = state | bstate;
+    const { backtrack = 0 } = context;
+    context.backtrack = backtrack | backtrackstate;
     const res2 = mr_ !== '' ? parser({ source: mr_, context }) : undefined;
     assert(check(mr_, res2));
-    context.backtrack = state;
+    context.backtrack = backtrack;
     const rm = eval(res2);
     const r_ = exec(res2, mr_);
     if (!rm && !optional) return void revert(context, linebreak);
@@ -91,9 +91,8 @@ export function surround<T>(
     for (const backtrack of backtracks) {
       if (backtrack & 2 && rr === undefined) {
         const { backtracks = {}, backtrack: state = 0, offset = 0 } = context;
-        // bracket only
-        const shift = backtrack >>> 2 === state >>> 2 ? state & 3 : 0;
-        backtracks[source.length + offset - 1] |= 1 << (backtrack >>> 2) + shift;
+        const shift = backtrack >>> statesize & state >>> statesize ? state & (1 << statesize) - 1 : 0;
+        backtracks[source.length + offset - 1] |= 1 << size(backtrack >>> statesize) + shift;
       }
     }
     context.recent = [
@@ -131,7 +130,20 @@ function match(pattern: string | RegExp): (input: Input) => [never[], string] |
       };
   }
 }
-
+function size(bits: number): number {
+  if (bits === 0) return 0;
+  let p = 0;
+  for (let s = 32 / 2; s > 0; s >>>= 1) {
+    if (bits >>> p + s === 0) continue;
+    p += s;
+  }
+  return p + 1;
+}
+assert(size(0 << 0) === 0);
+assert(size(1 << 0) === 1);
+assert(size(1 << 1) === 2);
+assert(size(1 << 30) === 31);
+assert(size(1 << 31) === 32);
 function revert(context: Ctx, linebreak: number | undefined): void {
   context.linebreak = linebreak;
 }

package/src/parser/context.ts

@@ -28,11 +28,11 @@ export const enum Recursion {
 }
 
 export const enum Backtrack {
-  link = 6 << 2,
-  ruby = 5 << 2,
-  linedoublebracket = 4 << 2,
-  linebracket = 3 << 2,
-  bracket = 2 << 2,
+  link = 1 << 7,
+  ruby = 1 << 6,
+  linedoublebracket = 1 << 5,
+  linebracket = 1 << 4,
+  bracket = 1 << 3,
   lineescbracket = 1 << 2,
   lineunescbracket = 0 << 2,
 }
@@ -41,7 +41,6 @@ export const enum Backtrack {
 export const enum BacktrackState {
   nobreak = 1,
 }
-assert(Backtrack.linebracket === Backtrack.bracket + (BacktrackState.nobreak << 2));
 
 export const enum Command {
   Error = '\x07',

package/src/parser/inline/annotation.ts

@@ -15,4 +15,6 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
     trimBlankNodeEnd(ns).length > 0
       ? [[html('sup', { class: 'annotation' }, [html('span', defrag(ns))])], rest]
       : undefined,
-  undefined, [3 | Backtrack.linedoublebracket, 1 | Backtrack.linebracket], Backtrack.bracket | BacktrackState.nobreak)));
+  undefined,
+  [3 | Backtrack.linedoublebracket, 1 | Backtrack.linebracket],
+  Backtrack.bracket | BacktrackState.nobreak)));

package/src/parser/inline/bracket.ts

@@ -11,15 +11,24 @@ const indexF = new RegExp(indexA.source.replace(', ', '[，、]')
   .replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0)! + 0xFEE0)));
 
 export const bracket: BracketParser = lazy(() => union([
-  surround(str('('), recursion(Recursion.bracket, precedence(1, some(inline, ')', [[')', 1]]))), str(')'), true,
+  surround(
+    str('('),
+    precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
+    str(')'),
+    true,
     ([as, bs = [], cs], rest, { recent = [] }) => [
       indexA.test(recent[1])
         ? recent
         : [html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))],
       rest
     ],
-    ([as, bs = []], rest) => [unshift(as, bs), rest], [2 | Backtrack.bracket]),
-  surround(str('（'), recursion(Recursion.bracket, precedence(1, some(inline, '）', [['）', 1]]))), str('）'), true,
+    ([as, bs = []], rest) => [unshift(as, bs), rest],
+    [2 | Backtrack.bracket]),
+  surround(
+    str('（'),
+    precedence(1, recursion(Recursion.bracket, some(inline, '）', [['）', 1]]))),
+    str('）'),
+    true,
     ([as, bs = [], cs], rest, { recent = [] }) => [
       indexF.test(recent[1])
         ? recent
@@ -27,23 +36,46 @@ export const bracket: BracketParser = lazy(() => union([
       rest
     ],
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('['), recursion(Recursion.bracket, precedence(1, some(inline, ']', [[']', 1]]))), str(']'), true,
+  surround(
+    str('['),
+    precedence(1, recursion(Recursion.bracket, some(inline, ']', [[']', 1]]))),
+    str(']'),
+    true,
     undefined,
-    ([as, bs = []], rest) => [unshift(as, bs), rest], [2 | Backtrack.bracket]),
-  surround(str('［'), recursion(Recursion.bracket, precedence(1, some(inline, '］', [['］', 1]]))), str('］'), true,
+    ([as, bs = []], rest) => [unshift(as, bs), rest],
+    [2 | Backtrack.bracket]),
+  surround(
+    str('［'),
+    precedence(1, recursion(Recursion.bracket, some(inline, '］', [['］', 1]]))),
+    str('］'),
+    true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('{'), recursion(Recursion.bracket, precedence(1, some(inline, '}', [['}', 1]]))), str('}'), true,
+  surround(
+    str('{'),
+    precedence(1, recursion(Recursion.bracket, some(inline, '}', [['}', 1]]))),
+    str('}'),
+    true,
     undefined,
-    ([as, bs = []], rest) => [unshift(as, bs), rest], [2 | Backtrack.bracket]),
-  surround(str('｛'), recursion(Recursion.bracket, precedence(1, some(inline, '｝', [['｝', 1]]))), str('｝'), true,
+    ([as, bs = []], rest) => [unshift(as, bs), rest],
+    [2 | Backtrack.bracket]),
+  surround(
+    str('｛'),
+    precedence(1, recursion(Recursion.bracket, some(inline, '｝', [['｝', 1]]))),
+    str('｝'),
+    true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  // 改行禁止はバックトラックなしでは内側の構文を破壊するため安易に行えない。
-  surround(str('"'), recursion(Recursion.bracket, precedence(2, some(inline, '"', [['"', 2, false]]))), str('"'), true,
+  // 同一行内でしか閉じない以外括弧と同じ挙動
+  surround(
+    str('"'),
+    precedence(2, recursion(Recursion.bracket, some(inline, '"', [['"', 2, false]]))),
+    str('"'),
+    true,
     ([as, bs = [], cs], rest, { linebreak = 0 }) =>
       linebreak > rest.length
         ? [unshift(as, bs), cs[0] + rest]
         : [push(unshift(as, bs), cs), rest],
-    ([as, bs = []], rest) => [unshift(as, bs), rest], [2 | Backtrack.bracket]),
+    ([as, bs = []], rest) => [unshift(as, bs), rest],
+    [2 | Backtrack.bracket]),
 ]));

package/src/parser/inline/extension/index.ts

@@ -26,7 +26,9 @@ export const index: IndexParser = lazy(() => constraint(State.index, false, fmap
     trimBlankNodeEnd(ns).length > 0
       ? [[html('a', { 'data-index': dataindex(ns) }, defrag(ns))], rest]
       : undefined,
-  undefined, [3 | Backtrack.linebracket], Backtrack.bracket | BacktrackState.nobreak)),
+  undefined,
+  [3 | Backtrack.linebracket],
+  Backtrack.bracket | BacktrackState.nobreak)),
   ([el]: [HTMLAnchorElement]) => [
     define(el,
       {

package/src/parser/inline/extension/placeholder.ts

@@ -23,4 +23,5 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
       ...invalid('extension', 'syntax', `Invalid start symbol or linebreak`),
     }, defrag(bs)),
   ], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest], [3 | Backtrack.bracket]));
+  ([as, bs], rest) => [unshift(as, bs), rest],
+  [3 | Backtrack.bracket]));

package/src/parser/inline/link.ts

@@ -22,12 +22,15 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       '[',
       trimBlankStart(some(union([inline]), ']', [['\n', 9], [']', 1]])),
       ']',
-      true, undefined, undefined, [1 | Backtrack.linebracket], Backtrack.bracket | BacktrackState.nobreak)),
+      true, undefined, undefined,
+      [1 | Backtrack.linebracket],
+      Backtrack.bracket | BacktrackState.nobreak)),
     dup(surround(
       /^{(?![{}])/,
       inits([uri, some(option)]),
       /^[^\S\n]*}/,
-      false, undefined, undefined, [3 | Backtrack.link])),
+      false, undefined, undefined,
+      [3 | Backtrack.link])),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
     assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));

package/src/parser/inline/media.ts

@@ -29,12 +29,14 @@ export const media: MediaParser = lazy(() => constraint(State.media, false, vali
         txt,
       ]), ']', [['\n', 9]])),
       ']',
-      true, undefined, undefined, [3 | Backtrack.lineescbracket])),
+      true, undefined, undefined,
+      [3 | Backtrack.lineescbracket])),
     dup(surround(
       /^{(?![{}])/,
       inits([uri, some(option)]),
       /^[^\S\n]*}/,
-      false, undefined, undefined, [3 | Backtrack.link])),
+      false, undefined, undefined,
+      [3 | Backtrack.link])),
   ]),
   ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]),
   ([[text]]) => text === '' || text.trim() !== ''),

package/src/parser/inline/reference.ts

@@ -25,7 +25,8 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     state & State.annotation
       ? [unshift(as, bs), rest]
       : undefined,
-  [3 | Backtrack.linedoublebracket, 1 | Backtrack.linebracket], Backtrack.bracket | BacktrackState.nobreak)));
+  [3 | Backtrack.linedoublebracket, 1 | Backtrack.linebracket],
+  Backtrack.bracket | BacktrackState.nobreak)));
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = surround(

package/src/parser/inline/ruby.ts

@@ -19,7 +19,8 @@ export const ruby: RubyParser = lazy(() => fmap(
         ns && ns.at(-1) === '' && ns.pop();
         return ns && isTightNodeStart(ns) ? [ns, rest] : undefined;
       },
-      undefined, [3 | Backtrack.ruby])),
+      undefined,
+      [3 | Backtrack.ruby])),
     dup(surround(
       '(', str(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/u), ')',
       false,
@@ -27,7 +28,8 @@ export const ruby: RubyParser = lazy(() => fmap(
         const ns = eval(text({ source, context }), [undefined])[0];
         return ns && [ns, rest];
       },
-      undefined, [3 | Backtrack.ruby])),
+      undefined,
+      [3 | Backtrack.ruby])),
   ]),
   ([texts, rubies]) => {
     switch (true) {

package/src/parser/inline/template.ts

@@ -11,7 +11,8 @@ export const template: TemplateParser = lazy(() => surround(
   '}}',
   true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('')}}}`)], rest],
-  undefined, [3 | Backtrack.linedoublebracket, 1 | Backtrack.lineescbracket]));
+  undefined,
+  [3 | Backtrack.linedoublebracket, 1 | Backtrack.lineescbracket]));
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,

package/src/parser/inline.test.ts

@@ -84,7 +84,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('"*a\nb*')), [['"', '<em>a<br>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('"*a\n""b*')), [['"', '<em>a<br>""b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('"a\n"*b"c*')), [['"', 'a', '<br>', '"', '*', 'b', '"', 'c', '*'], '']);
-      assert.deepStrictEqual(inspect(parser('"*a\n**b**"("c*')), [['"', '<em>a<br><strong>b</strong>"("c</em>'], '']);
+      assert.deepStrictEqual(inspect(parser('"*a**b\nc**"("*')), [['"', '<em>a<strong>b<br>c</strong>"("</em>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi>a"\nb</bdi>')), [['<bdi>a"<br>b</bdi>'], '']);
       assert.deepStrictEqual(inspect(parser('"<bdi>"a\n""b</bdi>"')), [['"', '<bdi>"a<br>""b</bdi>', '"'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi>*<bdi>a</bdi>*</bdi>')), [['<bdi><em><bdi>a</bdi></em></bdi>'], '']);