create-koishi-ce 1.7.0 → 1.8.0

package/lib/bin.mjs

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

package/lib/index.d.ts

@@ -16,6 +16,7 @@ interface Manifest {
   workspaces?: unknown;
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
+  overrides?: Record<string, string>;
   [key: string]: unknown;
 }
 /**

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-Cj4uFpkr.mjs";
+import { a as renderManifest, i as readNpmrcRegistry, n as detectAgent, r as getLocalRegistry, t as start } from "./src-D36TrO6G.mjs";
 export { detectAgent, getLocalRegistry, readNpmrcRegistry, renderManifest, start };

package/lib/{src-Cj4uFpkr.mjs → src-D36TrO6G.mjs}

@@ -9,7 +9,7 @@ import { downloadTemplate } from "giget";
 var package_default = {
 	name: "create-koishi-ce",
 	description: "Setup a Koishi application",
-	version: "1.7.0",
+	version: "1.8.0",
 	type: "module",
 	main: "./lib/index.mjs",
 	module: "./lib/index.mjs",
@@ -197,6 +197,74 @@ const dotFiles = {
 /** 模板静态文件（相对项目根的路径 → 文件内容），package.json 另行渲染 */
 const templateFiles = Object.fromEntries(readdirSync(templateDir).filter((file) => !file.startsWith(".")).map((file) => [dotFiles[file] ?? file, readFileSync(join(templateDir, file), "utf8")]));
 /**
+* 上游名 → CE 对应包的 overrides 兜底映射（值统一 npm:<目标>@^1.0.0，
+* 经 buildUpstreamOverrides 包装）。
+*
+* 六行钉名依赖「落盘版本满足声明范围」：第三方插件的声明超出冻结线
+* （如未来上游升线后的 ^6）或引用清单外的上游名（如 dependencies 直接
+* 依赖 @koishijs/plugin-admin / @koishijs/utils）时，官方包仍会落盘。
+* overrides 是包管理器级的强制重写——不看版本满足性，把整棵依赖树中对
+* 这些上游名的解析一律改指 CE 对应包，与钉名构成双层防线（napuketto
+* 事件 2026-09-19 后补）。
+*
+* 清单 = CE 已再分发且官方同名的包，2026-09-19 逐一 npm view 核实：
+* - plugin-cron 不在列（上游是裸名社区包 koishi-plugin-cron，非 @koishijs
+*   作用域）；
+* - plugin-welcome / plugin-theme-vanilla 不在列（CE 原创，上游无此名）；
+* - plugin-assets 的 CE 对应物是 @koishi-ce/assets（无 plugin 前缀）。
+* 新增 CE 再分发包时须同步本表与 sandbox 生成器的同款清单
+* （tooling/sandbox/manifest.ts，对账测试防漂移）。
+*/
+const UPSTREAM_OVERRIDES = {
+	koishi: "@koishi-ce/koishi",
+	"@koishijs/core": "@koishi-ce/koishi",
+	"@koishijs/loader": "@koishi-ce/koishi",
+	"@koishijs/utils": "@koishi-ce/utils",
+	"@koishijs/i18n-utils": "@koishi-ce/i18n-utils",
+	"@koishijs/client": "@koishi-ce/client",
+	"@koishijs/components": "@koishi-ce/components",
+	"@koishijs/console": "@koishi-ce/console",
+	"@koishijs/registry": "@koishi-ce/registry",
+	"@koishijs/plugin-console": "@koishi-ce/plugin-console",
+	"@koishijs/plugin-assets": "@koishi-ce/assets"
+};
+for (const name of [
+	"actions",
+	"admin",
+	"analytics",
+	"assets-local",
+	"auth",
+	"bind",
+	"broadcast",
+	"callme",
+	"commands",
+	"config",
+	"database-sqlite",
+	"dataview",
+	"echo",
+	"explorer",
+	"help",
+	"hmr",
+	"insight",
+	"inspect",
+	"locales",
+	"logger",
+	"market",
+	"mock",
+	"notifier",
+	"oobe",
+	"proxy-agent",
+	"rate-limit",
+	"sandbox",
+	"server",
+	"server-temp",
+	"status"
+]) UPSTREAM_OVERRIDES[`@koishijs/plugin-${name}`] = `@koishi-ce/plugin-${name}`;
+/** 生成模板 overrides 块：键为上游名，值统一 npm:<CE 包>@^1.0.0。 */
+function buildUpstreamOverrides() {
+	return Object.fromEntries(Object.entries(UPSTREAM_OVERRIDES).map(([name, target]) => [name, `npm:${target}@^1.0.0`]));
+}
+/**
 * 内置模板的 package.json 基础内容（name/version 会被 renderManifest 覆写，
 * prod 模式下 workspaces 与 devDependencies 会被移除）。
 */
@@ -261,6 +329,7 @@ function baseManifest() {
 			"@koishijs/client": "npm:@koishi-ce/client-shim@^5.30.11",
 			"@koishijs/components": "npm:@koishi-ce/components-shim@^1.5.22"
 		},
+		overrides: buildUpstreamOverrides(),
 		devDependencies: {
 			"@koishi-ce/client": "^1.0.0",
 			"@koishi-ce/plugin-hmr": "^1.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "create-koishi-ce",
     "description": "Setup a Koishi application",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "type": "module",
     "main": "./lib/index.mjs",
     "module": "./lib/index.mjs",

package/src/__tests__/template.test.ts

@@ -5,6 +5,7 @@ import { expect, test } from "bun:test";
 import { renderManifest } from "../index.ts";
 import {
 	baseManifest,
+	buildUpstreamOverrides,
 	templateFiles,
 } from "../template.ts";
 
@@ -178,13 +179,14 @@ test("koishi.yml 预写策略：sqlite 默认启用开箱数据库，非必需
 		expect(yml).toContain(name);
 	}
 	expect(yml).not.toContain("database-mongo");
-	// 模板依赖里不得出现官方 adapter / database 包名（只预写不预装）
-	expect(JSON.stringify(baseManifest())).not.toContain(
-		"adapter-",
-	);
-	expect(JSON.stringify(baseManifest())).not.toContain(
-		"@koishijs/plugin-database-",
-	);
+	// 模板依赖里不得出现官方 adapter / database 包名（只预写不预装）。
+	// 断言只扫 dependencies——overrides 的键含官方名是重写所需，属预期
+	expect(
+		JSON.stringify(baseManifest().dependencies),
+	).not.toContain("adapter-");
+	expect(
+		JSON.stringify(baseManifest().dependencies),
+	).not.toContain("@koishijs/plugin-database-");
 });
 
 test("koishi.yml 预写条目与模板依赖对账：CE 插件必须在册，官方 adapter 只预写不预装", () => {
@@ -264,3 +266,65 @@ test("renderManifest 渲染内置模板：常规改写生效，prod 模式保留
 		"npm:@koishi-ce/koishi-shim@^4.18.11",
 	);
 });
+
+test("内置模板 overrides 兜底层：41 个上游名强制重定向 CE 包", () => {
+	const table = baseManifest().overrides ?? {};
+	expect(Object.keys(table)).toHaveLength(41);
+	const keys = Object.keys(table);
+	// 核心九名（钉名六行之外由 overrides 补齐覆盖面）
+	expect(table["koishi"]).toBe(
+		"npm:@koishi-ce/koishi@^1.0.0",
+	);
+	expect(table["@koishijs/core"]).toBe(
+		"npm:@koishi-ce/koishi@^1.0.0",
+	);
+	expect(table["@koishijs/loader"]).toBe(
+		"npm:@koishi-ce/koishi@^1.0.0",
+	);
+	expect(table["@koishijs/utils"]).toBe(
+		"npm:@koishi-ce/utils@^1.0.0",
+	);
+	expect(table["@koishijs/i18n-utils"]).toBe(
+		"npm:@koishi-ce/i18n-utils@^1.0.0",
+	);
+	expect(table["@koishijs/client"]).toBe(
+		"npm:@koishi-ce/client@^1.0.0",
+	);
+	expect(table["@koishijs/components"]).toBe(
+		"npm:@koishi-ce/components@^1.0.0",
+	);
+	expect(table["@koishijs/console"]).toBe(
+		"npm:@koishi-ce/console@^1.0.0",
+	);
+	expect(table["@koishijs/registry"]).toBe(
+		"npm:@koishi-ce/registry@^1.0.0",
+	);
+	// CE 原创与上游裸名社区对应物不进清单（不拦官方生态的真实依赖）
+	expect(keys.includes("@koishijs/plugin-welcome")).toBe(
+		false,
+	);
+	expect(
+		keys.includes("@koishijs/plugin-theme-vanilla"),
+	).toBe(false);
+	expect(keys.includes("@koishijs/plugin-cron")).toBe(
+		false,
+	);
+	// plugin-assets 的 CE 对应物无 plugin 前缀
+	expect(table["@koishijs/plugin-assets"]).toBe(
+		"npm:@koishi-ce/assets@^1.0.0",
+	);
+	// 全部值为 npm:@koishi-ce/ 前缀，键全为 @koishijs/ 上游名或 koishi 裸名
+	for (const key of keys) {
+		expect(
+			key === "koishi" || key.startsWith("@koishijs/"),
+		).toBe(true);
+		expect(table[key]).toMatch(/^npm:@koishi-ce\//);
+	}
+	// buildUpstreamOverrides 与 baseManifest().overrides 同源
+	expect(buildUpstreamOverrides()).toEqual(table);
+	// renderManifest 全程透传 overrides（prod 模式也不删）
+	const prod = JSON.parse(
+		renderManifest(baseManifest(), "my-app", true),
+	);
+	expect(prod.overrides).toEqual(table);
+});

package/src/manifest.ts

@@ -18,6 +18,7 @@ export interface Manifest {
 	workspaces?: unknown;
 	dependencies?: Record<string, string>;
 	devDependencies?: Record<string, string>;
+	overrides?: Record<string, string>;
 	[key: string]: unknown;
 }
 

package/src/template.ts

@@ -85,6 +85,88 @@ export const templateFiles: Record<string, string> =
 			]),
 	);
 
+/**
+ * 上游名 → CE 对应包的 overrides 兜底映射（值统一 npm:<目标>@^1.0.0，
+ * 经 buildUpstreamOverrides 包装）。
+ *
+ * 六行钉名依赖「落盘版本满足声明范围」：第三方插件的声明超出冻结线
+ * （如未来上游升线后的 ^6）或引用清单外的上游名（如 dependencies 直接
+ * 依赖 @koishijs/plugin-admin / @koishijs/utils）时，官方包仍会落盘。
+ * overrides 是包管理器级的强制重写——不看版本满足性，把整棵依赖树中对
+ * 这些上游名的解析一律改指 CE 对应包，与钉名构成双层防线（napuketto
+ * 事件 2026-09-19 后补）。
+ *
+ * 清单 = CE 已再分发且官方同名的包，2026-09-19 逐一 npm view 核实：
+ * - plugin-cron 不在列（上游是裸名社区包 koishi-plugin-cron，非 @koishijs
+ *   作用域）；
+ * - plugin-welcome / plugin-theme-vanilla 不在列（CE 原创，上游无此名）；
+ * - plugin-assets 的 CE 对应物是 @koishi-ce/assets（无 plugin 前缀）。
+ * 新增 CE 再分发包时须同步本表与 sandbox 生成器的同款清单
+ * （tooling/sandbox/manifest.ts，对账测试防漂移）。
+ */
+const UPSTREAM_OVERRIDES: Record<string, string> = {
+	koishi: "@koishi-ce/koishi",
+	"@koishijs/core": "@koishi-ce/koishi",
+	"@koishijs/loader": "@koishi-ce/koishi",
+	"@koishijs/utils": "@koishi-ce/utils",
+	"@koishijs/i18n-utils": "@koishi-ce/i18n-utils",
+	"@koishijs/client": "@koishi-ce/client",
+	"@koishijs/components": "@koishi-ce/components",
+	"@koishijs/console": "@koishi-ce/console",
+	"@koishijs/registry": "@koishi-ce/registry",
+	"@koishijs/plugin-console": "@koishi-ce/plugin-console",
+	"@koishijs/plugin-assets": "@koishi-ce/assets",
+};
+
+// CE 与上游同名再分发的 plugin-*：机械一一对应
+for (const name of [
+	"actions",
+	"admin",
+	"analytics",
+	"assets-local",
+	"auth",
+	"bind",
+	"broadcast",
+	"callme",
+	"commands",
+	"config",
+	"database-sqlite",
+	"dataview",
+	"echo",
+	"explorer",
+	"help",
+	"hmr",
+	"insight",
+	"inspect",
+	"locales",
+	"logger",
+	"market",
+	"mock",
+	"notifier",
+	"oobe",
+	"proxy-agent",
+	"rate-limit",
+	"sandbox",
+	"server",
+	"server-temp",
+	"status",
+]) {
+	UPSTREAM_OVERRIDES[`@koishijs/plugin-${name}`] =
+		`@koishi-ce/plugin-${name}`;
+}
+
+/** 生成模板 overrides 块：键为上游名，值统一 npm:<CE 包>@^1.0.0。 */
+export function buildUpstreamOverrides(): Record<
+	string,
+	string
+> {
+	return Object.fromEntries(
+		Object.entries(UPSTREAM_OVERRIDES).map(
+			([name, target]) => [name, `npm:${target}@^1.0.0`],
+		),
+	);
+}
+
 /**
  * 内置模板的 package.json 基础内容（name/version 会被 renderManifest 覆写，
  * prod 模式下 workspaces 与 devDependencies 会被移除）。
@@ -187,6 +269,9 @@ export function baseManifest(): Manifest {
 			"@koishijs/components":
 				"npm:@koishi-ce/components-shim@^1.5.22",
 		},
+		// overrides 兜底层（语义见 UPSTREAM_OVERRIDES 注释）：不看版本
+		// 满足性强制重写整棵依赖树，拦住钉名覆盖面之外的上游声明
+		overrides: buildUpstreamOverrides(),
 		devDependencies: {
 			"@koishi-ce/client": "^1.0.0",
 			"@koishi-ce/plugin-hmr": "^1.0.0",