securemark 0.294.9 → 0.294.11

package/markdown.d.ts

@@ -1112,7 +1112,7 @@ export namespace MarkdownParser {
             SourceParser.StrParser,
             Parser<string | HTMLElement, Context, [
               Parser<HTMLAnchorElement, Context, []>,
-              InlineParser,
+              SourceParser.StrParser,
             ]>,
           ]> {
         }

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { Parser, List, Ctx, Context, subinput, failsafe } from '../../data/parser';
 
-export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, continuous: boolean, empty?: boolean): P;
-export function convert<N>(conv: (source: string, context: Ctx) => string, parser: Parser<N>, continuous: boolean, empty = false): Parser<N> {
+export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, empty?: boolean): P;
+export function convert<N>(conv: (source: string, context: Ctx) => string, parser: Parser<N>, empty = false): Parser<N> {
   assert(parser);
   return failsafe(input => {
     const { context } = input;
@@ -14,22 +14,12 @@ export function convert<N>(conv: (source: string, context: Ctx) => string, parse
       context.position = source.length;
       return new List();
     }
-    assert(source.endsWith(src) || src.endsWith(source, position) || !continuous);
-    if (continuous) {
-      context.position += source.length - position - src.length;
-      const result = parser(input);
-      assert(context.position > position || !result);
-      context.source = source;
-      return result;
-    }
-    else {
-      const { offset, backtracks } = context;
-      const result = parser(subinput(src, context));
-      context.position = context.source.length
-      assert(context.offset === offset);
-      assert(context.source === source);
-      assert(context.backtracks === backtracks);
-      return result;
-    }
+    const { offset, backtracks } = context;
+    const result = parser(subinput(src, context));
+    context.position = context.source.length
+    assert(context.offset === offset);
+    assert(context.source === source);
+    assert(context.backtracks === backtracks);
+    return result;
   });
 }

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

@@ -1,17 +1,24 @@
 import { Parser, Context, input, failsafe } from '../../data/parser';
 import { matcher } from '../../../combinator';
 
-export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P): P;
-export function focus<N>(scope: string | RegExp, parser: Parser<N>): Parser<N> {
+export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P, slice?: boolean): P;
+export function focus<N>(scope: string | RegExp, parser: Parser<N>, slice = true): Parser<N> {
   assert(parser);
   const match = matcher(scope, false);
-  return failsafe(({ context }) => {
+  return failsafe(arg => {
+    const { context } = arg;
     const { source, position } = context;
     if (position === source.length) return;
     const src = match({ context })?.head?.value ?? '';
     assert(source.startsWith(src, position));
     if (src === '') return;
-    context.range = src.length;
+    const range = context.range = src.length;
+    if (!slice) {
+      const result = parser(arg);
+      context.position += result && context.position === position ? range : 0;
+      assert(context.position > position || !result);
+      return result;
+    }
     context.offset ??= 0;
     context.offset += position;
     const result = parser(input(src, context));
@@ -25,16 +32,25 @@ export function focus<N>(scope: string | RegExp, parser: Parser<N>): Parser<N> {
 }
 
 //export function rewrite<N, C extends Ctx, D extends Parser<unknown, C>[]>(scope: Parser<unknown, C, D>, parser: Parser<N, C, never>): Parser<N, C, D>;
-export function rewrite<P extends Parser<unknown>>(scope: Parser<unknown, Context<P>>, parser: P): P;
-export function rewrite<N>(scope: Parser<unknown>, parser: Parser<N>): Parser<N> {
+export function rewrite<P extends Parser<unknown>>(scope: Parser<unknown, Context<P>>, parser: P, slice?: boolean): P;
+export function rewrite<N>(scope: Parser<unknown>, parser: Parser<N>, slice = true): Parser<N> {
   assert(scope);
   assert(parser);
-  return failsafe(({ context }) => {
+  return failsafe(arg => {
+    const { context } = arg;
     const { source, position } = context;
     if (position === source.length) return;
     const res1 = scope({ context });
     assert(context.position > position || !res1);
     if (res1 === undefined || context.position < position) return;
+    const range = context.range = context.position - position;
+    if (!slice) {
+      context.position = position;
+      const res2 = parser(arg);
+      context.position += res2 && context.position === position ? range : 0;
+      assert(context.position > position || !res2);
+      return res2;
+    }
     const src = source.slice(position, context.position);
     assert(src !== '');
     assert(source.startsWith(src, position));

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

@@ -13,7 +13,7 @@ describe('Unit: parser/api/body', () => {
       assert.deepStrictEqual(body('---\na: b\n---\n\n'), '');
       assert.deepStrictEqual(body('---\na: b\n---\n\n\n'), '\n');
       assert.deepStrictEqual(body('---\na: b\n---\n\n\na'), '\na');
-      assert.deepStrictEqual(body('--- \r\na: b \r\n--- \r\n \r\n \r\na'), ' \r\na');
+      //assert.deepStrictEqual(body('--- \r\na: b \r\n--- \r\n \r\n \r\na'), ' \r\na');
     });
 
   });

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

@@ -13,13 +13,13 @@ describe('Unit: parser/api/header', () => {
       assert.deepStrictEqual(headers('---\na: b\n---\nc'), []);
       assert.deepStrictEqual(headers('---\r \na: b\n---'), []);
       assert.deepStrictEqual(headers('---\na:\rb\n---'), []);
-      assert.deepStrictEqual(headers('---\na: b\r \n---'), []);
+      //assert.deepStrictEqual(headers('---\na: b\r \n---'), []);
       assert.deepStrictEqual(headers('---\n\n---'), []);
       assert.deepStrictEqual(headers('---\n \n---'), []);
       assert.deepStrictEqual(headers('---\n-\n---'), []);
       assert.deepStrictEqual(headers('---\na: b\n---'), ['a: b']);
       assert.deepStrictEqual(headers('---\na: b\nC: D e\n---\n'), ['a: b', 'C: D e']);
-      assert.deepStrictEqual(headers('--- \r\na: b \r\n--- \r\n \r\n'), ['a: b']);
+      //assert.deepStrictEqual(headers('--- \r\na: b \r\n--- \r\n \r\n'), ['a: b']);
     });
 
   });

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

@@ -6,6 +6,8 @@ describe('Unit: parser/normalize', () => {
       assert(normalize('\r') === '\n');
       assert(normalize('\r\n') === '\n');
       assert(normalize('\n\r') === '\n\n');
+      assert(normalize('\u2028') === '\n');
+      assert(normalize('\u2029') === '\n');
       assert(normalize('\x00') === '\uFFFD');
       assert(normalize('\x01') === '\uFFFD');
       assert(normalize('\x02') === '\uFFFD');

package/src/parser/api/normalize.ts

@@ -9,7 +9,7 @@ export function normalize(source: string): string {
 }
 
 function format(source: string): string {
-  return source.replace(/\r\n?/g, '\n');
+  return source.replace(/\r\n?|[\u2028\u2029]/g, '\n');
 }
 
 const invalid = new RegExp([

package/src/parser/block/blockquote.ts

@@ -25,10 +25,10 @@ const source: BlockquoteParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.blockquote, union([
     rewrite(
       indent,
-      convert(unindent, source, false, true)),
+      convert(unindent, source, true)),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(autolink, ns => new List([new Data(html('pre', defrag(unwrap(ns))))])), false, true)),
+      convert(unindent, fmap(autolink, ns => new List([new Data(html('pre', defrag(unwrap(ns))))])), true)),
   ]))),
   ns => new List([new Data(html('blockquote', unwrap(ns)))])));
 
@@ -36,7 +36,7 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
   some(recursion(Recursion.blockquote, union([
     rewrite(
       indent,
-      convert(unindent, markdown, false, true)),
+      convert(unindent, markdown, true)),
     rewrite(
       some(contentline, opener),
       convert(unindent, ({ context }) => {
@@ -51,6 +51,6 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
         }, context);
         context.position = source.length;
         return new List([new Data(html('section', [document, html('h2', 'References'), references]))]);
-      }, false, true)),
+      }, true)),
   ]))),
   ns => new List([new Data(html('blockquote', unwrap(ns)))])));

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

@@ -28,7 +28,7 @@ export const segment: FigParser.SegmentParser = block(
 export const fig: FigParser = block(rewrite(segment, verify(convert(
   (source, context) => {
     // Bug: TypeScript
-    const fence = (/^[^\n]*\n!?>+ /.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) as string[] || [])
+    const fence = (/^[^\n]*\n!?>+ /.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/gm) as string[] || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
     const { position } = context;
     const result = parser({ context });
@@ -37,8 +37,7 @@ export const fig: FigParser = block(rewrite(segment, verify(convert(
       ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
       : `${fence}figure ${source}\n\n${fence}`;
   },
-  union([figure]),
-  false),
+  union([figure])),
   ([{ value: el }]) => el.tagName === 'FIGURE')));
 
 const parser = sequence([

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

@@ -67,7 +67,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
       emptyline,
       block(visualize(trimBlank(some(inline)))),
     ]),
-  ]), false),
+  ])),
   nodes => {
     const [label, param, content, ...caption] = unwrap(nodes) as [HTMLAnchorElement, string, ...HTMLElement[]];
     return new List([

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

@@ -133,8 +133,8 @@ const dataline: CellParser.DatalineParser = line(
   rewrite(
     contentline,
     union([
-      validate(/!+ /y, convert(source => `:${source}`, data, false)),
-      convert(source => `: ${source}`, data, false),
+      validate(/!+ /y, convert(source => `:${source}`, data)),
+      convert(source => `: ${source}`, data),
     ])));
 
 function attributes(source: string): Record<string, string | undefined> {

package/src/parser/block/heading.ts

@@ -12,15 +12,15 @@ export const segment: HeadingParser.SegmentParser = block(focus(
   /#+ +\S[^\n]*(?:\n#+(?=$|[ \n])[^\n]*)*(?:$|\n)/y,
   input => {
     const { context } = input;
-    const { source } = context;
+    const { source, range = 0 } = context;
     const acc = new List<Data<string>>();
-    for (; context.position < source.length;) {
+    for (const len = context.position + range; context.position < len;) {
       const line = firstline(source, context.position);
       acc.push(new Data(line));
       context.position += line.length;
     }
     return acc;
-  }));
+  }, false));
 
 export const heading: HeadingParser = block(rewrite(segment,
   // その他の表示制御は各所のCSSで行う。

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

@@ -23,7 +23,7 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('a\\\n'), ctx), [['<p>a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\nb'), ctx), [['<p>a<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a&NewLine;b'), ctx), [['<p>a b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('&Tab;&NewLine;'), ctx), [['<p>&amp;NewLine;</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('&Tab;&NewLine;'), ctx), [['<p>&amp;Tab;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>'), ctx), [['<p>&lt;wbr&gt;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>\n'), ctx), [['<p>&lt;wbr&gt;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>\na'), ctx), [['<p>&lt;wbr&gt;<br>a</p>'], '']);

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

@@ -13,15 +13,13 @@ export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(
   rewrite(
     some(validate(syntax, anyline)),
     convert(
-      // TODO: インデント数を渡してインデント数前の行頭確認を行う実装に置き換える
-      source => source.replace(/(?<=^>+ )/mg, '\r'),
+      source => source.replace(/(?<=^>+ )/gm, '\r'),
       some(union([
         // quote補助関数が残した数式をパースする。
         math,
         autolink,
         unescsource,
-      ])),
-      false)),
+      ])))),
   (ns, { source, position }) => new List([
     new Data(source[position - 1] === '\n' ? ns.pop()!.value as HTMLBRElement : html('br')),
     new Data(html('span', { class: 'quote' }, defrag(unwrap(ns)))),

package/src/parser/block/sidefence.ts

@@ -24,9 +24,9 @@ const source: SidefenceParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.block, union([
     focus(
       /(?:\|\|+(?=$|[ \n])[^\n]*(?:$|\n))+/y,
-      convert(unindent, source, false, true)),
+      convert(unindent, source, true)),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(autolink, ns => new List([new Data(html('pre', defrag(unwrap(ns))))])), false, true)),
+      convert(unindent, fmap(autolink, ns => new List([new Data(html('pre', defrag(unwrap(ns))))])), true)),
   ]))),
   ns => new List([new Data(html('blockquote', unwrap(ns)))])));

package/src/parser/block/table.ts

@@ -40,10 +40,10 @@ const row = <P extends CellParser | AlignParser>(parser: P, optional: boolean):
 const align: AlignParser = fmap(open(
   '|',
   union([
-    focus(/:-+:?/y, ({ context: { source } }) =>
-      new List([new Data(source.at(-1) === ':' ? 'center' : 'start')])),
-    focus(/-+:?/y, ({ context: { source } }) =>
-      new List([new Data(source.at(-1) === ':' ? 'end' : '')])),
+    focus(/:-+:?/y, ({ context: { source, position, range = 0 } }) =>
+      new List([new Data(source[position + range - 1] === ':' ? 'center' : 'start')]), false),
+    focus(/-+:?/y, ({ context: { source, position, range = 0 } }) =>
+      new List([new Data(source[position + range - 1] === ':' ? 'end' : '')]), false),
   ])),
   ns => new List([new Data(html('td', defrag(unwrap(ns))))]));
 

package/src/parser/block/ulist.ts

@@ -31,9 +31,9 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
 
 export const checkbox = focus(
   /\[[xX ]\](?=$|[ \n])/y,
-  ({ context: { source } }) => new List([
-    new Data(html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐')),
-  ]));
+  ({ context: { source, position } }) => new List([
+    new Data(html('span', { class: 'checkbox' }, source[position + 1].trimStart() ? '☑' : '☐')),
+  ]), false);
 
 export function fillFirstLine(nodes: List<Data<string | HTMLElement>>): List<Data<string | HTMLElement>> {
   const node = nodes.head?.value;

package/src/parser/context.ts

@@ -28,12 +28,15 @@ export const enum Recursion {
 }
 
 export const enum Backtrack {
-  bracket = 1 << 6,
-  doublebracket = 1 << 5,
-  link = 1 << 4,
-  ruby = 1 << 3,
-  escbracket = 1 << 2,
-  autolink = 0 << 2,
+  // 構文
+  doublebracket = 1 << 6,
+  link = 1 << 5,
+  ruby = 1 << 4,
+  // 特殊構造
+  escapable = 1 << 3,
+  unescapable = 1 << 2,
+  // 共通構造
+  common = 0 << 2,
 }
 
 export const enum Command {

package/src/parser/header.test.ts

@@ -17,7 +17,7 @@ describe('Unit: parser/header', () => {
       assert.deepStrictEqual(inspect(parser('---\na: b\n---\nc'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('---\r \na: b\n---'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('---\na:\rb\n---'), ctx), [['<pre class="invalid" translate="no">---\na:\nb\n---</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('---\na: b\r \n---'), ctx), [['<pre class="invalid" translate="no">---\na: b\n \n---</pre>'], '']);
+      //assert.deepStrictEqual(inspect(parser('---\na: b\r \n---'), ctx), [['<pre class="invalid" translate="no">---\na: b\n \n---</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('---\n\n---'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('---\n \n---'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('---\n-\n---'), ctx), [['<pre class="invalid" translate="no">---\n-\n---</pre>'], '']);
@@ -30,7 +30,7 @@ describe('Unit: parser/header', () => {
       assert.deepStrictEqual(inspect(parser('---\na: b\n---'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('---\na: b\n---\n'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('---\na: b\nC: D e\n---\n'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span><span class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span>\n</span></details></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser('--- \r\na: b \r\n--- \r\n \r\n \r\na'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], ' \r\na']);
+      //assert.deepStrictEqual(inspect(parser('--- \r\na: b \r\n--- \r\n \r\n \r\na'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], ' \r\na']);
       assert.deepStrictEqual(inspect(parser('----\na: b\n----'), ctx), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
     });
 

package/src/parser/header.ts

@@ -7,14 +7,14 @@ import { normalize } from './api/normalize';
 import { html, defrag } from 'typed-dom/dom';
 
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
-  /---+ *\r?\n(?=\S)/y,
+  /---+ *\n(?=\S)/y,
   inits([
     block(
       union([
         validate(({ context }) => context.header ?? true,
-        focus(/(---+) *\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1 *(?:$|\r?\n)/y,
+        focus(/(---+) *\n(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*:[ \t]+\S[^\n]*\n){1,100}\1 *(?:$|\n)/y,
         convert(source =>
-          normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'),
+          normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))),
           fmap(
             some(union([field])),
             ns => new List([
@@ -23,7 +23,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
                   { open: '' },
                   defrag(unwrap(ns.unshift(new Data(html('summary', 'Header'))) && ns))),
               ])),
-            ])), false))),
+            ]))))),
         ({ context }) => {
           const { source, position } = context;
           context.position += source.length;
@@ -36,7 +36,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
           ]);
         },
       ])),
-    clear(str(/ *\r?\n/y)),
+    clear(str(/ *\n/y)),
   ])));
 
 const field: MarkdownParser.HeaderParser.FieldParser = line(({ context: { source, position } }) => {

package/src/parser/inline/annotation.ts

@@ -13,7 +13,7 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
   trimBlankStart(some(union([inline]), ')', [[')', 1]])))),
   '))',
   false,
-  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket],
+  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
   ([, ns], context) =>
     context.linebreak === 0
       ? new List([new Data(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))])

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { some, state, constraint, verify, surround, lazy } from '../../../combinator';
+import { some, state, constraint, verify, surround, setBacktrack, lazy } from '../../../combinator';
 import { parse } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
@@ -17,7 +17,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => constraint(State
       str(/[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}\/|/yi),
       str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi),
       false,
-      [3 | Backtrack.autolink]),
+      [3 | Backtrack.unescapable]),
     some(surround(
       '#',
       verify(
@@ -29,7 +29,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => constraint(State
         /(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
       ].join('|').replace(/emoji/g, emoji.source), 'yu'),
       false,
-      [3 | Backtrack.autolink])),
+      [3 | Backtrack.unescapable])),
     '',
     false, [],
     ([[{ value: host }, { value: account }], nodes], context) => {
@@ -45,7 +45,10 @@ export const account: AutolinkParser.AccountParser = lazy(() => constraint(State
       ]);
     },
     ([[{ value: host }, { value: account }]], context) => {
-      if (context.source[context.position] === '#') return;
+      if (context.source[context.position] === '#') {
+        assert(context.source[context.position - context.range!] === '@');
+        return void setBacktrack(context, [2 | Backtrack.unescapable], context.position - context.range!);
+      }
       return new List([
         new Data(define(
           parse(

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

@@ -22,7 +22,7 @@ export const anchor: AutolinkParser.AnchorParser = lazy(() => constraint(State.a
     str(/[0-9a-z]+(?:-[0-9a-z]+)*(?!-?[0-9a-z@#]|>>|:\S)/yi),
     '',
     false,
-    [3 | Backtrack.autolink],
+    [3 | Backtrack.unescapable],
     ([, [{ value }]], context) =>
       new List([
         new Data(define(parse(

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

@@ -15,6 +15,6 @@ export const email: AutolinkParser.EmailParser = constraint(State.autolink, stat
       ([{ value }]) => value.length <= 254),
     '',
     false,
-    [3 | Backtrack.autolink],
+    [3 | Backtrack.unescapable],
     ([, [{ value }]]) =>
       new List([new Data(html('a', { class: 'email', href: `mailto:${value}` }, value))]))));

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

@@ -17,7 +17,7 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => constraint(State
     ].join('|').replace(/emoji/g, emoji.source), 'yu')),
     '',
     false,
-    [1 | Backtrack.autolink],
+    [1 | Backtrack.unescapable],
     ([, [{ value }]], context) =>
       new List([
         new Data(define(parse(

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

@@ -25,7 +25,7 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => constraint(State
       /(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
     ].join('|').replace(/emoji/g, emoji.source), 'yu'),
     false,
-    [3 | Backtrack.autolink],
+    [3 | Backtrack.unescapable],
     ([, [{ value }]], context) =>
       new List([
         new Data(define(parse(

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

@@ -14,7 +14,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
       precedence(1, verify(bracket, ns => ns.length > 0)),
     ]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])),
     false,
-    [3 | Backtrack.autolink]),
+    [3 | Backtrack.unescapable]),
   union([
     constraint(State.autolink, state(State.autolink, ({ context }) =>
       new List([new Data(parse(new List(), new List([new Data(context.source)]), context))]))),
@@ -27,27 +27,27 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
     str('!'),
     union([
       constraint(State.autolink, state(State.autolink, ({ context }) => {
-        const { source, position } = context;
-        context.position -= source[0] === '!' ? 1 : 0;
-        context.position += source.length;
+        const { source, position, range = 0 } = context;
+        context.position -= position > 0 && source[position - 1] === '!' ? 1 : 0;
+        context.position += range;
         return new List([
           new Data(parse(
             new List(),
-            new List([new Data(source.slice(position))]),
+            new List([new Data(source.slice(position, context.position))]),
             context))
         ]);
       })),
-      open(str(/[^:]+/y), some(inline)),
+      str(/[^:]+/y),
     ]),
-  ])));
+  ]), false));
 
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'),
-    true, [3 | Backtrack.autolink], undefined, () => new List()),
+    true, [3 | Backtrack.unescapable], undefined, () => new List()),
   surround(str('['), recursion(Recursion.terminal, some(union([bracket, unescsource]), ']')), str(']'),
-    true, [3 | Backtrack.autolink], undefined, () => new List()),
+    true, [3 | Backtrack.unescapable], undefined, () => new List()),
   surround(str('{'), recursion(Recursion.terminal, some(union([bracket, unescsource]), '}')), str('}'),
-    true, [3 | Backtrack.autolink], undefined, () => new List()),
+    true, [3 | Backtrack.unescapable], undefined, () => new List()),
   surround(str('"'), precedence(2, recursion(Recursion.terminal, some(unescsource, '"'))), str('"'),
-    true, [3 | Backtrack.autolink], undefined, () => new List()),
+    true, [3 | Backtrack.unescapable], undefined, () => new List()),
 ]));

package/src/parser/inline/bracket.ts

@@ -39,7 +39,7 @@ const p1 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
   str(')'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   ([as, bs = new List(), cs], { source, position, range = 0 }) => {
     const str = source.slice(position - range + 1, position - 1);
     return indexA.test(str)
@@ -53,7 +53,7 @@ const p2 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, '）', [['）', 1]]))),
   str('）'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   ([as, bs = [], cs], { source, position, range = 0 }) => {
     const str = source.slice(position - range + 1, position - 1);
     return indexF.test(str)
@@ -67,12 +67,15 @@ const s1 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, ']', [[']', 1]]))),
   str(']'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   ([as, bs = new List(), cs], context) => {
     if (context.state! & State.link) {
       const { source, position, range = 0 } = context;
       const head = position - range;
-      if (context.linebreak !== 0 || source[position] !== '{') {
+      if (context.linebreak !== 0) {
+        setBacktrack(context, [2 | Backtrack.link, 2 | Backtrack.ruby], head);
+      }
+      else if (source[position] !== '{') {
         setBacktrack(context, [2 | Backtrack.link], head);
       }
       else {
@@ -97,7 +100,7 @@ const s2 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, '］', [['］', 1]]))),
   str('］'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -106,7 +109,7 @@ const c1 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, '}', [['}', 1]]))),
   str('}'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -115,7 +118,7 @@ const c2 = lazy(() => surround(
   precedence(1, recursion(Recursion.bracket, some(inline, '｝', [['｝', 1]]))),
   str('｝'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -125,6 +128,6 @@ const d1 = lazy(() => surround(
   precedence(2, recursion(Recursion.bracket, some(inline, /["\n]/y, [['"', 2], ['\n', 3]]))),
   str('"'),
   true,
-  [2 | Backtrack.bracket],
+  [2 | Backtrack.common],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));