securemark 0.260.4 → 0.260.5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.260.5
+
+- Refactoring.
+
 ## 0.260.4
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.260.4 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.260.5 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("DOMPurify"), require("Prism"));
@@ -2888,12 +2888,16 @@ const parser_1 = __webpack_require__(6728);
 const memo_1 = __webpack_require__(1090);
 
 function reset(base, parser) {
+  if (!('memo' in base)) {
+    base.memo = global_1.undefined;
+  }
+
   const changes = global_1.Object.entries(base);
   const values = (0, global_1.Array)(changes.length);
   return ({
     source,
     context
-  }) => apply(parser, source, (0, alias_1.ObjectCreate)(context), changes, values);
+  }) => apply(parser, source, (0, alias_1.ObjectCreate)(context), changes, values, true);
 }
 
 exports.reset = reset;
@@ -2909,18 +2913,25 @@ function context(base, parser) {
 
 exports.context = context;
 
-function apply(parser, source, context, changes, values) {
+function apply(parser, source, context, changes, values, reset = false) {
   if (context) for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
 
     switch (prop) {
       case 'resources':
-        if (prop in context && !(0, alias_1.hasOwnProperty)(context, prop)) break; // @ts-expect-error
-
+        if (!reset) break;
+        if (prop in context && !(0, alias_1.hasOwnProperty)(context, prop)) break;
         context[prop] = (0, alias_1.ObjectCreate)(change[1]);
         break;
 
+      case 'memo':
+        if (!reset) break;
+        context.memo = new memo_1.Memo({
+          targets: context.memo?.targets
+        });
+        break;
+
       default:
         values[i] = context[prop];
         context[prop] = change[1];
@@ -2935,8 +2946,11 @@ function apply(parser, source, context, changes, values) {
     const prop = change[0];
 
     switch (prop) {
-      case 'resources':
-        break;
+      case 'resources': // @ts-expect-error
+
+      case 'memo':
+        if (!reset) break;
+      // fallthrough
 
       default:
         context[prop] = values[i];
@@ -2953,26 +2967,25 @@ function syntax(syntax, prec, cost, state, parser) {
   }) => {
     if (source === '') return;
     const memo = context.memo ??= new memo_1.Memo();
-    context.memorable ??= ~0;
     context.offset ??= 0;
     const position = source.length + context.offset;
-    const st0 = context.state ?? 0;
-    const st1 = context.state = st0 | state;
-    const cache = syntax && memo.get(position, syntax, st1);
+    const stateOuter = context.state ?? 0;
+    const stateInner = context.state = stateOuter | state;
+    const cache = syntax && stateInner & memo.targets && memo.get(position, syntax, stateInner);
     const result = cache ? cache.length === 0 ? global_1.undefined : [cache[0], source.slice(cache[1])] : parser({
       source,
       context
     });
 
-    if (syntax && st0 & context.memorable) {
-      cache ?? memo.set(position, syntax, st1, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
+    if (syntax && stateOuter & memo.targets) {
+      cache ?? memo.set(position, syntax, stateInner, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
     }
 
-    if (result && !st0 && memo.length >= position + 2) {
+    if (result && !stateOuter && memo.length >= position + 2) {
       memo.clear(position + 2);
     }
 
-    context.state = st0;
+    context.state = stateOuter;
     return result;
   }));
 }
@@ -3200,8 +3213,11 @@ Object.defineProperty(exports, "__esModule", ({
 exports.Memo = void 0;
 
 class Memo {
-  constructor() {
+  constructor({
+    targets = ~0
+  } = {}) {
     this.memory = [];
+    this.targets = targets;
   }
 
   get length() {
@@ -3595,6 +3611,8 @@ const global_1 = __webpack_require__(4128);
 
 const parser_1 = __webpack_require__(6728);
 
+const memo_1 = __webpack_require__(1090);
+
 const segment_1 = __webpack_require__(9002);
 
 const header_1 = __webpack_require__(5702);
@@ -3616,9 +3634,11 @@ const array_1 = __webpack_require__(8112);
 function bind(target, settings) {
   let context = { ...settings,
     host: settings.host ?? new url_1.ReadonlyURL(global_1.location.pathname, global_1.location.origin),
-    memorable: 236
-    /* State.backtrackable */
+    memo: new memo_1.Memo({
+      targets: 236
+      /* State.backtrackers */
 
+    })
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const blocks = [];
@@ -3958,6 +3978,8 @@ const global_1 = __webpack_require__(4128);
 
 const parser_1 = __webpack_require__(6728);
 
+const memo_1 = __webpack_require__(1090);
+
 const segment_1 = __webpack_require__(9002);
 
 const header_1 = __webpack_require__(5702);
@@ -3988,9 +4010,11 @@ function parse(source, opts = {}, context) {
     ...(context?.resources && {
       resources: context.resources
     }),
-    memorable: 236
-    /* State.backtrackable */
+    memo: new memo_1.Memo({
+      targets: 236
+      /* State.backtrackers */
 
+    })
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = (0, dom_1.frag)();
@@ -5948,8 +5972,8 @@ exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-
 /* State.autolink */
 , false, (0, combinator_1.syntax)(2
 /* Syntax.autolink */
-, 1, 1, 0
-/* State.none */
+, 1, 1, ~1
+/* State.shortcut */
 , (0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email, // Escape unmatched email-like strings.
 (0, source_1.str)(/^[0-9a-z]+(?:[.+_-][0-9a-z]+)*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i), channel_1.channel, account_1.account, // Escape unmatched account-like strings.
 (0, source_1.str)(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i), // Escape invalid leading characters.
@@ -6502,10 +6526,12 @@ const dom_1 = __webpack_require__(3252);
 
 exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(32
 /* State.index */
-, false, (0, combinator_1.syntax)(1024
+, false, (0, combinator_1.syntax)(2048
 /* Syntax.index */
-, 2, 1, 254
-/* State.linkable */
+, 2, 1, 250
+/* State.linkers */
+| 4
+/* State.media */
 , (0, visibility_1.startTight)((0, combinator_1.open)((0, source_1.stropt)(/^\|?/), (0, visibility_1.trimBlankEnd)((0, combinator_1.some)((0, combinator_1.union)([signature, inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), true)))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', (0, dom_1.defrag)(ns))], rest])), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : global_1.undefined,
   class: 'index',
@@ -6707,7 +6733,7 @@ const array_1 = __webpack_require__(8112); // Don't use the symbols already used
 // All syntax surrounded by square brackets shouldn't contain line breaks.
 
 
-exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[:', '[^'], (0, combinator_1.surround)((0, source_1.str)(/^\[[:^]/), (0, combinator_1.syntax)(512
+exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[:', '[^'], (0, combinator_1.surround)((0, source_1.str)(/^\[[:^]/), (0, combinator_1.syntax)(1024
 /* Syntax.placeholder */
 , 2, 1, 0
 /* State.none */
@@ -6928,8 +6954,10 @@ const textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(8
 /* State.link */
 , false, (0, combinator_1.syntax)(256
 /* Syntax.link */
-, 2, 10, 254
-/* State.linkable */
+, 2, 10, 250
+/* State.linkers */
+| 4
+/* State.media */
 , (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
   return parse(content, params, rest, context);
 }))));
@@ -6939,10 +6967,8 @@ const medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(8
 /* State.media */
 , false, (0, combinator_1.syntax)(256
 /* Syntax.link */
-, 2, 10, 254
-/* State.linkable */
-^ 4
-/* State.media */
+, 2, 10, 250
+/* State.linkers */
 , (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
 exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\s{}]+/)]);
@@ -7172,8 +7198,8 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '
 /* State.media */
 , false, (0, combinator_1.syntax)(64
 /* Syntax.media */
-, 2, 10, 0
-/* State.none */
+, 2, 10, ~8
+/* State.link */
 , (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [[/^\\?\n/, 9]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/))]), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
   const INSECURE_URI = params.shift();
   const url = new url_1.ReadonlyURL((0, link_1.resolve)(INSECURE_URI, context.host ?? global_1.location, context.url ?? context.host ?? global_1.location), context.host?.href || global_1.location.href);
@@ -7195,7 +7221,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '
   if (context.state & 8
   /* State.link */
   ) return [[el], rest];
-  if (cache && cache.tagName !== 'IMG') return (0, combinator_1.creation)(10, (..._) => [[el], rest])({
+  if (cache && cache.tagName !== 'IMG') return (0, combinator_1.creation)(10, _ => [[el], rest])({
     source: '!',
     context
   });
@@ -7279,7 +7305,7 @@ const dom_1 = __webpack_require__(3252);
 
 exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('[[', (0, combinator_1.constraint)(64
 /* State.reference */
-, false, (0, combinator_1.syntax)(4096
+, false, (0, combinator_1.syntax)(8192
 /* Syntax.reference */
 , 6, 1, 128
 /* State.annotation */
@@ -7335,11 +7361,17 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.syntax)(0
-/* Syntax.none */
-, 2, 1, 0
-/* State.none */
-, (0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.sequence)([(0, combinator_1.surround)('[', (0, combinator_1.focus)(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=]\()/, text), ']'), (0, combinator_1.surround)('(', (0, combinator_1.focus)(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=\))/, text), ')')]), ([texts]) => (0, visibility_1.isStartTightNodes)(texts)), ([texts, rubies]) => {
+exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.syntax)(512
+/* Syntax.ruby */
+, 2, 1, -1
+/* State.all */
+, (0, combinator_1.fmap)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.sequence)([(0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']'), (0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')')]), ([texts, rubies], _, context) => [(0, parser_1.eval)(text({
+  source: texts,
+  context
+}), [])[0] ?? '', (0, parser_1.eval)(text({
+  source: rubies,
+  context
+}), [])[0] ?? '']), ([texts, rubies]) => texts && rubies && (0, visibility_1.isStartTightNodes)(texts)), ([texts, rubies]) => {
   texts[texts.length - 1] === '' && texts.pop();
 
   switch (true) {
@@ -7499,8 +7531,8 @@ const array_1 = __webpack_require__(8112);
 
 exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('{{', (0, combinator_1.syntax)(0
 /* Syntax.none */
-, 2, 1, 0
-/* State.none */
+, 2, 1, -1
+/* State.all */
 , (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), '}}', true, ([, ns = []], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
 }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest]));

package/markdown.d.ts

@@ -829,8 +829,8 @@ export namespace MarkdownParser {
       // [AB](a b)
       Inline<'ruby'>,
       Parser<HTMLElement, Context, [
-        RubyParser.TextParser,
-        RubyParser.TextParser,
+        SourceParser.StrParser,
+        SourceParser.StrParser,
       ]> {
     }
     export namespace RubyParser {

package/package.json

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

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

@@ -1,4 +1,8 @@
 export class Memo {
+  constructor({ targets = ~0 } = {}) {
+    this.targets = targets;
+  }
+  public readonly targets: number;
   private readonly memory: Record<string, readonly [any[], number] | readonly []>[/* pos */] = [];
   public get length(): number {
     return this.memory.length;

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

@@ -5,12 +5,15 @@ import { Memo } from './context/memo';
 
 export function reset<P extends Parser<unknown>>(base: Context<P>, parser: P): P;
 export function reset<T>(base: Ctx, parser: Parser<T>): Parser<T> {
+  if (!('memo' in base)) {
+    base.memo = undefined;
+  }
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
   const changes = Object.entries(base);
   const values = Array(changes.length);
   return ({ source, context }) =>
-    apply(parser, source, ObjectCreate(context), changes, values);
+    apply(parser, source, ObjectCreate(context), changes, values, true);
 }
 
 export function context<P extends Parser<unknown>>(base: Context<P>, parser: P): P;
@@ -23,18 +26,22 @@ export function context<T>(base: Ctx, parser: Parser<T>): Parser<T> {
     apply(parser, source, context, changes, values);
 }
 
-function apply<P extends Parser<unknown>>(parser: P, source: string, context: Context<P>, changes: [string, any][], values: any[]): Result<Tree<P>>;
-function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: [string, any][], values: any[]): Result<T> {
+function apply<P extends Parser<unknown>>(parser: P, source: string, context: Context<P>, changes: [string, any][], values: any[], reset?: boolean): Result<Tree<P>>;
+function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: [string, any][], values: any[], reset = false): Result<T> {
   if (context) for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
     switch (prop) {
       case 'resources':
+        if (!reset) break;
         assert(typeof change[1] === 'object');
         assert(context[prop] || !(prop in context));
         if (prop in context && !hasOwnProperty(context, prop)) break;
-        // @ts-expect-error
-        context[prop] = ObjectCreate(change[1]);
+        context[prop as string] = ObjectCreate(change[1]);
+        break;
+      case 'memo':
+        if (!reset) break;
+        context.memo = new Memo({ targets: context.memo?.targets });
         break;
       default:
         values[i] = context[prop];
@@ -47,7 +54,10 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: [str
     const prop = change[0];
     switch (prop) {
       case 'resources':
-        break;
+      // @ts-expect-error
+      case 'memo':
+        if (!reset) break;
+        // fallthrough
       default:
         context[prop] = values[i];
         values[i] = undefined;
@@ -61,26 +71,25 @@ export function syntax<T>(syntax: number, prec: number, cost: number, state: num
   return creation(cost, precedence(prec, ({ source, context }) => {
     if (source === '') return;
     const memo = context.memo ??= new Memo();
-    context.memorable ??= ~0;
     context.offset ??= 0;
     const position = source.length + context.offset!;
-    const st0 = context.state ?? 0;
-    const st1 = context.state = st0 | state;
-    const cache = syntax && memo.get(position, syntax, st1);
+    const stateOuter = context.state ?? 0;
+    const stateInner = context.state = stateOuter | state;
+    const cache = syntax && stateInner & memo.targets && memo.get(position, syntax, stateInner);
     const result: Result<T> = cache
       ? cache.length === 0
         ? undefined
         : [cache[0], source.slice(cache[1])]
       : parser!({ source, context });
-    if (syntax && st0 & context.memorable!) {
-      cache ?? memo.set(position, syntax, st1, eval(result), source.length - exec(result, '').length);
-      assert.deepStrictEqual(cache && cache, cache && memo.get(position, syntax, st1));
+    if (syntax && stateOuter & memo.targets) {
+      cache ?? memo.set(position, syntax, stateInner, eval(result), source.length - exec(result, '').length);
+      assert.deepStrictEqual(cache && cache, cache && memo.get(position, syntax, stateInner));
     }
-    if (result && !st0 && memo.length! >= position + 2) {
-      assert(!(st0 & context.memorable!));
+    if (result && !stateOuter && memo.length! >= position + 2) {
+      assert(!(stateOuter & memo.targets));
       memo.clear(position + 2);
     }
-    context.state = st0;
+    context.state = stateOuter;
     return result;
   }));
 }

package/src/combinator/data/parser.ts

@@ -20,7 +20,6 @@ export interface Ctx {
   precedence?: number;
   delimiters?: Delimiters;
   state?: number;
-  memorable?: number;
   memo?: Memo;
 }
 export type Tree<P extends Parser<unknown>> = P extends Parser<infer T> ? T : never;

package/src/parser/api/bind.ts

@@ -2,6 +2,7 @@ import { undefined, location } from 'spica/global';
 import { ParserSettings, Progress } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
+import { Memo } from '../../combinator/data/parser/context/memo';
 import { segment, validate, MAX_INPUT_SIZE } from '../segment';
 import { header } from '../header';
 import { block } from '../block';
@@ -24,7 +25,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
   let context: MarkdownParser.Context = {
     ...settings,
     host: settings.host ?? new ReadonlyURL(location.pathname, location.origin),
-    memorable: State.backtrackable,
+    memo: new Memo({ targets: State.backtrackers }),
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   assert(!settings.id);

package/src/parser/api/parse.ts

@@ -2,6 +2,7 @@ import { location } from 'spica/global';
 import { ParserOptions } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
+import { Memo } from '../../combinator/data/parser/context/memo';
 import { segment, validate, MAX_SEGMENT_SIZE } from '../segment';
 import { header } from '../header';
 import { block } from '../block';
@@ -30,7 +31,7 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     ...context?.resources && {
       resources: context.resources,
     },
-    memorable: State.backtrackable,
+    memo: new Memo({ targets: State.backtrackers }),
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();

package/src/parser/context.ts

@@ -1,8 +1,9 @@
 export const enum Syntax {
-  reference = 1 << 12,
-  comment = 1 << 11,
-  index = 1 << 10,
-  placeholder = 1 << 9,
+  reference = 1 << 13,
+  comment = 1 << 12,
+  index = 1 << 11,
+  placeholder = 1 << 10,
+  ruby = 1 << 9,
   link = 1 << 8,
   bracket = 1 << 7,
   media = 1 << 6,
@@ -25,15 +26,15 @@ export const enum State {
   autolink = 1 << 1,
   shortcut = 1 << 0,
   none = 0,
-  linkable = 0
+  all = ~0,
+  linkers = 0
     | State.annotation
     | State.reference
     | State.index
     | State.label
     | State.link
-    | State.media
     | State.autolink,
-  backtrackable = 0
+  backtrackers = 0
     | State.annotation
     | State.reference
     | State.index

package/src/parser/inline/autolink.ts

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

package/src/parser/inline/extension/index.ts

@@ -13,7 +13,7 @@ import IndexParser = ExtensionParser.IndexParser;
 export const index: IndexParser = lazy(() => validate('[#', fmap(indexee(surround(
   '[#',
   constraint(State.index, false,
-  syntax(Syntax.index, 2, 1, State.linkable,
+  syntax(Syntax.index, 2, 1, State.linkers | State.media,
   startTight(
   open(stropt(/^\|?/), trimBlankEnd(some(union([
     signature,

package/src/parser/inline/link.ts

@@ -25,7 +25,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], union([
 
 const textlink: LinkParser.TextLinkParser = lazy(() =>
   constraint(State.link, false,
-  syntax(Syntax.link, 2, 10, State.linkable,
+  syntax(Syntax.link, 2, 10, State.linkers | State.media,
   bind(reverse(tails([
     dup(surround(
       '[',
@@ -41,7 +41,7 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
 
 const medialink: LinkParser.MediaLinkParser = lazy(() =>
   constraint(State.link | State.media, false,
-  syntax(Syntax.link, 2, 10, State.linkable ^ State.media,
+  syntax(Syntax.link, 2, 10, State.linkers,
   bind(reverse(sequence([
     dup(surround(
       '[',

package/src/parser/inline/media.ts

@@ -21,7 +21,7 @@ Object.setPrototypeOf(optspec, null);
 export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
   '!',
   constraint(State.media, false,
-  syntax(Syntax.media, 2, 10, State.none,
+  syntax(Syntax.media, 2, 10, ~State.link,
   bind(verify(fmap(tails([
     dup(surround(
       '[',
@@ -55,7 +55,7 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
       el.style.aspectRatio = el.getAttribute('aspect-ratio')!;
     }
     if (context.state! & State.link) return [[el], rest];
-    if (cache && cache.tagName !== 'IMG') return creation(10, (..._) => [[el!], rest])({ source: '!', context });
+    if (cache && cache.tagName !== 'IMG') return creation(10, _ => [[el!], rest])({ source: '!', context });
     return fmap(
       unsafelink as MediaParser,
       ([link]) => [define(link, { class: null, target: '_blank' }, [el])])

package/src/parser/inline/ruby.ts

@@ -1,20 +1,24 @@
 import { undefined } from 'spica/global';
 import { RubyParser } from '../inline';
 import { eval, exec } from '../../combinator/data/parser';
-import { sequence, syntax, creation, validate, verify, focus, surround, lazy, fmap } from '../../combinator';
+import { sequence, syntax, creation, validate, verify, surround, lazy, fmap } from '../../combinator';
 import { unsafehtmlentity } from './htmlentity';
-import { text as txt } from '../source';
+import { text as txt, str } from '../source';
 import { Syntax, State } from '../context';
 import { isStartTightNodes } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 import { unshift, push } from 'spica/array';
 
-export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2, 1, State.none, fmap(verify(
+export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.ruby, 2, 1, State.all, fmap(verify(fmap(
   sequence([
-    surround('[', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=]\()/, text), ']'),
-    surround('(', focus(/^(?:\\[^\n]|[^\\[\](){}"\n])+(?=\))/, text), ')'),
+    surround('[', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']'),
+    surround('(', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')'),
   ]),
-  ([texts]) => isStartTightNodes(texts)),
+  ([texts, rubies], _, context) => [
+    eval(text({ source: texts, context }), [])[0] ?? '',
+    eval(text({ source: rubies, context }), [])[0] ?? '',
+  ]),
+  ([texts, rubies]) => texts && rubies && isStartTightNodes(texts)),
   ([texts, rubies]) => {
     texts[texts.length - 1] === '' && texts.pop();
     switch (true) {

package/src/parser/inline/template.ts

@@ -7,7 +7,7 @@ import { html } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const template: TemplateParser = lazy(() => surround(
-  '{{', syntax(Syntax.none, 2, 1, State.none, some(union([bracket, escsource]), '}')), '}}', true,
+  '{{', syntax(Syntax.none, 2, 1, State.all, some(union([bracket, escsource]), '}')), '}}', true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest]));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creation(union([