@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251027-17770fb28

package/src/logic/DecodedBitmap.ts

@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ElementTag } from "#common/ElementTag.js";
+import type { FieldModel } from "#models/FieldModel.js";
+import { Model } from "#models/index.js";
+import type { ValueModel } from "#models/ValueModel.js";
+import { FeatureMap } from "#standard/elements/feature-map.element.js";
+import { camelize } from "@matter/general";
+
+export type DecodedBitmap = Record<string, boolean | number>;
+
+/**
+ * Decode a bitmap value into an object.
+ */
+export function DecodedBitmap(model: ValueModel, value: number | bigint | DecodedBitmap): DecodedBitmap {
+    if (typeof value === "object") {
+        return value;
+    }
+
+    const fields = new Map<ValueModel, number | boolean>();
+
+    // Value is 0, so no bit set
+    if (value === 0) {
+        return {};
+    }
+
+    // Test each bit.  If set, install appropriate value into object
+    for (let bit = 0; Math.pow(2, bit) <= value; bit++) {
+        if (typeof value === "bigint") {
+            if (!(value & (1n << BigInt(bit)))) {
+                continue;
+            }
+        } else if (!(value & (1 << bit))) {
+            continue;
+        }
+
+        const definition = model.bitDefinition(bit);
+        if (!definition) {
+            continue;
+        }
+
+        const constraint = definition.effectiveConstraint;
+        if (constraint.value !== undefined) {
+            // Bit flag
+            fields.set(definition, true);
+        } else if (constraint.min !== undefined) {
+            // Bit range
+            const fieldBit = 1 << (bit - (constraint.min as number));
+            fields.set(definition, ((fields.get(definition) as number) ?? 0) | fieldBit);
+        }
+    }
+
+    let nameGenerator;
+    if (Model.types[ElementTag.Attribute] && model.id === FeatureMap.id) {
+        // Special case for feature map; use the long name as the key rather than the name
+        nameGenerator = (model: ValueModel) =>
+            (model as FieldModel).title === undefined ? camelize(model.name) : camelize((model as FieldModel).title!);
+    } else {
+        nameGenerator = (model: ValueModel) => camelize(model.name);
+    }
+
+    return Object.fromEntries([...fields.entries()].map(([k, v]) => [nameGenerator(k), v]));
+}

package/src/logic/DefaultValue.ts

@@ -4,12 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FieldModel } from "#models/FieldModel.js";
-import { FeatureMap } from "#standard/elements/definitions.js";
 import { Bytes, camelize, Duration, NotImplementedError } from "@matter/general";
-import { ElementTag, FieldValue, Metatype } from "../common/index.js";
-import { Model } from "../models/Model.js";
+import { FieldValue, Metatype } from "../common/index.js";
 import type { ValueModel } from "../models/ValueModel.js";
+import { DecodedBitmap } from "./DecodedBitmap.js";
 import { Scope } from "./Scope.js";
 
 /**
@@ -26,7 +24,7 @@ import { Scope } from "./Scope.js";
 export function DefaultValue(scope: Scope, model: ValueModel, ifValid = false): any {
     const value = castValue(model, model.default);
     if (value === undefined) {
-        return buildValue(scope, model, ifValid);
+        return createValue(scope, model, ifValid);
     }
     return value;
 }
@@ -71,7 +69,7 @@ function castValue(model: ValueModel, modelDefault?: FieldValue): unknown {
             // bit fields (composed above)
             if (typeof modelDefault === "number" || typeof modelDefault === "bigint") {
                 // Default value is a number
-                return decodeBitmap(model, modelDefault);
+                return DecodedBitmap(model, modelDefault);
             }
 
             // Default value may be an object
@@ -123,9 +121,9 @@ function castValue(model: ValueModel, modelDefault?: FieldValue): unknown {
 }
 
 /**
- * When an explicit default value is not present, for some types we generate a default from the structure.
+ * When an explicit default value is not present, for some types we generate a default.
  */
-function buildValue(scope: Scope, model: ValueModel, ifValid: boolean) {
+function createValue(scope: Scope, model: ValueModel, ifValid: boolean) {
     switch (model.effectiveMetatype) {
         case Metatype.array:
             // We don't really build default array values except in the case of non-nullable arrays where zero items is
@@ -221,48 +219,3 @@ function buildBitmap(scope: Scope, model: ValueModel) {
 
     return result;
 }
-
-function decodeBitmap(model: ValueModel, value: number | bigint) {
-    const fields = new Map<ValueModel, number | boolean>();
-
-    // Value is 0, so no bit set
-    if (value === 0) {
-        return {};
-    }
-    // Test each bit.  If set, install appropriate value into object
-    for (let bit = 0; Math.pow(2, bit) <= value; bit++) {
-        if (typeof value === "bigint") {
-            if (!(value & (1n << BigInt(bit)))) {
-                continue;
-            }
-        } else if (!(value & (1 << bit))) {
-            continue;
-        }
-
-        const definition = model.bitDefinition(bit);
-        if (!definition) {
-            continue;
-        }
-
-        const constraint = definition.effectiveConstraint;
-        if (constraint.value !== undefined) {
-            // Bit flag
-            fields.set(definition, true);
-        } else if (constraint.min !== undefined) {
-            // Bit range
-            const fieldBit = 1 << (bit - (constraint.min as number));
-            fields.set(definition, ((fields.get(definition) as number) ?? 0) | fieldBit);
-        }
-    }
-
-    let nameGenerator;
-    if (Model.types[ElementTag.Attribute] && model.id === FeatureMap.id) {
-        // Special case for feature map; use the long name as the key rather than the name
-        nameGenerator = (model: ValueModel) =>
-            (model as FieldModel).title === undefined ? camelize(model.name) : camelize((model as FieldModel).title!);
-    } else {
-        nameGenerator = (model: ValueModel) => camelize(model.name);
-    }
-
-    return Object.fromEntries([...fields.entries()].map(([k, v]) => [nameGenerator(k), v]));
-}

package/src/logic/Scope.ts

@@ -218,8 +218,8 @@ export namespace Scope {
     export const IgnoreConformance = "ignore";
 
     /**
-     * Use conformance to resolve conflicts but otherwise return all members.  Useful to detect errors in input
-     * that may contain non-conformant values.
+     * Use conformance to resolve conflicts but otherwise return all members.  Useful to detect errors in input that may
+     * contain non-conformant values.
      */
     export const DeconflictedConformance = "deconflicted";
 

package/src/logic/cluster-variance/IllegalFeatureCombinations.ts

@@ -89,7 +89,7 @@ function addFeatureNode(
             add({ [feature.name]: true });
             break;
 
-        case Conformance.Special.Group:
+        case Conformance.Special.Otherwise:
             const rules = node.param;
 
             // Temporary storage for exclusions used in algorithm below

package/src/logic/cluster-variance/InferredComponents.ts

@@ -177,6 +177,14 @@ const VarianceMatchers: VarianceMatcher[] = [
         },
     },
 
+    // [Field<| Field>*] or [Field<, Field>*] (optional, unconditional.  Ignores field references)
+    {
+        pattern: pattern("[", DISJUNCT_FIELDS, "]"),
+        processor(add) {
+            add(true);
+        },
+    },
+
     // FOO, [BAR]
     {
         pattern: pattern(FEATURE, ", ", "[", FEATURE, "]"),

package/src/logic/cluster-variance/index.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from "./FeatureBitmap.js";
+export * from "./IllegalFeatureCombinations.js";
+export * from "./InferredComponents.js";
+export * from "./NamedComponents.js";
+export * from "./VarianceCondition.js";

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

@@ -13,13 +13,12 @@ export namespace ValidationExceptions {
     export const AllowedEmptyEnums = new Set<string>([
         // Global types defined as enum but without specific fields
         "tag",
-        "namespace",
 
         // Extensions of ModeBase may define mode tags but the base cluster does not
         "ModeBase.ModeTagStruct.value",
 
-        // It's unclear where these enum values come from or if there even a standard definition for them
-        "ModeSelect.state.standardNamespace",
+        // This is the tag ID and is namespaced so we can't represent with a single enum
+        "ModeSelect.SemanticTagStruct.value",
 
         // This is one of multiple *EffectVariant fields (depending on the EffectIdentifier field).  We could override
         // with a union type but then validation wouldn't be entirely accurate anyway, so we just leave as a bare uint16

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

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

package/src/logic/index.ts

@@ -4,12 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from "./cluster-variance/FeatureBitmap.js";
-export * from "./cluster-variance/IllegalFeatureCombinations.js";
-export * from "./cluster-variance/InferredComponents.js";
-export * from "./cluster-variance/NamedComponents.js";
-export * from "./cluster-variance/VarianceCondition.js";
+export * from "./cluster-variance/index.js";
+export * from "./ClusterModifier.js";
 export * from "./ClusterVariance.js";
+export * from "./DecodedBitmap.js";
 export * from "./DefaultValue.js";
 export * from "./MergedModel.js";
 export * from "./ModelDiff.js";

package/src/models/Model.ts

@@ -29,11 +29,6 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
     type?: string;
     isSeed?: boolean;
 
-    #id: E["id"];
-    #name: string;
-    #isFinal?: boolean;
-    #resource?: Resource;
-
     /**
      * Indicates that an element defines a datatype.
      */
@@ -54,6 +49,17 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
      */
     operationalShadow?: Model | null;
 
+    /**
+     * Indicates whether the corresponding element is supported by an implementation.
+     *
+     * This is an operational implementation hint and does not override conformance.
+     */
+    isSupported?: boolean;
+
+    #id: E["id"];
+    #name: string;
+    #isFinal?: boolean;
+    #resource?: Resource;
     #children?: InternalChildren<C>;
     #parent?: Model;
     #root?: MatterModel;
@@ -255,7 +261,7 @@ export abstract class Model<E extends BaseElement = BaseElement, C extends Model
     /**
      * Factory support.
      */
-    static types = {} as { [type: string]: Model.ConcreteType };
+    static types: Record<string, Model.ConcreteType> = {};
 
     /**
      * Add a new model implementation.
@@ -567,6 +573,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;
 
         if (isClone) {
             if (definition.hasLocalResource) {
@@ -755,6 +762,7 @@ export namespace Model {
               parent?: Model;
               operationalBase?: Model;
               operationalShadow?: Model;
+              isSupported?: boolean;
           })
         | T;
 

package/src/parser/Lexer.ts

@@ -200,6 +200,7 @@ function* lex(
                         next();
                         next();
                         yield tokenizeDigits(2, binaryValueOf);
+                        break;
                     }
                 }
 

package/src/standard/elements/access-control.element.ts

@@ -125,7 +125,7 @@ export const AccessControl = Cluster(
     Datatype(
         { name: "AccessControlEntryPrivilegeEnum", type: "enum8" },
         Field({ name: "View", id: 0x1, conformance: "M" }),
-        Field({ name: "ProxyView", id: 0x2, conformance: "P, M" }),
+        Field({ name: "ProxyView", id: 0x2, conformance: "D" }),
         Field({ name: "Operate", id: 0x3, conformance: "M" }),
         Field({ name: "Manage", id: 0x4, conformance: "M" }),
         Field({ name: "Administer", id: 0x5, conformance: "M" })

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

@@ -26,10 +26,7 @@ export const AirQuality = Cluster(
         Field({ name: "XPOOR", conformance: "O", constraint: "3", title: "ExtremelyPoor" })
     ),
 
-    Attribute({
-        name: "AirQuality", id: 0x0, type: "AirQualityEnum", access: "R V", conformance: "M",
-        constraint: "desc", default: 0
-    }),
+    Attribute({ name: "AirQuality", id: 0x0, type: "AirQualityEnum", access: "R V", conformance: "M", constraint: "desc" }),
 
     Datatype(
         { name: "AirQualityEnum", type: "enum8" },

package/src/standard/elements/alarm-base.element.ts

@@ -18,31 +18,27 @@ import {
 
 export const AlarmBase = Cluster(
     { name: "AlarmBase" },
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 1 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 2 }),
     Attribute(
         { name: "FeatureMap", id: 0xfffc, type: "FeatureMap" },
         Field({ name: "RESET", constraint: "0", title: "Reset" })
     ),
-    Attribute({ name: "Mask", id: 0x0, type: "AlarmBitmap", access: "R V", conformance: "M", default: 0 }),
-    Attribute(
-        { name: "Latch", id: 0x1, type: "AlarmBitmap", access: "R V", conformance: "RESET", default: 0, quality: "F" }
-    ),
-    Attribute({ name: "State", id: 0x2, type: "AlarmBitmap", access: "R V", conformance: "M", default: 0 }),
-    Attribute(
-        { name: "Supported", id: 0x3, type: "AlarmBitmap", access: "R V", conformance: "M", default: 0, quality: "F" }
-    ),
+    Attribute({ name: "Mask", id: 0x0, type: "AlarmBitmap", access: "R V", conformance: "M" }),
+    Attribute({ name: "Latch", id: 0x1, type: "AlarmBitmap", access: "R V", conformance: "RESET", quality: "F" }),
+    Attribute({ name: "State", id: 0x2, type: "AlarmBitmap", access: "R V", conformance: "M" }),
+    Attribute({ name: "Supported", id: 0x3, type: "AlarmBitmap", access: "R V", conformance: "M", quality: "F" }),
 
     Event(
         { name: "Notify", id: 0x0, access: "V", conformance: "M", priority: "info" },
-        Field({ name: "Active", id: 0x0, type: "AlarmBitmap", conformance: "M", default: 0 }),
-        Field({ name: "Inactive", id: 0x1, type: "AlarmBitmap", conformance: "M", default: 0 }),
-        Field({ name: "State", id: 0x2, type: "AlarmBitmap", conformance: "M", default: 0 }),
-        Field({ name: "Mask", id: 0x3, type: "AlarmBitmap", conformance: "M", default: 0 })
+        Field({ name: "Active", id: 0x0, type: "AlarmBitmap", conformance: "M" }),
+        Field({ name: "Inactive", id: 0x1, type: "AlarmBitmap", conformance: "M" }),
+        Field({ name: "State", id: 0x2, type: "AlarmBitmap", conformance: "M" }),
+        Field({ name: "Mask", id: 0x3, type: "AlarmBitmap", conformance: "M" })
     ),
 
     Command(
         { name: "Reset", id: 0x0, access: "O", conformance: "RESET", direction: "request", response: "status" },
-        Field({ name: "Alarms", id: 0x0, type: "AlarmBitmap", conformance: "M", default: 0 })
+        Field({ name: "Alarms", id: 0x0, type: "AlarmBitmap", conformance: "M" })
     ),
 
     Command(
@@ -50,7 +46,7 @@ export const AlarmBase = Cluster(
             name: "ModifyEnabledAlarms", id: 0x1, access: "O", conformance: "O", direction: "request",
             response: "status"
         },
-        Field({ name: "Mask", id: 0x0, type: "AlarmBitmap", conformance: "M", default: 0 })
+        Field({ name: "Mask", id: 0x0, type: "AlarmBitmap", conformance: "M" })
     ),
 
     Datatype({ name: "AlarmBitmap", type: "map32" })

package/src/standard/elements/area-namespace.element.ts

@@ -16,97 +16,100 @@ export const AreaNamespaceNs = SemanticNamespace(
     { name: "AreaNamespace", id: 0x10 },
     SemanticTag({ name: "Aisle", id: 0x0 }),
     SemanticTag({ name: "Attic", id: 0x1 }),
-    SemanticTag({ name: "Back Door", id: 0x2 }),
-    SemanticTag({ name: "Back Yard", id: 0x3 }),
+    SemanticTag({ name: "BackDoor", id: 0x2 }),
+    SemanticTag({ name: "BackYard", id: 0x3 }),
     SemanticTag({ name: "Balcony", id: 0x4 }),
     SemanticTag({ name: "Ballroom", id: 0x5 }),
     SemanticTag({ name: "Bathroom", id: 0x6 }),
     SemanticTag({ name: "Bedroom", id: 0x7 }),
     SemanticTag({ name: "Border", id: 0x8 }),
     SemanticTag({ name: "Boxroom", id: 0x9 }),
-    SemanticTag({ name: "Breakfast Room", id: 0xa }),
+    SemanticTag({ name: "BreakfastRoom", id: 0xa }),
     SemanticTag({ name: "Carport", id: 0xb }),
     SemanticTag({ name: "Cellar", id: 0xc }),
     SemanticTag({ name: "Cloakroom", id: 0xd }),
     SemanticTag({ name: "Closet", id: 0xe }),
     SemanticTag({ name: "Conservatory", id: 0xf }),
     SemanticTag({ name: "Corridor", id: 0x10 }),
-    SemanticTag({ name: "Craft Room", id: 0x11 }),
+    SemanticTag({ name: "CraftRoom", id: 0x11 }),
     SemanticTag({ name: "Cupboard", id: 0x12 }),
     SemanticTag({ name: "Deck", id: 0x13 }),
     SemanticTag({ name: "Den", id: 0x14 }),
     SemanticTag({ name: "Dining", id: 0x15 }),
-    SemanticTag({ name: "Drawing Room", id: 0x16 }),
-    SemanticTag({ name: "Dressing Room", id: 0x17 }),
+    SemanticTag({ name: "DrawingRoom", id: 0x16 }),
+    SemanticTag({ name: "DressingRoom", id: 0x17 }),
     SemanticTag({ name: "Driveway", id: 0x18 }),
     SemanticTag({ name: "Elevator", id: 0x19 }),
     SemanticTag({ name: "Ensuite", id: 0x1a }),
     SemanticTag({ name: "Entrance", id: 0x1b }),
     SemanticTag({ name: "Entryway", id: 0x1c }),
-    SemanticTag({ name: "Family Room", id: 0x1d }),
+    SemanticTag({ name: "FamilyRoom", id: 0x1d }),
     SemanticTag({ name: "Foyer", id: 0x1e }),
-    SemanticTag({ name: "Front Door", id: 0x1f }),
-    SemanticTag({ name: "Front Yard", id: 0x20 }),
-    SemanticTag({ name: "Game Room", id: 0x21 }),
+    SemanticTag({ name: "FrontDoor", id: 0x1f }),
+    SemanticTag({ name: "FrontYard", id: 0x20 }),
+    SemanticTag({ name: "GameRoom", id: 0x21 }),
     SemanticTag({ name: "Garage", id: 0x22 }),
-    SemanticTag({ name: "Garage Door", id: 0x23 }),
+    SemanticTag({ name: "GarageDoor", id: 0x23 }),
     SemanticTag({ name: "Garden", id: 0x24 }),
-    SemanticTag({ name: "Garden Door", id: 0x25 }),
-    SemanticTag({ name: "Guest Bathroom", id: 0x26 }),
-    SemanticTag({ name: "Guest Bedroom", id: 0x27 }),
-    SemanticTag({ name: "Guest Room", id: 0x28 }),
-    SemanticTag({ name: "Gym", id: 0x29 }),
-    SemanticTag({ name: "Hallway", id: 0x2a }),
-    SemanticTag({ name: "Hearth Room", id: 0x2b }),
-    SemanticTag({ name: "Kids Room", id: 0x2c }),
-    SemanticTag({ name: "Kids Bedroom", id: 0x2d }),
-    SemanticTag({ name: "Kitchen", id: 0x2e }),
-    SemanticTag({ name: "Laundry Room", id: 0x2f }),
-    SemanticTag({ name: "Lawn", id: 0x30 }),
-    SemanticTag({ name: "Library", id: 0x31 }),
-    SemanticTag({ name: "Living Room", id: 0x32 }),
-    SemanticTag({ name: "Lounge", id: 0x33 }),
-    SemanticTag({ name: "Media/TV Room", id: 0x34 }),
-    SemanticTag({ name: "Mud Room", id: 0x35 }),
-    SemanticTag({ name: "Music Room", id: 0x36 }),
-    SemanticTag({ name: "Nursery", id: 0x37 }),
-    SemanticTag({ name: "Office", id: 0x38 }),
-    SemanticTag({ name: "Outdoor Kitchen", id: 0x39 }),
-    SemanticTag({ name: "Outside", id: 0x3a }),
-    SemanticTag({ name: "Pantry", id: 0x3b }),
-    SemanticTag({ name: "Parking Lot", id: 0x3c }),
-    SemanticTag({ name: "Parlor", id: 0x3d }),
-    SemanticTag({ name: "Patio", id: 0x3e }),
-    SemanticTag({ name: "Play Room", id: 0x3f }),
-    SemanticTag({ name: "Pool Room", id: 0x40 }),
-    SemanticTag({ name: "Porch", id: 0x41 }),
-    SemanticTag({ name: "Primary Bathroom", id: 0x42 }),
-    SemanticTag({ name: "Primary Bedroom", id: 0x43 }),
-    SemanticTag({ name: "Ramp", id: 0x44 }),
-    SemanticTag({ name: "Reception Room", id: 0x45 }),
-    SemanticTag({ name: "Recreation Room", id: 0x46 }),
-    SemanticTag({ name: "Roof", id: 0x47 }),
-    SemanticTag({ name: "Sauna", id: 0x48 }),
-    SemanticTag({ name: "Scullery", id: 0x49 }),
-    SemanticTag({ name: "Sewing Room", id: 0x4a }),
-    SemanticTag({ name: "Shed", id: 0x4b }),
-    SemanticTag({ name: "Side Door", id: 0x4c }),
-    SemanticTag({ name: "Side Yard", id: 0x4d }),
-    SemanticTag({ name: "Sitting Room", id: 0x4e }),
-    SemanticTag({ name: "Snug", id: 0x4f }),
-    SemanticTag({ name: "Spa", id: 0x50 }),
-    SemanticTag({ name: "Staircase", id: 0x51 }),
-    SemanticTag({ name: "Steam Room", id: 0x52 }),
-    SemanticTag({ name: "Storage Room", id: 0x53 }),
-    SemanticTag({ name: "Studio", id: 0x54 }),
-    SemanticTag({ name: "Study", id: 0x55 }),
-    SemanticTag({ name: "Sun Room", id: 0x56 }),
-    SemanticTag({ name: "Swimming Pool", id: 0x57 }),
-    SemanticTag({ name: "Terrace", id: 0x58 }),
-    SemanticTag({ name: "Toilet", id: 0x59 }),
-    SemanticTag({ name: "Utility Room", id: 0x5a }),
-    SemanticTag({ name: "Ward", id: 0x5b }),
-    SemanticTag({ name: "Workshop", id: 0x5c })
+    SemanticTag({ name: "GardenDoor", id: 0x25 }),
+    SemanticTag({ name: "GuestBathroom", id: 0x26 }),
+    SemanticTag({ name: "GuestBedroom", id: 0x27 }),
+    SemanticTag({ name: "Reserved1", id: 0x28 }),
+    SemanticTag({ name: "GuestRoom", id: 0x29 }),
+    SemanticTag({ name: "Gym", id: 0x2a }),
+    SemanticTag({ name: "Hallway", id: 0x2b }),
+    SemanticTag({ name: "HearthRoom", id: 0x2c }),
+    SemanticTag({ name: "KidsRoom", id: 0x2d }),
+    SemanticTag({ name: "KidsBedroom", id: 0x2e }),
+    SemanticTag({ name: "Kitchen", id: 0x2f }),
+    SemanticTag({ name: "Reserved2", id: 0x30 }),
+    SemanticTag({ name: "LaundryRoom", id: 0x31 }),
+    SemanticTag({ name: "Lawn", id: 0x32 }),
+    SemanticTag({ name: "Library", id: 0x33 }),
+    SemanticTag({ name: "LivingRoom", id: 0x34 }),
+    SemanticTag({ name: "Lounge", id: 0x35 }),
+    SemanticTag({ name: "MediaTvRoom", id: 0x36 }),
+    SemanticTag({ name: "MudRoom", id: 0x37 }),
+    SemanticTag({ name: "MusicRoom", id: 0x38 }),
+    SemanticTag({ name: "Nursery", id: 0x39 }),
+    SemanticTag({ name: "Office", id: 0x3a }),
+    SemanticTag({ name: "OutdoorKitchen", id: 0x3b }),
+    SemanticTag({ name: "Outside", id: 0x3c }),
+    SemanticTag({ name: "Pantry", id: 0x3d }),
+    SemanticTag({ name: "ParkingLot", id: 0x3e }),
+    SemanticTag({ name: "Parlor", id: 0x3f }),
+    SemanticTag({ name: "Patio", id: 0x40 }),
+    SemanticTag({ name: "PlayRoom", id: 0x41 }),
+    SemanticTag({ name: "PoolRoom", id: 0x42 }),
+    SemanticTag({ name: "Porch", id: 0x43 }),
+    SemanticTag({ name: "PrimaryBathroom", id: 0x44 }),
+    SemanticTag({ name: "PrimaryBedroom", id: 0x45 }),
+    SemanticTag({ name: "Ramp", id: 0x46 }),
+    SemanticTag({ name: "ReceptionRoom", id: 0x47 }),
+    SemanticTag({ name: "RecreationRoom", id: 0x48 }),
+    SemanticTag({ name: "Reserved3", id: 0x49 }),
+    SemanticTag({ name: "Roof", id: 0x4a }),
+    SemanticTag({ name: "Sauna", id: 0x4b }),
+    SemanticTag({ name: "Scullery", id: 0x4c }),
+    SemanticTag({ name: "SewingRoom", id: 0x4d }),
+    SemanticTag({ name: "Shed", id: 0x4e }),
+    SemanticTag({ name: "SideDoor", id: 0x4f }),
+    SemanticTag({ name: "SideYard", id: 0x50 }),
+    SemanticTag({ name: "SittingRoom", id: 0x51 }),
+    SemanticTag({ name: "Snug", id: 0x52 }),
+    SemanticTag({ name: "Spa", id: 0x53 }),
+    SemanticTag({ name: "Staircase", id: 0x54 }),
+    SemanticTag({ name: "SteamRoom", id: 0x55 }),
+    SemanticTag({ name: "StorageRoom", id: 0x56 }),
+    SemanticTag({ name: "Studio", id: 0x57 }),
+    SemanticTag({ name: "Study", id: 0x58 }),
+    SemanticTag({ name: "SunRoom", id: 0x59 }),
+    SemanticTag({ name: "SwimmingPool", id: 0x5a }),
+    SemanticTag({ name: "Terrace", id: 0x5b }),
+    SemanticTag({ name: "UtilityRoom", id: 0x5c }),
+    SemanticTag({ name: "Ward", id: 0x5d }),
+    SemanticTag({ name: "Workshop", id: 0x5e }),
+    SemanticTag({ name: "Toilet", id: 0x5f })
 );
 
 MatterDefinition.children.push(AreaNamespaceNs);

package/src/standard/elements/basic-information.element.ts

@@ -17,7 +17,7 @@ import {
 
 export const BasicInformation = Cluster(
     { name: "BasicInformation", id: 0x28 },
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 4 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 5 }),
     Attribute({
         name: "DataModelRevision", id: 0x0, type: "uint16", access: "R V", conformance: "M",
         constraint: "desc", quality: "F"
@@ -97,6 +97,10 @@ export const BasicInformation = Cluster(
         name: "MaxPathsPerInvoke", id: 0x16, type: "uint16", access: "R V", conformance: "M",
         constraint: "min 1", default: 1, quality: "F"
     }),
+    Attribute({
+        name: "ConfigurationVersion", id: 0x18, type: "uint32", access: "R V", conformance: "P, M",
+        constraint: "min 1", default: 1, quality: "N"
+    }),
     Event(
         { name: "StartUp", id: 0x0, access: "V", conformance: "M", priority: "critical" },
         Field({ name: "SoftwareVersion", id: 0x0, type: "uint32", conformance: "M" })
@@ -107,7 +111,7 @@ export const BasicInformation = Cluster(
         Field({ name: "FabricIndex", id: 0x0, type: "fabric-idx", conformance: "M", constraint: "1 to 254" })
     ),
     Event(
-        { name: "ReachableChanged", id: 0x3, access: "V", conformance: "desc", priority: "info" },
+        { name: "ReachableChanged", id: 0x3, access: "V", conformance: "Reachable", priority: "info" },
         Field({ name: "ReachableNewValue", id: 0x0, type: "bool", conformance: "M" })
     ),
 

package/src/standard/elements/boolean-state-configuration.element.ts

@@ -40,19 +40,15 @@ export const BooleanStateConfiguration = Cluster(
         name: "DefaultSensitivityLevel", id: 0x2, type: "uint8", access: "R V", conformance: "[SENSLVL]",
         constraint: "max supportedSensitivityLevels - 1", quality: "F"
     }),
-    Attribute(
-        { name: "AlarmsActive", id: 0x3, type: "AlarmModeBitmap", access: "R V", conformance: "VIS | AUD", default: 0 }
-    ),
-    Attribute(
-        { name: "AlarmsSuppressed", id: 0x4, type: "AlarmModeBitmap", access: "R V", conformance: "SPRS", default: 0 }
-    ),
+    Attribute({ name: "AlarmsActive", id: 0x3, type: "AlarmModeBitmap", access: "R V", conformance: "VIS | AUD" }),
+    Attribute({ name: "AlarmsSuppressed", id: 0x4, type: "AlarmModeBitmap", access: "R V", conformance: "SPRS" }),
     Attribute({
         name: "AlarmsEnabled", id: 0x5, type: "AlarmModeBitmap", access: "R V", conformance: "[VIS | AUD]",
         quality: "N"
     }),
     Attribute({
         name: "AlarmsSupported", id: 0x6, type: "AlarmModeBitmap", access: "R V", conformance: "VIS | AUD",
-        default: 0, quality: "F"
+        quality: "F"
     }),
     Attribute({ name: "SensorFault", id: 0x7, type: "SensorFaultBitmap", access: "R V", conformance: "O", default: 0 }),
     Event(

package/src/standard/elements/bridged-device-basic-information.element.ts

@@ -17,14 +17,14 @@ import {
 
 export const BridgedDeviceBasicInformation = Cluster(
     { name: "BridgedDeviceBasicInformation", id: 0x39, type: "BasicInformation" },
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 4 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 5 }),
     Attribute(
         { name: "FeatureMap", id: 0xfffc, type: "FeatureMap" },
         Field({ name: "BIS", conformance: "O", constraint: "20", title: "BridgedIcdSupport" })
     ),
     Attribute({ name: "DataModelRevision", id: 0x0, conformance: "X" }),
-    Attribute({ name: "VendorName", id: 0x1, conformance: "O" }),
-    Attribute({ name: "VendorId", id: 0x2, conformance: "O" }),
+    Attribute({ name: "VendorName", id: 0x1, conformance: "desc" }),
+    Attribute({ name: "VendorId", id: 0x2, conformance: "desc" }),
     Attribute({ name: "ProductName", id: 0x3, conformance: "O" }),
     Attribute({ name: "ProductId", id: 0x4, conformance: "desc" }),
     Attribute({ name: "NodeLabel", id: 0x5, conformance: "O" }),
@@ -45,6 +45,7 @@ export const BridgedDeviceBasicInformation = Cluster(
     Attribute({ name: "ProductAppearance", id: 0x14, conformance: "O" }),
     Attribute({ name: "SpecificationVersion", id: 0x15, conformance: "X" }),
     Attribute({ name: "MaxPathsPerInvoke", id: 0x16, conformance: "X" }),
+    Attribute({ name: "ConfigurationVersion", id: 0x18, conformance: "P, O" }),
     Event({ name: "StartUp", id: 0x0, conformance: "O", priority: "critical" }),
     Event({ name: "ShutDown", id: 0x1, conformance: "O", priority: "critical" }),
     Event(