jorgebucaran · jorgebucaran · Dec 5, 2020 · Nov 24, 2020 · Nov 25, 2020 · Nov 25, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,18 +3,25 @@ name: CI
 on: push
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
-      - run: |
-          sudo add-apt-repository -y ppa:fish-shell/nightly-master
+      - name: Install Fish
+        run: |
+          sudo apt-add-repository -yn ppa:fish-shell/release-3
           sudo apt-get update
-          sudo apt-get -y install fish
-      - run: |
-          curl git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
-          fish -c "fisher add . && nvm use lts && node -v"
-
-
+          sudo apt-get install -y fish
 
+      - name: Install Fisher
+        run: curl -sL git.io/fisher | source && fisher install jorgebucaran/fisher
+        shell: fish {0}
 
+      - name: Install Nvm
+        run: |
+          fisher install jorgebucaran/nvm.fish@2.0
+          set -l v 14.0.0
+          nvm install $v
+          test (node --version) = v$v
+        shell: fish {0}
diff --git a/README.md b/README.md
@@ -1,125 +1,118 @@
-# nvm.fish
+# NVM.fish
 
-> 100% pure-<a href="https://fishshell.com" title="friendly interactive shell">fish</a> Node.js version manager.
+> 100% pure-[Fish](https://fishshell.com) Node version management.
 
-- `.nvmrc` support.
-- Seamless shell integration. <kbd>Tab</kbd>-completions? You got them.
-- No dependencies, no subshells, no configuration setup, no fluff—it's so easy it hurts.
-- Because nvm.fish runs natively by fish, it's insanely fast ([see this discussion](https://github.com/jorgebucaran/fish-nvm/issues/82)).
+Not [_that_](https://github.com/nvm-sh/nvm) POSIX-compatible script. Designed for [Fish](), this tool helps you manage different versions of Node on a single local environment. Quickly install and switch between runtimes without cluttering your home directory or breaking system-wide scripts. Here are some of the highlights:
 
-![](https://gistcdn.githack.com/jorgebucaran/00f6d3f301483a01a00e836eb17a2b3e/raw/26625256b5e5ccb632f990727db70055ae24e584/nvm.fish.svg)
+- No dependencies, no setup, no clutter—it just works.
+- <kbd>Tab</kbd>-completable seamless shell integration.
+- `.node-version` and `.nvmrc` support. ✅
+- [XDG Base Directory](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) friendly.
+  <!-- - Hot symlink switching—absolute speed unlocked. -->
+    <!-- - Automatic version switching on `$PWD` change. -->
 
 ## Installation
 
-Install with [Fisher](https://github.com/jorgebucaran/fisher) (recommended):
+Install with [Fisher](https://github.com/jorgebucaran/fisher):
 
 ```console
 fisher install jorgebucaran/nvm.fish
 ```
 
-<details>
-<summary>Not using a package manager?</summary>
+## Quickstart
 
-###
+Install the latest Node release and start using it.
 
-Copy [`conf.d/nvm.fish`](conf.d/nvm.fish), [`functions/nvm.fish`](functions/nvm.fish), and [`completions/nvm.fish`](completions/nvm.fish) to your fish configuration directory preserving the directory structure.
+```console
+nvm install latest
+```
 
-```fish
-set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
+Install the latest [LTS](https://github.com/nodejs/Release) (long-term support) Node release.
 
-for i in conf.d functions completions
-  curl https://git.io/$i.nvm.fish --create-dirs -sLo $XDG_CONFIG_HOME/fish/$i/nvm.fish
-end
+```console
+nvm install lts
 ```
 
-To uninstall nvm, just run:
+Install an older LTS release by codename.
 
-```
-rm -f $XDG_CONFIG_HOME/fish/{conf.d,functions,completions}/nvm.fish && emit nvm_uninstall
+```console
+nvm install carbon
 ```
 
-</details>
+> Installs `8.16.2`, the latest release of the Carbon LTS line.
 
-## Quickstart
-
-Download and switch to the latest Node.js release.
+Or install a specific version of Node.
 
 ```console
-nvm use latest
+nvm install v12.9.1
 ```
 
-> **Note:** This downloads the latest Node.js release tarball from the [official mirror](https://nodejs.org/dist), extracts it to <code>[\$XDG_CONFIG_HOME](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables)/nvm</code> and modifies your `$PATH` so it can be used immediately. Learn more about the Node.js release schedule [here](https://github.com/nodejs/Release).
+> Supports full or partial version numbers, starting with an optional "v".
 
-Download and switch to the latest LTS (long-term support) Node.js release.
+The `nvm install` command activates the specified Node version only in the current environment. If you want to set the default version for new shells use:
 
-```console
-nvm use lts
+```fish
+set -U nvm_default_version v12.9.1
 ```
 
-You can create a `.nvmrc` file in the root of your project (or any parent directory) and run `nvm` to use the version in it. `nvm` will try to find the nearest `.nvmrc` file, traversing the directory tree from the current working directory upwards.
+Activate a version you've already installed.
 
 ```console
-node -v > .nvmrc
-nvm
+nvm use lts
 ```
 
-Run `nvm` in any subdirectory of a directory with an `.nvmrc` file to switch to the version from that file. Similarly, running `nvm use <version>` updates that `.nvmrc` file with the specified version.
+List which versions you have installed (includes your system Node if there is one).
 
 ```console
-├── README.md
-├── dist
-├── node_modules
-├── package.json
-└── src
-    └── index.js
+$ nvm list
+     system
+    v8.17.0 lts/carbon
+    v12.9.1
+ ▶ v14.15.1 lts/fermium
+    v15.3.0 latest
 ```
 
+Or list all the Node versions available to install.
+
 ```console
-echo lts >.nvmrc
-cd src
-nvm
-node -v
-v10.15.1
+$ nvm list-remote
+   ...
+   v14.13.1
+   v14.14.0
+   v14.15.0 lts/fermium
+ ▶ v14.15.1 lts/fermium ✓
+    v15.0.0
+    v15.0.1
+    v15.1.0
+    v15.2.0
+    v15.2.1
+    v15.3.0 latest ✓
 ```
 
-### Listing versions
-
-List all the supported Node.js versions you can download and switch to.
+Want to remove a Node version? You can do that too.
 
 ```console
-nvm ls
+nvm remove v12.9.1
 ```
 
-```console
-...
-10.14.2    (lts/dubnium)
-10.15.0    (lts/dubnium)
- 11.0.0
- 11.1.0
- 11.2.0
- 11.3.0
- 11.4.0
- 11.5.0
- 11.6.0
- 11.7.0    (latest/current)
+If you would like to use a different mirror of the Node binaries, for example, if you're behind a firewall, use:
+
+```fish
+set -g nvm_mirror https://npm.taobao.org/mirrors/node
 ```
 
-You can use a regular expression to narrow down the output.
+## `.nvmrc`
 
-```console
-nvm ls '^8.[4-6]'
-```
+An `.nvmrc` file makes it easy to peg a specific version of Node for different projects. Just create an `.nvmrc` (or `.node-version`) file containing a version number or alias, e.g., `latest`, `lts`, `carbon`, in the root of your project.
 
 ```console
-8.4.0    (lts/carbon)
-8.5.0    (lts/carbon)
-8.6.0    (lts/carbon)
+node -v >.nvmrc
 ```
 
-To customize the download mirror, e.g., if you are behind a firewall, you can set `$nvm_mirror`:
+Then run `nvm install` to install and activate that version. Works from anywhere inside your project by traversing the directory hierarchy until a `.nvmrc` is found.
 
 ```console
-set -g nvm_mirror http://npm.taobao.org/mirrors/node
+nvm install
 ```
 
 ## License

diff --git a/completions/nvm.fish b/completions/nvm.fish
@@ -1,6 +1,15 @@
-complete -xc nvm -n __fish_use_subcommand -a ls -d "List available versions matching <regex>"
-complete -xc nvm -n __fish_use_subcommand -a use -d "Download <version> and modify PATH so it's available"
-complete -xc nvm -n __fish_use_subcommand -a --help -d "Show usage help"
-complete -xc nvm -n __fish_use_subcommand -a --version -d "Show the current version of nvm"
+complete -c nvm --exclusive --long help -d ""
+complete -c nvm --exclusive --long version -d ""
 
-nvm complete
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a install -d ""
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a use -d ""
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a list -d ""
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a list-remote -d ""
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a remove -d ""
+complete -c nvm --exclusive --condition "__fish_use_subcommand" -a current -d ""
+complete -c nvm --exclusive --condition "__fish_seen_subcommand_from install" -a "(string split ' ' <$nvm_data/.index)"
+complete -c nvm --exclusive --condition "__fish_seen_subcommand_from remove" -a "(_nvm_list | string split ' ' | string replace system '')"
+complete -c nvm --exclusive --condition "__fish_seen_subcommand_from use" -a "(_nvm_list | string split ' ')"
+
+set -q nvm_default_version \
+    && complete -c nvm --exclusive --condition "__fish_seen_subcommand_from use remove" -a default
diff --git a/conf.d/nvm.fish b/conf.d/nvm.fish
@@ -1,15 +1,22 @@
+set -g nvm_version 1.1.0
+
+set --query XDG_DATA_HOME \
+    && set --global nvm_data $XDG_DATA_HOME/nvm \
+    || set --global nvm_data ~/.local/share/nvm
+
+if set --query nvm_default_version && not set --query nvm_current_version
+    nvm use $nvm_default_version >/dev/null
+end
+
 function _nvm_uninstall -e nvm_uninstall
-    if test -s "$nvm_config/version"
-        read -l ver <$nvm_config/version
-        if set -l i (contains -i -- "$nvm_config/$ver/bin" $fish_user_paths)
-            set -e fish_user_paths[$i]
-        end
-        command rm -f $nvm_config/version
-    end
+    # command rm -rf $nvm_data
+
+    set --query nvm_current_version && _nvm_version_deactivate $nvm_current_version
 
-    for name in (set -n | command awk '/^nvm_/')
-        set -e "$name"
+    for var in nvm_{version,current_version,default_node,data}
+        set --erase $var
     end
 
-    functions -e (functions -a | command awk '/^_nvm_/')
-end
+    complete --erase --command nvm
+    functions --erase (functions --all | string match --entire --regex "^_nvm_")
+end
diff --git a/functions/_nvm_list.fish b/functions/_nvm_list.fish
@@ -0,0 +1,12 @@
+function _nvm_list
+    set --local nodes $nvm_data/*
+
+    if set --query nodes[1]
+        string match --entire --regex (
+            string match --regex "v\d.+" $nodes | string escape --style=regex | string join "|"
+        ) <$nvm_data/.index
+    end
+
+    command --all node | string match --quiet --invert --regex "^$nvm_data" && echo system
+end
+
diff --git a/functions/_nvm_version_activate.fish b/functions/_nvm_version_activate.fish
@@ -0,0 +1,5 @@
+function _nvm_version_activate -a ver
+    _nvm_version_deactivate $nvm_current_version       
+    set --global --export nvm_current_version $ver
+    set --prepend PATH $nvm_data/$ver/bin
+end
diff --git a/functions/_nvm_version_deactivate.fish b/functions/_nvm_version_deactivate.fish
@@ -0,0 +1,4 @@
+function _nvm_version_deactivate -a ver
+    test "$nvm_current_version" = "$ver" && set --erase nvm_current_version
+    set --local index (contains --index -- $nvm_data/$ver/bin $PATH) && set --erase PATH[$index]
+end