Fix NPM Completion Conflict and Add Support for pnpm/yarn Dependency Removal

getDependencies.js

@@ -0,0 +1,8 @@
+const pkg = require(process.argv[2])
+
+const result = Object
+  .entries({ ...pkg.dependencies, ...pkg.devDependencies })
+  .map(entry => `${entry[0]}: ${entry[1]}`)
+  .join('\n')
+
+console.log(result)

getScripts.js

@@ -1,9 +1,7 @@
-
 const pkg = require(process.argv[2])
 
 const result = Object
   .entries(pkg.scripts || {})
-  .filter(entry => /^\w/.test(entry[0]))
   .map(entry => {
     entry[0] = entry[0].replace(/([$:])/ig, '\\$1')
     entry[1] = entry[1].replace(/([$:])/ig, '\\$1')

zsh-npm-scripts-autocomplete.plugin.zsh

@@ -1,6 +1,12 @@
 local _plugin_path=$0
 local _PWD=`echo $_plugin_path | sed -e 's/\/zsh-npm-scripts-autocomplete\.plugin\.zsh//'`
 __zna_pwd="$_PWD"
+
+__znsaGetDependencies() {
+  local pkgJson="$1"
+  node "$__zna_pwd/getDependencies.js" "$pkgJson" 2>/dev/null
+}
+
 __znsaGetScripts() {
   local pkgJson="$1"
   node "$__zna_pwd/getScripts.js" "$pkgJson" 2>/dev/null
@@ -21,42 +27,40 @@ __znsaArgsLength() {
 }
 
 __znsaYarnRunCompletion() {
-  [[ ! "$(__znsaArgsLength)" = "2" ]] && return
-  local pkgJson="$(__znsaFindFile package.json)"
-  [[ "$pkgJson" = "" ]] && return
-  local -a options
-  options=(${(f)"$(__znsaGetScripts $pkgJson)"})
-  [[ "$#options" = 0 ]] && return
-  _describe 'values' options
-}
+  # Return if the length of arguments is not 2 or 3
+  local argsLength="$(__znsaArgsLength)"
+  [[ "$argsLength" -ne "2" && "$argsLength" -ne "3" ]] && return
 
-## to lazy to handler different number of arguments
-## just copy and paste it
-__znsaNpmRunCompletion() {
-  [[ ! "$(__znsaArgsLength)" = "3" ]] && return
+  # Return if package.json is not found
   local pkgJson="$(__znsaFindFile package.json)"
-  [[ "$pkgJson" = "" ]] && return
-  local -a options
-  options=(${(f)"$(__znsaGetScripts $pkgJson)"})
-  [[ "$#options" = 0 ]] && return
-  _describe 'values' options
-}
+  [[ "$pkgJson" == "" ]] && return
 
-__znsaHandleYarn() {
-  __znsaYarnRunCompletion
-}
+  # Handle `yarn <script>` command
+  if [[ "$argsLength" = "2" ]]; then
+    # Get the scripts
+    local -a options=(${(f)"$(__znsaGetScripts $pkgJson)"})
+    [[ "$#options" = 0 ]] && return
+
+    # Describe the options for autocompletion
+    _describe 'values' options
+    return
+  fi
+
+  # Handle `yarn/pnpm remove/rm <dependency>` command
+  if [[ "$argsLength" = "3" ]]; then
+    # Return if the command is not `remove` or `rm`
+    [[ "${words[2]}" != "rm" && "${words[2]}" != "remove" ]] && return
 
-__znsaHandleNpm(){
-  case "${words[2]}" in
-    run)
-      __znsaNpmRunCompletion
-      ;;
-  esac
+    # Get the dependencies
+    local -a options=(${(f)"$(__znsaGetDependencies $pkgJson)"})
+    [[ "$#options" = 0 ]] && return
+
+    # Describe the options for autocompletion
+    _describe 'values' options
+    return
+  fi
 }
 
-alias nr="npm run"
-compdef __znsaYarnRunCompletion yarn
-compdef __znsaYarnRunCompletion nr
 compdef __znsaYarnRunCompletion pnpm
-compdef __znsaHandleNpm npm
-compdef __znsaHandleNpm bun
+compdef __znsaYarnRunCompletion yarn
+compdef __znsaNpmRunCompletion bun