securemark 0.294.3 → 0.294.5

package/markdown.d.ts

@@ -1096,13 +1096,10 @@ export namespace MarkdownParser {
         AutolinkParser.UrlParser.LineUrlParser,
         AutolinkParser.UrlParser,
         AutolinkParser.EmailParser,
-        SourceParser.StrParser,
         AutolinkParser.ChannelParser,
         AutolinkParser.AccountParser,
-        SourceParser.StrParser,
         AutolinkParser.HashtagParser,
         AutolinkParser.HashnumParser,
-        SourceParser.StrParser,
         AutolinkParser.AnchorParser,
       ]> {
     }
@@ -1110,9 +1107,9 @@ export namespace MarkdownParser {
       export interface UrlParser extends
         // https://host
         Inline<'url'>,
-        Parser<string | HTMLAnchorElement, Context, [
+        Parser<string | HTMLElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
+          InlineParser,
         ]> {
       }
       export namespace UrlParser {
@@ -1122,7 +1119,7 @@ export namespace MarkdownParser {
             SourceParser.StrParser,
             Parser<string | HTMLElement, Context, [
               InlineParser.LinkParser.UnsafeLinkParser,
-              Parser<string, Context, []>,
+              InlineParser,
             ]>,
           ]> {
         }
@@ -1150,7 +1147,6 @@ export namespace MarkdownParser {
         Inline<'email'>,
         Parser<string | HTMLAnchorElement, Context, [
           Parser<HTMLAnchorElement, Context, []>,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface ChannelParser extends
@@ -1158,7 +1154,6 @@ export namespace MarkdownParser {
         Inline<'channel'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface AccountParser extends
@@ -1166,7 +1161,6 @@ export namespace MarkdownParser {
         Inline<'account'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface HashtagParser extends
@@ -1174,7 +1168,6 @@ export namespace MarkdownParser {
         Inline<'hashtag'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface HashnumParser extends
@@ -1182,7 +1175,6 @@ export namespace MarkdownParser {
         Inline<'hashnum'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface AnchorParser extends
@@ -1190,7 +1182,6 @@ export namespace MarkdownParser {
         Inline<'anchor'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.294.3",
+  "version": "0.294.5",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -28,7 +28,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "spica": "0.0.809"
+    "spica": "0.0.810"
   },
   "devDependencies": {
     "@types/dompurify": "3.0.5",
@@ -42,7 +42,7 @@
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^8.2.2",
     "eslint": "^9.8.0",
-    "eslint-plugin-redos": "^4.4.5",
+    "eslint-plugin-redos": "^4.5.0",
     "eslint-webpack-plugin": "^4.2.0",
     "glob": "^11.0.0",
     "karma": "^6.4.4",

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

@@ -1,4 +1,5 @@
 import { Parser, List, Data, Ctx, failsafe } from '../../data/parser';
+import { consume } from '../../../combinator';
 import { firstline, isBlank } from '../constraint/line';
 import { push } from 'spica/array';
 
@@ -12,6 +13,7 @@ export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: Reg
     const matches = opener.exec(source);
     if (!matches) return;
     assert(matches[0] === firstline(source, position));
+    consume(matches[0].length, context);
     const delim = matches[1];
     assert(delim && delim === delim.trim());
     if (matches[0].includes(delim, delim.length)) return;

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

@@ -26,7 +26,7 @@ export function indent<N>(opener: RegExp | Parser<N>, parser: Parser<N> | boolea
         context.position = source.length;
         return new List([new Data(source.slice(position))]);
       }))),
-    ([indent]) => indent.length <= 16 ? indent.length * 2 + +(indent[0] === ' ') : -1, [])), separation),
+    ([indent]) => indent.length * 2 + -(indent[0] === ' '), [], 2 ** 4 - 1)), separation),
     (lines, context) => {
       assert(parser = parser as Parser<N>);
       return parser(subinput(trimBlockEnd(lines.foldl((acc, node) => acc + node.value, '')), context));

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

@@ -1,20 +1,23 @@
 import { Parser, failsafe } from '../../data/parser';
 import { consume } from '../../../combinator';
 
-export function match<P extends Parser<unknown>>(pattern: RegExp, f: (matched: RegExpMatchArray) => P, cost?: boolean): P;
-export function match<N>(pattern: RegExp, f: (matched: RegExpMatchArray) => Parser<N>, cost = false): Parser<N> {
+export function match<P extends Parser<unknown>>(pattern: RegExp, f: (matched: RegExpMatchArray) => P): P;
+export function match<N>(pattern: RegExp, f: (matched: RegExpMatchArray) => Parser<N>): Parser<N> {
   assert(!pattern.flags.match(/[gm]/) && pattern.sticky && !pattern.source.startsWith('^'));
+  const count = typeof pattern === 'object'
+    ? /[^^\\*+][*+]/.test(pattern.source)
+    : false;
   return failsafe(input => {
     const { context } = input;
     const { source, position } = context;
     if (position === source.length) return;
     pattern.lastIndex = position;
-    const param = pattern.exec(source);
-    if (!param) return;
-    assert(source.startsWith(param[0], position));
-    cost && consume(param[0].length, context);
-    const result = f(param)(input);
-    context.position += result && context.position === position ? param[0].length : 0;
+    const params = pattern.exec(source);
+    if (!params) return;
+    assert(source.startsWith(params[0], position));
+    count && consume(params[0].length, context);
+    const result = f(params)(input);
+    context.position += result && context.position === position ? params[0].length : 0;
     assert(context.position > position || !result);
     return context.position > position
       ? result

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

@@ -361,9 +361,9 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack', function () {
       this.timeout(5000);
-      // 最悪計算量での実行速度はCommonMarkの公式JS実装の32nに対して3倍遅い程度。
+      // 最悪計算量での実行速度はCommonMarkの公式JS実装の32nより速い。
       // 5n = annotation/reference + link + url/math + ruby + text
-      const source = `${'.'.repeat(0 + 0)}((([[[[#$[${'&'.repeat(19998)}`;
+      const source = `((([[[[#$[${'.'.repeat(19997)}`;
       assert.deepStrictEqual(
         [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
           .map(el => el.tagName),
@@ -372,7 +372,7 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack error', function () {
       this.timeout(5000);
-      const source = `${'.'.repeat(0 + 1)}((([[[[#$[${'&'.repeat(19998)}`;
+      const source = `((([[[[#$[${'.'.repeat(19997 + 1)}`;
       assert.deepStrictEqual(
         [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
           .map(el => el.tagName),

package/src/parser/block/blockquote.test.ts

@@ -14,6 +14,9 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser('>'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>a'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('>\na'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('!>\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('!>\na'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' > '), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>'), ctx), undefined);
     });
@@ -38,10 +41,6 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser('> a\\\nb'), ctx), [['<blockquote><pre>a\\<br>b</pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('>  a '), ctx), [['<blockquote><pre> a </pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> \na'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('>\na'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('>\n a'), ctx), [['<blockquote><pre><br> a</pre></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('>\n>'), ctx), [['<blockquote><pre><br></pre></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('>\n> a'), ctx), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> http://host'), ctx), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> http://host)'), ctx), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> !http://host'), ctx), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
@@ -92,11 +91,6 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser('!>> > a\n> b'), ctx), [['<blockquote><blockquote><section><blockquote><pre>a</pre></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote><section><p>b</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!> !> a'), ctx), [['<blockquote><section><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!> \na'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('!>\n'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('!>\na'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('!>\n a'), ctx), [['<blockquote><section><p> a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('!>\n>'), ctx), [['<blockquote><section><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('!>\n> a'), ctx), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!>> ## a\n> ## a'), ctx), [['<blockquote><blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2>a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!>> ~ a\n> ~ a'), ctx), [['<blockquote><blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt>a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~'), ctx), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);

package/src/parser/block/blockquote.ts

@@ -9,7 +9,7 @@ import { parse } from '../api/parse';
 import { html, defrag } from 'typed-dom/dom';
 
 export const segment: BlockquoteParser.SegmentParser = block(union([
-  validate(/!?>+(?=[^\S\n]|\n[^\S\n]*\S)/y, some(contentline)),
+  validate(/!?>+ /y, some(contentline)),
 ]));
 
 export const blockquote: BlockquoteParser = lazy(() => block(rewrite(segment, union([
@@ -17,9 +17,9 @@ export const blockquote: BlockquoteParser = lazy(() => block(rewrite(segment, un
   open(/!(?=>)/y, markdown),
 ]))));
 
-const opener = /(?=>>+(?:$|\s))/y;
-const indent = block(open(opener, some(contentline, />(?:$|\s)/y)), false);
-const unindent = (source: string) => source.replace(/(?<=^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$/g, '');
+const opener = /(?=>>+(?:$|[ \n]))/y;
+const indent = block(open(opener, some(contentline, />(?:$|[ \n])/y)), false);
+const unindent = (source: string) => source.replace(/(?<=^|\n)>(?: |(?=>*(?:$|[ \n])))|\n$/g, '');
 
 const source: BlockquoteParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.blockquote, union([

package/src/parser/block/dlist.ts

@@ -9,7 +9,7 @@ import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const dlist: DListParser = lazy(() => block(fmap(validate(
-  /~[^\S\n]+(?=\S)/y,
+  /~ +(?=\S)/y,
   some(inits([
     state(State.annotation | State.reference | State.index | State.label | State.link,
     some(term)),
@@ -18,15 +18,15 @@ export const dlist: DListParser = lazy(() => block(fmap(validate(
   ns => new List([new Data(html('dl', unwrap(fillTrailingDescription(ns))))]))));
 
 const term: DListParser.TermParser = line(indexee(fmap(open(
-  /~[^\S\n]+(?=\S)/y,
+  /~ +(?=\S)/y,
   visualize(trimBlank(some(union([indexer, inline])))),
   true),
   ns => new List([new Data(html('dt', { 'data-index': dataindex(ns) }, defrag(unwrap(ns))))]))));
 
 const desc: DListParser.DescriptionParser = block(fmap(open(
-  /:[^\S\n]+(?=\S)|/y,
+  /: +(?=\S)|/y,
   rewrite(
-    some(anyline, /[~:][^\S\n]+\S/y),
+    some(anyline, /[~:] +(?=\S)/y),
     visualize(trimBlankEnd(some(union([inline]))))),
   true),
   ns => new List([new Data(html('dd', defrag(unwrap(ns))))])),

package/src/parser/block/extension/example.ts

@@ -7,10 +7,8 @@ import { unwrap, invalid } from '../../util';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
-const opener = /(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/y;
-
 export const example: ExtensionParser.ExampleParser = recursion(Recursion.block, block(fmap(
-  fence(opener, 300),
+  fence(/(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/y, 300),
   // Bug: Type mismatch between outer and inner.
   (nodes: List<Data<string>>, context) => {
     const [body, overflow, closer, opener, delim, type = 'markdown', param] = unwrap(nodes);

package/src/parser/block/extension/fig.test.ts

@@ -40,7 +40,6 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('[$group-name]\n~~~table\n~~~\n'), ctx), [['<figure data-type="table" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><table></table></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n> '), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n> \n'), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure>'], '']);
-      assert.deepStrictEqual(inspect(parser('[$group-name]\n>\n~~~'), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote><pre><br>~~~</pre></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n!> *a*'), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote><section><p><em>a</em></p><h2>References</h2><ol class="references"></ol></section></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}\n'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);

package/src/parser/block/extension/fig.ts

@@ -1,5 +1,5 @@
 import { ExtensionParser } from '../../block';
-import { union, sequence, some, block, line, validate, verify, rewrite, close, convert } from '../../../combinator';
+import { union, sequence, some, block, line, verify, rewrite, close, convert } from '../../../combinator';
 import { contentline } from '../../source';
 import { figure } from './figure';
 import { segment as seg_label } from '../../inline/extension/label';
@@ -12,9 +12,9 @@ import { media, lineshortmedia } from '../../inline';
 
 import FigParser = ExtensionParser.FigParser;
 
-export const segment: FigParser.SegmentParser = block(validate(/\[?\$/y,
+export const segment: FigParser.SegmentParser = block(
   sequence([
-    line(close(seg_label, /(?=\s).*\n/y)),
+    line(close(seg_label, /(?!\S).*\n/y)),
     union([
       seg_code,
       seg_math,
@@ -23,12 +23,12 @@ export const segment: FigParser.SegmentParser = block(validate(/\[?\$/y,
       seg_placeholder,
       some(contentline),
     ]),
-  ])));
+  ]));
 
 export const fig: FigParser = block(rewrite(segment, verify(convert(
   (source, context) => {
     // Bug: TypeScript
-    const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) as string[] || [])
+    const fence = (/^[^\n]*\n!?>+ /.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) as string[] || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
     return parser({ context })
       ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
@@ -39,7 +39,7 @@ export const fig: FigParser = block(rewrite(segment, verify(convert(
   ([{ value: el }]) => el.tagName === 'FIGURE')));
 
 const parser = sequence([
-  line(close(seg_label, /(?=\s).*\n/y)),
+  line(close(seg_label, /(?!\S).*\n/y)),
   line(union([
     media,
     lineshortmedia,

package/src/parser/block/extension/figbase.ts

@@ -5,7 +5,7 @@ import { label } from '../../inline/extension/label';
 import { html } from 'typed-dom/dom';
 
 export const figbase: ExtensionParser.FigbaseParser = block(fmap(
-  validate(/\[?\$-(?:[0-9]+\.)*0\]?[^\S\n]*(?!\S|\n[^\S\n]*\S)/y,
+  validate(/\[?\$-(?:[0-9]+\.)*0\]?(?:$|[ \n])/y,
   line(union([label]))),
   ([{ value: el }]) => {
     const label = el.getAttribute('data-label')!;

package/src/parser/block/extension/figure.test.ts

@@ -71,7 +71,7 @@ describe('Unit: parser/block/extension/figure', () => {
       assert.deepStrictEqual(inspect(parser('~~~figure [$-0.0]\n$$\n\n$$\n~~~'), ctx), [['<figure data-type="math" data-label="$-0.0" data-group="$" class="invalid"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n\n$$</div></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$-name]\n!https://host\n~~~'), ctx), [['<figure data-type="media" data-label="$-name" data-group="$" class="invalid"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$-name]\n$$\n\n$$\n\ncaption\n~~~'), ctx), [['<figure data-type="math" data-label="$-name" data-group="$" class="invalid"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><div class="math" translate="no">$$\n\n$$</div></div></figure>'], '']);
-      assert.deepStrictEqual(inspect(parser(`~~~figure [$group-name]\n${'>\n'.repeat(500)}\n~~~`), ctx, '>'), [['<figure data-type="quote" data-label="group-name" data-group="group">'], '']);
+      assert.deepStrictEqual(inspect(parser(`~~~figure [$group-name]\n${'> \n'.repeat(500)}\n~~~`), ctx, '>'), [['<figure data-type="quote" data-label="group-name" data-group="group">'], '']);
       assert.deepStrictEqual(inspect(parser(`~~~figure [$group-name]\n~~~\n0${'\n'.repeat(300)}~~~\n~~~`), ctx, '>'), [['<figure data-type="example" data-label="group-name" data-group="group">'], '']);
     });
 

package/src/parser/block/extension/figure.ts

@@ -21,7 +21,7 @@ import { html, defrag } from 'typed-dom/dom';
 import FigureParser = ExtensionParser.FigureParser;
 
 export const segment: FigureParser.SegmentParser = block(match(
-  /(~{3,})(?:figure[^\S\n])?(?=\[?\$)/y,
+  /(~{3,})(?:figure )?(?=\[?\$)/y,
   memoize(
   ([, fence], closer = new RegExp(String.raw`${fence}[^\S\n]*(?:$|\n)`, 'y')) => close(
     sequence([
@@ -44,12 +44,12 @@ export const segment: FigureParser.SegmentParser = block(match(
       ]),
     ]),
     closer),
-  ([, fence]) => fence.length <= 16 ? fence.length : -1, [])));
+  ([, fence]) => fence.length - 1, [], 2 ** 4 - 1)));
 
 export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
   convert(source => source.slice(source.match(/^~+(?:\w+\s+)?/)![0].length, source.trimEnd().lastIndexOf('\n')),
   sequence([
-    line(sequence([label, str(/(?=\s).*\n/y)])),
+    line(sequence([label, str(/(?!\S).*\n/y)])),
     inits([
       block(union([
         ulist,
@@ -83,7 +83,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
     ]);
   })),
   fmap(
-    fence(/(~{3,})(?:figure|\[?\$\S*)(?!\S)[^\n]*(?:$|\n)/y, 300),
+    fence(/(~{3,})(?:figure(?=$|[ \n])|\[?\$)[^\n]*(?:$|\n)/y, 300),
     (nodes, context) => {
       const [body, overflow, closer, opener, delim] = unwrap<string>(nodes);
       const violation =
@@ -95,11 +95,11 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
           'fence',
           `Invalid trailing line after the closing delimiter "${delim}"`,
         ] ||
-        !seg_label(subinput(opener.match(/^~+(?:figure[^\S\n]+)?(\[?\$\S+)/)?.[1] ?? '', context)) && [
+        !seg_label(subinput(opener.match(/^~+(?:figure )?(\[?\$\S+)/)?.[1] ?? '', context)) && [
           'label',
           'Invalid label',
         ] ||
-        /^~+(?:figure[^\S\n]+)?(\[?\$\S+)[^\S\n]+\S/.test(opener) && [
+        /^~+(?:figure )?(\[?\$\S+)[^\S\n]+\S/.test(opener) && [
           'argument',
           'Invalid argument',
         ] ||

package/src/parser/block/extension/message.ts

@@ -20,7 +20,7 @@ import { html } from 'typed-dom/dom';
 import MessageParser = ExtensionParser.MessageParser;
 
 export const message: MessageParser = block(fmap(
-  fence(/(~{3,})message\/(\S+)([^\n]*)(?:$|\n)/y, 300),
+  fence(/(~{3,})message\/(\S+)(?!\S)([^\n]*)(?:$|\n)/y, 300),
   // Bug: Type mismatch between outer and inner.
   (nodes: List<Data<string>>, context) => {
     const [body, overflow, closer, opener, delim, type, param] = unwrap(nodes);

package/src/parser/block/extension/table.ts

@@ -83,10 +83,10 @@ const align: AlignParser = line(fmap(
   union([str(alignment)]),
   ([{ value }]) => new List([new Data(value.split('/').map(s => s.split('')) as [string[], string[]?])])));
 
-const delimiter = /[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|[#:](?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/y;
+const delimiter = /[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|[#:](?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=[ \n])/y;
 
 const head: CellParser.HeadParser = block(fmap(open(
-  str(/#(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/y),
+  str(/#(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=[ \n])/y),
   rewrite(
     inits([
       anyline,
@@ -108,7 +108,7 @@ const head: CellParser.HeadParser = block(fmap(open(
   false);
 
 const data: CellParser.DataParser = block(fmap(open(
-  str(/:(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/y),
+  str(/:(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=[ \n])/y),
   rewrite(
     inits([
       anyline,
@@ -133,7 +133,7 @@ const dataline: CellParser.DatalineParser = line(
   rewrite(
     contentline,
     union([
-      validate(/!+\s/y, convert(source => `:${source}`, data, false)),
+      validate(/!+ /y, convert(source => `:${source}`, data, false)),
       convert(source => `: ${source}`, data, false),
     ])));
 

package/src/parser/block/heading.ts

@@ -1,16 +1,16 @@
 import { HeadingParser } from '../block';
 import { State } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, state, block, line, validate, focus, rewrite, open, fmap } from '../../combinator';
+import { union, some, state, block, line, focus, rewrite, open, fmap } from '../../combinator';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { str } from '../source';
 import { visualize, trimBlank } from '../visibility';
 import { unwrap, invalid } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const segment: HeadingParser.SegmentParser = block(validate('#', focus(
-  /#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/y,
-  some(line(({ context: { source } }) => new List([new Data(source)]))))));
+export const segment: HeadingParser.SegmentParser = block(focus(
+  /#+ +\S[^\n]*(?:\n#+(?=$|[ \n])[^\n]*)*(?:$|\n)/y,
+  some(line(({ context: { source } }) => new List([new Data(source)])))));
 
 export const heading: HeadingParser = block(rewrite(segment,
   // その他の表示制御は各所のCSSで行う。

package/src/parser/block/reply/cite.ts

@@ -12,12 +12,12 @@ export const cite: ReplyParser.CiteParser = line(fmap(
   open(
     str(syntax),
     union([
-      anchor,
+      line(anchor),
       // Subject page representation.
       // リンクの実装は後で検討
       focus(/>>#\S*(?=\s*$)/y, ({ context: { source } }) => new List([new Data(html('a', { class: 'anchor' }, source))])),
       focus(/>>https?:\/\/\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Data(html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source))])),
-      focus(/>>.+(?=\s*$)/y, ({ context: { source } }) => new List([new Data(source)])),
+      focus(/>>\S+(?=\s*$)/y, ({ context: { source } }) => new List([new Data(source)])),
     ])),
   nodes => {
     const quotes = nodes.head!.value as string;

package/src/parser/block/reply/quote.ts

@@ -7,14 +7,14 @@ import { linebreak, unescsource, anyline } from '../../source';
 import { unwrap } from '../../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const syntax = />+[^\S\n]/y;
+export const syntax = />+ /y;
 
 export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(
   rewrite(
     some(validate(syntax, anyline)),
     convert(
       // TODO: インデント数を渡してインデント数前の行頭確認を行う実装に置き換える
-      source => source.replace(/(?<=^>+[^\S\n])/mg, '\r'),
+      source => source.replace(/(?<=^>+ )/mg, '\r'),
       some(union([
         // quote補助関数が残した数式をパースする。
         math,

package/src/parser/block/sidefence.test.ts

@@ -39,9 +39,7 @@ describe('Unit: parser/block/sidefence', () => {
       assert.deepStrictEqual(inspect(parser('|  a '), ctx), [['<blockquote class="invalid"><pre> a </pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| \na'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('|\na'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('|\n a'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('|\n|'), ctx), [['<blockquote class="invalid"><pre><br></pre></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('|\n| a'), ctx), [['<blockquote class="invalid"><pre><br>a</pre></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('|\n| a'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('| http://host'), ctx), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| http://host)'), ctx), [['<blockquote class="invalid"><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| !http://host'), ctx), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);

package/src/parser/block/sidefence.ts

@@ -8,7 +8,7 @@ import { unwrap, invalid } from '../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(
-  /(?=\|+(?:[^\S\n]|\n\|))(?:\|+(?:[^\S\n][^\n]*)?(?:$|\n))+$/y,
+  /\|+ [^\n]*(?:\n\|+(?=$|[ \n])[^\n]*)*(?:$|\n)/y,
   union([source])),
   ([{ value }]) => new List([
     new Data(define(value, {
@@ -17,13 +17,13 @@ export const sidefence: SidefenceParser = lazy(() => block(fmap(focus(
     })),
   ]))));
 
-const opener = /(?=\|\|+(?:$|\s))/y;
-const unindent = (source: string) => source.replace(/(?<=^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '');
+const opener = /(?=\|\|+(?:$|[ \n]))/y;
+const unindent = (source: string) => source.replace(/(?<=^|\n)\|(?: |(?=\|*(?:$|[ \n])))|\n$/g, '');
 
 const source: SidefenceParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.block, union([
     focus(
-      /(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/y,
+      /(?:\|\|+(?=$|[ \n])[^\n]*(?:$|\n))+/y,
       convert(unindent, source, false, true)),
     rewrite(
       some(contentline, opener),

package/src/parser/block/table.ts

@@ -28,7 +28,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
   ]))));
 
 const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => fallback(fmap(
-  line(surround(/(?=\|)/y, some(union([parser])), /[|\\]?\s*$/y, optional)),
+  line(surround(/(?=\|)/y, some(union([parser])), /\|?\s*$/y, optional)),
   ns => new List([new Data(html('tr', unwrap(ns)))])),
   rewrite(contentline, ({ context: { source } }) => new List([
     new Data(html('tr', {
@@ -53,7 +53,7 @@ const cell: CellParser = surround(
     close(medialink, /\s*(?=\||$)/y),
     close(media, /\s*(?=\||$)/y),
     close(shortmedia, /\s*(?=\||$)/y),
-    trimBlank(some(inline, /\|/y, [[/[|\\]?\s*$/y, 9]])),
+    trimBlank(some(inline, /\|/y, [[/\|?\s*$/y, 9]])),
   ]),
   /[^|]*/y, true);
 

package/src/parser/block.ts

@@ -114,7 +114,7 @@ export const block: BlockParser = reset(
   ]) as any));
 
 function error(parser: BlockParser): BlockParser {
-  const reg = new RegExp(String.raw`^${Command.Error}.*\n`)
+  const reg = new RegExp(String.raw`^${Command.Error}[^\n]*\n`)
   return recover<BlockParser>(fallback(
     open(Command.Error, ({ context: { source, position } }) => { throw new Error(source.slice(position).split('\n', 1)[0]); }),
     parser),

package/src/parser/header.ts

@@ -8,7 +8,7 @@ import { normalize } from './api/normalize';
 import { html, defrag } from 'typed-dom/dom';
 
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
-  /---+[^\S\v\f\r\n]*\r?\n(?=\S)/y,
+  /---+ *\r?\n(?=\S)/y,
   inits([
     rewrite(
       ({ context }) => {
@@ -24,7 +24,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
       block(
         union([
           validate(({ context }) => context.header ?? true,
-          focus(/(---+)[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}\1[^\S\v\f\r\n]*(?:$|\r?\n)/y,
+          focus(/(---+) *\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1 *(?:$|\r?\n)/y,
           convert(source =>
             normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'),
             fmap(
@@ -48,7 +48,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
             ]);
           },
         ]))),
-    clear(str(/[^\S\v\f\r\n]*\r?\n/y)),
+    clear(str(/ *\r?\n/y)),
   ])));
 
 const field: MarkdownParser.HeaderParser.FieldParser = line(({ context: { source, position } }) => {