securemark 0.258.9 → 0.259.2

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/block/extension/figure', () => {
   describe('figure', () => {
-    const parser = (source: string) => some(figure)(source, {});
+    const parser = (source: string) => some(figure)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('~~~figure\n!https://host\n~~~')), [['<pre class="invalid" translate="no">~~~figure\n!https://host\n~~~</pre>'], '']);

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

@@ -98,7 +98,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
           'data-invalid-type': 'fence',
           'data-invalid-message': `Invalid trailing line after the closing delimiter "${delim}"`,
         } ||
-        !seg_label(opener.match(/^~+(?:figure[^\S\n]+)?(\[?\$\S+)/)?.[1] ?? '', context) && {
+        !seg_label({ source: opener.match(/^~+(?:figure[^\S\n]+)?(\[?\$\S+)/)?.[1] ?? '', context }) && {
           'data-invalid-type': 'label',
           'data-invalid-message': 'Invalid label',
         } ||

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

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

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

@@ -48,7 +48,7 @@ export const message: MessageParser = block(validate('~~~', fmap(
     return [
       html('section', { class: `message`, 'data-type': type }, unshift(
         [html('h1', title(type))],
-        [...segment(body)].reduce((acc, seg) => push(acc, eval(content(seg, context), [])), []))),
+        [...segment(body)].reduce((acc, seg) => push(acc, eval(content({ source: seg, context }), [])), []))),
     ];
   })));
 

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

@@ -3,7 +3,7 @@ import { some } from '../../../combinator';
 
 describe('Unit: parser/block/extension/placeholder', () => {
   describe('placeholder', () => {
-    const parser = (source: string) => some(placeholder)(source, {});
+    const parser = (source: string) => some(placeholder)({ source, context: {} });
 
     it('invalid', () => {
       assert(!parser(''));

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

@@ -5,7 +5,7 @@ import { html } from 'typed-dom/dom';
 
 describe('Unit: parser/block/extension/table', () => {
   describe('table', () => {
-    const parser = (source: string) => some(table)(source, {});
+    const parser = (source: string) => some(table)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('~~~table a\n-\n~~~')), [['<pre class="invalid" translate="no">~~~table a\n-\n~~~</pre>'], '']);

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

@@ -40,7 +40,7 @@ export const table: TableParser = block(validate('~~~', fmap(
     switch (type) {
       case 'grid':
       case undefined:
-        return (eval(parser(body, context)) ?? [html('table')])
+        return (eval(parser({ source: body, context })) ?? [html('table')])
           .map(el => define(el, { 'data-type': type }));
       default:
         return [html('pre', {

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

@@ -3,7 +3,7 @@ import { some } from '../../combinator';
 
 describe('Unit: parser/block/extension', () => {
   describe('extension', () => {
-    const parser = (source: string) => some(extension)(source, {});
+    const parser = (source: string) => some(extension)({ source, context: {} });
 
     it('invalid', () => {
       assert(!parser(''));

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

@@ -6,10 +6,10 @@ import { inspect } from '../../debug.test';
 describe('Unit: parser/block/heading', () => {
   describe('heading', () => {
     const parser = (source: string) => {
-      const result = segment(source, {});
+      const result = segment({ source, context: {} });
       return result
-        ? [eval(result).flatMap(seg => eval<HTMLElement | string>(heading(seg, {}), [seg])), exec(result)] as const
-        : some(heading)(source, {});
+        ? [eval(result).flatMap(seg => eval<HTMLElement | string>(heading({ source: seg, context: {} }), [seg])), exec(result)] as const
+        : some(heading)({ source, context: {} });
     };
 
     it('invalid', () => {

package/src/parser/block/heading.ts

@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
 
 export const segment: HeadingParser.SegmentParser = block(validate('#', focus(
   /^#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/,
-  some(line(source => [[source], ''])))));
+  some(line(({ source }) => [[source], ''])))));
 
 export const heading: HeadingParser = block(rewrite(segment,
   state(State.annotation | State.reference | State.index | State.label | State.link | State.media,

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

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

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

@@ -3,7 +3,7 @@ import { some } from '../../combinator';
 
 describe('Unit: parser/block/ilist', () => {
   describe('ilist', () => {
-    const parser = (source: string) => some(ilist)(source, {});
+    const parser = (source: string) => some(ilist)({ source, context: {} });
 
     it('single', () => {
       assert(!parser('-'));

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

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

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

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

package/src/parser/block/olist.ts

@@ -1,5 +1,6 @@
 import { undefined } from 'spica/global';
 import { OListParser } from '../block';
+import { Parser } from '../../combinator/data/parser';
 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';
@@ -11,7 +12,6 @@ import { html, define, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
 import { duffbk } from 'spica/duff';
 import { shift } from 'spica/array';
-import { tuple } from 'spica/tuple';
 
 const openers = {
   '.': /^([0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?:$|\s)/,
@@ -51,15 +51,15 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
 const heads = {
   '.': focus(
     openers['.'],
-    source => [[source.trimEnd().split('.', 1)[0] + '.'], '']),
+    ({ source }) => [[source.trimEnd().split('.', 1)[0] + '.'], '']),
   '(': focus(
     openers['('],
-    source => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], '']),
+    ({ source }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], '']),
 } as const;
 
 export const invalid = rewrite(
-  inits([contentline, indent((s: string) => [tuple(s), ''] as const)]),
-  source => [[
+  inits([contentline, indent<Parser<string>>(({ source }) => [[source], ''])]),
+  ({ source }) => [[
     '',
     html('span', {
       class: 'invalid',

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

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/block/paragraph', () => {
   describe('paragraph', () => {
-    const parser = (source: string) => some(paragraph)(source, {});
+    const parser = (source: string) => some(paragraph)({ source, context: {} });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('a')), [['<p>a</p>'], '']);

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

@@ -4,7 +4,7 @@ import { inspect } from '../../../debug.test';
 
 describe('Unit: parser/block/reply/cite', () => {
   describe('cite', () => {
-    const parser = (source: string) => some(cite)(source, {});
+    const parser = (source: string) => some(cite)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);
@@ -18,7 +18,7 @@ describe('Unit: parser/block/reply/cite', () => {
       assert.deepStrictEqual(inspect(parser('>>\\')), undefined);
       assert.deepStrictEqual(inspect(parser('>>01#')), undefined);
       assert.deepStrictEqual(inspect(parser('>>01@')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>https://host')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>http://')), undefined);
       assert.deepStrictEqual(inspect(parser('>>tel:1234567890')), undefined);
       assert.deepStrictEqual(inspect(parser('>>..')), undefined);
       assert.deepStrictEqual(inspect(parser('>> 0')), undefined);
@@ -43,6 +43,8 @@ describe('Unit: parser/block/reply/cite', () => {
       assert.deepStrictEqual(inspect(parser('>>#a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#a</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#index:a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#index:a</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#:~:text=a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#:~:text=a</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>http://host')), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>https://host')), [['<span class="cite">&gt;<a class="anchor" href="https://host" target="_blank" data-depth="1">&gt;https://host</a></span>', '<br>'], '']);
     });
 
   });

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

@@ -13,7 +13,8 @@ export const cite: ReplyParser.CiteParser = creation(line(fmap(validate(
       // Subject page representation.
       // リンクの実装は後で検討
       focus(/^>>\.[^\S\n]*(?:$|\n)/, () => [[html('a', { class: 'anchor' }, '>>.')], '']),
-      focus(/^>>#\S*[^\S\n]*(?:$|\n)/, source => [[html('a', { class: 'anchor' }, source)], '']),
+      focus(/^>>#\S*[^\S\n]*(?:$|\n)/, ({ source }) => [[html('a', { class: 'anchor' }, source)], '']),
+      focus(/^>>https?:\/\/\w\S*[^\S\n]*(?:$|\n)/, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], '']),
     ]),
   ]))),
   ([el, quotes = '']: [HTMLElement, string?]) => [

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

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

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

@@ -33,7 +33,7 @@ export const quote: ReplyParser.QuoteParser = lazy(() => creation(block(fmap(val
   ]),
   false)));
 
-const qblock: ReplyParser.QuoteParser.BlockParser = (source, context) => {
+const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
   source = source.replace(/\n$/, '');
   const lines = source.match(/^.*\n?/mg)!;
   assert(lines);
@@ -41,7 +41,7 @@ const qblock: ReplyParser.QuoteParser.BlockParser = (source, context) => {
   assert(quotes);
   assert(quotes.length > 0);
   const content = lines.reduce((acc, line, row) => acc + line.slice(quotes[row].length), '');
-  const nodes = eval(some(text)(content, context), []);
+  const nodes = eval(some(text)({ source: content, context }), []);
   nodes.unshift(quotes.shift()!);
   for (let i = 0; i < nodes.length; ++i) {
     const child = nodes[i] as string | Text | Element;

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

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/block/reply', () => {
   describe('reply', () => {
-    const parser = (source: string) => some(reply)(source, {});
+    const parser = (source: string) => some(reply)({ source, context: {} });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a href="?at=1" class="anchor" data-depth="1">&gt;1</a></span></p>'], '']);

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

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

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

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

package/src/parser/block/table.ts

@@ -28,7 +28,7 @@ export const table: TableParser = lazy(() => block(fmap(validate(
 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 => [[
+  rewrite(contentline, ({ source }) => [[
     html('tr', {
       class: 'invalid',
       'data-invalid-syntax': 'table-row',

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

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

package/src/parser/block/ulist.ts

@@ -28,7 +28,7 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
 
 export const checkbox = creation(focus(
   /^\[[xX ]\](?=$|\s)/,
-  source => [[
+  ({ source }) => [[
     html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
   ], '']));
 

package/src/parser/block.ts

@@ -57,9 +57,9 @@ export const block: BlockParser = creation(error(
 
 function error(parser: BlockParser): BlockParser {
   return recover<BlockParser>(fallback(
-    open('\x07', source => { throw new Error(source.split('\n', 1)[0]); }),
+    open('\x07', ({source}) => { throw new Error(source.split('\n', 1)[0]); }),
     parser),
-    (source, { id }, reason) => [[
+    ({ source, context: { id } }, reason) => [[
       html('h1',
         {
           id: id !== '' ? `error:${rnd0Z(8)}` : undefined,

package/src/parser/context.ts

@@ -23,10 +23,19 @@ export const enum State {
   link = 1 << 2,
   media = 1 << 1,
   autolink = 1 << 0,
+  none = 0,
+  linkable = 0
+    | State.annotation
+    | State.reference
+    | State.index
+    | State.label
+    | State.link
+    | State.media
+    | State.autolink,
+  backtrackable = 0
+    | State.annotation
+    | State.reference
+    | State.index
+    | State.link
+    | State.media,
 }
-export const backtrackable = 0
-  | State.annotation
-  | State.reference
-  | State.index
-  | State.link
-  | State.media;

package/src/parser/header.test.ts

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

package/src/parser/header.ts

@@ -9,7 +9,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
   /^---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/,
   inits([
     rewrite(
-      (source, context) =>
+      ({ source, context }) =>
         [[], context.header ?? true ? source.slice(segment(source).next().value!.length) : ''],
       block(
         union([
@@ -27,7 +27,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
                   ])),
                 ]),
               ])))),
-          source => [[
+          ({ source }) => [[
             html('pre', {
               class: 'invalid',
               translate: 'no',
@@ -40,7 +40,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
     clear(str(/^[^\S\v\f\r\n]*\r?\n/)),
   ])));
 
-const field: MarkdownParser.HeaderParser.FieldParser = line(source => {
+const field: MarkdownParser.HeaderParser.FieldParser = line(({ source }) => {
   const name = source.slice(0, source.indexOf(':'));
   const value = source.slice(name.length + 1).trim();
   return [[

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

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

package/src/parser/inline/annotation.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { AnnotationParser } from '../inline';
-import { union, some, context, syntax, constraint, state, surround, lazy } from '../../combinator';
+import { union, some, context, syntax, constraint, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { Syntax, State } from '../context';
 import { startLoose, trimNode } from '../visibility';
@@ -9,11 +9,10 @@ import { html, defrag } from 'typed-dom/dom';
 export const annotation: AnnotationParser = lazy(() => surround(
   '((',
   constraint(State.annotation, false,
-  state(State.annotation | State.media,
-  syntax(Syntax.annotation, 6, 1,
+  syntax(Syntax.annotation, 6, 1, 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]));

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

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

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

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

package/src/parser/inline/autolink/channel.test.ts

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

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

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

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

@@ -8,4 +8,4 @@ import { html } from 'typed-dom/dom';
 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)], '']));
+  ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));

package/src/parser/inline/autolink/hashnum.test.ts

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

package/src/parser/inline/autolink/hashtag.test.ts

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

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

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

package/src/parser/inline/autolink.ts

@@ -14,7 +14,7 @@ import { stringify } from '../util';
 export const autolink: AutolinkParser = fmap(
   validate(/^(?:[@#>0-9A-Za-z]|\S[#>])/,
   constraint(State.autolink, false,
-  syntax(Syntax.autolink, 1, 1,
+  syntax(Syntax.autolink, 1, 1, State.none,
   some(union([
     url,
     email,

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

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

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 { Syntax } from '../context';
+import { Syntax, State } 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(Syntax.none, 2, 1, str(index)), str(')')),
-  surround(str('('), syntax(Syntax.bracket, 2, 1, some(inline, ')', [[')', 2]])), str(')'), true,
+  surround(str('('), syntax(Syntax.none, 2, 1, State.none, str(index)), str(')')),
+  surround(str('('), syntax(Syntax.bracket, 2, 1, State.none, 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(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,
+  surround(str('（'), syntax(Syntax.none, 2, 1, State.none, 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, State.none, 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(Syntax.bracket, 2, 1, some(inline, ']', [[']', 2]])), str(']'), true,
+  surround(str('['), syntax(Syntax.bracket, 2, 1, State.none, some(inline, ']', [[']', 2]])), str(']'), true,
     undefined,
     ([as, bs = []], rest) => [unshift([''], unshift(as, bs)), rest]),
-  surround(str('{'), syntax(Syntax.bracket, 2, 1, some(inline, '}', [['}', 2]])), str('}'), true,
+  surround(str('{'), syntax(Syntax.bracket, 2, 1, State.none, 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(Syntax.quote, 8, 1, some(inline, '"', [['"', 8]])), str('"'), true,
+  surround(str('"'), syntax(Syntax.quote, 8, 1, State.none, some(inline, '"', [['"', 8]])), str('"'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));

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

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

package/src/parser/inline/code.ts

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

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

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