remark-break-line 0.0.7 → 0.0.9

package/lib/index.d.ts

@@ -1,10 +1,17 @@
 /**
  * Turn gemoji shortcodes (`:+1:`) into emoji (`👍`).
- *
+ * @param {Object} [param0={}]
+ * @param {number} [param0.maxLineLength=80]
+ * @param {boolean} [param0.removeLinebreaks=false]
+ * @param {string[]} [param0.mergableElements=[]]
+ * @param {boolean}[param0.removeMultpleSpaces=false]
  * @returns
  *   Transform.
  */
-export default function remarkBreakLongLines({ maxLineLength }?: {
+export default function remarkBreakLongLines({ maxLineLength, removeLinebreaks: removeLinebreaksAndMultipleSpaces, mergableElements }?: {
     maxLineLength?: number | undefined;
-}): (tree: Root) => undefined;
+    removeLinebreaks?: boolean | undefined;
+    mergableElements?: string[] | undefined;
+    removeMultpleSpaces?: boolean | undefined;
+} | undefined): (tree: Root) => undefined;
 export type Root = import("mdast").Root;

package/lib/index.js

@@ -29,11 +29,15 @@ const elementSize = {
 
 /**
  * Turn gemoji shortcodes (`:+1:`) into emoji (`👍`).
- *
+ * @param {Object} [param0={}]
+ * @param {number} [param0.maxLineLength=80]
+ * @param {boolean} [param0.removeLinebreaks=false]
+ * @param {string[]} [param0.mergableElements=[]]
+ * @param {boolean}[param0.removeMultpleSpaces=false]
  * @returns
  *   Transform.
  */
-export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebreaks = false } = {}) {
+export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebreaks: removeLinebreaksAndMultipleSpaces = false, mergableElements = [] } = {}) {
   /**
    * Transform.
    *
@@ -52,19 +56,59 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
          *
          * @param {typeof node.children[number]} n
          */
-        const prepare = (n) => {
+        const removeLineBrakesWalker = (n) => {
           if (n.type === 'text' && n.value.length > 0) {
-            n.value = n.value.replaceAll(/[\r\n]+/g, ' ').replaceAll(/ {2..}/g, ' ');
+            n.value = n.value.replaceAll(/[\r\n]+/g, ' ').replaceAll(/ {2,}/g, ' ');
           } else if ('children' in n) {
             for (let i = 0; i < n.children.length; i++) {
               const element = n.children[i]
               if (element.type in elementSize) {
-                prepare(element);
+                removeLineBrakesWalker(element);
               }
             }
           }
         };
 
+        /**
+ *
+ * @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) {
+            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 ('children' in first && 'children' in last) {
+                  first.children.push(...last.children);
+                  n.children.splice(i, 1);
+                  i--;
+                }
+              }
+              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 ('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;
+                }
+              }
+
+              if (element.type in elementSize) {
+                mergeElements(element);
+              }
+            }
+          }
+        };
+
+
         /**
          *
          * @param {typeof node.children[number]} n
@@ -85,6 +129,8 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
                   const current = path[path.length - 1];
                   assert(current === 'text');
 
+                  n.value = n.value.trimStart();
+
                   return {
                     type: 'break-before',
                   };
@@ -92,7 +138,7 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
 
 
                 } else {
-                  n.value = '\n' + n.value
+                  n.value = '\n' + n.value.trimStart();
                   currentLine = 0
                 }
               }
@@ -200,7 +246,7 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
                 }
               }
             }
-          } else if ('children' in n) {
+          } else if ('children' in n && n.type in elementSize) {
             for (let i = 0; i < n.children.length; i++) {
               const element = n.children[i]
               if (element.type in elementSize) {
@@ -221,28 +267,61 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
                     type: 'break-before',
                   };
                 }
+              } else {
+                if (n.position && n.position.end.line == n.position.start.line) {
+                  const length = (n.position?.end.column ?? 0) - (n.position?.start.column ?? 0);
+                  currentLine += length;
+                } else if (n.position) {
+                  // this spans multiple lnes so we justtake the column of the end.
+                  currentLine = n.position.end.column - 1;
+                }
+                if (currentLine >= maxLineLength - baseIndention) {
+                  n.children.splice(i, 0, { type: 'text', value: '/n' });
+                  i++ // do not process this node again
+                  const length = (n.position?.end.column ?? 0) - (n.position?.start.column ?? 0);
+                  currentLine = length;
+                }
               }
             }
+          } else {
+            if (n.position && n.position.end.line == n.position.start.line) {
+              const length = (n.position?.end.column ?? 0) - (n.position?.start.column ?? 0);
+              currentLine += length;
+            } else if (n.position) {
+              // this spans multiple lnes so we justtake the column of the end.
+              currentLine = n.position.end.column - 1;
+            }
+            if (currentLine >= maxLineLength - baseIndention) {
+              return { type: 'break-before' };
+            }
           }
 
           return { type: 'nothing' };
         }
-
+        if (mergableElements.length > 0)
+          mergeElements(node);
         for (let i = 0; i < node.children.length; i++) {
           const element = node.children[i];
-          if (removeLinebreaks)
-            prepare(element);
+          if (removeLinebreaksAndMultipleSpaces)
+            removeLineBrakesWalker(element);
+
           const result = walk(element, [element.type])
           if (result.type == 'split') {
             currentLine = 0
             node.children.splice(i, 1, result.replaceBy[0], { type: 'text', value: '\n' }, result.replaceBy[1])
           } else if (result.type == 'break-before') {
-            currentLine = 0
-            node.children.splice(i, 0, { type: 'text', value: '\n' })
-            if (i > 0) {
-              const prev = node.children[i - 1];
-              if (prev.type === 'text') {
-                prev.value = prev.value.trimEnd();
+            const prev = node.children[i - 1];
+            if (i > 0 && prev.type == 'text' && prev.value.endsWith('\n')) {
+              // skip we already inserted a break before
+            } else {
+
+              currentLine = 0
+              node.children.splice(i, 0, { type: 'text', value: '\n' })
+              if (i > 0) {
+                const prev = node.children[i - 1];
+                if (prev.type === 'text') {
+                  prev.value = prev.value.trimEnd();
+                }
               }
             }
           } else if (currentLine > 0) {

package/package.json

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