nvm-vanilla 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm-vanilla",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "",
   "main": "index.js",
   "bin": {

package/src/bin.js

@@ -4,7 +4,8 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { promisify } = require('util');
-const { spawnSync, execFileSync } = require('child_process');
+const { spawnSync, execFile } = require('child_process');
+const { version: pkgVersion } = require('../package.json');
 
 const { init: install, use, list, detect, uninstall, alias, which } = require('./index');
 
@@ -45,6 +46,10 @@ const main = async () => {
     };
 
     switch (command) {
+        case '--version': {
+            console.log(pkgVersion);
+            break;
+        }
         case 'env': {
             const content = await promisify(fs.readFile)(path.resolve(
                 __dirname,
@@ -104,7 +109,8 @@ const main = async () => {
             break;
         }
         case 'current': {
-            spawnSync('node', ['--version'], { stdio: 'inherit' });
+            const nodeVersionOutput = await promisify(execFile)('node', ['--version']).catch(() => { });
+            if (nodeVersionOutput) console.log(nodeVersionOutput.stdout.replace(/^v/, '').trim());
             break;
         }
         case 'init': {

package/src/index.js

@@ -200,10 +200,24 @@ const clear = async (dir) => {
 };
 
 const getLocalNodeVersion = async (baseDir, name) => {
-    const packageFile = path.join(baseDir, name, 'node_modules', nodePackageName, 'package.json');
+    let aliasFile = path.join(baseDir, name);
+    let packageFile = path.join(baseDir, name, 'node_modules', nodePackageName, 'package.json');
+
+    let [
+        aliasVersion,
+        packageData,
+    ] = await Promise.all([
+        promisify(fs.readFile)(aliasFile, 'utf-8').catch(() => { }),
+        readJsonFile(packageFile).catch(() => { }),
+    ]);
+
+    if (aliasVersion) {
+        packageFile = path.join(baseDir, aliasVersion, 'node_modules', nodePackageName, 'package.json');
+        packageData = await readJsonFile(packageFile).catch(() => { });
+    }
+    
     try {
-        const { version } = await readJsonFile(packageFile);
-        return version.replace(/^v/, '');
+        return packageData.version.replace(/^v/, '');
     } catch (_) {
         throw `no local node version "${name}"`;
     }
@@ -223,16 +237,19 @@ const alias = async (baseDir, version, targetVersion) => {
         console.log(nodeVersion);
         return;
     } else if (!resetFlag) {
-        await getLocalNodeVersion(baseDir, targetVersion); // check
+        targetVersion = await getLocalNodeVersion(baseDir, targetVersion); // check
     }
 
-    const sourceDir = path.join(baseDir, targetVersion);
+    // const sourceDir = path.join(baseDir, targetVersion);
 
     try {
         await promisify(fs.unlink)(linkDir);
     } catch (_) { }
 
-    if (!resetFlag) await promisify(fs.symlink)(sourceDir, linkDir, 'dir');
+    if (!resetFlag) {
+        // await promisify(fs.symlink)(sourceDir, linkDir, 'dir');
+        await promisify(fs.writeFile)(linkDir, targetVersion, 'utf-8');
+    }
 };
 
 const init = async (baseDir, version) => {
@@ -385,8 +402,11 @@ const list = async (baseDir) => {
     const nameList = await promisify(fs.readdir)(baseDir).catch(() => []);
 
     let versionList = await Promise.all(nameList.map(async name => {
-        const version = await getLocalNodeVersion(baseDir, name).catch(() => {});
-        if (!version) return;
+        const version = await getLocalNodeVersion(baseDir, name).catch(() => { });
+        if (!version) {
+            await uninstall(baseDir, version);
+            return;
+        }
         return 'node@' + name + ' (' + version + ')';
     }));
 

package/src/nvm.ps1

@@ -10,12 +10,10 @@ function nvm {
 $global:_nvmAutoloadDir = ""
 
 function _nvmAutoloadHook {
-    # 只在交互式 shell 中运行
     if (-not [Environment]::UserInteractive) { return }
-
+    
     $currentDir = (Get-Location).Path
-
-    # 如果目录没变，跳过
+    
     if ($global:_nvmAutoloadDir -eq $currentDir) { return }
 
     nvm autoload
@@ -23,7 +21,6 @@ function _nvmAutoloadHook {
     $global:_nvmAutoloadDir = $currentDir
 }
 
-# 集成到 prompt 中
 $originalPrompt = Get-Item function:prompt -ErrorAction SilentlyContinue
 if ($originalPrompt) {
     $originalPrompt = $originalPrompt.ScriptBlock
@@ -32,7 +29,6 @@ if ($originalPrompt) {
 function global:prompt {
     _nvmAutoloadHook
 
-    # 调用原始 prompt
     if ($originalPrompt) {
         & $originalPrompt
     } else {

package/src/nvm.sh

@@ -21,14 +21,11 @@ _nvm_autoload_hook() {
     nvm_autoload_dir="$current_dir"
 }
 
-# 根据不同 shell 设置钩子
 case "$SHELL" in
     *bash*)
-        # bash: 使用 PROMPT_COMMAND
         PROMPT_COMMAND="_nvm_autoload_hook; $PROMPT_COMMAND"
         ;;
     *zsh*)
-        # zsh: 使用 chpwd 或 precmd 钩子
         autoload -U add-zsh-hook
         add-zsh-hook chpwd _nvm_autoload_hook
         ;;