From 1af66c2d08df7dd7f6a8d4d1544d965e41a1fb0d Mon Sep 17 00:00:00 2001
From: Jack Herrington <jherr@pobox.com>
Date: Sun, 15 Sep 2024 05:27:48 -0400
Subject: [PATCH] Adding support for ~ in target specification (#4848)

* Adding support for ~ in target specification

* test(shadcn): add a test for srcDir false

* chore: changeset

---------

Co-authored-by: shadcn <m@shadcn.com>
---
 .changeset/clever-swans-tan.md                |  5 ++
 .../shadcn/src/utils/updaters/update-files.ts | 17 ++++-
 .../test/utils/updaters/update-files.test.ts  | 65 +++++++++++++++++++
 3 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/clever-swans-tan.md
 create mode 100644 packages/shadcn/test/utils/updaters/update-files.test.ts

diff --git a/.changeset/clever-swans-tan.md b/.changeset/clever-swans-tan.md
new file mode 100644
index 00000000000..776948c7352
--- /dev/null
+++ b/.changeset/clever-swans-tan.md
@@ -0,0 +1,5 @@
+---
+"shadcn": patch
+---
+
+add support for ~ dir in target path
diff --git a/packages/shadcn/src/utils/updaters/update-files.ts b/packages/shadcn/src/utils/updaters/update-files.ts
index 757d15d12dd..3a06110e562 100644
--- a/packages/shadcn/src/utils/updaters/update-files.ts
+++ b/packages/shadcn/src/utils/updaters/update-files.ts
@@ -17,6 +17,19 @@ import { transformRsc } from "@/src/utils/transformers/transform-rsc"
 import { transformTwPrefixes } from "@/src/utils/transformers/transform-tw-prefix"
 import prompts from "prompts"
 
+export function resolveTargetDir(
+  projectInfo: Awaited<ReturnType<typeof getProjectInfo>>,
+  config: Config,
+  target: string
+) {
+  if (target.startsWith("~/")) {
+    return path.join(config.resolvedPaths.cwd, target.replace("~/", ""))
+  }
+  return projectInfo?.isSrcDir
+    ? path.join(config.resolvedPaths.cwd, "src", target)
+    : path.join(config.resolvedPaths.cwd, target)
+}
+
 export async function updateFiles(
   files: RegistryItem["files"],
   config: Config,
@@ -58,9 +71,7 @@ export async function updateFiles(
     let filePath = path.join(targetDir, fileName)
 
     if (file.target) {
-      filePath = projectInfo?.isSrcDir
-        ? path.join(config.resolvedPaths.cwd, "src", file.target)
-        : path.join(config.resolvedPaths.cwd, file.target)
+      filePath = resolveTargetDir(projectInfo, config, file.target)
       targetDir = path.dirname(filePath)
     }
 
diff --git a/packages/shadcn/test/utils/updaters/update-files.test.ts b/packages/shadcn/test/utils/updaters/update-files.test.ts
new file mode 100644
index 00000000000..4d12fcb841e
--- /dev/null
+++ b/packages/shadcn/test/utils/updaters/update-files.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, test } from "vitest"
+
+import { resolveTargetDir } from "../../../src/utils/updaters/update-files"
+
+describe("resolveTargetDir", () => {
+  test("should handle a home target without a src directory", () => {
+    const targetDir = resolveTargetDir(
+      {
+        isSrcDir: false,
+      },
+      {
+        resolvedPaths: {
+          cwd: "/foo/bar",
+        },
+      },
+      "~/.env"
+    )
+    expect(targetDir).toBe("/foo/bar/.env")
+  })
+
+  test("should handle a home target even with a src directory", () => {
+    const targetDir = resolveTargetDir(
+      {
+        isSrcDir: true,
+      },
+      {
+        resolvedPaths: {
+          cwd: "/foo/bar",
+        },
+      },
+      "~/.env"
+    )
+    expect(targetDir).toBe("/foo/bar/.env")
+  })
+
+  test("should handle a simple target", () => {
+    const targetDir = resolveTargetDir(
+      {
+        isSrcDir: false,
+      },
+      {
+        resolvedPaths: {
+          cwd: "/foo/bar",
+        },
+      },
+      "./components/ui/button.tsx"
+    )
+    expect(targetDir).toBe("/foo/bar/components/ui/button.tsx")
+  })
+
+  test("should handle a simple target with src directory", () => {
+    const targetDir = resolveTargetDir(
+      {
+        isSrcDir: true,
+      },
+      {
+        resolvedPaths: {
+          cwd: "/foo/bar",
+        },
+      },
+      "./components/ui/button.tsx"
+    )
+    expect(targetDir).toBe("/foo/bar/src/components/ui/button.tsx")
+  })
+})