fix: do not use dynamic module in post-script for PowerShell (#254)

Author: L. Yeung

lib/auto.js

@@ -112,15 +112,19 @@ function enableAutoSwitch(enable) {
 		require('./postScript').generate(null, {
 			'.PS1': [
 				// Patch the function that is invoked every time PowerShell shows a prompt.
-				// Export the function from the script using a dynamic module; this
-				// does NOT require the script to be sourced.
-				'if (-not $env:NVS_ORIGINAL_PROMPT) { ',
-				'   $env:NVS_ORIGINAL_PROMPT = $(Get-Content function:\\prompt)',
+				// This does NOT require the script to be sourced.
+				'if (-not $global:NVS_ORIGINAL_PROMPT) {',
+				'  $global:NVS_ORIGINAL_PROMPT = $Function:prompt',
+				'}',
+				'function global:prompt {',
+				'  # We have to do this so a prompt customization tool (like Oh My Posh or Starship) can get',
+				'  # the correct last command execution status and native command return code.',
+				'  $global:NVS_ORIGINAL_LASTEXECUTIONSTATUS = $?',
+				'  $originalExitCode = $global:LASTEXITCODE',
+				'  . "' + psScriptFile + '" "prompt"',
+				'  $global:LASTEXITCODE = $originalExitCode',
+				'  $global:NVS_ORIGINAL_PROMPT.Invoke()',
 				'}',
-				'New-Module -Script {',
-				'   function prompt { . "' + psScriptFile + '" "prompt" }',
-				'   Export-ModuleMember -Function prompt',
-				'} > $null',
 			],
 			'.SH': [
 				'function cd () { builtin cd "$@" && nvs cd; }',
@@ -131,11 +135,9 @@ function enableAutoSwitch(enable) {
 	} else {
 		require('./postScript').generate(null, {
 			'.PS1': [
-				'if ($env:NVS_ORIGINAL_PROMPT) { ',
-				'   New-Module -Script {',
-				'      function prompt { Invoke-Expression $env:NVS_ORIGINAL_PROMPT }',
-				'      Export-ModuleMember -Function prompt',
-				'   } > $null',
+				'if ($global:NVS_ORIGINAL_PROMPT) {',
+				'  $Function:prompt = $global:NVS_ORIGINAL_PROMPT',
+				'  Remove-Variable -Name @("NVS_ORIGINAL_PROMPT", "NVS_ORIGINAL_LASTEXECUTIONSTATUS") -Scope global',
 				'}',
 			],
 			'.SH': [

nvs.ps1

@@ -85,8 +85,7 @@ if ($args -eq "bootstrap") {
 	exit 0
 }
 elseif ($args -eq "prompt") {
-	# This script was invoked as a PS prompt function that enables auto-switching.
-	Invoke-Expression $env:NVS_ORIGINAL_PROMPT
+	# This script was invoked in a PS prompt function that enables auto-switching.
 
 	# Find the nearest .node-version file in current or parent directories
 	for ($parentDir = $pwd.Path; $parentDir; $parentDir = Split-Path $parentDir) {
@@ -109,7 +108,7 @@ elseif ($args -eq "prompt") {
 	while (($b = $proc.StandardOutput.Read()) -ne -1) {
 		Write-Host -NoNewline ([char]$b)
 	}
-	$proc.WaitForExit
+	$proc.WaitForExit()
 	$exitCode = $proc.ExitCode
 }
 else {