remark-break-line 0.0.6 → 0.0.8

package/lib/index.js

@@ -54,7 +54,7 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
          */
         const prepare = (n) => {
           if (n.type === 'text' && n.value.length > 0) {
-            n.value = n.value.replaceAll(/[\r\n]+/, ' ').replace(/ {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]
@@ -85,6 +85,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 +94,7 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
 
 
                 } else {
-                  n.value = '\n' + n.value
+                  n.value = '\n' + n.value.trimStart();
                   currentLine = 0
                 }
               }
@@ -200,7 +202,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,8 +223,33 @@ 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' };
@@ -237,12 +264,18 @@ export default function remarkBreakLongLines({ maxLineLength = 80, removeLinebre
             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.6",
+  "version": "0.0.8",
   "type": "module",
   "description": "",
   "keywords": [