Merge pull request #150 from augustocdias/fix_resolve_args

Fix resolveArgs bugs

Author: MarcelRobitaille

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 
-## [1.18.0] 2025-05-13
+## [1.18.2] 2025-05-15
+
+- Fix task arguments handling to prevent incorrect values
+- Fix `stdinResolveVars` using wrong task argument
+
+## [1.18.1] 2025-05-13
 
 - Support stdinResolveVars (#145)
 

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Tasks Shell Input",
   "description": "Use shell commands as input for your tasks",
   "icon": "icon.png",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "publisher": "augustocdias",
   "repository": {
     "url": "https://github.com/augustocdias/vscode-shell-command"

package.json

@@ -442,19 +442,21 @@ describe("Errors", async () => {
 
 describe("Argument parsing", () => {
     test("Test defaults and that all boolean properties use parseBoolean", () => {
-        expect(CommandHandler.resolveArgs({ extraTestThing: 42 }))
-            .toStrictEqual({
-                allowCustomValues: false,
-                rememberPrevious: false,
-                useFirstResult: false,
-                useSingleResult: false,
-                multiselect: false,
-                warnOnStderr: true,
-                multiselectSeparator: " ",
-                stdio: "stdout",
-                extraTestThing: 42,
-                stdinResolveVars: true,
-            });
+        expect(CommandHandler.resolveArgs({
+            extraTestThing: 42,
+            allowCustomValues: "false",
+        })).toStrictEqual({
+            allowCustomValues: false,
+            rememberPrevious: false,
+            useFirstResult: false,
+            useSingleResult: false,
+            multiselect: false,
+            warnOnStderr: true,
+            multiselectSeparator: " ",
+            stdio: "stdout",
+            extraTestThing: 42,
+            stdinResolveVars: true,
+        });
     });
 
     test("parseBoolean", () => {

src/lib/CommandHandler.test.ts

@@ -62,16 +62,16 @@ export class CommandHandler {
 
     static resolveArgs(args: { [key: string]: unknown }): ShellCommandOptions {
         return {
+            ...args,
             useFirstResult: parseBoolean(args.useFirstResult, false),
             useSingleResult: parseBoolean(args.useSingleResult, false),
             rememberPrevious: parseBoolean(args.rememberPrevious, false),
             allowCustomValues: parseBoolean(args.allowCustomValues, false),
             warnOnStderr: parseBoolean(args.warnOnStderr, true),
             multiselect: parseBoolean(args.multiselect, false),
-            stdinResolveVars: parseBoolean(args.multiselect, true),
+            stdinResolveVars: parseBoolean(args.stdinResolveVars, true),
             multiselectSeparator: args.multiselectSeparator ?? " ",
             stdio: ["stdout", "stderr", "both"].includes(args.stdio as string) ? args.stdio : "stdout",
-            ...args,
         } as ShellCommandOptions;
     }