securemark 0.294.7 → 0.294.9

package/src/parser/inline/autolink/account.ts

@@ -1,25 +1,57 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
+import { some, state, constraint, verify, surround, lazy } from '../../../combinator';
+import { parse } from '../link';
+import { emoji } from './hashtag';
+import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
 // https://example/@user must be a user page or a redirect page going there.
+// https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 
-export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
+export const account: AutolinkParser.AccountParser = lazy(() => constraint(State.autolink, state(State.autolink,
   surround(
-    /(?<![0-9a-z])@/yi,
-    /[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi,
-    /[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@#]|>>|:\S)/yi,
-    true, undefined, undefined,
-    [3 | Backtrack.autolink]),
-  constraint(State.autolink, state(State.autolink, fmap(convert(
-    source =>
-      `[${source}]{ ${source.includes('/')
-        ? `https://${source.slice(1).replace('/', '/@')}`
-        : `/${source}`
-      } }`,
-    union([unsafelink]),
-    false),
-    ([{ value }]) => new List([new Data(define(value, { class: 'account' }))]))))));
+    surround(
+      /(?<![0-9a-z])@/yi,
+      str(/[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}\/|/yi),
+      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi),
+      false,
+      [3 | Backtrack.autolink]),
+    some(surround(
+      '#',
+      verify(
+        str(new RegExp([
+          /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
+        ].join('|').replace(/emoji/g, emoji.source), 'yu')),
+        ([{ value }]) => /^[0-9]{0,4}[^0-9]/.test(value)),
+      new RegExp([
+        /(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+      ].join('|').replace(/emoji/g, emoji.source), 'yu'),
+      false,
+      [3 | Backtrack.autolink])),
+    '',
+    false, [],
+    ([[{ value: host }, { value: account }], nodes], context) => {
+      const hashes = nodes.foldl((acc, { value }) => acc + '#' + value, '');
+      const param = nodes.foldl((acc, { value }) => acc ? acc + '+' + value : value, '');
+      return new List([
+        new Data(define(
+          parse(
+            new List([new Data(`@${host}${account}${hashes}`)]),
+            new List([new Data(host ? `https://${host}@${account}?ch=${param}` : `/@${account}?ch=${param}`)]),
+            context),
+          { class: 'channel' }))
+      ]);
+    },
+    ([[{ value: host }, { value: account }]], context) => {
+      if (context.source[context.position] === '#') return;
+      return new List([
+        new Data(define(
+          parse(
+            new List([new Data(`@${host}${account}`)]),
+            new List([new Data(host ? `https://${host}@${account}` : `/@${account}`)]),
+            context),
+          { class: 'account' }))
+      ]);
+    }))));

package/src/parser/inline/autolink/anchor.test.ts

@@ -32,7 +32,6 @@ describe('Unit: parser/inline/autolink/anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>0-A'), ctx), [['<a class="anchor" href="?at=0-A">&gt;&gt;0-A</a>'], '']);
       assert.deepStrictEqual(inspect(parser('>>0--a'), ctx), [['<a class="anchor" href="?at=0">&gt;&gt;0</a>'], '--a']);
       assert.deepStrictEqual(inspect(parser('>>2000-0131-2359-59999'), ctx), [['<a class="anchor" href="?at=2000-0131-2359-59999">&gt;&gt;2000-0131-2359-59999</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>A/2000-0131-2359-59'), ctx), [['<a class="anchor" href="/@A/timeline?at=2000-0131-2359-59">&gt;&gt;A/2000-0131-2359-59</a>'], '']);
     });
 
   });

package/src/parser/inline/autolink/anchor.ts

@@ -1,8 +1,9 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
+import { state, constraint, surround, lazy } from '../../../combinator';
+import { parse } from '../link';
+import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
 // Timeline(pseudonym): user/tid
@@ -15,18 +16,18 @@ import { define } from 'typed-dom/dom';
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
 
-export const anchor: AutolinkParser.AnchorParser = lazy(() => rewrite(
-  open(
+export const anchor: AutolinkParser.AnchorParser = lazy(() => constraint(State.autolink, state(State.autolink,
+  surround(
     /(?<![0-9a-z])>>/yi,
-    /(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?!-?[0-9a-z@#]|>>|:\S)/yi,
+    str(/[0-9a-z]+(?:-[0-9a-z]+)*(?!-?[0-9a-z@#]|>>|:\S)/yi),
+    '',
     false,
-    [3 | Backtrack.autolink]),
-  constraint(State.autolink, state(State.autolink, fmap(convert(
-    source =>
-      `[${source}]{ ${source.includes('/')
-        ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
-        : `?at=${source.slice(2)}`
-      } }`,
-    union([unsafelink]),
-    false),
-    ([{ value }]) => new List([new Data(define(value, { class: 'anchor' }))]))))));
+    [3 | Backtrack.autolink],
+    ([, [{ value }]], context) =>
+      new List([
+        new Data(define(parse(
+          new List([new Data(`>>${value}`)]),
+          new List([new Data(`?at=${value}`)]),
+          context),
+          { class: 'anchor' }))
+      ])))));

package/src/parser/inline/autolink/email.test.ts

@@ -27,8 +27,8 @@ describe('Unit: parser/inline/autolink/email', () => {
       assert.deepStrictEqual(inspect(parser('a..b@c'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('a++b@c'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('a@b.c:d'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b.domain.com:c'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' a@b'), ctx), undefined);
     });
 

package/src/parser/inline/autolink/email.ts

@@ -1,21 +1,20 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, verify, rewrite, open } from '../../../combinator';
+import { state, constraint, verify, surround } from '../../../combinator';
 import { str } from '../../source';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
 
-export const email: AutolinkParser.EmailParser = rewrite(
-  open(/(?<![0-9a-z][_.+-]?|[@#])(?=[0-9a-z])/yi,
+export const email: AutolinkParser.EmailParser = constraint(State.autolink, state(State.autolink,
+  surround(
+    /(?<![0-9a-z][_.+-]?|[@#])(?=[0-9a-z])/yi,
     verify(
-      str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![.-]?[0-9a-z@#]|>>|:\S)/yi),
-      ([{ value }]) => value.length <= 255),
+      str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,63}@[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}(?![.-]?[0-9a-z@#]|>>|:\S)/yi),
+      ([{ value }]) => value.length <= 254),
+    '',
     false,
-    [3 | Backtrack.autolink]),
-  constraint(State.autolink, state(State.autolink,
-    union([
-      ({ context: { source } }) =>
-        new List([new Data(html('a', { class: 'email', href: `mailto:${source}` }, source))])
-    ]))));
+    [3 | Backtrack.autolink],
+    ([, [{ value }]]) =>
+      new List([new Data(html('a', { class: 'email', href: `mailto:${value}` }, value))]))));

package/src/parser/inline/autolink/hashnum.ts

@@ -1,24 +1,28 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
+import { state, constraint, surround, lazy } from '../../../combinator';
+import { parse } from '../link';
 import { emoji } from './hashtag';
+import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
-export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
-  open(
+export const hashnum: AutolinkParser.HashnumParser = lazy(() => constraint(State.autolink, state(State.autolink,
+  surround(
     new RegExp([
       /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yu.source,
     ].join('|').replace(/emoji/g, emoji.source), 'yu'),
-    new RegExp([
+    str(new RegExp([
       /[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-    ].join('|').replace(/emoji/g, emoji.source), 'yu'),
+    ].join('|').replace(/emoji/g, emoji.source), 'yu')),
+    '',
     false,
-    [1 | Backtrack.autolink]),
-  constraint(State.autolink, state(State.autolink, fmap(convert(
-    source => `[${source}]{ ${source.slice(1)} }`,
-    union([unsafelink]),
-    false),
-    ([{ value }]) => new List([new Data(define(value, { class: 'hashnum', href: null }))])))),
-  ));
+    [1 | Backtrack.autolink],
+    ([, [{ value }]], context) =>
+      new List([
+        new Data(define(parse(
+          new List([new Data(`#${value}`)]),
+          new List([new Data(value)]),
+          context),
+          { class: 'hashnum', href: null }))
+      ])))));

package/src/parser/inline/autolink/hashtag.ts

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
+import { state, constraint, verify, surround, lazy } from '../../../combinator';
+import { parse } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
@@ -11,22 +11,26 @@ import { define } from 'typed-dom/dom';
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 export const emoji = /\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F|\u200D/u;
 
-export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
-  verify(surround(
+export const hashtag: AutolinkParser.HashtagParser = lazy(() => constraint(State.autolink, state(State.autolink,
+  surround(
     new RegExp([
       /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yu.source,
     ].join('|').replace(/emoji/g, emoji.source), 'yu'),
-    str(new RegExp([
-      /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
-    ].join('|').replace(/emoji/g, emoji.source), 'yu')),
+    verify(
+      str(new RegExp([
+        /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
+      ].join('|').replace(/emoji/g, emoji.source), 'yu')),
+      ([{ value }]) => /^[0-9]{0,4}[^0-9]/.test(value)),
     new RegExp([
       /(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
     ].join('|').replace(/emoji/g, emoji.source), 'yu'),
-    false, undefined, undefined,
-    [3 | Backtrack.autolink]),
-    ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
-  constraint(State.autolink, state(State.autolink, fmap(convert(
-    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-    union([unsafelink]),
-    false),
-    ([{ value }]) => new List([new Data(define(value, { class: 'hashtag' }))]))))));
+    false,
+    [3 | Backtrack.autolink],
+    ([, [{ value }]], context) =>
+      new List([
+        new Data(define(parse(
+          new List([new Data(`#${value}`)]),
+          new List([new Data(`/hashtags/${value}`)]),
+          context),
+          { class: 'hashtag' }))
+      ])))));

package/src/parser/inline/autolink/url.ts

@@ -1,9 +1,9 @@
 import { AutolinkParser } from '../../inline';
 import { State, Recursion, Backtrack } from '../../context';
-import { List } from '../../../combinator/data/parser';
-import { union, tails, some, recursion, precedence, state, constraint, verify, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { List, Data } from '../../../combinator/data/parser';
+import { union, tails, some, recursion, precedence, state, constraint, verify, focus, rewrite, surround, open, lazy } from '../../../combinator';
 import { inline } from '../../inline';
-import { unsafelink } from '../link';
+import { parse } from '../link';
 import { unescsource, str } from '../../source';
 
 export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
@@ -16,10 +16,8 @@ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
     false,
     [3 | Backtrack.autolink]),
   union([
-    constraint(State.autolink, state(State.autolink, convert(
-      url => `{ ${url} }`,
-      unsafelink,
-      false))),
+    constraint(State.autolink, state(State.autolink, ({ context }) =>
+      new List([new Data(parse(new List(), new List([new Data(context.source)]), context))]))),
     open(str(/[^:]+/y), some(inline)),
   ])));
 
@@ -28,21 +26,28 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
   tails([
     str('!'),
     union([
-      constraint(State.autolink, state(State.autolink, convert(
-        url => `{ ${url} }`,
-        unsafelink,
-        false))),
+      constraint(State.autolink, state(State.autolink, ({ context }) => {
+        const { source, position } = context;
+        context.position -= source[0] === '!' ? 1 : 0;
+        context.position += source.length;
+        return new List([
+          new Data(parse(
+            new List(),
+            new List([new Data(source.slice(position))]),
+            context))
+        ]);
+      })),
       open(str(/[^:]+/y), some(inline)),
     ]),
   ])));
 
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
-  surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'), true,
-    undefined, () => new List(), [3 | Backtrack.autolink]),
-  surround(str('['), recursion(Recursion.terminal, some(union([bracket, unescsource]), ']')), str(']'), true,
-    undefined, () => new List(), [3 | Backtrack.autolink]),
-  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, unescsource]), '}')), str('}'), true,
-    undefined, () => new List(), [3 | Backtrack.autolink]),
-  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(unescsource, '"'))), str('"'), true,
-    undefined, () => new List(), [3 | Backtrack.autolink]),
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'),
+    true, [3 | Backtrack.autolink], undefined, () => new List()),
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, unescsource]), ']')), str(']'),
+    true, [3 | Backtrack.autolink], undefined, () => new List()),
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, unescsource]), '}')), str('}'),
+    true, [3 | Backtrack.autolink], undefined, () => new List()),
+  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(unescsource, '"'))), str('"'),
+    true, [3 | Backtrack.autolink], undefined, () => new List()),
 ]));

package/src/parser/inline/autolink.ts

@@ -3,7 +3,6 @@ import { State } from '../context';
 import { state, lazy } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
-import { channel } from './autolink/channel';
 import { account } from './autolink/account';
 import { hashtag } from './autolink/hashtag';
 import { hashnum } from './autolink/hashnum';
@@ -18,7 +17,7 @@ export const autolink: AutolinkParser = lazy(() =>
     const fst = source[position];
     switch (fst) {
       case '@':
-        return channel(input) || account(input);
+        return account(input);
       case '#':
         return hashtag(input) || hashnum(input);
       case '>':

package/src/parser/inline/bracket.ts

@@ -39,34 +39,35 @@ const p1 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
   str(')'),
   true,
+  [2 | Backtrack.bracket],
   ([as, bs = new List(), cs], { source, position, range = 0 }) => {
     const str = source.slice(position - range + 1, position - 1);
     return indexA.test(str)
       ? new List([new Data(as.head!.value), new Data(str), new Data(cs.head!.value)])
       : new List([new Data(html('span', { class: 'paren' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))]);
   },
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const p2 = lazy(() => surround(
   str('（'),
   precedence(1, recursion(Recursion.bracket, some(inline, '）', [['）', 1]]))),
   str('）'),
   true,
+  [2 | Backtrack.bracket],
   ([as, bs = [], cs], { source, position, range = 0 }) => {
     const str = source.slice(position - range + 1, position - 1);
     return indexF.test(str)
       ? new List([new Data(as.head!.value), new Data(str), new Data(cs.head!.value)])
       : new List([new Data(html('span', { class: 'paren' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))]);
   },
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const s1 = lazy(() => surround(
   str('['),
   precedence(1, recursion(Recursion.bracket, some(inline, ']', [[']', 1]]))),
   str(']'),
   true,
+  [2 | Backtrack.bracket],
   ([as, bs = new List(), cs], context) => {
     if (context.state! & State.link) {
       const { source, position, range = 0 } = context;
@@ -89,35 +90,34 @@ const s1 = lazy(() => surround(
     }
     return as.import(bs as List<Data<string>>).import(cs);
   },
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const s2 = lazy(() => surround(
   str('［'),
   precedence(1, recursion(Recursion.bracket, some(inline, '］', [['］', 1]]))),
   str('］'),
   true,
+  [2 | Backtrack.bracket],
   undefined,
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const c1 = lazy(() => surround(
   str('{'),
   precedence(1, recursion(Recursion.bracket, some(inline, '}', [['}', 1]]))),
   str('}'),
   true,
+  [2 | Backtrack.bracket],
   undefined,
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const c2 = lazy(() => surround(
   str('｛'),
   precedence(1, recursion(Recursion.bracket, some(inline, '｝', [['｝', 1]]))),
   str('｝'),
   true,
+  [2 | Backtrack.bracket],
   undefined,
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
 const d1 = lazy(() => surround(
   str('"'),
@@ -125,6 +125,6 @@ const d1 = lazy(() => surround(
   precedence(2, recursion(Recursion.bracket, some(inline, /["\n]/y, [['"', 2], ['\n', 3]]))),
   str('"'),
   true,
+  [2 | Backtrack.bracket],
   undefined,
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>),
-  [2 | Backtrack.bracket]));
+  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));

package/src/parser/inline/deletion.ts

@@ -15,7 +15,8 @@ export const deletion: DeletionParser = lazy(() =>
       some(inline, blankWith('\n', '~~')),
       open('\n', some(inline, '~'), true),
     ]))),
-    '~~', false,
+    '~~',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     nodes => new List([new Data(html('del', defrag(unwrap(nodes))))]))));

package/src/parser/inline/emphasis.ts

@@ -17,6 +17,7 @@ export const emphasis: EmphasisParser = lazy(() => surround(
     some(inline, blankWith('*')),
     open(some(inline, '*'), inline),
   ]))))),
-  str('*'), false,
+  str('*'),
+  false, [],
   ([, bs]) => new List([new Data(html('em', defrag(unwrap(bs))))]),
   ([as, bs]) => bs && as.import(bs as List<Data<string>>)));

package/src/parser/inline/emstrong.ts

@@ -32,7 +32,8 @@ export const emstrong: EmStrongParser = lazy(() =>
       some(inline, blankWith('*')),
       open(some(inline, '*'), inline),
     ])))),
-    str(/\*{1,3}/y), false,
+    str(/\*{1,3}/y),
+    false, [],
     ([, bs, cs], context): Result<Node<EmStrongParser>, Context<EmStrongParser>> => {
       assert(cs.length === 1);
       const { buffer = new List() } = context;

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

@@ -22,12 +22,12 @@ export const index: IndexParser = lazy(() => constraint(State.index, fmap(indexe
   ]), ']', [[']', 1]])))),
   str(']'),
   false,
+  [3 | Backtrack.bracket],
   ([, bs], context) =>
     context.linebreak === 0 && trimBlankNodeEnd(bs).length > 0
       ? new List([new Data(html('a', { 'data-index': dataindex(bs) }, defrag(unwrap(bs))))])
       : undefined,
-  undefined,
-  [3 | Backtrack.bracket])),
+  undefined)),
   ns => {
     if (ns.length === 1) {
       const el = ns.head!.value as HTMLElement;
@@ -54,14 +54,14 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', s
   ]), ']'),
   /(?=])/y,
   false,
+  [3 | Backtrack.bracket],
   ([, ns], context) => {
     const index = identity('index', undefined, ns.foldl((acc, { value }) => acc + value, ''))?.slice(7);
     return index && context.linebreak === 0
       ? new List([new Data(html('span', { class: 'indexer', 'data-index': index }))])
       : undefined;
   },
-  ([as, bs]) => bs && as.import(bs),
-  [3 | Backtrack.bracket])));
+  ([as, bs]) => bs && as.import(bs))));
 
 export function dataindex(nodes: List<Data<string | HTMLElement>>): string | undefined {
   let node = nodes.last;

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

@@ -16,4 +16,4 @@ export const indexer: ExtensionParser.IndexerParser = surround(
     signature,
     focus(/\|(?=\])/y, () => new List([new Data(html('span', { class: 'indexer', 'data-index': '' }))])),
   ]),
-  /\]\s*$/y);
+  /\][^\S\n]*(?:$|\n)/y);

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

@@ -14,7 +14,7 @@ export const segment: ExtensionParser.LabelParser.SegmentParser = clear(union([
 
 export const label: ExtensionParser.LabelParser = constraint(State.label, fmap(
   union([
-    surround('[', body, ']', false, undefined, undefined, [1 | Backtrack.bracket, 1]),
+    surround('[', body, ']', false, [1 | Backtrack.bracket, 1]),
     body,
   ]),
   ([{ value }]) => new List([

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

@@ -17,7 +17,9 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
   str(/\[[:^|]/y),
   precedence(1, recursion(Recursion.inline,
   tightStart(some(union([inline]), ']', [[']', 1]])))),
-  str(']'), false,
+  str(']'),
+  false,
+  [3 | Backtrack.bracket],
   (_, context) => new List([
     new Data(html('span',
       {
@@ -26,5 +28,4 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
       },
       context.source.slice(context.position - context.range!, context.position)))
   ]),
-  ([as, bs]) => bs && as.import(bs as List<Data<string>>),
-  [3 | Backtrack.bracket]));
+  ([as, bs]) => bs && as.import(bs as List<Data<string>>)));

package/src/parser/inline/html.ts

@@ -26,7 +26,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
       str(/<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[ >])/y),
       some(union([attribute])),
       open(str(/ ?/y), str('>'), true),
-      true,
+      true, [],
       ([as, bs = new List(), cs], context) =>
         new List([new Data(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), context))]),
       ([as, bs = new List()], context) =>
@@ -38,7 +38,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
         surround<HTMLParser.TagParser, string>(
           surround(
             str(`<${tag}`), some(attribute), open(str(/ ?/y), str('>'), true),
-            true,
+            true, [],
             ([as, bs = new List(), cs]) => as.import(bs).import(cs),
             ([as, bs = new List()]) => as.import(bs)),
           // 不可視のHTML構造が可視構造を変化させるべきでない。
@@ -51,7 +51,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
             open('\n', some(inline, `</${tag}>`), true),
           ])))),
           str(`</${tag}>`),
-          true,
+          true, [],
           ([as, bs = new List(), cs], context) =>
             new List([new Data(elem(tag, true, [...unwrap(as)], bs, cs, context))]),
           ([as, bs = new List()], context) =>
@@ -63,7 +63,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
       str(/<[a-z]+(?=[ >])/yi),
       some(union([attribute])),
       open(str(/ ?/y), str('>'), true),
-      true,
+      true, [],
       ([as, bs = new List(), cs], context) =>
         new List([new Data(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), context))]),
       ([as, bs = new List()], context) =>

package/src/parser/inline/htmlentity.ts

@@ -9,11 +9,11 @@ import { html } from 'typed-dom/dom';
 export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
   str('&'), str(/[0-9A-Za-z]+/y), str(';'),
   false,
+  [3 | Backtrack.bracket],
   ([as, bs, cs]) =>
     new List([new Data(parser(as.head!.value + bs.head!.value + cs.head!.value))]),
   ([as, bs]) =>
-    new List([new Data(as.head!.value + (bs?.head?.value ?? ''))]),
-  [3 | Backtrack.bracket]);
+    new List([new Data(as.head!.value + (bs?.head?.value ?? ''))]));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),

package/src/parser/inline/insertion.ts

@@ -15,7 +15,8 @@ export const insertion: InsertionParser = lazy(() =>
       some(inline, blankWith('\n', '++')),
       open('\n', some(inline, '+'), true),
     ]))),
-    '++', false,
+    '++',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     nodes => new List([new Data(html('ins', defrag(unwrap(nodes))))]))));

package/src/parser/inline/italic.ts

@@ -18,7 +18,8 @@ export const italic: ItalicParser = lazy(() =>
       some(inline, blankWith('///')),
       open(some(inline, '/'), inline),
     ])))),
-    '///', false,
+    '///',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     nodes => new List([new Data(html('i', defrag(unwrap(nodes))))]))));