@matter/model 0.16.0-alpha.0-20251101-70c8d51d7 → 0.16.0-alpha.0-20251103-b47ffa15b

package/src/standard/elements/energy-evse-device.element.ts

@@ -18,7 +18,10 @@ export const EnergyEvseDt = DeviceType(
     Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" }),
     Requirement({ name: "EnergyEvse", id: 0x99, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "EnergyEvseMode", id: 0x9d, conformance: "M", element: "serverCluster" }),
-    Requirement({ name: "TemperatureMeasurement", id: 0x402, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "TemperatureMeasurement", id: 0x402, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "PowerSource", id: 0x11, conformance: "M", element: "deviceType" }),
+    Requirement({ name: "ElectricalSensor", id: 0x510, conformance: "M", element: "deviceType" }),
+    Requirement({ name: "DeviceEnergyManagement", id: 0x50d, conformance: "M", element: "deviceType" })
 );
 
 MatterDefinition.children.push(EnergyEvseDt);

package/src/standard/elements/extractor-hood.element.ts

@@ -24,7 +24,9 @@ export const ExtractorHoodDt = DeviceType(
         Requirement({ name: "ROCKING", conformance: "X", element: "feature" }),
         Requirement({ name: "WIND", conformance: "X", element: "feature" }),
         Requirement({ name: "AIRFLOWDIRECTION", conformance: "X", element: "feature" })
-    )
+    ),
+
+    Requirement({ name: "OnOffLight", id: 0x100, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(ExtractorHoodDt);

package/src/standard/elements/fan.element.ts

@@ -21,7 +21,8 @@ export const FanDt = DeviceType(
     Requirement(
         { name: "FanControl", id: 0x202, conformance: "M", element: "serverCluster" },
         Requirement({ name: "FanModeSequence", access: "R V", conformance: "Matter", element: "attribute" })
-    )
+    ),
+    Requirement({ name: "Thermostat", id: 0x301, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(FanDt);

package/src/standard/elements/heat-pump.element.ts

@@ -16,7 +16,56 @@ export const HeatPumpDt = DeviceType(
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 777, revision: 1 } ], element: "attribute" })
     ),
     Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" }),
-    Requirement({ name: "Thermostat", id: 0x201, conformance: "O", element: "clientCluster" })
+    Requirement({ name: "Thermostat", id: 0x201, conformance: "O", element: "clientCluster" }),
+
+    Requirement(
+        { name: "PowerSource", id: 0x11, conformance: "M", element: "deviceType" },
+        Requirement(
+            { name: "PowerSource", id: 0x2f, element: "serverCluster" },
+            Requirement({ name: "Wired", conformance: "M", element: "feature" })
+        ),
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement(
+        { name: "ElectricalSensor", id: 0x510, conformance: "M", element: "deviceType" },
+
+        Requirement(
+            { name: "ElectricalPowerMeasurement", id: 0x90, element: "serverCluster" },
+            Requirement({ name: "AlternatingCurrent", conformance: "M", element: "feature" }),
+            Requirement({ name: "Voltage", conformance: "M", element: "attribute" }),
+            Requirement({ name: "ActiveCurrent", conformance: "M", element: "attribute" })
+        )
+    ),
+
+    Requirement(
+        { name: "DeviceEnergyManagement", id: 0x50d, conformance: "M", element: "deviceType" },
+        Requirement(
+            { name: "DeviceEnergyManagement", id: 0x98, element: "serverCluster" },
+            Requirement({ name: "PowerAdjustment", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement(
+        { name: "Thermostat", id: 0x301, conformance: "O", element: "deviceType" },
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement({ name: "WaterHeater", id: 0x50f, conformance: "O", element: "deviceType" }),
+
+    Requirement(
+        { name: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" },
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    )
 );
 
 MatterDefinition.children.push(HeatPumpDt);

package/src/standard/elements/microwave-oven.element.ts

@@ -27,7 +27,8 @@ export const MicrowaveOvenDt = DeviceType(
         Requirement({ name: "AIRFLOWDIRECTION", conformance: "X", element: "feature" })
     ),
     Requirement({ name: "MicrowaveOvenMode", id: 0x5e, conformance: "M", element: "serverCluster" }),
-    Requirement({ name: "MicrowaveOvenControl", id: 0x5f, conformance: "M", element: "serverCluster" })
+    Requirement({ name: "MicrowaveOvenControl", id: 0x5f, conformance: "M", element: "serverCluster" }),
+    Requirement({ name: "OnOffLight", id: 0x100, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(MicrowaveOvenDt);

package/src/standard/elements/oven.element.ts

@@ -15,7 +15,9 @@ export const OvenDt = DeviceType(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 123, revision: 2 } ], element: "attribute" })
     ),
-    Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "TemperatureControlledCabinet", id: 0x71, conformance: "M", element: "deviceType" }),
+    Requirement({ name: "Cooktop", id: 0x78, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(OvenDt);

package/src/standard/elements/refrigerator-device.element.ts

@@ -26,7 +26,8 @@ export const RefrigeratorDt = DeviceType(
         Requirement({ name: "ONOFF", conformance: "X", element: "feature" })
     ),
 
-    Requirement({ name: "RefrigeratorAlarm", id: 0x57, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "RefrigeratorAlarm", id: 0x57, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "TemperatureControlledCabinet", id: 0x71, conformance: "M", element: "deviceType" })
 );
 
 MatterDefinition.children.push(RefrigeratorDt);

package/src/standard/elements/room-air-conditioner-device.element.ts

@@ -29,7 +29,9 @@ export const RoomAirConditionerDt = DeviceType(
         Requirement({ name: "KeypadLockout", conformance: "O", element: "attribute" })
     ),
     Requirement({ name: "TemperatureMeasurement", id: 0x402, conformance: "O", element: "serverCluster" }),
-    Requirement({ name: "RelativeHumidityMeasurement", id: 0x405, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "RelativeHumidityMeasurement", id: 0x405, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "HumiditySensor", id: 0x307, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(RoomAirConditionerDt);

package/src/standard/elements/root-node.element.ts

@@ -45,12 +45,13 @@ export const RootNodeDt = DeviceType(
     Requirement({ name: "DiagnosticLogs", id: 0x32, conformance: "O", element: "serverCluster", quality: "I" }),
     Requirement({ name: "SoftwareDiagnostics", id: 0x34, conformance: "O", element: "serverCluster", quality: "I" }),
     Requirement({ name: "EthernetNetworkDiagnostics", id: 0x37, conformance: "[Ethernet]", element: "serverCluster" }),
-    Requirement({ name: "WiFiNetworkDiagnostics", id: 0x36, conformance: "[Wi, Fi]", element: "serverCluster" }),
+    Requirement({ name: "WiFiNetworkDiagnostics", id: 0x36, conformance: "[WiFi]", element: "serverCluster" }),
     Requirement({ name: "ThreadNetworkDiagnostics", id: 0x35, conformance: "[Thread]", element: "serverCluster" }),
     Requirement(
         { name: "IcdManagement", id: 0x46, conformance: "SIT | LIT", element: "serverCluster", quality: "I" },
         Requirement({ name: "LONGIDLETIMESUPPORT", conformance: "LIT", element: "feature" })
     ),
+    Requirement({ name: "PowerSource", id: 0x11, conformance: "O", element: "deviceType" }),
     Field(
         { name: "conditions", type: "enum8" },
         Field({ name: "CustomNetworkConfig" }),

package/src/standard/elements/secondary-network-interface.element.ts

@@ -17,7 +17,7 @@ export const SecondaryNetworkInterfaceDt = DeviceType(
     ),
     Requirement({ name: "NetworkCommissioning", id: 0x31, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "EthernetNetworkDiagnostics", id: 0x37, conformance: "[Ethernet]", element: "serverCluster" }),
-    Requirement({ name: "WiFiNetworkDiagnostics", id: 0x36, conformance: "[Wi, Fi]", element: "serverCluster" }),
+    Requirement({ name: "WiFiNetworkDiagnostics", id: 0x36, conformance: "[WiFi]", element: "serverCluster" }),
     Requirement({ name: "ThreadNetworkDiagnostics", id: 0x35, conformance: "[Thread]", element: "serverCluster" })
 );
 

package/src/standard/elements/smoke-co-alarm-device.element.ts

@@ -20,7 +20,8 @@ export const SmokeCoAlarmDt = DeviceType(
     Requirement({ name: "SmokeCoAlarm", id: 0x5c, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "RelativeHumidityMeasurement", id: 0x405, conformance: "O", element: "serverCluster" }),
     Requirement({ name: "TemperatureMeasurement", id: 0x402, conformance: "O", element: "serverCluster" }),
-    Requirement({ name: "CarbonMonoxideConcentrationMeasurement", id: 0x40c, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "CarbonMonoxideConcentrationMeasurement", id: 0x40c, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "PowerSource", id: 0x11, conformance: "M", element: "deviceType" })
 );
 
 MatterDefinition.children.push(SmokeCoAlarmDt);

package/src/standard/elements/solar-power.element.ts

@@ -15,7 +15,48 @@ export const SolarPowerDt = DeviceType(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 23, revision: 1 } ], element: "attribute" })
     ),
-    Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "Identify", id: 0x3, conformance: "O", element: "serverCluster" }),
+
+    Requirement(
+        { name: "PowerSource", id: 0x11, conformance: "M", element: "deviceType" },
+        Requirement(
+            { name: "PowerSource", id: 0x2f, element: "serverCluster" },
+            Requirement({ name: "Wired", conformance: "M", element: "feature" })
+        ),
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement(
+        { name: "ElectricalSensor", id: 0x510, conformance: "M", element: "deviceType" },
+        Requirement(
+            { name: "ElectricalPowerMeasurement", id: 0x90, element: "serverCluster" },
+            Requirement({ name: "Voltage", conformance: "M", element: "attribute" }),
+            Requirement({ name: "ActiveCurrent", conformance: "M", element: "attribute" })
+        ),
+        Requirement(
+            { name: "ElectricalEnergyMeasurement", id: 0x91, element: "serverCluster" },
+            Requirement({ name: "ExportedEnergy", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement(
+        { name: "DeviceEnergyManagement", id: 0x50d, conformance: "O", element: "deviceType" },
+        Requirement(
+            { name: "DeviceEnergyManagement", id: 0x98, element: "serverCluster" },
+            Requirement({ name: "PowerAdjustment", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement(
+        { name: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" },
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    )
 );
 
 MatterDefinition.children.push(SolarPowerDt);

package/src/standard/elements/water-heater.element.ts

@@ -21,7 +21,11 @@ export const WaterHeaterDt = DeviceType(
         Requirement({ name: "HEATING", conformance: "M", element: "feature" })
     ),
     Requirement({ name: "WaterHeaterManagement", id: 0x94, conformance: "M", element: "serverCluster" }),
-    Requirement({ name: "WaterHeaterMode", id: 0x9e, conformance: "M", element: "serverCluster" })
+    Requirement({ name: "WaterHeaterMode", id: 0x9e, conformance: "M", element: "serverCluster" }),
+    Requirement({ name: "PowerSource", id: 0x11, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "ElectricalSensor", id: 0x510, conformance: "desc", element: "deviceType" }),
+    Requirement({ name: "DeviceEnergyManagement", id: 0x50d, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(WaterHeaterDt);

package/src/standard/resources/air-purifier.resource.ts

@@ -21,6 +21,10 @@ Resource.add({
         { tag: "requirement", name: "OnOff", xref: "device§9.3.5" },
         { tag: "requirement", name: "FanControl", xref: "device§9.3.5" },
         { tag: "requirement", name: "HepaFilterMonitoring", xref: "device§9.3.5" },
-        { tag: "requirement", name: "ActivatedCarbonFilterMonitoring", xref: "device§9.3.5" }
+        { tag: "requirement", name: "ActivatedCarbonFilterMonitoring", xref: "device§9.3.5" },
+        { tag: "requirement", name: "Thermostat", xref: "device§9.3.4" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§9.3.4" },
+        { tag: "requirement", name: "HumiditySensor", xref: "device§9.3.4" },
+        { tag: "requirement", name: "AirQualitySensor", xref: "device§9.3.4" }
     ]
 });

package/src/standard/resources/battery-storage.resource.ts

@@ -15,5 +15,13 @@ Resource.add({
         "monitored and controlled by an Energy Management System in order to manage the peaks and troughs of " +
         "supply and demand, and/or to optimize cost of the energy consumed in premises. It is not intended to " +
         "be used for a UPS directly supplying a set of appliances, nor for portable battery storage devices.",
-    children: [{ tag: "requirement", name: "Identify", xref: "device§14.4.7" }]
+
+    children: [
+        { tag: "requirement", name: "Identify", xref: "device§14.4.7" },
+        { tag: "requirement", name: "PowerSource", xref: "device§14.4.5" },
+        { tag: "requirement", name: "ElectricalSensor", xref: "device§14.4.5" },
+        { tag: "requirement", name: "DeviceEnergyManagement", xref: "device§14.4.5" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§14.4.5" },
+        { tag: "requirement", name: "SolarPower", xref: "device§14.4.5" }
+    ]
 });

package/src/standard/resources/bridged-node.resource.ts

@@ -18,9 +18,13 @@ Resource.add({
     children: [
         { tag: "requirement", name: "BridgedDeviceBasicInformation", xref: "device§2.5.5" },
         { tag: "requirement", name: "PowerSourceConfiguration", xref: "device§2.5.5" },
-        { tag: "requirement", name: "PowerSource", xref: "device§2.5.5" },
+        {
+            tag: "requirement", name: "PowerSource", discriminator: "BridgedPowerSourceInfo:serverCluster",
+            xref: "device§2.5.5"
+        },
         { tag: "requirement", name: "EcosystemInformation", xref: "device§2.5.5" },
         { tag: "requirement", name: "AdministratorCommissioning", xref: "device§2.5.5" },
+        { tag: "requirement", name: "PowerSource", discriminator: "O:deviceType", xref: "device§2.5.4" },
 
         {
             tag: "field", name: "conditions",

package/src/standard/resources/cooktop.resource.ts

@@ -15,6 +15,7 @@ Resource.add({
         "placed above or through traditional gas or electric burners.",
     children: [
         { tag: "requirement", name: "Identify", xref: "device§13.8.5" },
-        { tag: "requirement", name: "OnOff", xref: "device§13.8.5" }
+        { tag: "requirement", name: "OnOff", xref: "device§13.8.5" },
+        { tag: "requirement", name: "CookSurface", xref: "device§13.8.4" }
     ]
 });

package/src/standard/resources/energy-evse-device.resource.ts

@@ -18,6 +18,9 @@ Resource.add({
         { tag: "requirement", name: "Identify", xref: "device§14.1.6" },
         { tag: "requirement", name: "EnergyEvse", xref: "device§14.1.6" },
         { tag: "requirement", name: "EnergyEvseMode", xref: "device§14.1.6" },
-        { tag: "requirement", name: "TemperatureMeasurement", xref: "device§14.1.6" }
+        { tag: "requirement", name: "TemperatureMeasurement", xref: "device§14.1.6" },
+        { tag: "requirement", name: "PowerSource", xref: "device§14.1.5" },
+        { tag: "requirement", name: "ElectricalSensor", xref: "device§14.1.5" },
+        { tag: "requirement", name: "DeviceEnergyManagement", xref: "device§14.1.5" }
     ]
 });

package/src/standard/resources/extractor-hood.resource.ts

@@ -34,6 +34,7 @@ Resource.add({
         { tag: "requirement", name: "Identify", xref: "device§13.10.5" },
         { tag: "requirement", name: "HepaFilterMonitoring", xref: "device§13.10.5" },
         { tag: "requirement", name: "ActivatedCarbonFilterMonitoring", xref: "device§13.10.5" },
-        { tag: "requirement", name: "FanControl", xref: "device§13.10.5" }
+        { tag: "requirement", name: "FanControl", xref: "device§13.10.5" },
+        { tag: "requirement", name: "OnOffLight", xref: "device§13.10.4" }
     ]
 });

package/src/standard/resources/fan.resource.ts

@@ -17,6 +17,7 @@ Resource.add({
         { tag: "requirement", name: "Identify", xref: "device§9.2.5" },
         { tag: "requirement", name: "Groups", xref: "device§9.2.5" },
         { tag: "requirement", name: "OnOff", xref: "device§9.2.5" },
-        { tag: "requirement", name: "FanControl", xref: "device§9.2.5" }
+        { tag: "requirement", name: "FanControl", xref: "device§9.2.5" },
+        { tag: "requirement", name: "Thermostat", xref: "device§9.2.4" }
     ]
 });

package/src/standard/resources/heat-pump.resource.ts

@@ -21,6 +21,12 @@ Resource.add({
 
     children: [
         { tag: "requirement", name: "Identify", xref: "device§14.5.7" },
-        { tag: "requirement", name: "Thermostat", xref: "device§14.5.7" }
+        { tag: "requirement", name: "Thermostat", discriminator: "O:clientCluster", xref: "device§14.5.7" },
+        { tag: "requirement", name: "PowerSource", xref: "device§14.5.5" },
+        { tag: "requirement", name: "ElectricalSensor", xref: "device§14.5.5" },
+        { tag: "requirement", name: "DeviceEnergyManagement", xref: "device§14.5.5" },
+        { tag: "requirement", name: "Thermostat", discriminator: "O:deviceType", xref: "device§14.5.5" },
+        { tag: "requirement", name: "WaterHeater", xref: "device§14.5.5" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§14.5.5" }
     ]
 });

package/src/standard/resources/microwave-oven.resource.ts

@@ -20,6 +20,7 @@ Resource.add({
         { tag: "requirement", name: "OperationalState", xref: "device§13.11.6" },
         { tag: "requirement", name: "FanControl", xref: "device§13.11.6" },
         { tag: "requirement", name: "MicrowaveOvenMode", xref: "device§13.11.6" },
-        { tag: "requirement", name: "MicrowaveOvenControl", xref: "device§13.11.6" }
+        { tag: "requirement", name: "MicrowaveOvenControl", xref: "device§13.11.6" },
+        { tag: "requirement", name: "OnOffLight", xref: "device§13.11.5" }
     ]
 });

package/src/standard/resources/oven.resource.ts

@@ -13,5 +13,9 @@ Resource.add({
     details: "An oven represents a device that contains one or more cabinets, and optionally a single cooktop, " +
         "that are all capable of heating food. Examples of consumer products implementing this device type " +
         "include ovens, wall ovens, convection ovens, etc.",
-    children: [{ tag: "requirement", name: "Identify", xref: "device§13.9.6" }]
+    children: [
+        { tag: "requirement", name: "Identify", xref: "device§13.9.6" },
+        { tag: "requirement", name: "TemperatureControlledCabinet", xref: "device§13.9.5" },
+        { tag: "requirement", name: "Cooktop", xref: "device§13.9.5" }
+    ]
 });

package/src/standard/resources/refrigerator-device.resource.ts

@@ -13,9 +13,11 @@ Resource.add({
     details: "A refrigerator represents a device that contains one or more cabinets that are capable of chilling " +
         "or freezing food. Examples of consumer products that may make use of this device type include " +
         "refrigerators, freezers, and wine coolers.",
+
     children: [
         { tag: "requirement", name: "Identify", xref: "device§13.2.6" },
         { tag: "requirement", name: "RefrigeratorAndTemperatureControlledCabinetMode", xref: "device§13.2.6" },
-        { tag: "requirement", name: "RefrigeratorAlarm", xref: "device§13.2.6" }
+        { tag: "requirement", name: "RefrigeratorAlarm", xref: "device§13.2.6" },
+        { tag: "requirement", name: "TemperatureControlledCabinet", xref: "device§13.2.5" }
     ]
 });

package/src/standard/resources/room-air-conditioner-device.resource.ts

@@ -24,6 +24,8 @@ Resource.add({
         { tag: "requirement", name: "FanControl", xref: "device§13.3.6" },
         { tag: "requirement", name: "ThermostatUserInterfaceConfiguration", xref: "device§13.3.6" },
         { tag: "requirement", name: "TemperatureMeasurement", xref: "device§13.3.6" },
-        { tag: "requirement", name: "RelativeHumidityMeasurement", xref: "device§13.3.6" }
+        { tag: "requirement", name: "RelativeHumidityMeasurement", xref: "device§13.3.6" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§13.3.5" },
+        { tag: "requirement", name: "HumiditySensor", xref: "device§13.3.5" }
     ]
 });

package/src/standard/resources/root-node.resource.ts

@@ -43,6 +43,7 @@ Resource.add({
         { tag: "requirement", name: "WiFiNetworkDiagnostics", xref: "device§2.1.5" },
         { tag: "requirement", name: "ThreadNetworkDiagnostics", xref: "device§2.1.5" },
         { tag: "requirement", name: "IcdManagement", xref: "device§2.1.5" },
+        { tag: "requirement", name: "PowerSource", xref: "device§2.1.4" },
 
         {
             tag: "field", name: "conditions",

package/src/standard/resources/smoke-co-alarm-device.resource.ts

@@ -29,6 +29,7 @@ Resource.add({
         { tag: "requirement", name: "SmokeCoAlarm", xref: "device§7.9.5" },
         { tag: "requirement", name: "RelativeHumidityMeasurement", xref: "device§7.9.5" },
         { tag: "requirement", name: "TemperatureMeasurement", xref: "device§7.9.5" },
-        { tag: "requirement", name: "CarbonMonoxideConcentrationMeasurement", xref: "device§7.9.5" }
+        { tag: "requirement", name: "CarbonMonoxideConcentrationMeasurement", xref: "device§7.9.5" },
+        { tag: "requirement", name: "PowerSource", xref: "device§7.9.4" }
     ]
 });

package/src/standard/resources/solar-power.resource.ts

@@ -13,5 +13,12 @@ Resource.add({
     details: "A Solar Power device is a device that allows a solar panel array, which can optionally be comprised " +
         "of a set parallel strings of solar panels, and its associated controller and, if appropriate, " +
         "inverter, to be monitored and controlled by an Energy Management System.",
-    children: [{ tag: "requirement", name: "Identify", xref: "device§14.3.6" }]
+
+    children: [
+        { tag: "requirement", name: "Identify", xref: "device§14.3.6" },
+        { tag: "requirement", name: "PowerSource", xref: "device§14.3.5" },
+        { tag: "requirement", name: "ElectricalSensor", xref: "device§14.3.5" },
+        { tag: "requirement", name: "DeviceEnergyManagement", xref: "device§14.3.5" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§14.3.5" }
+    ]
 });

package/src/standard/resources/water-heater.resource.ts

@@ -17,6 +17,10 @@ Resource.add({
         { tag: "requirement", name: "Identify", xref: "device§14.2.6" },
         { tag: "requirement", name: "Thermostat", xref: "device§14.2.6" },
         { tag: "requirement", name: "WaterHeaterManagement", xref: "device§14.2.6" },
-        { tag: "requirement", name: "WaterHeaterMode", xref: "device§14.2.6" }
+        { tag: "requirement", name: "WaterHeaterMode", xref: "device§14.2.6" },
+        { tag: "requirement", name: "PowerSource", xref: "device§14.2.5" },
+        { tag: "requirement", name: "TemperatureSensor", xref: "device§14.2.5" },
+        { tag: "requirement", name: "ElectricalSensor", xref: "device§14.2.5" },
+        { tag: "requirement", name: "DeviceEnergyManagement", xref: "device§14.2.5" }
     ]
 });

package/dist/cjs/common/Datatype.d.ts

@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright 2022-2025 Matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * An identifier for every non-derived datatype from the Matter Core
- * Specification.
- */
-export declare enum Datatype {
-    bool = "bool",
-    map8 = "map8",
-    map16 = "map16",
-    map32 = "map32",
-    map64 = "map64",
-    uint8 = "uint8",
-    uint16 = "uint16",
-    uint24 = "uint24",
-    uint32 = "uint32",
-    uint40 = "uint40",
-    uint48 = "uint48",
-    uint56 = "uint56",
-    uint64 = "uint64",
-    int8 = "int8",
-    int16 = "int16",
-    int24 = "int24",
-    int32 = "int32",
-    int40 = "int40",
-    int48 = "int48",
-    int56 = "int56",
-    int64 = "int64",
-    single = "single",
-    double = "double",
-    octstr = "octstr",
-    list = "list",
-    struct = "struct",
-    string = "string",
-    enum8 = "enum8",
-    enum16 = "enum16",
-    any = "any"
-}
-//# sourceMappingURL=Datatype.d.ts.map

package/dist/cjs/common/Datatype.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Datatype.d.ts","sourceRoot":"","sources":["../../../src/common/Datatype.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,oBAAY,QAAQ;IAChB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IAIjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IAGjB,GAAG,QAAQ;CACd"}

package/dist/cjs/common/Datatype.js

@@ -1,62 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var Datatype_exports = {};
-__export(Datatype_exports, {
-  Datatype: () => Datatype
-});
-module.exports = __toCommonJS(Datatype_exports);
-/**
- * @license
- * Copyright 2022-2025 Matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-var Datatype = /* @__PURE__ */ ((Datatype2) => {
-  Datatype2["bool"] = "bool";
-  Datatype2["map8"] = "map8";
-  Datatype2["map16"] = "map16";
-  Datatype2["map32"] = "map32";
-  Datatype2["map64"] = "map64";
-  Datatype2["uint8"] = "uint8";
-  Datatype2["uint16"] = "uint16";
-  Datatype2["uint24"] = "uint24";
-  Datatype2["uint32"] = "uint32";
-  Datatype2["uint40"] = "uint40";
-  Datatype2["uint48"] = "uint48";
-  Datatype2["uint56"] = "uint56";
-  Datatype2["uint64"] = "uint64";
-  Datatype2["int8"] = "int8";
-  Datatype2["int16"] = "int16";
-  Datatype2["int24"] = "int24";
-  Datatype2["int32"] = "int32";
-  Datatype2["int40"] = "int40";
-  Datatype2["int48"] = "int48";
-  Datatype2["int56"] = "int56";
-  Datatype2["int64"] = "int64";
-  Datatype2["single"] = "single";
-  Datatype2["double"] = "double";
-  Datatype2["octstr"] = "octstr";
-  Datatype2["list"] = "list";
-  Datatype2["struct"] = "struct";
-  Datatype2["string"] = "string";
-  Datatype2["enum8"] = "enum8";
-  Datatype2["enum16"] = "enum16";
-  Datatype2["any"] = "any";
-  return Datatype2;
-})(Datatype || {});
-//# sourceMappingURL=Datatype.js.map

package/dist/cjs/common/Datatype.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/common/Datatype.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAUO,IAAK,WAAL,kBAAKA,cAAL;AACH,EAAAA,UAAA,UAAO;AACP,EAAAA,UAAA,UAAO;AACP,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,UAAO;AACP,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,UAAO;AACP,EAAAA,UAAA,YAAS;AAIT,EAAAA,UAAA,YAAS;AACT,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,YAAS;AAGT,EAAAA,UAAA,SAAM;AAnCE,SAAAA;AAAA,GAAA;",
-  "names": ["Datatype"]
-}

package/dist/esm/common/Datatype.d.ts

@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright 2022-2025 Matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * An identifier for every non-derived datatype from the Matter Core
- * Specification.
- */
-export declare enum Datatype {
-    bool = "bool",
-    map8 = "map8",
-    map16 = "map16",
-    map32 = "map32",
-    map64 = "map64",
-    uint8 = "uint8",
-    uint16 = "uint16",
-    uint24 = "uint24",
-    uint32 = "uint32",
-    uint40 = "uint40",
-    uint48 = "uint48",
-    uint56 = "uint56",
-    uint64 = "uint64",
-    int8 = "int8",
-    int16 = "int16",
-    int24 = "int24",
-    int32 = "int32",
-    int40 = "int40",
-    int48 = "int48",
-    int56 = "int56",
-    int64 = "int64",
-    single = "single",
-    double = "double",
-    octstr = "octstr",
-    list = "list",
-    struct = "struct",
-    string = "string",
-    enum8 = "enum8",
-    enum16 = "enum16",
-    any = "any"
-}
-//# sourceMappingURL=Datatype.d.ts.map

package/dist/esm/common/Datatype.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Datatype.d.ts","sourceRoot":"","sources":["../../../src/common/Datatype.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,oBAAY,QAAQ;IAChB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IAIjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IAGjB,GAAG,QAAQ;CACd"}