From d07d299327feb3c6b49fadfab250083e2d1930d0 Mon Sep 17 00:00:00 2001
From: iirhe <t1t4m1un@gmail.com>
Date: Tue, 10 Dec 2024 00:26:50 +0800
Subject: [PATCH 1/2] feat: add completion support for remove/uninstall
 commands

Modified existing logic to include completion support for remove/uninstall commands in npm, yarn, and pnpm.
---
 getDependencies.js                      |  8 +++
 getScripts.js                           |  1 -
 zsh-npm-scripts-autocomplete.plugin.zsh | 86 ++++++++++++++++++-------
 3 files changed, 70 insertions(+), 25 deletions(-)
 create mode 100644 getDependencies.js

diff --git a/getDependencies.js b/getDependencies.js
new file mode 100644
index 0000000..a810829
--- /dev/null
+++ b/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)
diff --git a/getScripts.js b/getScripts.js
index 1466124..d4e6d67 100644
--- a/getScripts.js
+++ b/getScripts.js
@@ -1,4 +1,3 @@
-
 const pkg = require(process.argv[2])
 
 const result = Object
diff --git a/zsh-npm-scripts-autocomplete.plugin.zsh b/zsh-npm-scripts-autocomplete.plugin.zsh
index d2f84b7..67fd719 100644
--- a/zsh-npm-scripts-autocomplete.plugin.zsh
+++ b/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,74 @@ __znsaArgsLength() {
 }
 
 __znsaYarnRunCompletion() {
-  [[ ! "$(__znsaArgsLength)" = "2" ]] && return
+  # Return if the length of arguments is not 2 or 3
+  local argsLength="$(__znsaArgsLength)"
+  [[ "$argsLength" -ne "2" || "$argsLength" -ne "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
+
+  # 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]" in "rm" "remove" ]] && return
+
+    # Get the dependencies
+    local -a options=(${(f)"$(__znsaGetDependencies $pkgJson)"})
+    [[ "$#options" = 0 ]] && return
+
+    # Describe the options for autocompletion
+    _describe 'values' options
+    return
+  fi
 }
 
-## to lazy to handler different number of arguments
-## just copy and paste it
 __znsaNpmRunCompletion() {
-  [[ ! "$(__znsaArgsLength)" = "3" ]] && return
+  # Return if the length of arguments is not 3
+  [[ ! "$(__znsaArgsLength)" -ne "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
-}
 
-__znsaHandleYarn() {
-  __znsaYarnRunCompletion
-}
+  # Handle `npm run <script>` command
+  if [[ "$words[2]" == "run" ]]; then
+    # Get the scripts
+    local -a options=(${(f)"$(__znsaGetScripts $pkgJson)"})
+    [[ "$#options" = 0 ]] && return
+
+    # Describe the options for autocompletion
+    _describe 'values' options
+    return
+  fi
+
+  # Handle `npm uninstall <dependency>` command
+  if [[ "$words[2]" == "uninstall" ]]; then
+    # Get the dependencies
+    local -a options=(${(f)"$(__znsaGetDependencies $pkgJson)"})
+    [[ "$#options" = 0 ]] && return
 
-__znsaHandleNpm(){
-  case "${words[2]}" in
-    run)
-      __znsaNpmRunCompletion
-      ;;
-  esac
+    # 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 __znsaNpmRunCompletion npm
+compdef __znsaNpmRunCompletion bun

From a53a93a6c116efceab50f3e543826f67d0bc856a Mon Sep 17 00:00:00 2001
From: iirhe <t1t4m1un@gmail.com>
Date: Tue, 10 Dec 2024 00:40:14 +0800
Subject: [PATCH 2/2] fix: resolve bug in dependency handling

Resolved a bug in the dependency handling logic.

refactor: remove redundant npm completion registration
---
 getScripts.js                           |  1 -
 zsh-npm-scripts-autocomplete.plugin.zsh | 42 +++----------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/getScripts.js b/getScripts.js
index d4e6d67..85dad64 100644
--- a/getScripts.js
+++ b/getScripts.js
@@ -2,7 +2,6 @@ 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')
diff --git a/zsh-npm-scripts-autocomplete.plugin.zsh b/zsh-npm-scripts-autocomplete.plugin.zsh
index 67fd719..2f8f2d0 100644
--- a/zsh-npm-scripts-autocomplete.plugin.zsh
+++ b/zsh-npm-scripts-autocomplete.plugin.zsh
@@ -29,11 +29,11 @@ __znsaArgsLength() {
 __znsaYarnRunCompletion() {
   # Return if the length of arguments is not 2 or 3
   local argsLength="$(__znsaArgsLength)"
-  [[ "$argsLength" -ne "2" || "$argsLength" -ne "3" ]] && return
+  [[ "$argsLength" -ne "2" && "$argsLength" -ne "3" ]] && return
 
   # Return if package.json is not found
   local pkgJson="$(__znsaFindFile package.json)"
-  [[ "$pkgJson" = "" ]] && return
+  [[ "$pkgJson" == "" ]] && return
 
   # Handle `yarn <script>` command
   if [[ "$argsLength" = "2" ]]; then
@@ -49,7 +49,7 @@ __znsaYarnRunCompletion() {
   # Handle `yarn/pnpm remove/rm <dependency>` command
   if [[ "$argsLength" = "3" ]]; then
     # Return if the command is not `remove` or `rm`
-    [[ ! "$words[2]" in "rm" "remove" ]] && return
+    [[ "${words[2]}" != "rm" && "${words[2]}" != "remove" ]] && return
 
     # Get the dependencies
     local -a options=(${(f)"$(__znsaGetDependencies $pkgJson)"})
@@ -61,40 +61,6 @@ __znsaYarnRunCompletion() {
   fi
 }
 
-__znsaNpmRunCompletion() {
-  # Return if the length of arguments is not 3
-  [[ ! "$(__znsaArgsLength)" -ne "3" ]] && return
-
-  # Return if package.json is not found
-  local pkgJson="$(__znsaFindFile package.json)"
-  [[ "$pkgJson" = "" ]] && return
-
-  # Handle `npm run <script>` command
-  if [[ "$words[2]" == "run" ]]; then
-    # Get the scripts
-    local -a options=(${(f)"$(__znsaGetScripts $pkgJson)"})
-    [[ "$#options" = 0 ]] && return
-
-    # Describe the options for autocompletion
-    _describe 'values' options
-    return
-  fi
-
-  # Handle `npm uninstall <dependency>` command
-  if [[ "$words[2]" == "uninstall" ]]; then
-    # 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 __znsaNpmRunCompletion npm
+compdef __znsaYarnRunCompletion yarn
 compdef __znsaNpmRunCompletion bun