@nocobase/cli 2.1.11-test.1 → 2.1.11-test.3

package/dist/lib/self-manager.js

@@ -142,6 +142,13 @@ function getInstallMethodCacheFile() {
 function getInstallMethodCacheKey(packageRoot) {
     return normalizePath(path.join(packageRoot, 'bin', 'run.js'));
 }
+function readCurrentBinPath(currentBinPath) {
+    const candidate = String(currentBinPath ?? process.argv[1] ?? '').trim();
+    if (!candidate) {
+        return undefined;
+    }
+    return normalizePath(candidate);
+}
 async function readInstallMethodCache() {
     try {
         const raw = await fsp.readFile(getInstallMethodCacheFile(), 'utf8');
@@ -188,6 +195,16 @@ async function readYarnGlobalDir(commandOutputFn) {
         return undefined;
     }
 }
+async function readYarnGlobalBin(commandOutputFn) {
+    try {
+        return (await commandOutputFn('yarn', ['global', 'bin'], {
+            errorName: 'yarn global bin',
+        })).trim();
+    }
+    catch {
+        return undefined;
+    }
+}
 async function readDistTags(packageName, commandOutputFn) {
     const output = await commandOutputFn('npm', ['view', packageName, 'dist-tags', '--json'], {
         errorName: 'npm view',
@@ -244,17 +261,28 @@ export async function inspectSelfInstall(options = {}) {
     const packageRoot = options.packageRoot ? normalizePath(options.packageRoot) : PACKAGE_ROOT;
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const cachedInstallMethod = await readCachedInstallMethod(packageRoot);
+    const currentBinPath = readCurrentBinPath(options.currentBinPath);
     const globalPrefix = cachedInstallMethod?.globalPrefix ?? await readGlobalPrefix(commandOutputFn);
     const yarnGlobalDir = cachedInstallMethod?.yarnGlobalDir ?? await readYarnGlobalDir(commandOutputFn);
-    const installMethod = cachedInstallMethod?.installMethod
-        ?? detectInstallMethod(packageRoot, {
-            globalPrefix,
-            yarnGlobalDir,
-        });
-    if (!cachedInstallMethod) {
+    const yarnGlobalBin = cachedInstallMethod?.yarnGlobalBin ?? await readYarnGlobalBin(commandOutputFn);
+    const detectedInstallMethod = detectInstallMethodFromSignals({
+        packageRoot,
+        currentBinPath,
+        globalPrefix,
+        yarnGlobalBin,
+        yarnGlobalDir,
+    });
+    const installMethod = cachedInstallMethod?.installMethod === detectedInstallMethod
+        ? cachedInstallMethod.installMethod
+        : detectedInstallMethod;
+    if (!cachedInstallMethod
+        || cachedInstallMethod.currentBinPath !== currentBinPath
+        || cachedInstallMethod.installMethod !== installMethod) {
         await writeCachedInstallMethod(packageRoot, {
             installMethod,
+            currentBinPath,
             globalPrefix,
+            yarnGlobalBin,
             yarnGlobalDir,
         });
     }
@@ -264,6 +292,15 @@ export async function inspectSelfInstall(options = {}) {
         globalPrefix,
     };
 }
+function detectInstallMethodFromSignals(options) {
+    if (options.currentBinPath && options.yarnGlobalBin && isSubPath(options.yarnGlobalBin, options.currentBinPath)) {
+        return 'yarn-global';
+    }
+    return detectInstallMethod(options.packageRoot, {
+        globalPrefix: options.globalPrefix,
+        yarnGlobalDir: options.yarnGlobalDir,
+    });
+}
 export async function inspectSelfStatus(options = {}) {
     const packageRoot = options.packageRoot ? normalizePath(options.packageRoot) : PACKAGE_ROOT;
     const packageName = options.packageName ?? DEFAULT_PACKAGE_NAME;

package/package.json

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