Merge branch 'master' into query-file

Author: ericdallo

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Improved flaky test #150
 - Obfuscate env vars in /doctor.
 - Bump clj-otel to 0.2.10
+- Rename $ARGS to $ARGUMENTS placeholder alias for custom commands.
 
 ## 0.66.1
 

docs/configuration.md

@@ -260,7 +260,7 @@ Placeholders in the format `{{argument_name}}` within the `command` string will
 ## Custom command prompts
 
 You can configure custom command prompts for project, global or via `commands` config pointing to the path of the commands.
-Prompts can use variables like `$ARGS`, `$ARG1`, `ARG2`, to replace in the prompt during command call.
+Prompts can use variables like `$ARGUMENTS`, `$ARG1`, `ARG2`, to replace in the prompt during command call.
 
 === "Local custom commands"
 

src/eca/features/commands.clj

@@ -127,10 +127,13 @@
 (defn ^:private get-custom-command [command args custom-cmds]
   (when-let [raw-content (:content (first (filter #(= command (:name %))
                                                   custom-cmds)))]
-    (let [raw-content (string/replace raw-content "$ARGS" (string/join " " args))]
+    (let [args-joined (string/join " " args)
+          content-with-args (-> raw-content
+                                (string/replace "$ARGS" args-joined)
+                                (string/replace "$ARGUMENTS" args-joined))]
       (reduce (fn [content [i arg]]
                 (string/replace content (str "$ARG" (inc i)) arg))
-              raw-content
+              content-with-args
               (map-indexed vector args)))))
 
 (defn ^:private doctor-msg [db config]

test/eca/features/commands_test.clj

@@ -25,4 +25,9 @@
   (testing "multiple occurrences of the same placeholder are all replaced"
     (let [custom [{:name "dup" :content "$ARG1-$ARG1 $ARGS"}]]
       (is (= "x-x x y"
-             (#'f.commands/get-custom-command "dup" ["x" "y"] custom))))))
+             (#'f.commands/get-custom-command "dup" ["x" "y"] custom)))))
+
+  (testing "$ARGUMENTS is supported as alias for $ARGS"
+    (let [custom [{:name "test" :content "Process $ARGUMENTS here"}]]
+      (is (= "Process one two here"
+             (#'f.commands/get-custom-command "test" ["one" "two"] custom))))))