@pubinfo/cli 2.1.3 → 2.1.4

package/dist/{build-CBpkrIHc.js → build-TpYdEV_-.js}

@@ -1,5 +1,5 @@
-import { t as runVite } from "./vite-BeiYc40N.js";
-import { t as setup_default } from "./setup-DTOe0VmW.js";
+import { t as runVite } from "./vite-bwhDbW7x.js";
+import { t as setup_default } from "./setup-BdawX0W3.js";
 import { defineCommand, runMain } from "citty";
 
 //#region src/commands/build.ts

package/dist/{dev-C17amTjs.js → dev-DVlLrfjX.js}

@@ -1,5 +1,5 @@
-import { t as runVite } from "./vite-BeiYc40N.js";
-import { t as setup_default } from "./setup-DTOe0VmW.js";
+import { t as runVite } from "./vite-bwhDbW7x.js";
+import { t as setup_default } from "./setup-BdawX0W3.js";
 import { defineCommand, runMain } from "citty";
 
 //#region src/commands/dev.ts

package/dist/generate-9OAGGbjc.js

@@ -0,0 +1,63 @@
+import { n as ensureValidIdentifier, r as resolvePubinfoVersionFromApps, t as ensureMonorepoAppsDir } from "./generate-MJ0AbXtK.js";
+import { createRequire } from "node:module";
+import { defineCommand } from "citty";
+import { resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { logger } from "@pubinfo/shared";
+import { generate } from "create-pubinfo";
+
+//#region src/commands/generate.ts
+const require = createRequire(import.meta.url);
+const createPubinfoPkgPath = require.resolve("create-pubinfo/package.json");
+const createPubinfoPkg = require("create-pubinfo/package.json");
+const monorepoAppTemplatePath = resolve(resolve(createPubinfoPkgPath, ".."), "templates/pubinfo-monorepo/apps/basic");
+const fallbackVersion = createPubinfoPkg.version;
+var generate_default = defineCommand({
+	meta: {
+		name: "generate",
+		description: "在 monorepo apps 目录下创建新的 pubinfo 应用"
+	},
+	args: {
+		name: {
+			type: "positional",
+			required: true,
+			description: "应用目录名称，例如 admin"
+		},
+		key: {
+			type: "string",
+			description: "应用标识，默认与目录名称一致"
+		},
+		rbac: {
+			type: "boolean",
+			default: true,
+			description: "是否包含 RBAC 模块"
+		},
+		openapi: {
+			type: "boolean",
+			default: false,
+			description: "是否启用 openapi 自动生成"
+		}
+	},
+	async run({ args }) {
+		const appsDir = ensureMonorepoAppsDir(resolve("."));
+		const appName = args.name;
+		ensureValidIdentifier(appName, "应用名称");
+		const targetDir = resolve(appsDir, appName);
+		if (existsSync(targetDir)) throw new Error(`应用 ${appName} 已存在，请选择其他名称`);
+		const key = args.key ?? appName;
+		ensureValidIdentifier(key, "应用标识");
+		await generate({
+			templateName: "pubinfo-monorepo",
+			templatePath: monorepoAppTemplatePath,
+			targetDir,
+			key,
+			version: await resolvePubinfoVersionFromApps(appsDir) || fallbackVersion,
+			modules: args.rbac === false ? [] : ["rbac"],
+			openapi: Boolean(args.openapi)
+		});
+		logger.success(`应用 ${appName} 创建完成，位于 apps/${appName}`);
+	}
+});
+
+//#endregion
+export { generate_default as default };

package/dist/generate-MJ0AbXtK.js

@@ -0,0 +1,33 @@
+import { readFile } from "node:fs/promises";
+import { resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { globby } from "globby";
+
+//#region src/utils/generate.ts
+const INVALID_NAME_RE = /[<>:"/\\|?*\s]/;
+function ensureValidIdentifier(value, label) {
+	if (!value) throw new Error(`${label} 不能为空`);
+	if (INVALID_NAME_RE.test(value)) throw new Error(`${label} 不能包含空格或特殊字符 (<>:"/\\|?*)`);
+}
+function ensureMonorepoAppsDir(root) {
+	const appsDir = resolve(root, "apps");
+	if (!existsSync(appsDir)) throw new Error("未检测到 apps 目录，请在 pubinfo monorepo 根目录执行该命令");
+	if (!existsSync(resolve(root, "pnpm-workspace.yaml"))) throw new Error("未找到 pnpm-workspace.yaml，当前目录不是 pubinfo monorepo 工程");
+	return appsDir;
+}
+async function resolvePubinfoVersionFromApps(appsDir) {
+	const pkgFiles = await globby("**/package.json", {
+		cwd: appsDir,
+		absolute: true,
+		onlyFiles: true
+	});
+	for (const file of pkgFiles) {
+		const content = await readFile(file, "utf8");
+		const pkg = JSON.parse(content);
+		const version = pkg.dependencies?.pubinfo || pkg.devDependencies?.pubinfo;
+		if (version) return version;
+	}
+}
+
+//#endregion
+export { ensureValidIdentifier as n, resolvePubinfoVersionFromApps as r, ensureMonorepoAppsDir as t };

package/dist/{icon-Dp4dXbYT.js → icon-B2EyVw8p.js}

@@ -3,8 +3,8 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
 import { logger } from "@pubinfo/shared";
-import { load } from "cheerio";
 import { globby } from "globby";
+import { load } from "cheerio";
 
 //#region src/commands/icon.ts
 function parseNumberLike(v) {

package/dist/index.js

@@ -3,20 +3,22 @@ import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name = "@pubinfo/cli";
-var version = "2.1.3";
+var version = "2.1.4";
 var description = "CLI for Pubinfo";
 
 //#endregion
 //#region src/commands/index.ts
 const _rDefault = (r) => r.default || r;
 const commands = {
-	dev: () => import("./dev-C17amTjs.js").then(_rDefault),
-	build: () => import("./build-CBpkrIHc.js").then(_rDefault),
-	preview: () => import("./preview-CL5eJUy5.js").then(_rDefault),
-	setup: () => import("./setup-tGwcxPxN.js").then(_rDefault),
-	commit: () => import("./commit-BsodnARP.js").then(_rDefault),
-	icon: () => import("./icon-Dp4dXbYT.js").then(_rDefault),
-	upgrade: () => import("./upgrade-R63l7RcU.js").then(_rDefault)
+	dev: () => import("./dev-DVlLrfjX.js").then(_rDefault),
+	build: () => import("./build-TpYdEV_-.js").then(_rDefault),
+	preview: () => import("./preview-BVVgNnhp.js").then(_rDefault),
+	setup: () => import("./setup-CACbESTE.js").then(_rDefault),
+	commit: () => import("./commit-r-63XXfJ.js").then(_rDefault),
+	icon: () => import("./icon-B2EyVw8p.js").then(_rDefault),
+	upgrade: () => import("./upgrade-B-Zl5nkj.js").then(_rDefault),
+	generate: () => import("./generate-9OAGGbjc.js").then(_rDefault),
+	monorepo: () => import("./monorepo-BY87UC9C.js").then(_rDefault)
 };
 
 //#endregion

package/dist/monorepo-BY87UC9C.js

@@ -0,0 +1,265 @@
+import { n as ensureValidIdentifier } from "./generate-MJ0AbXtK.js";
+import { createRequire } from "node:module";
+import { defineCommand } from "citty";
+import { cp, mkdir, mkdtemp, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { dirname, join, relative, resolve } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
+import { logger } from "@pubinfo/shared";
+import { generate } from "create-pubinfo";
+import { globby } from "globby";
+import { tmpdir } from "node:os";
+
+//#region src/utils/monorepo.ts
+const APP_DIRECTORIES = [
+	"src",
+	"public",
+	"mock",
+	"mocks",
+	"tests",
+	"test",
+	"e2e"
+];
+const APP_FILES = [
+	"index.html",
+	"openapi.config.ts",
+	"openapi.config.ts.hbs",
+	"pubinfo.config.ts",
+	"pubinfo.config.js",
+	"tsconfig.json",
+	"tsconfig.app.json",
+	"tsconfig.node.json",
+	"uno.config.ts",
+	"uno.config.js",
+	"vitest.config.ts",
+	"vitest.config.js",
+	"vitest.setup.ts",
+	"vite.config.ts",
+	"vite.config.js"
+];
+const TEMPLATE_ROOT_FILES = [
+	".browserslistrc",
+	".editorconfig",
+	".gitignore",
+	".npmrc",
+	"eslint.config.ts",
+	"stylelint.config.js",
+	"pnpm-workspace.yaml"
+];
+const ENV_PATTERNS = [".env", ".env.*"];
+function hasDependency(pkg, dep) {
+	return Boolean(pkg.dependencies?.[dep] || pkg.devDependencies?.[dep]);
+}
+function formatTimestamp(date) {
+	const pad = (value) => value.toString().padStart(2, "0");
+	return `${[
+		date.getFullYear().toString(),
+		pad(date.getMonth() + 1),
+		pad(date.getDate())
+	].join("")}-${[
+		pad(date.getHours()),
+		pad(date.getMinutes()),
+		pad(date.getSeconds())
+	].join("")}`;
+}
+async function backupPath(rootDir, backupDir, target) {
+	if (!existsSync(target)) return;
+	const dest = resolve(backupDir, relative(rootDir, target));
+	await mkdir(dirname(dest), { recursive: true });
+	await cp(target, dest, {
+		recursive: true,
+		force: true
+	});
+}
+async function movePath(rootDir, destinationRoot, backupDir, relativePath) {
+	const source = resolve(rootDir, relativePath);
+	if (!existsSync(source)) return false;
+	const dest = resolve(destinationRoot, relativePath);
+	if (existsSync(dest)) throw new Error(`目标路径 ${relative(rootDir, dest)} 已存在，无法覆盖`);
+	await backupPath(rootDir, backupDir, source);
+	await mkdir(dirname(dest), { recursive: true });
+	await rename(source, dest);
+	return true;
+}
+async function copyTemplateFile(templateRoot, rootDir, backupDir, relativePath) {
+	const source = resolve(templateRoot, relativePath);
+	if (!existsSync(source)) return;
+	const target = resolve(rootDir, relativePath);
+	if (existsSync(target)) await backupPath(rootDir, backupDir, target);
+	await mkdir(dirname(target), { recursive: true });
+	await cp(source, target, {
+		recursive: true,
+		force: true
+	});
+}
+function deriveDefaultAppName(pkgName) {
+	if (!pkgName) return "app";
+	let base = pkgName.trim();
+	if (base.startsWith("@")) {
+		const slashIndex = base.indexOf("/");
+		base = slashIndex === -1 ? base.slice(1) : base.slice(slashIndex + 1);
+	}
+	return base.replace(/\//g, "-").replace(/[^\w-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "app";
+}
+async function extractStorageKey(rootDir) {
+	const settingsPath = resolve(rootDir, "src/settings.ts");
+	if (!existsSync(settingsPath)) return;
+	return (await readFile(settingsPath, "utf8")).match(/storagePrefix:\s*['"]([^'"\\]+)['"]/)?.[1];
+}
+function detectModulesFromPackage(pkg) {
+	const modules = [];
+	if (hasDependency(pkg, "@pubinfo/module-rbac")) modules.push("rbac");
+	return modules;
+}
+function detectOpenapiEnabled(pkg) {
+	return hasDependency(pkg, "@pubinfo/openapi") || hasDependency(pkg, "@pubinfo/preset-openapi") || Boolean(pkg.scripts?.openapi);
+}
+function resolvePubinfoVersionFromPackage(pkg) {
+	return pkg.dependencies?.pubinfo || pkg.devDependencies?.pubinfo;
+}
+function buildWorkspacePackageName(originalName) {
+	if (!originalName) return "pubinfo-monorepo";
+	if (originalName.endsWith("-workspace")) return originalName;
+	if (originalName.startsWith("@")) {
+		const [scope, name] = originalName.slice(1).split("/");
+		if (!name) return originalName;
+		return `@${scope}/${name.endsWith("-workspace") ? name : `${name}-workspace`}`;
+	}
+	return `${originalName}-workspace`;
+}
+function preserveFields(target, source, fields) {
+	for (const field of fields) {
+		const value = source[field];
+		if (value !== void 0) target[field] = value;
+	}
+}
+async function convertToMonorepo(options) {
+	const { rootDir, templateRoot, appName, force, rootPackageJson, rootPackageJsonContent, packageManager } = options;
+	if (existsSync(resolve(rootDir, "pnpm-workspace.yaml")) && !force) throw new Error("已检测到 pnpm-workspace.yaml，当前目录可能已经是 monorepo，如需继续请使用 --force");
+	const appsDir = resolve(rootDir, "apps");
+	await mkdir(appsDir, { recursive: true });
+	const appDir = resolve(appsDir, appName);
+	if (existsSync(appDir)) throw new Error(`应用目录 apps/${appName} 已存在，请更换名称或清理后再试`);
+	await mkdir(appDir, { recursive: true });
+	const backupDir = resolve(rootDir, ".pubinfo", "monorepo-backup", formatTimestamp(/* @__PURE__ */ new Date()));
+	await mkdir(backupDir, { recursive: true });
+	for (const dir of APP_DIRECTORIES) await movePath(rootDir, appDir, backupDir, dir);
+	for (const file of APP_FILES) await movePath(rootDir, appDir, backupDir, file);
+	const envFiles = await globby(ENV_PATTERNS, {
+		cwd: rootDir,
+		dot: true,
+		onlyFiles: true
+	});
+	for (const env of envFiles) await movePath(rootDir, appDir, backupDir, env);
+	const rootPkgPath = resolve(rootDir, "package.json");
+	const appPkgPath = resolve(appDir, "package.json");
+	await mkdir(dirname(appPkgPath), { recursive: true });
+	if (existsSync(appPkgPath)) throw new Error(`目标应用 package.json 已存在：apps/${appName}/package.json`);
+	await writeFile(appPkgPath, rootPackageJsonContent);
+	await backupPath(rootDir, backupDir, rootPkgPath);
+	const templatePkg = JSON.parse(await readFile(resolve(templateRoot, "package.json"), "utf8"));
+	templatePkg.name = buildWorkspacePackageName(rootPackageJson.name);
+	templatePkg.packageManager = packageManager || templatePkg.packageManager;
+	templatePkg.description = rootPackageJson.description || templatePkg.description || `Workspace for ${rootPackageJson.name ?? "pubinfo app"}`;
+	preserveFields(templatePkg, rootPackageJson, [
+		"license",
+		"author",
+		"repository",
+		"bugs",
+		"homepage"
+	]);
+	await writeFile(rootPkgPath, `${JSON.stringify(templatePkg, null, 2)}\n`);
+	for (const file of TEMPLATE_ROOT_FILES) await copyTemplateFile(templateRoot, rootDir, backupDir, file);
+	const lockFile = resolve(rootDir, "pnpm-lock.yaml");
+	if (existsSync(lockFile)) {
+		await backupPath(rootDir, backupDir, lockFile);
+		await rm(lockFile, { force: true });
+	}
+	return {
+		appDir,
+		backupDir
+	};
+}
+
+//#endregion
+//#region src/commands/monorepo.ts
+const require = createRequire(import.meta.url);
+const createPubinfoPkg = (() => {
+	try {
+		const pkgPath = resolve(dirname(require.resolve("create-pubinfo")), "../package.json");
+		return { version: JSON.parse(readFileSync(pkgPath, "utf8")).version ?? "latest" };
+	} catch {
+		logger.warn("无法解析 create-pubinfo 版本，将使用最新版本");
+		return { version: "latest" };
+	}
+})();
+var monorepo_default = defineCommand({
+	meta: {
+		name: "monorepo",
+		description: "将现有 pubinfo 单体工程转换为 monorepo 结构"
+	},
+	args: {
+		app: {
+			type: "string",
+			description: "应用目录名称，将生成在 apps/<name>"
+		},
+		key: {
+			type: "string",
+			description: "应用 storage key，默认尝试从 src/settings.ts 推断"
+		},
+		force: {
+			type: "boolean",
+			default: false,
+			description: "强制执行，忽略已有 pnpm-workspace.yaml 等检查"
+		}
+	},
+	async run({ args }) {
+		const rootDir = resolve(".");
+		const pkgPath = resolve(rootDir, "package.json");
+		if (!existsSync(pkgPath)) throw new Error("未找到 package.json，无法识别当前工程");
+		const pkgContent = await readFile(pkgPath, "utf8");
+		const pkg = JSON.parse(pkgContent);
+		const defaultAppName = deriveDefaultAppName(pkg.name);
+		const appName = args.app ?? defaultAppName;
+		ensureValidIdentifier(appName, "应用名称");
+		const detectedKey = await extractStorageKey(rootDir);
+		const key = args.key ?? detectedKey ?? appName;
+		ensureValidIdentifier(key, "应用标识");
+		const modules = detectModulesFromPackage(pkg);
+		const openapi = detectOpenapiEnabled(pkg);
+		const detectedVersion = resolvePubinfoVersionFromPackage(pkg);
+		const resolvedVersion = detectedVersion ?? createPubinfoPkg.version;
+		if (!detectedVersion) logger.info("未在 package.json 中检测到 pubinfo 依赖，将使用 create-pubinfo 默认版本");
+		const tempDir = await mkdtemp(join(tmpdir(), "pubinfo-monorepo-"));
+		try {
+			await generate({
+				templateName: "pubinfo-monorepo",
+				targetDir: tempDir,
+				key,
+				version: resolvedVersion,
+				modules,
+				openapi,
+				dir: appName
+			});
+			const { appDir, backupDir } = await convertToMonorepo({
+				rootDir,
+				templateRoot: tempDir,
+				appName,
+				force: Boolean(args.force),
+				rootPackageJson: pkg,
+				rootPackageJsonContent: pkgContent,
+				packageManager: pkg.packageManager
+			});
+			logger.success(`monorepo 结构已准备完成，应用目录：${relative(rootDir, appDir)}`);
+			logger.info(`备份文件位于：${relative(rootDir, backupDir)}`);
+			logger.info("请运行 pnpm install 以安装新的依赖，并使用 pnpm --filter apps/<app> dev 启动开发服务器");
+		} finally {
+			await rm(tempDir, {
+				recursive: true,
+				force: true
+			});
+		}
+	}
+});
+
+//#endregion
+export { monorepo_default as default };

package/dist/{preview-CL5eJUy5.js → preview-BVVgNnhp.js}

@@ -1,4 +1,4 @@
-import { t as runVite } from "./vite-BeiYc40N.js";
+import { t as runVite } from "./vite-bwhDbW7x.js";
 import { defineCommand } from "citty";
 
 //#region src/commands/preview.ts

package/dist/setup-CACbESTE.js

@@ -0,0 +1,3 @@
+import { t as setup_default } from "./setup-BdawX0W3.js";
+
+export { setup_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/cli",
   "type": "module",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "CLI for Pubinfo",
   "exports": {
     ".": "./bin/pubinfo.mjs"
@@ -18,7 +18,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
-    "@pubinfo/vite": "2.1.3"
+    "@pubinfo/vite": "2.1.4"
   },
   "dependencies": {
     "cheerio": "^1.1.2",
@@ -26,12 +26,13 @@
     "execa": "^9.6.0",
     "globby": "^14.1.0",
     "pkg-types": "^2.3.0",
-    "@pubinfo/commitlint": "2.1.3",
-    "@pubinfo/shared": "2.1.3"
+    "@pubinfo/commitlint": "2.1.4",
+    "@pubinfo/shared": "2.1.4",
+    "create-pubinfo": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^24.0.10",
-    "@pubinfo/vite": "2.1.3"
+    "@pubinfo/vite": "2.1.4"
   },
   "scripts": {
     "dev": "tsdown --watch",

package/dist/setup-tGwcxPxN.js

@@ -1,3 +0,0 @@
-import { t as setup_default } from "./setup-DTOe0VmW.js";
-
-export { setup_default as default };