securemark 0.225.0 → 0.225.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.225.1
+
+- Refactoring.
+
 ## 0.225.0
 
 - Refine some parsers to disallow trailing whitespace.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.225.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.225.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -9056,26 +9056,31 @@ require = function () {
             }
             exports.trimNode = trimNode;
             function trimNodeStart(nodes) {
-                const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
-                for (let first = nodes[0]; nodes.length > 0 && !isVisible(first, 0) && !(typeof first === 'object' && first.className === 'comment');) {
-                    if (typeof first === 'string') {
-                        const pos = first.length - first.trimStart().length;
+                for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+                    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer')
+                        break;
+                    if (typeof node === 'object' && node.className === 'comment')
+                        break;
+                    if (typeof node === 'string') {
+                        const pos = node.length - node.trimStart().length;
                         if (pos > 0) {
-                            nodes[0] = first.slice(pos);
+                            nodes[0] = node.slice(pos);
                             break;
                         }
                     }
-                    nodes.pop();
+                    nodes.shift();
                 }
-                return (0, array_1.push)(nodes, skip);
+                return nodes;
             }
             function trimNodeEnd(nodes) {
                 const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
-                for (let last = nodes[0]; nodes.length > 0 && !isVisible(last = nodes[nodes.length - 1], -1) && !(typeof last === 'object' && last.className === 'comment');) {
-                    if (typeof last === 'string') {
-                        const pos = last.trimEnd().length;
+                for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
+                    if (typeof node === 'object' && node.className === 'comment')
+                        break;
+                    if (typeof node === 'string') {
+                        const pos = node.trimEnd().length;
                         if (pos > 0) {
-                            nodes[nodes.length - 1] = last.slice(0, pos);
+                            nodes[nodes.length - 1] = node.slice(0, pos);
                             break;
                         }
                     }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.225.0",
+  "version": "0.225.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/src/parser/util.ts

@@ -172,28 +172,19 @@ export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string
   return trimNodeStart(trimNodeEnd(nodes));
 }
 function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  const skip = nodes.length > 0 &&
-    typeof nodes[nodes.length - 1] === 'object' &&
-    nodes[nodes.length - 1]['className'] === 'indexer'
-    ? [nodes.pop()!]
-    : [];
-  for (
-    let first = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(first, 0) &&
-    !(typeof first === 'object' && first.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof first === 'string') {
-      const pos = first.length - first.trimStart().length;
+  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
+    if (typeof node === 'object' && node.className === 'comment') break;
+    if (typeof node === 'string') {
+      const pos = node.length - node.trimStart().length;
       if (pos > 0) {
-        nodes[0] = first.slice(pos);
+        nodes[0] = node.slice(pos);
         break;
       }
     }
-    nodes.pop();
+    nodes.shift();
   }
-  return push(nodes, skip);
+  return nodes;
 }
 export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   const skip = nodes.length > 0 &&
@@ -201,17 +192,12 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
     nodes[nodes.length - 1]['className'] === 'indexer'
     ? [nodes.pop()!]
     : [];
-  for (
-    let last = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(last = nodes[nodes.length - 1], -1) &&
-    !(typeof last === 'object' && last.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof last === 'string') {
-      const pos = last.trimEnd().length;
+  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
+    if (typeof node === 'object' && node.className === 'comment') break;
+    if (typeof node === 'string') {
+      const pos = node.trimEnd().length;
       if (pos > 0) {
-        nodes[nodes.length - 1] = last.slice(0, pos);
+        nodes[nodes.length - 1] = node.slice(0, pos);
         break;
       }
     }