nvm-vanilla 1.0.6 → 1.0.8

package/README.md

@@ -17,4 +17,10 @@ nvm exec <version> <command>
 
 nvm alias <name> <version>
 nvm unalias <name>
-```
+```
+
+### For Windows
+
+```
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
+```

package/package.json

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

package/src/bin.js

@@ -15,6 +15,12 @@ const evalCommandSet = new Set(['use', 'autoload', 'env']);
 const main = async () => {
     // process.stderr.write(JSON.stringify(process.argv) + '\n'); // debug
 
+    await promisify(fs.appendFile)(path.resolve(__dirname, '.history'), JSON.stringify({
+        argv: process.argv,
+        cwd: process.cwd(),
+        time: Date.now(),
+    }));
+
     const homeDir = os.homedir();
 
     const baseDir = path.join(homeDir, '.nvm-vanilla');
@@ -41,7 +47,7 @@ const main = async () => {
         case 'env': {
             const content = await promisify(fs.readFile)(path.resolve(
                 __dirname,
-                process.platform == 'win32' ? 'nvm.ps1' : 'nvm.sh'
+                process.env.PSModulePath ? 'nvm.ps1' : 'nvm.sh'
             ), 'utf-8');
             process.stdout.write(content);
             break;
@@ -52,10 +58,11 @@ const main = async () => {
         }
         case 'autoload': {
             const targetVersion = await detect(baseDir);
-            if (targetVersion) {
+            try {
+                if (!targetVersion) throw '';
                 await use(baseDir, targetVersion);
-            } else {
-                console.log(':');
+            } catch (_) {
+                console.log(process.env.PSModulePath ? ';' : ':');
             }
             break;
         }

package/src/index.js

@@ -359,15 +359,13 @@ const use = async (baseDir, version, evalFlag = true) => {
     if (evalFlag) {
         for (const key in env) {
             const value = env[key];
-            let command = (key === 'PATH' || true)
-                ? `export ${key}=${value}`
-                : `export ${key}=\${${key}:-${value}}`;
+
+            // shell
+            let command = `export ${key}=${value}`;
 
             // powershell
-            if (process.platform === 'win32') {
-                command = (key === 'PATH' || true)
-                    ? `$env:${key}="${value}"`
-                    : `if not defined ${key} set ${key}=${value}`;
+            if (process.env.PSModulePath) {
+                command = `$env:${key}="${value}"`;
             }
 
             process.stdout.write(
@@ -384,10 +382,10 @@ const use = async (baseDir, version, evalFlag = true) => {
 };
 
 const list = async (baseDir) => {
-    const nameList = await promisify(fs.readdir)(baseDir);
+    const nameList = await promisify(fs.readdir)(baseDir).catch(() => []);
 
     let versionList = await Promise.all(nameList.map(async name => {
-        const version = getLocalNodeVersion(baseDir, name).catch(() => {});
+        const version = await getLocalNodeVersion(baseDir, name).catch(() => {});
         if (!version) return;
         return 'node@' + name + ' (' + version + ')';
     }));

package/src/init.js

@@ -16,7 +16,7 @@ const insert = async (profilePath, line) => {
 };
 
 const init = async () => {
-    if (process.platform === 'win32') {
+    if (process.env.PSModulePath) {
         const profilePath = path.resolve(os.homedir(), 'Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1');
         const line = 'nvm-vanilla --eval env | Out-String | Invoke-Expression';
         await insert(profilePath, line);

package/src/nvm.ps1

@@ -1,8 +1,41 @@
 function nvm {
-    $result = nvm-vanilla --eval @args 2>$null
+    $result = nvm-vanilla --eval @args
     if ($result) {
         Invoke-Expression ($result -join ";")
     } else {
         nvm-vanilla @args
     }
 }
+
+$global:_nvmAutoloadDir = ""
+
+function _nvmAutoloadHook {
+    # 只在交互式 shell 中运行
+    if (-not [Environment]::UserInteractive) { return }
+
+    $currentDir = (Get-Location).Path
+
+    # 如果目录没变，跳过
+    if ($global:_nvmAutoloadDir -eq $currentDir) { return }
+
+    nvm autoload
+    
+    $global:_nvmAutoloadDir = $currentDir
+}
+
+# 集成到 prompt 中
+$originalPrompt = Get-Item function:prompt -ErrorAction SilentlyContinue
+if ($originalPrompt) {
+    $originalPrompt = $originalPrompt.ScriptBlock
+}
+
+function global:prompt {
+    _nvmAutoloadHook
+
+    # 调用原始 prompt
+    if ($originalPrompt) {
+        & $originalPrompt
+    } else {
+        "PS $($executionContext.SessionState.Path.CurrentLocation)$('>' * ($nestedPromptLevel + 1)) "
+    }
+}