Improved types for generated service arguments (#1149)

* Improved types for generated service arguments

* fix test

Author: FrankBakkerNl

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

@@ -17,21 +17,23 @@ private static Type GetClrTypeFromSelector(Selector? selectorObject)
         var clrType =  selectorObject switch
         {
             null => typeof(object),
-            NumberSelector s when (s.Step ?? 1) % 1 != 0 => typeof(double),
-            NumberSelector => typeof(long),
+            NumberSelector { Step: not null } s when s.Step % 1 == 0 => typeof(long),
+            NumberSelector => typeof(double),
             EntitySelector => typeof(string),
             DeviceSelector => typeof(string),
             AreaSelector => typeof(string),
             _ => selectorObject.Type switch
             {
+                "color_rgb" => typeof(IReadOnlyCollection<int>),
                 "boolean" => typeof(bool),
-                "object" => typeof(object),
-                "time" => typeof(DateTime), // Maybe TimeOnly??,
+                "date" => typeof(DateOnly),
+                "time" => typeof(TimeOnly),
+                "datetime" => typeof(DateTime),
                 "text" => typeof(string),
                 _ => typeof(object)
             },
         };
 
         return selectorObject?.Multiple ?? false ? typeof(IEnumerable<>).MakeGenericType(clrType) : clrType;
     }
-}
+}

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

@@ -46,7 +46,7 @@ public void TestSomeBasicServicesCanBeParsed()
     [Fact]
     public void TestServicesWithAdvancedFieldsCanBeParsed()
     {
-        var sample = File.ReadAllText(@"CodeGenerator/ServiceMetaDataSamples/Lights.json");
+        var sample = File.ReadAllText(@"CodeGenerator/ServiceMetaDataSamples/light.json");
 
         var res = Parse(sample);
         res.Should().HaveCount(1);

src/HassModel/NetDaemon.HassModel.Tests/CodeGenerator/ServiceMetaDataSamples/calendar.json

@@ -0,0 +1,125 @@
+{
+    "calendar": {
+        "create_event": {
+            "name": "Create event",
+            "description": "Adds a new calendar event.",
+            "fields": {
+                "summary": {
+                    "required": true,
+                    "example": "Department Party",
+                    "selector": {
+                        "text": null
+                    },
+                    "name": "Summary",
+                    "description": "Defines the short summary or subject for the event."
+                },
+                "description": {
+                    "example": "Meeting to provide technical review for \u0027Phoenix\u0027 design.",
+                    "selector": {
+                        "text": null
+                    },
+                    "name": "Description",
+                    "description": "A more complete description of the event than the one provided by the summary."
+                },
+                "start_date_time": {
+                    "example": "2022-03-22 20:00:00",
+                    "selector": {
+                        "datetime": null
+                    },
+                    "name": "Start time",
+                    "description": "The date and time the event should start."
+                },
+                "end_date_time": {
+                    "example": "2022-03-22 22:00:00",
+                    "selector": {
+                        "datetime": null
+                    },
+                    "name": "End time",
+                    "description": "The date and time the event should end."
+                },
+                "start_date": {
+                    "example": "2022-03-22",
+                    "selector": {
+                        "date": null
+                    },
+                    "name": "Start date",
+                    "description": "The date the all-day event should start."
+                },
+                "end_date": {
+                    "example": "2022-03-23",
+                    "selector": {
+                        "date": null
+                    },
+                    "name": "End date",
+                    "description": "The date the all-day event should end (exclusive)."
+                },
+                "in": {
+                    "example": "{\u0022days\u0022: 2} or {\u0022weeks\u0022: 2}",
+                    "name": "In",
+                    "description": "Days or weeks that you want to create the event in."
+                },
+                "location": {
+                    "example": "Conference Room - F123, Bldg. 002",
+                    "selector": {
+                        "text": null
+                    },
+                    "name": "Location",
+                    "description": "The location of the event."
+                }
+            },
+            "target": {
+                "entity": [
+                    {
+                        "domain": [
+                            "calendar"
+                        ],
+                        "supported_features": [
+                            1
+                        ]
+                    }
+                ]
+            }
+        },
+        "get_events": {
+            "name": "Get events",
+            "description": "Get events on a calendar within a time range.",
+            "fields": {
+                "start_date_time": {
+                    "example": "2022-03-22 20:00:00",
+                    "selector": {
+                        "datetime": null
+                    },
+                    "name": "Start time",
+                    "description": "Returns active events after this time (exclusive). When not set, defaults to now."
+                },
+                "end_date_time": {
+                    "example": "2022-03-22 22:00:00",
+                    "selector": {
+                        "datetime": null
+                    },
+                    "name": "End time",
+                    "description": "Returns active events before this time (exclusive). Cannot be used with \u0027duration\u0027."
+                },
+                "duration": {
+                    "selector": {
+                        "duration": null
+                    },
+                    "name": "Duration",
+                    "description": "Returns active events from start_date_time until the specified duration."
+                }
+            },
+            "target": {
+                "entity": [
+                    {
+                        "domain": [
+                            "calendar"
+                        ]
+                    }
+                ]
+            },
+            "response": {
+                "optional": false
+            }
+        }
+    }
+}