securemark 0.281.2 → 0.281.4

package/CHANGELOG.md

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

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.281.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.281.4 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', ({
@@ -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__) => {
 
@@ -6100,7 +6120,7 @@ function identity(type, id, text) {
   const str = text.replace(/\s/g, '_');
   const cs = [...str];
   if (type === '' || cs.length <= MAX) {
-    return `${type}:${id ?? ''}:${str}${/_|[^\S ]/.test(text) ? `=${hash(text)}` : ''}`;
+    return `${type}:${id ?? ''}:${str}${/_|[^\S ]|=[0-9a-z]{1,7}$/.test(text) ? `=${hash(text)}` : ''}`;
   }
   const s1 = cs.slice(0, PART + REM).join('');
   const s2 = cs.slice(-PART).join('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.281.2",
+  "version": "0.281.4",
   "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.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/indexee.ts

@@ -32,7 +32,7 @@ export function identity(
   const str = text.replace(/\s/g, '_');
   const cs = [...str];
   if (type === '' || cs.length <= MAX) {
-    return `${type}:${id ?? ''}:${str}${/_|[^\S ]/.test(text) ? `=${hash(text)}` : ''}`;
+    return `${type}:${id ?? ''}:${str}${/_|[^\S ]|=[0-9a-z]{1,7}$/.test(text) ? `=${hash(text)}` : ''}`;
   }
   const s1 = cs.slice(0, PART + REM).join('');
   const s2 = cs.slice(-PART).join('');
@@ -48,6 +48,9 @@ assert.notDeepStrictEqual(
 assert.notDeepStrictEqual(
   identity('index', undefined, '0 0'),
   identity('index', undefined, '0\t0'));
+assert.notDeepStrictEqual(
+  identity('index', undefined, '0_0'),
+  identity('index', undefined, identity('index', undefined, '0_0')!.slice(7).replace('_', ' ')));
 assert.deepStrictEqual(
   identity('index', undefined, `${'0'.repeat(MAX - 1)}1`)!.slice(7),
   `${'0'.repeat(MAX - 1)}1`);

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

@@ -30,7 +30,7 @@ describe('Unit: parser/inline/mark', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('==a==')), [['<mark id="mark::a">a</mark>', '<a href="#mark::a"></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('==a=b==')), [['<mark id="mark::a=b">a=b</mark>', '<a href="#mark::a=b"></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a=b==')), [['<mark id="mark::a=b=1aef5x1">a=b</mark>', '<a href="#mark::a=b=1aef5x1"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('==\\===')), [['<mark id="mark::=">=</mark>', '<a href="#mark::="></a>'], '']);
       assert.deepStrictEqual(inspect(parser('==a===')), [['<mark id="mark::a">a</mark>', '<a href="#mark::a"></a>'], '=']);
     });