securemark 0.259.0 → 0.260.0

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

@@ -1,17 +1,19 @@
 import { AutolinkParser } from '../../inline';
-import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy, fmap } from '../../../combinator';
 import { unsafelink } from '../link';
 import { unescsource } from '../../source';
+import { define } from 'typed-dom/dom';
 
 const closer = /^[-+*=~^,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 
-export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], rewrite(
+export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], fmap(rewrite(
   open(
     /^https?:\/\/(?=[\x21-\x7E])/,
     focus(/^[\x21-\x7E]+/, some(union([bracket, some(unescsource, closer)])))),
   convert(
     url => `{ ${url} }`,
-    union([unsafelink])))));
+    union([unsafelink]))),
+  ([el]) => [define(el, { class: 'url' })])));
 
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(precedence(2, union([
   surround('(', some(union([bracket, unescsource]), ')'), ')', true),

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);

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,18 +4,16 @@ 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>'], '']);
       assert.deepStrictEqual(inspect(parser('<script>alert()<script>')), [['<span class="invalid">&lt;script&gt;alert<span class="paren">()</span><span class="invalid">&lt;script&gt;</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('<script>alert()</script>')), [['<span class="invalid">&lt;script&gt;alert<span class="paren">()</span>&lt;/script&gt;</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('<script src="\\""></script>')), [['<span class="invalid">&lt;script src="\\""&gt;&lt;/script&gt;</span>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()">')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;</span>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()"></bdi>')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;&lt;/bdi&gt;</span>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi onclick="alert()">a</bdi>')), [['<span class="invalid">&lt;bdi onclick="alert()"&gt;a&lt;/bdi&gt;</span>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi><bdi onclick="alert()">a</bdi></bdi>')), [['<bdi><span class="invalid">&lt;bdi onclick="alert()"&gt;a&lt;/bdi&gt;</span></bdi>'], '']);
-      assert.deepStrictEqual(inspect(parser('<bdo dir="rtl\\"><">a</bdo>')), [['<span class="invalid">&lt;bdo dir="rtl\\"&gt;&lt;"&gt;a&lt;/bdo&gt;</span>'], '']);
     });
 
     it('invalid', () => {

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')], '']),
@@ -64,7 +64,7 @@ export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^
 ])))));
 
 export const attribute: HTMLParser.AttributeParser = union([
-  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/i),
+  str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),
 ]);
 
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Element

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),