@lark-apaas/express-datapaas 0.0.1 → 0.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/express-datapaas",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Drizzle ORM + PostgreSQL with RLS support for Express",
   "type": "module",
   "main": "./dist/index.js",
@@ -34,7 +34,7 @@
   },
   "scripts": {
     "build": "tsup",
-    "postinstall": "npm run apply-patch",
+    "postinstall": "node scripts/apply-patch.js",
     "apply-patch": "node scripts/apply-patch.js",
     "dev": "tsup --watch",
     "clean": "rm -rf dist",

package/scripts/apply-patch.js

@@ -1,19 +1,65 @@
 #!/usr/bin/env node
 import { execSync } from "child_process";
+import { createRequire } from "node:module";
+import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const sdkRoot = path.resolve(__dirname, "..");
-const hostRoot = path.resolve(sdkRoot, "../../.."); // npm、yarn 场景下，安装在 node_modules/@lark-apaas/express-datapaas
+const patchDir = path.resolve(sdkRoot, "patches");
+const esmRequire = createRequire(import.meta.url);
 
-console.log(`[patch] Applying drizzle-orm patch at host: ${hostRoot}`);
+/**
+ * 通过 Node 模块解析定位 drizzle-orm 所在的 node_modules 父目录。
+ * 兼容 npm（扁平）、yarn（扁平）、pnpm（隔离 + symlink）。
+ *
+ * 注意：drizzle-orm 的 exports 字段未导出 ./package.json，
+ * 因此使用 resolve("drizzle-orm") 获取入口文件路径，
+ * 再通过 "node_modules/drizzle-orm/" marker 截取 hostRoot。
+ */
+function resolveHostRoot() {
+  const resolved = fs.realpathSync(esmRequire.resolve("drizzle-orm"));
+  // resolved: .../node_modules/drizzle-orm/index.cjs (npm/yarn)
+  //       或: .../.pnpm/drizzle-orm@0.44.6/node_modules/drizzle-orm/index.cjs (pnpm)
+  const marker = `${path.sep}node_modules${path.sep}drizzle-orm${path.sep}`;
+  const idx = resolved.lastIndexOf(marker);
+  if (idx === -1) {
+    throw new Error(
+      `Cannot locate node_modules/drizzle-orm in resolved path: ${resolved}`,
+    );
+  }
+  return resolved.substring(0, idx);
+}
+
+/**
+ * 解析 patch-package CLI 入口的绝对路径，避免依赖 npx 在错误 cwd 下查找。
+ */
+function resolvePatchBin() {
+  const pkgPath = esmRequire.resolve("patch-package/package.json");
+  const pkgDir = path.dirname(pkgPath);
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  const bin =
+    typeof pkg.bin === "string" ? pkg.bin : pkg.bin["patch-package"];
+  return path.resolve(pkgDir, bin);
+}
+
+// ── main ──
+const hostRoot = resolveHostRoot();
+const patchBin = resolvePatchBin();
+
+// patch-package 要求 --patch-dir 为相对路径（相对于 cwd）
+const relativePatchDir = path.relative(hostRoot, patchDir);
+
+console.log(`[patch] host root      : ${hostRoot}`);
+console.log(`[patch] patch-package  : ${patchBin}`);
+console.log(`[patch] patch dir      : ${patchDir} (relative: ${relativePatchDir})`);
 
 try {
-  execSync(
-    "npx patch-package --patch-dir node_modules/@lark-apaas/express-datapaas/patches",
-    { stdio: "inherit", cwd: hostRoot }
-  );
+  execSync(`node "${patchBin}" --patch-dir "${relativePatchDir}"`, {
+    stdio: "inherit",
+    cwd: hostRoot,
+  });
   console.log("[patch] drizzle-orm patched ✅");
 } catch (err) {
   console.error("[patch] Failed to apply drizzle-orm patch ❌", err);