Added new test to ensure that both root and sub commands honor configuration changes.

Author: JordanMarr

src/TestConsole/Program.fs

@@ -14,7 +14,7 @@ let main _ =
     //ProgramSubCommand.main (args "list c:/data/")
     //ProgramSubCommand.main (args "delete c:/data/ --recursive")
     //ProgramTask.main (args "-w hello -w world")
-    ProgramTokenReplacer.SCL.main (args "--package @shoelace-style/shoelace")
-    //ProgramTokenReplacer.main (args "--package @shoelace-style/shoelace")
+    //ProgramTokenReplacer.SCL.main (args "--package @shoelace-style/shoelace")
+    ProgramTokenReplacer.main (args "get @shoelace-style/shoelace")
     //ProgramExtraInputs.main (args "-a A -b B -c C -d D -e E -1 1 -2 2 -3 3 -4 4 -5 5")
     //ProgramAppendWords.main (args "-w hello -w world -s \", \"")

src/TestConsole/ProgramTokenReplacer.fs

@@ -25,15 +25,24 @@ open FSharp.SystemCommandLine
 open Input
 open System.CommandLine.Parsing
 
-let main argv =
-    let app (package: string) =
-        if package.StartsWith("@") then
-            printfn $"{package}"
-            0
-        else
-            eprintfn "The package name does not start with a leading @"
-            1
+let getCmd = 
+    command "get" {
+        description "Get a package by name"
+        inputs (
+            argument<string> "package" 
+            |> desc "A package with a leading @ name"
+        )
+        setAction (fun (package: string) ->
+            if package.StartsWith("@") then
+                printfn $"{package}"
+                0 // success
+            else
+                eprintfn "The package name does not start with a leading @"
+                1 // failure
+        )
+    }
 
+let main argv =
     rootCommand argv {
         description "Can be called with a leading @ package"
         configure (fun cfg -> 
@@ -43,24 +52,6 @@ let main argv =
             cfg.ResponseFileTokenReplacer <- new TryReplaceToken(fun _ _ _ -> true)
             cfg
         )        
-        inputs (
-            // The package option needs to accept strings that start with "@" symbol.
-            // For example, "--package @shoelace-style/shoelace".
-            // To accomplish this, we will need to modify the default pipeline settings below.
-            option<string> "--package" 
-            |> aliases ["-p"] 
-            |> desc "A package with a leading @ name"
-            |> editOption (fun o ->
-                o.CustomParser <- (fun res -> 
-                    // Custom parser to allow leading @ in the package name
-                    let value = res.GetValueOrDefault<string>()
-                    if value.StartsWith("@") 
-                    then value
-                    else 
-                        res.AddError("oops")
-                        "---"
-                )
-            )
-        )
-        setAction app
+        noAction
+        addCommand getCmd
     }

src/Tests/SimpleAppTest.fs

@@ -94,7 +94,7 @@ let ``05 empty array`` () =
 
 /// In beta5, the action handler is never called if an input starts with "@", even if ResponseFileTokenReplacer is set to null.
 [<Test>]
-let ``06 Token Replacer`` () = 
+let ``06 - rootCommand should use configuration`` () = 
     testRootCommand "--package @shoelace-style/shoelace" {
         description "Can be called with a leading @ package"
         configure (fun cfg -> 
@@ -114,9 +114,42 @@ let ``06 Token Replacer`` () =
                 1 // failure
         )
     } =! 0
+
+[<Test>]
+let ``07 - Child command should use configuration`` () = 
+    let getCmd = 
+        command "get" {
+            description "Get a package by name"
+            inputs (
+                argument<string> "package" 
+                |> desc "A package with a leading @ name"
+            )
+            setAction (fun (package: string) ->
+                handlerCalled <- true
+                if package.StartsWith("@") then
+                    printfn $"{package}"
+                    0 // success
+                else
+                    eprintfn "The package name does not start with a leading @"
+                    1 // failure
+            )
+        }
+
+    testRootCommand "get @shoelace-style/shoelace" {
+        description "Can be called with a leading @ package"
+        configure (fun cfg -> 
+            // Skip @ processing
+            //cfg.UseTokenReplacer(fun _ _ _ -> false)
+            //cfg.ResponseFileTokenReplacer <- null // in beta5, you must set ResponseFileTokenReplacer to null to skip @ processing
+            cfg.ResponseFileTokenReplacer <- new TryReplaceToken(fun _ _ _ -> true)
+            cfg
+        )        
+        noAction
+        addCommand getCmd
+    } =! 0
 
 [<Test>]
-let ``07 - Validators`` () = 
+let ``08 - Validators`` () = 
     handlerCalled <- true // Set to true to avoid false negatives in the test
     let args = args "-w delete -s *"
     let cfg =