fix(nushell): add missing | parse env | update-env for deactivation operations

.github/workflows/test.yml

@@ -201,6 +201,8 @@ jobs:
           mkdir -p "$HOME/.local/bin"
           ln -s "$(which fdfind)" "$HOME/.local/bin/fd"
           echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+      - name: Dependencies for e2e/shell/test_nushell
+        run: npm install --global nushell
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: mise-ubuntu-latest

e2e/shell/test_nushell

@@ -0,0 +1,38 @@
+#! /usr/bin/env sh
+
+# run this test with either:
+# - mise run e2e nushell
+# - LD_LIBRARY_PATH=/usr/lib:/home/linuxbrew/.linuxbrew/lib mise run e2e nushell
+
+set -eu
+
+if ! command -v nu >/dev/null 2>&1; then
+	# for now, treat these tests as optional if `nu` is unavailable
+	exit 0
+fi
+
+MISE_NUSHELL_INIT=$(mktemp e2e_nushell_init.XXXXXXXXXX)
+
+# nushell's `source` is a parser keyword:
+# https://www.nushell.sh/commands/docs/source.html
+# this means the sourced mise init file must exist before we run `nu`
+
+# use `env` to control the environment variables available to `nu`
+# - we need LD_LIBRARY_PATH so that mise can find libbz2.so.1.0
+# - we need PATH so that this test can find `mise`
+env --ignore-environment LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="${PATH}" mise activate nu >"${MISE_NUSHELL_INIT}"
+
+# equivalent of try/catch so we always cleanup the temporary file,
+# even if the test fails
+set +e
+
+# use `env` to control the environment variables available to `nu`
+# - we need LD_LIBRARY_PATH so that mise can find libbz2.so.1.0
+# - we need PATH so that this test can find `nu`
+env --ignore-environment LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="${PATH}" nu --no-config-file --commands "source ${MISE_NUSHELL_INIT}"
+NUSHELL_EXIT_CODE=${?}
+
+set -e
+rm --force --verbose "${MISE_NUSHELL_INIT}"
+
+exit "${NUSHELL_EXIT_CODE}"

e2e/shell/test_nushell_deactivation

@@ -0,0 +1,39 @@
+#! /usr/bin/env sh
+
+# run this test with either:
+# - mise run e2e nushell
+# - LD_LIBRARY_PATH=/usr/lib:/home/linuxbrew/.linuxbrew/lib mise run e2e nushell
+
+set -eu
+
+if ! command -v nu >/dev/null 2>&1; then
+	# for now, treat these tests as optional if `nu` is unavailable
+	exit 0
+fi
+
+MISE_NUSHELL_INIT=$(mktemp e2e_nushell_init.XXXXXXXXXX)
+
+# nushell's `source` is a parser keyword:
+# https://www.nushell.sh/commands/docs/source.html
+# this means the sourced mise init file must exist before we run `nu`
+
+# use `env` to control the environment variables available to `nu`
+# - we need __MISE_DIFF to trigger the deactivation code path
+# - we need LD_LIBRARY_PATH so that mise can find libbz2.so.1.0
+# - we need PATH so that this test can find `mise`
+env --ignore-environment __MISE_DIFF=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="${PATH}" mise activate nu >"${MISE_NUSHELL_INIT}"
+
+# equivalent of try/catch so we always cleanup the temporary file,
+# even if the test fails
+set +e
+
+# use `env` to control the environment variables available to `nu`
+# - we need LD_LIBRARY_PATH so that mise can find libbz2.so.1.0
+# - we need PATH so that this test can find `nu`
+env --ignore-environment LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PATH="${PATH}" nu --no-config-file --commands "source ${MISE_NUSHELL_INIT}"
+NUSHELL_EXIT_CODE=${?}
+
+set -e
+rm --force --verbose "${MISE_NUSHELL_INIT}"
+
+exit "${NUSHELL_EXIT_CODE}"

src/shell/nushell.rs

@@ -52,7 +52,31 @@ impl Shell for Nushell {
 
         let mut out = String::new();
 
-        out.push_str(&shell::build_deactivation_script(self));
+        out.push_str(&formatdoc! {r#"
+          def "parse vars" [] {{
+            $in | from csv --noheaders --no-infer | rename 'op' 'name' 'value'
+          }}
+
+          def --env "update-env" [] {{
+            for $var in $in {{
+              if $var.op == "set" {{
+                if ($var.name | str upcase) == 'PATH' {{
+                  $env.PATH = ($var.value | split row (char esep))
+                }} else {{
+                  load-env {{($var.name): $var.value}}
+                }}
+              }} else if $var.op == "hide" and $var.name in $env {{
+                hide-env $var.name
+              }}
+            }}
+          }}
+        "#});
+
+        let deactivation_ops_csv = &shell::build_deactivation_script(self);
+        out.push_str(&formatdoc! {r#"
+          "{deactivation_ops_csv}" | parse vars | update-env
+        "#});
+
         let inline_prelude = self.format_activate_prelude_inline(&opts.prelude);
         out.push_str(&formatdoc! {r#"
           export-env {{
@@ -73,10 +97,6 @@ impl Shell for Nushell {
             $env.config = ($old_config | upsert $field ($old_hooks ++ [$new_hook]))
           }}
 
-          def "parse vars" [] {{
-            $in | from csv --noheaders --no-infer | rename 'op' 'name' 'value'
-          }}
-
           export def --env --wrapped main [command?: string, --help, ...rest: string] {{
             let commands = ["deactivate", "shell", "sh"]
 
@@ -93,20 +113,6 @@ impl Shell for Nushell {
             }}
           }}
 
-          def --env "update-env" [] {{
-            for $var in $in {{
-              if $var.op == "set" {{
-                if ($var.name | str upcase) == 'PATH' {{
-                  $env.PATH = ($var.value | split row (char esep))
-                }} else {{
-                  load-env {{($var.name): $var.value}}
-                }}
-              }} else if $var.op == "hide" {{
-                hide-env $var.name
-              }}
-            }}
-          }}
-
           def --env mise_hook [] {{
             ^"{exe}" hook-env{flags} -s nu
               | parse vars

src/shell/snapshots/mise__shell__nushell__tests__hook_init.snap

@@ -1,7 +1,26 @@
 ---
 source: src/shell/nushell.rs
+assertion_line: 178
 expression: nushell.activate(opts)
 ---
+def "parse vars" [] {
+  $in | from csv --noheaders --no-infer | rename 'op' 'name' 'value'
+}
+
+def --env "update-env" [] {
+  for $var in $in {
+    if $var.op == "set" {
+      if ($var.name | str upcase) == 'PATH' {
+        $env.PATH = ($var.value | split row (char esep))
+      } else {
+        load-env {($var.name): $var.value}
+      }
+    } else if $var.op == "hide" and $var.name in $env {
+      hide-env $var.name
+    }
+  }
+}
+"" | parse vars | update-env
 export-env {
 
   $env.MISE_SHELL = "nu"
@@ -20,10 +39,6 @@ def --env add-hook [field: cell-path new_hook: any] {
   $env.config = ($old_config | upsert $field ($old_hooks ++ [$new_hook]))
 }
 
-def "parse vars" [] {
-  $in | from csv --noheaders --no-infer | rename 'op' 'name' 'value'
-}
-
 export def --env --wrapped main [command?: string, --help, ...rest: string] {
   let commands = ["deactivate", "shell", "sh"]
 
@@ -40,20 +55,6 @@ export def --env --wrapped main [command?: string, --help, ...rest: string] {
   }
 }
 
-def --env "update-env" [] {
-  for $var in $in {
-    if $var.op == "set" {
-      if ($var.name | str upcase) == 'PATH' {
-        $env.PATH = ($var.value | split row (char esep))
-      } else {
-        load-env {($var.name): $var.value}
-      }
-    } else if $var.op == "hide" {
-      hide-env $var.name
-    }
-  }
-}
-
 def --env mise_hook [] {
   ^"/some/dir/mise" hook-env --status -s nu
     | parse vars