securemark 0.300.2 → 0.300.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.300.3
+
+- Refactoring.
+
 ## 0.300.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.300.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.300.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"));
@@ -6355,7 +6355,7 @@ class Input extends parser_1.Input {
     this.resources ??= {
       clock: -1,
       interval: 200,
-      recursions: [10 || 0 /* Recursion.document */, 100 || 0 /* Recursion.block */, 100 || 0 /* Recursion.inline */, 100 || 0 /* Recursion.bracket */]
+      recursions: [20 || 0 /* Recursion.document */, 100 || 0 /* Recursion.block */, 100 || 0 /* Recursion.inline */, 100 || 0 /* Recursion.bracket */]
     };
     this.segment = segment ?? 0 /* Segment.unknown */;
     this.header = header ?? true;
@@ -6413,29 +6413,54 @@ exports.document = (() => {
   const loop = (0, parser_2.build)(segment_1.parser, block_1.block);
   return (0, combinator_1.always)([(input, output) => {
     input.id = input.id === '' ? '' : input.local ? (0, util_1.randomID)() : input.id;
-    input.memory = input.notes ?? {
-      interpolation: true,
-      references: (0, dom_1.html)('ol', {
+    input.memory = {
+      interpolation: !input.notes,
+      references: input.notes?.references ?? (0, dom_1.html)('ol', {
         class: 'references'
       })
     };
     output.push();
     return output.context;
   }, (0, combinator_1.recursion)(0 /* Recursion.document */, (0, combinator_1.force)(() => loop)), (input, output) => {
-    const doc = (0, dom_1.frag)((0, util_1.unwrap)(output.pop()));
+    const {
+      memory
+    } = input;
+    const doc = memory.doc = (0, dom_1.frag)((0, util_1.unwrap)(output.pop()));
     output.append(new parser_1.Node(doc));
+    if (input.test && !input.local) return output.context;
+    memory.orphan = !memory.references.parentNode;
+    memory.orphan && doc.appendChild(memory.references);
+    return output.context;
+  }, (input, output) => {
+    if (input.test && !input.local) return output.context;
+    const {
+      memory
+    } = input;
+    return conv((0, figure_1.figure)(memory.doc, memory, input));
+  }, (input, output) => {
     if (input.test && !input.local) return output.context;
     const {
       memory
     } = input;
-    const orphan = !memory.references.parentNode;
-    orphan && doc.appendChild(memory.references);
-    for (const _ of (0, figure_1.figure)(doc, memory, input));
-    for (const _ of (0, note_1.note)(doc, memory, input));
-    orphan && !memory.interpolation && memory.references.remove();
+    return conv((0, note_1.note)(memory.doc, memory, input));
+  }, (input, output) => {
+    const {
+      memory
+    } = input;
+    memory.orphan && !memory.interpolation && memory.references.remove();
     return output.context;
   }]);
 })();
+function conv(iterable) {
+  const iter = iterable[Symbol.iterator]();
+  const cont = [(_, output) => {
+    const {
+      done
+    } = iter.next();
+    return done ? output.context : cont;
+  }];
+  return cont;
+}
 
 /***/ },
 
@@ -8581,7 +8606,7 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
       input.position = position;
       return parser_1.Result.skip;
     }
-    let depth = i / opener.length + 1 | 0;
+    const depth = i / opener.length + 1 | 0;
     (0, combinator_1.recur)(output, recursions, recursion, depth, true);
     input.memory = {
       position,
@@ -8633,6 +8658,7 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
           const advance = input.position - pos;
           m.i -= advance;
           m.follow -= advance;
+          (0, combinator_1.recur)(output, recursions, recursion, -(advance / closer.length | 0));
           m.depth -= advance / closer.length | 0;
         }
         continue;
@@ -8643,7 +8669,10 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
   }, parser, (input, output) => {
     const {
       source,
-      memory: m
+      memory: m,
+      resources: {
+        recursions
+      }
     } = input;
     const {
       lead
@@ -8671,6 +8700,7 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
           const advance = input.position - pos;
           m.i -= advance;
           m.follow -= advance;
+          (0, combinator_1.recur)(output, recursions, recursion, -(advance / closer.length | 0));
           m.depth -= advance / closer.length | 0;
         }
         m.i -= opener.length, m.follow -= closer.length;

package/package.json

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

package/src/parser/context.ts

@@ -28,7 +28,7 @@ export class Input<M extends object = object> extends Ipt<M> {
       clock: -1,
       interval: 200,
       recursions: [
-        10 || Recursion.document,
+        20 || Recursion.document,
         100 || Recursion.block,
         100 || Recursion.inline,
         100 || Recursion.bracket,

package/src/parser/document.ts

@@ -1,6 +1,6 @@
 import { MarkdownParser } from '../../markdown';
 import { Input, Recursion } from './context';
-import { Parser, Node } from '../combinator/parser';
+import { Parser, Result, Node } from '../combinator/parser';
 import { always, force, recursion } from '../combinator';
 import { build } from './parser';
 import { parser as segment } from './segment';
@@ -12,8 +12,10 @@ import { frag, html } from 'typed-dom/dom';
 
 export const document: MarkdownParser = (() => {
   interface Memory {
-    readonly interpolation?: boolean;
+    readonly interpolation: boolean;
     readonly references: HTMLOListElement;
+    doc?: DocumentFragment;
+    orphan?: boolean;
   }
   const loop = build(segment, block);
   return always<Parser<DocumentFragment | HTMLElement, Input<Memory>>>([
@@ -22,9 +24,9 @@ export const document: MarkdownParser = (() => {
         input.id === '' ? '' :
         input.local ? randomID() :
         input.id;
-      input.memory = input.notes ?? {
-        interpolation: true,
-        references: html('ol', { class: 'references' }),
+      input.memory = {
+        interpolation: !input.notes,
+        references: input.notes?.references ?? html('ol', { class: 'references' }),
       };
       output.push();
       return output.context;
@@ -32,17 +34,42 @@ export const document: MarkdownParser = (() => {
     recursion(Recursion.document, force(() => loop)),
     (input, output) => {
       assert(input.position === input.source.length);
-      const doc = frag(unwrap(output.pop()));
+      const { memory } = input;
+      const doc = memory.doc = frag(unwrap(output.pop()));
       output.append(new Node(doc));
       assert(input.id !== '' || !doc.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
+      if (input.test && !input.local) return output.context;
+      memory.orphan = !memory.references.parentNode;
+      memory.orphan && doc.appendChild(memory.references);
+      return output.context;
+    },
+    (input, output) => {
+      if (input.test && !input.local) return output.context;
+      const { memory } = input;
+      return conv(figure(memory.doc!, memory, input));
+    },
+    (input, output) => {
       if (input.test && !input.local) return output.context;
       const { memory } = input;
-      const orphan = !memory.references.parentNode;
-      orphan && doc.appendChild(memory.references);
-      for (const _ of figure(doc, memory, input));
-      for (const _ of note(doc, memory, input));
-      orphan && !memory.interpolation && memory.references.remove();
+      return conv(note(memory.doc!, memory, input));
+    },
+    (input, output) => {
+      const { memory } = input;
+      memory.orphan && !memory.interpolation && memory.references.remove();
       return output.context;
     },
   ]);
 })();
+
+function conv<T>(iterable: Iterable<T>): Result<never> {
+  const iter = iterable[Symbol.iterator]();
+  const cont: Result<T> = [
+    (_, output) => {
+      const { done } = iter.next();
+      return done
+        ? output.context
+        : cont;
+    },
+  ];
+  return cont;
+}

package/src/parser/repeat.ts

@@ -51,7 +51,7 @@ export function repeat<T extends HTMLElement | string>(
         input.position = position;
         return Result.skip;
       }
-      let depth = i / opener.length + 1 | 0;
+      const depth = i / opener.length + 1 | 0;
       recur(output, recursions, recursion, depth, true);
       input.memory = {
         position,
@@ -94,6 +94,7 @@ export function repeat<T extends HTMLElement | string>(
             const advance = input.position - pos;
             m.i -= advance;
             m.follow -= advance;
+            recur(output, recursions, recursion, -(advance / closer.length | 0));
             m.depth -= advance / closer.length | 0;
           }
           continue;
@@ -104,7 +105,7 @@ export function repeat<T extends HTMLElement | string>(
     },
     parser,
     (input, output) => {
-      const { source, memory: m } = input;
+      const { source, memory: m, resources: { recursions } } = input;
       const { lead } = m;
       input.range = input.position - m.position - m.i + opener.length;
       if (!output.state) return;
@@ -131,6 +132,7 @@ export function repeat<T extends HTMLElement | string>(
             const advance = input.position - pos;
             m.i -= advance;
             m.follow -= advance;
+            recur(output, recursions, recursion, -(advance / closer.length | 0));
             m.depth -= advance / closer.length | 0;
           }
           m.i -= opener.length, m.follow -= closer.length;