fix(commands): add non-nested version for remove new lines command

Author: stdword

src/app.ts

@@ -17,7 +17,7 @@ import {
     joinAsSentences_Map, joinViaCommas_Attach, joinViaSpaces_Attach,
     joinViaNewLines_Attach, joinViaNewLines_Map,
 
-    splitByLines, splitBySentences, splitByWords, removeNewLinesCommand,
+    splitByLines, splitBySentences, splitByWords, removeNewLines,
 } from './commands'
 import { improveCursorMovement_KeyDownListener, improveSearch_KeyDownListener } from './features'
 import { getChosenBlocks, p, scrollToBlock } from './utils'
@@ -215,10 +215,15 @@ async function main() {
 
     // Updates
     logseq.App.registerCommandPalette({
-        label: ICON + ' Remove new lines', key: 'mc-6-update-1-remove-new-lines',
+        label: ICON + ' Remove new lines', key: 'mc-7-update-1-remove-new-lines',
         // @ts-expect-error
         keybinding: {},
-    }, (e) => removeNewLinesCommand())
+    }, (e) => updateBlocksCommand(removeNewLines))
+    logseq.App.registerCommandPalette({
+        label: ICON + ' Remove new lines (with nested)', key: 'mc-7-update-2-remove-new-lines-nested',
+        // @ts-expect-error
+        keybinding: {},
+    }, (e) => updateBlocksCommand(removeNewLines, true))
 
 
     // Navigation

src/commands.ts

@@ -848,38 +848,44 @@ export function magicJoinCommand(independentMode: boolean) {
 
 export async function updateBlocksCommand(
     callback: (content: string, level: number, block: BlockEntity, parent?: BlockEntity) => string,
+    recursive: boolean = false,
 ) {
     let [ blocks, isSelectedState ] = await getChosenBlocks()
     if (blocks.length === 0)
         return
 
     blocks = unique(blocks, (b) => b.uuid)
-    blocks = await Promise.all(
-        blocks.map(async (b) => {
-            return (
-                await logseq.Editor.getBlock(b.uuid, {includeChildren: true})
-            )!
-        })
-    )
-    blocks = filterOutChildBlocks(blocks)
+    if (recursive) {
+        blocks = await Promise.all(
+            blocks.map(async (b) => {
+                return (
+                    await logseq.Editor.getBlock(b.uuid, {includeChildren: true})
+                )!
+            })
+        )
+        blocks = filterOutChildBlocks(blocks)
+    }
 
     if (blocks.length === 0)
         return
 
-
     // it is important to check if any block in the tree has references
     // (Logseq replaces references with it's text)
-    for (const block of blocks) {
-        const blocksWithReferences = await getBlocksWithReferences(block)
-        block._treeHasReferences = blocksWithReferences.length !== 0
-    }
-
+    if (recursive)
+        for (const block of blocks) {
+            const blocksWithReferences = await getBlocksWithReferences(block)
+            block._treeHasReferences = blocksWithReferences.length !== 0
+        }
 
     for (const block of blocks) {
-        // ensure .children always is array
+        // ensure .children is always an array
         if (!block.children)
             block.children = []
 
+        // skip child nodes in non-recursive mode
+        if (!recursive)
+            block.children = []
+
         const newTree = walkBlockTree(block as WalkBlock, (b, level, p, data) => {
             const properties = PropertiesUtils.fromCamelCaseAll(data.node.properties)
             const propertiesOrder = PropertiesUtils.getPropertyNames(b.content)
@@ -909,11 +915,9 @@ export async function updateBlocksCommand(
     }
 }
 
-export function removeNewLinesCommand() {
-    return updateBlocksCommand((content, level, block, parent) => {
-        return content
-            .replaceAll(/\n+/g, '\n')
-            .replaceAll(/(?<=[^\S\n])\n/g, '')  // remove \n when there are spaces before
-            .replaceAll(/(?<![^\S])\n/g, ' ')   // replace \n to space when there are no spaces before
-    })
+export function removeNewLines(content, level, block, parent) {
+    return content
+        .replaceAll(/\n+/g, '\n')
+        .replaceAll(/(?<=[^\S\n])\n/g, '')  // remove \n when there are spaces before
+        .replaceAll(/(?<![^\S])\n/g, ' ')   // replace \n to space when there are no spaces before
 }