securemark 0.290.2 → 0.291.0

package/markdown.d.ts

@@ -723,7 +723,7 @@ export namespace MarkdownParser {
         // [#index]
         // [#index|signature]
         Inline<'extension/index'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLElement, Context, [
           InlineParser,
           IndexParser.SignatureParser,
         ]> {
@@ -736,21 +736,10 @@ export namespace MarkdownParser {
           ]> {
         }
         export namespace SignatureParser {
-          export interface BracketParser extends
-            Inline<'extension/index/signature/bracket'>,
+          export interface InternalParser extends
+            Inline<'extension/index/signature/internal'>,
             Parser<string, Context, [
-              Parser<string, Context, [
-                BracketParser,
-                SourceParser.TxtParser,
-              ]>,
-              Parser<string, Context, [
-                BracketParser,
-                SourceParser.TxtParser,
-              ]>,
-              Parser<string, Context, [
-                BracketParser,
-                SourceParser.TxtParser,
-              ]>,
+              UnsafeHTMLEntityParser,
               SourceParser.TxtParser,
             ]> {
           }
@@ -933,7 +922,6 @@ export namespace MarkdownParser {
         export interface OptionParser extends
           Inline<'media/parameter/option'>,
           Parser<string, Context, [
-            SourceParser.StrParser,
             SourceParser.StrParser,
             LinkParser.ParameterParser.OptionParser,
           ]> {
@@ -982,6 +970,7 @@ export namespace MarkdownParser {
         Inline<'html/attribute'>,
         Parser<string, Context, [
           SourceParser.StrParser,
+          SourceParser.StrParser,
         ]> {
       }
     }
@@ -1057,7 +1046,7 @@ export namespace MarkdownParser {
         MathParser.BracketParser,
         Parser<string, Context, [
           MathParser.BracketParser,
-          SourceParser.UnescapableSourceParser,
+          SourceParser.EscapableSourceParser,
         ]>,
       ]> {
     }

package/package.json

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

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

@@ -1,4 +1,5 @@
 import { Parser, Input, Result, Ctx, Node, Context, SubParsers, SubNode, IntermediateParser, eval, exec, check } from '../../data/parser';
+import { consume } from '../../../combinator';
 import { unshift, push } from 'spica/array';
 
 export function surround<P extends Parser<unknown>, S = string>(
@@ -50,21 +51,21 @@ export function surround<N>(
     const sme_ = source;
     if (sme_ === '') return;
     const { linebreak } = context;
-    context.linebreak = undefined;
+    context.linebreak = 0;
     const resultS = opener({ source: sme_, context });
     assert(check(sme_, resultS, false));
     if (resultS === undefined) return void revert(context, linebreak);
     const nodesS = eval(resultS);
     const me_ = exec(resultS);
-    if (getBacktrack(context, backtracks, sme_, sme_.length - me_.length)) return void revert(context, linebreak);
+    if (isBacktrack(context, backtracks, sme_, sme_.length - me_.length)) return void revert(context, linebreak);
     const resultM = me_ !== '' ? parser({ source: me_, context }) : undefined;
     assert(check(me_, resultM));
     const nodesM = eval(resultM);
-    const e_ = exec(resultM, me_);
+    const e_ = exec(resultM) ?? me_;
     const resultE = nodesM || optional ? closer({ source: e_, context }) : undefined;
     assert(check(e_, resultE, false));
     const nodesE = eval(resultE);
-    const rest = exec(resultE, e_);
+    const rest = exec(resultE) ?? e_;
     nodesE || setBacktrack(context, backtracks, sme_.length);
     if (!nodesM && !optional) return void revert(context, linebreak);
     if (rest.length === sme_.length) return void revert(context, linebreak);
@@ -81,7 +82,7 @@ export function surround<N>(
         ? g([nodesS, nodesM!, me_], rest, context)
         : undefined;
     if (result) {
-      context.linebreak ??= linebreak;
+      context.linebreak ||= linebreak;
     }
     else {
       revert(context, linebreak);
@@ -119,16 +120,18 @@ export function close<N>(
 }
 
 const statesize = 2;
-export function getBacktrack(
+export function isBacktrack(
   context: Ctx,
   backtracks: readonly number[],
   source: string,
   length: number = 1,
 ): boolean {
-  if (length > 0) for (const backtrack of backtracks) {
+  if (length === 0 || source.length === 0) return false;
+  for (const backtrack of backtracks) {
     if (backtrack & 1) {
       const { backtracks = {}, offset = 0 } = context;
       for (let i = 0; i < length; ++i) {
+        assert(i < source.length);
         if (source[i] !== source[0]) break;
         const pos = source.length - i + offset - 1;
         assert(pos >= 0);
@@ -145,8 +148,9 @@ export function setBacktrack(
   position: number,
   length: number = 1,
 ): void {
-  if (length > 0) for (const backtrack of backtracks) {
-    if (backtrack & 2) {
+  if (length === 0 || position === 0) return;
+  for (const backtrack of backtracks) {
+    if (backtrack & 2 && position !== 0) {
       const { backtracks = {}, offset = 0 } = context;
       for (let i = 0; i < length; ++i) {
         const pos = position - i + offset - 1;
@@ -162,11 +166,11 @@ function match(pattern: string | RegExp): (input: Input) => [never[], string] |
     case 'string':
       return ({ source }) => source.slice(0, pattern.length) === pattern ? [[], source.slice(pattern.length)] : undefined;
     case 'object':
-      return ({ source }) => {
+      return ({ source, context }) => {
         const m = source.match(pattern);
-        return m
-          ? [[], source.slice(m[0].length)]
-          : undefined;
+        if (m === null) return;
+        consume(m[0].length, context);
+        return [[], source.slice(m[0].length)];
       };
   }
 }

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

@@ -38,11 +38,11 @@ export class Delimiters {
         return source => pattern.test(source) || undefined;
     }
   }
-  private readonly heap: Record<number, Delimiter[]> = {};
+  private readonly tree: Record<number, Delimiter[]> = {};
   private readonly map: Map<string, Delimiter[]> = new Map();
   private registry(signature: number | string): Delimiter[] {
     if (typeof signature === 'number') {
-      return this.heap[signature] ??= [];
+      return this.tree[signature] ??= [];
     }
     else {
       const ds = this.map.get(signature);

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

@@ -50,7 +50,8 @@ function apply<N>(parser: Parser<N>, source: string, context: Ctx, changes: read
     switch (prop) {
       case 'resources':
         assert(reset);
-        break;
+        // プロトタイプに戻ることで戻す
+        continue;
     }
     context[prop] = values[i];
     values[i] = undefined;
@@ -135,11 +136,11 @@ export function state<N>(state: number, positive: boolean | Parser<N>, parser?:
 }
 
 export function constraint<P extends Parser<unknown>>(state: number, parser: P): P;
-export function constraint<P extends Parser<unknown>>(state: number, positive: boolean, parser: P): P;
+//export function constraint<P extends Parser<unknown>>(state: number, positive: boolean, parser: P): P;
 export function constraint<N>(state: number, positive: boolean | Parser<N>, parser?: Parser<N>): Parser<N> {
   if (typeof positive === 'function') {
     parser = positive;
-    positive = true;
+    positive = false;
   }
   assert(state);
   assert(parser = parser!);

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

@@ -6,7 +6,7 @@ type DelimiterOption = readonly [delimiter: string | RegExp, precedence: number,
 
 export function some<P extends Parser<unknown>>(parser: P, limit?: number): P;
 export function some<P extends Parser<unknown>>(parser: P, end?: string | RegExp, delimiters?: readonly DelimiterOption[], limit?: number): P;
-export function some<N>(parser: Parser<N>, end?: string | RegExp | number, delimiters: readonly DelimiterOption[] = [], limit = -1): Parser<N> {
+export function some<N>(parser: Parser<N>, end?: string | RegExp | number, delimiters: readonly DelimiterOption[] = [], limit = 0): Parser<N> {
   if (typeof end === 'number') return some(parser, undefined, delimiters, end);
   assert(parser);
   assert([end].concat(delimiters.map(o => o[0])).every(d => d instanceof RegExp ? !d.flags.match(/[gmy]/) && d.source.startsWith('^') : true));
@@ -31,7 +31,7 @@ export function some<N>(parser: Parser<N>, end?: string | RegExp | number, delim
       if (match(rest)) break;
       if (context.delimiters?.match(rest, context)) break;
       const result = parser({ source: rest, context });
-      assert.doesNotThrow(() => limit < 0 && check(rest, result));
+      assert.doesNotThrow(() => limit === 0 && check(rest, result));
       if (result === undefined) break;
       nodes = nodes
         ? nodes.length < eval(result).length / 8
@@ -39,7 +39,7 @@ export function some<N>(parser: Parser<N>, end?: string | RegExp | number, delim
           : push(nodes, eval(result))
         : eval(result);
       rest = exec(result);
-      if (limit >= 0 && source.length - rest.length > limit) break;
+      if (limit > 0 && source.length - rest.length > limit) break;
     }
     if (delims.length > 0) {
       context.delimiters!.pop(delims.length);

package/src/combinator/data/parser.ts

@@ -19,7 +19,9 @@ export interface Ctx {
   precedence?: number;
   delimiters?: Delimiters;
   state?: number;
-  depth?: number;
+  // Objectの内部実装を利用する。
+  // 探索木を直接使用する場合は探索速度が重要で挿入は相対的に少なく削除は不要かつ不確実であるため
+  // AVL木が適当と思われる。
   backtracks?: Record<number, number>;
   linebreak?: number;
   recent?: string[];
@@ -42,8 +44,8 @@ function eval_<N>(result: Result<N>, default_?: N[]): N[] | undefined {
     : default_;
 }
 
-export function exec(result: NonNullable<Result<unknown>>, default_?: string): string;
-export function exec(result: Result<unknown>, default_: string): string
+export function exec(result: NonNullable<Result<unknown>>, default_?: ''): string;
+export function exec(result: Result<unknown>, default_: ''): string
 export function exec(result: Result<unknown>, default_?: undefined): string | undefined;
 export function exec(result: Result<unknown>, default_?: string): string | undefined {
   return result

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

@@ -288,44 +288,47 @@ describe('Unit: parser/api/parse', () => {
 
     it('recursion', () => {
       assert.deepStrictEqual(
-        [...parse(`${'{'.repeat(20)}a`).children].map(el => el.outerHTML),
-        [`<p>${'{'.repeat(20)}a</p>`]);
+        [...parse(`${'{'.repeat(20)}0`).children].map(el => el.outerHTML),
+        [`<p>${'{'.repeat(20)}0</p>`]);
       assert.deepStrictEqual(
-        [...parse(`${'{'.repeat(21)}a`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse(`${'{'.repeat(21)}0`).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)}a</pre>`,
+          `<pre class="error" translate="no">${'{'.repeat(21)}0</pre>`,
         ]);
       assert.deepStrictEqual(
-        [...parse(`${'('.repeat(20)}a`).children].map(el => el.outerHTML),
-        [`<p>${'('.repeat(20)}a</p>`]);
+        [...parse(`${'('.repeat(20)}0`).children].map(el => el.outerHTML),
+        [`<p>${'('.repeat(20)}0</p>`]);
       assert.deepStrictEqual(
-        [...parse(`${'('.repeat(21)}a`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse(`${'('.repeat(21)}0`).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)}a</pre>`,
+          `<pre class="error" translate="no">${'('.repeat(21)}0</pre>`,
         ]);
       assert.deepStrictEqual(
-        [...parse(`${'['.repeat(20)}a`).children].map(el => el.outerHTML),
-        [`<p>${'['.repeat(20)}a</p>`]);
+        [...parse(`${'['.repeat(20)}0`).children].map(el => el.outerHTML),
+        [`<p>${'['.repeat(20)}0</p>`]);
       assert.deepStrictEqual(
-        [...parse(`${'['.repeat(21)}a`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse(`${'['.repeat(21)}0`).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)}a</pre>`,
+          `<pre class="error" translate="no">${'['.repeat(21)}0</pre>`,
         ]);
-      assert.deepStrictEqual(
-        [...parse(`${'['.repeat(20)}\na`).children].map(el => el.outerHTML),
-        [`<p>${'['.repeat(20)}<br>a</p>`]);
     });
 
     it('recovery', () => {
       assert.deepStrictEqual(
-        [...parse(`${'{'.repeat(21)}\n\na`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse(`${'['.repeat(20)}0\n\n[a]`).children].map(el => el.outerHTML),
         [
-          `<h1 id="error:rnd" class="error">Error: Too much recursion</h1>`,
-          `<pre class="error" translate="no">${'{'.repeat(21)}\n</pre>`,
-          '<p>a</p>',
+          `<p>${'['.repeat(20)}0</p>`,
+          '<p>[a]</p>',
+        ]);
+      assert.deepStrictEqual(
+        [...parse(`${'['.repeat(21)}0\n\n[a]`).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)}0\n</pre>`,
+          '<p>[a]</p>',
         ]);
     });
 
@@ -350,22 +353,23 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack', function () {
       this.timeout(5000);
-      // 8n = template + link + annotation/reference + link + code + url + ruby + text
-      const source = `${'.'.repeat(0 + 0)}{{{((([[[\`http://[${'.'.repeat(12493)}`;
-      assert.deepStrictEqual(
-        [...parse(source).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
-        [`<p>${source}</p>`]);
+      // 最悪計算量での実行速度はCommonMarkの公式JS実装の32nに対して5倍遅い程度。
+      // 11n = link + link + template + annotation/reference + link +
+      //       code + signature * 2 + url/math + ruby + text
+      const source = `${'.'.repeat(6 + 0)}!{ !{!{{{((([[[\`[#.|$[${'.'.repeat(9082)}]]]]`;
+      assert.deepStrictEqual(
+        [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
+          .map(el => el.tagName),
+        ['P', 'OL']);
     });
 
     it('backtrack error', function () {
       this.timeout(5000);
-      const source = `${'.'.repeat(0 + 1)}{{{((([[[\`http://[${'.'.repeat(12493)}`;
+      const source = `${'.'.repeat(6 + 1)}!{ !{!{{{((([[[\`[#.|$[${'.'.repeat(9082)}]]]]`;
       assert.deepStrictEqual(
-        [...parse(source).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
-        [
-          '<h1 id="error:rnd" class="error">Error: Too many creations</h1>',
-          `<pre class="error" translate="no">${source.slice(0, 1000 - 3)}...</pre>`,
-        ]);
+        [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
+          .map(el => el.tagName),
+        ['H1', 'PRE']);
     });
 
   });

package/src/parser/block/dlist.ts

@@ -11,7 +11,7 @@ import { html, defrag } from 'typed-dom/dom';
 export const dlist: DListParser = lazy(() => block(fmap(validate(
   /^~[^\S\n]+(?=\S)/,
   some(inits([
-    state(State.annotation | State.reference | State.index | State.label | State.link | State.media,
+    state(State.annotation | State.reference | State.index | State.label | State.link,
     some(term)),
     some(desc),
   ]))),

package/src/parser/block/heading.ts

@@ -9,11 +9,11 @@ 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], ''])), false)));
+  some(line(({ source }) => [[source], ''])))));
 
 export const heading: HeadingParser = block(rewrite(segment,
   // その他の表示制御は各所のCSSで行う。
-  state(State.annotation | State.reference | State.index | State.label | State.link | State.media,
+  state(State.annotation | State.reference | State.index | State.label | State.link,
   line(indexee(fmap(union([
     open(
       str(/^##+/),

package/src/parser/block/mediablock.ts

@@ -15,9 +15,9 @@ export const mediablock: MediaBlockParser = block(validate(['[!', '!'], fmap(
       medialink,
       media,
       shortmedia,
-    ]), ({ source }) => [[html('div', [html('span', {
+    ]), ({ source }) => [[html('span', {
       class: 'invalid',
       ...invalid('mediablock', 'syntax', 'Not media syntax'),
-    }, source.replace('\n', ''))])], '']))),
+    }, source.replace('\n', ''))], '']))),
   ]),
   ns => [html('div', ns)])));

package/src/parser/block/pagebreak.ts

@@ -4,4 +4,4 @@ import { html } from 'typed-dom/dom';
 
 export const pagebreak: PagebreakParser = block(line(focus(
   /^={3,}[^\S\n]*(?:$|\n)/,
-  () => [[html('hr')], ''], false)));
+  () => [[html('hr')], ''])));

package/src/parser/block/reply.ts

@@ -16,6 +16,6 @@ export const reply: ReplyParser = block(validate(csyntax, fmap(
     quote,
     rewrite(
       some(anyline, delimiter),
-      visualize(lineable(some(inline), true))),
+      visualize(lineable(some(inline), 1))),
   ])),
   ns => [html('p', trimBlankNodeEnd(defrag(ns)))])));

package/src/parser/block.ts

@@ -1,6 +1,7 @@
 import { MarkdownParser } from '../../markdown';
 import { Recursion, Command } from './context';
 import { union, reset, open, fallback, recover } from '../combinator';
+import { MAX_SEGMENT_SIZE } from './segment';
 import { emptyline } from './source';
 import { pagebreak } from './block/pagebreak';
 import { heading } from './block/heading';
@@ -40,7 +41,8 @@ export import ParagraphParser = BlockParser.ParagraphParser;
 export const block: BlockParser = reset(
   {
     resources: {
-      clock: 100000,
+      // バックトラックのせいで文字数制限を受けないようにする。
+      clock: MAX_SEGMENT_SIZE * 11 + 1,
       recursions: [
         10 || Recursion.block,
         20 || Recursion.blockquote,

package/src/parser/header.ts

@@ -27,7 +27,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
                     ...es,
                   ])),
                 ]),
-              ]), false), false)),
+              ]), false))),
           ({ source }) => [[
             html('pre', {
               class: 'invalid',

package/src/parser/inline/annotation.ts

@@ -5,16 +5,15 @@ import { inline } from '../inline';
 import { trimBlankStart, trimBlankNodeEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
-export const annotation: AnnotationParser = lazy(() => constraint(State.annotation, false, surround(
+export const annotation: AnnotationParser = lazy(() => constraint(State.annotation, surround(
   '((',
-  precedence(1, state(State.annotation | State.media,
+  precedence(1, state(State.annotation,
   trimBlankStart(some(union([inline]), ')', [[')', 1]])))),
   '))',
   false,
   ([, ns], rest, context) =>
-    context.linebreak === undefined &&
-    trimBlankNodeEnd(ns).length > 0
-      ? [[html('sup', { class: 'annotation' }, [html('span', defrag(ns))])], rest]
+    context.linebreak === 0
+      ? [[html('sup', { class: 'annotation' }, [html('span', defrag(trimBlankNodeEnd(ns)))])], rest]
       : undefined,
   undefined,
   [3 | Backtrack.doublebracket, 1 | Backtrack.bracket])));

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

@@ -15,7 +15,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
       str(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i),
     ])),
   union([
-    constraint(State.autolink, false, state(State.autolink, fmap(convert(
+    constraint(State.autolink, state(State.autolink, fmap(convert(
       source =>
         `[${source}]{ ${source.includes('/')
           ? `https://${source.slice(1).replace('/', '/@')}`

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

@@ -18,7 +18,7 @@ export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>',
   focus(
     /^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i,
     union([
-      constraint(State.autolink, false, state(State.autolink, fmap(convert(
+      constraint(State.autolink, state(State.autolink, fmap(convert(
         source =>
           `[${source}]{ ${source.includes('/')
             ? `/@${source.slice(2).replace('/', '/timeline?at=')}`

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

@@ -9,7 +9,7 @@ import { define } from 'typed-dom/dom';
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 
 export const channel: AutolinkParser.ChannelParser = validate('@',
-  constraint(State.autolink, false, bind(
+  constraint(State.autolink, bind(
   sequence([
     account,
     some(hashtag),

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

@@ -16,7 +16,7 @@ export const email: AutolinkParser.EmailParser = rewrite(
     false, undefined, undefined,
     [3 | Backtrack.autolink]),
   union([
-    constraint(State.autolink, false, state(State.autolink,
+    constraint(State.autolink, state(State.autolink,
       ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], ''])),
     ({ source }) => [[source], ''],
   ]));

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

@@ -13,7 +13,7 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
       /^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji)/u.source,
     ].join('').replace(/emoji/, emoji), 'u'))),
   union([
-    constraint(State.autolink, false, state(State.autolink, fmap(convert(
+    constraint(State.autolink, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${source.slice(1)} }`,
       unsafelink,
       false),

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

@@ -20,7 +20,7 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
     false,
     [3 | Backtrack.autolink]),
   union([
-    constraint(State.autolink, false, state(State.autolink, fmap(convert(
+    constraint(State.autolink, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
       unsafelink,
       false),

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

@@ -21,6 +21,7 @@ describe('Unit: parser/inline/autolink/url', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('http://a')), [['<a class="url" href="http://a" target="_blank">http://a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://a/')), [['<a class="url" href="http://a/" target="_blank">http://a/</a>'], '']);
       assert.deepStrictEqual(inspect(parser('http://a:80')), [['<a class="url" href="http://a:80" target="_blank">http://a:80</a>'], '']);
       assert.deepStrictEqual(inspect(parser('http://a.b')), [['<a class="url" href="http://a.b" target="_blank">http://a.b</a>'], '']);
       assert.deepStrictEqual(inspect(parser(`http://a?#${encodeURIComponent(':/[]()<>?#=& ')}`)), [['<a class="url" href="http://a?#%3A%2F%5B%5D()%3C%3E%3F%23%3D%26%20" target="_blank">http://a?#%3A%2F[]()&lt;&gt;%3F%23%3D%26%20</a>'], '']);
@@ -55,13 +56,18 @@ describe('Unit: parser/inline/autolink/url', () => {
       assert.deepStrictEqual(inspect(parser('http://host=')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '=']);
       assert.deepStrictEqual(inspect(parser('http://host~')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '~']);
       assert.deepStrictEqual(inspect(parser('http://host^')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '^']);
+      assert.deepStrictEqual(inspect(parser('http://host_')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '_']);
+      assert.deepStrictEqual(inspect(parser('http://host/')), [['<a class="url" href="http://host/" target="_blank">http://host/</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host//')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '//']);
       assert.deepStrictEqual(inspect(parser(`http://host'`)), [['<a class="url" href="http://host\'" target="_blank">http://host\'</a>'], '']);
       assert.deepStrictEqual(inspect(parser('http://host"')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '"']);
       assert.deepStrictEqual(inspect(parser('http://host`')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '`']);
       assert.deepStrictEqual(inspect(parser('http://host|')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '|']);
       assert.deepStrictEqual(inspect(parser('http://host&')), [['<a class="url" href="http://host&amp;" target="_blank">http://host&amp;</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('http://host_')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '_']);
-      assert.deepStrictEqual(inspect(parser('http://host$')), [['<a class="url" href="http://host$" target="_blank">http://host$</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host$')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '$']);
+      assert.deepStrictEqual(inspect(parser('http://host#"$"')), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '"$"']);
+      assert.deepStrictEqual(inspect(parser('http://host#($)')), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '($)']);
+      assert.deepStrictEqual(inspect(parser('http://host#(($))')), [['<a class="url" href="http://host#" target="_blank">http://host#</a>'], '(($))']);
       assert.deepStrictEqual(inspect(parser('http://user@host')), [['<a class="url" href="http://user@host" target="_blank">http://user@host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('http://host#@')), [['<a class="url" href="http://host#@" target="_blank">http://host#@</a>'], '']);
       assert.deepStrictEqual(inspect(parser('http://host[')), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '[']);

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

@@ -4,19 +4,18 @@ import { union, tails, some, recursion, precedence, state, constraint, validate,
 import { unsafelink } from '../link';
 import { linebreak, unescsource, str } from '../../source';
 
-const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|[^\x21-\x7E]|$)/;
-
 export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'https://'], rewrite(
   open(
     /^https?:\/\/(?=[\x21-\x7E])/,
     precedence(1, some(union([
       verify(bracket, ns => ns.length > 0),
-      some(unescsource, closer),
-    ]), undefined, [[/^[^\x21-\x7E]/, 3]])),
+      // 再帰に注意
+      some(unescsource, /^[-+*=~^_/,.;:!?]{2}|^[-+*=~^_,.;:!?]?(?=[\\"`|\[\](){}<>]|[^\x21-\x7E]|$)/),
+    ]), undefined, [[/^[^\x21-\x7E]|^\$/, 9]])),
     false,
     [3 | Backtrack.autolink]),
   union([
-    constraint(State.autolink, false, state(State.autolink, convert(
+    constraint(State.autolink, state(State.autolink, convert(
       url => `{ ${url} }`,
       unsafelink,
       false))),
@@ -30,7 +29,7 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
     tails([
       str('!'),
       union([
-        constraint(State.autolink, false, state(State.autolink, convert(
+        constraint(State.autolink, state(State.autolink, convert(
           url => `{ ${url} }`,
           unsafelink,
           false))),

package/src/parser/inline/bracket.ts

@@ -1,7 +1,8 @@
 import { BracketParser } from '../inline';
-import { Recursion, Backtrack } from '../context';
-import { union, some, recursion, precedence, surround, lazy } from '../../combinator';
+import { State, Recursion, Backtrack } from '../context';
+import { union, some, recursion, precedence, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
 import { inline } from '../inline';
+import { textlink } from './link';
 import { str } from '../source';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
@@ -41,7 +42,28 @@ export const bracket: BracketParser = lazy(() => union([
     precedence(1, recursion(Recursion.bracket, some(inline, ']', [[']', 1]]))),
     str(']'),
     true,
-    undefined,
+    ([as, bs = [], cs], rest, context) => {
+      if (context.state! & State.link) {
+        const { recent } = context;
+        const head = recent!.reduce((a, b) => a + b.length, rest.length);
+        if (context.linebreak! > 0 || rest[0] !== '{') {
+          setBacktrack(context, [2 | Backtrack.link], head);
+        }
+        else {
+          context.state! ^= State.link;
+          assert(rest.length > 0);
+          const result = !isBacktrack(context, [1 | Backtrack.link], rest)
+            ? textlink({ source: rest, context })
+            : undefined;
+          if (!result) {
+            setBacktrack(context, [2 | Backtrack.link], head);
+          }
+          context.state! ^= State.link;
+          context.recent = recent;
+        }
+      }
+      return [push(unshift(as, bs), cs), rest];
+    },
     ([as, bs = []], rest) => [unshift(as, bs), rest],
     [2 | Backtrack.bracket]),
   surround(