securemark 0.296.1 → 0.296.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.296.2
+
+- Fix leading blank character validation with nested syntax.
+
 ## 0.296.1
 
 - Fix parsers to disallow leading blank characters.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.296.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.296.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"));
@@ -2603,18 +2603,19 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.verify = exports.validate = void 0;
-const combinator_1 = __webpack_require__(3484);
+const delimiter_1 = __webpack_require__(385);
+const bind_1 = __webpack_require__(994);
 function validate(pattern, parser) {
   if (typeof pattern === 'function') return guard(pattern, parser);
-  const match = (0, combinator_1.matcher)(pattern, false);
-  return input => match(input) ? parser(input) : undefined;
+  const test = (0, delimiter_1.tester)(pattern, false);
+  return input => test(input) && parser(input);
 }
 exports.validate = validate;
 function guard(f, parser) {
   return input => f(input) ? parser(input) : undefined;
 }
 function verify(parser, cond) {
-  return (0, combinator_1.bind)(parser, (nodes, context) => cond(nodes, context) ? nodes : undefined);
+  return (0, bind_1.bind)(parser, (nodes, context) => cond(nodes, context) ? nodes : undefined);
 }
 exports.verify = verify;
 
@@ -2989,9 +2990,9 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.rewrite = exports.focus = void 0;
 const parser_1 = __webpack_require__(605);
-const combinator_1 = __webpack_require__(3484);
+const delimiter_1 = __webpack_require__(385);
 function focus(scope, parser, slice = true) {
-  const match = (0, combinator_1.matcher)(scope, false);
+  const match = (0, delimiter_1.matcher)(scope, false);
   return (0, parser_1.failsafe)(arg => {
     const {
       context
@@ -3067,22 +3068,22 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.setBacktrack = exports.isBacktrack = exports.close = exports.open = exports.surround = void 0;
 const parser_1 = __webpack_require__(605);
-const combinator_1 = __webpack_require__(3484);
+const delimiter_1 = __webpack_require__(385);
 function surround(opener, parser, closer, optional = false, backtracks = [], f, g) {
   switch (typeof opener) {
     case 'string':
     case 'object':
-      opener = (0, combinator_1.clear)((0, combinator_1.matcher)(opener, true));
+      opener = (0, delimiter_1.tester)(opener, true);
   }
   switch (typeof parser) {
     case 'string':
     case 'object':
-      parser = (0, combinator_1.clear)((0, combinator_1.matcher)(parser, true));
+      parser = (0, delimiter_1.tester)(parser, true);
   }
   switch (typeof closer) {
     case 'string':
     case 'object':
-      closer = (0, combinator_1.clear)((0, combinator_1.matcher)(closer, true));
+      closer = (0, delimiter_1.tester)(closer, true);
   }
   const [blen, rbs, wbs] = reduce(backtracks);
   return (0, parser_1.failsafe)(input => {
@@ -3099,7 +3100,7 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
     } = context;
     context.linebreak = 0;
     const nodesO = opener(input);
-    if (!nodesO) {
+    if (nodesO === undefined) {
       return void revert(context, linebreak);
     }
     if (rbs && isBacktrack(context, rbs, position, blen)) {
@@ -3107,14 +3108,14 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
     }
     const nodesM = context.position < source.length ? parser(input) : undefined;
     context.range = context.position - position;
-    if (!nodesM && !optional) {
+    if (nodesM === undefined && !optional) {
       wbs && setBacktrack(context, wbs, position);
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
     }
     const nodesC = nodesM || optional ? closer(input) : undefined;
     context.range = context.position - position;
-    if (!nodesC) {
+    if (nodesC === undefined) {
       wbs && setBacktrack(context, wbs, position);
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
@@ -3123,7 +3124,7 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
       return void revert(context, linebreak);
     }
     context.range = context.position - position;
-    const result = f ? f([nodesO, nodesM, nodesC], context) : nodesO.import(nodesM ?? new parser_1.List()).import(nodesC);
+    const result = f ? f([nodesO, nodesM, nodesC], context) : nodesM ? nodesO.import(nodesM).import(nodesC) : nodesO.import(nodesC);
     if (result) {
       context.linebreak ||= linebreak;
     }
@@ -3245,8 +3246,9 @@ exports.fmap = fmap;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.Delimiters = void 0;
-const combinator_1 = __webpack_require__(3484);
+exports.tester = exports.matcher = exports.Delimiters = void 0;
+const parser_1 = __webpack_require__(605);
+const context_1 = __webpack_require__(5745);
 class Delimiters {
   constructor() {
     this.tree = {};
@@ -3276,9 +3278,9 @@ class Delimiters {
         return () => undefined;
       case 'string':
       case 'object':
-        const match = (0, combinator_1.matcher)(pattern, false);
-        const verify = after ? (0, combinator_1.matcher)(after, false) : undefined;
-        return verify ? input => match(input) !== undefined && verify(input) !== undefined || undefined : input => match(input) !== undefined || undefined;
+        const test = tester(pattern, false);
+        const verify = after ? tester(after, false) : undefined;
+        return verify ? input => test(input) !== undefined && verify(input) !== undefined || undefined : input => test(input) !== undefined || undefined;
     }
   }
   registry(signature) {
@@ -3390,6 +3392,90 @@ class Delimiters {
   }
 }
 exports.Delimiters = Delimiters;
+function matcher(pattern, advance, after) {
+  const count = typeof pattern === 'object' ? /[^^\\*+][*+]/.test(pattern.source) : false;
+  switch (typeof pattern) {
+    case 'string':
+      if (pattern === '') return () => new parser_1.List([new parser_1.Node(pattern)]);
+      return input => {
+        const {
+          context
+        } = input;
+        const {
+          source,
+          position
+        } = context;
+        if (!source.startsWith(pattern, position)) return;
+        if (advance) {
+          context.position += pattern.length;
+        }
+        const next = after?.(input);
+        return after ? next && new parser_1.List([new parser_1.Node(pattern)]).import(next) : new parser_1.List([new parser_1.Node(pattern)]);
+      };
+    case 'object':
+      return input => {
+        const {
+          context
+        } = input;
+        const {
+          source,
+          position
+        } = context;
+        pattern.lastIndex = position;
+        if (!pattern.test(source)) return;
+        const src = source.slice(position, pattern.lastIndex);
+        count && (0, context_1.consume)(src.length, context);
+        if (advance) {
+          context.position += src.length;
+        }
+        const next = after?.(input);
+        return after ? next && new parser_1.List([new parser_1.Node(src)]).import(next) : new parser_1.List([new parser_1.Node(src)]);
+      };
+  }
+}
+exports.matcher = matcher;
+function tester(pattern, advance, after) {
+  const count = typeof pattern === 'object' ? /[^^\\*+][*+]/.test(pattern.source) : false;
+  switch (typeof pattern) {
+    case 'string':
+      if (pattern === '') return () => new parser_1.List();
+      return input => {
+        const {
+          context
+        } = input;
+        const {
+          source,
+          position
+        } = context;
+        if (!source.startsWith(pattern, position)) return;
+        if (advance) {
+          context.position += pattern.length;
+        }
+        if (after && after(input) === undefined) return;
+        return new parser_1.List();
+      };
+    case 'object':
+      return input => {
+        const {
+          context
+        } = input;
+        const {
+          source,
+          position
+        } = context;
+        pattern.lastIndex = position;
+        if (!pattern.test(source)) return;
+        const len = pattern.lastIndex - position;
+        count && (0, context_1.consume)(len, context);
+        if (advance) {
+          context.position += len;
+        }
+        if (after && after(input) === undefined) return;
+        return new parser_1.List();
+      };
+  }
+}
+exports.tester = tester;
 
 /***/ },
 
@@ -3630,8 +3716,7 @@ exports.failsafe = failsafe;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.matcher = exports.constraint = exports.state = exports.precedence = exports.recursion = exports.consume = exports.creation = exports.context = exports.reset = void 0;
-const parser_1 = __webpack_require__(605);
+exports.constraint = exports.state = exports.precedence = exports.recursion = exports.consume = exports.creation = exports.context = exports.reset = void 0;
 const alias_1 = __webpack_require__(5413);
 const assign_1 = __webpack_require__(9888);
 function reset(base, parser) {
@@ -3790,45 +3875,6 @@ function constraint(state, positive, parser) {
   };
 }
 exports.constraint = constraint;
-function matcher(pattern, advance, verify) {
-  const count = typeof pattern === 'object' ? /[^^\\*+][*+]/.test(pattern.source) : false;
-  switch (typeof pattern) {
-    case 'string':
-      return ({
-        context
-      }) => {
-        const {
-          source,
-          position
-        } = context;
-        if (!source.startsWith(pattern, position)) return;
-        if (verify?.(source, position, pattern.length) === false) return;
-        if (advance) {
-          context.position += pattern.length;
-        }
-        return new parser_1.List([new parser_1.Node(pattern)]);
-      };
-    case 'object':
-      return ({
-        context
-      }) => {
-        const {
-          source,
-          position
-        } = context;
-        pattern.lastIndex = position;
-        if (!pattern.test(source)) return;
-        const src = source.slice(position, pattern.lastIndex);
-        count && consume(src.length, context);
-        if (verify?.(source, position, src.length) === false) return;
-        if (advance) {
-          context.position += src.length;
-        }
-        return new parser_1.List([new parser_1.Node(src)]);
-      };
-  }
-}
-exports.matcher = matcher;
 
 /***/ },
 
@@ -6243,7 +6289,7 @@ const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, combinator_1.surround)('((', (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]])))), '))', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => context.linebreak === 0 ? new parser_1.List([new parser_1.Node((0, dom_1.html)('sup', {
+exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, combinator_1.surround)((0, combinator_1.close)('((', visibility_1.beforeNonblank), (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]]))), '))', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => context.linebreak === 0 ? new parser_1.List([new parser_1.Node((0, dom_1.html)('sup', {
   class: 'annotation'
 }, [(0, dom_1.html)('span', (0, dom_1.defrag)((0, util_1.unwrap)((0, visibility_1.trimBlankNodeEnd)(ns))))]))]) : undefined, (_, context) => {
   const {
@@ -6683,7 +6729,7 @@ const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('~~', (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '~~')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '~'), true)])), '~~', false, [], ([, bs], {
+exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('~~', '', (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '~~')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '~'), true)])), '~~', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -6709,7 +6755,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('*', (source, position, range) => !source.startsWith('*', position + range)), (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank), strong_1.strong]))))), (0, source_1.str)('*'), false, [], ([, bs]) => new parser_1.List([new parser_1.Node((0, dom_1.html)('em', (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]), ([as, bs]) => bs && as.import(bs)));
+exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('*', (0, visibility_1.beforeNonblankWith)(/(?!\*)/)), (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank), strong_1.strong])))), (0, source_1.str)('*'), false, [], ([, bs]) => new parser_1.List([new parser_1.Node((0, dom_1.html)('em', (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]), ([as, bs]) => bs && as.import(bs)));
 
 /***/ },
 
@@ -6737,13 +6783,13 @@ const subemphasis = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, comb
 // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
-exports.emstrong = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('***', (0, combinator_1.surround)('', (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)]))), (0, source_1.strs)('*', 3), false, [], ([, bs, cs], context) => {
+exports.emstrong = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('***', visibility_1.beforeNonblank, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)])), (0, source_1.strs)('*', 3), false, [], ([, bs, cs], context) => {
   const {
     buffer
   } = context;
   switch (cs.head.value) {
     case '***':
-      return bs;
+      return buffer.import(bs);
     case '**':
       return (0, combinator_1.bind)(subemphasis, ds => {
         const {
@@ -6893,7 +6939,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(32 /* State.index */, (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)((0, source_1.str)('[#'), (0, combinator_1.precedence)(1, (0, combinator_1.state)(251 /* State.linkers */, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[']', 1]])))), (0, source_1.str)(']'), false, [3 | 4 /* Backtrack.common */], ([, bs], context) => context.linebreak === 0 && (0, visibility_1.trimBlankNodeEnd)(bs).length > 0 ? new parser_1.List([new parser_1.Node((0, dom_1.html)('a', {
+exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(32 /* State.index */, (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)((0, source_1.str)('[#', visibility_1.beforeNonblank), (0, combinator_1.precedence)(1, (0, combinator_1.state)(251 /* State.linkers */, (0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[']', 1]]))), (0, source_1.str)(']'), false, [3 | 4 /* Backtrack.common */], ([, bs], context) => context.linebreak === 0 && (0, visibility_1.trimBlankNodeEnd)(bs).length > 0 ? new parser_1.List([new parser_1.Node((0, dom_1.html)('a', {
   'data-index': dataindex(bs)
 }, (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]) : undefined, undefined)), ns => {
   const el = ns.head.value;
@@ -7155,7 +7201,7 @@ const dom_1 = __webpack_require__(394);
 // All syntax surrounded by square brackets shouldn't contain line breaks.
 exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.surround)(
 // ^はabbrで使用済みだが^:などのようにして分離使用可能
-(0, source_1.str)(/\[[:^|]/y), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 1]])))), (0, source_1.str)(']'), false, [3 | 4 /* Backtrack.common */], (_, context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+(0, source_1.str)(/\[[:^|]/y, visibility_1.beforeNonblank), (0, combinator_1.precedence)(1, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 1]]))), (0, source_1.str)(']'), false, [3 | 4 /* Backtrack.common */], (_, context) => new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
   class: 'invalid',
   ...(0, util_1.invalid)('extension', 'syntax', `Invalid start symbol or linebreak`)
 }, context.source.slice(context.position - context.range, context.position)))]), ([as, bs]) => bs && as.import(bs)));
@@ -7302,7 +7348,7 @@ const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('++', (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '++')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '+'), true)])), '++', false, [], ([, bs], {
+exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('++', '', (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '++')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '+'), true)])), '++', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -7329,7 +7375,7 @@ const dom_1 = __webpack_require__(394);
 // 可読性のため実際にはオブリーク体を指定する。
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
-exports.italic = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('///', (0, combinator_1.surround)('', (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '///', visibility_1.afterNonblank)), '///', false, [], ([, bs], {
+exports.italic = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('///', visibility_1.beforeNonblank, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '///', visibility_1.afterNonblank), '///', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -7360,7 +7406,7 @@ const optspec = {
   rel: ['nofollow']
 };
 Object.setPrototypeOf(optspec, null);
-exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.subsequence)([(0, combinator_1.constraint)(8 /* State.link */, (0, combinator_1.state)(251 /* State.linkers */, (0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.precedence)(1, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 1]]))), ']', true, [3 | 4 /* Backtrack.common */ | 64 /* Backtrack.link */, 2 | 32 /* Backtrack.ruby */], ([, ns = new parser_1.List()], context) => {
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.subsequence)([(0, combinator_1.constraint)(8 /* State.link */, (0, combinator_1.state)(251 /* State.linkers */, (0, combinator_1.dup)((0, combinator_1.surround)((0, combinator_1.close)('[', visibility_1.beforeNonblank), (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[']', 1]])), ']', true, [3 | 4 /* Backtrack.common */ | 64 /* Backtrack.link */, 2 | 32 /* Backtrack.ruby */], ([, ns = new parser_1.List()], context) => {
   if (context.linebreak !== 0) {
     const head = context.position - context.range;
     return void (0, combinator_1.setBacktrack)(context, 2 | 64 /* Backtrack.link */ | 32 /* Backtrack.ruby */, head);
@@ -7510,16 +7556,16 @@ const indexee_1 = __webpack_require__(7610);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('==', (0, combinator_1.surround)('', (0, visibility_1.beforeNonblank)((0, combinator_1.state)(2 /* State.mark */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '==', visibility_1.afterNonblank))), '==', false, [], ([, bs], {
+exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('==', visibility_1.beforeNonblank, (0, combinator_1.surround)('', (0, combinator_1.state)(2 /* State.mark */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '==', visibility_1.afterNonblank)), '==', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
 }) => bs && buffer.import(bs).push(new parser_1.Node("\u0018" /* Command.Cancel */)) && buffer), (nodes, {
   id,
   state
-}) => {
+}, nest) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)((0, util_1.unwrap)(nodes)));
-  if (state & 251 /* State.linkers */) return new parser_1.List([new parser_1.Node(el)]);
+  if (state & 251 /* State.linkers */ || nest) return new parser_1.List([new parser_1.Node(el)]);
   (0, dom_1.define)(el, {
     id: (0, indexee_1.identity)('mark', id, (0, indexee_1.signature)(el))
   });
@@ -7703,7 +7749,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64 /* State.reference */, (0, combinator_1.surround)((0, source_1.str)('[['), (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.beforeNonblank)((0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))]))), ']]', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => {
+exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64 /* State.reference */, (0, combinator_1.surround)('[[', (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)(visibility_1.beforeNonblank, (0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))]))), ']]', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => {
   const {
     position,
     range,
@@ -7948,7 +7994,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.strong = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('**', (source, position, range) => !source.startsWith('*', position + range)), (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, visibility_1.beforeNonblank)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank), emphasis_1.emphasis]))))), (0, source_1.str)('**'), false, [], ([, bs]) => new parser_1.List([new parser_1.Node((0, dom_1.html)('strong', (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]), ([as, bs]) => bs && as.import(bs)));
+exports.strong = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('**', (0, visibility_1.beforeNonblankWith)(/(?!\*)/)), (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank), emphasis_1.emphasis])))), (0, source_1.str)('**'), false, [], ([, bs]) => new parser_1.List([new parser_1.Node((0, dom_1.html)('strong', (0, dom_1.defrag)((0, util_1.unwrap)(bs))))]), ([as, bs]) => bs && as.import(bs)));
 
 /***/ },
 
@@ -8583,9 +8629,9 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.strs = exports.str = void 0;
 const parser_1 = __webpack_require__(605);
-const combinator_1 = __webpack_require__(3484);
-function str(pattern, verify) {
-  return (0, combinator_1.matcher)(pattern, true, verify);
+const delimiter_1 = __webpack_require__(385);
+function str(pattern, after) {
+  return (0, delimiter_1.matcher)(pattern, true, after ? (0, delimiter_1.tester)(after, false) : undefined);
 }
 exports.str = str;
 function strs(pattern, limit = -1) {
@@ -8908,6 +8954,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.stringify = exports.unmarkInvalid = exports.markInvalid = exports.invalid = exports.repeat = exports.unwrap = void 0;
 const parser_1 = __webpack_require__(605);
+const delimiter_1 = __webpack_require__(385);
 const alias_1 = __webpack_require__(5413);
 const dom_1 = __webpack_require__(394);
 function* unwrap(nodes) {
@@ -8917,7 +8964,7 @@ function* unwrap(nodes) {
   }
 }
 exports.unwrap = unwrap;
-function repeat(symbol, parser, cons, termination = (nodes, context, prefix, postfix) => {
+function repeat(symbol, after, parser, cons, termination = (nodes, context, prefix, postfix) => {
   const acc = new parser_1.List();
   if (prefix > 0) {
     acc.push(new parser_1.Node(symbol[0].repeat(prefix)));
@@ -8933,6 +8980,7 @@ function repeat(symbol, parser, cons, termination = (nodes, context, prefix, pos
   }
   return acc;
 }) {
+  const test = (0, delimiter_1.tester)(after, false);
   return (0, parser_1.failsafe)(input => {
     const {
       context
@@ -8946,10 +8994,11 @@ function repeat(symbol, parser, cons, termination = (nodes, context, prefix, pos
     let i = symbol.length;
     for (; source[context.position + i] === source[context.position];) ++i;
     context.position += i;
+    if (test(input) === undefined) return;
     let state = false;
     for (; i >= symbol.length; i -= symbol.length) {
       if (nodes.length > 0 && source.startsWith(symbol, context.position)) {
-        nodes = cons(nodes, context);
+        nodes = cons(nodes, context, i > symbol.length);
         context.position += symbol.length;
         continue;
       }
@@ -8969,7 +9018,7 @@ function repeat(symbol, parser, cons, termination = (nodes, context, prefix, pos
           state = true;
           continue;
         default:
-          nodes = cons(nodes, context);
+          nodes = cons(nodes, context, i > symbol.length);
           state = true;
           continue;
       }
@@ -9038,7 +9087,7 @@ exports.stringify = stringify;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.trimBlankNodeEnd = exports.trimBlankEnd = exports.trimBlank = exports.isNonblankNodeStart = exports.isNonblankFirstLine = exports.beforeNonblank = exports.blankWith = exports.afterNonblank = exports.visualize = void 0;
+exports.trimBlankNodeEnd = exports.trimBlankEnd = exports.trimBlank = exports.isNonblankNodeStart = exports.isNonblankFirstLine = exports.beforeNonblankWith = exports.blankWith = exports.afterNonblank = exports.beforeNonblank = exports.visualize = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const normalize_1 = __webpack_require__(4490);
@@ -9052,7 +9101,8 @@ function visualize(parser) {
   return (0, combinator_1.convert)(source => source.replace(blank.line, `$1${"\u001B" /* Command.Escape */}$2`), parser);
 }
 exports.visualize = visualize;
-exports.afterNonblank = nonblankWith('');
+exports.beforeNonblank = beforeNonblankWith('');
+exports.afterNonblank = afterNonblankWith('');
 function blankWith(starts, delimiter) {
   return new RegExp([
   // 空行除去
@@ -9060,33 +9110,12 @@ function blankWith(starts, delimiter) {
   String.raw`(?:${starts}(?:\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)*)?`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
 }
 exports.blankWith = blankWith;
-function nonblankWith(delimiter) {
-  return new RegExp([String.raw`(?<!\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
-}
-function beforeNonblank(parser) {
-  return input => isNonblankStart(input) ? parser(input) : undefined;
+function beforeNonblankWith(delimiter) {
+  return new RegExp([typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source, String.raw`(?!\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`].join(''), 'y');
 }
-exports.beforeNonblank = beforeNonblank;
-function isNonblankStart(input) {
-  const {
-    context
-  } = input;
-  const {
-    source,
-    position
-  } = context;
-  if (position === source.length) return true;
-  switch (source[position]) {
-    case ' ':
-    case '　':
-    case '\t':
-    case '\n':
-      return false;
-    default:
-      const reg = blank.unit;
-      reg.lastIndex = position;
-      return !reg.test(source);
-  }
+exports.beforeNonblankWith = beforeNonblankWith;
+function afterNonblankWith(delimiter) {
+  return new RegExp([String.raw`(?<!\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
 }
 function isNonblankFirstLine(nodes) {
   if (nodes.length === 0) return true;

package/package.json

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

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

@@ -1,5 +1,6 @@
 import { Parser, Input, List, Node, Context } from '../../data/parser';
-import { matcher, bind } from '../../../combinator';
+import { tester } from '../../data/delimiter';
+import { bind } from '../monad/bind';
 
 //export function contract<P extends Parser>(patterns: string | RegExp | (string | RegExp)[], parser: P, cond: (nodes: readonly Data<P>[], rest: string) => boolean): P;
 //export function contract<N>(patterns: string | RegExp | (string | RegExp)[], parser: Parser<N>, cond: (nodes: readonly N[], rest: string) => boolean): Parser<N> {
@@ -10,8 +11,8 @@ export function validate<P extends Parser>(pattern: string | RegExp, parser: P):
 export function validate<P extends Parser>(cond: ((input: Input<Parser.Context<P>>) => boolean), parser: P): P;
 export function validate<N>(pattern: string | RegExp | ((input: Input<Context>) => boolean), parser: Parser<N>): Parser<N> {
   if (typeof pattern === 'function') return guard(pattern, parser);
-  const match = matcher(pattern, false);
-  return input => match(input) ? parser(input) : undefined;
+  const test = tester(pattern, false);
+  return input => test(input) && parser(input);
 }
 
 function guard<P extends Parser>(f: (input: Input<Parser.Context<P>>) => boolean, parser: P): P;

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

@@ -1,5 +1,5 @@
 import { Parser, input, failsafe } from '../../data/parser';
-import { matcher } from '../../../combinator';
+import { matcher } from '../../data/delimiter';
 
 export function focus<P extends Parser>(scope: string | RegExp, parser: P, slice?: boolean): P;
 export function focus<N>(scope: string | RegExp, parser: Parser<N>, slice = true): Parser<N> {

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

@@ -1,50 +1,64 @@
 import { Parser, Result, List, Node, Context, failsafe } from '../../data/parser';
-import { matcher, clear } from '../../../combinator';
+import { tester } from '../../data/delimiter';
 
 export function surround<P extends Parser, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: Parser.IntermediateParser<P>, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: Parser.IntermediateParser<P>,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: false,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.SubNode<P>>>, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.SubNode<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: Parser.IntermediateParser<P>, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: Parser.IntermediateParser<P>,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: boolean,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.SubNode<P>>> | undefined, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.SubNode<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: P, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: P,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: false,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>>, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: P, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: P,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: boolean,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<P extends Parser<string>, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: string | RegExp | P,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: false,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>>, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<P extends Parser<string>, S = string>(
-  opener: string | RegExp | Parser<S, Parser.Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Parser.Context<P>>,
+  opener: string | RegExp | Parser<S, Parser.Context<P>>,
+  parser: string | RegExp | P,
+  closer: string | RegExp | Parser<S, Parser.Context<P>>,
   optional?: boolean,
   backtracks?: readonly number[],
   f?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined, List<Node<S>>], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
   g?: (rss: [List<Node<S>>, List<Node<Parser.Node<P>>> | undefined], context: Parser.Context<P>) => Result<Parser.Node<P>, Parser.Context<P>, Parser.SubParsers<P>>,
 ): P;
 export function surround<N>(
-  opener: string | RegExp | Parser<N>, parser: string | RegExp | Parser<N>, closer: string | RegExp | Parser<N>,
+  opener: string | RegExp | Parser<N>,
+  parser: string | RegExp | Parser<N>,
+  closer: string | RegExp | Parser<N>,
   optional: boolean = false,
   backtracks: readonly number[] = [],
   f?: (rss: [List<Node<N>>, List<Node<N>>, List<Node<N>>], context: Context) => Result<N>,
@@ -53,19 +67,19 @@ export function surround<N>(
   switch (typeof opener) {
     case 'string':
     case 'object':
-      opener = clear(matcher(opener, true));
+      opener = tester(opener, true);
   }
   assert(opener);
   switch (typeof parser) {
     case 'string':
     case 'object':
-      parser = clear(matcher(parser, true));
+      parser = tester(parser, true);
   }
   assert(parser);
   switch (typeof closer) {
     case 'string':
     case 'object':
-      closer = clear(matcher(closer, true));
+      closer = tester(closer, true);
   }
   assert(closer);
   const [blen, rbs, wbs] = reduce(backtracks);
@@ -76,7 +90,7 @@ export function surround<N>(
     const { linebreak } = context;
     context.linebreak = 0;
     const nodesO = opener(input);
-    if (!nodesO) {
+    if (nodesO === undefined) {
       return void revert(context, linebreak);
     }
     if (rbs && isBacktrack(context, rbs, position, blen)) {
@@ -84,14 +98,14 @@ export function surround<N>(
     }
     const nodesM = context.position < source.length ? parser(input) : undefined;
     context.range = context.position - position;
-    if (!nodesM && !optional) {
+    if (nodesM === undefined && !optional) {
       wbs && setBacktrack(context, wbs, position);
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
     }
     const nodesC = nodesM || optional ? closer(input) : undefined;
     context.range = context.position - position;
-    if (!nodesC) {
+    if (nodesC === undefined) {
       wbs && setBacktrack(context, wbs, position);
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
@@ -102,7 +116,9 @@ export function surround<N>(
     context.range = context.position - position;
     const result = f
       ? f([nodesO, nodesM!, nodesC], context)
-      : nodesO.import(nodesM ?? new List()).import(nodesC);
+      : nodesM
+        ? nodesO.import(nodesM).import(nodesC)
+        : nodesO.import(nodesC);
     if (result) {
       context.linebreak ||= linebreak;
     }

package/src/combinator/data/delimiter.ts

@@ -1,5 +1,5 @@
-import { Input, Context } from './parser';
-import { matcher } from '../../combinator';
+import { Parser, Input, List, Node, Context } from './parser';
+import { consume } from './parser/context';
 
 interface Delimiter {
   readonly memory: Delimiter[];
@@ -33,11 +33,11 @@ export class Delimiters {
         return () => undefined;
       case 'string':
       case 'object':
-        const match = matcher(pattern, false);
-        const verify = after ? matcher(after, false) : undefined;
+        const test = tester(pattern, false);
+        const verify = after ? tester(after, false) : undefined;
         return verify
-          ? input => match(input) !== undefined && verify(input) !== undefined || undefined
-          : input => match(input) !== undefined || undefined;
+          ? input => test(input) !== undefined && verify(input) !== undefined || undefined
+          : input => test(input) !== undefined || undefined;
     }
   }
   private readonly tree: Record<number, Delimiter[]> = {};
@@ -150,3 +150,79 @@ export class Delimiters {
     return false;
   }
 }
+
+export function matcher(pattern: string | RegExp, advance: boolean, after?: Parser<string>): Parser<string> {
+  assert(pattern instanceof RegExp ? !pattern.flags.match(/[gm]/) && pattern.sticky && !pattern.source.startsWith('^') : true);
+  const count = typeof pattern === 'object'
+    ? /[^^\\*+][*+]/.test(pattern.source)
+    : false;
+  switch (typeof pattern) {
+    case 'string':
+      if (pattern === '') return () => new List([new Node(pattern)]);
+      return input => {
+        const { context } = input;
+        const { source, position } = context;
+        if (!source.startsWith(pattern, position)) return;
+        if (advance) {
+          context.position += pattern.length;
+        }
+        const next = after?.(input);
+        return after
+          ? next && new List([new Node(pattern)]).import(next)
+          : new List([new Node(pattern)]);
+      };
+    case 'object':
+      assert(pattern.sticky);
+      return input => {
+        const { context } = input;
+        const { source, position } = context;
+        pattern.lastIndex = position;
+        if (!pattern.test(source)) return;
+        const src = source.slice(position, pattern.lastIndex);
+        count && consume(src.length, context);
+        if (advance) {
+          context.position += src.length;
+        }
+        const next = after?.(input);
+        return after
+          ? next && new List([new Node(src)]).import(next)
+          : new List([new Node(src)]);
+      };
+  }
+}
+
+export function tester(pattern: string | RegExp, advance: boolean, after?: Parser<unknown>): Parser<never> {
+  assert(pattern instanceof RegExp ? !pattern.flags.match(/[gm]/) && pattern.sticky && !pattern.source.startsWith('^') : true);
+  const count = typeof pattern === 'object'
+    ? /[^^\\*+][*+]/.test(pattern.source)
+    : false;
+  switch (typeof pattern) {
+    case 'string':
+      if (pattern === '') return () => new List();
+      return input => {
+        const { context } = input;
+        const { source, position } = context;
+        if (!source.startsWith(pattern, position)) return;
+        if (advance) {
+          context.position += pattern.length;
+        }
+        if (after && after(input) === undefined) return;
+        return new List();
+      };
+    case 'object':
+      assert(pattern.sticky);
+      return input => {
+        const { context } = input;
+        const { source, position } = context;
+        pattern.lastIndex = position;
+        if (!pattern.test(source)) return;
+        const len = pattern.lastIndex - position;
+        count && consume(len, context);
+        if (advance) {
+          context.position += len;
+        }
+        if (after && after(input) === undefined) return;
+        return new List();
+      };
+  }
+}

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

@@ -1,4 +1,4 @@
-import { Parser, Result, List, Node, Context, Options } from '../../data/parser';
+import { Parser, Result, Context, Options } from '../../data/parser';
 import { min } from 'spica/alias';
 import { clone } from 'spica/assign';
 
@@ -158,36 +158,3 @@ export function constraint<N>(state: number, positive: boolean | Parser<N>, pars
       : undefined;
   };
 }
-
-export function matcher(pattern: string | RegExp, advance: boolean, verify?: (source: string, position: number, range: number) => boolean): Parser<string> {
-  assert(pattern instanceof RegExp ? !pattern.flags.match(/[gm]/) && pattern.sticky && !pattern.source.startsWith('^') : true);
-  const count = typeof pattern === 'object'
-    ? /[^^\\*+][*+]/.test(pattern.source)
-    : false;
-  switch (typeof pattern) {
-    case 'string':
-      return ({ context }) => {
-        const { source, position } = context;
-        if (!source.startsWith(pattern, position)) return;
-        if (verify?.(source, position, pattern.length) === false) return;
-        if (advance) {
-          context.position += pattern.length;
-        }
-        return new List([new Node(pattern)]);
-      };
-    case 'object':
-      assert(pattern.sticky);
-      return ({ context }) => {
-        const { source, position } = context;
-        pattern.lastIndex = position;
-        if (!pattern.test(source)) return;
-        const src = source.slice(position, pattern.lastIndex);
-        count && consume(src.length, context);
-        if (verify?.(source, position, src.length) === false) return;
-        if (advance) {
-          context.position += src.length;
-        }
-        return new List([new Node(src)]);
-      };
-  }
-}

package/src/parser/inline/annotation.ts

@@ -1,16 +1,16 @@
 import { AnnotationParser } from '../inline';
 import { State, Backtrack } from '../context';
 import { List, Node } from '../../combinator/data/parser';
-import { union, some, precedence, state, constraint, surround, setBacktrack, lazy } from '../../combinator';
+import { union, some, precedence, state, constraint, surround, close, setBacktrack, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { beforeNonblank, trimBlankNodeEnd } from '../visibility';
 import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const annotation: AnnotationParser = lazy(() => constraint(State.annotation, surround(
-  '((',
+  close('((', beforeNonblank),
   precedence(1, state(State.annotation,
-  beforeNonblank(some(union([inline]), ')', [[')', 1]])))),
+  some(union([inline]), ')', [[')', 1]]))),
   '))',
   false,
   [2, 1 | Backtrack.common, 3 | Backtrack.doublebracket],

package/src/parser/inline/deletion.ts

@@ -8,7 +8,7 @@ import { unwrap, repeat } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const deletion: DeletionParser = lazy(() =>
-  precedence(0, recursion(Recursion.inline, repeat('~~', surround(
+  precedence(0, recursion(Recursion.inline, repeat('~~', '', surround(
     '',
     some(union([
       some(inline, blankWith('\n', '~~')),

package/src/parser/inline/emphasis.ts

@@ -5,17 +5,17 @@ import { union, some, recursion, precedence, surround, lazy } from '../../combin
 import { inline } from '../inline';
 import { strong } from './strong';
 import { str } from '../source';
-import { beforeNonblank, afterNonblank } from '../visibility';
+import { beforeNonblankWith, afterNonblank } from '../visibility';
 import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const emphasis: EmphasisParser = lazy(() => surround(
-  str('*', (source, position, range) => !source.startsWith('*', position + range)),
+  str('*', beforeNonblankWith(/(?!\*)/)),
   precedence(0, recursion(Recursion.inline,
-  beforeNonblank(some(union([
+  some(union([
     some(inline, '*', afterNonblank),
     strong,
-  ]))))),
+  ])))),
   str('*'),
   false, [],
   ([, bs]) => new List([new Node(html('em', defrag(unwrap(bs))))]),

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

@@ -114,6 +114,7 @@ describe('Unit: parser/inline/emstrong', () => {
       assert.deepStrictEqual(inspect(parser, input('******a*b ***', new Context())), [['*****', '<em>a</em>', 'b ', '***'], '']);
       assert.deepStrictEqual(inspect(parser, input('******a*b ****', new Context())), [['*****', '<em>a</em>', 'b ', '****'], '']);
       assert.deepStrictEqual(inspect(parser, input('******a*b *****', new Context())), [['*****', '<em>a</em>', 'b ', '*****'], '']);
+      assert.deepStrictEqual(inspect(parser, input('******a*** b***', new Context())), [['<em><strong><em><strong>a</strong></em> b</strong></em>'], '']);
     });
 
   });

package/src/parser/inline/emstrong.ts

@@ -23,9 +23,9 @@ const subemphasis: Parser.IntermediateParser<EmphasisParser> = lazy(() => some(u
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
 export const emstrong: EmStrongParser = lazy(() =>
-  precedence(0, recursion(Recursion.inline, repeat('***', surround(
+  precedence(0, recursion(Recursion.inline, repeat('***', beforeNonblank, surround(
     '',
-    beforeNonblank(some(union([some(inline, '*', afterNonblank)]))),
+    some(union([some(inline, '*', afterNonblank)])),
     strs('*', 3),
     false, [],
     ([, bs, cs], context): Result<Parser.Node<EmStrongParser>, Parser.Context<EmStrongParser>> => {
@@ -33,7 +33,7 @@ export const emstrong: EmStrongParser = lazy(() =>
       const { buffer } = context;
       switch (cs.head!.value) {
         case '***':
-          return bs;
+          return buffer.import(bs);
         case '**':
           return bind<EmphasisParser>(
             subemphasis,

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

@@ -13,13 +13,12 @@ import { html, define, defrag } from 'typed-dom/dom';
 import IndexParser = ExtensionParser.IndexParser;
 
 export const index: IndexParser = lazy(() => constraint(State.index, fmap(indexee(surround(
-  str('[#'),
+  str('[#', beforeNonblank),
   precedence(1, state(State.linkers,
-  beforeNonblank(
   some(inits([
     inline,
     signature,
-  ]), ']', [[']', 1]])))),
+  ]), ']', [[']', 1]]))),
   str(']'),
   false,
   [3 | Backtrack.common],

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

@@ -14,9 +14,9 @@ import { html } from 'typed-dom/dom';
 
 export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surround(
   // ^はabbrで使用済みだが^:などのようにして分離使用可能
-  str(/\[[:^|]/y),
+  str(/\[[:^|]/y, beforeNonblank),
   precedence(1, recursion(Recursion.inline,
-  beforeNonblank(some(union([inline]), ']', [[']', 1]])))),
+  some(union([inline]), ']', [[']', 1]]))),
   str(']'),
   false,
   [3 | Backtrack.common],

package/src/parser/inline/insertion.ts

@@ -8,7 +8,7 @@ import { unwrap, repeat } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const insertion: InsertionParser = lazy(() =>
-  precedence(0, recursion(Recursion.inline, repeat('++', surround(
+  precedence(0, recursion(Recursion.inline, repeat('++', '', surround(
     '',
     some(union([
       some(inline, blankWith('\n', '++')),

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

@@ -57,6 +57,7 @@ describe('Unit: parser/inline/italic', () => {
       assert.deepStrictEqual(inspect(parser, input('//////a/////b', new Context())), [['///', '<i>a</i>', '//b'], '']);
       assert.deepStrictEqual(inspect(parser, input('//////a//////', new Context())), [['<i><i>a</i></i>'], '']);
       assert.deepStrictEqual(inspect(parser, input('//////a///b///', new Context())), [['<i><i>a</i>b</i>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('//////a/// b///', new Context())), [['<i><i>a</i> b</i>'], '']);
       assert.deepStrictEqual(inspect(parser, input('///a ///b//////', new Context())), [['<i>a <i>b</i></i>'], '']);
       assert.deepStrictEqual(inspect(parser, input('///- ///b//////', new Context())), [['<i>- <i>b</i></i>'], '']);
       assert.deepStrictEqual(inspect(parser, input('///a\\ ///b//////', new Context())), [['<i>a <i>b</i></i>'], '']);

package/src/parser/inline/italic.ts

@@ -11,9 +11,9 @@ import { html, defrag } from 'typed-dom/dom';
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
 export const italic: ItalicParser = lazy(() =>
-  precedence(0, recursion(Recursion.inline, repeat('///', surround(
+  precedence(0, recursion(Recursion.inline, repeat('///', beforeNonblank, surround(
     '',
-    beforeNonblank(some(union([inline]), '///', afterNonblank)),
+    some(union([inline]), '///', afterNonblank),
     '///',
     false, [],
     ([, bs], { buffer }) => buffer.import(bs),

package/src/parser/inline/link.ts

@@ -1,7 +1,7 @@
 import { LinkParser } from '../inline';
 import { Context, State, Backtrack, Command } from '../context';
 import { List, Node } from '../../combinator/data/parser';
-import { union, inits, sequence, subsequence, some, consume, precedence, state, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
+import { union, inits, sequence, subsequence, some, consume, precedence, state, constraint, surround, open, close, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { str } from '../source';
@@ -18,9 +18,9 @@ Object.setPrototypeOf(optspec, null);
 export const textlink: LinkParser.TextLinkParser = lazy(() => bind(
   subsequence([
     constraint(State.link, state(State.linkers, dup(surround(
-      '[',
+      close('[', beforeNonblank),
       precedence(1,
-      beforeNonblank(some(union([inline]), ']', [[']', 1]]))),
+      some(union([inline]), ']', [[']', 1]])),
       ']',
       true,
       [3 | Backtrack.common | Backtrack.link, 2 | Backtrack.ruby],

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

@@ -44,6 +44,7 @@ describe('Unit: parser/inline/mark', () => {
       assert.deepStrictEqual(inspect(parser, input('==a&Tab;==b====', new Context())), [['<mark id="mark::a_b=33Mw2l">a\t<mark>b</mark></mark>', '<a href="#mark::a_b=33Mw2l"></a>'], '']);
       assert.deepStrictEqual(inspect(parser, input('==a<wbr>==b====', new Context())), [['<mark id="mark::ab">a<wbr><mark>b</mark></mark>', '<a href="#mark::ab"></a>'], '']);
       assert.deepStrictEqual(inspect(parser, input('==*==a==*==', new Context())), [['<mark id="mark::a"><em><mark>a</mark></em></mark>', '<a href="#mark::a"></a>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('====a== b==', new Context())), [['<mark id="mark::a_b"><mark>a</mark> b</mark>', '<a href="#mark::a_b"></a>'], '']);
     });
 
   });

package/src/parser/inline/mark.ts

@@ -9,16 +9,16 @@ import { unwrap, repeat } from '../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const mark: MarkParser = lazy(() =>
-  precedence(0, recursion(Recursion.inline, repeat('==', surround(
+  precedence(0, recursion(Recursion.inline, repeat('==', beforeNonblank, surround(
     '',
-    beforeNonblank(state(State.mark, some(union([inline]), '==', afterNonblank))),
+    state(State.mark, some(union([inline]), '==', afterNonblank)),
     '==',
     false, [],
     ([, bs], { buffer }) => buffer.import(bs),
     ([, bs], { buffer }) => bs && buffer.import(bs).push(new Node(Command.Cancel)) && buffer),
-    (nodes, { id, state }) => {
+    (nodes, { id, state }, nest) => {
       const el = html('mark', defrag(unwrap(nodes)));
-      if (state & State.linkers) return new List([new Node(el)]);
+      if (state & State.linkers || nest) return new List([new Node(el)]);
       define(el, { id: identity('mark', id, signature(el)) });
       return el.id
         ? new List([new Node(el), new Node(html('a', { href: `#${el.id}` }))])

package/src/parser/inline/reference.ts

@@ -1,7 +1,7 @@
 import { ReferenceParser } from '../inline';
 import { State, Backtrack, Command } from '../context';
 import { List, Node } from '../../combinator/data/parser';
-import { union, subsequence, some, precedence, state, constraint, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
+import { union, subsequence, some, precedence, state, constraint, surround, open, isBacktrack, setBacktrack, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { textlink } from './link';
 import { str } from '../source';
@@ -10,11 +10,11 @@ import { unwrap, invalid } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const reference: ReferenceParser = lazy(() => constraint(State.reference, surround(
-  str('[['),
+  '[[',
   precedence(1, state(State.annotation | State.reference,
   subsequence([
     abbr,
-    beforeNonblank(some(inline, ']', [[']', 1]])),
+    open(beforeNonblank, some(inline, ']', [[']', 1]])),
   ]))),
   ']]',
   false,

package/src/parser/inline/strong.ts

@@ -5,17 +5,17 @@ import { union, some, recursion, precedence, surround, lazy } from '../../combin
 import { inline } from '../inline';
 import { emphasis } from './emphasis';
 import { str } from '../source';
-import { beforeNonblank, afterNonblank } from '../visibility';
+import { beforeNonblankWith, afterNonblank } from '../visibility';
 import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const strong: StrongParser = lazy(() => surround(
-  str('**', (source, position, range) => !source.startsWith('*', position + range)),
+  str('**', beforeNonblankWith(/(?!\*)/)),
   precedence(0, recursion(Recursion.inline,
-  beforeNonblank(some(union([
+  some(union([
     some(inline, '*', afterNonblank),
     emphasis,
-  ]))))),
+  ])))),
   str('**'),
   false, [],
   ([, bs]) => new List([new Node(html('strong', defrag(unwrap(bs))))]),

package/src/parser/source/str.ts

@@ -1,10 +1,10 @@
 import { StrParser } from '../source';
 import { Parser, List, Node } from '../../combinator/data/parser';
-import { matcher } from '../../combinator';
+import { matcher, tester } from '../../combinator/data/delimiter';
 
-export function str(pattern: string | RegExp, verify?: (source: string, position: number, range: number) => boolean): StrParser;
-export function str(pattern: string | RegExp, verify?: (source: string, position: number, range: number) => boolean): Parser<string> {
-  return matcher(pattern, true, verify);
+export function str(pattern: string | RegExp, after?: string | RegExp): StrParser;
+export function str(pattern: string | RegExp, after?: string | RegExp): Parser<string> {
+  return matcher(pattern, true, after ? tester(after, false) : undefined);
 }
 
 export function strs(pattern: string, limit?: number): StrParser;

package/src/parser/util.ts

@@ -1,4 +1,5 @@
 import { Parser, Result, List, Node, failsafe } from '../combinator/data/parser';
+import { tester } from '../combinator/data/delimiter';
 import { Context, Command } from './context';
 import { min } from 'spica/alias';
 import { define } from 'typed-dom/dom';
@@ -10,8 +11,8 @@ export function* unwrap<N>(nodes: List<Node<N>> | undefined): Iterable<N> {
   }
 }
 
-export function repeat<P extends Parser<HTMLElement | string, Context>>(symbol: string, parser: P, cons: (nodes: List<Node<Parser.Node<P>>>, context: Parser.Context<P>) => List<Node<Parser.Node<P>>>, termination?: (acc: List<Node<Parser.Node<P>>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | Parser.Node<P>>): P;
-export function repeat<N extends HTMLElement | string>(symbol: string, parser: Parser<N>, cons: (nodes: List<Node<N>>, context: Context) => List<Node<N>>, termination: (acc: List<Node<N>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | N, Context> = (nodes, context, prefix, postfix) => {
+export function repeat<P extends Parser<HTMLElement | string, Context>>(symbol: string, after: string | RegExp, parser: P, cons: (nodes: List<Node<Parser.Node<P>>>, context: Parser.Context<P>, nest: boolean) => List<Node<Parser.Node<P>>>, termination?: (acc: List<Node<Parser.Node<P>>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | Parser.Node<P>>): P;
+export function repeat<N extends HTMLElement | string>(symbol: string, after: string | RegExp, parser: Parser<N>, cons: (nodes: List<Node<N>>, context: Context, nest: boolean) => List<Node<N>>, termination: (acc: List<Node<N>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | N, Context> = (nodes, context, prefix, postfix) => {
   const acc = new List<Node<string | N>>();
   if (prefix > 0) {
     acc.push(new Node(symbol[0].repeat(prefix)));
@@ -24,6 +25,7 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
   }
   return acc;
 }): Parser<string | N, Context> {
+  const test = tester(after, false);
   return failsafe(input => {
     const { context } = input;
     const { source, position } = context;
@@ -32,10 +34,11 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
     let i = symbol.length;
     for (; source[context.position + i] === source[context.position];) ++i;
     context.position += i;
+    if (test(input) === undefined) return;
     let state = false;
     for (; i >= symbol.length; i -= symbol.length) {
       if (nodes.length > 0 && source.startsWith(symbol, context.position)) {
-        nodes = cons(nodes, context);
+        nodes = cons(nodes, context, i > symbol.length);
         context.position += symbol.length;
         continue;
       }
@@ -57,7 +60,7 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
           state = true;
           continue;
         default:
-          nodes = cons(nodes, context);
+          nodes = cons(nodes, context, i > symbol.length);
           state = true;
           continue;
       }

package/src/parser/visibility.ts

@@ -1,5 +1,5 @@
-import { Parser, Input, List, Node, failsafe } from '../combinator/data/parser';
-import { Context, Command } from './context';
+import { Parser, List, Node, failsafe } from '../combinator/data/parser';
+import { Command } from './context';
 import { Flag } from './node';
 import { convert, fmap } from '../combinator';
 import { invisibleBlankHTMLEntityNames } from './api/normalize';
@@ -25,7 +25,8 @@ export function visualize<P extends Parser>(parser: P): P {
     parser);
 }
 
-export const afterNonblank = nonblankWith('');
+export const beforeNonblank = beforeNonblankWith('');
+export const afterNonblank = afterNonblankWith('');
 export function blankWith(starts: '\n', delimiter: string | RegExp): RegExp {
   return new RegExp([
     // 空行除去
@@ -36,37 +37,21 @@ export function blankWith(starts: '\n', delimiter: string | RegExp): RegExp {
       : delimiter.source,
   ].join(''), 'y');
 }
-function nonblankWith(delimiter: string | RegExp): RegExp {
+export function beforeNonblankWith(delimiter: string | RegExp): RegExp {
   return new RegExp([
-    String.raw`(?<!\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`,
     typeof delimiter === 'string'
       ? delimiter.replace(/[*+()\[\]]/g, '\\$&')
       : delimiter.source,
+    String.raw`(?!\\?\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`,
   ].join(''), 'y');
 }
-
-export function beforeNonblank<P extends Parser>(parser: P): P;
-export function beforeNonblank<N>(parser: Parser<N>): Parser<N, Context> {
-  return input =>
-    isNonblankStart(input)
-      ? parser(input)
-      : undefined;
-}
-function isNonblankStart(input: Input<Context>): boolean {
-  const { context } = input;
-  const { source, position } = context;
-  if (position === source.length) return true;
-  switch (source[position]) {
-    case ' ':
-    case '　':
-    case '\t':
-    case '\n':
-      return false;
-    default:
-      const reg = blank.unit;
-      reg.lastIndex = position;
-      return !reg.test(source);
-  }
+function afterNonblankWith(delimiter: string | RegExp): RegExp {
+  return new RegExp([
+    String.raw`(?<!\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`,
+    typeof delimiter === 'string'
+      ? delimiter.replace(/[*+()\[\]]/g, '\\$&')
+      : delimiter.source,
+  ].join(''), 'y');
 }
 
 export function isNonblankFirstLine(nodes: List<Node<HTMLElement | string>>): boolean {