securemark 0.240.0 → 0.241.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.240.0",
+  "version": "0.241.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -33,12 +33,12 @@
     "@types/dompurify": "2.3.3",
     "@types/jquery": "3.5.14",
     "@types/mathjax": "0.0.37",
-    "@types/mocha": "9.1.0",
+    "@types/mocha": "9.1.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
     "browserify": "^17.0.0",
     "browserify-shim": "^3.8.14",
-    "concurrently": "^7.0.0",
+    "concurrently": "^7.1.0",
     "del": "^6.0.0",
     "eslint-plugin-redos": "^4.3.0",
     "gulp": "^4.0.2",
@@ -50,7 +50,7 @@
     "gulp-mocha": "^8.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-unassert": "^2.0.0",
-    "karma": "^6.3.17",
+    "karma": "^6.3.19",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage-istanbul-instrumenter": "^1.0.4",
     "karma-coverage-istanbul-reporter": "^3.0.3",
@@ -58,12 +58,12 @@
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "mocha": "^9.2.2",
-    "npm-check-updates": "^12.5.4",
+    "npm-check-updates": "^12.5.9",
     "power-assert": "^1.6.1",
-    "semver": "^7.3.5",
-    "spica": "0.0.515",
+    "semver": "^7.3.7",
+    "spica": "0.0.521",
     "tsify": "^5.0.4",
-    "typed-dom": "0.0.250",
+    "typed-dom": "0.0.253",
     "typescript": "4.6.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"

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

@@ -2,7 +2,6 @@ import { Parser, Tree, Context } from '../../data/parser';
 import { union } from '../../data/parser/union';
 
 export function fallback<P extends Parser<unknown>>(parser: P, otherwise: Parser<Tree<P>, Context<P>>): P;
-export function fallback<T, P extends Parser<T>>(parser: P, otherwise: Parser<T, Context<P>>): P;
 export function fallback<T>(parser: Parser<T>, otherwise: Parser<T>): Parser<T> {
   return union([parser, otherwise]);
 }

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

@@ -5,7 +5,7 @@ import { line } from '../constraint/line';
 import { bind } from '../monad/bind';
 import { match } from './match';
 import { open } from './surround';
-import { reduce } from 'spica/memoize';
+import { memoize } from 'spica/memoize';
 import { join } from 'spica/array';
 
 export function indent<P extends Parser<unknown>>(parser: P): P;
@@ -13,10 +13,10 @@ export function indent<T>(parser: Parser<T>): Parser<T> {
   assert(parser);
   return bind(match(
     /^(?=(([ \t])\2*))/,
-    reduce<string[], Parser<string>, string>(
+    memoize(
     ([, indent]) =>
       some(line(open(indent, source => [[unline(source)], '']))),
-    ([, indent]) => indent)),
+    ([, indent]) => indent.length * 2 + +(indent[0] === ' '), [])),
     (nodes, rest, context) => {
       const result = parser(join(nodes, '\n'), context);
       return result && exec(result) === ''

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

@@ -14,14 +14,14 @@ const signature = (pattern: string | RegExp | undefined): string => {
   }
 };
 const matcher = memoize(
-  (pattern: string | RegExp | undefined): (source: string) => boolean => {
+  (pattern: string | RegExp | undefined): (source: string) => true | undefined => {
     switch (typeof pattern) {
       case 'undefined':
-        return () => false;
+        return () => undefined;
       case 'string':
-        return source => source.slice(0, pattern.length) === pattern;
+        return source => source.slice(0, pattern.length) === pattern || undefined;
       case 'object':
-        return reduce(source => pattern.test(source));
+        return reduce(source => pattern.test(source) || undefined);
     }
   },
   signature);
@@ -42,8 +42,8 @@ export function some<T>(parser: Parser<T>, until?: string | RegExp | number, dee
     let rest = source;
     let nodes: T[] | undefined;
     if (deep && context) {
-      // bracket > annotation > bracket > reference > bracket > link > media | bracket
-      // bracket > annotation > bracket > reference > bracket > index > bracket
+      // bracket > link > media | bracket
+      // bracket > index > bracket
       context.delimiters ??= new Delimiters();
       context.delimiters.push(delimiter);
     }
@@ -69,3 +69,25 @@ export function some<T>(parser: Parser<T>, until?: string | RegExp | number, dee
       : undefined;
   };
 }
+
+export function escape<P extends Parser<unknown>>(parser: P, delim: string): P;
+export function escape<T>(parser: Parser<T>, delim: string): Parser<T> {
+  assert(parser);
+  const delimiter = {
+    signature: signature(delim),
+    matcher: (source: string) => source.slice(0, delim.length) !== delim && undefined,
+    escape: true,
+  } as const;
+  return (source, context) => {
+    if (source === '') return;
+    if (context) {
+      context.delimiters ??= new Delimiters();
+      context.delimiters.push(delimiter);
+    }
+    const result = parser(source, context);
+    if (context.delimiters) {
+      context.delimiters.pop();
+    }
+    return result;
+  };
+}

package/src/combinator/data/parser.ts

@@ -20,26 +20,31 @@ type ExtractSubTree<D extends Parser<unknown>[]> = ExtractSubParser<D> extends i
 type ExtractSubParser<D extends Parser<unknown>[]> = D extends (infer P)[] ? P extends Parser<unknown> ? P : never : never;
 
 export class Delimiters {
-  private readonly stack: string[] = [];
-  private readonly matchers: Record<string, (source: string) => boolean> = {};
-  public push(delimiter: { readonly signature: string; readonly matcher: (source: string) => boolean; }): void {
-    const { signature, matcher } = delimiter;
-    this.stack.push(signature);
-    this.matchers[signature] ??= matcher;
-    assert(this.matchers[signature] === matcher);
+  private readonly matchers: ((source: string) => boolean | undefined)[] = [];
+  private readonly record: Record<string, boolean> = {};
+  public push(delimiter: { readonly signature: string; readonly matcher: (source: string) => boolean | undefined; readonly escape?: boolean; }): void {
+    const { signature, matcher, escape } = delimiter;
+    if (this.record[signature] === !escape) {
+      this.matchers.unshift(() => undefined);
+    }
+    else {
+      this.matchers.unshift(matcher);
+      this.record[signature] = !escape;
+    }
   }
   public pop(): void {
-    assert(this.stack.length > 0);
-    this.stack.pop();
+    assert(this.matchers.length > 0);
+    this.matchers.shift();
   }
   public match(source: string): boolean {
-    const { stack, matchers } = this;
-    const log = {};
-    for (let i = 0; i < stack.length; ++i) {
-      const sig = stack[i];
-      if (sig in log) continue;
-      if (matchers[sig](source)) return true;
-      log[sig] = false;
+    const { matchers } = this;
+    for (let i = 0; i < matchers.length; ++i) {
+      switch (matchers[i](source)) {
+        case true:
+          return true;
+        case false:
+          return false;
+      }
     }
     return false;
   }

package/src/debug.test.ts

@@ -1,5 +1,5 @@
 import { Result, eval, exec } from './combinator/data/parser';
-import { html, define } from 'typed-dom';
+import { html, define } from 'typed-dom/dom';
 
 export function inspect(result: Result<HTMLElement | string>, until: number | string = Infinity): Result<string> {
   return result && [

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

@@ -1,6 +1,6 @@
 import { ParserSettings, Progress } from '../../..';
 import { bind } from './bind';
-import { frag, html } from 'typed-dom';
+import { frag, html } from 'typed-dom/dom';
 
 describe('Unit: parser/api/bind', () => {
   describe('bind', () => {

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

@@ -1,5 +1,5 @@
 import { parse } from './parse';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 describe('Unit: parser/api/parse', () => {
   describe('parse', () => {
@@ -218,6 +218,12 @@ describe('Unit: parser/api/parse', () => {
         ['<p>a<span class="linebreak"> </span>b</p>']);
     });
 
+    it('creation', () => {
+      assert.deepStrictEqual(
+        [...parse('"[# '.repeat(100)).children].map(el => el.outerHTML),
+        [`<p>${'"[# '.repeat(100).trim()}</p>`]);
+    });
+
     it('recursion', () => {
       assert.deepStrictEqual(
         [...parse('('.repeat(199)).children].map(el => el.outerHTML),

package/src/parser/api/parse.ts

@@ -9,7 +9,7 @@ import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
 import { footnote } from '../processor/footnote';
-import { frag } from 'typed-dom';
+import { frag } from 'typed-dom/dom';
 import { ReadonlyURL } from 'spica/url';
 
 interface Options extends ParserOptions {

package/src/parser/block/blockquote.ts

@@ -3,7 +3,7 @@ import { union, some, block, validate, rewrite, creator, open, convert, lazy, fm
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { parse } from '../api/parse';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const segment: BlockquoteParser.SegmentParser = block(validate(['!>', '>'], union([
   validate(/^!?>+(?=[^\S\n]|\n[^\S\n]*\S)/, some(contentline)),

package/src/parser/block/codeblock.ts

@@ -3,7 +3,7 @@ import { CodeBlockParser } from '../block';
 import { eval } from '../../combinator/data/parser';
 import { some, block, validate, fence, clear, fmap } from '../../combinator';
 import { autolink } from '../autolink';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 const opener = /^(`{3,})(?!`)([^\n]*)(?:$|\n)/;
 const language = /^[0-9a-z]+(?:-[a-z][0-9a-z]*)*$/i;

package/src/parser/block/dlist.ts

@@ -4,7 +4,7 @@ import { inline, indexee, indexer } from '../inline';
 import { anyline } from '../source';
 import { localize } from '../locale';
 import { visualize } from '../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { push } from 'spica/array';
 
 export const dlist: DListParser = lazy(() => block(localize(fmap(validate(

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

@@ -2,7 +2,7 @@ import { ExtensionParser } from '../../block';
 import { block, validate, fence, creator, fmap } from '../../../combinator';
 import { identity, text } from '../../inline/extension/indexee';
 import { parse } from '../../api/parse';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 export const aside: ExtensionParser.AsideParser = creator(100, block(validate('~~~', fmap(
   fence(/^(~{3,})aside(?!\S)([^\n]*)(?:$|\n)/, 300),

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

@@ -3,7 +3,7 @@ import { eval } from '../../../combinator/data/parser';
 import { block, validate, fence, creator, fmap } from '../../../combinator';
 import { parse } from '../../api/parse';
 import { mathblock } from '../mathblock';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 const opener = /^(~{3,})(?:example\/(\S+)|(?!\S))([^\n]*)(?:$|\n)/;
 

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

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

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

@@ -15,7 +15,7 @@ import { placeholder, segment_ as seg_placeholder } from './placeholder';
 import { inline, media, shortmedia } from '../../inline';
 import { localize } from '../../locale';
 import { visualize } from '../../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
 import { unshift } from 'spica/array';
 
@@ -46,7 +46,7 @@ export const segment: FigureParser.SegmentParser = block(match(
         ]),
       ]),
       closer),
-  ([, fence]) => fence.length)));
+  ([, fence]) => fence.length, [])));
 
 export const figure: FigureParser = block(rewrite(segment, fmap(
   convert(source => source.slice(source.search(/[[$]/), source.trimEnd().lastIndexOf('\n')),
@@ -120,43 +120,44 @@ function attributes(label: string, param: string, content: HTMLElement, caption:
       'data-invalid-message': 'Invalid argument',
     } ||
     group === '$' && (type !== 'math' || caption.length > 0) && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`$` label group can only be used with a math formula with no caption',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"$" label group must be used to math formulas with no caption',
     } ||
-    ['fig', 'figure'].includes(group) && type !== 'media' && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`fig` and `figure` label groups can only be used with media',
+    type === 'media' && {} ||
+    ['fig', 'figure'].includes(group) && {
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"fig" and "figure" label groups must be used to media',
     } ||
     group === 'table' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`table` label group can only be used with a table',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"table" label group must be used to tables',
     } ||
     group === 'list' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`list` label group can only be used with a list',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"list" label group must be used to lists',
     } ||
     group === 'quote' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`quote` label group can only be used with a blockquote',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"quote" label group must be used to blockquotes',
     } ||
     group === 'text' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`text` label group can only be used with a codeblock with no language',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"text" label group must be used to codeblocks with no language',
     } ||
     group === 'code' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`code` label group can only be used with a codeblock',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"code" label group must be used to codeblocks with any language',
     } ||
     group === 'example' && type !== group && {
-      'data-invalid-type': 'content',
-      'data-invalid-message': '`example` label group can only be used with an example',
+      'data-invalid-type': 'label',
+      'data-invalid-message': '"example" label group must be used to examples',
     } ||
     undefined;
   return {
     'data-type': type,
     'data-label': label,
     'data-group': group,
-    ...invalid && {
+    ...invalid?.['data-invalid-type'] && {
       class: 'invalid',
       'data-invalid-syntax': 'figure',
       ...invalid,

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

@@ -11,7 +11,7 @@ import { codeblock } from '../codeblock';
 import { mathblock } from '../mathblock';
 import { blockquote } from '../blockquote';
 import { paragraph } from '../paragraph';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { unshift, push } from 'spica/array';
 
 import MessageParser = ExtensionParser.MessageParser;

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

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../block';
 import { block, validate, fence, clear, fmap } from '../../../combinator';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 const opener = /^(~{3,})(?!~)[^\n]*(?:$|\n)/;
 

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

@@ -1,7 +1,7 @@
 import { table } from './table';
 import { some } from '../../../combinator';
 import { inspect } from '../../../debug.test';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 describe('Unit: parser/block/extension/table', () => {
   describe('table', () => {

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

@@ -7,7 +7,7 @@ import { inline } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { localize } from '../../locale';
 import { visualize } from '../../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { unshift, splice } from 'spica/array';
 
 import TableParser = ExtensionParser.TableParser;

package/src/parser/block/heading.ts

@@ -3,7 +3,7 @@ import { union, some, block, line, validate, focus, rewrite, context, open, trim
 import { inline, indexee, indexer } from '../inline';
 import { str } from '../source';
 import { visualize } from '../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const segment: HeadingParser.SegmentParser = block(validate('#', focus(
   /^#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/,

package/src/parser/block/horizontalrule.ts

@@ -1,6 +1,6 @@
 import { HorizontalRuleParser } from '../block';
 import { block, line, focus } from '../../combinator';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 export const horizontalrule: HorizontalRuleParser = block(line(focus(
   /^-{3,}[^\S\n]*(?:$|\n)/,

package/src/parser/block/ilist.ts

@@ -4,7 +4,7 @@ import { ulist_, fillFirstLine } from './ulist';
 import { olist_ } from './olist';
 import { inline } from '../inline';
 import { contentline } from '../source';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const ilist: IListParser = lazy(() => block(validate(
   /^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/,

package/src/parser/block/mathblock.ts

@@ -1,7 +1,7 @@
 import { undefined } from 'spica/global';
 import { MathBlockParser } from '../block';
 import { block, validate, fence, clear, fmap } from '../../combinator';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 
 const opener = /^(\${2,})(?!\$)([^\n]*)(?:$|\n)/;
 

package/src/parser/block/olist.ts

@@ -5,7 +5,7 @@ import { checkbox, ulist_, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline, indexee, indexer } from '../inline';
 import { contentline } from '../source';
-import { html, define, defrag } from 'typed-dom';
+import { html, define, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
 import { shift } from 'spica/array';
 
@@ -25,23 +25,23 @@ export const olist: OListParser = lazy(() => block(validate(
 export const olist_: OListParser = lazy(() => block(union([
   match(
     new RegExp(`^(?=${openers['.'].source.replace('?:', '')})`),
-    memoize(ms => list(type(ms[1]), '.'), ms => type(ms[1]))),
+    memoize(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])),
   match(
     new RegExp(`^(?=${openers['('].source.replace('?:', '')})`),
-    memoize(ms => list(type(ms[1]), '('), ms => type(ms[1]))),
+    memoize(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, [])),
 ])));
 
-const list = (type: string, delim: string): OListParser.ListParser => fmap(
+const list = (type: string, form: string): OListParser.ListParser => fmap(
   some(creator(union([
     indexee(fmap(fallback(
       inits([
-        line(open(heads[delim], trim(subsequence([checkbox, trimStart(some(union([indexer, inline])))])), true)),
+        line(open(heads[form], trim(subsequence([checkbox, trimStart(some(union([indexer, inline])))])), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),
       (ns: [string, ...(HTMLElement | string)[]]) => [html('li', { 'data-marker': ns[0] }, defrag(fillFirstLine(shift(ns)[1])))]), true),
   ]))),
-  es => [format(html('ol', es), type, delim)]);
+  es => [format(html('ol', es), type, form)]);
 
 const heads = {
   '.': focus(
@@ -107,13 +107,13 @@ function initial(type: string): RegExp {
   }
 }
 
-function format(el: HTMLOListElement, type: string, delim: string): HTMLOListElement {
+function format(el: HTMLOListElement, type: string, form: string): HTMLOListElement {
   if (el.firstElementChild?.firstElementChild?.classList.contains('checkbox')) {
     el.setAttribute('class', 'checklist');
   }
   define(el, {
     type: type || undefined,
-    'data-format': delim === '.' ? undefined : 'paren',
+    'data-format': form === '.' ? undefined : 'paren',
     'data-type': style(type) || undefined,
   });
   const marker = el.firstElementChild?.getAttribute('data-marker')!.match(initial(type))?.[0] ?? '';

package/src/parser/block/paragraph.ts

@@ -3,7 +3,7 @@ import { union, some, block, trim, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { localize } from '../locale';
 import { visualize } from '../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const paragraph: ParagraphParser = block(localize(fmap(
   trim(visualize(some(union([inline])))),

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

@@ -2,7 +2,7 @@ import { ReplyParser } from '../../block';
 import { union, tails, line, validate, focus, creator, reverse, fmap } from '../../../combinator';
 import { anchor } from '../../inline/autolink/anchor';
 import { str } from '../../source';
-import { html, define, defrag } from 'typed-dom';
+import { html, define, defrag } from 'typed-dom/dom';
 
 export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
   '>>',

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

@@ -4,7 +4,7 @@ import { union, some, block, line, validate, rewrite, creator, lazy, fmap } from
 import { math } from '../../inline/math';
 import { str, anyline } from '../../source';
 import { autolink } from '../../autolink';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
 

package/src/parser/block/reply.ts

@@ -6,7 +6,7 @@ import { inline } from '../inline';
 import { anyline } from '../source';
 import { localize } from '../locale';
 import { visualize } from '../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { push, pop } from 'spica/array';
 
 /*

package/src/parser/block/table.ts

@@ -2,7 +2,7 @@ import { TableParser } from '../block';
 import { union, sequence, some, block, line, validate, focus, rewrite, creator, surround, open, fallback, lazy, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { contentline } from '../source';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { push } from 'spica/array';
 
 import RowParser = TableParser.RowParser;

package/src/parser/block/ulist.ts

@@ -3,7 +3,7 @@ import { union, inits, subsequence, some, block, line, validate, indent, focus,
 import { olist_ } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee } from '../inline';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 import { contentline } from '../source';
 

package/src/parser/block.ts

@@ -15,7 +15,7 @@ import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
-import { html } from 'typed-dom';
+import { html } from 'typed-dom/dom';
 import { rnd0Z } from 'spica/random';
 
 export import BlockParser = MarkdownParser.BlockParser;

package/src/parser/header.ts

@@ -3,7 +3,7 @@ import { union, inits, some, block, line, validate, focus, rewrite, guard, clear
 import { segment } from './segment';
 import { str } from './source';
 import { normalize } from './api/normalize';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
   /^---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/,

package/src/parser/inline/annotation.ts

@@ -3,7 +3,7 @@ import { AnnotationParser } from '../inline';
 import { union, some, validate, guard, context, creator, surround, lazy, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { startLoose, trimSpaceStart, trimNodeEnd } from '../util';
-import { html, defrag } from 'typed-dom';
+import { html, defrag } from 'typed-dom/dom';
 
 export const annotation: AnnotationParser = lazy(() => creator(validate('((', '))', '\n', fmap(surround(
   '((',
@@ -19,7 +19,7 @@ export const annotation: AnnotationParser = lazy(() => creator(validate('((', ')
     //label: true,
     //link: true,
     //autolink: true,
-  }}, state: undefined },
+  }}, state: undefined, delimiters: undefined },
   trimSpaceStart(union([some(inline, ')', /^\\?\n/)]))))),
   '))'),
   ns => [html('sup', { class: 'annotation' }, trimNodeEnd(defrag(ns)))]))));

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

@@ -2,7 +2,7 @@ import { AutolinkParser } from '../../inline';
 import { union, tails, verify, rewrite, context, open, convert, fmap, lazy } from '../../../combinator';
 import { link } from '../link';
 import { str } from '../../source';
-import { define } from 'typed-dom';
+import { define } from 'typed-dom/dom';
 
 // https://example/@user must be a user page or a redirect page going there.
 

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { union, validate, focus, context, convert, fmap, lazy } from '../../../combinator';
 import { link } from '../link';
-import { define } from 'typed-dom';
+import { define } from 'typed-dom/dom';
 
 // Timeline(pseudonym): user/tid
 // Thread(anonymous): cid