securemark 0.300.3 → 0.300.5

package/index.d.ts

@@ -42,8 +42,8 @@ export interface ParserSettings {
 export type Progress =
   | { readonly type: 'segment'; readonly value: string; }
   | { readonly type: 'block'; readonly value: HTMLElement; }
-  | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
-  | { readonly type: 'note'; readonly value: HTMLLIElement | HTMLElement; }
+  | { readonly type: 'figure'; }
+  | { readonly type: 'note'; readonly value: HTMLOListElement; }
   | { readonly type: 'break'; readonly value: 'segment' | 'block' | 'parser' | 'figure' | 'note'; }
   | { readonly type: 'cancel'; };
 

package/markdown.d.ts

@@ -1,19 +1,18 @@
 import { Parser, List, Node } from './src/combinator/parser';
 import { Input } from './src/parser/context';
 
-declare abstract class Markdown<T> {
+declare abstract class Document<T> {
   private parser?: T;
 }
-export interface MarkdownParser extends
-  Markdown<'markdown'>,
+export interface DocumentParser extends
+  Document<'document'>,
   Parser<DocumentFragment, Input, [
-    MarkdownParser.HeaderParser,
-    MarkdownParser.BlockParser,
+    DocumentParser.BlockParser,
   ]> {
 }
-export namespace MarkdownParser {
+export namespace DocumentParser {
   export interface SegmentParser extends
-    Markdown<'segment'>,
+    Document<'segment'>,
     Parser<string, Input, [
       SourceParser.EmptySegmentParser,
       Parser<string, Input, [
@@ -25,39 +24,19 @@ export namespace MarkdownParser {
       SourceParser.ContentLineParser,
     ]> {
   }
-  export interface HeaderParser extends
-    // ---
-    // url: https://host/path
-    // ---
-    Markdown<'header'>,
-    Parser<HTMLElement | HTMLPreElement, Input, [
-      Parser<HTMLElement | HTMLPreElement, Input, [
-        Parser<HTMLElement, Input, [
-          HeaderParser.FieldParser,
-        ]>,
-        Parser<HTMLPreElement, Input, []>,
-      ]>,
-      Parser<never, Input, []>,
-    ]> {
-  }
-  export namespace HeaderParser {
-    export interface FieldParser extends
-      Markdown<'header/field'>,
-      Parser<HTMLSpanElement, Input, []> {
-    }
-  }
   export interface BlockParser extends
-    Markdown<'block'>,
+    Document<'block'>,
     Parser<HTMLElement, Input, [
       SourceParser.EmptySegmentParser,
       Parser<HTMLElement, Input, [
-        BlockParser.PagebreakParser,
+        BlockParser.HeaderParser,
         BlockParser.HeadingParser,
         BlockParser.UListParser,
         BlockParser.OListParser,
         BlockParser.IListParser,
         BlockParser.DListParser,
         BlockParser.TableParser,
+        BlockParser.PagebreakParser,
         BlockParser.CodeBlockParser,
         BlockParser.MathBlockParser,
         BlockParser.ExtensionParser,
@@ -70,7 +49,28 @@ export namespace MarkdownParser {
     ]> {
   }
   export namespace BlockParser {
-    interface Block<T extends string> extends Markdown<`block/${T}`> { }
+    interface Block<T extends string> extends Document<`block/${T}`> { }
+    export interface HeaderParser extends
+      // ---
+      // url: https://host/path
+      // ---
+      Block<'header'>,
+      Parser<HTMLElement | HTMLPreElement, Input, [
+        Parser<HTMLElement | HTMLPreElement, Input, [
+          Parser<HTMLElement, Input, [
+            HeaderParser.FieldParser,
+          ]>,
+          Parser<HTMLPreElement, Input, []>,
+        ]>,
+        Parser<never, Input, []>,
+      ]> {
+    }
+    export namespace HeaderParser {
+      export interface FieldParser extends
+        Block<'header/field'>,
+        Parser<HTMLSpanElement, Input, []> {
+      }
+    }
     export interface PagebreakParser extends
       // ===
       Block<'pagebreak'>,
@@ -520,7 +520,7 @@ export namespace MarkdownParser {
         Parser<HTMLElement, Input, [
           Parser<string, Input, []>,
           Parser<HTMLElement, Input, []>,
-          MarkdownParser,
+          DocumentParser,
           Parser<HTMLElement, Input, []>,
         ]> {
       }
@@ -635,7 +635,7 @@ export namespace MarkdownParser {
     }
   }
   export interface InlineParser extends
-    Markdown<'inline'>,
+    Document<'inline'>,
     Parser<HTMLElement | string, Input, [
       Parser<HTMLElement | string, Input, [
         InlineParser.AnnotationParser,
@@ -663,7 +663,7 @@ export namespace MarkdownParser {
     ]> {
   }
   export namespace InlineParser {
-    interface Inline<T extends string> extends Markdown<`inline/${T}`> { }
+    interface Inline<T extends string> extends Document<`inline/${T}`> { }
     export interface AnnotationParser extends
       // ((abc))
       Inline<'annotation'>,
@@ -1173,14 +1173,14 @@ export namespace MarkdownParser {
     }
   }
   export interface AutolinkParser extends
-    Markdown<'autolink'>,
+    Document<'autolink'>,
     Parser<string | HTMLElement, Input, [
       InlineParser.AutolinkParser,
       SourceParser.UnescapableSourceParser,
     ]> {
   }
   export namespace SourceParser {
-    interface Source<T extends string> extends Markdown<`source/${T}`> { }
+    interface Source<T extends string> extends Document<`source/${T}`> { }
     export interface TextParser extends
       // abc
       Source<'text'>,

package/package.json

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

package/src/api/bind.test.ts

@@ -10,8 +10,10 @@ describe('Unit: api/bind', () => {
         const result = iter.next();
         if (result.done) break;
         switch (result.value.type) {
-          case 'break':
           case 'segment':
+          case 'figure':
+          case 'note':
+          case 'break':
             --i;
             continue;
           case 'block':

package/src/api/bind.ts

@@ -126,14 +126,17 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
     }
     yield { type: 'break', value: 'parser' };
     if (rev !== revision) return yield { type: 'cancel' };
-    for (const el of figure(next(0)?.parentNode ?? target, settings.notes, options)) {
+    for (const el of figure(next(0)?.parentNode ?? target, output.labels.pop()!, settings.notes, options)) {
       assert(rev === revision);
       el
-        ? yield { type: 'figure', value: el }
+        ? yield { type: 'figure' }
         : yield { type: 'break', value: 'figure' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of note(next(0)?.parentNode ?? target, settings.notes, options, bottom)) {
+    for (const el of note(next(0)?.parentNode ?? target, {
+      annotations: output.annotations.pop()!,
+      references: output.references.pop()!,
+    }, settings.notes, options, bottom)) {
       assert(rev === revision);
       el
         ? yield { type: 'note', value: el }

package/src/api/header.ts

@@ -1,6 +1,6 @@
 import { Input } from '../parser/context';
 import { Output, run } from '../combinator/parser';
-import { header as h } from '../parser/header';
+import { header as h } from '../parser/block/header';
 
 export function header(source: string): string {
   const [, pos = 0] = parse(source);

package/src/api/parse.ts

@@ -1,12 +1,15 @@
 import { ParserOptions } from '../..';
 import { Input, Options } from '../parser/context';
-import { Output, run } from '../combinator/parser';
+import { Output, List, Node, run } from '../combinator/parser';
 import { document } from '../parser/document';
 import { ReadonlyURL } from 'spica/url';
 
-interface Opts extends ParserOptions {
+export interface Opts extends ParserOptions {
   readonly local?: boolean;
   readonly test?: boolean;
+  readonly labels?: List<Node<HTMLAnchorElement>>;
+  readonly annotations?: List<Node<HTMLElement>>;
+  readonly references?: List<Node<HTMLElement>>;
 }
 
 export function* parse(source: string, opts: Opts = {}, options?: Options): Generator<void, DocumentFragment, void> {
@@ -23,6 +26,9 @@ export function* parse(source: string, opts: Opts = {}, options?: Options): Gene
   if (options.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (options.host?.origin === 'null') throw new Error(`Invalid host: ${options.host.href}`);
   const output = new Output<DocumentFragment>();
+  assert(output.labels[0] = opts.labels ?? output.labels[0]);
+  assert(output.annotations[0] = opts.annotations ?? output.annotations[0]);
+  assert(output.references[0] = opts.references ?? output.references[0]);
   for (const _ of run(document, new Input(options, source), output)) yield;
   assert(output.data.length === 1);
   assert(output.peek().length === 1);

package/src/combinator/effect/backtrack.ts

@@ -1,5 +1,5 @@
 import { always } from '../control/state';
-import { Parser, Input } from '../parser';
+import { Parser, Input, Output, List } from '../parser';
 import { Scope } from './scope';
 
 interface Data {
@@ -30,8 +30,8 @@ export class Backtrack {
     input.range = range;
     input.linebreak = linebreak;
   }
-  public handle(state: boolean): void {
-    state
+  public handle(output: Output<unknown>): void {
+    output.state
       ? this.unmemory()
       : this.backtrack();
   }
@@ -50,14 +50,26 @@ export function backtrack<T>(parser: Parser<T>): Parser<T> {
         linebreak,
       });
       output.push();
+      output.labels.push(new List());
+      output.annotations.push(new List());
+      output.references.push(new List());
       return output.context;
     },
     parser,
     ({ backtrack }, output) => {
-      output.state
-        ? output.flat()
-        : output.pop();
-      backtrack.handle(output.state);
+      backtrack.handle(output);
+      if (output.state) {
+        output.import(output.pop());
+        output.labels.at(-2)!.import(output.labels.pop()!);
+        output.annotations.at(-2)!.import(output.annotations.pop()!);
+        output.references.at(-2)!.import(output.references.pop()!);
+      }
+      else {
+        output.pop();
+        output.labels.pop();
+        output.annotations.pop();
+        output.references.pop();
+      }
       return output.context;
     },
   ]);

package/src/combinator/parser/list.ts

@@ -8,6 +8,9 @@ export class List<N extends List.Node = List.Node, I extends Input = Input, S ex
     }
   }
   public length = 0;
+  public isEmpty(): boolean {
+    return this.head === undefined;
+  }
   public head?: N = undefined;
   public last?: N = undefined;
   public get tail(): N | undefined {
@@ -93,18 +96,6 @@ export class List<N extends List.Node = List.Node, I extends Input = Input, S ex
     list.clear();
     return this;
   }
-  public truncateBefore(node: N): void {
-    assert(node.next || node.prev || this.head === this.last);
-    if (node.prev === undefined) return;
-    this.delete(node.prev);
-    this.head = node;
-  }
-  public truncateAfter(node: N): void {
-    assert(node.next || node.prev || this.head === this.last);
-    if (node.next === undefined) return;
-    this.delete(node.next);
-    this.last = node;
-  }
   public clear(): void {
     this.length = 0;
     this.head = this.last = undefined;
@@ -155,12 +146,19 @@ export namespace List {
     prev?: this;
   }
 }
-export class Node<N> implements List.Node {
+export class Node<T> implements List.Node {
   constructor(
-    public value: N,
-    public flags: number = 0,
+    public value: T,
+    public position: number = 0,
+    public flags: Node.Flag = 0,
   ) {
   }
   public next?: this = undefined;
   public prev?: this = undefined;
 }
+export namespace Node {
+  export const enum Flag {
+    none,
+    blank,
+  }
+}

package/src/combinator/parser.ts

@@ -142,6 +142,9 @@ export class Output<T> {
   public state: boolean = true;
   public readonly context: Result.Succ | Result.Fail = Result.succ;
   public error?: Error = undefined;
+  public readonly labels: List<Node<HTMLAnchorElement>>[] = [new List()];
+  public readonly annotations: List<Node<HTMLElement>>[] = [new List()];
+  public readonly references: List<Node<HTMLElement>>[] = [new List()];
   public peek(): List<Node<T>> {
     assert(this.data.length > 0);
     return this.data.at(-1)!;
@@ -163,11 +166,6 @@ export class Output<T> {
     this.data[this.data.length - 1] = list;
     return Result.succ;
   }
-  public flat(): Result.Succ | Result.Fail {
-    assert(this.data.length > 1);
-    this.import(this.data.pop()!);
-    return Result.succ;
-  }
   public push(list: List<Node<T>> = new List()): void {
     this.data.push(list);
   }

package/src/debug.test.ts

@@ -6,6 +6,9 @@ export function inspect(parser: Parser<DocumentFragment | HTMLElement | string>,
   const output = new Output<DocumentFragment | HTMLElement | string>();
   for (const _ of run(parser, input, output));
   assert.deepStrictEqual(output.data, [output.data[0]]);
+  assert(output.labels.length === 1);
+  assert(output.annotations.length === 1);
+  assert(output.references.length === 1);
   assert(output.state || output.peek().length === 0);
   assert(!output.error);
   return !output.state ? undefined : [

package/src/parser/autolink.ts

@@ -1,9 +1,9 @@
-import { MarkdownParser } from '../../markdown';
+import { DocumentParser } from '../../markdown';
 import { union, some, lazy } from '../combinator';
 import { autolink as autolink_ } from './inline/autolink';
 import { unescsource } from './source';
 
-export import AutolinkParser = MarkdownParser.AutolinkParser;
+export import AutolinkParser = DocumentParser.AutolinkParser;
 
 export const autolink: AutolinkParser = lazy(() =>
   some(union([

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

@@ -77,7 +77,7 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser, input('!>  a \n b  c ')), [['<blockquote><section><p> a<br> b c</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!>> a')), [['<blockquote><blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!>> a\n> b')), [['<blockquote><blockquote><section><p>a</p><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, input('!> - a')), [['<blockquote><section><ul><li id="index:random:a" class="local">a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!> - a')), [['<blockquote><section><ul><li id="index:random:a">a</li></ul><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\na\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!> ```\n> a\n> ```')), [['<blockquote><section><pre class="text">a</pre><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
@@ -90,10 +90,10 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser, input('!>> > a\n> b')), [['<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, input('!> !> a')), [['<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, input('!> \na')), [['<blockquote><section><p>a</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a')), [['<blockquote><blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a')), [['<blockquote><blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ## a\n> ## a')), [['<blockquote><blockquote><section><h2 id="index:random:a">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote><section><h2 id="index:random:a">a</h2><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ~ a\n> ~ a')), [['<blockquote><blockquote><section><dl><dt id="index:random:a">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote><section><dl><dt id="index:random:a">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser, input('!>> ~~~figure $test-a\n>> > \n>>\n~~~\n> ~~~figure $test-a\n> > \n>\n[#a]\n~~~')), [['<blockquote><blockquote><section><figure data-type="quote" data-label="test-a" data-group="test" data-number="1" id="label:random:test-a"><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" id="label:random:test-a"><figcaption><span class="figindex">Test 1. </span><span class="figtext"><a class="index" href="#index:random:a">a</a></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote><section><p><sup class="annotation" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
     });
 
   });

package/src/parser/block/blockquote.ts

@@ -54,7 +54,8 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
           const doc = output.pop().head!.value;
           if (!doc.firstChild) return output.context;
           return output.append(new Node(html('section', [
-            doc,
+            // DocumentFragmentを追加すると異常に重くなるので避ける
+            ...doc.children,
             html('h2', 'References'),
             notes!.references,
           ])));

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

@@ -14,9 +14,9 @@ describe('Unit: parser/block/extension/aside', () => {
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser, input('~~~aside\n# 0\n~~~')), [['<aside id="index::0" class="aside"><h1 id="index:random:0" class="local">0</h1><h2>References</h2><ol class="references"></ol></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('~~~aside\n## 0\n~~~')), [['<aside id="index::0" class="aside"><h2 id="index:random:0" class="local">0</h2><h2>References</h2><ol class="references"></ol></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('~~~aside\n# 0\n\n$-0.0\n\n## 1\n\n$test-a\n> \n~~~')), [['<aside id="index::0" class="aside"><h1 id="index:random:0" class="local">0</h1><figure data-label="$-0.0" data-group="$" hidden="" data-number="0.0"></figure><h2 id="index:random:1" class="local">1</h2><figure data-type="quote" data-label="test-a" data-group="test" data-number="1.1" id="label:random:test-a"><figcaption><span class="figindex">Test 1.1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~aside\n# 0\n~~~')), [['<aside id="index::0" class="aside"><h1 id="index:random:0">0</h1><h2>References</h2><ol class="references"></ol></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~aside\n## 0\n~~~')), [['<aside id="index::0" class="aside"><h2 id="index:random:0">0</h2><h2>References</h2><ol class="references"></ol></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~aside\n# 0\n\n$-0.0\n\n## 1\n\n$test-a\n> \n~~~')), [['<aside id="index::0" class="aside"><h1 id="index:random:0">0</h1><figure data-label="$-0.0" data-group="$" hidden="" data-number="0.0"></figure><h2 id="index:random:1">1</h2><figure data-type="quote" data-label="test-a" data-group="test" data-number="1.1" id="label:random:test-a"><figcaption><span class="figindex">Test 1.1. </span><span class="figtext"></span></figcaption><div><blockquote></blockquote></div></figure><h2>References</h2><ol class="references"></ol></aside>'], '']);
     });
 
   });

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

@@ -72,7 +72,8 @@ export const aside: ExtensionParser.AsideParser = block(recursion(Recursion.bloc
           class: 'aside',
         },
         [
-          doc,
+          // DocumentFragmentを追加すると異常に重くなるので避ける
+          ...doc.children,
           html('h2', 'References'),
           notes!.references,
         ])));

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

@@ -21,9 +21,9 @@ describe('Unit: parser/block/extension/example', () => {
       assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n++a\nb++\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">++a\nb++</pre><hr><section><p><ins>a<br>b</ins></p><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n$fig-a\n!https://host\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">$fig-a\n!https://host</pre><hr><section><figure data-type="media" data-label="fig-a" data-group="fig" data-number="1" id="label:random:fig-a"><figcaption><span class="figindex">Fig. 1. </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><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n[$fig-a]\n!https://host\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">[$fig-a]\n!https://host</pre><hr><section><figure data-type="media" data-label="fig-a" data-group="fig" data-number="1" id="label:random:fig-a"><figcaption><span class="figindex">Fig. 1. </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><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n## a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">## a</pre><hr><section><h2 id="index:random:a" class="local">a</h2><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n~ a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">~ a</pre><hr><section><dl><dt id="index:random:a" class="local">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n((a))[[b]]\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">((a))[[b]]</pre><hr><section><p><sup class="annotation local" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup><sup class="reference local" id="reference:random:ref:b:1" title="b"><a href="#reference:random:def:b">[1]</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"><li id="reference:random:def:b"><span>b</span><sup><a href="#reference:random:ref:b:1">^1</a></sup></li></ol></section></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n## a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">## a</pre><hr><section><h2 id="index:random:a">a</h2><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n~ a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">~ a</pre><hr><section><dl><dt id="index:random:a">a</dt><dd></dd></dl><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('~~~example/markdown\n((a))[[b]]\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">((a))[[b]]</pre><hr><section><p><sup class="annotation" id="annotation:random:ref:a:1" title="a"><a href="#annotation:random:def:a:1">*1</a></sup><sup class="reference" id="reference:random:ref:b:1" title="b"><a href="#reference:random:def:b">[1]</a></sup></p><ol class="annotations"><li id="annotation:random:def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation:random:ref:a:1">^1</a></sup></li></ol><h2>References</h2><ol class="references"><li id="reference:random:def:b"><span>b</span><sup><a href="#reference:random:ref:b:1">^1</a></sup></li></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser, input('~~~~example/markdown\na\n~~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">a</pre><hr><section><p>a</p><h2>References</h2><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser, input('~~~example/math\na\n~~~')), [['<aside class="example" data-type="math"><pre translate="no">a</pre><hr><div class="math" translate="no">$$\na\n$$</div></aside>'], '']);
     });

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

@@ -66,6 +66,7 @@ const contMD: Result<DocumentFragment | HTMLElement, Input<Memory>> = [
   (input, output) => {
     const { notes } = input;
     input = input.scope.pop();
+    const doc = output.pop().head!.value;
     return output.append(
       new Node(html('aside',
         { class: 'example', 'data-type': 'markdown' },
@@ -73,7 +74,8 @@ const contMD: Result<DocumentFragment | HTMLElement, Input<Memory>> = [
           html('pre', { translate: 'no' }, input.memory.body.slice(0, input.memory.body.at(-2) === '\r' ? -2 : -1)),
           html('hr'),
           html('section', [
-            output.pop().head!.value,
+            // DocumentFragmentを追加すると異常に重くなるので避ける
+            ...doc.children,
             html('h2', 'References'),
             notes!.references,
           ]),

package/src/parser/{header.test.ts → block/header.test.ts}

@@ -1,8 +1,8 @@
 import { header } from './header';
-import { input } from './context';
-import { inspect } from '../debug.test';
+import { input } from '../context';
+import { inspect } from '../../debug.test';
 
-describe('Unit: parser/header', () => {
+describe('Unit: parser/block/header', () => {
   describe('header', () => {
     const parser = header;
 

package/src/parser/{header.ts → block/header.ts}

@@ -1,12 +1,12 @@
-import { MarkdownParser } from '../../markdown';
-import { List, Node } from '../combinator/parser';
-import { union, inits, some, scope, block, line, validate, focus, clear, lazy, fmap } from '../combinator';
-import { str } from './source';
-import { unwrap, invalid } from './util';
+import { HeaderParser } from '../block';
+import { List, Node } from '../../combinator/parser';
+import { union, inits, some, scope, block, line, validate, focus, clear, lazy, fmap } from '../../combinator';
+import { str } from '../source';
+import { unwrap, invalid } from '../util';
 import { ReadonlyURL } from 'spica/url';
 import { html, defrag } from 'typed-dom/dom';
 
-export const header: MarkdownParser.HeaderParser = lazy(() => validate(
+export const header: HeaderParser = lazy(() => validate(
   /---+[^\S\r\n]*\r?\n(?=\S)/y,
   inits([
     block(
@@ -40,7 +40,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
     clear(str(/[^\S\r\n]*\r?\n/y)),
   ])));
 
-const field: MarkdownParser.HeaderParser.FieldParser = line((input, output) => {
+const field: HeaderParser.FieldParser = line((input, output) => {
   const { source, position } = input;
   const name = source.slice(position, source.indexOf(':', position));
   const value = source.slice(position + name.length + 1).trim();

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

@@ -1,6 +1,5 @@
 import { ReplyParser } from '../../block';
 import { List, Node } from '../../../combinator/parser';
-import { Flag } from '../../node';
 import { union, line, focus, open, fmap } from '../../../combinator';
 import { anchor } from '../../inline/autolink/anchor';
 import { str } from '../../source';
@@ -20,7 +19,7 @@ export const cite: ReplyParser.CiteParser = line(fmap(
       focus(/>>https?:\/\/\S+(?=\s*$)/y, ({ source }, output) => output.append(new Node(html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)))),
       focus(/>>\S+(?=\s*$)/y, ({ source }, output) => output.append(new Node(source))),
     ])),
-  nodes => {
+  (nodes, { position }) => {
     const quotes = nodes.head!.value as string;
     const node = nodes.last!.value;
     return new List([
@@ -34,6 +33,6 @@ export const cite: ReplyParser.CiteParser = line(fmap(
             ? define(node, { 'data-depth': `${quotes.length + 1}` }, node.innerText.slice(1))
             : node.slice(1),
         ]))),
-      new Node(html('br'), Flag.blank),
+      new Node(html('br'), position, Node.Flag.blank),
     ]);
   }));

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

@@ -1,6 +1,5 @@
 import { ReplyParser } from '../../block';
 import { List, Node } from '../../../combinator/parser';
-import { Flag } from '../../node';
 import { union, some, scope, block, validate, rewrite, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
@@ -23,7 +22,7 @@ export const quote: ReplyParser.QuoteParser = block(fmap(
       ])),
       true)),
   (ns, { source, position }) => new List([
-    new Node(source[position - 1] === '\n' ? ns.pop()!.value as HTMLBRElement : html('br'), Flag.blank),
+    new Node(source[position - 1] === '\n' ? ns.pop()!.value as HTMLBRElement : html('br'), position, Node.Flag.blank),
     new Node(html('span', { class: 'quote' }, defrag(unwrap(ns)))),
   ].reverse())),
   false);

package/src/parser/block/reply.ts

@@ -1,6 +1,5 @@
 import { ReplyParser } from '../block';
 import { List, Node } from '../../combinator/parser';
-import { Flag } from '../node';
 import { union, some, block, validate, rewrite, fmap } from '../../combinator';
 import { cite, syntax as csyntax } from './reply/cite';
 import { quote, syntax as qsyntax } from './reply/quote';
@@ -21,6 +20,6 @@ export const reply: ReplyParser = block(validate(csyntax, fmap(
       visualize(fmap(some(inline), (ns, { source, position }) =>
         source[position - 1] === '\n'
           ? ns
-          : ns.push(new Node(html('br'), Flag.blank)))))
+          : ns.push(new Node(html('br'), position, Node.Flag.blank)))))
   ])),
   ns => new List([new Node(html('p', defrag(unwrap(trimBlankNodeEnd(ns)))))]))));