@koishi-ce/plugin-market 1.0.2 → 1.0.3

package/lib/index.mjs

@@ -5,7 +5,7 @@ import { compare, gt, satisfies, valid } from "semver";
 import { DataService } from "@koishi-ce/console";
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import Scanner from "@koishi-ce/registry";
+import Scanner, { resolvePackageJson } from "@koishi-ce/registry";
 import spawn from "execa";
 import pMap from "p-map";
 import messageZhCN from "./assets/message.zh-CN-B_nH77kB.yml";
@@ -67,7 +67,7 @@ const levelMap = {
 	error: "warn"
 };
 function loadManifest(name) {
-	const filename = __require.resolve(`${name}/package.json`);
+	const filename = resolvePackageJson(name);
 	const meta = JSON.parse(readFileSync(filename, "utf8"));
 	meta.dependencies ||= {};
 	defineProperty(meta, "$workspace", !filename.includes("node_modules"));
@@ -224,10 +224,14 @@ var Installer = class extends Service {
 	}
 	async override(deps) {
 		const filename = resolve(this.cwd, "package.json");
-		for (const key in deps) if (deps[key]) this.manifest.dependencies[key] = deps[key];
-		else delete this.manifest.dependencies[key];
+		this.manifest = JSON.parse(readFileSync(filename, "utf8"));
+		this.manifest.dependencies ||= {};
+		for (const key in deps) if (deps[key]) {
+			if (this.manifest.dependencies[key]?.startsWith("workspace:")) continue;
+			this.manifest.dependencies[key] = deps[key];
+		} else if (!this.manifest.dependencies[key]?.startsWith("workspace:")) delete this.manifest.dependencies[key];
 		this.manifest.dependencies = Object.fromEntries(Object.entries(this.manifest.dependencies).sort((a, b) => a[0].localeCompare(b[0])));
-		await Bun.write(filename, `${JSON.stringify(this.manifest, null, 2)}\n`);
+		await Bun.write(filename, `${JSON.stringify(this.manifest, null, "	")}\n`);
 	}
 	_install() {
 		const args = [];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -62,14 +62,14 @@
     "devDependencies": {
         "@koishi-ce/client": "^1.0.1",
         "@koishi-ce/loader": "^1.0.1",
-        "@koishi-ce/plugin-config": "^1.0.1",
+        "@koishi-ce/plugin-config": "^1.0.2",
         "@koishijs/market": "^4.2.10",
         "@types/semver": "^7.5.8",
         "vue": "^3.5.12"
     },
     "dependencies": {
         "@koishi-ce/console": "^1.0.0",
-        "@koishi-ce/registry": "^1.0.1",
+        "@koishi-ce/registry": "^1.0.2",
         "execa": "^5.1.1",
         "p-map": "^4.0.0",
         "semver": "^7.6.3",

package/src/node/installer.ts

@@ -22,6 +22,7 @@ import Scanner, {
 	type PackageJson,
 	type Registry,
 	type RemotePackage,
+	resolvePackageJson,
 } from "@koishi-ce/registry";
 import spawn from "execa";
 import pMap from "p-map";
@@ -111,7 +112,9 @@ export interface LocalPackage extends PackageJson {
 }
 
 export function loadManifest(name: string) {
-	const filename = require.resolve(`${name}/package.json`);
+	// 经 resolvePackageJson 兜底：安装前对 `pkg/package.json` 形态的
+	// 探测会被 Bun 记入进程内负缓存，装完后主路径仍解析失败
+	const filename = resolvePackageJson(name);
 	const meta: LocalPackage = JSON.parse(readFileSync(filename, "utf8"));
 	meta.dependencies ||= {};
 	defineProperty(meta, "$workspace", !filename.includes("node_modules"));
@@ -323,10 +326,20 @@ class Installer extends Service {
 
 	async override(deps: Dict<string | null>) {
 		const filename = resolve(this.cwd, "package.json");
+		// 现读现写：this.manifest 原为构造期的启动快照，运行期间根
+		// package.json 可能已被外部更新，基于快照整体重写会抹掉变更
+		this.manifest = JSON.parse(readFileSync(filename, "utf8")) as LocalPackage;
+		this.manifest.dependencies ||= {};
 		for (const key in deps) {
 			if (deps[key]) {
+				// workspace: 声明是本仓库对上游裸名的归属（如 koishi 裸名
+				// shim，见 packages/node/koishi），不可被安装清单覆盖成
+				// npm 版本，否则会拉下官方包形成第二份框架副本
+				if (this.manifest.dependencies[key]?.startsWith("workspace:")) {
+					continue;
+				}
 				this.manifest.dependencies[key] = deps[key];
-			} else {
+			} else if (!this.manifest.dependencies[key]?.startsWith("workspace:")) {
 				delete this.manifest.dependencies[key];
 			}
 		}
@@ -335,7 +348,9 @@ class Installer extends Service {
 				a[0].localeCompare(b[0]),
 			),
 		);
-		await Bun.write(filename, `${JSON.stringify(this.manifest, null, 2)}\n`);
+		// 仓库格式权威是 biome（tab 缩进），按 tab 写出避免装插件后
+		// package.json 被重排成空格、lint 报格式漂移
+		await Bun.write(filename, `${JSON.stringify(this.manifest, null, "\t")}\n`);
 	}
 
 	private _install() {