Make multiple text selector generate IEnumerable<string> (#1162)

Author: FrankBakkerNl

src/HassModel/NetDaemon.HassModel.CodeGenerator/MetaData/ServicesMetaData/SelectorConverter.cs

@@ -20,14 +20,11 @@ class SelectorConverter : JsonConverter<Selector>
         Type[] executingAssemblyTypes = Assembly.GetExecutingAssembly().GetTypes();
         var selectorType = executingAssemblyTypes.FirstOrDefault(x => string.Equals($"{selectorName}Selector", x.Name, StringComparison.OrdinalIgnoreCase));
 
-        if (selectorType is null)
-        {
-            return new Selector { Type = selectorName};
-        }
+        selectorType ??= typeof(Selector);
 
         var deserialize = (Selector?)element.Deserialize(selectorType, ServiceMetaDataParser.SerializerOptions);
         deserialize ??= (Selector)Activator.CreateInstance(selectorType)!;
 
         return deserialize with { Type = selectorName };
     }
-}
+}

src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/ServicesGeneratorTest.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using NetDaemon.Client.HomeAssistant.Model;
 using NetDaemon.HassModel.CodeGenerator;
@@ -363,50 +364,100 @@ public void MultpileEntitySelector_ShouldGenerateArray()
     {
         var states = new HassState[] { new() { EntityId = "media_player.group1" } };
 
-        var serviceMetaData = """
-                    {
-                      "media_player": {
-                        "join": {
-                          "name": "Join",
-                          "description": "Group players together. Only works on platforms with support for player groups.",
-                          "fields": {
-                            "group_members": {
-                              "name": "Group members",
-                              "description": "The players which will be synced with the target player.",
-                              "required": true,
-                              "example": "- media_player.multiroom_player2\n- media_player.multiroom_player3\n",
-                              "selector": {
-                                "entity": {
-                                  "multiple": true,
-                                  "domain": "media_player"
-                                }
-                              }
-                            }
-                          },
-                          "target": {
-                            "entity": {
-                              "domain": "media_player"
-                            }
-                          }
-                        }
-                     }
-                    }
-                    """;
+        var hassServiceDomains = Parse("""
+                                       {
+                                         "media_player": {
+                                           "join": {
+                                             "name": "Join",
+                                             "description": "Group players together. Only works on platforms with support for player groups.",
+                                             "fields": {
+                                               "group_members": {
+                                                 "name": "Group members",
+                                                 "description": "The players which will be synced with the target player.",
+                                                 "required": true,
+                                                 "example": "- media_player.multiroom_player2\n- media_player.multiroom_player3\n",
+                                                 "selector": {
+                                                   "entity": {
+                                                     "multiple": true,
+                                                     "domain": "media_player"
+                                                   }
+                                                 }
+                                               }
+                                             },
+                                             "target": {
+                                               "entity": {
+                                                 "domain": "media_player"
+                                               }
+                                             }
+                                           }
+                                        }
+                                       }
+                                       """);
 
         var appCode = WrapMethodBody(
             """
                 entities.MediaPlayer.Group1.Join(groupMembers: new string [] {"media_player.multiroom_player1", "media_player.multiroom_player2"});
                 services.MediaPlayer.Join(new ServiceTarget(), groupMembers: new string [] {"media_player.multiroom_player1", "media_player.multiroom_player2"});
             """);
 
-        var hassServiceDomains = Parse(serviceMetaData);
 
 // Act:
         var code = CodeGenTestHelper.GenerateCompilationUnit(_settings, states, hassServiceDomains);
         CodeGenTestHelper.AssertCodeCompiles(code.ToString(), appCode);
     }
 
 
+        [Fact]
+    public void MultipleTextSelector_ShouldGenerateArray()
+    {
+        var states = new HassState[] { new() { EntityId = "input_select.home_mode" } };
+
+        var hassServiceDomains = Parse("""
+                                       {
+                                         "input_select": {
+                                           "set_options": {
+                                               "name": "Set options",
+                                               "description": "Sets the options.",
+                                               "fields": {
+                                                   "options": {
+                                                       "required": true,
+                                                       "example": "[\u0022Item A\u0022, \u0022Item B\u0022, \u0022Item C\u0022]",
+                                                       "selector": {
+                                                           "text": {
+                                                               "multiple": true
+                                                           }
+                                                       },
+                                                       "name": "Options",
+                                                       "description": "List of options."
+                                                   }
+                                                 },
+                                                 "target": {
+                                                   "entity": {
+                                                     "domain": "input_select"
+                                                   }
+                                                 }
+                                               }
+                                            }
+                                          }
+                                       """);
+
+        var appCode = WrapMethodBody(
+            """
+            entities.InputSelect.HomeMode.SetOptions(options: new string [] {"home", "away"});
+            entities.InputSelect.HomeMode.SetOptions(options: ["home", "away"]);
+
+            services.InputSelect.SetOptions(new ServiceTarget(), options: new string [] {"home", "away"});
+            services.InputSelect.SetOptions(new ServiceTarget(), options: ["home", "away"]);
+            """);
+
+// Act:
+        var code = CodeGenTestHelper.GenerateCompilationUnit(_settings, states, hassServiceDomains);
+        CodeGenTestHelper.AssertCodeCompiles(code.ToString(), appCode);
+    }
+
+
+
+
     [Fact]
     public void ValidateLightsArguments()
     {
@@ -460,7 +511,7 @@ public void Run(Entities entities, Services services)
     }
 
 
-    private static IReadOnlyCollection<HassServiceDomain> Parse(string sample)
+    private static IReadOnlyCollection<HassServiceDomain> Parse([StringSyntax("json")] string sample)
     {
         var element = JsonDocument.Parse(sample).RootElement;
         var result = ServiceMetaDataParser.Parse(element, out var errors);