securemark 0.299.4 → 0.300.1

package/src/parser/block/mathblock.ts

@@ -1,36 +1,37 @@
 import { MathBlockParser } from '../block';
-import { List, Node } from '../../combinator/data/parser';
-import { block, fence, clear, fmap } from '../../combinator';
+import { Node } from '../../combinator/parser';
+import { inits, block, fence } from '../../combinator';
 import { unwrap, invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
 const opener = /(\${2,})(?!\$)([^\r\n]*)(?:$|\r?\n)/y;
 
 export const segment: MathBlockParser.SegmentParser = block(
-  clear(fence(opener, 300)));
+  fence(opener, false));
 
 export const segment_: MathBlockParser.SegmentParser = block(
-  clear(fence(opener, 300, false)), false);
+  fence(opener, false, false), false);
 
-export const mathblock: MathBlockParser = block(fmap(
-  fence(opener, 300),
-  // Bug: Type mismatch between outer and inner.
-  (nodes, { caches: { math: cache = undefined } = {} }) => {
-    const [body, overflow, closer, opener, delim, param] = unwrap<string>(nodes);
-    return new List([
+export const mathblock: MathBlockParser = block(inits([
+  fence(opener, true),
+  ({ caches: { math: cache = undefined } = {} }, output) => {
+    const [body, overflow, closer, opener, delim, param] = unwrap(output.pop()) as string[];
+    return output.append(
       delim.length === 2 && closer && !overflow && param.trimStart() === ''
         ? new Node(cache?.get(`${delim}\n${body}${delim}`)?.cloneNode(true) as HTMLDivElement ||
           html('div', { class: 'math', translate: 'no' }, `${delim}\n${body}${delim}`))
-        : new Node(html('pre', {
-            class: 'invalid',
-            translate: 'no',
-            ...invalid(
-              'mathblock',
-              delim.length > 2 ? 'syntax' : !closer || overflow ? 'fence' : 'argument',
-              delim.length > 2 ? 'Invalid syntax' :
-                !closer ? `Missing the closing delimiter "${delim}"` :
-                  overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
-                    'Invalid argument'),
-          }, `${opener}${body}${overflow || closer}`)),
-    ]);
-  }));
+        : new Node(html('pre',
+            {
+              class: 'invalid',
+              translate: 'no',
+              ...invalid(
+                'mathblock',
+                delim.length > 2 ? 'syntax' : !closer || overflow ? 'fence' : 'argument',
+                delim.length > 2 ? 'Invalid syntax' :
+                  !closer ? `Missing the closing delimiter "${delim}"` :
+                    overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
+                      'Invalid argument'),
+            },
+            `${opener}${body}${overflow || closer}`)));
+  },
+]));

package/src/parser/block/mediablock.ts

@@ -1,5 +1,5 @@
 import { MediaBlockParser } from '../block';
-import { List, Node } from '../../combinator/data/parser';
+import { List, Node } from '../../combinator/parser';
 import { union, inits, some, block, line, fallback, fmap } from '../../combinator';
 import { medialink, media, lineshortmedia } from '../inline';
 import { unwrap, invalid } from '../util';
@@ -11,15 +11,15 @@ export const mediablock: MediaBlockParser = block(fmap(
       medialink,
       media,
       lineshortmedia,
-    ])),
+    ]), false),
     some(line(fallback(union([
       medialink,
       media,
       lineshortmedia,
-    ]), ({ source }) => new List([
+    ]), ({ source }, output) => output.append(
       new Node(html('span', {
-      class: 'invalid',
-      ...invalid('mediablock', 'syntax', 'Not media syntax'),
-    }, source.replace(/\r?\n/, '')))
-    ]))))]),
+        class: 'invalid',
+        ...invalid('mediablock', 'syntax', 'Not media syntax'),
+      }, source.replace(/\r?\n/, ''))))), false))
+  ]),
   ns => new List([new Node(html('div', unwrap(ns)))])));

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

@@ -1,7 +1,6 @@
 import { olist } from './olist';
 import { some } from '../../combinator';
-import { input } from '../../combinator/data/parser';
-import { Context } from '../context';
+import { input } from '../context';
 import { inspect } from '../../debug.test';
 
 describe('Unit: parser/block/olist', () => {
@@ -9,140 +8,140 @@ describe('Unit: parser/block/olist', () => {
     const parser = some(olist);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1a. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('a1. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('aZ. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('Az. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1 ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1 ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.1', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.1.', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('1.\n1. a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(1)', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(1)\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(1)\n(1) a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('I. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('A. ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(I) ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('(A) ', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input(' 1. ', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1a. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('a1. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('aZ. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('Az. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1 ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1 ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.1')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.1.')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('1.\n1. a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(1)')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(1)\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(1)\n(1) a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('I. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('A. ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(I) ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('(A) ')), undefined);
+      assert.deepStrictEqual(inspect(parser, input(' 1. ')), undefined);
     });
 
     it('single', () => {
       // pending
-      assert.deepStrictEqual(inspect(parser, input('1. ', new Context())), [['<ol><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. ')), [['<ol><li></li></ol>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser, input('1. \\', new Context())), [['<ol><li id="index::\\">\\</li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \\\n', new Context())), [['<ol><li id="index::\\">\\</li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. -', new Context())), [['<ol><li id="index::-">-</li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. -\n', new Context())), [['<ol><li id="index::-">-</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \\')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \\\n')), [['<ol><li id="index::\\">\\</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. -')), [['<ol><li id="index::-">-</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. -\n')), [['<ol><li id="index::-">-</li></ol>'], '']);
       // pending
-      assert.deepStrictEqual(inspect(parser, input('(1) ', new Context())), [['<ol data-format="paren"><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) ')), [['<ol data-format="paren"><li></li></ol>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser, input('(1) a', new Context())), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) a')), [['<ol data-format="paren"><li id="index::a">a</li></ol>'], '']);
     });
 
     it('multiple', () => {
       // pending
-      assert.deepStrictEqual(inspect(parser, input('0. \n0', new Context())), [['<ol><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. \n0\n', new Context())), [['<ol><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. \n0.', new Context())), [['<ol><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. \n0. ', new Context())), [['<ol><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. \n0.\n', new Context())), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0')), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0\n')), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0.')), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0. ')), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0.\n')), [['<ol><li></li><li></li></ol>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2', new Context())), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2\n0. 3', new Context())), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2')), [['<ol><li id="index::1">1</li><li id="index::2">2</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n0. 2\n0. 3')), [['<ol><li id="index::1">1</li><li id="index::2">2</li><li id="index::3">3</li></ol>'], '']);
       // pending
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)\n', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       // filled
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1) ', new Context())), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1) ')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       // invalid
-      assert.deepStrictEqual(inspect(parser, input('0. \n0 ', new Context())), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n0 ')), [['<ol><li></li><li id="index::0"><span class="invalid">0 </span></li></ol>'], '']);
     });
 
     it('nest', () => {
-      assert.deepStrictEqual(inspect(parser, input('0. \n 0', new Context())), [['<ol><li><br><ol><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. ', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.\n', new Context())), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n 0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n  0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. 1\n  0. 2\n 0. 3', new Context())), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. a [#b]', new Context())), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. http://host\\', new Context())), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. !http://host', new Context())), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n 0')), [['<ol><li><br><ol><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. ')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0.\n')), [['<ol><li id="index::1">1<ol><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::3">3</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n 0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li><li id="index::3">3</li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n 0. 2\n  0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2<ol><li id="index::3">3</li></ol></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. 1\n  0. 2\n 0. 3')), [['<ol><li id="index::1">1<ol><li id="index::2">2</li></ol></li><li id="index::0._3"><span class="invalid"> 0. 3</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. a [#b]')), [['<ol><li id="index::a_b">a <a class="index" href="#index::b">b</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. http://host\\')), [['<ol><li id="index::http://host\\"><a class="url" href="http://host\\" target="_blank">http://host\\</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. !http://host')), [['<ol><li id="index::!http://host">!<a class="url" href="http://host" target="_blank">http://host</a></li></ol>'], '']);
     });
 
     it('index', () => {
-      assert.deepStrictEqual(inspect(parser, input('1. ', new Context())), [['<ol><li></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('9. ', new Context())), [['<ol><li data-marker="9."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('00. ', new Context())), [['<ol><li data-marker="00."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('01. ', new Context())), [['<ol><li data-marker="01."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('0. \n1', new Context())), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('8. \n9', new Context())), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('9. \n9', new Context())), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. ')), [['<ol><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('9. ')), [['<ol><li data-marker="9."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('00. ')), [['<ol><li data-marker="00."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('01. ')), [['<ol><li data-marker="01."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0. \n1')), [['<ol><li></li><li data-marker="1."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('8. \n9')), [['<ol><li data-marker="8."></li><li data-marker="9."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('9. \n9')), [['<ol><li data-marker="9."></li><li data-marker="9." class="invalid"></li></ol>'], '']);
     });
 
     it('branch', () => {
-      assert.deepStrictEqual(inspect(parser, input('1-1. ', new Context())), [['<ol><li data-marker="1-1."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1-1-1. ', new Context())), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n1-', new Context())), [['<ol><li></li><li data-marker="1-."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n1-1', new Context())), [['<ol><li></li><li data-marker="1-1."></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1)-1 ', new Context())), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1)-1-1 ', new Context())), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-', new Context())), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-1', new Context())), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n1--', new Context())), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n1--. ', new Context())), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)--', new Context())), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-- ', new Context())), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1-1. 1', new Context())), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1-1. ')), [['<ol><li data-marker="1-1."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1-1-1. ')), [['<ol><li data-marker="1-1-1."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n1-')), [['<ol><li></li><li data-marker="1-."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n1-1')), [['<ol><li></li><li data-marker="1-1."></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1)-1 ')), [['<ol data-format="paren"><li data-marker="(1)-1"></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1)-1-1 ')), [['<ol data-format="paren"><li data-marker="(1)-1-1"></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-')), [['<ol data-format="paren"><li></li><li data-marker="(1)-"></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-1')), [['<ol data-format="paren"><li></li><li data-marker="(1)-1"></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n1--')), [['<ol><li></li><li id="index::1--"><span class="invalid">1--</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n1--. ')), [['<ol><li></li><li id="index::1--."><span class="invalid">1--. </span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)--')), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)--</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('(1) \n(1)-- ')), [['<ol data-format="paren"><li></li><li id="index::(1)--"><span class="invalid">(1)-- </span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1-1. 1')), [['<ol><li data-marker="1-1." id="index::1">1</li></ol>'], '']);
     });
 
     it('type', () => {
-      assert.deepStrictEqual(inspect(parser, input('1. \n i. ', new Context())), [['<ol><li><br><ol type="i" data-type="lower-roman"><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n a. ', new Context())), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n I. ', new Context())), [['<ol><li><br><ol type="I" data-type="upper-roman"><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n A. ', new Context())), [['<ol><li><br><ol type="A" data-type="upper-alpha"><li></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n a. \n 1.\n c', new Context())), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li><li data-marker="1."></li><li data-marker="c."></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. \n i. 1', new Context())), [['<ol><li><br><ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n i. ')), [['<ol><li><br><ol type="i" data-type="lower-roman"><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n a. ')), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n I. ')), [['<ol><li><br><ol type="I" data-type="upper-roman"><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n A. ')), [['<ol><li><br><ol type="A" data-type="upper-alpha"><li></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n a. \n 1.\n c')), [['<ol><li><br><ol type="a" data-type="lower-alpha"><li></li><li data-marker="1."></li><li data-marker="c."></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. \n i. 1')), [['<ol><li><br><ol type="i" data-type="lower-roman"><li id="index::1">1</li></ol></li></ol>'], '']);
     });
 
     it('checkbox', () => {
-      assert.deepStrictEqual(inspect(parser, input('1. [ ]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. [x]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. [X]', new Context())), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. [X] 1', new Context())), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [ ]')), [['<ol class="checklist"><li><span class="checkbox">☐</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [x]')), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [X]')), [['<ol class="checklist"><li><span class="checkbox">☑</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [X] 1')), [['<ol class="checklist"><li id="index::1"><span class="checkbox">☑</span>1</li></ol>'], '']);
     });
 
     it('indexer', () => {
-      assert.deepStrictEqual(inspect(parser, input('1. [|a]', new Context())), [['<ol><li id="index::[|a]"><span class="invalid">[|a]</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. a [|]', new Context())), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. a [|b]', new Context())), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. - [|]', new Context())), [['<ol><li>-<span class="indexer" data-index=""></span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. [ ] [|a]', new Context())), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. [ ] a [|b]', new Context())), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. a [|]\n 1. c [|d]', new Context())), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('1. a [|b]\n 1. c [|d]', new Context())), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [|a]')), [['<ol><li id="index::[|a]"><span class="invalid">[|a]</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. a [|]')), [['<ol><li>a<span class="indexer" data-index=""></span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. a [|b]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. - [|]')), [['<ol><li>-<span class="indexer" data-index=""></span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [ ] [|a]')), [['<ol class="checklist"><li id="index::[|a]"><span class="checkbox">☐</span><span class="invalid">[|a]</span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. [ ] a [|b]')), [['<ol class="checklist"><li id="index::b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. a [|]\n 1. c [|d]')), [['<ol><li>a<span class="indexer" data-index=""></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('1. a [|b]\n 1. c [|d]')), [['<ol><li id="index::b">a<span class="indexer" data-index="b"></span><ol><li id="index::d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
     });
 
   });

package/src/parser/block/olist.ts

@@ -1,6 +1,6 @@
 import { OListParser } from '../block';
 import { Recursion } from '../context';
-import { List, Node } from '../../combinator/data/parser';
+import { List, Node } from '../../combinator/parser';
 import { union, inits, subsequence, some, recursion, block, line, validate, indent, focus, open, match, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, checkbox, fillFirstLine } from './ulist';
 import { ilist_, ilistitem } from './ilist';
@@ -11,8 +11,8 @@ import { memoize } from 'spica/memoize';
 import { html, define, defrag } from 'typed-dom/dom';
 
 const openers = {
-  '.': /([0-9]+|[a-z]+|[A-Z]+)(?:-(?=$|[0-9\r\n])[0-9]*)*(?:\.?(?:$|[\r\n])|\. )/y,
-  '(': /\((?=$|[0-9a-z\r\n])([0-9]*|[a-z]*)(?=$|[)\r\n])\)?(?:-(?=$|[0-9\r\n])[0-9]*)*(?:$|[ \r\n])/y,
+  '.': /([0-9]+|[a-z]+|[A-Z]+)(?:-(?=$|[0-9\r\n])[0-9]*)*(?:\.?(?=$|[\r\n])|\. )/y,
+  '(': /\((?=$|[0-9a-z\r\n])([0-9]*|[a-z]*)(?=$|[)\r\n])\)?(?:-(?=$|[0-9\r\n])[0-9]*)*(?=$|[ \r\n])/y,
 } as const;
 
 export const olist: OListParser = lazy(() => block(validate(
@@ -31,13 +31,14 @@ export const olist_: OListParser = lazy(() => block(union([
     memoize(ms => list(type(ms[1]), '('), ms => idx(ms[1]), [])),
 ])));
 
+// TODO: リストマーカーの直書き
 const list = (type: string, form: string): OListParser.ListParser => fmap(
-  recursion(Recursion.listitem, some(union([
+  recursion(Recursion.block, some(union([
     indexee(fmap(fallback(
       inits([
-        line(open(heads[form], subsequence([
+        open(heads[form], subsequence([
           checkbox,
-          visualize(trimBlank(some(union([indexer, inline]))))]), true)),
+          line(visualize(trimBlank(some(union([indexer, inline])))))]), true),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       ilistitem),
@@ -53,14 +54,12 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
 const heads = {
   '.': focus(
     openers['.'],
-    ({ source }) => new List([
-      new Node(source.trimEnd().split('.', 1)[0] + '.')
-    ])),
+    ({ source }, output) => output.append(
+      new Node(source.trimEnd().split('.', 1)[0] + '.'))),
   '(': focus(
     openers['('],
-    ({ source }) => new List([
-      new Node(source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)'))
-    ])),
+    ({ source }, output) => output.append(
+      new Node(source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')))),
 } as const;
 
 function idx(value: string): number {

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

@@ -1,7 +1,6 @@
 import { pagebreak } from './pagebreak';
 import { some } from '../../combinator';
-import { input } from '../../combinator/data/parser';
-import { Context } from '../context';
+import { input } from '../context';
 import { inspect } from '../../debug.test';
 
 describe('Unit: parser/block/pagebreak', () => {
@@ -9,23 +8,23 @@ describe('Unit: parser/block/pagebreak', () => {
     const parser = some(pagebreak);
 
     it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser, input('', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('\n', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('=', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('==', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('==\n=', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('===a', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('===\na', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('= = =', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input(' ===', new Context())), undefined);
-      assert.deepStrictEqual(inspect(parser, input('---', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('\n')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('=')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('==')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('==\n=')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('===a')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('===\na')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('= = =')), undefined);
+      assert.deepStrictEqual(inspect(parser, input(' ===')), undefined);
+      assert.deepStrictEqual(inspect(parser, input('---')), undefined);
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser, input('===', new Context())), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('=== ', new Context())), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('===\n', new Context())), [['<hr>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('====', new Context())), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('===')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('=== ')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('===\n')), [['<hr>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('====')), [['<hr>'], '']);
     });
 
   });

package/src/parser/block/pagebreak.ts

@@ -1,8 +1,8 @@
 import { PagebreakParser } from '../block';
-import { List, Node } from '../../combinator/data/parser';
-import { block, line, focus } from '../../combinator';
+import { Node } from '../../combinator/parser';
+import { block, focus } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
-export const pagebreak: PagebreakParser = block(line(focus(
-  /={3,}[^\S\r\n]*(?:$|\r?\n)/y,
-  () => new List([new Node(html('hr'))]))));
+export const pagebreak: PagebreakParser = block(focus(
+  /={3,}[^\S\r\n]*(?:$|\r?\n(?=[^\S\r\n]*(?:$|\r?\n)))/y,
+  (_, output) => output.append(new Node(html('hr')))));