@collectui/bdui 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@collectui/bdui",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Add BoardUI components to your project.",
   "license": "MIT",
   "type": "module",

package/src/add.js

@@ -7,23 +7,38 @@ import { detectProject, installCommand } from "./project.js";
 import { fetchIndex, fetchItem } from "./registry.js";
 import { writeItemFiles } from "./write.js";
 
+/** 依赖 spec → 包名。scoped 包(@scope/name@^1.0.0)的首个 @ 属于包名,不是分隔符 */
+export function pkgBaseName(dep) {
+	const i = dep.indexOf("@", 1);
+	return i === -1 ? dep : dep.slice(0, i);
+}
+
 export async function installPackages(pm, packages, cwd) {
 	if (!packages.length) return;
 	const [command, args] = installCommand(pm, packages);
+	// stderr 管道捕获(只留尾部):失败时带诊断输出,成功时丢弃不污染终端
+	const stderrLines = [];
 	await new Promise((resolve, reject) => {
 		const child = spawn(command, args, {
 			cwd,
-			stdio: "ignore",
+			stdio: ["ignore", "ignore", "pipe"],
 			shell: process.platform === "win32",
 		});
+		child.stderr?.on("data", (d) => {
+			stderrLines.push(String(d));
+			if (stderrLines.length > 40) stderrLines.shift();
+		});
 		child.on("error", reject);
-		child.on("close", (code) =>
-			code === 0
-				? resolve()
-				: reject(
-						new Error(`${command} ${args.join(" ")} exited with code ${code}`)
-					)
-		);
+		child.on("close", (code) => {
+			if (code === 0) return resolve();
+			const tail = stderrLines.join("").trim().split("\n").slice(-8).join("\n");
+			reject(
+				new Error(
+					`${command} ${args.join(" ")} exited with code ${code}` +
+						(tail ? `\n${tail}` : "")
+				)
+			);
+		});
 	});
 }
 
@@ -68,21 +83,33 @@ export async function cmdAdd(names, flags) {
 			`Unknown component(s): ${missing.join(", ")} — run \`bdui list\`.`
 		);
 	}
+	if (resolved.size > wanted.length) {
+		console.log(
+			c.dim(
+				`  closure ${resolved.size} item(s) resolved from ${wanted.length} requested (registry dependencies)`
+			)
+		);
+	}
 
 	const outRoot = flags.path ?? project.sourceRoot;
 	const deps = new Map(); // pkgName → 带 版本的 spec(去重,优先带版本形式)
+	const nextImports = new Set();
 	let wrote = 0;
 	writeItemFiles.lastWroteStyles = false;
 
 	for (const item of resolved.values()) {
 		for (const dep of item.dependencies ?? []) {
-			const pkgName = dep.split("@")[0] || dep;
+			const pkgName = pkgBaseName(dep);
 			if (!project.deps[pkgName]) {
 				const prev = deps.get(pkgName);
 				if (!prev || (prev === pkgName && dep !== pkgName))
 					deps.set(pkgName, dep);
 			}
 		}
+		for (const f of item.files ?? []) {
+			for (const m of (f.content ?? "").matchAll(/from\s+["'](next\/[a-z-]+)/g))
+				nextImports.add(m[1]);
+		}
 		wrote += await writeItemFiles(item, outRoot, flags);
 	}
 
@@ -111,6 +138,20 @@ export async function cmdAdd(names, flags) {
 		}
 	}
 	console.log(c.green(`\n✓ ${wrote} file(s) written.`));
+	if (wrote === 0) {
+		console.log(
+			c.yellow(
+				"  warn  nothing was written — every file was skipped, or the registry entry ships no component source (upstream entry may be broken)"
+			)
+		);
+	}
+	if (nextImports.size) {
+		console.log(
+			c.yellow(
+				`\nNote: ${[...nextImports].sort().join(", ")} imported by installed files — these only compile in a Next.js project.`
+			)
+		);
+	}
 	// 与 boardui 同款 Note:样式入口提示(本次写过 styles/ 文件时)
 	if (writeItemFiles.lastWroteStyles) {
 		console.log(

package/src/init.js

@@ -1,8 +1,10 @@
 // `bdui init` — 对齐 boardui init:装 foundations(cx/theme/typography/globals)
 // + agent 规则(AGENTS.md + .cursor/rules),内容全部来自 registry(与官方同源)
 
+import { existsSync } from "fs";
 import ora from "ora";
-import { installPackages } from "./add.js";
+import path from "path";
+import { installPackages, pkgBaseName } from "./add.js";
 import c from "./color.js";
 import { detectProject } from "./project.js";
 import { fetchItem } from "./registry.js";
@@ -18,6 +20,48 @@ const PRO_EXTRA_DEPS = [
 	"@internationalized/date",
 ];
 
+/** BoardUI 按 Tailwind v4 + "@/..." alias 编写;官方按 Next.js 模板(自带基建)，
+ * 其他框架 init 必须补齐,否则装完 build 全红(2026-10-03 Vite 实测 50+ 错)。 */
+function frameworkSetup(project, cwd) {
+	const notes = [];
+	const pkgs = [];
+	const has = (n) => Boolean(project.deps[n]);
+
+	if (!has("tailwindcss")) pkgs.push("tailwindcss");
+	if (project.deps?.next) {
+		// Next.js:官方模板自带 @/ alias 与 @types/node;仅补缺失的 tailwind 管道
+		if (!has("@tailwindcss/postcss")) pkgs.push("@tailwindcss/postcss");
+		return { pkgs, notes };
+	}
+	const viteConfig = [
+		"vite.config.ts",
+		"vite.config.js",
+		"vite.config.mjs",
+	].find((f) => existsSync(path.join(cwd, f)));
+	const isVite = has("vite") || viteConfig != null;
+	if (isVite) {
+		if (!has("@tailwindcss/vite")) pkgs.push("@tailwindcss/vite");
+		if (existsSync(path.join(cwd, "tsconfig.json")) && !has("@types/node"))
+			pkgs.push("@types/node");
+		notes.push(
+			[
+				"Vite detected — finish the setup manually:",
+				"  1. Add the plugin & alias to " +
+					(viteConfig ?? "vite.config.ts") +
+					":",
+				'       import tailwindcss from "@tailwindcss/vite";',
+				'       import path from "node:path";',
+				"       // plugins: [tailwindcss()]",
+				'       // resolve: { alias: { "@": path.resolve(__dirname, "./src") } }',
+				'  2. Map the "@/..." alias in tsconfig (compilerOptions.paths):',
+				'       { "paths": { "@/*": ["./src/*"] } }',
+				"     (tsconfig uses references → add to tsconfig.app.json as well)",
+			].join("\n")
+		);
+	}
+	return { pkgs, notes };
+}
+
 export async function cmdInit(flags) {
 	const cwd = flags.dir ?? process.cwd();
 	const project = detectProject(cwd);
@@ -28,11 +72,15 @@ export async function cmdInit(flags) {
 		`${c.cyan("init")}   detected ${project.packageManager}, src=${project.usesSrcDir}, alias=${project.alias}`
 	);
 
-	// npm 依赖:foundation 用到的 + 可选 pro 依赖(官方 --pro 同款集)
-	const deps = new Set(["clsx", "tailwind-merge"]);
-	if (flags.pro) {
-		for (const d of PRO_EXTRA_DEPS) deps.add(d);
-	}
+	// npm 依赖:foundation 用到的 + 可选 pro 依赖(官方 --pro 同款集)+ 框架适配
+	// Map 按 pkgName 去重(裸名与带版本 spec 共存会导致重复 install)
+	const baseDeps = ["clsx", "tailwind-merge"];
+	if (flags.pro) baseDeps.push(...PRO_EXTRA_DEPS);
+	const setup = frameworkSetup(project, cwd);
+	baseDeps.push(...setup.pkgs);
+	const deps = new Map(); // pkgName → spec(优先带版本形式)
+	for (const d of baseDeps)
+		if (!project.deps[pkgBaseName(d)]) deps.set(pkgBaseName(d), d);
 
 	// foundations 条目落盘(boardui init 同款:theme tokens、type scale、globals、cx)
 	const outRoot = flags.path ?? project.sourceRoot;
@@ -40,8 +88,12 @@ export async function cmdInit(flags) {
 	for (const name of FOUNDATIONS) {
 		const item = await fetchItem(name);
 		for (const dep of item.dependencies ?? []) {
-			const pkgName = dep.split("@")[0] || dep;
-			if (!project.deps[pkgName]) deps.add(dep);
+			const pkgName = pkgBaseName(dep);
+			if (!project.deps[pkgName]) {
+				const prev = deps.get(pkgName);
+				if (!prev || (prev === pkgName && dep !== pkgName))
+					deps.set(pkgName, dep);
+			}
 		}
 		wrote += await writeItemFiles(item, outRoot, flags);
 	}
@@ -50,7 +102,7 @@ export async function cmdInit(flags) {
 	const ruleLines = await applyAgentRules(cwd);
 
 	if (deps.size) {
-		console.log(`  ${c.cyan("deps")}   ${[...deps].join(", ")}`);
+		console.log(`  ${c.cyan("deps")}   ${[...deps.values()].join(", ")}`);
 		const spin = process.stderr.isTTY
 			? ora({
 					text: "Installing dependencies…",
@@ -59,7 +111,7 @@ export async function cmdInit(flags) {
 				}).start()
 			: null;
 		try {
-			await installPackages(project.packageManager, [...deps], cwd);
+			await installPackages(project.packageManager, [...deps.values()], cwd);
 			spin?.succeed("Dependencies installed");
 		} catch (e) {
 			spin?.fail("Dependency installation failed");
@@ -67,6 +119,7 @@ export async function cmdInit(flags) {
 		}
 	}
 	console.log(c.green(`\n✓ ${wrote} foundation file(s) written.`));
+	for (const note of setup.notes) console.log(c.yellow(`\n${note}\n`));
 	for (const line of ruleLines) console.log(line);
 	console.log(
 		`  ${c.dim('Note: import the styles in your root layout or global css: import "@/styles/globals.css";')}`

package/src/list.js

@@ -6,7 +6,7 @@ export async function cmdList() {
 	const { items } = await fetchIndex(true);
 	const groups = new Map();
 	for (const item of items) {
-		const key = item.bdui2Type ?? "base";
+		const key = item.boarduiType ?? "base";
 		if (!groups.has(key)) groups.set(key, []);
 		groups.get(key).push(item);
 	}

package/src/mcp.js

@@ -158,7 +158,7 @@ async function dispatch(name, args, captured, serverKey) {
 			const lines = [header];
 			const groups = new Map();
 			for (const i of items) {
-				const g = i.bdui2Type ?? "base";
+				const g = i.boarduiType ?? "base";
 				if (!groups.has(g)) groups.set(g, []);
 				groups.get(g).push(i);
 			}
@@ -240,14 +240,14 @@ async function dispatch(name, args, captured, serverKey) {
 				return `No package.json found in ${projectDir}. Pass projectDir with the absolute path of the project root. If the directory is fresh, scaffold an app there first (e.g. npx create-next-app@latest .), then call init_boardui again.`;
 			}
 			const { cmdInit } = await import("./init.js");
+			// cmdInit 内部已应用 agent rules(init.js 的 applyAgentRules),此处不重复刷
 			await cmdInit({
 				dir: projectDir,
 				pro: args.pro,
 				overwrite: args.overwrite,
 				yes: true,
 			});
-			const ruleLines = await applyAgentRules(projectDir);
-			return ["Setup complete.", ...captured, ...ruleLines].join("\n");
+			return ["Setup complete.", ...captured].join("\n");
 		}
 
 		case "install_rules":
@@ -346,6 +346,18 @@ export async function cmdMcp(options = {}) {
 	const rl = createInterface({ input: process.stdin });
 	const write = (obj) => process.stdout.write(JSON.stringify(obj) + "\n");
 
+	// tools/call 串行队列:安装类工具写同一项目目录 + console.log 捕获是全局单例,
+	// 并发调用会互相踩(文件竞争 / 输出丢失)。其他方法即时响应不受队列影响。
+	let callQueue = Promise.resolve();
+	function serialize(fn) {
+		const run = callQueue.then(fn, fn);
+		callQueue = run.then(
+			() => {},
+			() => {}
+		);
+		return run;
+	}
+
 	rl.on("line", (line) => {
 		if (!line.trim()) return;
 		let msg;
@@ -380,27 +392,29 @@ export async function cmdMcp(options = {}) {
 			if (method === "tools/list")
 				return write({ jsonrpc: "2.0", id, result: { tools: TOOLS } });
 			if (method === "tools/call") {
-				try {
-					const result = await call(
-						params.name,
-						params.arguments ?? {},
-						serverKey
-					);
-					return write({
-						jsonrpc: "2.0",
-						id,
-						result: { content: [{ type: "text", text: String(result) }] },
-					});
-				} catch (error) {
-					return write({
-						jsonrpc: "2.0",
-						id,
-						result: {
-							content: [{ type: "text", text: `Error: ${error.message}` }],
-							isError: true,
-						},
-					});
-				}
+				return serialize(async () => {
+					try {
+						const result = await call(
+							params.name,
+							params.arguments ?? {},
+							serverKey
+						);
+						return write({
+							jsonrpc: "2.0",
+							id,
+							result: { content: [{ type: "text", text: String(result) }] },
+						});
+					} catch (error) {
+						return write({
+							jsonrpc: "2.0",
+							id,
+							result: {
+								content: [{ type: "text", text: `Error: ${error.message}` }],
+								isError: true,
+							},
+						});
+					}
+				});
 			}
 			write({
 				jsonrpc: "2.0",

package/src/write.js

@@ -30,7 +30,14 @@ export async function writeItemFiles(item, outRoot, flags = {}) {
 	let wroteStyles = false;
 	const state = { all: false };
 	for (const file of item.files ?? []) {
-		const target = path.join(outRoot, file.path);
+		// 路径守卫:file.path 不得逃逸 outRoot(防 ../ 遍历;信任官方 registry
+		// 前提下是纵深防御,与 shadcn 同水位再进一步)
+		const rel = path.normalize(file.path ?? "");
+		if (rel.startsWith("..") || path.isAbsolute(rel)) {
+			console.log(`  ${pc.red("skip")}    unsafe path in item: ${file.path}`);
+			continue;
+		}
+		const target = path.join(outRoot, rel);
 		if (existsSync(target) && !(await confirmOverwrite(target, flags, state))) {
 			console.log(
 				`  ${pc.yellow("skip")}    ${path.relative(process.cwd(), target)} (exists)`