Add convenience arg in the completion to simplify use in bash

Author: zph

cmd/lib.go

@@ -18,9 +18,18 @@ import (
 
 type CompletionArgs struct {
 	Args        []string `json:"args"`
+	LastArg     string   `json:"last_arg"`
 	CurrentWord string   `json:"current_word"`
 }
 
+func NewCompletionArgs(args []string, currentWord string) CompletionArgs {
+	return CompletionArgs{
+		Args:        args,
+		LastArg:     args[len(args)-1],
+		CurrentWord: currentWord,
+	}
+}
+
 func ValidArgsFunctionForScripts(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	config := NewConfig()
 	rootDir := config.RootDir()
@@ -68,7 +77,7 @@ func ValidArgsFunctionForScripts(cmd *cobra.Command, args []string, toComplete s
 			// Execute the joint path as a shell script
 			completionFlag := []string{"--completion"}
 			cmd := exec.Command(joint, completionFlag...)
-			envArg := CompletionArgs{Args: args, CurrentWord: toComplete}
+			envArg := NewCompletionArgs(args, toComplete)
 			c, err := json.Marshal(envArg)
 			if err != nil {
 				log.Fatal(err)

test/tome-cli.test.ts

@@ -108,9 +108,9 @@ for await (let [executable, fn] of [["tome-cli", tome], ["wrapper.sh", wrapper]]
 }
 
 Deno.test(`tome-cli: TOME_COMPLETION passed through as env`, async function (t): Promise<void> {
-  const { code, lines, executable } = await tome(`__complete exec folder test-env-injection ""`);
+  const { code, lines, executable } = await tome(`__complete exec folder test-env-injection "a"`);
   assertEquals(code, 0);
   await assertEquals(lines.filter(l => l.startsWith("TOME_COMPLETION")).sort(), [
-    'TOME_COMPLETION={"args":["folder","test-env-injection"],"current_word":""}',
+    'TOME_COMPLETION={"args":["folder","test-env-injection"],"last_arg":"test-env-injection","current_word":"a"}',
   ].sort());
 })