securemark 0.258.9 → 0.259.2

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 { Syntax } from '../context';
+import { Syntax, State } 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(Syntax.none, 4, 1, match(
+export const comment: CommentParser = lazy(() => validate('[%', syntax(Syntax.none, 4, 1, State.none, match(
   /^\[(%+)\s/,
   memoize(
   ([, fence]) =>

package/src/parser/inline/deletion.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/deletion', () => {
   describe('deletion', () => {
-    const parser = (source: string) => some(deletion)(source, {});
+    const parser = (source: string) => some(deletion)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/deletion.ts

@@ -2,14 +2,14 @@ import { DeletionParser } from '../inline';
 import { union, some, syntax, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const deletion: DeletionParser = lazy(() => surround(
   str('~~'),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   some(union([
     some(inline, blankWith('\n', '~~')),
     open('\n', some(inline, '~'), true),

package/src/parser/inline/emphasis.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/emphasis', () => {
   describe('emphasis', () => {
-    const parser = (source: string) => some(emphasis)(source, {});
+    const parser = (source: string) => some(emphasis)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('*')), undefined);

package/src/parser/inline/emphasis.ts

@@ -4,14 +4,14 @@ import { inline } from '../inline';
 import { emstrong } from './emstrong';
 import { strong } from './strong';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { startTight, blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const emphasis: EmphasisParser = lazy(() => surround(
   str('*'),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     strong,
     some(inline, blankWith('*')),

package/src/parser/inline/emstrong.ts

@@ -5,7 +5,7 @@ import { inline } from '../inline';
 import { strong } from './strong';
 import { emphasis } from './emphasis';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { startTight, blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
@@ -29,7 +29,7 @@ const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
 
 export const emstrong: EmStrongParser = lazy(() => surround(
   str('***'),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('*')),
     open(some(inline, '*'), inline),
@@ -47,7 +47,7 @@ export const emstrong: EmStrongParser = lazy(() => surround(
             rest.slice(0, 1) === '*'
               ? [[html('em', unshift([html('strong', defrag(bs))], defrag(ds)))], rest.slice(1)]
               : [unshift(['*', html('strong', defrag(bs))], ds), rest])
-          (rest, context) ?? [['*', html('strong', defrag(bs))], rest];
+          ({ source: rest, context }) ?? [['*', html('strong', defrag(bs))], rest];
       case '*':
         return bind<StrongParser>(
           substrong,
@@ -55,7 +55,7 @@ export const emstrong: EmStrongParser = lazy(() => surround(
             rest.slice(0, 2) === '**'
               ? [[html('strong', unshift([html('em', defrag(bs))], defrag(ds)))], rest.slice(2)]
               : [unshift(['**', html('em', defrag(bs))], ds), rest])
-          (rest, context) ?? [['**', html('em', defrag(bs))], rest];
+          ({ source: rest, context }) ?? [['**', html('em', defrag(bs))], rest];
     }
     assert(false);
   },

package/src/parser/inline/escape.ts

@@ -5,7 +5,7 @@ import { str } from '../source';
 
 const repeat = str(/^(.)\1*/);
 
-export const escape: EscapeParser = union([(source, context) => {
+export const escape: EscapeParser = union([({ source, context }) => {
   if (source.length < 3) return;
   switch (source[0]) {
     case '*':
@@ -14,7 +14,7 @@ export const escape: EscapeParser = union([(source, context) => {
       return source[3] === source[0]
           && source[2] === source[0]
           && source[1] === source[0]
-        ? repeat(source, context)
+        ? repeat({ source, context })
         : undefined;
     case '+':
     case '~':
@@ -22,7 +22,7 @@ export const escape: EscapeParser = union([(source, context) => {
       assert(source[2]);
       return source[2] === source[0]
           && source[1] === source[0]
-        ? repeat(source, context)
+        ? repeat({ source, context })
         : undefined;
     default:
       return;

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/extension/index', () => {
   describe('index', () => {
-    const parser = (source: string) => some(index)(source, {});
+    const parser = (source: string) => some(index)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('[]')), undefined);

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

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { ExtensionParser } from '../../inline';
-import { union, some, syntax, creation, precedence, constraint, state, validate, surround, open, lazy, fmap } from '../../../combinator';
+import { union, some, syntax, creation, precedence, constraint, validate, surround, open, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
 import { indexee, identity } from './indexee';
 import { txt, str, stropt } from '../../source';
@@ -13,13 +13,12 @@ import IndexParser = ExtensionParser.IndexParser;
 export const index: IndexParser = lazy(() => validate('[#', fmap(indexee(surround(
   '[#',
   constraint(State.index, false,
-  state(State.annotation | State.reference | State.index | State.label | State.link | State.media | State.autolink,
-  syntax(Syntax.index, 2, 1,
+  syntax(Syntax.index, 2, 1, State.linkable,
   startTight(
   open(stropt(/^\|?/), trimBlankEnd(some(union([
     signature,
     inline,
-  ]), ']', [[/^\\?\n/, 9], [']', 2]])), true))))),
+  ]), ']', [[/^\\?\n/, 9], [']', 2]])), true)))),
   ']',
   false,
   ([, ns], rest) => [[html('a', defrag(ns))], rest])),

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/extension/indexer', () => {
   describe('indexer', () => {
-    const parser = (source: string) => some(indexer)(source, {});
+    const parser = (source: string) => some(indexer)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/extension/label', () => {
   describe('label', () => {
-    const parser = (source: string) => some(label)(source, {});
+    const parser = (source: string) => some(label)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('[]')), undefined);

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/inline/extension/placeholder', () => {
   describe('placeholder', () => {
-    const parser = (source: string) => some(placeholder)(source, {});
+    const parser = (source: string) => some(placeholder)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('[]')), undefined);

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

@@ -2,7 +2,7 @@ import { ExtensionParser } from '../../inline';
 import { union, some, syntax, validate, surround, lazy } from '../../../combinator';
 import { inline } from '../../inline';
 import { str } from '../../source';
-import { Syntax } from '../../context';
+import { Syntax, State } from '../../context';
 import { startTight } from '../../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
@@ -13,7 +13,7 @@ import { unshift } from 'spica/array';
 
 export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => validate(['[:', '[^'], surround(
   str(/^\[[:^]/),
-  syntax(Syntax.none, 2, 1,
+  syntax(Syntax.none, 2, 1, State.none,
   startTight(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 2]]))),
   str(']'), false,
   ([as, bs], rest) => [[

package/src/parser/inline/html.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/html', () => {
   describe('html', () => {
-    const parser = (source: string) => some(html)(source, {});
+    const parser = (source: string) => some(html)({ source, context: {} });
 
     it('xss', () => {
       assert.deepStrictEqual(inspect(parser('<script>')), [['<span class="invalid">&lt;script&gt;</span>'], '']);

package/src/parser/inline/html.ts

@@ -3,7 +3,7 @@ import { HTMLParser } from '../inline';
 import { union, subsequence, some, syntax, validate, focus, surround, open, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { isStartLooseNodes, blankWith } from '../visibility';
 import { html as h, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
@@ -19,7 +19,7 @@ const attrspecs = {
 Object.setPrototypeOf(attrspecs, null);
 Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
 
-export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, syntax(Syntax.none, 5, 1, union([
+export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, syntax(Syntax.none, 5, 1, State.none, union([
   focus(
     /^<wbr[^\S\n]*>/i,
     () => [[h('wbr')], '']),

package/src/parser/inline/htmlentity.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/htmlentity', () => {
   describe('htmlentity', () => {
-    const parser = (source: string) => some(htmlentity)(source, {});
+    const parser = (source: string) => some(htmlentity)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/htmlentity.ts

@@ -6,7 +6,7 @@ import { reduce } from 'spica/memoize';
 
 export const unsafehtmlentity: UnsafeHTMLEntityParser = creation(validate('&', focus(
   /^&[0-9A-Za-z]+;/,
-  entity => [[parse(entity) ?? `\x1B${entity}`], ''])));
+  ({ source }) => [[parse(source) ?? `\x1B${source}`], ''])));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),

package/src/parser/inline/insertion.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/insertion', () => {
   describe('insertion', () => {
-    const parser = (source: string) => some(insertion)(source, {});
+    const parser = (source: string) => some(insertion)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/insertion.ts

@@ -2,14 +2,14 @@ import { InsertionParser } from '../inline';
 import { union, some, syntax, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const insertion: InsertionParser = lazy(() => surround(
   str('++'),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   some(union([
     some(inline, blankWith('\n', '++')),
     open('\n', some(inline, '+'), true),

package/src/parser/inline/link.test.ts

@@ -5,7 +5,7 @@ import { MarkdownParser } from '../../../markdown';
 
 describe('Unit: parser/inline/link', () => {
   describe('link', () => {
-    const parser = (source: string, context: MarkdownParser.Context = {}) => some(link)(source, context);
+    const parser = (source: string, context: MarkdownParser.Context = {}) => some(link)({ source, context });
 
     it('xss', () => {
       assert.deepStrictEqual(inspect(parser('[]{javascript:alert}')), [['<a class="invalid">javascript:alert</a>'], '']);

package/src/parser/inline/link.ts

@@ -25,8 +25,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], union([
 
 const textlink: LinkParser.TextLinkParser = lazy(() =>
   constraint(State.link, false,
-  state(State.link | State.media | State.annotation | State.reference | State.index | State.label | State.autolink,
-  syntax(Syntax.link, 2, 10,
+  syntax(Syntax.link, 2, 10, State.linkable,
   bind(reverse(tails([
     dup(surround(
       '[',
@@ -36,22 +35,19 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
-    assert(params.length > 0);
-    assert(params.every(p => typeof p === 'string'));
+    assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
     if (content.length !== 0 && trimNode(content).length === 0) return;
     for (let source = stringify(content); source;) {
-      const result = state(State.autolink, false, autolink)(source, context);
+      const result = state(State.autolink, false, autolink)({ source, context });
       if (typeof eval(result!)[0] === 'object') return;
       source = exec(result!);
     }
-    assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
     return parse(content, params, rest, context);
-  })))));
+  }))));
 
 const medialink: LinkParser.MediaLinkParser = lazy(() =>
   constraint(State.link | State.media, false,
-  state(State.link | State.annotation | State.reference | State.index | State.label | State.autolink,
-  syntax(Syntax.link, 2, 10,
+  syntax(Syntax.link, 2, 10, State.linkable ^ State.media,
   bind(reverse(sequence([
     dup(surround(
       '[',
@@ -59,26 +55,20 @@ const medialink: LinkParser.MediaLinkParser = lazy(() =>
       ']')),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
-  ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
-    assert(params.length > 0);
-    assert(params.every(p => typeof p === 'string'));
-    assert(content.length === 1);
-    return parse(content, params, rest, context);
-  })))));
+  ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
+    parse(content, params, rest, context)))));
 
-export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() => validate(['[', '{'], bind(
+export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
   creation(10, precedence(2,
-  reverse(tails([
+  bind(reverse(tails([
     dup(surround(
       '[',
       some(union([unescsource]), ']'),
       ']')),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
-  ])))),
-  ([params, content = []], rest, context) => {
-    assert(params.every(p => typeof p === 'string'));
-    return parse(content, params, rest, context);
-  })));
+  ])),
+  ([params, content = []], rest, context) =>
+    parse(content, params, rest, context)))));
 
 export const uri: LinkParser.ParameterParser.UriParser = union([
   open(/^[^\S\n]+/, str(/^\S+/)),
@@ -97,6 +87,8 @@ function parse(
   rest: string,
   context: MarkdownParser.Context,
 ): Result<HTMLAnchorElement, MarkdownParser.Context> {
+  assert(params.length > 0);
+  assert(params.every(p => typeof p === 'string'));
   const INSECURE_URI = params.shift()!;
   assert(INSECURE_URI === INSECURE_URI.trim());
   assert(!INSECURE_URI.match(/\s/));

package/src/parser/inline/mark.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/mark', () => {
   describe('mark', () => {
-    const parser = (source: string) => some(mark)(source, {});
+    const parser = (source: string) => some(mark)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/mark.ts

@@ -3,13 +3,13 @@ import { union, some, syntax, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
 import { startTight, blankWith } from '../visibility';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const mark: MarkParser = lazy(() => surround(
   str('=='),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('==')),
     open(some(inline, '='), mark),

package/src/parser/inline/math.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/math', () => {
   describe('math', () => {
-    const parser = (source: string) => some(math)(source, {});
+    const parser = (source: string) => some(math)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/math.ts

@@ -16,7 +16,7 @@ export const math: MathParser = lazy(() => validate('$', creation(rewrite(
       ]))),
       /^\$(?![0-9A-Za-z])/),
   ]),
-  (source, { caches: { math: cache } = {} }) => [[
+  ({ source, context: { caches: { math: cache } = {} } }) => [[
     cache?.get(source)?.cloneNode(true) ||
     html('span',
       !forbiddenCommand.test(source)

package/src/parser/inline/media.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/media', () => {
   describe('media', () => {
-    const parser = (source: string) => some(media)(source, {});
+    const parser = (source: string) => some(media)({ source, context: {} });
 
     it('xss', () => {
       assert.deepStrictEqual(inspect(parser('![]{javascript:alert}')), [['<img class="media invalid" data-src="javascript:alert" alt="">'], '']);

package/src/parser/inline/media.ts

@@ -21,7 +21,7 @@ Object.setPrototypeOf(optspec, null);
 export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
   '!',
   constraint(State.media, false,
-  syntax(Syntax.media, 2, 10,
+  syntax(Syntax.media, 2, 10, State.none,
   bind(verify(fmap(tails([
     dup(surround(
       '[',
@@ -55,11 +55,11 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
       el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
     }
     if (context.state! & State.link) return [[el], rest];
-    if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])('!', context);
+    if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])({ source: '!', context });
     return fmap(
       unsafelink as MediaParser,
       ([link]) => [define(link, { target: '_blank' }, [el])])
-      (`{ ${INSECURE_URI}${params.join('')} }${rest}`, context);
+      ({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
   }))))));
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union([

package/src/parser/inline/reference.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/reference', () => {
   describe('reference', () => {
-    const parser = (source: string) => some(reference)(source, {});
+    const parser = (source: string) => some(reference)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/reference.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { ReferenceParser } from '../inline';
-import { union, subsequence, some, context, syntax, creation, constraint, state, surround, open, lazy, bind } from '../../combinator';
+import { union, subsequence, some, context, syntax, creation, constraint, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { str, stropt } from '../source';
 import { Syntax, State } from '../context';
@@ -11,15 +11,14 @@ import { html, defrag } from 'typed-dom/dom';
 export const reference: ReferenceParser = lazy(() => surround(
   '[[',
   constraint(State.reference, false,
-  state(State.annotation | State.reference | State.media,
-  syntax(Syntax.reference, 6, 1,
+  syntax(Syntax.reference, 6, 1, State.annotation | State.reference | State.media,
   startLoose(
   context({ delimiters: undefined },
   subsequence([
     abbr,
     open(stropt(/^(?=\^)/), some(inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])),
     some(inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]]),
-  ])), ']')))),
+  ])), ']'))),
   ']]',
   false,
   ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNode(defrag(ns)))])], rest]));

package/src/parser/inline/ruby.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/ruby', () => {
   describe('ruby', () => {
-    const parser = (source: string) => some(ruby)(source, {});
+    const parser = (source: string) => some(ruby)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/ruby.ts

@@ -4,12 +4,12 @@ import { eval, exec } from '../../combinator/data/parser';
 import { sequence, syntax, creation, validate, verify, focus, surround, lazy, fmap } from '../../combinator';
 import { unsafehtmlentity } from './htmlentity';
 import { text as txt } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { isStartTightNodes } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift, push } from 'spica/array';
 
-export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2, 1, fmap(verify(
+export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2, 1, State.none, fmap(verify(
   sequence([
     surround('[', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=]\()/, text), ']'),
     surround('(', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=\))/, text), ')'),
@@ -48,14 +48,14 @@ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2,
     }
   }))));
 
-const text: RubyParser.TextParser = creation((source, context) => {
+const text: RubyParser.TextParser = creation(({ source, context }) => {
   const acc = [''];
   while (source !== '') {
     assert(source[0] !== '\n');
     switch (source[0]) {
       // @ts-expect-error
       case '&': {
-        const result = unsafehtmlentity(source, context);
+        const result = unsafehtmlentity({ source, context });
         if (result) {
           acc[acc.length - 1] += eval(result)[0];
           source = exec(result, source.slice(1));
@@ -69,7 +69,7 @@ const text: RubyParser.TextParser = creation((source, context) => {
           source = source.slice(1);
           continue;
         }
-        const result = txt(source, context)!;
+        const result = txt({ source, context })!;
         assert(result);
         acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);
         source = exec(result);

package/src/parser/inline/shortmedia.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/shortmedia', () => {
   describe('shortmedia', () => {
-    const parser = (source: string) => some(shortmedia)(source, {});
+    const parser = (source: string) => some(shortmedia)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/strong.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/strong', () => {
   describe('strong', () => {
-    const parser = (source: string) => some(strong)(source, {});
+    const parser = (source: string) => some(strong)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('**')), undefined);

package/src/parser/inline/strong.ts

@@ -3,14 +3,14 @@ import { union, some, syntax, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { emstrong } from './emstrong';
 import { str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { startTight, blankWith } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const strong: StrongParser = lazy(() => surround(
   str('**'),
-  syntax(Syntax.none, 1, 1,
+  syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('**')),
     open(some(inline, '*'), union([

package/src/parser/inline/template.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/inline/template', () => {
   describe('template', () => {
-    const parser = (source: string) => some(template)(source, {});
+    const parser = (source: string) => some(template)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/inline/template.ts

@@ -2,12 +2,12 @@ import { undefined } from 'spica/global';
 import { TemplateParser } from '../inline';
 import { union, some, syntax, creation, precedence, surround, lazy } from '../../combinator';
 import { escsource, str } from '../source';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { html } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const template: TemplateParser = lazy(() => surround(
-  '{{', syntax(Syntax.none, 2, 1, some(union([bracket, escsource]), '}')), '}}', true,
+  '{{', syntax(Syntax.none, 2, 1, State.none, some(union([bracket, escsource]), '}')), '}}', true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest]));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creation(union([

package/src/parser/inline.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../debug.test';
 
 describe('Unit: parser/inline', () => {
   describe('inline', () => {
-    const parser = (source: string) => some(inline)(source, {});
+    const parser = (source: string) => some(inline)({ source, context: {} });
 
     it('empty', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);