assistant-ui 0.0.91 → 0.0.92

package/src/lib/create-project.ts

@@ -1,10 +1,10 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { downloadTemplate } from "giget";
-import { spawn } from "cross-spawn";
 import { sync as globSync } from "glob";
 import { detect } from "detect-package-manager";
 import { logger } from "./utils/logger";
+import { runSpawn, SpawnExitError } from "./run-spawn";
 
 export type PackageManagerName = "npm" | "pnpm" | "yarn" | "bun";
 
@@ -27,6 +27,40 @@ export interface TransformOptions {
   packageManager: PackageManagerName;
 }
 
+export type ProjectSource =
+  | {
+      kind: "github";
+      ref: string | undefined;
+    }
+  | {
+      kind: "local";
+      rootDir: string;
+    };
+
+const LOCAL_PROJECT_ARTIFACT_DIRS: readonly string[] = [
+  "node_modules",
+  ".next",
+  "dist",
+  "build",
+];
+
+const LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES = LOCAL_PROJECT_ARTIFACT_DIRS.map(
+  (dir) => `**/${dir}/**`,
+);
+
+export function resolvePackageManager(opts: {
+  useNpm?: boolean;
+  usePnpm?: boolean;
+  useYarn?: boolean;
+  useBun?: boolean;
+}): PackageManagerName | undefined {
+  if (opts.useNpm) return "npm";
+  if (opts.usePnpm) return "pnpm";
+  if (opts.useYarn) return "yarn";
+  if (opts.useBun) return "bun";
+  return undefined;
+}
+
 export async function resolveLatestReleaseRef(): Promise<string | undefined> {
   try {
     const res = await fetch(
@@ -89,6 +123,47 @@ export async function downloadProject(
   }
 }
 
+function shouldCopyLocalProjectPath(src: string, projectDir: string): boolean {
+  const relative = path.relative(projectDir, src);
+  if (!relative) return true;
+
+  const segments = relative.split(path.sep);
+  return !segments.some((segment) =>
+    LOCAL_PROJECT_ARTIFACT_DIRS.includes(segment),
+  );
+}
+
+export async function scaffoldProject(
+  repoPath: string,
+  destDir: string,
+  source: ProjectSource,
+): Promise<void> {
+  if (source.kind === "github") {
+    await downloadProject(repoPath, destDir, source.ref);
+    return;
+  }
+
+  const localProjectDir = path.resolve(source.rootDir, repoPath);
+  try {
+    fs.cpSync(localProjectDir, destDir, {
+      recursive: true,
+      force: true,
+      filter: (src) => shouldCopyLocalProjectPath(src, localProjectDir),
+    });
+  } catch (error) {
+    const code =
+      error instanceof Error
+        ? (error as NodeJS.ErrnoException).code
+        : undefined;
+    if (code === "ENOENT") {
+      throw new Error(
+        `Local project source does not exist: ${localProjectDir}`,
+      );
+    }
+    throw error;
+  }
+}
+
 function detectFromUserAgent(): PackageManagerName | undefined {
   const ua = process.env.npm_config_user_agent;
   if (!ua) return undefined;
@@ -99,15 +174,15 @@ function detectFromUserAgent(): PackageManagerName | undefined {
   return undefined;
 }
 
-export async function resolvePackageManagerName(
-  projectDir: string,
+export async function resolvePackageManagerForCwd(
+  cwd: string,
   packageManager?: PackageManagerName,
 ): Promise<PackageManagerName> {
   if (packageManager) return packageManager;
   const fromAgent = detectFromUserAgent();
   if (fromAgent) return fromAgent;
   try {
-    return await detect({ cwd: path.dirname(projectDir) });
+    return await detect({ cwd });
   } catch {
     return "npm";
   }
@@ -117,9 +192,8 @@ export async function transformProject(
   projectDir: string,
   opts: TransformOptions,
 ): Promise<void> {
-  // 1. Transform package.json (always)
   logger.step("Transforming package.json...");
-  await transformPackageJson(projectDir);
+  transformPackageJson(projectDir);
 
   let assistantUI: string[] | undefined;
   let shadcnUI: string[] | undefined;
@@ -127,20 +201,14 @@ export async function transformProject(
   if (!opts.hasLocalComponents) {
     logger.step("Transforming project files...");
 
-    // 2–4. Transform tsconfig, CSS, and scan components in parallel
-    const [, , components] = await Promise.all([
-      transformTsConfig(projectDir),
-      transformCssFiles(projectDir),
-      scanRequiredComponents(projectDir),
-    ]);
+    transformTsConfig(projectDir);
+    transformCssFiles(projectDir);
+
+    const components = scanRequiredComponents(projectDir);
     assistantUI = components.assistantUI;
     shadcnUI = components.shadcnUI;
-
-    // 5. Remove workspace components (after scan completes — scan reads these files)
-    await removeWorkspaceComponents(projectDir);
   }
 
-  // 6. Install dependencies
   const pm = opts.packageManager;
   if (!opts.skipInstall) {
     logger.step("Installing dependencies...");
@@ -148,14 +216,12 @@ export async function transformProject(
   }
 
   if (!opts.hasLocalComponents && shadcnUI && assistantUI) {
-    // 7. Install shadcn UI components
     const allShadcn = shadcnUI.includes("utils")
       ? shadcnUI
       : [...shadcnUI, "utils"];
     logger.step(`Installing shadcn UI components: ${allShadcn.join(", ")}...`);
     await installShadcnRegistry(projectDir, allShadcn, "shadcn components", pm);
 
-    // 8. Install assistant-ui components
     if (assistantUI.length > 0) {
       const auiComponents = assistantUI.map((c) => `@assistant-ui/${c}`);
       logger.step(
@@ -166,11 +232,11 @@ export async function transformProject(
   }
 }
 
-async function transformPackageJson(projectDir: string): Promise<void> {
+function transformPackageJson(projectDir: string): void {
   const pkgPath = path.join(projectDir, "package.json");
   const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
 
-  // Remove @assistant-ui/react-ui (workspace-only package)
+  // Remove @assistant-ui/ui dependency
   if (pkg.dependencies?.["@assistant-ui/ui"]) {
     delete pkg.dependencies["@assistant-ui/ui"];
   }
@@ -199,7 +265,7 @@ async function transformPackageJson(projectDir: string): Promise<void> {
   fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
 }
 
-async function transformTsConfig(projectDir: string): Promise<void> {
+function transformTsConfig(projectDir: string): void {
   const tsconfigPath = path.join(projectDir, "tsconfig.json");
 
   if (!fs.existsSync(tsconfigPath)) {
@@ -212,7 +278,9 @@ async function transformTsConfig(projectDir: string): Promise<void> {
   // Remove workspace paths
   if (tsconfig.compilerOptions?.paths) {
     delete tsconfig.compilerOptions.paths["@/components/assistant-ui/*"];
+    delete tsconfig.compilerOptions.paths["@/components/icons/*"];
     delete tsconfig.compilerOptions.paths["@/components/ui/*"];
+    delete tsconfig.compilerOptions.paths["@/hooks/*"];
     delete tsconfig.compilerOptions.paths["@/lib/utils"];
     delete tsconfig.compilerOptions.paths["@assistant-ui/ui/*"];
 
@@ -254,10 +322,10 @@ async function transformTsConfig(projectDir: string): Promise<void> {
   fs.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`);
 }
 
-async function transformCssFiles(projectDir: string): Promise<void> {
+function transformCssFiles(projectDir: string): void {
   const cssFiles = globSync("**/*.css", {
     cwd: projectDir,
-    ignore: ["**/node_modules/**", "**/dist/**", "**/.next/**"],
+    ignore: LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES,
   });
 
   for (const file of cssFiles) {
@@ -284,12 +352,14 @@ interface RequiredComponents {
   shadcnUI: string[];
 }
 
-async function scanRequiredComponents(
-  projectDir: string,
-): Promise<RequiredComponents> {
+function stripImportExtension(component: string): string {
+  return component.replace(/\.[cm]?[tj]sx?$/, "");
+}
+
+function scanRequiredComponents(projectDir: string): RequiredComponents {
   const files = globSync("**/*.{ts,tsx}", {
     cwd: projectDir,
-    ignore: ["**/node_modules/**", "**/dist/**", "**/.next/**"],
+    ignore: LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES,
   });
 
   const assistantUIComponents = new Set<string>();
@@ -303,12 +373,12 @@ async function scanRequiredComponents(
       const assistantUIRegex =
         /from\s+["']@\/components\/assistant-ui\/([^"']+)["']/g;
       for (const match of content.matchAll(assistantUIRegex)) {
-        assistantUIComponents.add(match[1]!);
+        assistantUIComponents.add(stripImportExtension(match[1]!));
       }
 
       const uiRegex = /from\s+["']@\/components\/ui\/([^"']+)["']/g;
       for (const match of content.matchAll(uiRegex)) {
-        shadcnUIComponents.add(match[1]!);
+        shadcnUIComponents.add(stripImportExtension(match[1]!));
       }
     } catch {
       // Ignore files that cannot be read
@@ -321,35 +391,20 @@ async function scanRequiredComponents(
   };
 }
 
-async function removeWorkspaceComponents(projectDir: string): Promise<void> {
-  const componentsDir = path.join(projectDir, "components", "assistant-ui");
-  fs.rmSync(componentsDir, { recursive: true, force: true });
-}
-
 async function installDependencies(
   projectDir: string,
   pm: PackageManagerName,
 ): Promise<void> {
   const args = pm === "yarn" ? [] : ["install"];
-
-  return new Promise((resolve, reject) => {
-    const child = spawn(pm, args, {
-      cwd: projectDir,
-      stdio: "inherit",
-    });
-
-    child.on("error", (error) => {
-      reject(new Error(`Failed to install dependencies: ${error.message}`));
-    });
-
-    child.on("close", (code) => {
-      if (code !== 0) {
-        reject(new Error(`${pm} install exited with code ${code}`));
-      } else {
-        resolve();
-      }
-    });
-  });
+  try {
+    await runSpawn(pm, args, projectDir);
+  } catch (error) {
+    if (error instanceof SpawnExitError) {
+      throw new Error(`${pm} install exited with code ${error.code}`);
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to install dependencies: ${message}`);
+  }
 }
 
 async function installShadcnRegistry(
@@ -359,27 +414,21 @@ async function installShadcnRegistry(
   pm: PackageManagerName,
 ): Promise<void> {
   const [cmd, dlxArgs] = dlxCommand(pm);
-  return new Promise((resolve, reject) => {
-    const child = spawn(
-      cmd,
-      [...dlxArgs, "shadcn@latest", "add", ...components, "--yes"],
-      {
-        cwd: projectDir,
-        stdio: "inherit",
-      },
-    );
+  // For npm, dlxArgs may already include `--yes` for npx auto-install.
+  // The trailing `--yes` is for shadcn's own confirmation prompt.
+  const addArgs = [...dlxArgs, "shadcn@latest", "add", ...components, "--yes"];
 
-    child.on("error", (error) => {
-      reject(new Error(`Failed to install ${label}: ${error.message}`));
-    });
+  try {
+    await runSpawn(cmd, addArgs, projectDir);
+  } catch (error) {
+    if (error instanceof SpawnExitError) {
+      logger.warn(
+        `shadcn exited with code ${error.code}. Run the following to retry:\n  ${cmd} ${addArgs.slice(0, -1).join(" ")}`,
+      );
+      return;
+    }
 
-    child.on("close", (code) => {
-      if (code !== 0) {
-        logger.warn(
-          `shadcn exited with code ${code}. Run the following to retry:\n  ${cmd} ${[...dlxArgs, "shadcn@latest", "add", ...components].join(" ")}`,
-        );
-      }
-      resolve();
-    });
-  });
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to install ${label}: ${message}`);
+  }
 }

package/src/lib/run-spawn.ts

@@ -0,0 +1,32 @@
+import { spawn } from "cross-spawn";
+
+export class SpawnExitError extends Error {
+  code: number;
+
+  constructor(code: number) {
+    super(`Process exited with code ${code}`);
+    this.code = code;
+  }
+}
+
+export function runSpawn(
+  command: string,
+  args: string[],
+  cwd?: string,
+): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      stdio: "inherit",
+      cwd,
+    });
+
+    child.on("error", (error) => reject(error));
+    child.on("close", (code) => {
+      if (code !== 0) {
+        reject(new SpawnExitError(code || 1));
+      } else {
+        resolve();
+      }
+    });
+  });
+}