securemark 0.300.3 → 0.300.4

package/CHANGELOG.md

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

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.300.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.300.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"));
@@ -2528,8 +2528,7 @@ function bind(target, settings) {
     };
     for (const el of (0, figure_1.figure)(next(0)?.parentNode ?? target, settings.notes, options)) {
       el ? yield {
-        type: 'figure',
-        value: el
+        type: 'figure'
       } : yield {
         type: 'break',
         value: 'figure'
@@ -6427,23 +6426,11 @@ exports.document = (() => {
     } = 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;
+    if (input.test && !input.local) return parser_1.Result.skip;
     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;
-    return conv((0, note_1.note)(memory.doc, memory, input));
-  }, (input, output) => {
+  }, input => conv((0, figure_1.figure)(input.memory.doc, input.memory, input)), input => conv((0, note_1.note)(input.memory.doc, input.memory, input)), (input, output) => {
     const {
       memory
     } = input;
@@ -6453,12 +6440,7 @@ exports.document = (() => {
 })();
 function conv(iterable) {
   const iter = iterable[Symbol.iterator]();
-  const cont = [(_, output) => {
-    const {
-      done
-    } = iter.next();
-    return done ? output.context : cont;
-  }];
+  const cont = [(_, output) => iter.next().done ? output.context : cont];
   return cont;
 }
 
@@ -8594,6 +8576,7 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
     const {
       source,
       position,
+      linebreak,
       resources: {
         recursions
       }
@@ -8610,12 +8593,14 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
     (0, combinator_1.recur)(output, recursions, recursion, depth, true);
     input.memory = {
       position,
+      linebreak,
       i,
       lead: 0,
       follow: 0,
       state: false,
       depth
     };
+    input.linebreak = 0;
     output.push();
     return loop;
   }, (input, output) => {
@@ -8628,6 +8613,7 @@ function repeat(opener, after, closer, recursion, parser, cons, termination = (n
     } = input;
     (0, combinator_1.recur)(output, recursions, recursion, -m.depth);
     m.depth = 0;
+    input.linebreak ||= m.linebreak;
     const prefix = m.i;
     m.i = 0;
     for (let len = (0, alias_1.min)(prefix, source.length - input.position); m.i < len && source[input.position + m.i] === closer[0];) {
@@ -9667,7 +9653,7 @@ function* figure(target, notes, opts = {}) {
   let base = '0';
   let bases = base.split('.');
   for (let defs = target instanceof Element ? target.querySelectorAll(`:scope > ${selector}`) : target.querySelectorAll(`:not(* > *)${selector}`), len = defs.length, i = 0; i < len; ++i) {
-    yield;
+    if (~i << 32 - 8 === 0) yield;
     const def = defs[i];
     const {
       tagName
@@ -9740,7 +9726,7 @@ function* figure(target, notes, opts = {}) {
         (0, util_1.unmarkInvalid)(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
-      yield (0, dom_1.define)(ref, {
+      (0, dom_1.define)(ref, {
         class: opts.local ? `${ref.className} local` : undefined,
         href: opts.id !== '' ? `#${def.id}` : undefined
       }, figindex);
@@ -9750,7 +9736,6 @@ function* figure(target, notes, opts = {}) {
     if (opts.id !== '' && !ref.classList.contains('invalid')) {
       (0, util_1.markInvalid)(ref, 'label', 'reference', messages.reference);
     }
-    yield ref;
   }
 }
 exports.figure = figure;
@@ -9842,14 +9827,17 @@ function build(syntax, list, selector, marker, splitter = '') {
     let format;
     let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
+      if (~i << 32 - 8 === 0) yield;
       const ref = refs[i];
       if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
         const pos = splitter?.compareDocumentPosition(ref) ?? 0;
         if (pos & (Node.DOCUMENT_POSITION_PRECEDING | Node.DOCUMENT_POSITION_DISCONNECTED)) break;
         if (~iSplitters << 32 - 8 === 0) yield;
         if (splitter.classList.contains(list) && splitter.nextElementSibling !== splitters[iSplitters + 1]) {
-          yield* proc(splitter);
-          splitter.remove();
+          const note = splitter;
+          proc(note);
+          note.remove();
+          yield note;
           continue;
         }
         if (defs.size > 0) {
@@ -9857,7 +9845,8 @@ function build(syntax, list, selector, marker, splitter = '') {
           const note = splitter.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
             class: list
           }), splitter);
-          yield* proc(note, defs);
+          proc(note, defs);
+          yield note;
         }
       }
       const {
@@ -9919,31 +9908,33 @@ function build(syntax, list, selector, marker, splitter = '') {
         href: refId && `#${refId}`,
         title: abbr && text || undefined
       }, `^${++refIndex}`));
-      yield;
     }
     if (note || defs.size > 0) {
       const splitter = splitters[iSplitters++];
       note ??= splitter?.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
         class: list
       }), splitter ?? bottom);
-      yield* proc(note, defs);
+      proc(note, defs);
+      yield note;
     }
     if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
       if (splitter.classList.contains(list)) {
-        yield* proc(splitter);
+        const note = splitter;
+        proc(note);
         splitter.remove();
+        yield note;
       }
     }
   };
 }
-function* proc(note, defs) {
+function proc(note, defs) {
   for (let defs = note.children, i = defs.length; i--;) {
-    yield note.removeChild(defs[i]);
+    note.removeChild(defs[i]);
   }
   if (!defs) return;
   for (const [, def] of defs) {
-    yield note.appendChild(def);
+    note.appendChild(def);
   }
   defs.clear();
 }

package/index.d.ts

@@ -42,8 +42,8 @@ export interface ParserSettings {
 export type Progress =
   | { readonly type: 'segment'; readonly value: string; }
   | { readonly type: 'block'; readonly value: HTMLElement; }
-  | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
-  | { readonly type: 'note'; readonly value: HTMLLIElement | HTMLElement; }
+  | { readonly type: 'figure'; }
+  | { readonly type: 'note'; readonly value: HTMLOListElement; }
   | { readonly type: 'break'; readonly value: 'segment' | 'block' | 'parser' | 'figure' | 'note'; }
   | { readonly type: 'cancel'; };
 

package/package.json

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

package/src/api/bind.test.ts

@@ -10,8 +10,10 @@ describe('Unit: api/bind', () => {
         const result = iter.next();
         if (result.done) break;
         switch (result.value.type) {
-          case 'break':
           case 'segment':
+          case 'figure':
+          case 'note':
+          case 'break':
             --i;
             continue;
           case 'block':

package/src/api/bind.ts

@@ -129,7 +129,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
     for (const el of figure(next(0)?.parentNode ?? target, settings.notes, options)) {
       assert(rev === revision);
       el
-        ? yield { type: 'figure', value: el }
+        ? yield { type: 'figure' }
         : yield { type: 'break', value: 'figure' };
       if (rev !== revision) return yield { type: 'cancel' };
     }

package/src/parser/document.ts

@@ -38,21 +38,15 @@ export const document: MarkdownParser = (() => {
       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;
+      if (input.test && !input.local) return Result.skip;
       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;
-      return conv(note(memory.doc!, memory, input));
-    },
+    input =>
+      conv(figure(input.memory.doc!, input.memory, input)),
+    input =>
+      conv(note(input.memory.doc!, input.memory, input)),
     (input, output) => {
       const { memory } = input;
       memory.orphan && !memory.interpolation && memory.references.remove();
@@ -64,12 +58,10 @@ export const document: MarkdownParser = (() => {
 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) =>
+      iter.next().done
         ? output.context
-        : cont;
-    },
+        : cont,
   ];
   return cont;
 }

package/src/parser/inline.test.ts

@@ -142,6 +142,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser, input('(([:a\n]')), [['<span class="bracket">(<span class="bracket">(<span class="invalid">[:a\n]</span></span></span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('(({{\n}}')), [['<span class="bracket">(<span class="bracket">(<span class="template">{{<br>}}</span></span></span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('"((""))')), [['"', '<span class="paren">(<span class="paren">(</span></span>', '"', '"', ')', ')'], '']);
+      assert.deepStrictEqual(inspect(parser, input('0\n((a))')), [['0', '<br>', '<sup class="annotation"><span>a</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[[a]]')), [['[', '<sup class="reference"><span>a</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[[[a]]')), [['[', '[', '<sup class="reference"><span>a</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);

package/src/parser/repeat.ts

@@ -34,6 +34,7 @@ export function repeat<T extends HTMLElement | string>(
   const test = tester(after, false);
   interface Memory {
     readonly position: number;
+    linebreak: number;
     i: number;
     lead: number;
     follow: number;
@@ -42,7 +43,7 @@ export function repeat<T extends HTMLElement | string>(
   }
   const cont: Result<T, Input<Memory>> = [
     (input, output) => {
-      const { source, position, resources: { recursions } } = input;
+      const { source, position, linebreak, resources: { recursions } } = input;
       if (!source.startsWith(opener, input.position)) return Result.skip;
       let i = opener.length;
       for (; source[input.position + i] === source[input.position];) ++i;
@@ -55,12 +56,14 @@ export function repeat<T extends HTMLElement | string>(
       recur(output, recursions, recursion, depth, true);
       input.memory = {
         position,
+        linebreak,
         i,
         lead: 0,
         follow: 0,
         state: false,
         depth,
       };
+      input.linebreak = 0;
       output.push();
       return loop;
     },
@@ -68,6 +71,7 @@ export function repeat<T extends HTMLElement | string>(
       const { source, memory: m, resources: { recursions } } = input;
       recur(output, recursions, recursion, -m.depth);
       m.depth = 0;
+      input.linebreak ||= m.linebreak;
       const prefix = m.i;
       m.i = 0;
       for (let len = min(prefix, source.length - input.position); m.i < len && source[input.position + m.i] === closer[0];) {

package/src/processor/figure.ts

@@ -11,7 +11,7 @@ export function* figure(
     readonly id?: string;
     readonly local?: boolean;
   } = {},
-): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
+): Generator<undefined, undefined, undefined> {
   const selector = ':is(figure[data-label], h1, h2)';
   const refs = new MultiQueue<string, HTMLAnchorElement>(
     !notes || notes.references.parentNode === target
@@ -34,7 +34,7 @@ export function* figure(
           ? target.querySelectorAll(`:scope > ${selector}`)
           : target.querySelectorAll(`:not(* > *)${selector}`),
         len = defs.length, i = 0; i < len; ++i) {
-    yield;
+    if (~i << 32 - 8 === 0) yield;
     const def = defs[i];
     assert(def.parentNode === target || !def.parentNode);
     const { tagName } = def;
@@ -127,7 +127,7 @@ export function* figure(
         unmarkInvalid(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
-      yield define(ref,
+      define(ref,
         {
           class: opts.local ? `${ref.className} local` : undefined,
           href: opts.id !== '' ? `#${def.id}` : undefined,
@@ -139,7 +139,6 @@ export function* figure(
     if (opts.id !== '' && !ref.classList.contains('invalid')) {
       markInvalid(ref, 'label', 'reference', messages.reference);
     }
-    yield ref;
   }
   assert(opts.id !== '' || !target.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
   assert(opts.id !== '' || !notes?.references.querySelector('[id], .index[href], .label[href]'));

package/src/processor/note.test.ts

@@ -18,7 +18,7 @@ describe('Unit: processor/note', () => {
     it('1', () => {
       const target = run(parse('((a b))'));
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...note(target)].length, i === 0 ? 2 : 3);
+        assert.deepStrictEqual([...note(target)].length, 1);
         assert.deepStrictEqual(
           [...target.children].map(el => normalize(el.outerHTML)),
           [
@@ -40,7 +40,7 @@ describe('Unit: processor/note', () => {
     it('2', () => {
       const target = run(parse('((1))((12345678901234567890))'));
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...note(target)].length, i === 0 ? 4 : 6);
+        assert.deepStrictEqual([...note(target)].length, 1);
         assert.deepStrictEqual(
           [...target.children].map(el => normalize(el.outerHTML)),
           [
@@ -203,7 +203,7 @@ describe('Unit: processor/note', () => {
     it('id', () => {
       const target = run(parse('((a b))'));
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...note(target, undefined, { id: '0' })].length, i === 0 ? 2 : 3);
+        assert.deepStrictEqual([...note(target, undefined, { id: '0' })].length, 1);
         assert.deepStrictEqual(
           [...target.children].map(el => normalize(el.outerHTML)),
           [

package/src/processor/note.ts

@@ -14,7 +14,7 @@ export function* note(
     readonly local?: boolean;
   } = {},
   bottom: Node | null = null,
-): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
+): Generator<HTMLOListElement | undefined, undefined, undefined> {
   const referenceRefMemory = referenceRefsMemoryCaller(target);
   const annotationRefMemory = annotationRefsMemoryCaller(target);
   for (const memory of [referenceRefMemory, annotationRefMemory]) {
@@ -77,7 +77,7 @@ function build(
       readonly local?: boolean;
     } = {},
     bottom: Node | null = null,
-  ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
+  ): Generator<HTMLOListElement | undefined, undefined, undefined> {
     const refInfoCaller = memoize((ref: HTMLElement) => {
       const content = ref.firstElementChild!;
       const abbr = ref.getAttribute('data-abbr') ?? '';
@@ -119,6 +119,7 @@ function build(
     let format: 'number' | 'abbr';
     let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
+      if (~i << 32 - 8 === 0) yield;
       const ref = refs[i];
       if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
         assert(splitter.parentNode === target || !splitter.parentNode);
@@ -126,8 +127,10 @@ function build(
         if (pos & (Node.DOCUMENT_POSITION_PRECEDING | Node.DOCUMENT_POSITION_DISCONNECTED)) break;
         if (~iSplitters << 32 - 8 === 0) yield;
         if (splitter.classList.contains(list) && splitter.nextElementSibling !== splitters[iSplitters + 1]) {
-          yield* proc(splitter as HTMLOListElement);
-          splitter.remove();
+          const note = splitter as HTMLOListElement;
+          proc(note);
+          note.remove();
+          yield note;
           continue;
         }
         if (defs.size > 0) {
@@ -137,8 +140,9 @@ function build(
             ? splitter as HTMLOListElement
             : target.insertBefore(html('ol', { class: list }), splitter);
           assert(note.parentNode);
-          yield* proc(note, defs);
+          proc(note, defs);
           assert(defs.size === 0);
+          yield note;
         }
       }
       const { content, identifier, abbr, text } = refInfoCaller(ref);
@@ -209,21 +213,23 @@ function build(
             title: abbr && text || undefined,
           },
           `^${++refIndex}`));
-      yield;
     }
     if (note || defs.size > 0) {
       const splitter = splitters[iSplitters++];
       note ??= splitter?.classList.contains(list)
         ? splitter as HTMLOListElement
         : target.insertBefore(html('ol', { class: list }), splitter ?? bottom);
-      yield* proc(note, defs);
+      proc(note, defs);
       assert(defs.size === 0);
+      yield note;
     }
     if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
       if (splitter.classList.contains(list)) {
-        yield* proc(splitter as HTMLOListElement);
+        const note = splitter as HTMLOListElement;
+        proc(note);
         splitter.remove();
+        yield note;
       }
     }
     assert(opts.id !== '' || !target.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
@@ -231,13 +237,13 @@ function build(
   };
 }
 
-function* proc(note: HTMLOListElement, defs?: Map<string, HTMLLIElement>): Generator<HTMLLIElement | undefined, undefined, undefined> {
+function proc(note: HTMLOListElement, defs?: Map<string, HTMLLIElement>): void {
   for (let defs = note.children, i = defs.length; i--;) {
-    yield note.removeChild(defs[i] as HTMLLIElement);
+    note.removeChild(defs[i] as HTMLLIElement);
   }
   if (!defs) return;
   for (const [, def] of defs) {
-    yield note.appendChild(def);
+    note.appendChild(def);
   }
   defs.clear();
 }