Refactored TestConsole so inputs are contained within test module.

Author: JordanMarr

src/TestConsole/Program.fs

@@ -8,13 +8,12 @@ let args commandLine =
 [<EntryPoint>]
 let main _ = 
 
-    //ProgramAlt1.main (args "--int-option 1 --bool-option true --file-option \"c:\test\"")
-    //ProgramNoArgs.main (args "")
-    //ProgramNestedSubCommands.main (args "io list \"c:/data/\" --enable-logging") // Also contains global options
-    //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 "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 \", \"")
+    //ProgramAlt1.run ()
+    //ProgramNoArgs.run ()
+    //ProgramNestedSubCommands.run () // Also contains global options
+    //ProgramSubCommand.run ()
+    //ProgramTask.run ()
+    //ProgramTokenReplacer.SCL.run ()
+    //ProgramTokenReplacer.run ()
+    //ProgramExtraInputs.run ()
+    ProgramAppendWords.run ()

src/TestConsole/ProgramAlt1.fs

@@ -30,4 +30,7 @@ let main (argv: string[]) =
 
     cmd.Parse(argv).InvokeAsync()
     |> Async.AwaitTask
-    |> Async.RunSynchronously
+    |> Async.RunSynchronously
+
+let run () = 
+    "--int-option 1 --bool-option true --file-option \"c:\test\"" |> Utils.args |> main

src/TestConsole/ProgramAppendWords.fs

@@ -4,17 +4,25 @@ open FSharp.SystemCommandLine
 open Input
 
 let app (words: string array, separator: string option) =
-    let separator = separator |> Option.defaultValue ", "
+    let separator = defaultArg separator " + "
     System.String.Join(separator, words) |> printfn "Result: %s"
 
 let main argv = 
-    //let words = Input.Option("word", ["--word"; "-w"], Array.empty, "A list of words to be appended")
-    //let separator = Input.OptionMaybe("separator", ["--separator"; "-s"], "A character that will separate the joined words.")
-    let words = option "--word" |> alias "-w" |> desc "A list of words to be appended"
-    let separator = optionMaybe "--separator" |> alias "-s" |> desc "A character that will separate the joined words."
-
     rootCommand argv {
         description "Appends words together"
-        inputs (words, separator)
+        inputs (
+            option "--word" 
+            |> alias "-w" 
+            |> desc "A list of words to be appended" 
+            |> acceptOnlyFromAmong [ "hello" ; "world" ], 
+
+            optionMaybe "--separator"
+            |> alias "-s"
+            |> desc "A character that will separate the joined words."
+        )
         setAction app
-    }
+    }
+
+let run () = 
+    "-w hello -w world -s \", \"" |> Utils.args |> main
+    

src/TestConsole/ProgramExtraInputs.fs

@@ -39,3 +39,6 @@ let main argv =
         setAction app
         addInputs [ a; b; c; d; e; f; g; h; i; j ]
     }
+
+let run () = 
+    "-a A -b B -c C -d D -e E -1 1 -2 2 -3 3 -4 4 -5 5" |> Utils.args |> main

src/TestConsole/ProgramNestedSubCommands.fs

@@ -84,4 +84,7 @@ let main (argv: string[]) =
     printfn $"ROOT: Logging enabled: {loggingEnabled}"
 
     parseResult.Invoke()
+
+let run () = 
+    "io list \"c:/data/\" --enable-logging" |> Utils.args |> main
 

src/TestConsole/ProgramNoArgs.fs

@@ -10,5 +10,7 @@ let main argv =
         description "My sample app"
         setAction app
     }
-    
+
+let run () = 
+    "" |> Utils.args |> main
 

src/TestConsole/ProgramSubCommand.fs

@@ -46,3 +46,6 @@ let main argv =
         noAction
         addCommands [ listCmd; deleteCmd ]
     }
+
+let run () = 
+    "list c:/data/" |> Utils.args |> main

src/TestConsole/ProgramTask.fs

@@ -29,3 +29,6 @@ let main argv =
     }
     |> Async.AwaitTask
     |> Async.RunSynchronously
+
+let run () = 
+    "-w hello -w world" |> Utils.args |> main

src/TestConsole/ProgramTokenReplacer.fs

@@ -20,10 +20,12 @@ module SCL =
 
         cmd.Parse(argv, cfg).Invoke()
 
+    let run () = 
+        "--package @shoelace-style/shoelace" |> Utils.args |> main
+
 
 open FSharp.SystemCommandLine
 open Input
-open System.CommandLine.Parsing
 
 let getCmd = 
     command "get" {
@@ -52,3 +54,6 @@ let main argv =
         noAction
         addCommand getCmd
     }
+
+let run () = 
+    "get @shoelace-style/shoelace" |> Utils.args |> main

src/TestConsole/TestConsole.fsproj

@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="Utils.fs" />
     <Compile Include="ProgramAlt1.fs" />
     <Compile Include="ProgramNoArgs.fs" />
     <Compile Include="ProgramNestedSubCommands.fs" />