securemark 0.280.1 → 0.280.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.280.2
+
+- Refactoring.
+
 ## 0.280.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.280.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.280.2 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("Prism"), require("DOMPurify"));
@@ -3325,9 +3325,6 @@ const alias_1 = __webpack_require__(5406);
 const parser_1 = __webpack_require__(6728);
 const memo_1 = __webpack_require__(1090);
 function reset(base, parser) {
-  if (!('memo' in base)) {
-    base.memo = undefined;
-  }
   const changes = Object.entries(base);
   const values = Array(changes.length);
   return ({
@@ -3346,44 +3343,33 @@ function context(base, parser) {
 }
 exports.context = context;
 function apply(parser, source, context, changes, values, reset = false) {
-  if (context) for (let i = 0; i < changes.length; ++i) {
+  for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
     switch (prop) {
       case 'resources':
-        if (!reset) break;
-        if (prop in context && !(0, alias_1.hasOwnProperty)(context, prop)) break;
-        context[prop] = (0, alias_1.ObjectCreate)(change[1]);
-        break;
-      // @ts-expect-error
-      case 'memo':
-        if (!reset) break;
-        context.memo = new memo_1.Memo({
-          targets: context.memo?.targets
-        });
-      // fallthrough
-      default:
-        values[i] = context[prop];
-        context[prop] = change[1];
+        context[prop] ??= (0, alias_1.ObjectCreate)(change[1]);
+        continue;
     }
+    values[i] = context[prop];
+    context[prop] = change[1];
   }
   const result = parser({
     source,
     context
   });
-  if (context) for (let i = 0; i < changes.length; ++i) {
+  for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
     switch (prop) {
       case 'resources':
-      // @ts-expect-error
+        break;
       case 'memo':
-        if (!reset) break;
-      // fallthrough
-      default:
-        context[prop] = values[i];
-        values[i] = undefined;
+        context.memo.clear();
+        break;
     }
+    context[prop] = values[i];
+    values[i] = undefined;
   }
   return result;
 }
@@ -3407,7 +3393,7 @@ function syntax(syntax, prec, state, parser) {
       cache ?? memo.set(position, syntax, stateInner, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
     }
     if (result && !stateOuter && memo.length >= position + 2) {
-      memo.clear(position + 2);
+      memo.resize(position + 2);
     }
     context.state = stateOuter;
     return result;
@@ -3557,7 +3543,7 @@ class Delimiters {
       const {
         signature,
         matcher,
-        precedence = 1
+        precedence
       } = delims[i];
       const stack = registry(signature);
       const index = stack[0]?.index ?? delimiters.length;
@@ -3576,7 +3562,7 @@ class Delimiters {
       }
     }
   }
-  pop(count = 1) {
+  pop(count) {
     const {
       registry,
       delimiters,
@@ -3640,9 +3626,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.Memo = void 0;
 class Memo {
-  constructor({
-    targets = ~0
-  } = {}) {
+  constructor(targets = ~0) {
+    this.targets = targets;
     this.memory = [];
     this.targets = targets;
   }
@@ -3660,15 +3645,18 @@ class Memo {
     //console.log('set', position, syntax, state, record[syntax]?.[state]);
   }
 
-  clear(position) {
+  resize(position) {
     const memory = this.memory;
     for (let len = memory.length, i = position; i < len; ++i) {
       memory.pop();
     }
-    //console.log('clear', position + 1);
+    //console.log('resize', position + 1);
   }
-}
 
+  clear() {
+    this.memory = [];
+  }
+}
 exports.Memo = Memo;
 
 /***/ }),
@@ -3972,7 +3960,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.bind = void 0;
 const parser_1 = __webpack_require__(6728);
-const memo_1 = __webpack_require__(1090);
 const segment_1 = __webpack_require__(9002);
 const header_1 = __webpack_require__(5702);
 const block_1 = __webpack_require__(4032);
@@ -3985,12 +3972,8 @@ const array_1 = __webpack_require__(8112);
 function bind(target, settings) {
   let context = {
     ...settings,
-    host: settings.host ?? new url_1.ReadonlyURL(location.pathname, location.origin),
-    memo: new memo_1.Memo({
-      targets: 472 /* State.backtrackers */
-    })
+    host: settings.host ?? new url_1.ReadonlyURL(location.pathname, location.origin)
   };
-
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const blocks = [];
@@ -4297,7 +4280,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.parse = void 0;
 const parser_1 = __webpack_require__(6728);
-const memo_1 = __webpack_require__(1090);
 const segment_1 = __webpack_require__(9002);
 const header_1 = __webpack_require__(5702);
 const block_1 = __webpack_require__(4032);
@@ -4316,14 +4298,8 @@ function parse(source, opts = {}, context) {
     url: url ? new url_1.ReadonlyURL(url) : context?.url,
     id: opts.id ?? context?.id,
     caches: context?.caches,
-    ...(context?.resources && {
-      resources: context.resources
-    }),
-    memo: new memo_1.Memo({
-      targets: 472 /* State.backtrackers */
-    })
+    resources: context?.resources
   };
-
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = (0, dom_1.frag)();
@@ -4376,6 +4352,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.block = void 0;
 const combinator_1 = __webpack_require__(2087);
+const memo_1 = __webpack_require__(1090);
 const source_1 = __webpack_require__(6743);
 const pagebreak_1 = __webpack_require__(4107);
 const heading_1 = __webpack_require__(4623);
@@ -4394,12 +4371,13 @@ const reply_1 = __webpack_require__(9978);
 const paragraph_1 = __webpack_require__(6457);
 const random_1 = __webpack_require__(7325);
 const dom_1 = __webpack_require__(3252);
-exports.block = (0, combinator_1.creation)(0, false, error((0, combinator_1.reset)({
+exports.block = (0, combinator_1.creation)(0, false, (0, combinator_1.reset)({
   resources: {
     clock: 20000,
     recursion: 20 + 1
-  }
-}, (0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, mediablock_1.mediablock, reply_1.reply, paragraph_1.paragraph]))));
+  },
+  memo: new memo_1.Memo(472 /* State.backtrackers */)
+}, error((0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, mediablock_1.mediablock, reply_1.reply, paragraph_1.paragraph]))));
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', ({
     source
@@ -6084,7 +6062,7 @@ exports.bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, comb
   class: 'paren'
 }, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 2, 0 /* State.none */, (0, source_1.str)(new RegExp(index.source.replace(', ', '[，、]').replace(/[09AZaz.]|\-(?!\w)/g, c => c.trimStart() && String.fromCharCode(c.charCodeAt(0) + 0xFEE0)))))), (0, source_1.str)('）')), (0, combinator_1.surround)((0, source_1.str)('（'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '）', [[/^\\?\n/, 3], ['）', 2]]))), (0, source_1.str)('）'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
   class: 'paren'
-}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 3], [']', 2]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '}', [[/^\\?\n/, 3], ['}', 2]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '"', [[/^\\?\n/, 4], ['"', 3]]))), (0, source_1.str)('"'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])]));
+}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 3], [']', 2]]))), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('［'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '］', [[/^\\?\n/, 3], ['］', 2]]))), (0, source_1.str)('］'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '}', [[/^\\?\n/, 3], ['}', 2]]))), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('｛'), (0, combinator_1.creation)((0, combinator_1.syntax)(8 /* Syntax.bracket */, 2, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '｝', [[/^\\?\n/, 3], ['｝', 2]]))), (0, source_1.str)('｝'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '"', [[/^\\?\n/, 4], ['"', 3]]))), (0, source_1.str)('"'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('“'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '”', [[/^\\?\n/, 4], ['”', 3]]))), (0, source_1.str)('”'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('‘'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '’', [[/^\\?\n/, 4], ['’', 3]]))), (0, source_1.str)('’'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('「'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '」', [[/^\\?\n/, 4], ['」', 3]]))), (0, source_1.str)('」'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('『'), (0, combinator_1.creation)((0, combinator_1.syntax)(0 /* Syntax.none */, 3, 0 /* State.none */, (0, combinator_1.some)(inline_1.inline, '』', [[/^\\?\n/, 4], ['』', 3]]))), (0, source_1.str)('』'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest])]));
 
 /***/ }),
 
@@ -7582,7 +7560,7 @@ exports.isAlphanumeric = exports.linebreak = exports.txt = exports.text = export
 const combinator_1 = __webpack_require__(2087);
 const str_1 = __webpack_require__(2790);
 const dom_1 = __webpack_require__(3252);
-exports.delimiter = /[\s\x00-\x7F（）]|\S[#>]/u;
+exports.delimiter = /[\s\x00-\x7F（）［］｛｝“”‘’「」『』]|\S[#>]/u;
 exports.nonWhitespace = /[\S\n]|$/u;
 exports.nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/u;
 const repeat = (0, str_1.str)(/^(.)\1*/);

package/markdown.d.ts

@@ -1246,6 +1246,12 @@ export namespace MarkdownParser {
         InlineParser,
         InlineParser,
         InlineParser,
+        InlineParser,
+        InlineParser,
+        InlineParser,
+        InlineParser,
+        InlineParser,
+        InlineParser,
       ]> {
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.280.1",
+  "version": "0.280.2",
   "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/delimiter.ts

@@ -37,12 +37,12 @@ export class Delimiters {
     delims: readonly {
       readonly signature: string;
       readonly matcher: (source: string) => boolean | undefined;
-      readonly precedence?: number;
+      readonly precedence: number;
     }[]
   ): void {
     const { registry, delimiters, order } = this;
     for (let i = 0; i < delims.length; ++i) {
-      const { signature, matcher, precedence = 1 } = delims[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) {
@@ -61,7 +61,7 @@ export class Delimiters {
       }
     }
   }
-  public pop(count = 1): void {
+  public pop(count: number): void {
     assert(count > 0);
     const { registry, delimiters, order } = this;
     for (let i = 0; i < count; ++i) {

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

@@ -1,9 +1,10 @@
 export class Memo {
-  constructor({ targets = ~0 } = {}) {
+  constructor(
+    public readonly targets = ~0,
+  ) {
     this.targets = targets;
   }
-  public readonly targets: number;
-  private readonly memory: Record<number, Record<number, readonly [any[], number] | readonly []>>[/* pos */] = [];
+  private memory: Record<number, Record<number, readonly [any[], number] | readonly []>>[/* pos */] = [];
   public get length(): number {
     return this.memory.length;
   }
@@ -32,11 +33,14 @@ export class Memo {
       : [];
     //console.log('set', position, syntax, state, record[syntax]?.[state]);
   }
-  public clear(position: number): void {
+  public resize(position: number): void {
     const memory = this.memory;
     for (let len = memory.length, i = position; i < len; ++i) {
       memory.pop();
     }
-    //console.log('clear', position + 1);
+    //console.log('resize', position + 1);
+  }
+  public clear(): void {
+    this.memory = [];
   }
 }

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

@@ -1,12 +1,9 @@
-import { hasOwnProperty, ObjectCreate } from 'spica/alias';
+import { ObjectCreate } from 'spica/alias';
 import { Parser, Result, Ctx, Tree, Context, eval, exec } from '../../data/parser';
 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);
@@ -27,41 +24,38 @@ export function context<T>(base: Ctx, parser: Parser<T>): Parser<T> {
 
 function apply<P extends Parser<unknown>>(parser: P, source: string, context: Context<P>, changes: readonly [string, unknown][], values: unknown[], reset?: boolean): Result<Tree<P>>;
 function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: readonly [string, unknown][], values: unknown[], reset = false): Result<T> {
-  if (context) for (let i = 0; i < changes.length; ++i) {
+  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;
-        context[prop as string] = ObjectCreate(change[1] as object);
-        break;
-      // @ts-expect-error
-      case 'memo':
-        if (!reset) break;
-        context.memo = new Memo({ targets: context.memo?.targets });
-        // fallthrough
-      default:
-        values[i] = context[prop];
-        context[prop] = change[1];
+        assert(reset);
+        assert(!context.offset);
+        assert(!context.precedence);
+        assert(!context.delimiters);
+        assert(!context.state);
+        assert(!context.memo);
+        context[prop as string] ??= ObjectCreate(change[1] as object);
+        continue;
     }
+    values[i] = context[prop];
+    context[prop] = change[1];
   }
   const result = parser({ source, context });
-  if (context) for (let i = 0; i < changes.length; ++i) {
+  for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
     switch (prop) {
       case 'resources':
-      // @ts-expect-error
+        assert(reset);
+        break;
       case 'memo':
-        if (!reset) break;
-        // fallthrough
-      default:
-        context[prop] = values[i];
-        values[i] = undefined;
+        assert(reset);
+        context.memo!.clear();
+        break;
     }
+    context[prop] = values[i];
+    values[i] = undefined;
   }
   return result;
 }
@@ -87,7 +81,7 @@ export function syntax<T>(syntax: number, prec: number, state: number, parser?:
     }
     if (result && !stateOuter && memo.length! >= position + 2) {
       assert(!(stateOuter & memo.targets));
-      memo.clear(position + 2);
+      memo.resize(position + 2);
     }
     context.state = stateOuter;
     return result;

package/src/parser/api/bind.ts

@@ -1,11 +1,9 @@
 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';
-import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
@@ -24,12 +22,12 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
   let context: MarkdownParser.Context = {
     ...settings,
     host: settings.host ?? new ReadonlyURL(location.pathname, location.origin),
-    memo: new Memo({ targets: State.backtrackers }),
   };
   assert(!context.offset);
   assert(!context.precedence);
   assert(!context.delimiters);
   assert(!context.state);
+  assert(!context.memo);
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   type Block = readonly [segment: string, blocks: readonly HTMLElement[], url: string];

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

@@ -333,7 +333,6 @@ describe('Unit: parser/api/parse', () => {
 
     it('creation', function () {
       this.timeout(5000);
-      // 実測500ms程度
       assert.deepStrictEqual(
         [...parse('.'.repeat(20000)).children].map(el => el.outerHTML),
         [`<p>${'.'.repeat(20000)}</p>`]);
@@ -341,7 +340,6 @@ describe('Unit: parser/api/parse', () => {
 
     it('creation error', function () {
       this.timeout(5000);
-      // 実測500ms程度
       assert.deepStrictEqual(
         [...parse('.'.repeat(20001)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [
@@ -350,6 +348,16 @@ describe('Unit: parser/api/parse', () => {
         ]);
     });
 
+    it('recovery', function () {
+      this.timeout(5000);
+      assert.deepStrictEqual(
+        [...parse(`!>> ${'['.repeat(20)}${'{a}'.repeat(518)}\n> ${'{a}'.repeat(4)}\n\na`).children].map(el => el.outerHTML),
+        [
+          `<blockquote><blockquote><section><p>${'['.repeat(20)}${'<a class="url" href="a">a</a>'.repeat(518)}</p><h2>References</h2><ol class="references"></ol></section></blockquote><section><h1 class="error">Error: Too many creations</h1><pre class="error" translate="no">{a}{a}{a}{a}</pre><h2>References</h2><ol class="references"></ol></section></blockquote>`,
+          '<p>a</p>',
+        ]);
+    });
+
   });
 
 });

package/src/parser/api/parse.ts

@@ -1,11 +1,9 @@
 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';
-import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
@@ -26,15 +24,13 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     url: url ? new ReadonlyURL(url as ':') : context?.url,
     id: opts.id ?? context?.id,
     caches: context?.caches,
-    ...context?.resources && {
-      resources: context.resources,
-    },
-    memo: new Memo({ targets: State.backtrackers }),
+    resources: context?.resources,
   };
   assert(!context.offset);
   assert(!context.precedence);
   assert(!context.delimiters);
   assert(!context.state);
+  assert(!context.memo);
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();

package/src/parser/block.ts

@@ -1,5 +1,6 @@
 import { MarkdownParser } from '../../markdown';
 import { union, reset, creation, open, fallback, recover } from '../combinator';
+import { Memo } from '../combinator/data/parser/context/memo';
 import { emptyline } from './source';
 import { pagebreak } from './block/pagebreak';
 import { heading } from './block/heading';
@@ -16,6 +17,7 @@ import { blockquote } from './block/blockquote';
 import { mediablock } from './block/mediablock';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
+import { State } from './context';
 import { rnd0Z } from 'spica/random';
 import { html } from 'typed-dom/dom';
 
@@ -36,9 +38,9 @@ export import MediaBlockParser = BlockParser.MediaBlockParser;
 export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
-export const block: BlockParser = creation(0, false, error(
-  reset({ resources: { clock: 20000, recursion: 20 + 1 } },
-  union([
+export const block: BlockParser = creation(0, false,
+  reset({ resources: { clock: 20000, recursion: 20 + 1 }, memo: new Memo(State.backtrackers) },
+  error(union([
     emptyline,
     pagebreak,
     heading,

package/src/parser/inline/bracket.ts

@@ -20,10 +20,28 @@ export const bracket: BracketParser = lazy(() => union([
   surround(str('['), creation(syntax(Syntax.bracket, 2, State.none, some(inline, ']', [[/^\\?\n/, 3], [']', 2]]))), str(']'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('［'), creation(syntax(Syntax.bracket, 2, State.none, some(inline, '］', [[/^\\?\n/, 3], ['］', 2]]))), str('］'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('{'), creation(syntax(Syntax.bracket, 2, State.none, some(inline, '}', [[/^\\?\n/, 3], ['}', 2]]))), str('}'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('｛'), creation(syntax(Syntax.bracket, 2, State.none, some(inline, '｝', [[/^\\?\n/, 3], ['｝', 2]]))), str('｝'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('"'), creation(syntax(Syntax.none, 3, State.none, some(inline, '"', [[/^\\?\n/, 4], ['"', 3]]))), str('"'), true,
     undefined,
     ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('“'), creation(syntax(Syntax.none, 3, State.none, some(inline, '”', [[/^\\?\n/, 4], ['”', 3]]))), str('”'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('‘'), creation(syntax(Syntax.none, 3, State.none, some(inline, '’', [[/^\\?\n/, 4], ['’', 3]]))), str('’'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('「'), creation(syntax(Syntax.none, 3, State.none, some(inline, '」', [[/^\\?\n/, 4], ['」', 3]]))), str('」'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
+  surround(str('『'), creation(syntax(Syntax.none, 3, State.none, some(inline, '』', [[/^\\?\n/, 4], ['』', 3]]))), str('』'), true,
+    undefined,
+    ([as, bs = []], rest) => [unshift(as, bs), rest]),
 ]));

package/src/parser/source/text.ts

@@ -3,7 +3,7 @@ import { union, creation, focus } from '../../combinator';
 import { str } from './str';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /[\s\x00-\x7F（）]|\S[#>]/u;
+export const delimiter = /[\s\x00-\x7F（）［］｛｝“”‘’「」『』]|\S[#>]/u;
 export const nonWhitespace = /[\S\n]|$/u;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/u;
 const repeat = str(/^(.)\1*/);