@nocobase/cli 2.1.11-test.5 → 2.1.11-test.7

package/dist/lib/self-manager.js

@@ -116,6 +116,9 @@ function detectInstallMethod(packageRoot, options = {}) {
     if (options.yarnGlobalDir && isSubPath(options.yarnGlobalDir, packageRoot)) {
         return 'yarn-global';
     }
+    if (options.pnpmGlobalRoot && isPnpmGlobalRootPath(options.pnpmGlobalRoot, packageRoot)) {
+        return 'pnpm-global';
+    }
     if (isPnpmGlobalPath(packageRoot)) {
         return 'pnpm-global';
     }
@@ -133,6 +136,25 @@ function isPnpmGlobalPath(packageRoot) {
     }
     return segments.slice(globalIndex + 2).includes('node_modules');
 }
+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 readCurrentBinPath(currentBinPath) {
     const candidate = String(currentBinPath ?? process.argv[1] ?? '').trim();
     if (!candidate) {
@@ -140,11 +162,35 @@ function readCurrentBinPath(currentBinPath) {
     }
     return normalizePath(candidate);
 }
+function cleanCommandPath(value) {
+    const trimmed = value.trim();
+    return trimmed ? trimmed : undefined;
+}
 async function readGlobalPrefix(commandOutputFn) {
     try {
-        return (await commandOutputFn('npm', ['prefix', '-g'], {
+        return cleanCommandPath(await commandOutputFn('npm', ['prefix', '-g'], {
             errorName: 'npm prefix',
-        })).trim();
+        }));
+    }
+    catch {
+        return undefined;
+    }
+}
+async function readPnpmGlobalBin(commandOutputFn) {
+    try {
+        return cleanCommandPath(await commandOutputFn('pnpm', ['bin', '-g'], {
+            errorName: 'pnpm bin',
+        }));
+    }
+    catch {
+        return undefined;
+    }
+}
+async function readPnpmGlobalRoot(commandOutputFn) {
+    try {
+        return cleanCommandPath(await commandOutputFn('pnpm', ['root', '-g'], {
+            errorName: 'pnpm root',
+        }));
     }
     catch {
         return undefined;
@@ -152,9 +198,9 @@ async function readGlobalPrefix(commandOutputFn) {
 }
 async function readYarnGlobalDir(commandOutputFn) {
     try {
-        return (await commandOutputFn('yarn', ['global', 'dir'], {
+        return cleanCommandPath(await commandOutputFn('yarn', ['global', 'dir'], {
             errorName: 'yarn global dir',
-        })).trim();
+        }));
     }
     catch {
         return undefined;
@@ -162,9 +208,9 @@ async function readYarnGlobalDir(commandOutputFn) {
 }
 async function readYarnGlobalBin(commandOutputFn) {
     try {
-        return (await commandOutputFn('yarn', ['global', 'bin'], {
+        return cleanCommandPath(await commandOutputFn('yarn', ['global', 'bin'], {
             errorName: 'yarn global bin',
-        })).trim();
+        }));
     }
     catch {
         return undefined;
@@ -227,12 +273,16 @@ export async function inspectSelfInstall(options = {}) {
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const currentBinPath = readCurrentBinPath(options.currentBinPath);
     const globalPrefix = await readGlobalPrefix(commandOutputFn);
+    const pnpmGlobalBin = await readPnpmGlobalBin(commandOutputFn);
+    const pnpmGlobalRoot = await readPnpmGlobalRoot(commandOutputFn);
     const yarnGlobalDir = await readYarnGlobalDir(commandOutputFn);
     const yarnGlobalBin = await readYarnGlobalBin(commandOutputFn);
     const installMethod = detectInstallMethodFromSignals({
         packageRoot,
         currentBinPath,
         globalPrefix,
+        pnpmGlobalBin,
+        pnpmGlobalRoot,
         yarnGlobalBin,
         yarnGlobalDir,
     });
@@ -246,8 +296,12 @@ function detectInstallMethodFromSignals(options) {
     if (options.currentBinPath && options.yarnGlobalBin && isSubPath(options.yarnGlobalBin, options.currentBinPath)) {
         return 'yarn-global';
     }
+    if (options.currentBinPath && options.pnpmGlobalBin && isSubPath(options.pnpmGlobalBin, options.currentBinPath)) {
+        return 'pnpm-global';
+    }
     return detectInstallMethod(options.packageRoot, {
         globalPrefix: options.globalPrefix,
+        pnpmGlobalRoot: options.pnpmGlobalRoot,
         yarnGlobalDir: options.yarnGlobalDir,
     });
 }

package/package.json

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