Skip to content

Commit ee13aab

Browse files
ridiculousfishridiculousfish
authored
Optimize fish completions (#11185)
1 parent 09438eb commit ee13aab

File tree

1 file changed

+91
-70
lines changed

1 file changed

+91
-70
lines changed

‎completions/bun.fish

+91-70
Original file line numberDiff line numberDiff line change
@@ -32,132 +32,153 @@ function __fish__get_bun_bun_js_files
3232
string split ' ' (bun getcompletes j)
3333
end
3434

35-
function bun_fish_is_nth_token --description 'Test if current token is on Nth place' --argument-names n
36-
set -l tokens (commandline -poc)
37-
set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
38-
test (count $tokens) -eq "$n"
39-
end
40-
41-
function __bun_command_count --argument-names n
42-
set -l cmds (commandline -poc)
43-
44-
test (count cmds) -eq "$n"
45-
end
46-
47-
function __bun_last_cmd --argument-names n
48-
set -l cmds (commandline -poc)
49-
50-
test "(cmds[-1])" = "$n"
51-
end
52-
5335
set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global
5436
set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependencies" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder"
5537

56-
set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add init link unlink pm x
5738
set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add init pm x
58-
set -l bun_builtin_cmds_without_bun dev create help upgrade run discord install remove add init pm x
59-
set -l bun_builtin_cmds_without_create dev help bun upgrade discord run install remove add init pm x
60-
set -l bun_builtin_cmds_without_install create dev help bun upgrade discord run remove add init pm x
61-
set -l bun_builtin_cmds_without_remove create dev help bun upgrade discord run install add init pm x
62-
set -l bun_builtin_cmds_without_add create dev help bun upgrade discord run remove install init pm x
63-
set -l bun_builtin_cmds_without_pm create dev help bun upgrade discord run init pm x
64-
65-
# clear
39+
set -l bun_builtin_cmds_accepting_flags create help bun upgrade discord run init link unlink pm x
40+
41+
function __bun_complete_bins_scripts --inherit-variable bun_builtin_cmds_without_run -d "Emit bun completions for bins and scripts"
42+
# Do nothing if we already have a builtin subcommand,
43+
# or any subcommand other than "run".
44+
if __fish_seen_subcommand_from $bun_builtin_cmds_without_run
45+
or not __fish_use_subcommand && not __fish_seen_subcommand_from run
46+
return
47+
end
48+
# Do we already have a bin or script subcommand?
49+
set -l bins (__fish__get_bun_bins)
50+
if __fish_seen_subcommand_from $bins
51+
return
52+
end
53+
# Scripts have descriptions appended with a tab separator.
54+
# Strip off descriptions for the purposes of subcommand testing.
55+
set -l scripts (__fish__get_bun_scripts)
56+
if __fish_seen_subcommand_from $(string split \t -f 1 -- $scripts)
57+
return
58+
end
59+
# Emit scripts.
60+
for script in $scripts
61+
echo $script
62+
end
63+
# Emit binaries and JS files (but only if we're doing `bun run`).
64+
if __fish_seen_subcommand_from run
65+
for bin in $bins
66+
echo "$bin"\t"package bin"
67+
end
68+
for file in (__fish__get_bun_bun_js_files)
69+
echo "$file"\t"Bun.js"
70+
end
71+
end
72+
end
73+
74+
75+
# Clear existing completions
6676
complete -e -c bun
6777

78+
# Dynamically emit scripts and binaries
79+
complete -c bun -f -a "(__bun_complete_bins_scripts)"
80+
81+
# Complete flags if we have no subcommand or a flag-friendly one.
82+
set -l flag_applies "__fish_use_subcommand; or __fish_seen_subcommand_from $bun_builtin_cmds_accepting_flags"
6883
complete -c bun \
69-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '(__fish__get_bun_scripts)' -d 'script'
70-
complete -c bun \
71-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bins)' -d 'package bin'
72-
complete -c bun \
73-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_scripts)' -d 'script'
74-
complete -c bun \
75-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bun_js_files)' -d 'Bun.js'
76-
complete -c bun \
77-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'run' -f -d 'Run a script or bin'
78-
complete -c bun \
79-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths'
84+
-n $flag_applies --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths'
8085
complete -c bun \
81-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'p' -l 'port' -r -d 'Port number to start server from'
86+
-n $flag_applies --no-files -s 'p' -l 'port' -r -d 'Port number to start server from'
8287
complete -c bun \
83-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"'
88+
-n $flag_applies --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"'
8489
complete -c bun \
85-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react'
90+
-n $flag_applies --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react'
8691
complete -c bun \
87-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'use' -r -d 'Use a framework (ex: next)'
92+
-n $flag_applies --no-files -l 'use' -r -d 'Use a framework (ex: next)'
8893
complete -c bun \
89-
-n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime'
90-
94+
-n $flag_applies --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime'
95+
96+
# Complete dev and create as first subcommand.
9197
complete -c bun \
92-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'dev' -d 'Start dev server'
98+
-n "__fish_use_subcommand" -a 'dev' -d 'Start dev server'
9399
complete -c bun \
94-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template'
100+
-n "__fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template'
95101

102+
# Complete "next" and "react" if we've seen "create".
96103
complete -c bun \
97-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'next' -d 'new Next.js project'
104+
-n "__fish_seen_subcommand_from create" -a 'next' -d 'new Next.js project'
98105

99106
complete -c bun \
100-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'react' -d 'new React project'
107+
-n "__fish_seen_subcommand_from create" -a 'react' -d 'new React project'
101108

109+
# Complete "upgrade" as first subcommand.
102110
complete -c bun \
103-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'upgrade' -d 'Upgrade bun to the latest version' -x
111+
-n "__fish_use_subcommand" -a 'upgrade' -d 'Upgrade bun to the latest version' -x
112+
# Complete "-h/--help" unconditionally.
104113
complete -c bun \
105-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '--help' -d 'See all commands and flags' -x
114+
-s "h" -l "help" -d 'See all commands and flags' -x
106115

116+
# Complete "-v/--version" if we have no subcommand.
107117
complete -c bun \
108-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -l "version" -s "v" -a '--version' -d 'Bun\'s version' -x
118+
-n "not __fish_use_subcommand" -l "version" -s "v" -d 'Bun\'s version' -x
119+
120+
# Complete additional subcommands.
109121
complete -c bun \
110-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x
122+
-n "__fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x
111123

112124

113125
complete -c bun \
114-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); __fish_use_subcommand" -a 'bun' -d 'Generate a new bundle'
126+
-n "__fish_use_subcommand" -a 'bun' -d 'Generate a new bundle'
115127

116128

117129
complete -c bun \
118-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from bun" -F -d 'Bundle this'
130+
-n "__fish_seen_subcommand_from bun" -F -d 'Bundle this'
119131

120132
complete -c bun \
121-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create; and not __fish_seen_subcommand_from (__fish__get_bun_bins); and not __fish_seen_subcommand_from (__fish__get_bun_scripts); and __fish_seen_subcommand_from react; or __fish_seen_subcommand_from next" -F -d "Create in directory"
133+
-n "__fish_seen_subcommand_from create; and __fish_seen_subcommand_from react next" -F -d "Create in directory"
122134

123135

124136
complete -c bun \
125-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project'
137+
-n "__fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project'
126138

127139
complete -c bun \
128-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json'
140+
-n "__fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json'
129141

130142
complete -c bun \
131-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'add' -F -d 'Add a package to package.json'
132-
133-
complete -c bun \
134-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'remove' -F -d 'Remove a package from package.json'
143+
-n "__fish_use_subcommand" -a 'add' -F -d 'Add a package to package.json'
135144

136145
complete -c bun \
137-
-n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand add remove" -F
146+
-n "__fish_use_subcommand" -a 'remove' -F -d 'Remove a package from package.json'
147+
138148

139-
140149
for i in (seq (count $bun_install_boolean_flags))
141150
complete -c bun \
142-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l "$bun_install_boolean_flags[$i]" -d "$bun_install_boolean_flags_descriptions[$i]"
151+
-n "__fish_seen_subcommand_from install add remove" -l "$bun_install_boolean_flags[$i]" -d "$bun_install_boolean_flags_descriptions[$i]"
143152
end
144153

145154
complete -c bun \
146-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cwd' -d 'Change working directory'
155+
-n "__fish_seen_subcommand_from install add remove" -l 'cwd' -d 'Change working directory'
147156

148157
complete -c bun \
149-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cache-dir' -d 'Choose a cache directory (default: $HOME/.bun/install/cache)'
158+
-n "__fish_seen_subcommand_from install add remove" -l 'cache-dir' -d 'Choose a cache directory (default: $HOME/.bun/install/cache)'
150159

151160
complete -c bun \
152-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'Popular' -a '(__fish__get_bun_packages)'
161+
-n "__fish_seen_subcommand_from add" -d 'Popular' -a '(__fish__get_bun_packages)'
153162

154163
complete -c bun \
155-
-n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'History' -a '(__history_completions)'
156-
164+
-n "__fish_seen_subcommand_from add" -d 'History' -a '(__history_completions)'
165+
157166
complete -c bun \
158167
-n "__fish_seen_subcommand_from pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) cache;" -a 'bin ls cache hash hash-print hash-string' -f
159168

160169
complete -c bun \
161170
-n "__fish_seen_subcommand_from pm; and __fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts);" -a 'rm' -f
162171

163-
complete -c bun -n "not __fish_seen_subcommand_from $bun_builtin_cmds (__fish__get_bun_bins) (__fish__get_bun_scripts)" -a "$bun_builtin_cmds" -f
172+
# Add built-in subcommands with descriptions.
173+
complete -c bun -n "__fish_use_subcommand" -a "create" -f -d "Create a new project from a template"
174+
complete -c bun -n "__fish_use_subcommand" -a "build bun" --require-parameter -F -d "Transpile and bundle one or more files"
175+
complete -c bun -n "__fish_use_subcommand" -a "upgrade" -d "Upgrade Bun"
176+
complete -c bun -n "__fish_use_subcommand" -a "run" -d "Run a script or package binary"
177+
complete -c bun -n "__fish_use_subcommand" -a "install" -d "Install dependencies from package.json" -f
178+
complete -c bun -n "__fish_use_subcommand" -a "remove" -d "Remove a dependency from package.json" -f
179+
complete -c bun -n "__fish_use_subcommand" -a "add" -d "Add a dependency to package.json" -f
180+
complete -c bun -n "__fish_use_subcommand" -a "init" -d "Initialize a Bun project in this directory" -f
181+
complete -c bun -n "__fish_use_subcommand" -a "link" -d "Register or link a local npm package" -f
182+
complete -c bun -n "__fish_use_subcommand" -a "link" -d "Unregister a local npm package" -f
183+
complete -c bun -n "__fish_use_subcommand" -a "pm" -d "Additional package management utilities" -f
184+
complete -c bun -n "__fish_use_subcommand" -a "x" -d "Execute a package binary, installing if needed" -f

0 commit comments

Comments
 (0)