securemark 0.283.2 → 0.283.4

package/markdown.d.ts

@@ -603,7 +603,7 @@ export namespace MarkdownParser {
         Block<'reply/cite'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
           SourceParser.StrParser,
-          Parser<HTMLAnchorElement, Context, [
+          Parser<string | HTMLAnchorElement, Context, [
             InlineParser.AutolinkParser.AnchorParser,
             Parser<HTMLAnchorElement, Context, []>,
             Parser<HTMLAnchorElement, Context, []>,
@@ -1147,8 +1147,9 @@ export namespace MarkdownParser {
       export interface UrlParser extends
         // https://host
         Inline<'url'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export namespace UrlParser {
@@ -1156,7 +1157,10 @@ export namespace MarkdownParser {
           Inline<'url/lineurl'>,
           Parser<string | HTMLElement, Context, [
             SourceParser.StrParser,
-            InlineParser.LinkParser.UnsafeLinkParser,
+            Parser<string | HTMLElement, Context, [
+              InlineParser.LinkParser.UnsafeLinkParser,
+              Parser<string, Context, []>,
+            ]>,
           ]> {
         }
         export interface BracketParser extends
@@ -1188,7 +1192,7 @@ export namespace MarkdownParser {
       export interface ChannelParser extends
         // @user#tag
         Inline<'channel'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           InlineParser.AutolinkParser.AccountParser,
           InlineParser.AutolinkParser.HashtagParser,
         ]> {
@@ -1196,29 +1200,33 @@ export namespace MarkdownParser {
       export interface AccountParser extends
         // @user
         Inline<'account'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashtagParser extends
         // #tag
         Inline<'hashtag'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashnumParser extends
         // #1
         Inline<'hashnum'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface AnchorParser extends
         // >>1
         Inline<'anchor'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
     }

package/package.json

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

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

@@ -32,7 +32,7 @@ export function indent<T>(opener: RegExp | Parser<T>, parser?: Parser<T> | boole
 
 function trimBlockEnd(block: string): string {
   return block === ''
-      || block[block.length - 1] !== '\n'
+      || block.at(-1) !== '\n'
     ? block
     : block.slice(0, -1);
 }

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

@@ -59,10 +59,10 @@ export function surround<T>(
       const { logger = {}, offset = 0 } = context;
       for (let i = 0; i < source.length - mr_.length; ++i) {
         if (source[i] !== source[0]) break;
-        const j = source.length + offset - i;
-        if (!(j in logger)) continue;
+        const pos = source.length + offset - i - 1;
+        if (!(pos in logger)) continue;
         assert(log >>> 2);
-        if (logger[j] & 1 << (log >>> 2)) return;
+        if (logger[pos] & 1 << (log >>> 2)) return;
       }
     }
     const res2 = mr_ !== '' ? parser({ source: mr_, context }) : undefined;
@@ -77,7 +77,7 @@ export function surround<T>(
     if (rest.length === lmr_.length) return;
     if (log & 2 && rr === undefined) {
       const { logger = {}, offset = 0 } = context;
-      logger[source.length + offset] |= 1 << (log >>> 2);
+      logger[source.length + offset - 1] |= 1 << (log >>> 2);
     }
     return rr
       ? f

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

@@ -5,6 +5,7 @@ interface Delimiter {
   readonly signature: string;
   readonly matcher: (source: string) => boolean | undefined;
   readonly precedence: number;
+  state: boolean;
 }
 
 export class Delimiters {
@@ -32,7 +33,8 @@ export class Delimiters {
     this.signature);
   private readonly registry = memoize<(signature: string) => Delimiter[]>(() => []);
   private readonly delimiters: Delimiter[] = [];
-  private readonly order: number[] = [];
+  private readonly stack: number[] = [];
+  private readonly states: (readonly number[])[] = [];
   public push(
     delims: readonly {
       readonly signature: string;
@@ -40,53 +42,76 @@ export class Delimiters {
       readonly precedence: number;
     }[]
   ): void {
-    const { registry, delimiters, order } = this;
+    const { registry, delimiters, stack } = this;
+    // シグネチャ数以下
+    assert(delimiters.length < 100);
     for (let i = 0; i < delims.length; ++i) {
       const { signature, matcher, precedence } = delims[i];
-      const stack = registry(signature);
-      const index = stack[0]?.index ?? delimiters.length;
-      if (stack.length === 0 || precedence > delimiters[index].precedence) {
+      const memory = registry(signature);
+      const index = memory[0]?.index ?? delimiters.length;
+      if (memory.length === 0 || precedence > delimiters[index].precedence) {
         const delimiter: Delimiter = {
           index,
           signature,
           matcher,
           precedence,
+          state: true,
         };
         delimiters[index] = delimiter;
-        stack.push(delimiter);
-        order.push(index);
+        memory.push(delimiter);
+        stack.push(index);
       }
       else {
-        order.push(-1);
+        stack.push(-1);
       }
+      // 現状各優先順位は固定
+      assert(memory.length === 1);
     }
   }
   public pop(count: number): void {
     assert(count > 0);
-    const { registry, delimiters, order } = this;
+    const { registry, delimiters, stack } = this;
     for (let i = 0; i < count; ++i) {
-      assert(this.order.length > 0);
-      const index = order.pop()!;
+      assert(this.stack.length > 0);
+      const index = stack.pop()!;
       if (index === -1) continue;
-      const stack = registry(delimiters[index].signature);
-      assert(stack.length > 0);
-      if (stack.length === 1) {
+      const memory = registry(delimiters[index].signature);
+      assert(memory.length > 0);
+      if (memory.length === 1) {
         assert(index === delimiters.length - 1);
-        assert(stack[0] === delimiters.at(-1));
-        stack.pop();
+        assert(memory[0] === delimiters.at(-1));
+        memory.pop();
         delimiters.pop();
       }
       else {
-        stack.pop();
-        delimiters[index] = stack.at(-1)!;
+        memory.pop();
+        delimiters[index] = memory.at(-1)!;
       }
     }
   }
-  public match(source: string, precedence = 1): boolean {
+  public shift(precedence: number): void {
     const { delimiters } = this;
-    for (let i = 0; i < delimiters.length; ++i) {
+    const indexes: number[] = [];
+    for (let i = delimiters.length; i--;) {
       const delimiter = delimiters[i];
-      if (precedence >= delimiter.precedence) continue;
+      if (delimiter.precedence >= precedence || !delimiter.state) continue;
+      delimiter.state = false;
+      indexes.push(i)
+    }
+    this.states.push(indexes);
+  }
+  public unshift(): void {
+    const { delimiters } = this;
+    const indexes = this.states.pop()!;
+    for (let i = indexes.length; i--;) {
+      delimiters[indexes[i]].state = true;
+    }
+  }
+  public match(source: string, precedence = 0): boolean {
+    const { delimiters } = this;
+    for (let i = delimiters.length; i--;) {
+      const delimiter = delimiters[i];
+      if (delimiter.precedence <= precedence || !delimiter.state) continue;
       switch (delimiter.matcher(source)) {
         case true:
           return true;

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

@@ -93,11 +93,15 @@ export function creation(cost: number, recursion: number, parser: Parser<unknown
 
 export function precedence<P extends Parser<unknown>>(precedence: number, parser: P): P;
 export function precedence<T>(precedence: number, parser: Parser<T>): Parser<T> {
-  assert(precedence > 0);
+  assert(precedence >= 0);
   return ({ source, context }) => {
-    const p = context.precedence;
+    const { delimiters, precedence: p = 0 } = context;
+    const shift = delimiters && precedence > p;
     context.precedence = precedence;
+    // デリミタはシフト後に設定しなければならない
+    shift && delimiters.shift(precedence);
     const result = parser({ source, context });
+    shift && delimiters.unshift();
     context.precedence = p;
     return result;
   };

package/src/parser/block/dlist.ts

@@ -33,7 +33,7 @@ const desc: DListParser.DescriptionParser = block(fmap(open(
   false);
 
 function fillTrailingDescription(es: HTMLElement[]): HTMLElement[] {
-  return es.length > 0 && es[es.length - 1].tagName === 'DT'
+  return es.length > 0 && es.at(-1)!.tagName === 'DT'
     ? push(es, [html('dd')])
     : es;
 }

package/src/parser/context.ts

@@ -1,13 +1,12 @@
 export const enum State {
-  annotation = 1 << 8,
-  reference = 1 << 7,
-  index = 1 << 6,
-  label = 1 << 5,
-  link = 1 << 4,
-  media = 1 << 3,
-  mark = 1 << 2,
-  autolink = 1 << 1,
-  shortcut = 1 << 0,
+  annotation = 1 << 7,
+  reference = 1 << 6,
+  index = 1 << 5,
+  label = 1 << 4,
+  link = 1 << 3,
+  media = 1 << 2,
+  mark = 1 << 1,
+  autolink = 1 << 0,
   none = 0,
   all = ~0,
   linkers = 0
@@ -32,10 +31,10 @@ export const enum Recursion {
 
 export const enum Backtrack {
   template = 7 << 2,
-  media = 6 << 2,
+  index = 6 << 2,
   ruby = 5 << 2,
   link = 4 << 2,
-  index = 3 << 2,
+  media = 3 << 2,
   url = 2 << 2,
   bracket = 1 << 2,
 }

package/src/parser/inline/annotation.ts

@@ -8,8 +8,8 @@ import { html, defrag } from 'typed-dom/dom';
 export const annotation: AnnotationParser = lazy(() => creation(1, Recursion.ignore, surround(
   '((',
   constraint(State.annotation, false,
-  syntax(6, State.annotation | State.media,
-  trimBlankStart(some(union([inline]), ')', [[/^\\?\n/, 9], [')', 2]])))),
+  syntax(1, State.annotation | State.media,
+  trimBlankStart(some(union([inline]), ')', [[/^\\?\n/, 9], [')', 1]])))),
   '))',
   false,
   ([, ns], rest) => [[html('sup', { class: 'annotation' }, [html('span', trimNodeEnd(defrag(ns)))])], rest],

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, tails, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -7,20 +7,21 @@ import { define } from 'typed-dom/dom';
 
 // https://example/@user must be a user page or a redirect page going there.
 
-export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
   open(
     '@',
     tails([
       str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i),
       str(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i),
-    ]))),
-  convert(
-    source =>
-      `[${source}]{ ${
-      source.includes('/')
-        ? `https://${source.slice(1).replace('/', '/@')}`
-        : `/${source}`
-      } }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'account' })]));
+    ])),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source =>
+        `[${source}]{ ${source.includes('/')
+          ? `https://${source.slice(1).replace('/', '/@')}`
+          : `/${source}`
+        } }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'account' })]))),
+    ({ source }) => [[source], ''],
+  ])));

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { State } from '../../context';
 import { define } from 'typed-dom/dom';
@@ -14,16 +14,17 @@ import { define } from 'typed-dom/dom';
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
 
-export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(
-  constraint(State.shortcut, false,
+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,
-    convert(
-      source =>
-        `[${source}]{ ${
-        source.includes('/')
-          ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
-          : `?at=${source.slice(2)}`
-        } }`,
-      union([unsafelink])))),
-  ([el]) => [define(el, { class: 'anchor' })])));
+    union([
+      constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+        source =>
+          `[${source}]{ ${source.includes('/')
+            ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
+            : `?at=${source.slice(2)}`
+          } }`,
+        unsafelink),
+        ([el]) => [define(el, { class: 'anchor' })]))),
+      ({ source }) => [[source], ''],
+    ]))));

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

@@ -1,13 +1,15 @@
 import { AutolinkParser } from '../../inline';
-import { sequence, some, validate, bind } from '../../../combinator';
+import { sequence, some, constraint, validate, bind } from '../../../combinator';
 import { account } from './account';
 import { hashtag } from './hashtag';
+import { State } from '../../context';
 import { stringify } from '../../util';
 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('@', bind(
+export const channel: AutolinkParser.ChannelParser = validate('@',
+  constraint(State.autolink, false, bind(
   sequence([
     account,
     some(hashtag),
@@ -15,6 +17,7 @@ export const channel: AutolinkParser.ChannelParser = validate('@', bind(
   (es, rest) => {
     const source = stringify(es);
     const el = es[0];
+    if (typeof el === 'string') return [es, rest];
     const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
     return [[define(el, { class: 'channel', href: url }, source)], rest];
-  }));
+  })));

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
-import { creation, verify, rewrite } from '../../../combinator';
+import { syntax, creation, constraint, verify, rewrite } from '../../../combinator';
 import { str } from '../../source';
-import { Recursion } from '../../context';
+import { State, Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
@@ -9,4 +9,5 @@ import { html } from 'typed-dom/dom';
 export const email: AutolinkParser.EmailParser = creation(1, Recursion.ignore, rewrite(verify(
   str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
   ([source]) => source.length <= 255),
-  ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));
+  constraint(State.autolink, false, syntax(0, State.autolink,
+    ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']))));

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

@@ -1,15 +1,17 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
 import { State } from '../../context';
 import { define } from 'typed-dom/dom';
 
-export const hashnum: AutolinkParser.HashnumParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
-  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${source.slice(1)} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashnum', href: null })]));
+export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
+  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${source.slice(1)} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashnum', href: null })]))),
+    ({ source }) => [[source], ''],
+  ])));

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

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -10,15 +10,17 @@ import { define } from 'typed-dom/dom';
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
 
-export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   open(
     '#',
     str(new RegExp([
       /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')))/u.source,
       /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|'))+/u.source,
-    ].join('').replace(/emoji/g, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashtag' })]));
+    ].join('').replace(/emoji/g, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashtag' })]))),
+    ({ source }) => [[source], ''],
+  ])));

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

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { union, tails, some, syntax, creation, precedence, constraint, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { linebreak, unescsource, str } from '../../source';
-import { Backtrack, Recursion } from '../../context';
+import { State, Recursion, Backtrack } from '../../context';
 
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 
@@ -10,24 +10,30 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
   open(
     /^https?:\/\/(?=[\x21-\x7E])/,
     focus(/^[\x21-\x7E]+/, some(union([bracket, some(unescsource, closer)])))),
-  convert(
-    url => `{ ${url} }`,
-    union([unsafelink])))));
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, convert(
+      url => `{ ${url} }`,
+      unsafelink))),
+    ({ source }) => [[source], ''],
+  ]))));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
   linebreak,
-  tails([
-    str('!'),
-    focus(
-      /^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
-      convert(
-        url => `{ ${url} }`,
-        unsafelink)),
-  ])));
+  focus(
+    /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+    tails([
+      str('!'),
+      union([
+        constraint(State.autolink, false, syntax(0, State.autolink, convert(
+          url => `{ ${url} }`,
+          unsafelink))),
+        ({ source }) => [[source], ''],
+      ]),
+    ]))));
 
-const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, precedence(2, union([
-  surround(str('('), some(union([bracket, unescsource]), ')'), str(')'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('['), some(union([bracket, unescsource]), ']'), str(']'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('{'), some(union([bracket, unescsource]), '}'), str('}'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('"'), precedence(3, some(unescsource, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.url),
-]))));
+const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, union([
+  surround(str('('), precedence(1, some(union([bracket, unescsource]), ')')), str(')'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('['), precedence(1, some(union([bracket, unescsource]), ']')), str(']'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('{'), precedence(1, some(union([bracket, unescsource]), '}')), str('}'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('"'), precedence(2, some(unescsource, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.url),
+])));

package/src/parser/inline/autolink.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../inline';
-import { union, some, syntax, constraint, validate, lazy, fmap } from '../../combinator';
+import { union, some, syntax, validate, lazy, fmap } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
 import { channel } from './autolink/channel';
@@ -13,8 +13,7 @@ import { stringify } from '../util';
 
 export const autolink: AutolinkParser = lazy(() =>
   validate(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu,
-  constraint(State.autolink, false,
-  syntax(1, ~State.shortcut,
+  syntax(0, ~State.autolink,
   union([
     some(union([lineurl])),
     fmap(some(union([
@@ -37,4 +36,4 @@ export const autolink: AutolinkParser = lazy(() =>
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),
-  ])))));
+  ]))));

package/src/parser/inline/bracket.ts

@@ -6,42 +6,45 @@ import { State, Recursion, Backtrack } from '../context';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-const index = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
+const indexA = /^[0-9A-Za-z]+(?:(?:[.-]|, )[0-9A-Za-z]+)*/;
+const indexF = new RegExp(indexA.source.replace(', ', '[，、]')
+  .replace(/[09AZaz.]|\-(?!\w)/g, c => String.fromCodePoint(c.codePointAt(0)! + 0xFEE0)));
 
 export const bracket: BracketParser = lazy(() => union([
-  surround(str('('), creation(0, Recursion.bracket, syntax(2, State.none, str(index))), str(')')),
-  surround(str('('), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, ')', [[')', 2]]))), str(')'), true,
+  surround(str('('), creation(0, Recursion.bracket, syntax(1, State.none, str(indexA))), str(')')),
+  surround(str('('), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, ')', [[')', 1]]))), str(')'), true,
     ([as, bs = [], cs], rest) => [[html('span', { class: 'paren' }, defrag(push(unshift(as, bs), cs)))], rest],
     ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.bracket),
-  surround(str('（'), creation(0, Recursion.bracket, syntax(2, State.none, str(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))))), str('）')),
-  surround(str('（'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '）', [['）', 2]]))), str('）'), true,
+  surround(str('（'), creation(0, Recursion.bracket, syntax(1, State.none, str(indexF))), str('）')),
+  surround(str('（'), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, '）', [['）', 1]]))), 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('['), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, ']', [[']', 2]]))), str(']'), true,
+  surround(str('['), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, ']', [[']', 1]]))), str(']'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.bracket),
-  surround(str('［'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '］', [['］', 2]]))), str('］'), true,
+  surround(str('［'), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, '］', [['］', 1]]))), str('］'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('{'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '}', [['}', 2]]))), str('}'), true,
+  surround(str('{'), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, '}', [['}', 1]]))), str('}'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.bracket),
-  surround(str('｛'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '｝', [['｝', 2]]))), str('｝'), true,
+  surround(str('｛'), creation(0, Recursion.bracket, syntax(1, State.none, some(inline, '｝', [['｝', 1]]))), str('｝'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('"'), creation(0, Recursion.bracket, syntax(3, State.none, some(inline, '"', [[/^\\?\n/, 9], ['"', 3]]))), str('"'), true,
+  // 改行禁止はバックトラックなしでは内側の構文を破壊するため安易に行えない。
+  surround(str('"'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '"', [[/^\\?\n/, 9], ['"', 2]]))), str('"'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('“'), creation(0, Recursion.bracket, syntax(3, State.none, some(inline, '”', [[/^\\?\n/, 9], ['”', 3]]))), str('”'), true,
+  surround(str('“'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '”', [[/^\\?\n/, 9], ['”', 2]]))), str('”'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('‘'), creation(0, Recursion.bracket, syntax(3, State.none, some(inline, '’', [[/^\\?\n/, 9], ['’', 3]]))), str('’'), true,
+  surround(str('‘'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '’', [[/^\\?\n/, 9], ['’', 2]]))), str('’'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('「'), creation(0, Recursion.bracket, syntax(3, State.none, some(inline, '」', [[/^\\?\n/, 9], ['」', 3]]))), str('」'), true,
+  surround(str('「'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '」', [[/^\\?\n/, 9], ['」', 2]]))), str('」'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('『'), creation(0, Recursion.bracket, syntax(3, State.none, some(inline, '』', [[/^\\?\n/, 9], ['』', 3]]))), str('』'), true,
+  surround(str('『'), creation(0, Recursion.bracket, syntax(2, State.none, some(inline, '』', [[/^\\?\n/, 9], ['』', 2]]))), str('』'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));