@hardfin/cli 0.1.0-dev.20 → 0.1.0-dev.21

package/dist/cli.js

@@ -1056,31 +1056,100 @@ async function runCompletion(input) {
 }
 /** toScript writes a shell's completion, each one asking __complete for the candidates. */
 function toScript(shell) {
-	if (shell === "bash") return `# hardfin completion for bash
+	return SCRIPTS[shell];
+}
+const SCRIPTS = {
+	bash: `# hardfin completion for bash
+_hardfin_words() {
+  # Bash splits a word at = and :, so the pieces are joined again wherever no space
+  # separates them in the line, and the word under the cursor ends at the cursor.
+  local line=\${COMP_LINE:0:COMP_POINT} offset=0 i word rest gap
+  _hardfin_line_words=()
+
+  for ((i = 0; i <= COMP_CWORD; i++)); do
+    rest=\${line:offset}
+
+    if ((i < COMP_CWORD)); then
+      word=\${COMP_WORDS[i]}
+      gap=\${rest%%"$word"*}
+      offset=$((offset + \${#gap} + \${#word}))
+    else
+      word=\${rest#"\${rest%%[![:space:]]*}"}
+      gap=\${rest%"$word"}
+    fi
+
+    if ((i > 0)) && [[ -z $gap ]]; then
+      _hardfin_line_words[\${#_hardfin_line_words[@]} - 1]+=$word
+    else
+      _hardfin_line_words+=("$word")
+    fi
+  done
+}
+
 _hardfin_complete() {
-  local words
-  words=("\${COMP_WORDS[@]:1}")
-  COMPREPLY=($(hardfin __complete -- "\${words[@]}" 2>/dev/null))
-}
-complete -F _hardfin_complete hardfin`;
-	if (shell === "zsh") return `# hardfin completion for zsh
+  local _hardfin_line_words candidate current prefix breaks
+  _hardfin_words
+  COMPREPLY=()
+
+  while IFS= read -r candidate; do
+    COMPREPLY+=("$candidate")
+  done < <(hardfin __complete -- "\${_hardfin_line_words[@]:1}" 2>/dev/null)
+
+  # Readline replaces only the text after the last = or : in the word, so a candidate
+  # loses what comes before it or the line would repeat that part.
+  current=\${_hardfin_line_words[\${#_hardfin_line_words[@]} - 1]}
+  breaks=\${COMP_WORDBREAKS//[^=:]/}
+
+  if [[ -n $breaks && $current == *["$breaks"]* ]]; then
+    prefix=\${current%"\${current##*["$breaks"]}"}
+    COMPREPLY=("\${COMPREPLY[@]#"$prefix"}")
+  fi
+}
+
+complete -F _hardfin_complete hardfin`,
+	zsh: `# hardfin completion for zsh
 _hardfin_complete() {
   local -a candidates
-  candidates=(\${(f)"$(hardfin __complete -- \${words[2,-1]} 2>/dev/null)"})
+  candidates=(\${(f)"$(hardfin __complete -- "\${(@)words[2,CURRENT]}" 2>/dev/null)"})
   compadd -a candidates
 }
-compdef _hardfin_complete hardfin`;
-	if (shell === "fish") return `# hardfin completion for fish
-complete -c hardfin -f -a "(hardfin __complete -- (commandline -opc)[2..-1] 2>/dev/null)"`;
-	return `# hardfin completion for PowerShell
+
+compdef _hardfin_complete hardfin`,
+	fish: `# hardfin completion for fish
+function __hardfin_complete
+    # Older fish lacks -x, which replaced -o, so it falls back to the older option.
+    set -l words (commandline -xpc 2>/dev/null; or commandline -opc)
+    set -l current (commandline -ct)
+    hardfin __complete -- $words[2..-1] "$current" 2>/dev/null
+end
+
+complete -c hardfin -f -a "(__hardfin_complete)"`,
+	powershell: `# hardfin completion for PowerShell
 Register-ArgumentCompleter -Native -CommandName hardfin -ScriptBlock {
   param($wordToComplete, $commandAst, $cursorPosition)
-  $words = $commandAst.CommandElements | Select-Object -Skip 1 | ForEach-Object { $_.ToString() }
+
+  # Only the words before the cursor decide what is offered, and PowerShell leaves out the
+  # empty word after a trailing space, so it is added back.
+  $words = @($commandAst.CommandElements | Select-Object -Skip 1 | Where-Object { $_.Extent.StartOffset -lt $cursorPosition } | ForEach-Object { $_.Extent.Text })
+
+  if ($wordToComplete -eq '') {
+    # Before 7.3, and in Legacy mode, an empty argument never reaches the program unless
+    # it is written as a pair of quotes.
+    $isLegacy = $PSVersionTable.PSVersion -lt [version]'7.3' -or $PSNativeCommandArgumentPassing -eq 'Legacy'
+    $words += if ($isLegacy) { '""' } else { '' }
+  }
+
   hardfin __complete -- @words 2>$null | ForEach-Object {
-    [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
+    $text = $_
+
+    if ($text -match '[\\s#@$;,''{}()"\`|<>&]') {
+      $text = "'" + ($text -replace "'", "''") + "'"
+    }
+
+    [System.Management.Automation.CompletionResult]::new($text, $_, 'ParameterValue', $_)
   }
-}`;
-}
+}`
+};
 //#endregion
 //#region src/command/config.ts
 const configCommand = defineCommand({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hardfin/cli",
-    "version": "0.1.0-dev.20",
+    "version": "0.1.0-dev.21",
     "description": "Command line interface for the Hardfin API",
     "license": "Apache-2.0",
     "author": "Hardfin, Inc.",