securemark 0.281.1 → 0.281.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.281.3
+
+- Refactoring.
+
+## 0.281.2
+
+- Fix identifiers.
+
 ## 0.281.1
 
 - Fix identifiers.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.281.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.281.3 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"));
@@ -3169,6 +3169,7 @@ function context(base, parser) {
 }
 exports.context = context;
 function apply(parser, source, context, changes, values, reset = false) {
+  reset && context.memo?.clear();
   for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
@@ -3190,9 +3191,6 @@ function apply(parser, source, context, changes, values, reset = false) {
     switch (prop) {
       case 'resources':
         break;
-      case 'memo':
-        context.memo.clear();
-        break;
     }
     context[prop] = values[i];
     values[i] = undefined;
@@ -3441,7 +3439,7 @@ Delimiters.matcher = (0, memoize_1.memoize)(pattern => {
 /***/ }),
 
 /***/ 1074:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -3450,15 +3448,17 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.Memo = void 0;
+const alias_1 = __webpack_require__(5413);
 class Memo {
   constructor(targets = ~0, margin = 0) {
     this.targets = targets;
     this.margin = margin;
-    this.memory = [];
+    this.memory = {};
     this.count = 0;
+    this.$length = 0;
   }
   get length() {
-    return this.memory.length;
+    return this.$length;
   }
   get(position, syntax, state) {
     if (this.count === 0) return;
@@ -3467,21 +3467,23 @@ class Memo {
     return cache?.length === 2 ? [cache[0].slice(), cache[1]] : cache;
   }
   set(position, syntax, state, nodes, offset) {
-    this.count += +!this.memory[position - 1];
-    const record = this.memory[position - 1] ??= {};
+    this.$length = (0, alias_1.max)(this.$length, position);
+    const record = this.memory[position - 1] ??= (++this.count, {});
     (record[syntax] ??= {})[state] = nodes ? [nodes.slice(), offset] : [];
     //console.log('set', position, syntax, state, record[syntax]?.[state]);
   }
   resize(position) {
     const memory = this.memory;
-    for (let i = memory.length; i > position; --i) {
-      this.count -= +memory.pop();
+    for (let i = this.$length; i > position; this.$length = --i) {
+      if (!(i in memory)) continue;
+      memory[i] &&= (--this.count, undefined);
     }
     //console.log('resize', position + 1);
   }
   clear() {
-    this.memory = [];
+    this.memory = {};
     this.count = 0;
+    this.$length = 0;
   }
 }
 exports.Memo = Memo;
@@ -3787,6 +3789,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.bind = void 0;
 const parser_1 = __webpack_require__(605);
+const memo_1 = __webpack_require__(1074);
+const context_1 = __webpack_require__(8669);
 const segment_1 = __webpack_require__(3967);
 const header_1 = __webpack_require__(3009);
 const block_1 = __webpack_require__(7099);
@@ -3799,7 +3803,8 @@ const array_1 = __webpack_require__(6876);
 function bind(target, settings) {
   let context = {
     ...settings,
-    host: settings.host ?? new url_1.ReadonlyURL(location.pathname, location.origin)
+    host: settings.host ?? new url_1.ReadonlyURL(location.pathname, location.origin),
+    memo: new memo_1.Memo(508 /* Syntax.targets */, context_1.Margin)
   };
   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}`);
@@ -4124,6 +4129,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.parse = void 0;
 const parser_1 = __webpack_require__(605);
+const memo_1 = __webpack_require__(1074);
+const context_1 = __webpack_require__(8669);
 const segment_1 = __webpack_require__(3967);
 const header_1 = __webpack_require__(3009);
 const block_1 = __webpack_require__(7099);
@@ -4142,7 +4149,8 @@ function parse(source, opts = {}, context) {
     url: url ? new url_1.ReadonlyURL(url) : context?.url,
     id: opts.id ?? context?.id,
     caches: context?.caches,
-    resources: context?.resources
+    resources: context?.resources,
+    memo: new memo_1.Memo(508 /* Syntax.targets */, context_1.Margin)
   };
   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}`);
@@ -4196,7 +4204,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.block = void 0;
 const combinator_1 = __webpack_require__(3484);
-const memo_1 = __webpack_require__(1074);
 const source_1 = __webpack_require__(8745);
 const pagebreak_1 = __webpack_require__(2946);
 const heading_1 = __webpack_require__(2778);
@@ -4219,8 +4226,7 @@ exports.block = (0, combinator_1.creation)(0, false, (0, combinator_1.reset)({
   resources: {
     clock: 20000,
     recursion: 20 + 1
-  },
-  memo: new memo_1.Memo(508 /* Syntax.targets */, 2)
+  }
 }, 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', ({
@@ -4437,7 +4443,7 @@ exports.aside = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, co
     'data-invalid-message': 'Missing the title at the first line'
   }, `${opener}${body}${closer}`)];
   return [(0, dom_1.html)('aside', {
-    id: (0, indexee_1.identity)(context.id, (0, indexee_1.index)(heading)),
+    id: (0, indexee_1.identity)('index', context.id, heading),
     class: 'aside'
   }, [document, (0, dom_1.html)('h2', 'References'), references])];
 })));
@@ -5199,7 +5205,7 @@ exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combina
 exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => idx(ms[1]), [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => idx(ms[1]), []))])));
 const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, combinator_1.trim)((0, visibility_1.visualize)((0, util_1.lineable)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), ulist_1.invalid), ns => [(0, dom_1.html)('li', {
   'data-marker': ns.shift() || undefined
-}, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))]), true)]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
+}, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))]))]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
 const heads = {
   '.': (0, combinator_1.focus)(openers['.'], ({
     source
@@ -5523,7 +5529,7 @@ const visibility_1 = __webpack_require__(6364);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, exports.ulist_)));
-exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, combinator_1.trim)((0, visibility_1.visualize)((0, util_1.lineable)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
+exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, combinator_1.trim)((0, visibility_1.visualize)((0, util_1.lineable)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]))])))), es => [format((0, dom_1.html)('ul', es))])));
 exports.checkbox = (0, combinator_1.creation)(1, false, (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, ({
   source
 }) => [[(0, dom_1.html)('span', {
@@ -5552,6 +5558,20 @@ function format(list) {
 
 /***/ }),
 
+/***/ 8669:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Margin = void 0;
+exports.Margin = 2;
+
+/***/ }),
+
 /***/ 3009:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -6057,7 +6077,7 @@ exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0
 })]))));
 exports.signature = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('|', (0, combinator_1.creation)((0, combinator_1.fmap)((0, combinator_1.open)('|', (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ']'))), ns => [(0, dom_1.html)('span', {
   class: 'indexer',
-  'data-index': (0, indexee_1.identity)(undefined, ns.join('')).slice(7)
+  'data-index': (0, indexee_1.identity)('index', undefined, ns.join('')).slice(7)
 })]))));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(3, (0, combinator_1.some)(source_1.txt, '"')), (0, source_1.str)('"'), true)])));
 
@@ -6072,15 +6092,15 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, comb
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.text = exports.signature = exports.index = exports.identity = exports.indexee = void 0;
+exports.text = exports.signature = exports.identity = exports.indexee = void 0;
 const combinator_1 = __webpack_require__(3484);
 const memoize_1 = __webpack_require__(6925);
 const dom_1 = __webpack_require__(394);
-function indexee(parser, optional) {
+function indexee(parser) {
   return (0, combinator_1.fmap)(parser, ([el], _, {
     id
   }) => [(0, dom_1.define)(el, {
-    id: identity(id, index(el, optional))
+    id: identity('index', id, el)
   })]);
 }
 exports.indexee = indexee;
@@ -6088,20 +6108,23 @@ const MAX = 60;
 const ELLIPSIS = '...';
 const PART = (MAX - ELLIPSIS.length) / 2 | 0;
 const REM = MAX - PART * 2 - ELLIPSIS.length;
-function identity(id, text, type = 'index') {
+function identity(type, id, text) {
   if (id === '') return undefined;
+  if (typeof text !== 'string') {
+    const index = text.querySelector(':scope > .indexer')?.getAttribute('data-index');
+    if (index === '' && text.tagName === 'LI') return undefined;
+    return index ? `${type}:${id ?? ''}:${index}` : identity(type, id, signature(text));
+  }
   text = text.trim();
   if (text === '') return undefined;
   const str = text.replace(/\s/g, '_');
   const cs = [...str];
-  if (cs.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
-  switch (type) {
-    case 'index':
-    case 'mark':
-      const s1 = cs.slice(0, PART + REM).join('');
-      const s2 = cs.slice(-PART).join('');
-      return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text).toString(36)}`;
+  if (type === '' || cs.length <= MAX) {
+    return `${type}:${id ?? ''}:${str}${/_|[^\S ]/.test(text) ? `=${hash(text)}` : ''}`;
   }
+  const s1 = cs.slice(0, PART + REM).join('');
+  const s2 = cs.slice(-PART).join('');
+  return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text)}`;
 }
 exports.identity = identity;
 function hash(source) {
@@ -6112,17 +6135,8 @@ function hash(source) {
     x ^= x >>> 17;
     x ^= x << 15;
   }
-  return x >>> 0;
-}
-function index(source, optional = false) {
-  if (!source.firstChild) return '';
-  const indexer = source.querySelector(':scope > .indexer');
-  const text = indexer?.getAttribute('data-index');
-  if (text === '' && optional) return '';
-  if (text) return [...text].length <= MAX ? text : text.replace(/=\w{1,7}$/, '');
-  return signature(source);
+  return (x >>> 0).toString(36);
 }
-exports.index = index;
 function signature(source) {
   const target = source.cloneNode(true);
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
@@ -6539,7 +6553,7 @@ exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combi
 }) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)(bs));
   return [[(0, dom_1.define)(el, {
-    id: (0, indexee_1.identity)(id, (0, indexee_1.signature)(el), 'mark')
+    id: (0, indexee_1.identity)('mark', id, (0, indexee_1.signature)(el))
   }), el.id && (0, dom_1.html)('a', {
     href: `#${el.id}`
   })], rest];
@@ -7054,7 +7068,7 @@ function build(syntax, marker, splitter = '') {
     const content = ref.firstElementChild;
     content.replaceWith(content.cloneNode());
     const abbr = ref.getAttribute('data-abbr') ?? '';
-    const identifier = abbr ? (0, indexee_1.identity)(undefined, abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ?? abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ?? abbr, '')?.slice(2) || '' : (0, indexee_1.identity)(undefined, (0, indexee_1.signature)(content), 'mark')?.slice(6) || '';
+    const identifier = abbr ? (0, indexee_1.identity)('', undefined, abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ?? abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ?? abbr)?.slice(2) || '' : (0, indexee_1.identity)('mark', undefined, (0, indexee_1.signature)(content))?.slice(6) || '';
     return {
       content,
       identifier,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.281.1",
+  "version": "0.281.3",
   "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,19 +1,22 @@
+import { max } from 'spica/alias';
+
 export class Memo {
   constructor(
     public readonly targets = ~0,
     public readonly margin = 0,
   ) {
   }
-  private memory: Record<number, Record<number, readonly [any[], number] | readonly []>>[/* pos */] = [];
+  private memory: Record<number, Record<number, Record<number, readonly [unknown[], number] | readonly []>> | undefined> = {};
   private count = 0;
+  private $length = 0;
   public get length(): number {
-    return this.memory.length;
+    return this.$length;
   }
   public get(
     position: number,
     syntax: number,
     state: number,
-  ): readonly [any[], number] | readonly [] | undefined {
+  ): readonly [unknown[], number] | readonly [] | undefined {
     assert(position > 0);
     if (this.count === 0) return;
     //console.log('get', position, syntax, state, this.memory[position - 1]?.[syntax]?.[state]);
@@ -26,12 +29,12 @@ export class Memo {
     position: number,
     syntax: number,
     state: number,
-    nodes: any[] | undefined,
+    nodes: unknown[] | undefined,
     offset: number,
   ): void {
     assert(position > 0);
-    this.count += +!this.memory[position - 1];
-    const record = this.memory[position - 1] ??= {};
+    this.$length = max(this.$length, position);
+    const record = this.memory[position - 1] ??= (++this.count, {});
     assert(!record[syntax]?.[state]);
     (record[syntax] ??= {})[state] = nodes
       ? [nodes.slice(), offset]
@@ -40,13 +43,15 @@ export class Memo {
   }
   public resize(position: number): void {
     const memory = this.memory;
-    for (let i = memory.length; i > position; --i) {
-      this.count -= +memory.pop()!;
+    for (let i = this.$length; i > position; this.$length = --i) {
+      if (!(i in memory)) continue;
+      memory[i] &&= (--this.count, undefined);
     }
     //console.log('resize', position + 1);
   }
   public clear(): void {
-    this.memory = [];
+    this.memory = {};
     this.count = 0;
+    this.$length = 0;
   }
 }

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

@@ -24,6 +24,7 @@ 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> {
+  reset && context.memo?.clear();
   for (let i = 0; i < changes.length; ++i) {
     const change = changes[i];
     const prop = change[0];
@@ -34,7 +35,6 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: read
         assert(!context.precedence);
         assert(!context.delimiters);
         assert(!context.state);
-        assert(!context.memo);
         context[prop as string] ??= ObjectCreate(change[1] as object);
         continue;
     }
@@ -49,10 +49,6 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: read
       case 'resources':
         assert(reset);
         break;
-      case 'memo':
-        assert(reset);
-        context.memo!.clear();
-        break;
     }
     context[prop] = values[i];
     values[i] = undefined;
@@ -61,7 +57,7 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: read
 }
 
 export function syntax<P extends Parser<unknown>>(syntax: number, precedence: number, state: number, parser: P): P;
-export function syntax<T>(syntax: number, prec: number, state: number, parser?: Parser<T>): Parser<T> {
+export function syntax<T>(syntax: number, prec: number, state: number, parser: Parser<T>): Parser<T> {
   return precedence(prec, ({ source, context }) => {
     if (source === '') return;
     const memo = context.memo ??= new Memo();
@@ -73,12 +69,12 @@ export function syntax<T>(syntax: number, prec: number, state: number, parser?:
     const result: Result<T> = cache
       ? cache.length === 0
         ? undefined
-        : [cache[0], source.slice(cache[1])]
-      : parser!({ source, context });
+        : [cache[0] as T[], source.slice(cache[1])]
+      : parser({ source, context });
     if (stateOuter && !cache && syntax & memo.targets) {
       memo.set(position, syntax, stateInner, eval(result), source.length - exec(result, '').length);
     }
-    else if (!stateOuter && result && memo.length! >= position + memo.margin) {
+    else if (!stateOuter && result && memo.length >= position + memo.margin) {
       memo.resize(position + memo.margin);
     }
     context.state = stateOuter;

package/src/parser/api/bind.ts

@@ -1,6 +1,8 @@
 import { ParserSettings, Progress } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
+import { Memo } from '../../combinator/data/parser/context/memo';
+import { Syntax, Margin } from '../context';
 import { segment, validate, MAX_INPUT_SIZE } from '../segment';
 import { header } from '../header';
 import { block } from '../block';
@@ -22,12 +24,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(Syntax.targets, Margin),
   };
   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.ts

@@ -1,6 +1,8 @@
 import { ParserOptions } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
+import { Memo } from '../../combinator/data/parser/context/memo';
+import { Syntax, Margin } from '../context';
 import { segment, validate, MAX_SEGMENT_SIZE } from '../segment';
 import { header } from '../header';
 import { block } from '../block';
@@ -25,12 +27,12 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     id: opts.id ?? context?.id,
     caches: context?.caches,
     resources: context?.resources,
+    memo: new Memo(Syntax.targets, Margin),
   };
   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/extension/aside.ts

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../block';
 import { block, validate, fence, fmap } from '../../../combinator';
-import { identity, index } from '../../inline/extension/indexee';
+import { identity } from '../../inline/extension/indexee';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
@@ -34,9 +34,9 @@ export const aside: ExtensionParser.AsideParser = block(validate('~~~', fmap(
       'data-invalid-type': 'content',
       'data-invalid-message': 'Missing the title at the first line',
     }, `${opener}${body}${closer}`)];
-    assert(identity(context.id, index(heading)));
+    assert(identity('index', context.id, heading));
     return [
-      html('aside', { id: identity(context.id, index(heading)), class: 'aside' }, [
+      html('aside', { id: identity('index', context.id, heading), class: 'aside' }, [
         document,
         html('h2', 'References'),
         references,

package/src/parser/block/olist.ts

@@ -39,7 +39,7 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),
-      ns => [html('li', { 'data-marker': ns.shift() as string || undefined }, defrag(fillFirstLine(ns)))]), true),
+      ns => [html('li', { 'data-marker': ns.shift() as string || undefined }, defrag(fillFirstLine(ns)))])),
   ]))),
   es => [format(html('ol', es), type, form)]);
 

package/src/parser/block/ulist.ts

@@ -26,7 +26,7 @@ export const ulist_: UListParser = lazy(() => block(fmap(validate(
         indent(union([ulist_, olist_, ilist_])),
       ]),
       invalid),
-      ns => [html('li', defrag(fillFirstLine(ns)))]), true),
+      ns => [html('li', defrag(fillFirstLine(ns)))])),
   ])))),
   es => [format(html('ul', es))])));
 

package/src/parser/block.ts

@@ -1,6 +1,5 @@
 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';
@@ -17,7 +16,6 @@ import { blockquote } from './block/blockquote';
 import { mediablock } from './block/mediablock';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
-import { Syntax } from './context';
 import { rnd0Z } from 'spica/random';
 import { html } from 'typed-dom/dom';
 
@@ -41,7 +39,6 @@ export import ParagraphParser = BlockParser.ParagraphParser;
 export const block: BlockParser = creation(0, false,
   reset({
     resources: { clock: 20000, recursion: 20 + 1 },
-    memo: new Memo(Syntax.targets, 2),
   },
   error(union([
     emptyline,

package/src/parser/context.ts

@@ -39,3 +39,5 @@ export const enum State {
     | State.mark
     | State.autolink,
 }
+
+export const Margin = 2;

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

@@ -44,13 +44,15 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a ]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a  ]')), [['<a class="index" href="#index::a">a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a b]')), [['<a class="index" href="#index::a_b">a b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index::a__b">a  b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a \\ ]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a &nbsp;]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a <wbr>]')), [['<a class="index" href="#index::a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a [% b %]]')), [['<a class="index" href="#index::a">a <span class="remark"><input type="checkbox"><span>[% b %]</span></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a\\ ]')), [['<a class="index" href="#index::a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a b]')), [['<a class="index" href="#index::a_b">a b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index::a__b">a  b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a\tb]')), [['<a class="index" href="#index::a_b=1eu1tj4">a\tb</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a_b]')), [['<a class="index" href="#index::a_b=10dxc9b">a_b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a\\ b]')), [['<a class="index" href="#index::a_b">a b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#[]]')), [['<a class="index" href="#index::[]">[]</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#\\]]')), [['<a class="index" href="#index::]">]</a>'], '']);
@@ -85,6 +87,8 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a|*b*]')), [['<a class="index" href="#index::*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|b c]')), [['<a class="index" href="#index::b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|b  c]')), [['<a class="index" href="#index::b__c">a<span class="indexer" data-index="b__c"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|b\tc]')), [['<a class="index" href="#index::b_c=3p5wqt">a<span class="indexer" data-index="b_c=3p5wqt"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|b_c]')), [['<a class="index" href="#index::b_c=fvw9e2">a<span class="indexer" data-index="b_c=fvw9e2"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|[]]')), [['<a class="index" href="#index::[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|&copy;]')), [['<a class="index" href="#index::&amp;copy;">a<span class="indexer" data-index="&amp;copy;"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a |b]')), [['<a class="index" href="#index::b">a<span class="indexer" data-index="b"></span></a>'], '']);

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

@@ -34,7 +34,7 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', c
   '|',
   startTight(some(union([bracket, txt]), ']'))),
   ns => [
-    html('span', { class: 'indexer', 'data-index': identity(undefined, ns.join(''))!.slice(7) }),
+    html('span', { class: 'indexer', 'data-index': identity('index', undefined, ns.join(''))!.slice(7) }),
   ]))));
 
 const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => creation(union([

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

@@ -4,9 +4,9 @@ import { fmap } from '../../../combinator';
 import { reduce } from 'spica/memoize';
 import { define } from 'typed-dom/dom';
 
-export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P, optional?: boolean): P;
-export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>, optional?: boolean): Parser<HTMLElement> {
-  return fmap(parser, ([el], _, { id }) => [define(el, { id: identity(id, index(el, optional)) })]);
+export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P): P;
+export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>): Parser<HTMLElement> {
+  return fmap(parser, ([el], _, { id }) => [define(el, { id: identity('index', id, el) })]);
 }
 
 const MAX = 60;
@@ -14,44 +14,50 @@ const ELLIPSIS = '...';
 const PART = (MAX - ELLIPSIS.length) / 2 | 0;
 const REM = MAX - PART * 2 - ELLIPSIS.length;
 export function identity(
+  type: 'index' | 'mark' | '',
   id: string | undefined,
-  text: string,
-  type: 'index' | 'mark' | '' = 'index',
+  text: string | HTMLElement,
 ): string | undefined {
   assert(id?.match(/^[0-9a-z/-]*$/i) ?? true);
-  assert(!text.includes('\n'));
   if (id === '') return undefined;
+  if (typeof text !== 'string') {
+    const index = text.querySelector(':scope > .indexer')?.getAttribute('data-index');
+    if (index === '' && text.tagName === 'LI') return undefined;
+    return index
+      ? `${type}:${id ?? ''}:${index}`
+      : identity(type, id, signature(text));
+  }
   text = text.trim();
   if (text === '') return undefined;
   const str = text.replace(/\s/g, '_');
   const cs = [...str];
-  if (cs.length <= MAX || type === '') return `${type}:${id ?? ''}:${str}`;
-  switch (type) {
-    case 'index':
-    case 'mark':
-      const s1 = cs.slice(0, PART + REM).join('');
-      const s2 = cs.slice(-PART).join('');
-      assert([...`${s1}${ELLIPSIS}${s2}`].length === MAX);
-      return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text).toString(36)}`;
+  if (type === '' || cs.length <= MAX) {
+    return `${type}:${id ?? ''}:${str}${/_|[^\S ]/.test(text) ? `=${hash(text)}` : ''}`;
   }
-  assert(false);
+  const s1 = cs.slice(0, PART + REM).join('');
+  const s2 = cs.slice(-PART).join('');
+  assert([...`${s1}${ELLIPSIS}${s2}`].length === MAX);
+  return `${type}:${id ?? ''}:${s1}${ELLIPSIS}${s2}=${hash(text)}`;
 }
 assert.deepStrictEqual(
-  identity(undefined, `${'0'.repeat(MAX - 1)}1`)!.slice(7),
+  identity('index', undefined, ' 0 '),
+  identity('index', undefined, ' 0 '.trim()));
+assert.notDeepStrictEqual(
+  identity('index', undefined, '0 0'),
+  identity('index', undefined, '0_0'));
+assert.notDeepStrictEqual(
+  identity('index', undefined, '0 0'),
+  identity('index', undefined, '0\t0'));
+assert.deepStrictEqual(
+  identity('index', undefined, `${'0'.repeat(MAX - 1)}1`)!.slice(7),
   `${'0'.repeat(MAX - 1)}1`);
 assert.deepStrictEqual(
-  identity(undefined, `0${'1'.repeat(MAX / 2)}${'2'.repeat(MAX / 2)}3`)!.slice(7),
+  identity('index', undefined, `0${'1'.repeat(MAX / 2)}${'2'.repeat(MAX / 2)}3`)!.slice(7),
   `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=mhy513`);
 assert.deepStrictEqual(
-  identity(undefined, `0${'1'.repeat(MAX * 2)}${'2'.repeat(MAX * 2)}3`)!.slice(7),
+  identity('index', undefined, `0${'1'.repeat(MAX * 2)}${'2'.repeat(MAX * 2)}3`)!.slice(7),
   `0${'1'.repeat(PART + REM - 1)}${ELLIPSIS}${'2'.repeat(PART - 1)}3=12jqtiv`);
-assert.deepStrictEqual(
-  identity(undefined, ` ${'0 '.repeat(MAX)}`)!.slice(7),
-  identity(undefined, ` ${'0 '.repeat(MAX)}`.trim())!.slice(7));
-assert.notDeepStrictEqual(
-  identity(undefined, `${'0 '.repeat(MAX)}`)!.slice(7),
-  identity(undefined, `${'0_'.repeat(MAX)}`)!.slice(7));
-function hash(source: string): number {
+function hash(source: string): string {
   let x = 0;
   for (let i = 0; i < source.length; ++i) {
     x ^= source.charCodeAt(i) << 1 | 1; // 16+1bit
@@ -59,33 +65,12 @@ function hash(source: string): number {
     x ^= x >>> 17;
     x ^= x << 15;
   }
-  return x >>> 0;
+  return (x >>> 0).toString(36);
 }
-assert(hash('\x00') !== 0);
-assert(hash('\x01') !== 0);
+assert(hash('\x00') !== '0');
+assert(hash('\x01') !== '0');
 assert(hash('\x00') !== hash(String.fromCharCode(1 << 15)));
 
-export function index(source: Element, optional = false): string {
-  assert(!source.matches('.indexer'));
-  assert(source.querySelectorAll(':scope > .indexer').length <= 1);
-  if (!source.firstChild) return '';
-  const indexer = source.querySelector(':scope > .indexer');
-  const text = indexer?.getAttribute('data-index');
-  if (text === '' && optional) return '';
-  if (text) return [...text].length <= MAX ? text : text.replace(/=\w{1,7}$/, '');
-  return signature(source);
-}
-assert.deepStrictEqual(
-  index(define(document.createElement('b'), [
-    define(document.createElement('b'), { class: 'indexer', 'data-index': '0'.repeat(MAX - 2) + '=0' })
-  ])),
-  '0'.repeat(MAX - 2) + '=0');
-assert.deepStrictEqual(
-  index(define(document.createElement('b'), [
-    define(document.createElement('b'), { class: 'indexer', 'data-index': '0'.repeat(MAX) + '=0' })
-  ])),
-  '0'.repeat(MAX));
-
 export function signature(source: Element | DocumentFragment): string {
   assert(!navigator.userAgent.includes('Chrome') || !source.querySelector('br:not(:has(+ :is(ul, ol)))'));
   const target = source.cloneNode(true) as typeof source;

package/src/parser/inline/extension/indexer.test.ts

@@ -25,6 +25,8 @@ describe('Unit: parser/inline/extension/indexer', () => {
       assert.deepStrictEqual(inspect(parser(' [|a  ]')), [['<span class="indexer" data-index="a"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|a b]')), [['<span class="indexer" data-index="a_b"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|a  b]')), [['<span class="indexer" data-index="a__b"></span>'], '']);
+      assert.deepStrictEqual(inspect(parser(' [|a\tb]')), [['<span class="indexer" data-index="a_b=1eu1tj4"></span>'], '']);
+      assert.deepStrictEqual(inspect(parser(' [|a_b]')), [['<span class="indexer" data-index="a_b=10dxc9b"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|A]')), [['<span class="indexer" data-index="A"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|*A*]')), [['<span class="indexer" data-index="*A*"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [|`A`]')), [['<span class="indexer" data-index="`A`"></span>'], '']);

package/src/parser/inline/mark.test.ts

@@ -38,7 +38,7 @@ describe('Unit: parser/inline/mark', () => {
     it('nest', () => {
       assert.deepStrictEqual(inspect(parser('==a ==b====')), [['<mark id="mark::a_b">a <mark id="mark::b">b</mark><a href="#mark::b"></a></mark>', '<a href="#mark::a_b"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\\ ==b====')), [['<mark id="mark::a_b">a <mark id="mark::b">b</mark><a href="#mark::b"></a></mark>', '<a href="#mark::a_b"></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('==a&Tab;==b====')), [['<mark id="mark::a_b">a\t<mark id="mark::b">b</mark><a href="#mark::b"></a></mark>', '<a href="#mark::a_b"></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a&Tab;==b====')), [['<mark id="mark::a_b=1eu1tj4">a\t<mark id="mark::b">b</mark><a href="#mark::b"></a></mark>', '<a href="#mark::a_b=1eu1tj4"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('==a<wbr>==b====')), [['<mark id="mark::ab">a<wbr><mark id="mark::b">b</mark><a href="#mark::b"></a></mark>', '<a href="#mark::ab"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('==*==a==*==')), [['<mark id="mark::a"><em><mark id="mark::a">a</mark><a href="#mark::a"></a></em></mark>', '<a href="#mark::a"></a>'], '']);
     });

package/src/parser/inline/mark.ts

@@ -20,7 +20,7 @@ export const mark: MarkParser = lazy(() => creation(surround(
   ([, bs], rest, { id }) => {
     const el = html('mark', defrag(bs));
     return [[
-      define(el, { id: identity(id, signature(el), 'mark') }),
+      define(el, { id: identity('mark', id, signature(el)) }),
       el.id && html('a', { href: `#${el.id}` }),
     ], rest];
   },

package/src/parser/processor/note.ts

@@ -39,14 +39,14 @@ function build(
     const abbr = ref.getAttribute('data-abbr') ?? '';
     const identifier = abbr
       ? identity(
+          '',
           undefined,
           (
             abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ??
             abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ??
             abbr
-          ),
-          '')?.slice(2) || ''
-      : identity(undefined, signature(content), 'mark')?.slice(6) || '';
+          ))?.slice(2) || ''
+      : identity('mark', undefined, signature(content))?.slice(6) || '';
     return {
       content,
       identifier,