gwqadd 0.3.2 → 0.3.4

package/README.md

@@ -45,15 +45,19 @@ Then add the shell integration:
 
 ```sh
 # zsh  — ~/.zshrc
-eval "$(gwqadd --init zsh)"
+eval "$(command gwqadd --init zsh)"
 
 # bash — ~/.bashrc
-eval "$(gwqadd --init bash)"
+eval "$(command gwqadd --init bash)"
 
 # fish — ~/.config/fish/config.fish
-gwqadd --init fish | source
+command gwqadd --init fish | source
 ```
 
+`command` matters: each tool defines a shell function with its own name, so on a
+second `source ~/.zshrc` the *function* would answer, capture the `--init` output
+and try to `cd` into it. `command` skips functions and goes to the binary.
+
 Reload the shell and `gwqadd` moves it.
 
 Prefer a different name? `eval "$(gwqadd --init zsh --cmd gwa)"` gives you `gwa`.

package/bin/gwqadd.mjs

@@ -25,7 +25,7 @@ const HELP = `${PKG} ${VERSION} — create a branch and its gwq worktree here, a
 
 USAGE
   ${PKG} [options] [<branch>]
-  eval "$(${PKG} --init zsh)"        # then \`${PKG}\` moves the shell itself
+  eval "$(command ${PKG} --init zsh)"   # then \`${PKG}\` moves the shell itself
 
 OPTIONS
   --init <shell>     print shell integration for zsh | bash | fish, then exit
@@ -247,7 +247,7 @@ function shellInit(shell, fnName) {
 
   if (shell === 'zsh') {
     return `# ${PKG} ${VERSION} — zsh integration
-# Add to ~/.zshrc:  eval "$(${PKG} --init zsh)"
+# Add to ~/.zshrc:  eval "$(command ${PKG} --init zsh)"
 
 __${slug}_fallback=${shq(SELF)}
 
@@ -266,6 +266,18 @@ __${slug}_exec() {
 # ${desc}.
 ${fnName}() {
   emulate -L zsh
+  # These print to stdout for the caller — help text, a list, JSON — and one of
+  # them, --json, would collide with the --quiet added below. Capturing that and
+  # handing it to cd produced "file name too long" on --help. Pass them through.
+  local __a
+  for __a in "$@"; do
+    case $__a in
+      -h|--help|-V|--version|--init|--init=*|--json)
+        __${slug}_exec "$@"
+        return $?
+        ;;
+    esac
+  done
   local __dir
   __dir=$(__${slug}_exec --quiet "$@") || return $?
   # Empty is not a failure: --no-cd, --help and --version all succeed without
@@ -278,7 +290,7 @@ ${fnName}() {
 
   if (shell === 'bash') {
     return `# ${PKG} ${VERSION} — bash integration
-# Add to ~/.bashrc:  eval "$(${PKG} --init bash)"
+# Add to ~/.bashrc:  eval "$(command ${PKG} --init bash)"
 
 __${slug}_fallback=${shq(SELF)}
 
@@ -296,6 +308,18 @@ __${slug}_exec() {
 
 # ${desc}.
 ${fnName}() {
+  # These print to stdout for the caller — help text, a list, JSON — and one of
+  # them, --json, would collide with the --quiet added below. Capturing that and
+  # handing it to cd produced "file name too long" on --help. Pass them through.
+  local __a
+  for __a in "$@"; do
+    case "$__a" in
+      -h|--help|-V|--version|--init|--init=*|--json)
+        __${slug}_exec "$@"
+        return $?
+        ;;
+    esac
+  done
   local __dir
   __dir=$(__${slug}_exec --quiet "$@") || return $?
   [ -n "$__dir" ] || return 0
@@ -306,7 +330,7 @@ ${fnName}() {
 
   if (shell === 'fish') {
     return `# ${PKG} ${VERSION} — fish integration
-# Add to ~/.config/fish/config.fish:  ${PKG} --init fish | source
+# Add to ~/.config/fish/config.fish:  command ${PKG} --init fish | source
 
 set -g __${slug}_fallback ${fishq(SELF)}
 
@@ -322,6 +346,15 @@ function __${slug}_exec
 end
 
 function ${fnName} --description ${fishq(desc)}
+    # Help text, a list or JSON goes to the caller, not to cd. --json would also
+    # collide with the --quiet added below.
+    for __a in $argv
+        switch $__a
+            case -h --help -V --version --init '--init=*' --json
+                __${slug}_exec $argv
+                return $status
+        end
+    end
     set -l __dir (__${slug}_exec --quiet $argv)
     # \`set\` reports the command substitution's status, but not every fish
     # release agrees on that. Capturing it keeps a failed run from cd'ing,
@@ -1169,7 +1202,7 @@ async function finish({ repo, branch, base, path, created }) {
   stderr.write('\n');
   stderr.write(renderBox(cdCommand) + '\n');
   stderr.write(
-    `   ${dim('tip:')} ${dim(`eval "$(${PKG} --init zsh)"`)} ${dim('lets')} ` +
+    `   ${dim('tip:')} ${dim(`eval "$(command ${PKG} --init zsh)"`)} ${dim('lets')} ` +
     `${bold(PKG)} ${dim('cd for you')}\n`,
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gwqadd",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Create a branch and its gwq worktree in the repository you are in, and cd there.",
   "type": "module",
   "bin": {