create-koishi-ce 1.6.2 → 1.6.4

package/lib/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { t as start } from "./src-bupbxcI6.mjs";
+import { t as start } from "./src-D2Fw0uXq.mjs";
 //#region src/bin.ts
 /**
 * create-koishi-ce 的 CLI 可执行入口：shebang 由 rolldown 原样保留到

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import { getLocalRegistry, readNpmrcRegistry } from "@koishi-ce/utils";
 //#region src/manifest.d.ts
 /**
  * 模板项目 package.json 的类型与改写（纯函数域，无副作用）：定义本流程
@@ -23,19 +24,6 @@ interface Manifest {
  */
 export declare function renderManifest(source: Manifest, project: string, prod: boolean): string;
 //#endregion
-//#region src/registry.d.ts
-/**
- * 从单个 .npmrc 文件提取 registry 配置项（非注释、非 scoped 的 registry= 行）。
- * 文件不存在或未配置时返回 undefined，读文件异常一律静默吞掉。
- */
-export declare function readNpmrcRegistry(file: string): string | undefined;
-/**
- * 读取本机 npm registry 配置（优先级对齐 npm 自身：环境变量 > 项目
- * .npmrc > 用户 ~/.npmrc）。任何一步都拿不到时返回 undefined，由调用方
- * 回落官方源。
- */
-export declare function getLocalRegistry(cwd?: string, userHome?: string): string | undefined;
-//#endregion
 //#region src/utils.d.ts
 /**
  * 探测后续安装/启动使用的包管理器（Bun-first）：yarn / pnpm 用户跟随其
@@ -51,4 +39,4 @@ export declare function detectAgent(): string;
  */
 export declare function start(): Promise<void>;
 //#endregion
-export type { Manifest };
+export { type Manifest, getLocalRegistry, readNpmrcRegistry };

package/lib/index.mjs

@@ -1,2 +1,2 @@
-import { a as renderManifest, i as readNpmrcRegistry, n as detectAgent, r as getLocalRegistry, t as start } from "./src-bupbxcI6.mjs";
+import { a as renderManifest, i as readNpmrcRegistry, n as detectAgent, r as getLocalRegistry, t as start } from "./src-D2Fw0uXq.mjs";
 export { detectAgent, getLocalRegistry, readNpmrcRegistry, renderManifest, start };

package/lib/{src-bupbxcI6.mjs → src-D2Fw0uXq.mjs}

@@ -3,18 +3,18 @@ import { basename, join, relative } from "node:path";
 import { parseArgs } from "node:util";
 import * as p from "@clack/prompts";
 import pc from "picocolors";
-import { homedir } from "node:os";
+import { getLocalRegistry, readNpmrcRegistry } from "@koishi-ce/utils";
 import { downloadTemplate } from "giget";
 //#region package.json
 var package_default = {
 	name: "create-koishi-ce",
 	description: "Setup a Koishi application",
-	version: "1.6.2",
+	version: "1.6.4",
 	type: "module",
 	main: "./lib/index.mjs",
 	module: "./lib/index.mjs",
 	types: "./lib/index.d.ts",
-	bin: { "create-koishi-ce": "./lib/bin.mjs" },
+	bin: { "create-koishi-ce": "lib/bin.mjs" },
 	files: ["lib", "src"],
 	contributors: ["Shigma <shigma10826@gmail.com>", "Oppenheymu <oppenheymu@gmail.com>"],
 	license: "MIT",
@@ -40,6 +40,7 @@ var package_default = {
 	],
 	dependencies: {
 		"@clack/prompts": "^1.7.0",
+		"@koishi-ce/utils": "workspace:*",
 		"picocolors": "^1.1.1",
 		"giget": "^3.3.1"
 	},
@@ -71,40 +72,6 @@ function renderManifest(source, project, prod) {
 	return `${JSON.stringify(meta, null, 2)}\n`;
 }
 //#endregion
-//#region src/registry.ts
-/**
-* 本机 npm registry 配置探测（纯函数域，零子进程、零网络）：优先级对齐
-* npm 自身（环境变量 > 项目 .npmrc > 用户 ~/.npmrc）。刻意不 spawn 子进程
-* 探测——既有实现按 user-agent 选 `bun config get registry`，而 Bun 没有
-* config 子命令，bunx 场景下子进程退出码 1 直接炸掉脚手架；读 npmrc 是
-* 零依赖、零子进程的等价路径。远程模板下载流程见 remote.ts，不在本文件。
-*/
-/**
-* 从单个 .npmrc 文件提取 registry 配置项（非注释、非 scoped 的 registry= 行）。
-* 文件不存在或未配置时返回 undefined，读文件异常一律静默吞掉。
-*/
-function readNpmrcRegistry(file) {
-	try {
-		for (const line of readFileSync(file, "utf8").split(/\r?\n/)) {
-			const value = /^\s*registry\s*=\s*(\S+)\s*$/.exec(line)?.[1];
-			if (value) return value;
-		}
-	} catch {}
-}
-/**
-* 读取本机 npm registry 配置（优先级对齐 npm 自身：环境变量 > 项目
-* .npmrc > 用户 ~/.npmrc）。任何一步都拿不到时返回 undefined，由调用方
-* 回落官方源。
-*/
-function getLocalRegistry(cwd = process.cwd(), userHome = homedir()) {
-	const candidates = [
-		Bun.env["npm_config_registry"],
-		readNpmrcRegistry(join(cwd, ".npmrc")),
-		readNpmrcRegistry(join(userHome, ".npmrc"))
-	];
-	for (const candidate of candidates) if (candidate?.startsWith("https://") || candidate?.startsWith("http://")) return candidate;
-}
-//#endregion
 //#region src/remote.ts
 /**
 * 远程模板分支（--template <包名>）的下载-解包-改写全流程：拉取 npm
@@ -235,7 +202,11 @@ function baseManifest() {
 	return {
 		type: "module",
 		packageManager: `bun@${Bun.version}`,
-		workspaces: ["plugins/*", "external/*"],
+		workspaces: [
+			"plugins/*",
+			"external/**",
+			"!external/**/node_modules/**"
+		],
 		scripts: {
 			start: "koishi start",
 			dev: "NODE_ENV=development koishi start",

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "create-koishi-ce",
     "description": "Setup a Koishi application",
-    "version": "1.6.2",
+    "version": "1.6.4",
     "type": "module",
     "main": "./lib/index.mjs",
     "module": "./lib/index.mjs",
     "types": "./lib/index.d.ts",
     "bin": {
-        "create-koishi-ce": "./lib/bin.mjs"
+        "create-koishi-ce": "lib/bin.mjs"
     },
     "files": [
         "lib",
@@ -44,6 +44,7 @@
     ],
     "dependencies": {
         "@clack/prompts": "^1.7.0",
+        "@koishi-ce/utils": "^1.1.0",
         "picocolors": "^1.1.1",
         "giget": "^3.3.1"
     },
@@ -56,4 +57,4 @@
         },
         "./package.json": "./package.json"
     }
-}
+}

package/src/__tests__/run-default.test.ts

@@ -231,9 +231,12 @@ function expectTemplateFiles(dir: string): void {
 	) as Record<string, unknown>;
 	expect(manifest["private"]).toBe(true);
 	expect(manifest["version"]).toBe("0.0.0");
+	// globstar + 负向排除形态：external 任意深度（含克隆的 monorepo
+	// 子包）都是成员，node_modules 残留被排除（与 template.test.ts 同步）
 	expect(manifest["workspaces"]).toEqual([
 		"plugins/*",
-		"external/*",
+		"external/**",
+		"!external/**/node_modules/**",
 	]);
 }
 

package/src/__tests__/run-remote.test.ts

@@ -18,7 +18,7 @@ import {
 	rmSync,
 	writeFileSync,
 } from "node:fs";
-import { tmpdir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
 import { tarPack } from "./tar-pack.ts";
 
@@ -203,13 +203,19 @@ function reset(sc: typeof scenario): void {
 		recursive: true,
 		force: true,
 	});
-	// giget 把 tarball 缓存到系统临时目录（win32 为 tmpdir()/giget，不受
-	// XDG_CACHE_HOME 影响）；逐用例清理，避免上一场景的缓存（tarball-404
-	// 的缺失或 corrupt 的损坏归档）被 giget 的「下载失败回退缓存」吞掉
-	rmSync(join(tmpdir(), "giget"), {
-		recursive: true,
-		force: true,
-	});
+	// giget 缓存位置随平台而异（win32 为 tmpdir()/giget，POSIX 跟随
+	// XDG_CACHE_HOME——默认 ~/.cache）；逐用例清理，避免上一场景的缓存
+	// （tarball-404 的缺失或 corrupt 的损坏归档）被 giget 的
+	// 「下载失败回退缓存」吞掉
+	const cacheRoot =
+		process.env["XDG_CACHE_HOME"] ??
+		join(homedir(), ".cache");
+	for (const dir of [
+		join(tmpdir(), "giget"),
+		join(cacheRoot, "giget"),
+	]) {
+		rmSync(dir, { recursive: true, force: true });
+	}
 }
 
 describe("create-koishi-ce 远程模板", () => {

package/src/__tests__/template.test.ts

@@ -224,6 +224,14 @@ test("renderManifest 渲染内置模板：常规改写生效，prod 模式保留
 	expect(output.dependencies.koishi).toBe(
 		"npm:@koishi-ce/koishi-shim@^4.18.11",
 	);
+	// workspaces 是 globstar + 负向排除形态：external 任意深度（含克隆的
+	// monorepo 子包）都是成员，node_modules 排除搬迁残留——配置页的
+	// 「添加插件」列表按同一份声明展开收录，写法回退即嵌套不可见
+	expect(output.workspaces).toEqual([
+		"plugins/*",
+		"external/**",
+		"!external/**/node_modules/**",
+	]);
 
 	const prod = JSON.parse(
 		renderManifest(baseManifest(), "my-app", true),

package/src/registry.ts

@@ -2,60 +2,13 @@
 // Copyright (c) 2026-present Koishi-CE contributors.
 
 /**
- * 本机 npm registry 配置探测（纯函数域，零子进程、零网络）：优先级对齐
- * npm 自身（环境变量 > 项目 .npmrc > 用户 ~/.npmrc）。刻意不 spawn 子进程
- * 探测——既有实现按 user-agent 选 `bun config get registry`，而 Bun 没有
- * config 子命令，bunx 场景下子进程退出码 1 直接炸掉脚手架；读 npmrc 是
- * 零依赖、零子进程的等价路径。远程模板下载流程见 remote.ts，不在本文件。
+ * 本机 npm registry 配置探测。
+ *
+ * 实现已收敛到 @koishi-ce/utils 的 npm-registry 模块（与 market 插件的
+ * installer 共享同一实现），此处按原公共 API 再导出，调用方与测试的
+ * 导入路径不变。远程模板下载流程见 remote.ts，不在本文件。
  */
-import { readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-/**
- * 从单个 .npmrc 文件提取 registry 配置项（非注释、非 scoped 的 registry= 行）。
- * 文件不存在或未配置时返回 undefined，读文件异常一律静默吞掉。
- */
-export function readNpmrcRegistry(
-	file: string,
-): string | undefined {
-	try {
-		for (const line of readFileSync(file, "utf8").split(
-			/\r?\n/,
-		)) {
-			const matched = /^\s*registry\s*=\s*(\S+)\s*$/.exec(
-				line,
-			);
-			const value = matched?.[1];
-			if (value) return value;
-		}
-	} catch {
-		// registry 探测不允许打断主流程，任何读取失败都视为未配置
-	}
-	return undefined;
-}
-
-/**
- * 读取本机 npm registry 配置（优先级对齐 npm 自身：环境变量 > 项目
- * .npmrc > 用户 ~/.npmrc）。任何一步都拿不到时返回 undefined，由调用方
- * 回落官方源。
- */
-export function getLocalRegistry(
-	cwd: string = process.cwd(),
-	userHome: string = homedir(),
-): string | undefined {
-	const candidates = [
-		Bun.env["npm_config_registry"],
-		readNpmrcRegistry(join(cwd, ".npmrc")),
-		readNpmrcRegistry(join(userHome, ".npmrc")),
-	];
-	for (const candidate of candidates) {
-		if (
-			candidate?.startsWith("https://") ||
-			candidate?.startsWith("http://")
-		) {
-			return candidate;
-		}
-	}
-	return undefined;
-}
+export {
+	getLocalRegistry,
+	readNpmrcRegistry,
+} from "@koishi-ce/utils";

package/src/template/README.md

@@ -43,7 +43,7 @@ bun run update        # 安全更新：只更新 @koishi-ce/* 生态位依赖
 - `bun run new <名称>` —— 生成插件骨架到 `external/`（`--console` 附带控制台前端扩展）
 - `bun run clone <仓库>` —— 克隆已有插件源码到 `external/` 本地联动调试
 
-两种来源的插件都在 `koishi.yml` 中以相对路径引用（如 `./plugins/my-plugin`、`./external/my-plugin`）即可启用；Bun 直接加载 TypeScript 源码，无需预编译。
+两种来源的插件都在 `koishi.yml` 中以相对路径引用（如 `./plugins/my-plugin`、`./external/my-plugin`）即可启用；Bun 直接加载 TypeScript 源码，无需预编译。克隆来的 **monorepo 形态插件仓库**（插件在 `packages/` 等子目录）无需平铺——`workspaces` 声明的 `external/**` 通配任意深度，控制台「添加插件」列表同样按此声明收录，子包直接可见可启用（搬迁自其它包管理器的仓库若带着旧 `node_modules`，负向声明已将其排除，建议顺手删除节省空间）。
 
 ## 插件构建与发布
 

package/src/template.ts

@@ -92,7 +92,16 @@ export function baseManifest(): Manifest {
 		type: "module",
 		// 本项目只用 Bun：钉住创建时的 Bun 版本（bun run 亦据此选择解释器）
 		packageManager: `bun@${Bun.version}`,
-		workspaces: ["plugins/*", "external/*"],
+		// globstar + 负向排除（Bun workspaces 支持完整 glob 语法）：external
+		// 下任意深度的插件包（含克隆来的 monorepo 形态 packages/ 子包）都是
+		// workspace 成员；node_modules 排除搬迁残留的依赖目录（包管理器
+		// 对其另有管理，混入成员会污染解析）。配置页的「添加插件」列表按
+		// 同一份声明展开收录，声明写多深列表就能看多深
+		workspaces: [
+			"plugins/*",
+			"external/**",
+			"!external/**/node_modules/**",
+		],
 		scripts: {
 			start: "koishi start",
 			// bun run 走 Bun Shell，`NODE_ENV=...` 前缀天然跨平台，无需 cross-env

package/src/__tests__/registry.test.ts

@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2026-present Koishi-CE contributors.
-
-import { expect, test } from "bun:test";
-import {
-	mkdtempSync,
-	rmSync,
-	writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import {
-	getLocalRegistry,
-	readNpmrcRegistry,
-} from "../index.ts";
-
-test("readNpmrcRegistry：提取首个 registry= 行，忽略注释与空行", () => {
-	const dir = mkdtempSync(join(tmpdir(), "ckc-npmrc-"));
-	const file = join(dir, ".npmrc");
-	writeFileSync(
-		file,
-		"# 注释行\n; 另一种注释\n\nstrict-ssl=false\nregistry=https://registry.npmmirror.com/\r\n@scope:registry=https://example.com/\n",
-	);
-	expect(readNpmrcRegistry(file)).toBe(
-		"https://registry.npmmirror.com/",
-	);
-	rmSync(dir, { recursive: true, force: true });
-});
-
-test("readNpmrcRegistry：文件不存在或未配置时返回 undefined 而不抛错", () => {
-	expect(
-		readNpmrcRegistry(
-			join(tmpdir(), "ckc-不存在", ".npmrc"),
-		),
-	).toBeUndefined();
-	const dir = mkdtempSync(join(tmpdir(), "ckc-npmrc-"));
-	const file = join(dir, ".npmrc");
-	writeFileSync(file, "strict-ssl=false\n");
-	expect(readNpmrcRegistry(file)).toBeUndefined();
-	rmSync(dir, { recursive: true, force: true });
-});
-
-test("getLocalRegistry：环境变量优先且校验协议，非法值跳过", () => {
-	const key = "npm_config_registry";
-	const isolated = mkdtempSync(
-		join(tmpdir(), "ckc-npmrc-"),
-	);
-	Bun.env[key] = "https://registry.example.com/";
-	expect(getLocalRegistry(isolated, isolated)).toBe(
-		"https://registry.example.com/",
-	);
-	// 非 http(s) 的值视为未配置，继续走后续候选
-	Bun.env[key] = "ftp://not-a-registry/";
-	expect(
-		getLocalRegistry(isolated, isolated),
-	).toBeUndefined();
-	delete Bun.env[key];
-	rmSync(isolated, { recursive: true, force: true });
-});
-
-test("getLocalRegistry：项目 .npmrc 优先于用户级 .npmrc，均无配置时返回 undefined", () => {
-	const key = "npm_config_registry";
-	delete Bun.env[key];
-	const dir = mkdtempSync(join(tmpdir(), "ckc-npmrc-"));
-	const emptyHome = mkdtempSync(
-		join(tmpdir(), "ckc-home-"),
-	);
-	writeFileSync(
-		join(dir, ".npmrc"),
-		"registry=http://localhost:4873/\n",
-	);
-	expect(getLocalRegistry(dir, emptyHome)).toBe(
-		"http://localhost:4873/",
-	);
-	// 目录与用户级均无 .npmrc 时返回 undefined，主流程回落官方源
-	expect(
-		getLocalRegistry(emptyHome, emptyHome),
-	).toBeUndefined();
-	rmSync(dir, { recursive: true, force: true });
-	rmSync(emptyHome, { recursive: true, force: true });
-});