From f7bf4038dc7fcf3adc09697797da1c68c932eadc Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 6 Jul 2023 16:56:30 -0700
Subject: [PATCH] fix path parsing

---
 quartz/bootstrap-cli.mjs           | 32 +++++++++++++++++++-----------
 quartz/plugins/transformers/ofm.ts |  3 ++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 92f88bfd..b1503f21 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -45,6 +45,14 @@ export const BuildArgv = {
   }
 }
 
+function escapePath(fp) {
+  return fp
+    .replace(/\\ /g, " ") // unescape spaces
+    .replace(/^".*"$/, "$1")
+    .replace(/^'.*"$/, "$1")
+    .trim()
+}
+
 yargs(hideBin(process.argv))
   .scriptName("quartz")
   .version(version)
@@ -69,30 +77,29 @@ yargs(hideBin(process.argv))
     }
 
     async function rmContentFolder() {
-      if (fs.existsSync(contentFolder)) {
-        const contentStat = await fs.promises.lstat(contentFolder)
+      const contentStat = await fs.promises.lstat(contentFolder)
+      if (contentStat) {
         if (contentStat.isSymbolicLink()) {
           await fs.promises.unlink(contentFolder)
         } else {
           await rimraf(contentFolder)
         }
       }
-
-      await fs.promises.mkdir(contentFolder)
     }
 
     if (setupStrategy === 'copy' || setupStrategy === 'symlink') {
-      const originalFolder = await text({
+      const originalFolder = escapePath(await text({
         message: "Enter the full path to existing content folder",
         placeholder: 'On most terminal emulators, you can drag and drop a folder into the window and it will paste the full path',
         validate(fp) {
-          if (!fs.existsSync(fp)) {
+          const fullPath = escapePath(fp)
+          if (!fs.existsSync(fullPath)) {
             return "The given path doesn't exist"
-          } else if (!fs.lstatSync(fp).isDirectory()) {
+          } else if (!fs.lstatSync(fullPath).isDirectory()) {
             return "The given path is not a folder"
           }
         }
-      })
+      }))
 
       if (isCancel(originalFolder)) {
         outro(chalk.red("Exiting"))
@@ -101,14 +108,15 @@ yargs(hideBin(process.argv))
 
       await rmContentFolder()
       if (setupStrategy === 'copy') {
-        await fs.promises.cp(originalFolder, contentFolder)
+        await fs.promises.cp(originalFolder, contentFolder, { recursive: true })
       } else if (setupStrategy === 'symlink') {
-        await fs.promises.symlink(originalFolder, contentFolder)
+        await fs.promises.symlink(originalFolder, contentFolder, 'dir')
       }
     } else if (setupStrategy === 'new') {
       await rmContentFolder()
-      await fs.promises.writeFile(path.join(contentFolder, "index.md"), 
-`---
+      await fs.promises.mkdir(contentFolder)
+      await fs.promises.writeFile(path.join(contentFolder, "index.md"),
+        `---
 title: Welcome to Quartz
 ---
 
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index 0deec4b9..0e694d3f 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -220,6 +220,7 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>
               }
 
               const text = firstChild.children[0].value
+              const restChildren = firstChild.children.splice(1)
               const [firstLine, ...remainingLines] = text.split("\n")
               const remainingText = remainingLines.join("\n")
 
@@ -253,7 +254,7 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>
                     children: [{
                       type: 'text',
                       value: remainingText,
-                    }]
+                    }, ...restChildren]
                   })
                 }