securemark 0.258.2 → 0.258.3

package/package.json

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

package/src/combinator/data/parser/context/memo.ts

@@ -1,5 +1,5 @@
 export class Memo {
-  private memory: Record<string, readonly [any[], number] | readonly []>[/* pos */] = [];
+  private readonly memory: Record<string, readonly [any[], number] | readonly []>[/* pos */] = [];
   public get length(): number {
     return this.memory.length;
   }
@@ -10,7 +10,10 @@ export class Memo {
     state: number,
   ): readonly [any[], number] | readonly [] | undefined {
     //console.log('get', position + this.offset, syntax, state, this.memory[position + this.offset - 1]?.[`${syntax}:${state}`]);;
-    return this.memory[position + this.offset - 1]?.[`${syntax}:${state}`];
+    const cache = this.memory[position + this.offset - 1]?.[`${syntax}:${state}`];
+    return cache?.length === 2
+      ? [cache[0].slice(), cache[1]]
+      : cache;
   }
   public set(
     position: number,
@@ -24,7 +27,7 @@ export class Memo {
     record[`${syntax}:${state}`] = nodes
       ? [nodes.slice(), offset]
       : [];
-    //console.log('set', position + this.offset, syntax, state);
+    //console.log('set', position + this.offset, syntax, state, record[`${syntax}:${state}`]);
   }
   public clear(position: number): void {
     const memory = this.memory;

package/src/combinator/data/parser/context.test.ts

@@ -1,7 +1,7 @@
 import { Parser, Ctx } from '../parser';
 import { some } from './some';
 import { reset, context } from './context';
-import { creator } from './context';
+import { creation } from './context';
 
 describe('Unit: combinator/data/parser/context', () => {
   interface Context extends Ctx {
@@ -9,7 +9,7 @@ describe('Unit: combinator/data/parser/context', () => {
   }
 
   describe('reset', () => {
-    const parser: Parser<number> = some(creator(
+    const parser: Parser<number> = some(creation(
       (s, context) => [[context.resources?.budget ?? NaN], s.slice(1)]));
 
     it('root', () => {
@@ -36,7 +36,7 @@ describe('Unit: combinator/data/parser/context', () => {
   });
 
   describe('context', () => {
-    const parser: Parser<boolean, Context> = some(creator(
+    const parser: Parser<boolean, Context> = some(creation(
       (s, context) => [[context.status!], s.slice(1)]));
 
     it('', () => {

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

@@ -56,17 +56,12 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: [str
   return result;
 }
 
-export function syntax<P extends Parser<unknown>>(syntax: number, precedence: number, parser: P): P;
 export function syntax<P extends Parser<unknown>>(syntax: number, precedence: number, cost: number, parser: P): P;
-export function syntax<T>(syntax: number, precedence: number, cost: number | Parser<T>, parser?: Parser<T>): Parser<T> {
-  if (typeof cost === 'function') {
-    parser = cost;
-    cost = 1;
-  }
+export function syntax<T>(syntax: number, precedence: number, cost: number, parser?: Parser<T>): Parser<T> {
   return (source, context) => {
     if (source === '') return;
-    context.backtrackable ??= ~0;
-    const state = context.state ??= 0;
+    const memo = context.memo ??= new Memo();
+    context.memorable ??= ~0;
     const p = context.precedence;
     context.precedence = precedence;
     const { resources = { budget: 1, recursion: 1 } } = context;
@@ -74,7 +69,8 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
     if (resources.recursion <= 0) throw new Error('Too much recursion');
     --resources.recursion;
     const pos = source.length;
-    const cache = syntax && context.memo?.get(pos, syntax, state);
+    const state = context.state ?? 0;
+    const cache = syntax && memo.get(pos, syntax, state);
     const result: Result<T> = cache
       ? cache.length === 0
         ? undefined
@@ -82,18 +78,16 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
       : parser!(source, context);
     ++resources.recursion;
     if (result && !cache) {
-      assert(cost = cost as number);
       resources.budget -= cost;
     }
     if (syntax) {
-      if (state & context.backtrackable) {
-        context.memo ??= new Memo();
-        cache ?? context.memo.set(pos, syntax, state, eval(result), source.length - exec(result, '').length);
-        assert.deepStrictEqual(cache && cache, cache && context.memo.get(pos, syntax, state));
+      if (state & context.memorable!) {
+        cache ?? memo.set(pos, syntax, state, eval(result), source.length - exec(result, '').length);
+        assert.deepStrictEqual(cache && cache, cache && memo.get(pos, syntax, state));
       }
-      else if (result && context.memo?.length! >= pos) {
-        assert(!(state & context.backtrackable));
-        context.memo!.clear(pos);
+      else if (result && memo.length! >= pos) {
+        assert(!(state & context.memorable!));
+        memo.clear(pos);
       }
     }
     context.precedence = p;
@@ -101,10 +95,10 @@ export function syntax<T>(syntax: number, precedence: number, cost: number | Par
   };
 }
 
-export function creator<P extends Parser<unknown>>(parser: P): P;
-export function creator<P extends Parser<unknown>>(cost: number, parser: P): P;
-export function creator(cost: number | Parser<unknown>, parser?: Parser<unknown>): Parser<unknown> {
-  if (typeof cost === 'function') return creator(1, cost);
+export function creation<P extends Parser<unknown>>(parser: P): P;
+export function creation<P extends Parser<unknown>>(cost: number, parser: P): P;
+export function creation(cost: number | Parser<unknown>, parser?: Parser<unknown>): Parser<unknown> {
+  if (typeof cost === 'function') return creation(1, cost);
   assert(cost >= 0);
   return (source, context) => {
     const { resources = { budget: 1, recursion: 1 } } = context;

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

@@ -1,7 +1,7 @@
 import { undefined } from 'spica/global';
 import { Parser, eval, exec, check } from '../parser';
 import { Delimiters } from './context/delimiter';
-import { push } from 'spica/array';
+import { unshift, push } from 'spica/array';
 
 type DelimiterOption = readonly [delimiter: string | RegExp, precedence: number];
 
@@ -32,7 +32,9 @@ export function some<T>(parser: Parser<T>, end?: string | RegExp | number, delim
       assert.doesNotThrow(() => limit < 0 && check(rest, result));
       if (!result) break;
       nodes = nodes
-        ? push(nodes, eval(result))
+        ? nodes.length < eval(result).length
+          ? unshift(nodes, eval(result))
+          : push(nodes, eval(result))
         : eval(result);
       rest = exec(result);
       if (limit >= 0 && source.length - rest.length > limit) break;

package/src/combinator/data/parser.ts

@@ -15,7 +15,7 @@ export interface Ctx {
   precedence?: number;
   delimiters?: Delimiters;
   state?: number;
-  backtrackable?: number;
+  memorable?: number;
   memo?: Memo;
 }
 export type Tree<P extends Parser<unknown>> = P extends Parser<infer T> ? T : never;

package/src/parser/api/bind.ts

@@ -24,7 +24,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
   let context: MarkdownParser.Context = {
     ...settings,
     host: settings.host ?? new ReadonlyURL(location.pathname, location.origin),
-    backtrackable,
+    memorable: backtrackable,
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   assert(!settings.id);

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

@@ -247,19 +247,19 @@ describe('Unit: parser/api/parse', () => {
         [...parse('('.repeat(20)).children].map(el => el.outerHTML),
         [`<p>${'('.repeat(20)}</p>`]);
       assert.deepStrictEqual(
-        [...parse('('.repeat(21)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse('('.repeat(22)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [
           '<h1 id="error:rnd" class="error">Error: Too much recursion</h1>',
-          `<pre class="error" translate="no">${'('.repeat(21)}</pre>`,
+          `<pre class="error" translate="no">${'('.repeat(22)}</pre>`,
         ]);
       assert.deepStrictEqual(
         [...parse('['.repeat(20)).children].map(el => el.outerHTML),
         [`<p>${'['.repeat(20)}</p>`]);
       assert.deepStrictEqual(
-        [...parse('['.repeat(21)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse('['.repeat(22)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [
           '<h1 id="error:rnd" class="error">Error: Too much recursion</h1>',
-          `<pre class="error" translate="no">${'['.repeat(21)}</pre>`,
+          `<pre class="error" translate="no">${'['.repeat(22)}</pre>`,
         ]);
       assert.deepStrictEqual(
         [...parse('['.repeat(17) + '\na').children].map(el => el.outerHTML),

package/src/parser/api/parse.ts

@@ -30,7 +30,7 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     ...context?.resources && {
       resources: context.resources,
     },
-    backtrackable,
+    memorable: backtrackable,
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();

package/src/parser/block/blockquote.ts

@@ -1,5 +1,5 @@
 import { BlockquoteParser } from '../block';
-import { union, some, creator, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
+import { union, some, creation, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { parse } from '../api/parse';
@@ -19,7 +19,7 @@ const indent = block(open(opener, some(contentline, /^>(?:$|\s)/)), false);
 const unindent = (source: string) => source.replace(/(^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$/g, '$1');
 
 const source: BlockquoteParser.SourceParser = lazy(() => fmap(
-  some(creator(union([
+  some(creation(union([
     rewrite(
       indent,
       convert(unindent, source)),
@@ -30,11 +30,11 @@ const source: BlockquoteParser.SourceParser = lazy(() => fmap(
   ns => [html('blockquote', ns)]));
 
 const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
-  some(creator(union([
+  some(creation(union([
     rewrite(
       indent,
       convert(unindent, markdown)),
-    creator(99,
+    creation(99,
     rewrite(
       some(contentline, opener),
       convert(unindent, (source, context) => {

package/src/parser/block/dlist.ts

@@ -1,5 +1,5 @@
 import { DListParser } from '../block';
-import { union, inits, some, creator, state, block, line, validate, rewrite, open, trimEnd, lazy, fmap } from '../../combinator';
+import { union, inits, some, creation, state, block, line, validate, rewrite, open, trimEnd, lazy, fmap } from '../../combinator';
 import { inline, indexee, indexer } from '../inline';
 import { anyline } from '../source';
 import { State } from '../context';
@@ -17,13 +17,13 @@ export const dlist: DListParser = lazy(() => block(localize(fmap(validate(
   ]))),
   es => [html('dl', fillTrailingDescription(es))]))));
 
-const term: DListParser.TermParser = creator(line(indexee(fmap(open(
+const term: DListParser.TermParser = creation(line(indexee(fmap(open(
   /^~[^\S\n]+(?=\S)/,
   visualize(trimBlank(some(union([indexer, inline])))),
   true),
   ns => [html('dt', defrag(ns))]))));
 
-const desc: DListParser.DescriptionParser = creator(block(fmap(open(
+const desc: DListParser.DescriptionParser = creation(block(fmap(open(
   /^:[^\S\n]+(?=\S)|/,
   rewrite(
     some(anyline, /^[~:][^\S\n]+\S/),

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

@@ -2,7 +2,7 @@ import { undefined, BigInt, Array } from 'spica/global';
 import { max, min, isArray } from 'spica/alias';
 import { ExtensionParser } from '../../block';
 import { Tree, eval } from '../../../combinator/data/parser';
-import { union, subsequence, inits, some, creator, block, line, validate, fence, rewrite, open, clear, convert, trim, dup, lazy, fmap } from '../../../combinator';
+import { union, subsequence, inits, some, creation, block, line, validate, fence, rewrite, open, clear, convert, trim, dup, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { localize } from '../../locale';
@@ -79,7 +79,7 @@ const align: AlignParser = line(fmap(
 
 const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/;
 
-const head: CellParser.HeadParser = creator(block(fmap(open(
+const head: CellParser.HeadParser = creation(block(fmap(open(
   str(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/),
   rewrite(
     inits([
@@ -91,7 +91,7 @@ const head: CellParser.HeadParser = creator(block(fmap(open(
   ns => [html('th', attributes(ns.shift()! as string), defrag(ns))]),
   false));
 
-const data: CellParser.DataParser = creator(block(fmap(open(
+const data: CellParser.DataParser = creation(block(fmap(open(
   str(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/),
   rewrite(
     inits([
@@ -103,7 +103,7 @@ const data: CellParser.DataParser = creator(block(fmap(open(
   ns => [html('td', attributes(ns.shift()! as string), defrag(ns))]),
   false));
 
-const dataline: CellParser.DatalineParser = creator(line(
+const dataline: CellParser.DatalineParser = creation(line(
   rewrite(
     contentline,
     union([

package/src/parser/block/ilist.ts

@@ -1,5 +1,5 @@
 import { IListParser } from '../block';
-import { union, inits, some, creator, state, block, line, validate, indent, open, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, some, creation, state, block, line, validate, indent, open, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, fillFirstLine } from './ulist';
 import { olist_, invalid } from './olist';
 import { inline } from '../inline';
@@ -13,7 +13,7 @@ export const ilist: IListParser = lazy(() => block(validate(
 
 export const ilist_: IListParser = lazy(() => block(fmap(validate(
   /^[-+*](?:$|\s)/,
-  some(creator(union([
+  some(creation(union([
     fmap(fallback(
       inits([
         line(open(/^[-+*](?:$|\s)/, some(inline), true)),

package/src/parser/block/olist.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { OListParser } from '../block';
-import { union, inits, subsequence, some, creator, state, block, line, validate, indent, focus, rewrite, open, match, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, rewrite, open, match, fallback, lazy, fmap } from '../../combinator';
 import { checkbox, ulist_, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline, indexee, indexer } from '../inline';
@@ -36,7 +36,7 @@ export const olist_: OListParser = lazy(() => block(union([
 ])));
 
 const list = (type: string, form: string): OListParser.ListParser => fmap(
-  some(creator(union([
+  some(creation(union([
     indexee(fmap(fallback(
       inits([
         line(open(heads[form], subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),

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

@@ -1,10 +1,10 @@
 import { ReplyParser } from '../../block';
-import { union, tails, creator, line, validate, focus, reverse, fmap } from '../../../combinator';
+import { union, tails, creation, line, validate, focus, reverse, fmap } from '../../../combinator';
 import { anchor } from '../../inline/autolink/anchor';
 import { str } from '../../source';
 import { html, define, defrag } from 'typed-dom/dom';
 
-export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
+export const cite: ReplyParser.CiteParser = creation(line(fmap(validate(
   '>>',
   reverse(tails([
     str(/^>*(?=>>[^>\s]+[^\S\n]*(?:$|\n))/),

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

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

package/src/parser/block/sidefence.ts

@@ -1,5 +1,5 @@
 import { SidefenceParser } from '../block';
-import { union, some, creator, block, focus, rewrite, convert, lazy, fmap } from '../../combinator';
+import { union, some, creation, block, focus, rewrite, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -20,7 +20,7 @@ const opener = /^(?=\|\|+(?:$|\s))/;
 const unindent = (source: string) => source.replace(/(^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '$1');
 
 const source: SidefenceParser.SourceParser = lazy(() => fmap(
-  some(creator(union([
+  some(creation(union([
     focus(
       /^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/,
       convert(unindent, source)),

package/src/parser/block/table.ts

@@ -1,5 +1,5 @@
 import { TableParser } from '../block';
-import { union, sequence, some, creator, block, line, validate, focus, rewrite, surround, open, fallback, lazy, fmap } from '../../combinator';
+import { union, sequence, some, creation, block, line, validate, focus, rewrite, surround, open, fallback, lazy, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { contentline } from '../source';
 import { trimNode } from '../visibility';
@@ -25,7 +25,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
     ]),
   ])));
 
-const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => creator(fallback(fmap(
+const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean): RowParser<P> => creation(fallback(fmap(
   line(surround(/^(?=\|)/, some(union([parser])), /^[|\\]?\s*$/, optional)),
   es => [html('tr', es)]),
   rewrite(contentline, source => [[
@@ -37,7 +37,7 @@ const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean):
     }, [html('td', source.replace('\n', ''))])
   ], ''])));
 
-const align: AlignParser = creator(fmap(open(
+const align: AlignParser = creation(fmap(open(
   '|',
   union([
     focus(/^:-+:/, () => [['center'], '']),
@@ -52,11 +52,11 @@ const cell: CellParser = surround(
   some(union([inline]), /^\|/, [[/^[|\\]?\s*$/, 9]]),
   /^[^|]*/, true);
 
-const head: CellParser.HeadParser = creator(fmap(
+const head: CellParser.HeadParser = creation(fmap(
   cell,
   ns => [html('th', trimNode(defrag(ns)))]));
 
-const data: CellParser.DataParser = creator(fmap(
+const data: CellParser.DataParser = creation(fmap(
   cell,
   ns => [html('td', trimNode(defrag(ns)))]));
 

package/src/parser/block/ulist.ts

@@ -1,5 +1,5 @@
 import { UListParser } from '../block';
-import { union, inits, subsequence, some, creator, state, block, line, validate, indent, focus, open, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, open, fallback, lazy, fmap } from '../../combinator';
 import { olist_, invalid } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee } from '../inline';
@@ -15,7 +15,7 @@ export const ulist: UListParser = lazy(() => block(validate(
 
 export const ulist_: UListParser = lazy(() => block(fmap(validate(
   /^-(?=$|\s)/,
-  some(creator(union([
+  some(creation(union([
     indexee(fmap(fallback(
       inits([
         line(open(/^-(?:$|\s)/, subsequence([checkbox, trimBlank(some(union([indexer, inline])))]), true)),

package/src/parser/block.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
-import { union, reset, creator, open, fallback, recover } from '../combinator';
+import { union, reset, creation, open, fallback, recover } from '../combinator';
 import { emptyline } from './source';
 import { horizontalrule } from './block/horizontalrule';
 import { heading } from './block/heading';
@@ -35,7 +35,7 @@ export import BlockquoteParser = BlockParser.BlockquoteParser;
 export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
-export const block: BlockParser = creator(error(
+export const block: BlockParser = creation(error(
   reset({ resources: { budget: 50 * 1000, recursion: 20 } },
   union([
     emptyline,

package/src/parser/context.ts

@@ -1,4 +1,4 @@
-export const enum Rule {
+export const enum Syntax {
   reference = 1 << 12,
   comment = 1 << 11,
   index = 1 << 10,

package/src/parser/inline/annotation.ts

@@ -1,20 +1,21 @@
 import { undefined } from 'spica/global';
 import { AnnotationParser } from '../inline';
-import { union, some, guard, context, syntax, state, validate, surround, lazy } from '../../combinator';
+import { union, some, guard, context, syntax, state, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { optimize } from './link';
-import { Rule, State } from '../context';
+import { Syntax, State } from '../context';
 import { startLoose, trimNode } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
-export const annotation: AnnotationParser = lazy(() => validate('((', syntax(Rule.annotation, 6, surround(
+export const annotation: AnnotationParser = lazy(() => surround(
   '((',
   guard(context => ~context.state! & State.annotation,
+  syntax(Syntax.annotation, 6, 1,
   state(State.annotation | State.media,
   startLoose(
   context({ delimiters: undefined },
-  some(union([inline]), ')', [[/^\\?\n/, 9], [')', 2], ['))', 6]])), ')'))),
+  some(union([inline]), ')', [[/^\\?\n/, 9], [')', 2], ['))', 6]])), ')')))),
   '))',
   false,
   ([, ns], rest) => [[html('sup', { class: 'annotation' }, [html('span', trimNode(defrag(ns)))])], rest],
-  ([, ns, rest], next) => next[0] === ')' ? undefined : optimize('((', ns, rest, next)))));
+  ([, ns, rest], next) => next[0] === ')' ? undefined : optimize('((', ns, rest, next)));

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

@@ -1,11 +1,11 @@
 import { AutolinkParser } from '../../inline';
-import { creator, verify, rewrite } from '../../../combinator';
+import { creation, verify, rewrite } from '../../../combinator';
 import { str } from '../../source';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
 
-export const email: AutolinkParser.EmailParser = creator(rewrite(verify(
+export const email: AutolinkParser.EmailParser = creation(rewrite(verify(
   str(/^[0-9A-Za-z]+(?:[.+_-][0-9A-Za-z]+)*@[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?)*(?![0-9A-Za-z])/),
   ([source]) => source.indexOf('@') <= 64 && source.length <= 255),
   source => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, some, creator, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
 import { textlink } from '../link';
 import { unescsource } from '../../source';
 
@@ -13,7 +13,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
     url => `{ ${url} }`,
     union([textlink])))));
 
-const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creator(precedence(2, union([
+const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(precedence(2, union([
   surround('(', some(union([bracket, unescsource]), ')'), ')', true),
   surround('[', some(union([bracket, unescsource]), ']'), ']', true),
   surround('{', some(union([bracket, unescsource]), '}'), '}', true),

package/src/parser/inline/autolink.ts

@@ -8,13 +8,13 @@ import { hashtag, emoji } from './autolink/hashtag';
 import { hashnum } from './autolink/hashnum';
 import { anchor } from './autolink/anchor';
 import { str } from '../source';
-import { Rule, State } from '../context';
+import { Syntax, State } from '../context';
 import { stringify } from '../util';
 
 export const autolink: AutolinkParser = fmap(
   validate(/^(?:[@#>0-9A-Za-z]|\S#)/,
   guard(context => ~context.state! & State.autolink,
-  syntax(Rule.autolink, 1,
+  syntax(Syntax.autolink, 1, 1,
   some(union([
     url,
     email,

package/src/parser/inline/bracket.ts

@@ -3,29 +3,29 @@ import { BracketParser } from '../inline';
 import { union, some, syntax, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { Rule } from '../context';
+import { Syntax } from '../context';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift, push } from 'spica/array';
 
 const index = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
 
 export const bracket: BracketParser = lazy(() => union([
-  surround(str('('), syntax(Rule.none, 2, str(index)), str(')')),
-  surround(str('('), syntax(Rule.bracket, 2, some(inline, ')', [[')', 2]])), str(')'), true,
+  surround(str('('), syntax(Syntax.none, 2, 1, str(index)), str(')')),
+  surround(str('('), syntax(Syntax.bracket, 2, 1, some(inline, ')', [[')', 2]])), str(')'), true,
     ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
     ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest]),
-  surround(str('（'), syntax(Rule.none, 2, str(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0))))), str('）')),
-  surround(str('（'), syntax(Rule.bracket, 2, some(inline, '）', [['）', 2]])), str('）'), true,
+  surround(str('（'), syntax(Syntax.none, 2, 1, str(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0))))), str('）')),
+  surround(str('（'), syntax(Syntax.bracket, 2, 1, some(inline, '）', [['）', 2]])), str('）'), true,
     ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('['), syntax(Rule.bracket, 2, some(inline, ']', [[']', 2]])), str(']'), true,
+  surround(str('['), syntax(Syntax.bracket, 2, 1, some(inline, ']', [[']', 2]])), str(']'), true,
     undefined,
     ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest]),
-  surround(str('{'), syntax(Rule.bracket, 2, some(inline, '}', [['}', 2]])), str('}'), true,
+  surround(str('{'), syntax(Syntax.bracket, 2, 1, some(inline, '}', [['}', 2]])), str('}'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
   // Control media blinking in editing rather than control confusion of pairs of quote marks.
-  surround(str('"'), syntax(Rule.quote, 8, some(inline, '"', [['"', 8]])), str('"'), true,
+  surround(str('"'), syntax(Syntax.quote, 8, 1, some(inline, '"', [['"', 8]])), str('"'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));

package/src/parser/inline/code.ts

@@ -1,8 +1,8 @@
 import { CodeParser } from '../inline';
-import { creator, validate, match } from '../../combinator';
+import { creation, validate, match } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
-export const code: CodeParser = creator(validate('`', match(
+export const code: CodeParser = creation(validate('`', match(
   /^(`+)(?!`)([^\n]*?[^`\n])\1(?!`)/,
   ([whole, , body]) => rest =>
     [[html('code', { 'data-src': whole }, format(body))], rest.slice(whole.length)])));

package/src/parser/inline/comment.ts

@@ -2,12 +2,12 @@ import { CommentParser } from '../inline';
 import { union, some, syntax, validate, surround, open, close, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { text, str } from '../source';
-import { Rule } from '../context';
+import { Syntax } from '../context';
 import { html, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
 import { unshift, push } from 'spica/array';
 
-export const comment: CommentParser = lazy(() => validate('[%', syntax(Rule.none, 4, match(
+export const comment: CommentParser = lazy(() => validate('[%', syntax(Syntax.none, 4, 1, match(
   /^\[(%+)\s/,
   memoize(
   ([, fence]) =>