@matter/model 0.16.0-alpha.0-20251102-faee7ab25 → 0.16.0-alpha.0-20251104-8c3166ea3

package/dist/esm/standard/resources/root-node.resource.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/standard/resources/root-node.resource.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAY,gBAAgB;AAAA,EAAQ,MAAM;AAAA,EAEnE,SAAS;AAAA,EAYT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,kBAAe;AAAA,IACrE,EAAE,KAAK,eAAe,MAAM,iBAAiB,MAAM,kBAAe;AAAA,IAClE,EAAE,KAAK,eAAe,MAAM,4BAA4B,MAAM,kBAAe;AAAA,IAC7E,EAAE,KAAK,eAAe,MAAM,uBAAuB,MAAM,kBAAe;AAAA,IACxE,EAAE,KAAK,eAAe,MAAM,sBAAsB,MAAM,kBAAe;AAAA,IACvE,EAAE,KAAK,eAAe,MAAM,wBAAwB,MAAM,kBAAe;AAAA,IACzE,EAAE,KAAK,eAAe,MAAM,wBAAwB,MAAM,kBAAe;AAAA,IACzE,EAAE,KAAK,eAAe,MAAM,8BAA8B,MAAM,kBAAe;AAAA,IAC/E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,6BAA6B,MAAM,kBAAe;AAAA,IAC9E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,kBAAe;AAAA,IACrE,EAAE,KAAK,eAAe,MAAM,sBAAsB,MAAM,kBAAe;AAAA,IACvE,EAAE,KAAK,eAAe,MAAM,kBAAkB,MAAM,kBAAe;AAAA,IACnE,EAAE,KAAK,eAAe,MAAM,uBAAuB,MAAM,kBAAe;AAAA,IACxE,EAAE,KAAK,eAAe,MAAM,8BAA8B,MAAM,kBAAe;AAAA,IAC/E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,4BAA4B,MAAM,kBAAe;AAAA,IAC7E,EAAE,KAAK,eAAe,MAAM,iBAAiB,MAAM,kBAAe;AAAA,IAElE;AAAA,MACI,KAAK;AAAA,MAAS,MAAM;AAAA,MAEpB,UAAU;AAAA,QACN;AAAA,UACI,KAAK;AAAA,UAAS,MAAM;AAAA,UACpB,aAAa;AAAA,UACb,MAAM;AAAA,QACV;AAAA,QACA;AAAA,UACI,KAAK;AAAA,UAAS,MAAM;AAAA,UACpB,aAAa;AAAA,UACb,MAAM;AAAA,QACV;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAY,gBAAgB;AAAA,EAAQ,MAAM;AAAA,EAEnE,SAAS;AAAA,EAYT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,kBAAe;AAAA,IACrE,EAAE,KAAK,eAAe,MAAM,iBAAiB,MAAM,kBAAe;AAAA,IAClE,EAAE,KAAK,eAAe,MAAM,4BAA4B,MAAM,kBAAe;AAAA,IAC7E,EAAE,KAAK,eAAe,MAAM,uBAAuB,MAAM,kBAAe;AAAA,IACxE,EAAE,KAAK,eAAe,MAAM,sBAAsB,MAAM,kBAAe;AAAA,IACvE,EAAE,KAAK,eAAe,MAAM,wBAAwB,MAAM,kBAAe;AAAA,IACzE,EAAE,KAAK,eAAe,MAAM,wBAAwB,MAAM,kBAAe;AAAA,IACzE,EAAE,KAAK,eAAe,MAAM,8BAA8B,MAAM,kBAAe;AAAA,IAC/E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,6BAA6B,MAAM,kBAAe;AAAA,IAC9E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,kBAAe;AAAA,IACrE,EAAE,KAAK,eAAe,MAAM,sBAAsB,MAAM,kBAAe;AAAA,IACvE,EAAE,KAAK,eAAe,MAAM,kBAAkB,MAAM,kBAAe;AAAA,IACnE,EAAE,KAAK,eAAe,MAAM,uBAAuB,MAAM,kBAAe;AAAA,IACxE,EAAE,KAAK,eAAe,MAAM,8BAA8B,MAAM,kBAAe;AAAA,IAC/E,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,4BAA4B,MAAM,kBAAe;AAAA,IAC7E,EAAE,KAAK,eAAe,MAAM,iBAAiB,MAAM,kBAAe;AAAA,IAClE,EAAE,KAAK,eAAe,MAAM,eAAe,MAAM,kBAAe;AAAA,IAEhE;AAAA,MACI,KAAK;AAAA,MAAS,MAAM;AAAA,MAEpB,UAAU;AAAA,QACN;AAAA,UACI,KAAK;AAAA,UAAS,MAAM;AAAA,UACpB,aAAa;AAAA,UACb,MAAM;AAAA,QACV;AAAA,QACA;AAAA,UACI,KAAK;AAAA,UAAS,MAAM;AAAA,UACpB,aAAa;AAAA,UACb,MAAM;AAAA,QACV;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;",
   "names": []
 }

package/dist/esm/standard/resources/smoke-co-alarm-device.resource.js

@@ -16,7 +16,8 @@ Resource.add({
     { tag: "requirement", name: "SmokeCoAlarm", xref: "device\xA77.9.5" },
     { tag: "requirement", name: "RelativeHumidityMeasurement", xref: "device\xA77.9.5" },
     { tag: "requirement", name: "TemperatureMeasurement", xref: "device\xA77.9.5" },
-    { tag: "requirement", name: "CarbonMonoxideConcentrationMeasurement", xref: "device\xA77.9.5" }
+    { tag: "requirement", name: "CarbonMonoxideConcentrationMeasurement", xref: "device\xA77.9.5" },
+    { tag: "requirement", name: "PowerSource", xref: "device\xA77.9.4" }
   ]
 });
 //# sourceMappingURL=smoke-co-alarm-device.resource.js.map

package/dist/esm/standard/resources/smoke-co-alarm-device.resource.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/standard/resources/smoke-co-alarm-device.resource.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAgB,gBAAgB;AAAA,EAAU,MAAM;AAAA,EAEzE,SAAS;AAAA,EAYT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,kBAAe;AAAA,IAC7D,EAAE,KAAK,eAAe,MAAM,UAAU,MAAM,kBAAe;AAAA,IAC3D,EAAE,KAAK,eAAe,MAAM,gBAAgB,MAAM,kBAAe;AAAA,IACjE,EAAE,KAAK,eAAe,MAAM,+BAA+B,MAAM,kBAAe;AAAA,IAChF,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,0CAA0C,MAAM,kBAAe;AAAA,EAC/F;AACJ,CAAC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAgB,gBAAgB;AAAA,EAAU,MAAM;AAAA,EAEzE,SAAS;AAAA,EAYT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,kBAAe;AAAA,IAC7D,EAAE,KAAK,eAAe,MAAM,UAAU,MAAM,kBAAe;AAAA,IAC3D,EAAE,KAAK,eAAe,MAAM,gBAAgB,MAAM,kBAAe;AAAA,IACjE,EAAE,KAAK,eAAe,MAAM,+BAA+B,MAAM,kBAAe;AAAA,IAChF,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,kBAAe;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,0CAA0C,MAAM,kBAAe;AAAA,IAC3F,EAAE,KAAK,eAAe,MAAM,eAAe,MAAM,kBAAe;AAAA,EACpE;AACJ,CAAC;",
   "names": []
 }

package/dist/esm/standard/resources/solar-power.resource.js

@@ -10,6 +10,12 @@ Resource.add({
   classification: "simple",
   xref: "device\xA714.3",
   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\xA714.3.6" }]
+  children: [
+    { tag: "requirement", name: "Identify", xref: "device\xA714.3.6" },
+    { tag: "requirement", name: "PowerSource", xref: "device\xA714.3.5" },
+    { tag: "requirement", name: "ElectricalSensor", xref: "device\xA714.3.5" },
+    { tag: "requirement", name: "DeviceEnergyManagement", xref: "device\xA714.3.5" },
+    { tag: "requirement", name: "TemperatureSensor", xref: "device\xA714.3.5" }
+  ]
 });
 //# sourceMappingURL=solar-power.resource.js.map

package/dist/esm/standard/resources/solar-power.resource.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/standard/resources/solar-power.resource.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAc,gBAAgB;AAAA,EAAU,MAAM;AAAA,EACvE,SAAS;AAAA,EAGT,UAAU,CAAC,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,mBAAgB,CAAC;AAC9E,CAAC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAc,gBAAgB;AAAA,EAAU,MAAM;AAAA,EACvE,SAAS;AAAA,EAIT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,mBAAgB;AAAA,IAC9D,EAAE,KAAK,eAAe,MAAM,eAAe,MAAM,mBAAgB;AAAA,IACjE,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,mBAAgB;AAAA,IACtE,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,mBAAgB;AAAA,IAC5E,EAAE,KAAK,eAAe,MAAM,qBAAqB,MAAM,mBAAgB;AAAA,EAC3E;AACJ,CAAC;",
   "names": []
 }

package/dist/esm/standard/resources/water-heater.resource.js

@@ -14,7 +14,11 @@ Resource.add({
     { tag: "requirement", name: "Identify", xref: "device\xA714.2.6" },
     { tag: "requirement", name: "Thermostat", xref: "device\xA714.2.6" },
     { tag: "requirement", name: "WaterHeaterManagement", xref: "device\xA714.2.6" },
-    { tag: "requirement", name: "WaterHeaterMode", xref: "device\xA714.2.6" }
+    { tag: "requirement", name: "WaterHeaterMode", xref: "device\xA714.2.6" },
+    { tag: "requirement", name: "PowerSource", xref: "device\xA714.2.5" },
+    { tag: "requirement", name: "TemperatureSensor", xref: "device\xA714.2.5" },
+    { tag: "requirement", name: "ElectricalSensor", xref: "device\xA714.2.5" },
+    { tag: "requirement", name: "DeviceEnergyManagement", xref: "device\xA714.2.5" }
   ]
 });
 //# sourceMappingURL=water-heater.resource.js.map

package/dist/esm/standard/resources/water-heater.resource.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/standard/resources/water-heater.resource.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAe,gBAAgB;AAAA,EAAU,MAAM;AAAA,EACxE,SAAS;AAAA,EAGT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,mBAAgB;AAAA,IAC9D,EAAE,KAAK,eAAe,MAAM,cAAc,MAAM,mBAAgB;AAAA,IAChE,EAAE,KAAK,eAAe,MAAM,yBAAyB,MAAM,mBAAgB;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,mBAAmB,MAAM,mBAAgB;AAAA,EACzE;AACJ,CAAC;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AAEzB,SAAS,IAAI;AAAA,EACT,KAAK;AAAA,EAAc,MAAM;AAAA,EAAe,gBAAgB;AAAA,EAAU,MAAM;AAAA,EACxE,SAAS;AAAA,EAGT,UAAU;AAAA,IACN,EAAE,KAAK,eAAe,MAAM,YAAY,MAAM,mBAAgB;AAAA,IAC9D,EAAE,KAAK,eAAe,MAAM,cAAc,MAAM,mBAAgB;AAAA,IAChE,EAAE,KAAK,eAAe,MAAM,yBAAyB,MAAM,mBAAgB;AAAA,IAC3E,EAAE,KAAK,eAAe,MAAM,mBAAmB,MAAM,mBAAgB;AAAA,IACrE,EAAE,KAAK,eAAe,MAAM,eAAe,MAAM,mBAAgB;AAAA,IACjE,EAAE,KAAK,eAAe,MAAM,qBAAqB,MAAM,mBAAgB;AAAA,IACvE,EAAE,KAAK,eAAe,MAAM,oBAAoB,MAAM,mBAAgB;AAAA,IACtE,EAAE,KAAK,eAAe,MAAM,0BAA0B,MAAM,mBAAgB;AAAA,EAChF;AACJ,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/model",
-    "version": "0.16.0-alpha.0-20251102-faee7ab25",
+    "version": "0.16.0-alpha.0-20251104-8c3166ea3",
     "description": "Matter data model",
     "keywords": [
         "iot",
@@ -31,11 +31,11 @@
         "embed-examples": "embedme **/README.md"
     },
     "dependencies": {
-        "@matter/general": "0.16.0-alpha.0-20251102-faee7ab25"
+        "@matter/general": "0.16.0-alpha.0-20251104-8c3166ea3"
     },
     "devDependencies": {
-        "@matter/testing": "0.16.0-alpha.0-20251102-faee7ab25",
-        "@matter/tools": "0.16.0-alpha.0-20251102-faee7ab25"
+        "@matter/testing": "0.16.0-alpha.0-20251104-8c3166ea3",
+        "@matter/tools": "0.16.0-alpha.0-20251104-8c3166ea3"
     },
     "files": [
         "dist/**/*",

package/src/aspects/Conformance.ts

@@ -67,10 +67,10 @@ export class Conformance extends Aspect<Conformance.Definition> {
         return Conformance.validateReferences(this, this.ast, errorTarget, lookup);
     }
 
-    validateComputation(errorTarget: Conformance.ErrorTarget, featuresAvailable?: FeatureSet) {
+    validateComputation(errorTarget: Conformance.ErrorTarget, features?: FeatureSet) {
         try {
             // This validation only confirms we can perform computation; we ignore the result
-            this.applicabilityOf(featuresAvailable ?? new Set(), new Set());
+            this.applicabilityFor({ definedFeatures: features ?? new Set(), supportedFeatures: new Set() });
         } catch (e) {
             errorTarget.error("CANNOT_COMPUTE_CONFORMANCE", `Error computing conformance: ${asError(e).message}`);
         }
@@ -106,11 +106,8 @@ export class Conformance extends Aspect<Conformance.Definition> {
      * This is useful for filtering elements at compile time.  For complete accuracy you then need to filter at runtime
      * once field values are known.
      */
-    applicabilityOf(features: Iterable<string>, supportedFeatures: Iterable<string>) {
-        const fset = features instanceof Set ? (features as Set<string>) : new Set(features);
-        const sfset =
-            supportedFeatures instanceof Set ? (supportedFeatures as Set<string>) : new Set(supportedFeatures);
-        return computeApplicability(fset, sfset, this);
+    applicabilityFor({ definedFeatures: features, supportedFeatures }: Conformance.FeatureContext) {
+        return computeApplicability(features, supportedFeatures, this);
     }
 
     override toString() {
@@ -124,6 +121,11 @@ export class Conformance extends Aspect<Conformance.Definition> {
 }
 
 export namespace Conformance {
+    export interface FeatureContext {
+        definedFeatures: Set<string>;
+        supportedFeatures: Set<string>;
+    }
+
     export enum Applicability {
         None = 0,
         Optional = 1,

package/src/elements/RequirementElement.ts

@@ -51,5 +51,6 @@ export namespace RequirementElement {
         Command = "command",
         Event = "event",
         CommandField = "commandField",
+        DeviceType = "deviceType",
     }
 }

package/src/logic/ClusterModifier.ts

@@ -73,14 +73,14 @@ export namespace ClusterModifier {
      */
     export function applyPresence(target: ClusterModel, modifications: ClusterModifier.PresenceModifications) {
         return apply(target, modifications, (element, isSupported) => {
-            if (element.isSupported === isSupported) {
+            if (element.effectiveIsSupported === isSupported) {
                 return;
             }
 
             if (element.isFinal) {
                 element = element.clone();
             }
-            element.isSupported = isSupported;
+            element.operationalIsSupported = isSupported;
 
             return element;
         });
@@ -116,7 +116,7 @@ export namespace ClusterModifier {
 
                 const replacement = apply(member, mod as T);
                 if (replacement === member || replacement === undefined) {
-                    return;
+                    continue;
                 }
 
                 if (model === undefined) {

package/src/logic/Scope.ts

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Conformance } from "#aspects/Conformance.js";
 import { ElementTag } from "#common/ElementTag.js";
 import { SchemaImplementationError } from "#common/errors.js";
-import { FeatureSet } from "#common/FeatureSet.js";
 import { ImplementationError } from "#general";
+import { ModelIndex, MutableModelIndex } from "./ModelIndex.js";
 import { ModelTraversal } from "./ModelTraversal.js";
 
 // These must be types to avoid circular references
 import type { ClusterModel, Model, ScopeModel, ValueModel } from "#models/index.js";
-import { ModelIndex, MutableModelIndex } from "./ModelIndex.js";
 
 const DEFAULT_TAGS = new Set([ElementTag.Field, ElementTag.Attribute]);
 const GLOBAL_IDS = new Set([0xfffd, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8]);
@@ -37,7 +37,7 @@ const cache = new WeakMap<Model, Scope>();
  *
  * TODO - currently we only consider shadows at scope root but shadows of nested children is possible with this approach
  */
-export interface Scope {
+export interface Scope extends Conformance.FeatureContext {
     /**
      * The model analyzed.
      */
@@ -63,6 +63,14 @@ export interface Scope {
      * Identify members (child properties) of the designated model in this scope.
      */
     membersOf<T extends Model>(parent: T, options?: Scope.MemberOptions): ModelIndex<Model.ChildOf<T>>;
+
+    /**
+     * Test whether an element is supported in this scope.
+     *
+     * We define "supported" as an element that is mandatory given active features or has
+     * {@link Model#operationalIsSupported} set.
+     */
+    hasOperationalSupport(model: Model): boolean;
 }
 
 /**
@@ -91,13 +99,10 @@ export function Scope(subject: Model, options: Scope.ScopeOptions = {}) {
     let deconflictedMemberCache: Map<Model, Map<ElementTag, Set<Model>>> | undefined;
     let conformantMemberCache: Map<Model, Map<ElementTag, Set<Model>>> | undefined;
 
-    let { featureNames, supportedFeatures } = owner as ClusterModel;
-    if (!featureNames) {
-        featureNames = new FeatureSet();
-    }
-    if (!supportedFeatures) {
-        supportedFeatures = new FeatureSet();
-    }
+    const features: Conformance.FeatureContext = {
+        definedFeatures: (owner as ClusterModel).definedFeatures ?? new Set(),
+        supportedFeatures: (owner as ClusterModel).supportedFeatures ?? new Set(),
+    };
 
     if (useCache && !options.disableCache) {
         const cached = cache.get(owner);
@@ -135,8 +140,9 @@ export function Scope(subject: Model, options: Scope.ScopeOptions = {}) {
         }
     });
 
-    const result: Scope = {
+    const scope: Scope = {
         owner,
+        ...features,
         isShadow: shadows ? model => shadows!.has(model as ValueModel) : () => false,
         extensionOf: shadows
             ? <T extends Model>(model?: T) => shadows!.get(model as unknown as ValueModel)?.[0] as T | undefined
@@ -146,6 +152,7 @@ export function Scope(subject: Model, options: Scope.ScopeOptions = {}) {
                   (shadows!.get(model as unknown as ValueModel)?.[0] as T | undefined) ?? model
             : <T extends Model>(model: T) => model,
         membersOf,
+        hasOperationalSupport,
     };
 
     function membersOf<T extends Model>(parent: T, options: Scope.MemberOptions = {}) {
@@ -154,7 +161,7 @@ export function Scope(subject: Model, options: Scope.ScopeOptions = {}) {
         if (Array.isArray(tags)) {
             tags = new Set(tags);
         }
-        const allMembers = findAllMembers(parent, tags, result);
+        const allMembers = findAllMembers(parent, tags, scope);
 
         if (parent.tag === ElementTag.Cluster && tags.has(ElementTag.Attribute)) {
             injectGlobalAttributes(
@@ -177,18 +184,30 @@ export function Scope(subject: Model, options: Scope.ScopeOptions = {}) {
             parent,
             tags,
             allMembers,
-            featureNames,
-            supportedFeatures,
+            features,
             conformantOnly,
             conformantOnly ? deconflictedMemberCache : conformantMemberCache,
         );
     }
 
+    function hasOperationalSupport(model: Model) {
+        model = scope.modelFor(model);
+
+        const operational = model.effectiveIsSupported;
+        if (operational !== undefined) {
+            return operational;
+        }
+
+        const conformance = (model as { effectiveConformance?: Conformance }).effectiveConformance;
+
+        return conformance?.applicabilityFor(scope) === Conformance.Applicability.Mandatory;
+    }
+
     if (useCache) {
-        cache.set(owner, result);
+        cache.set(owner, scope);
     }
 
-    return result;
+    return scope;
 }
 
 export namespace Scope {
@@ -350,8 +369,7 @@ function filterWithConformance<T extends Model>(
     parent: T,
     tags: Set<ElementTag>,
     members: Model[],
-    features: FeatureSet,
-    supportedFeatures: FeatureSet,
+    features: Conformance.FeatureContext,
     conformantOnly: boolean,
     cache?: Map<Model, Map<ElementTag, Set<Model>>>,
 ) {
@@ -388,13 +406,13 @@ function filterWithConformance<T extends Model>(
             );
         }
 
-        if (conformantOnly && !conformance.applicabilityOf(features, supportedFeatures)) {
+        if (conformantOnly && !conformance.applicabilityFor(features)) {
             continue;
         }
 
         const other = selectedMembers[tag][member.name];
         if (other !== undefined) {
-            if (!conformantOnly && !conformance.applicabilityOf(features, supportedFeatures)) {
+            if (!conformantOnly && !conformance.applicabilityFor(features)) {
                 continue;
             }
 
@@ -405,7 +423,7 @@ function filterWithConformance<T extends Model>(
                 );
             }
 
-            if (otherConformance.applicabilityOf(features, supportedFeatures)) {
+            if (otherConformance.applicabilityFor(features)) {
                 throw new SchemaImplementationError(
                     parent,
                     `There are multiple definitions of "${member.name}" that cannot be differentiated by conformance`,

package/src/logic/definition-validation/RequirementValidator.ts

@@ -25,10 +25,15 @@ ModelValidator.validators[RequirementElement.Tag] = class RequirementValidator e
             switch (this.model.element) {
                 case RequirementElement.ElementType.ClientCluster:
                 case RequirementElement.ElementType.ServerCluster:
-                    if (parentTag !== ElementTag.DeviceType) {
+                    if (
+                        parentTag !== ElementTag.DeviceType &&
+                        (parentTag !== ElementTag.Requirement ||
+                            (this.model.parent as RequirementModel).element !==
+                                RequirementElement.ElementType.DeviceType)
+                    ) {
                         this.error(
                             "ILLEGAL_REQUIREMENT_PARENT",
-                            `Requirement type ${this.model.type} must be parented by device type`,
+                            `Requirement type ${this.model.type} must be parented by device type or device requirement`,
                         );
                     }
                     break;

package/src/logic/definition-validation/ValueValidator.ts

@@ -43,7 +43,7 @@ export class ValueValidator<T extends ValueModel> extends ModelValidator<T> {
                 }
             }
         });
-        this.model.conformance.validateComputation(this, this.model.owner(ClusterModel)?.featureNames);
+        this.model.conformance.validateComputation(this, this.model.owner(ClusterModel)?.definedFeatures);
 
         this.#validateAspect("constraint");
         this.#validateAspect("access");

package/src/models/ClusterModel.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Conformance } from "#aspects/Conformance.js";
 import { camelize, describeList } from "#general";
 import { ModelIndex } from "#logic/ModelIndex.js";
 import { ModelTraversal } from "#logic/ModelTraversal.js";
@@ -21,7 +22,10 @@ import type { FieldModel } from "./FieldModel.js";
 import { Model } from "./Model.js";
 import { ScopeModel } from "./ScopeModel.js";
 
-export class ClusterModel extends ScopeModel<ClusterElement, ClusterModel.Child> implements ClusterElement {
+export class ClusterModel
+    extends ScopeModel<ClusterElement, ClusterModel.Child>
+    implements ClusterElement, Conformance.FeatureContext
+{
     override tag: ClusterElement.Tag = ClusterElement.Tag;
 
     #quality: Quality;
@@ -106,7 +110,7 @@ export class ClusterModel extends ScopeModel<ClusterElement, ClusterModel.Child>
         return (this.member(FeatureMap.id, [ElementTag.Attribute]) as AttributeModel) ?? new AttributeModel(FeatureMap);
     }
 
-    get featureNames(): FeatureSet {
+    get definedFeatures(): FeatureSet {
         return new FeatureSet(this.features.map(feature => feature.name));
     }
 

package/src/models/Model.ts

@@ -54,7 +54,7 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
      *
      * This is an operational implementation hint and does not override conformance.
      */
-    isSupported?: boolean;
+    operationalIsSupported?: boolean;
 
     #id: E["id"];
     #name: string;
@@ -329,6 +329,17 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
         return [this.tag];
     }
 
+    /**
+     * Obtain the "is supported" flag from inheritance.
+     */
+    get effectiveIsSupported(): boolean | undefined {
+        if (this.operationalIsSupported !== undefined) {
+            return this.operationalIsSupported;
+        }
+
+        return this.base?.effectiveIsSupported;
+    }
+
     /**
      * Update a subset of fields.
      *
@@ -532,16 +543,15 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
      */
     extend<This extends Model>(
         this: This,
-        properties?: Partial<BaseElement.Properties<E>>,
+        properties?: Partial<Model.Definition<This>>,
         ...children: Model.ChildDefinition<Model>[]
     ): This {
         const constructor = this.constructor as new (properties: unknown) => This;
-
         const definition = {
             id: this.id,
             name: this.name,
 
-            ...properties,
+            ...properties!, // This assertion may be a lie, but necessary due to apparent TS bug
 
             tag: this.tag,
             operationalBase: this,
@@ -573,7 +583,7 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
         this.isSeed = definition.isSeed;
         this.operationalBase = definition.operationalBase;
         this.operationalShadow = definition.operationalShadow;
-        this.isSupported = definition.isSupported;
+        this.operationalIsSupported = definition.operationalIsSupported;
 
         if (isClone) {
             if (definition.hasLocalResource) {
@@ -762,7 +772,7 @@ export namespace Model {
               parent?: Model;
               operationalBase?: Model;
               operationalShadow?: Model;
-              isSupported?: boolean;
+              operationalIsSupported?: boolean;
           })
         | T;
 

package/src/models/Schema.ts

@@ -54,10 +54,20 @@ export function Schema(source: Model.Source) {
         throw new ImplementationError(`Model ${model.name} tag ${model.tag} is not legal for schema`);
     }
 
-    return model as Schema;
+    return model as Schema.Struct;
 }
 
 export namespace Schema {
+    /**
+     * Schema that defines an object with named properties.
+     */
+    export type Struct = ClusterModel | DatatypeModel;
+
+    /**
+     * Schema that defines a cluster.
+     */
+    export type Cluster = ClusterModel;
+
     /**
      * Obtain {@link Schema} that is required for operation.
      */
@@ -74,4 +84,6 @@ export namespace Schema {
     export type Source = Schema | NewableFunction;
 
     export const empty = new DatatypeModel({ name: "Empty", type: "struct" });
+
+    empty.finalize();
 }

package/src/standard/elements/air-purifier.element.ts

@@ -20,7 +20,11 @@ export const AirPurifierDt = DeviceType(
     Requirement({ name: "OnOff", id: 0x6, conformance: "O", element: "serverCluster" }),
     Requirement({ name: "FanControl", id: 0x202, conformance: "M", element: "serverCluster" }),
     Requirement({ name: "HepaFilterMonitoring", id: 0x71, conformance: "O", element: "serverCluster" }),
-    Requirement({ name: "ActivatedCarbonFilterMonitoring", id: 0x72, conformance: "O", element: "serverCluster" })
+    Requirement({ name: "ActivatedCarbonFilterMonitoring", id: 0x72, conformance: "O", element: "serverCluster" }),
+    Requirement({ name: "Thermostat", id: 0x301, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "HumiditySensor", id: 0x307, conformance: "O", element: "deviceType" }),
+    Requirement({ name: "AirQualitySensor", id: 0x2c, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(AirPurifierDt);

package/src/standard/elements/battery-storage.element.ts

@@ -15,7 +15,64 @@ export const BatteryStorageDt = DeviceType(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
         Requirement({ name: "DeviceTypeList", default: [ { deviceType: 24, 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: "Battery", conformance: "M", element: "feature" }),
+            Requirement({ name: "BatVoltage", conformance: "M", element: "attribute" }),
+            Requirement({ name: "BatPercentRemaining", conformance: "M", element: "attribute" }),
+            Requirement({ name: "BatTimeRemaining", conformance: "M", element: "attribute" }),
+            Requirement({ name: "ActiveBatFaults", conformance: "M", element: "attribute" }),
+            Requirement({ name: "BatCapacity", conformance: "M", element: "attribute" }),
+            Requirement({ name: "BatTimeToFullCharge", conformance: "M", element: "attribute" }),
+            Requirement({ name: "BatChargingCurrent", conformance: "M", element: "attribute" }),
+            Requirement({ name: "ActiveBatChargeFaults", conformance: "M", element: "attribute" })
+        ),
+
+        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: "ElectricalEnergyMeasurement", id: 0x91, element: "serverCluster" },
+            Requirement({ name: "ExportedEnergy", conformance: "M", element: "feature" })
+        )
+    ),
+
+    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: "TemperatureSensor", id: 0x302, conformance: "O", element: "deviceType" },
+        Requirement(
+            { name: "Descriptor", id: 0x1d, element: "serverCluster" },
+            Requirement({ name: "TagList", conformance: "M", element: "feature" })
+        )
+    ),
+
+    Requirement({ name: "SolarPower", id: 0x17, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(BatteryStorageDt);

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

@@ -26,6 +26,7 @@ export const BridgedNodeDt = DeviceType(
         { name: "EcosystemInformation", id: 0x750, conformance: "FabricSynchronizedNode, O", element: "serverCluster" }
     ),
     Requirement({ name: "AdministratorCommissioning", id: 0x3c, conformance: "FabricSynchronizedNode", element: "serverCluster" }),
+    Requirement({ name: "PowerSource", id: 0x11, conformance: "O", element: "deviceType" }),
     Field({ name: "conditions", type: "enum8" }, Field({ name: "FabricSynchronizedNode" }))
 );
 

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

@@ -19,7 +19,8 @@ export const CooktopDt = DeviceType(
     Requirement(
         { name: "OnOff", id: 0x6, conformance: "M", element: "serverCluster" },
         Requirement({ name: "OFFONLY", conformance: "M", element: "feature" })
-    )
+    ),
+    Requirement({ name: "CookSurface", id: 0x77, conformance: "O", element: "deviceType" })
 );
 
 MatterDefinition.children.push(CooktopDt);

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);