remark-break-line 0.0.9 → 0.0.10

package/lib/index.js

@@ -3,6 +3,7 @@
  */
 
 import { assert } from 'console'
+import { text } from 'stream/consumers'
 import { visit } from 'unist-util-visit'
 
 /**
@@ -31,13 +32,13 @@ const elementSize = {
  * Turn gemoji shortcodes (`:+1:`) into emoji (`👍`).
  * @param {Object} [param0={}]
  * @param {number} [param0.maxLineLength=80]
- * @param {boolean} [param0.removeLinebreaks=false]
+ * @param {boolean} [param0.removeLinebreaksAndMultipleSpaces=false]
  * @param {string[]} [param0.mergableElements=[]]
  * @param {boolean}[param0.removeMultpleSpaces=false]
  * @returns
  *   Transform.
  */
-export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebreaks: removeLinebreaksAndMultipleSpaces = false, mergableElements = [] } = {}) {
+export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebreaksAndMultipleSpaces = false, mergableElements = [] } = {}) {
   /**
    * Transform.
    *
@@ -54,7 +55,7 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
 
         /**
          *
-         * @param {typeof node.children[number]} n
+         * @param {typeof node.children[number]|typeof node} n
          */
         const removeLineBrakesWalker = (n) => {
           if (n.type === 'text' && n.value.length > 0) {
@@ -74,36 +75,37 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
  * @param {typeof node.children[number]|typeof node} n
  */
         const mergeElements = (n) => {
-          if (n.type === 'text' && n.value.length > 0) {
-            // n.value = n.value.replaceAll(/[\r\n]+/g, ' ').replaceAll(/ {2,}/g, ' ');
-          } else if ('children' in n) {
+          if ('children' in n) {
             for (let i = 0; i < n.children.length; i++) {
               const element = n.children[i]
-              if (mergableElements.includes(element.type) && i - 1 >= 0 && n.children[i - 1].type == element.type) {
-                const first = n.children[i - 1];
-                const last = element;
+              if ((element.type == 'text' || mergableElements.includes(element.type)) && i + 1 < n.children.length && n.children[i + 1].type == element.type) {
+                const first = element;
+                const last = n.children[i + 1];
                 if ('children' in first && 'children' in last) {
                   first.children.push(...last.children);
-                  n.children.splice(i, 1);
-                  i--;
+                  n.children.splice(i + 1, 1);
+                } else if (first.type == 'text' && last.type == 'text') {
+                  if (!last.value.startsWith(' ') && !first.value.endsWith(' '))
+                    first.value += ' ';
+                  first.value += last.value;
+                  n.children.splice(i + 1, 1);
+                  i--;// we need to repeat this, so we will consoume multiple following text elements
                 }
               }
-              if (mergableElements.includes(element.type) && i - 2 >= 0 && n.children[i - 2].type == element.type) {
-                const first = n.children[i - 2];
-                const middel = n.children[i - 1];
-                const last = element;
+              if (mergableElements.includes(element.type) && i + 2 < n.children.length && n.children[i + 2].type == element.type) {
+                const first = element;
+                const middel = n.children[i + 1];
+                const last = n.children[i + 2];
                 if ('children' in first && 'children' in last && middel.type == 'text' && /^[\s\n\r]*$/.test(middel.value)) {
                   middel.value = middel.value.replaceAll(/\r\n|\r|\n/g, ' ')
                   first.children.push(middel);
                   first.children.push(...last.children);
-                  n.children.splice(i - 1, 2);
-                  i -= 2;
+                  n.children.splice(i + 1, 2);
+
                 }
               }
 
-              if (element.type in elementSize) {
-                mergeElements(element);
-              }
+              mergeElements(element);
             }
           }
         };
@@ -298,12 +300,13 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
 
           return { type: 'nothing' };
         }
+        if (removeLinebreaksAndMultipleSpaces)
+          removeLineBrakesWalker(node);
         if (mergableElements.length > 0)
           mergeElements(node);
         for (let i = 0; i < node.children.length; i++) {
           const element = node.children[i];
-          if (removeLinebreaksAndMultipleSpaces)
-            removeLineBrakesWalker(element);
+
 
           const result = walk(element, [element.type])
           if (result.type == 'split') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remark-break-line",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "type": "module",
   "description": "",
   "keywords": [