Merge branch 'main' into minimal_damon

Author: FrankBakkerNl

.github/copilot-instructions.md

@@ -0,0 +1,57 @@
+# Copilot Instructions for NetDaemon
+
+This document provides guidance for AI assistants working on the NetDaemon project.
+
+## .NET Version
+
+- **Always use the .NET version specified in `global.json`**
+
+## Development Workflow
+
+### Building the Project
+```bash
+dotnet restore
+dotnet build --configuration Release
+```
+
+### Running Tests
+**Always verify code changes by running tests with `dotnet test`**
+
+The project has comprehensive test coverage including:
+- Unit tests for individual components
+- Integration tests with Home Assistant (stable and beta versions)
+
+Run specific test projects:
+```bash
+# Unit tests
+dotnet test src/HassModel/NetDaemon.HassModel.Tests
+dotnet test src/Extensions/NetDaemon.Extensions.Scheduling.Tests
+dotnet test src/Client/NetDaemon.HassClient.Tests
+dotnet test src/AppModel/NetDaemon.AppModel.Tests
+dotnet test src/Runtime/NetDaemon.Runtime.Tests
+
+# Integration tests
+dotnet test tests/Integration/NetDaemon.Tests.Integration
+```
+
+### Code Quality
+- Follow the existing `.editorconfig` settings
+- The project uses Roslynator for additional code analysis
+- Build warnings are treated as errors in CI
+- Maintain test coverage for new features
+
+### Making Changes
+- Focus on minimal, surgical changes
+- Maintain backward compatibility where possible
+- Update tests for any functional changes
+- Consider integration test coverage for Home Assistant interactions
+
+## Key Documentation Links
+
+### NetDaemon Documentation
+- **NetDaemon User Docs**: https://netdaemon.xyz/docs/user/
+- **NetDaemon Developer Site**: https://netdaemon.xyz/docs/developer
+
+### Home Assistant Documentation
+- **Home Assistant Docs**: https://www.home-assistant.io/docs/
+- **Home Assistant Developer Docs**: https://developers.home-assistant.io/

global.json

@@ -1,7 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "version": "9.0.0",
+    "rollForward": "latestMinor"
   }
 }

src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/HelpersGenerator.cs

@@ -65,8 +65,8 @@ private static MethodDeclarationSyntax BuildAddHomeAssistantGenerated(IEnumerabl
     private static IEnumerable<string> GetInjectableTypes(IEnumerable<EntityDomainMetadata> domains, IEnumerable<HassServiceDomain> orderedServiceDomains) =>
         [
             EntitiesClassName,
-            .. domains.Select(d => d.EntitiesForDomainClassName),
+            .. domains.Select(d => d.EntitiesForDomainClassName).Distinct(),
             ServicesClassName,
-            ..orderedServiceDomains.Select(d => GetServicesTypeName(d.Domain))
+            ..orderedServiceDomains.Select(d => GetServicesTypeName(d.Domain)).Distinct()
         ];
 }

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

@@ -0,0 +1,75 @@
+using System.Text.RegularExpressions;
+using NetDaemon.Client.HomeAssistant.Model;
+using NetDaemon.HassModel.CodeGenerator;
+using NetDaemon.HassModel.CodeGenerator.CodeGeneration;
+
+namespace NetDaemon.HassModel.Tests.CodeGenerator;
+
+public class HelpersGeneratorTest
+{
+    [Fact]
+    public void AddHomeAssistantGenerated_ShouldNotRegisterDuplicateEntityClasses()
+    {
+        // Arrange: Create test data that would lead to duplicate SensorEntities registrations
+        var states = new HassState[]
+        {
+            // Non-numeric sensor (no unit_of_measurement)
+            new() { EntityId = "sensor.simple_text", Attributes = new Dictionary<string, object>() },
+            
+            // Numeric sensor (has unit_of_measurement)  
+            new() { EntityId = "sensor.temperature", Attributes = new Dictionary<string, object> { ["unit_of_measurement"] = "°C" } }
+        };
+        
+        // Act: Generate metadata which creates both numeric and non-numeric sensor domains
+        var metaData = EntityMetaDataGenerator.GetEntityDomainMetaData(states);
+        
+        // Both should have the same EntitiesForDomainClassName
+        var sensorDomains = metaData.Domains.Where(d => d.Domain == "sensor").ToList();
+        sensorDomains.Should().HaveCount(2, "there should be both numeric and non-numeric sensor domains");
+        sensorDomains.Should().AllSatisfy(d => d.EntitiesForDomainClassName.Should().Be("SensorEntities"));
+        
+        // Generate the extension method code
+        var generatedMembers = HelpersGenerator.Generate(metaData.Domains, []).ToList();
+        var generatedCode = generatedMembers.First().ToString();
+        
+        // Assert: The generated code should not contain duplicate SensorEntities registrations
+        var sensorEntitiesMatches = Regex.Matches(
+            generatedCode, 
+            @"serviceCollection\.AddTransient<SensorEntities>\(\);");
+            
+        sensorEntitiesMatches.Should().HaveCount(1, "SensorEntities should only be registered once, not duplicated");
+    }
+    
+    [Fact]
+    public void AddHomeAssistantGenerated_ShouldRegisterAllUniqueEntityClasses()
+    {
+        // Arrange: Create test data with different domains
+        var states = new HassState[]
+        {
+            new() { EntityId = "sensor.temperature", Attributes = new Dictionary<string, object> { ["unit_of_measurement"] = "°C" } },
+            new() { EntityId = "light.living_room", Attributes = new Dictionary<string, object>() },
+            new() { EntityId = "switch.kitchen", Attributes = new Dictionary<string, object>() }
+        };
+        
+        // Act: Generate metadata
+        var metaData = EntityMetaDataGenerator.GetEntityDomainMetaData(states);
+        
+        // Generate the extension method code
+        var generatedMembers = HelpersGenerator.Generate(metaData.Domains, []).ToList();
+        var generatedCode = generatedMembers.First().ToString();
+        
+        // Assert: Each domain should be registered exactly once
+        generatedCode.Should().Contain("serviceCollection.AddTransient<SensorEntities>();");
+        generatedCode.Should().Contain("serviceCollection.AddTransient<LightEntities>();");
+        generatedCode.Should().Contain("serviceCollection.AddTransient<SwitchEntities>();");
+        
+        // Verify no duplicates
+        var sensorMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<SensorEntities>\(\);");
+        var lightMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<LightEntities>\(\);");
+        var switchMatches = Regex.Matches(generatedCode, @"serviceCollection\.AddTransient<SwitchEntities>\(\);");
+        
+        sensorMatches.Should().HaveCount(1);
+        lightMatches.Should().HaveCount(1); 
+        switchMatches.Should().HaveCount(1);
+    }
+}