@nocobase/cli 2.1.11-test.6 → 2.1.11-test.8

package/dist/lib/self-manager.js

@@ -116,7 +116,12 @@ function detectInstallMethod(packageRoot, options = {}) {
     if (options.yarnGlobalDir && isSubPath(options.yarnGlobalDir, packageRoot)) {
         return 'yarn-global';
     }
-    if (options.pnpmGlobalRoot && isSubPath(options.pnpmGlobalRoot, packageRoot)) {
+    if (isPnpmGlobalInstallPath({
+        packageName: options.packageName ?? DEFAULT_PACKAGE_NAME,
+        packageRoot,
+        pnpmGlobalBin: options.pnpmGlobalBin,
+        pnpmGlobalRoot: options.pnpmGlobalRoot,
+    })) {
         return 'pnpm-global';
     }
     if (isPnpmGlobalPath(packageRoot)) {
@@ -136,6 +141,71 @@ function isPnpmGlobalPath(packageRoot) {
     }
     return segments.slice(globalIndex + 2).includes('node_modules');
 }
+function packageNameToPath(packageName) {
+    return packageName.split('/').filter(Boolean);
+}
+function isSameRealPath(left, right) {
+    try {
+        return normalizePath(fs.realpathSync(left)) === normalizePath(fs.realpathSync(right));
+    }
+    catch {
+        return false;
+    }
+}
+function isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot) {
+    if (isSubPath(pnpmGlobalRoot, packageRoot)) {
+        return true;
+    }
+    const normalizedGlobalRoot = normalizePath(pnpmGlobalRoot);
+    const globalNodeModulesDir = path.basename(normalizedGlobalRoot) === 'node_modules'
+        ? normalizedGlobalRoot
+        : path.join(normalizedGlobalRoot, 'node_modules');
+    const globalProjectDir = path.dirname(globalNodeModulesDir);
+    if (!isSubPath(globalProjectDir, packageRoot)) {
+        return false;
+    }
+    const segments = normalizePath(packageRoot).split(path.sep).filter(Boolean);
+    const pnpmStoreIndex = segments.indexOf('.pnpm');
+    if (pnpmStoreIndex === -1) {
+        return false;
+    }
+    return segments.slice(pnpmStoreIndex + 1).includes('node_modules');
+}
+function isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName) {
+    return isSameRealPath(path.join(pnpmGlobalRoot, ...packageNameToPath(packageName)), packageRoot);
+}
+function isPnpmGlobalBinProjectPath(pnpmGlobalBin, packageRoot, packageName) {
+    const pnpmHome = path.dirname(normalizePath(pnpmGlobalBin));
+    const globalDir = path.join(pnpmHome, 'global');
+    if (isSubPath(globalDir, packageRoot)) {
+        return true;
+    }
+    let entries;
+    try {
+        entries = fs.readdirSync(globalDir);
+    }
+    catch {
+        return false;
+    }
+    return entries.some((entry) => {
+        const pnpmGlobalRoot = path.join(globalDir, entry, 'node_modules');
+        return isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot)
+            || isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName);
+    });
+}
+function isPnpmGlobalInstallPath(options) {
+    if (options.pnpmGlobalRoot) {
+        const matchedRoot = isPnpmGlobalRootPath(options.pnpmGlobalRoot, options.packageRoot)
+            || isPnpmGlobalPackagePath(options.pnpmGlobalRoot, options.packageRoot, options.packageName);
+        if (matchedRoot) {
+            return true;
+        }
+    }
+    if (options.pnpmGlobalBin) {
+        return isPnpmGlobalBinProjectPath(options.pnpmGlobalBin, options.packageRoot, options.packageName);
+    }
+    return false;
+}
 function readCurrentBinPath(currentBinPath) {
     const candidate = String(currentBinPath ?? process.argv[1] ?? '').trim();
     if (!candidate) {
@@ -251,6 +321,7 @@ export function getSelfUpdatePackageSpec(status) {
 }
 export async function inspectSelfInstall(options = {}) {
     const packageRoot = options.packageRoot ? normalizePath(options.packageRoot) : PACKAGE_ROOT;
+    const packageName = options.packageName ?? DEFAULT_PACKAGE_NAME;
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const currentBinPath = readCurrentBinPath(options.currentBinPath);
     const globalPrefix = await readGlobalPrefix(commandOutputFn);
@@ -262,6 +333,7 @@ export async function inspectSelfInstall(options = {}) {
         packageRoot,
         currentBinPath,
         globalPrefix,
+        packageName,
         pnpmGlobalBin,
         pnpmGlobalRoot,
         yarnGlobalBin,
@@ -282,6 +354,8 @@ function detectInstallMethodFromSignals(options) {
     }
     return detectInstallMethod(options.packageRoot, {
         globalPrefix: options.globalPrefix,
+        packageName: options.packageName,
+        pnpmGlobalBin: options.pnpmGlobalBin,
         pnpmGlobalRoot: options.pnpmGlobalRoot,
         yarnGlobalDir: options.yarnGlobalDir,
     });
@@ -293,6 +367,7 @@ export async function inspectSelfStatus(options = {}) {
     const channel = options.channel && options.channel !== 'auto' ? options.channel : detectChannel(currentVersion);
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const { installMethod, globalPrefix } = await inspectSelfInstall({
+        packageName,
         packageRoot,
         commandOutputFn,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.11-test.6",
+  "version": "2.1.11-test.8",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",