Remove converter in favor of a complex type

Author: EluciusFTW

src/spectrecoff-cli/commands/Prompt.fs

@@ -6,19 +6,15 @@ open SpectreCoff
 type PromptSettings()  =
     inherit CommandSettings()
 
-type Value = 
-    { num: int
-      description: string }
-
 type PromptExample() =
     inherit Command<PromptSettings>()
     interface ICommandLimiter<PromptSettings>
 
     override _.Execute(_context, _) =
 
         let fruits = ["Kiwi"; "Pear"; "Grape"; "Plum"; "Banana" ; "Orange"; "Durian"]
-        let chosenFruit = "If you had to pick one, which would it be?" |> chooseFrom fruits
-        let chosenFruits = "Which all do you actually like?" |> chooseMultipleFrom fruits
+        let chosenFruit = "If you had to pick one, which would it be?" |> choose fruits
+        let chosenFruits = "Which all do you actually like?" |> chooseMultiple fruits
 
         match chosenFruits.Count with
         | 0 -> "You don't like any fruit??"
@@ -49,16 +45,13 @@ type PromptExample() =
         |> toConsole
 
         // example for chooseFromValues
-        let getDescription (value: Value) =
-            value.description
-        
-        let values = [
-            { num = 42; description = "the answer" }
-            { num = 13; description = "some say it's unlucky" }
+        let choices = [
+            { Value = 42; Label = "the answer" }
+            { Value = 13; Label = "some say it's unlucky" }
         ]
 
-        let chosenValue = chooseFromValues getDescription values "Which number do you like best from its description?"
-        $"I like {chosenValue.num}, too"
+        let chosenValue = chooseWithLabel choices "Which number do you like best from its description?"
+        $"I like {chosenValue}, too"
         |> printMarkedUp 
         0
 
@@ -99,10 +92,10 @@ type PromptDocumentation() =
             emptyRule
             C "If the set of choices is finite, one of the following can be used:"
             BI [
-                Many [P "chooseFrom = (choices: string list) (question: string) -> string"; C "a simple single selection prompt"]
-                Many [P "chooseFromValues<'T> (converter : 'T -> string) (values: 'T list) (question: string) -> string"; C "a single selection prompt that gives a typed response and needs a converter to get a displayable string from each value"]
-                Many [P "chooseMultipleFrom = (choices: string list) (question: string) -> string list"; C "select multiple values from a list of choices"]
-                Many [P "chooseMultipleFromWith = (options: MultiSelectionPromptOptions) (choices: string list) (question: string) -> string list"; C " selecting multiple entries with configuration of the number of visible entries per page (default: 10)"]
+                Many [P "choose = (choices: string list) (question: string) -> string"; C "a simple single selection prompt"]
+                Many [P "chooseWithLabel<'T> (choices: ChoiceWithLabel<'T> list) (question: string) -> string"; C "a single selection prompt that gives a typed response"]
+                Many [P "chooseMultiple = (choices: string list) (question: string) -> string list"; C "select multiple values from a list of choices"]
+                Many [P "chooseMultipleWith = (options: MultiSelectionPromptOptions) (choices: string list) (question: string) -> string list"; C " selecting multiple entries with configuration of the number of visible entries per page (default: 10)"]
             ]
             BL
             emptyRule

src/spectrecoff/Prompt.fs

@@ -10,6 +10,10 @@ type PromptOptions =
 type MultiSelectionPromptOptions = 
     { PageSize: int }
 
+type ChoiceWithLabel<'T when 'T: equality> = 
+    { Value: 'T
+      Label: string }
+
 let defaultOptions = 
     { Secret = false
       Optional = false }
@@ -52,17 +56,25 @@ module private Prompts =
 let private prompt prompter =
     AnsiConsole.Prompt prompter;
 
-let chooseFrom (choices: string list) question = 
+let choose (choices: string list) question = 
     prompt (Prompts.selectionPrompt question choices)
 
-let chooseFromValues<'T> (converter : 'T -> string) (values: 'T list) question =
-    prompt (Prompts.selectionPromptT converter question values)
-
-let chooseMultipleFromWith options (choices: string list) question = 
+let chooseWithLabel<'T when 'T: equality> (choices: ChoiceWithLabel<'T> list ) question =
+    let choiceLabelMap = 
+        choices 
+        |> Seq.map (fun choice -> choice.Value, choice.Label)
+        |> dict
+    let converter = (fun choice -> choiceLabelMap[choice])
+    
+    choiceLabelMap.Keys 
+    |> Prompts.selectionPromptT converter question 
+    |> prompt
+
+let chooseMultipleWith options (choices: string list) question = 
     prompt (Prompts.multiSelectionPrompt question choices options)
 
-let chooseMultipleFrom = 
-    chooseMultipleFromWith defaultMultiSelectionOptions
+let chooseMultiple = 
+    chooseMultipleWith defaultMultiSelectionOptions
 
 let ask<'T> question = 
     prompt (Prompts.textPrompt<'T> question defaultOptions)