securemark 0.296.2 → 0.296.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.296.3
+
+- Refactoring.
+
 ## 0.296.2
 
 - Fix leading blank character validation with nested syntax.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.296.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.296.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"));
@@ -3113,7 +3113,7 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
     }
-    const nodesC = nodesM || optional ? closer(input) : undefined;
+    const nodesC = optional || nodesM ? closer(input) : undefined;
     context.range = context.position - position;
     if (nodesC === undefined) {
       wbs && setBacktrack(context, wbs, position);
@@ -3720,15 +3720,24 @@ exports.constraint = exports.state = exports.precedence = exports.recursion = ex
 const alias_1 = __webpack_require__(5413);
 const assign_1 = __webpack_require__(9888);
 function reset(base, parser) {
-  const changes = Object.entries(base);
-  const values = Array(changes.length);
-  return ({
-    context
-  }) =>
-  // 大域離脱時の汚染回避のため複製
-  apply(parser, {
-    ...context
-  }, changes, values, true);
+  return input => {
+    const {
+      context
+    } = input;
+    // @ts-expect-error
+    context.resources ??= {
+      clock: base.resources?.clock,
+      recursions: base.resources?.recursions.slice()
+    };
+    context.backtracks = {};
+    return parser(input);
+  };
+  // removed by dead control flow
+
+  // removed by dead control flow
+
+  // removed by dead control flow
+
 }
 exports.reset = reset;
 function context(base, parser) {
@@ -4228,7 +4237,7 @@ function bind(target, settings) {
     context.header = true;
     for (; index < sourceSegments.length - last; ++index) {
       const seg = sourceSegments[index];
-      const es = (0, block_1.block)((0, parser_1.input)(seg, context))?.foldl((acc, {
+      const es = (0, block_1.block)((0, parser_1.input)(seg, new context_1.Context(context)))?.foldl((acc, {
         value
       }) => void acc.push(value) || acc, []) ?? [];
       // @ts-expect-error
@@ -4237,7 +4246,7 @@ function bind(target, settings) {
       if (es.length === 0) continue;
       // All deletion processes always run after all addition processes have done.
       // Therefore any `base` node will never be unavailable by deletions until all the dependent `el` nodes are added.
-      (0, array_1.push)(adds, es.map(el => [el, base]));
+      adds.push(...es.map(el => [el, base]));
       adds.reverse();
       for (; adds.length > 0;) {
         const [el, base] = adds.pop();
@@ -4254,7 +4263,7 @@ function bind(target, settings) {
     for (let refuse = (0, array_1.splice)(blocks, index, blocks.length - sourceSegments.length), i = 0; i < refuse.length; ++i) {
       const es = refuse[i][1];
       if (es.length === 0) continue;
-      (0, array_1.push)(dels, es.map(el => [el]));
+      dels.push(...es.map(el => [el]));
     }
     adds.reverse();
     for (; adds.length > 0;) {
@@ -4539,7 +4548,7 @@ function parse(source, options = {}, context) {
   // @ts-expect-error
   context.header = true;
   for (const seg of (0, segment_1.segment)(source)) {
-    node.append(...((0, block_1.block)((0, parser_1.input)(seg, context))?.foldl((acc, {
+    node.append(...((0, block_1.block)((0, parser_1.input)(seg, new context_1.Context(context)))?.foldl((acc, {
       value
     }) => void acc.push(value) || acc, []) ?? []));
     // @ts-expect-error

package/package.json

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

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

@@ -103,7 +103,7 @@ export function surround<N>(
       const result = g?.([nodesO, nodesM], context);
       return result || void revert(context, linebreak);
     }
-    const nodesC = nodesM || optional ? closer(input) : undefined;
+    const nodesC = optional || nodesM ? closer(input) : undefined;
     context.range = context.position - position;
     if (nodesC === undefined) {
       wbs && setBacktrack(context, wbs, position);

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

@@ -21,9 +21,9 @@ describe('Unit: combinator/data/parser/context', () => {
       const ctx: Ctx = new Context();
       assert.deepStrictEqual([...unwrap(reset(base, parser)(input('123', ctx))!)], [3, 2, 1]);
       assert(base.resources?.clock === 3);
-      assert(ctx.resources?.clock === undefined);
+      assert(ctx.resources?.clock === 0);
       assert.throws(() => reset(base, parser)(input('1234', ctx)));
-      assert(ctx.resources?.clock === undefined);
+      assert(ctx.resources?.clock === 0);
     });
 
     it('node', () => {

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

@@ -4,13 +4,22 @@ import { clone } from 'spica/assign';
 
 export function reset<P extends Parser>(base: Options, parser: P): P;
 export function reset<N>(base: Context, parser: Parser<N>): Parser<N> {
+  return input => {
+    const { context } = input;
+    // @ts-expect-error
+    context.resources ??= {
+      clock: base.resources?.clock,
+      recursions: base.resources?.recursions.slice(),
+    };
+    context.backtracks = {};
+    return parser(input);
+  };
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
   const changes = Object.entries(base);
   const values = Array(changes.length);
   return ({ context }) =>
-    // 大域離脱時の汚染回避のため複製
-    apply(parser, { ...context }, changes, values, true);
+    apply(parser, context, changes, values, true);
 }
 
 export function context<P extends Parser>(base: Options, parser: P): P;

package/src/parser/api/bind.ts

@@ -8,7 +8,7 @@ import { headers } from './header';
 import { figure } from '../processor/figure';
 import { note } from '../processor/note';
 import { ReadonlyURL } from 'spica/url';
-import { push, splice } from 'spica/array';
+import { splice } from 'spica/array';
 
 interface Settings extends ParserSettings {
 }
@@ -29,8 +29,8 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   type Block = readonly [segment: string, blocks: readonly HTMLElement[], url: string];
   const blocks: Block[] = [];
-  const adds: [HTMLElement, Node | null][] = [];
-  const dels: [HTMLElement][] = [];
+  const adds: (readonly [HTMLElement, Node | null])[] = [];
+  const dels: (readonly [HTMLElement])[] = [];
   const bottom = target.firstChild;
   let revision: symbol | undefined;
   return {
@@ -75,7 +75,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
     for (; index < sourceSegments.length - last; ++index) {
       assert(rev === revision);
       const seg = sourceSegments[index];
-      const es = block(input(seg, context))
+      const es = block(input(seg, new Context(context)))
         ?.foldl<HTMLElement[]>((acc, { value }) => void acc.push(value) || acc, []) ?? [];
       // @ts-expect-error
       context.header = false;
@@ -83,7 +83,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       if (es.length === 0) continue;
       // All deletion processes always run after all addition processes have done.
       // Therefore any `base` node will never be unavailable by deletions until all the dependent `el` nodes are added.
-      push(adds, es.map(el => [el, base] as const));
+      adds.push(...es.map(el => [el, base] as const));
       adds.reverse();
       for (; adds.length > 0;) {
         assert(rev === revision);
@@ -98,7 +98,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       assert(rev === revision);
       const es = refuse[i][1];
       if (es.length === 0) continue;
-      push(dels, es.map(el => [el]));
+      dels.push(...es.map(el => [el] as const));
     }
     assert(blocks.length === sourceSegments.length);
     adds.reverse();

package/src/parser/api/parse.ts

@@ -34,7 +34,7 @@ export function parse(source: string, options: Options = {}, context?: Context):
   context.header = true;
   for (const seg of segment(source)) {
     node.append(
-      ...block(input(seg, context))
+      ...block(input(seg, new Context(context)))
         ?.foldl<HTMLElement[]>((acc, { value }) => void acc.push(value) || acc, []) ?? []);
     // @ts-expect-error
     context.header = false;