Merge pull request #53 from selemondev/feat/support-multiple-workspaces

feat: support multiple workspaces

Author: selemondev

package.json

@@ -139,7 +139,17 @@
         "command": "shadcn-svelte.gotoDoc",
         "title": "shadcn/svelte: Open Documentation"
       }
-    ]
+    ],
+    "configuration": {
+      "title": "shadcn/svelte",
+      "properties": {
+        "shadcn-svelte.cwd": {
+          "type": "string",
+          "default": "",
+          "markdownDescription": "Absolute path to the working directory when running shadcn-svelte CLI. Default is the current workspace folder."
+        }
+      }
+    }
   },
   "scripts": {
     "vscode:prepublish": "pnpm build",
@@ -149,7 +159,7 @@
     "dev": "pnpm build -- --watch",
     "deploy:extension": "vsce publish --no-dependencies",
     "deploy:openvsx": "ovsx publish -p $OVSX_PAT",
-    "lint": "eslint src --ext ts"
+    "lint": "eslint src --ext ts --fix"
   },
   "devDependencies": {
     "@types/node": "20.x",

src/extension.ts

@@ -5,7 +5,7 @@ import {
   getComponentDocLink,
   getRegistry,
 } from "./utils/registry";
-import { executeCommand } from "./utils/vscode";
+import { executeCommand, getOrChooseCwd } from "./utils/vscode";
 import { getSvelteVersion } from "./utils/getSvelteVersion";
 import type { Component, Components } from "./utils/registry";
 
@@ -28,7 +28,8 @@ export async function activate(context: vscode.ExtensionContext) {
 
   const disposables: vscode.Disposable[] = [
     vscode.commands.registerCommand(commands.initCli, async () => {
-      const intCmd = await getInitCmd();
+      const cwd = await getOrChooseCwd();
+      const intCmd = await getInitCmd(cwd);
       executeCommand(intCmd);
     }),
     vscode.commands.registerCommand(commands.addNewComponent, async () => {
@@ -49,8 +50,8 @@ export async function activate(context: vscode.ExtensionContext) {
       if (!selectedComponent) {
         return;
       }
-
-      const installCmd = await getInstallCmd([selectedComponent.label]);
+      const cwd = await getOrChooseCwd();
+      const installCmd = await getInstallCmd([selectedComponent.label], cwd);
       executeCommand(installCmd);
     }),
 
@@ -75,8 +76,8 @@ export async function activate(context: vscode.ExtensionContext) {
       }
 
       const selectedComponent = selectedComponents.map((component: Component) => component.label);
-
-      const installCmd = await getInstallCmd(selectedComponent);
+      const cwd = await getOrChooseCwd();
+      const installCmd = await getInstallCmd(selectedComponent, cwd);
       executeCommand(installCmd);
     }),
     vscode.commands.registerCommand(commands.gotoComponentDoc, async () => {

src/utils/getSvelteVersion.ts

@@ -3,5 +3,5 @@ import { getProjectDependencies } from "./getProjectDeps";
 export const getSvelteVersion = async (): Promise<number> => {
     const dependencies = await getProjectDependencies();
     const svelteDep = dependencies.find((dep) => dep.name === 'svelte');
-    return svelteDep!.version;
+    return svelteDep ? svelteDep?.version : 4;
 };

src/utils/registry.ts

@@ -45,39 +45,39 @@ export const getRegistry = async (): Promise<Components | null> => {
   return components;
 };
 
-export const getInstallCmd = async (components: string[]) => {
+export const getInstallCmd = async (components: string[], cwd: string) => {
   const packageManager = await detectPackageManager();
   const componentStr = components.join(" ");
   const svelteVersion = await getSvelteVersion();
 
   if (packageManager === "bun") {
-    return svelteVersion >= 5 ? `bunx shadcn-svelte@next add ${componentStr}` : `bunx shadcn-svelte add ${componentStr}`;
+    return svelteVersion >= 5 ? `bunx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `bunx shadcn-svelte add ${componentStr} -c ${cwd}`;
   }
 
   if (packageManager === "pnpm") {
-    return svelteVersion >= 5 ? `pnpm dlx shadcn-svelte@next add ${componentStr}` : `pnpm dlx shadcn-svelte@latest add ${componentStr}`;
+    return svelteVersion >= 5 ? `pnpm dlx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `pnpm dlx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
   }
 
-  return svelteVersion >= 5 ? `npx shadcn-svelte@next add ${componentStr}` : `npx shadcn-svelte@latest add ${componentStr}`;
+  return svelteVersion >= 5 ? `npx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `npx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
 };
 
-export const getInitCmd = async () => {
+export const getInitCmd = async (cwd: string) => {
   const packageManager = await detectPackageManager();
   const svelteVersion = await getSvelteVersion();
 
   if (packageManager === "bun") {
-    return svelteVersion >= 5 ? 'bunx shadcn-svelte@next init' : "bunx shadcn-svelte init";
+    return svelteVersion >= 5 ? `bunx shadcn-svelte@next init -c ${cwd}` : `bunx shadcn-svelte init -c ${cwd}`;
   }
 
   if (packageManager === "pnpm") {
-    return svelteVersion >= 5 ? 'pnpm dlx shadcn-svelte@next init' : "pnpm dlx shadcn-svelte@latest init";
+    return svelteVersion >= 5 ? `pnpm dlx shadcn-svelte@next init -c ${cwd}` : `pnpm dlx shadcn-svelte@latest init -c ${cwd}`;
   }
 
-  return svelteVersion >= 5 ? 'npx shadcn-svelte@next init' : "npx shadcn-svelte@latest init";
+  return svelteVersion >= 5 ? `npx shadcn-svelte@next init -c ${cwd}` : `npx shadcn-svelte@latest init -c ${cwd}`;
 };
 
 export const getComponentDocLink = async (component: string) => {
   const svelteVersion = await getSvelteVersion();
   const shadCnDocUrl = svelteVersion >= 5 ? "https://next.shadcn-svelte.com/docs" : "https://shadcn-svelte.com/docs";
   return `${shadCnDocUrl}/components/${component}`;
-};
+};

src/utils/vscode.ts

@@ -50,3 +50,40 @@ export const detectPackageManager = async (): Promise<PackageManager> => {
 
   return "npm";
 };
+
+export const getOrChooseCwd = async (): Promise<string> => {
+  const cwdFromConfig = vscode.workspace
+    .getConfiguration("shadcn-svelte")
+    .get<string>("cwd")
+    ?.trim();
+
+  // Always use the value from settings if it's provided
+  if (cwdFromConfig) {
+    return cwdFromConfig;
+  }
+
+  // Get the currently opened workspace folders
+  const workspaceFolders = (vscode.workspace.workspaceFolders ?? []).filter(
+    (f) => f.uri.scheme === "file"
+  );
+
+  // If there are no workspace folders open or if there is only one workspace folder, just use the current working dir
+  if (!workspaceFolders.length || workspaceFolders.length === 1) {
+    return "./";
+  }
+
+  // If there are multiple workspaces open, allow the user to pick which one
+  // they want to use.
+  const choice = await vscode.window.showQuickPick(
+    workspaceFolders.map((f) => f.name)
+  );
+
+  if (!choice) {
+    return "./";
+  }
+
+  // Map the chosen workspace name to absolute path
+  const fsPath = workspaceFolders.find((f) => f.name === choice)?.uri.fsPath;
+
+  return fsPath ?? "./";
+};