chore: tweaks > bun.lock package.json clone.ts index.ts

bun.lock
package.json
src/commands/clone.ts
src/index.ts

Author: nrjdalal

bun.lock

@@ -4,6 +4,7 @@
     "": {
       "name": "gitpick",
       "dependencies": {
+        "@clack/prompts": "^0.10.0",
         "chalk": "^5.4.1",
         "commander": "^13.1.0",
         "inquirer": "^12.5.0",
@@ -44,6 +45,10 @@
 
     "@babel/types": ["@babel/types@7.26.7", "", { "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" } }, "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg=="],
 
+    "@clack/core": ["@clack/core@0.4.1", "", { "dependencies": { "picocolors": "^1.0.0", "sisteransi": "^1.0.5" } }, "sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA=="],
+
+    "@clack/prompts": ["@clack/prompts@0.10.0", "", { "dependencies": { "@clack/core": "0.4.1", "picocolors": "^1.0.0", "sisteransi": "^1.0.5" } }, "sha512-H3rCl6CwW1NdQt9rE3n373t7o5cthPv7yUoxF2ytZvyvlJv89C5RYMJu83Hed8ODgys5vpBU0GKxIRG83jd8NQ=="],
+
     "@commitlint/cli": ["@commitlint/cli@19.8.0", "", { "dependencies": { "@commitlint/format": "^19.8.0", "@commitlint/lint": "^19.8.0", "@commitlint/load": "^19.8.0", "@commitlint/read": "^19.8.0", "@commitlint/types": "^19.8.0", "tinyexec": "^0.3.0", "yargs": "^17.0.0" }, "bin": { "commitlint": "./cli.js" } }, "sha512-t/fCrLVu+Ru01h0DtlgHZXbHV2Y8gKocTR5elDOqIRUzQd0/6hpt2VIWOj9b3NDo7y4/gfxeR2zRtXq/qO6iUg=="],
 
     "@commitlint/config-conventional": ["@commitlint/config-conventional@19.8.0", "", { "dependencies": { "@commitlint/types": "^19.8.0", "conventional-changelog-conventionalcommits": "^7.0.2" } }, "sha512-9I2kKJwcAPwMoAj38hwqFXG0CzS2Kj+SAByPUQ0SlHTfb7VUhYVmo7G2w2tBrqmOf7PFd6MpZ/a1GQJo8na8kw=="],
@@ -536,6 +541,8 @@
 
     "simple-git-hooks": ["simple-git-hooks@2.12.1", "", { "bin": { "simple-git-hooks": "cli.js" } }, "sha512-NB3V4XyCOrWTIhjh85DyEoVlM3adHWwqQXKYHmuegy/108bJPP6YxuPGm4ZKBq1+GVKRbKJuzNY//09cMJYp+A=="],
 
+    "sisteransi": ["sisteransi@1.0.5", "", {}, "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="],
+
     "slice-ansi": ["slice-ansi@5.0.0", "", { "dependencies": { "ansi-styles": "^6.0.0", "is-fullwidth-code-point": "^4.0.0" } }, "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="],
 
     "sort-object-keys": ["sort-object-keys@1.1.3", "", {}, "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="],

package.json

@@ -44,10 +44,9 @@
     "commit-msg": "npx commitlint --edit $1"
   },
   "dependencies": {
+    "@clack/prompts": "^0.10.0",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
-    "inquirer": "^12.5.0",
-    "ora": "^8.2.0",
     "simple-git": "^3.27.0",
     "terminal-link": "^4.0.0",
     "zod": "^3.24.2",

src/commands/clone.ts

@@ -3,10 +3,9 @@ import os from "os"
 import path from "path"
 import { parseTimeString } from "@/utils/parse-time-string"
 import { githubConfigFromUrl } from "@/utils/transform-url"
+import { cancel, confirm, intro, isCancel, log, spinner } from "@clack/prompts"
 import chalk from "chalk"
 import { Command } from "commander"
-import inquirer from "inquirer"
-import ora, { Ora } from "ora"
 import simpleGit from "simple-git"
 import { z } from "zod"
 import { fromError } from "zod-validation-error"
@@ -42,10 +41,13 @@ export const clone = new Command()
         url,
         target,
         branch: options.branch,
-        overwrite: options.overwrite || options.force,
+        overwrite: options.overwrite,
+        force: options.force,
         watch: options.watch,
       })
 
+      options.overwrite = options.overwrite || options.force
+
       if (options.watch) {
         if (typeof options.watch === "boolean") options.watch = "1m"
 
@@ -59,7 +61,7 @@ export const clone = new Command()
         target,
       })
 
-      console.log(
+      intro(
         `${chalk.bold(config.owner)}/${chalk.bold(config.repository)} ${chalk.green(
           `<${config.type}:${config.branch}>`,
         )} ${
@@ -73,14 +75,9 @@ export const clone = new Command()
                 }`,
               )}`
         }`,
-        "\n",
       )
 
-      const spinner = ora().start()
-
       try {
-        spinner.stop()
-
         const targetPath = path.resolve(config.target)
 
         if (options.watch) options.overwrite = true
@@ -100,44 +97,44 @@ export const clone = new Command()
               ? "The target directory is not empty. Do you want to overwrite the files?"
               : "The target file already exists. Do you want to overwrite the file?"
 
-          const { overwrite } = await inquirer.prompt([
-            {
-              type: "confirm",
-              name: "overwrite",
-              message,
-              default: false,
-            },
-          ])
+          const overwrite = await confirm({
+            message,
+          })
+
+          if (isCancel(overwrite)) {
+            cancel("Operation cancelled.")
+            process.exit(0)
+          }
 
           if (!overwrite) {
-            throw new Error("Chose not to overwrite files")
+            log.info("Chose not to overwrite files.")
+            process.exit(0)
           }
 
-          spinner.info(
-            "You can use -o | --overwrite or -f | --force flag to skip this prompt",
+          log.info(
+            "You can use -o | --overwrite or -f | --force flag to skip this prompt next time.",
           )
         }
 
-        await cloneAction(spinner, config, options, targetPath)
+        await cloneAction(config, options, targetPath)
 
         if (options.watch) {
           const watchInterval = parseTimeString(options.watch)
           setInterval(
-            async () => await cloneAction(spinner, config, options, targetPath),
+            async () => await cloneAction(config, options, targetPath),
             watchInterval,
           )
         }
       } catch (err) {
-        console.log("\n")
-        spinner.fail("Level 1: An error occurred")
+        log.error("Level 1: An error occurred")
 
         if (err instanceof z.ZodError) {
           const validationError = fromError(err)
-          console.error("\nValidation Error: " + validationError.toString())
+          log.error("Validation Error: " + validationError.toString())
         } else if (err instanceof Error) {
-          console.error("\nError: " + err.message)
+          log.error("Error: " + err.message)
         } else {
-          console.error("\nUnexpected Error: " + JSON.stringify(err, null, 2))
+          log.error("Unexpected Error: " + JSON.stringify(err, null, 2))
         }
 
         process.exit(1)
@@ -163,7 +160,6 @@ async function copyDir(src: string, dest: string) {
 }
 
 const cloneAction = async (
-  spinner: Ora,
   config: {
     token: string
     owner: string
@@ -177,7 +173,11 @@ const cloneAction = async (
   },
   targetPath: string,
 ) => {
+  const s = spinner()
+
   try {
+    const start = performance.now()
+
     const git = simpleGit()
 
     if (process.platform === "win32") {
@@ -191,7 +191,7 @@ const cloneAction = async (
     )
 
     if (!options.watch)
-      spinner.start(
+      s.start(
         `Picking ${config.type}${config.type === "repository" ? " without .git" : " from repository"}`,
       )
 
@@ -206,6 +206,7 @@ const cloneAction = async (
     const sourcePath = path.join(tempDir, config.path)
 
     const sourceStat = await fs.promises.stat(sourcePath)
+
     if (sourceStat.isDirectory()) {
       await fs.promises.mkdir(targetPath, { recursive: true })
       await copyDir(sourcePath, targetPath)
@@ -218,21 +219,24 @@ const cloneAction = async (
         targetPath + "/" + config.path.split("/").pop(),
       )
     }
+
     if (!options.watch) {
-      spinner.succeed(
-        `Picked ${config.type}${config.type === "repository" ? " without .git!" : " from repository!"}`,
+      s.stop(
+        `Picked ${config.type}${config.type === "repository" ? " without .git!" : " from repository"} in ${(
+          (performance.now() - start) /
+          1000
+        ).toFixed(2)} seconds!`,
       )
-    } else spinner.succeed("Synced at " + new Date().toLocaleTimeString())
+    } else log.success("Synced at " + new Date().toLocaleTimeString())
 
     await fs.promises.rm(tempDir, { recursive: true, force: true })
   } catch (err) {
-    console.log("\n")
-    spinner.fail("Level 2: An error occurred!")
+    s.stop("Level 2: An error occurred while cloning!")
 
     if (err instanceof Error) {
-      console.error("\nError: " + err.message)
+      log.error("Error: " + err.message)
     } else {
-      console.error("\nUnexpected Error: " + JSON.stringify(err, null, 2))
+      log.error("Unexpected Error: " + JSON.stringify(err, null, 2))
     }
 
     process.exit(1)

src/index.ts

@@ -61,9 +61,7 @@ ${chalk.bold("Examples:")}
   })
 
   console.log(
-    chalk.dim(
-      `\n${terminalLink("GitPick ↗️ ", "https://github.com/nrjdalal/gitpick")} - Clone specific directories or files from GitHub!\n`,
-    ),
+    `\n${terminalLink("GitPick ↗️ ", "https://github.com/nrjdalal/gitpick")} - Clone specific directories or files from GitHub!\n`,
   )
 
   program.parse()