@matter/node 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251029-bd92894d4

package/src/endpoint/Endpoint.ts

@@ -18,6 +18,7 @@ import {
     Lifecycle,
     Logger,
     MaybePromise,
+    Observable,
     toHex,
     UninitializedDependencyError,
 } from "#general";
@@ -174,11 +175,18 @@ export class Endpoint<T extends EndpointType = EndpointType.Empty> {
 
     /**
      * Current state for a specific behavior ID.
+     *
+     * Be aware that using a string type does not provide type checking and does not enforce the correctness of the used
+     * Behavior type including all enabled features. Because of this the returned state is typed as a plain string
+     * indexed record (Val.Struct). Please ensure to have proper checks in place when using this method with string type.
      */
     stateOf(type: string): Immutable<Val.Struct>;
 
     /**
      * Current state for a specific behavior.
+     *
+     * This is the recommended way to access state for a specific behavior because it provides proper type checking
+     * and enforces the correctness of the used Behavior type including all enabled features.
      */
     stateOf<T extends Behavior.Type>(type: T): Immutable<Behavior.StateOf<T>>;
 
@@ -256,10 +264,37 @@ export class Endpoint<T extends EndpointType = EndpointType.Empty> {
      *
      * The patch semantics used here are identical to {@link set}.
      *
+     * This is the recommended way to set state for a single behavior because it provides proper type checking and
+     * enforces the correctness of the used Behavior type including all enabled features.
+     *
      * @param type the {@link Behavior} to patch
      * @param values the values to change
      */
-    async setStateOf<T extends Behavior.Type>(type: T, values: Behavior.PatchStateOf<T>) {
+    async setStateOf<T extends Behavior.Type>(type: T, values: Behavior.PatchStateOf<T>): Promise<void>;
+
+    /**
+     * Update state values for a single behavior ID.
+     *
+     * The patch semantics used here are identical to {@link set}.
+     *
+     * Be aware that using a string type does not provide type checking and does not enforce the correctness of the used
+     * Behavior type including all enabled features. Expect runtime errors if the provided values are not compatible
+     * with the actual Behavior type.
+     *
+     * @param type the {@link Behavior} to patch
+     * @param values the values to change
+     */
+    async setStateOf(type: string, values: Val.Struct): Promise<void>;
+
+    async setStateOf(type: Behavior.Type | string, values: Val.Struct) {
+        if (typeof type === "string") {
+            const typeName = type;
+            type = this.behaviors.supported[type];
+            if (type === undefined) {
+                throw new ImplementationError(`Behavior ${typeName} is not supported by ${this}`);
+            }
+        }
+
         await this.act(`setStateOf<${this}>`, async agent => {
             const behavior = agent.get(type);
 
@@ -312,14 +347,35 @@ export class Endpoint<T extends EndpointType = EndpointType.Empty> {
         return this.#events;
     }
 
+    /**
+     * Events for a specific behavior ID.
+     *
+     * Be aware that using a string type does not provide type checking and does not enforce the correctness of the used
+     * Behavior type including all enabled features. Because of this each event is typed as Observable | undefined.
+     * Please ensure to have proper checks in place when using this method with string type.
+     */
+    eventsOf(type: string): Immutable<Record<string, Observable | undefined>>;
+
     /**
      * Events for a specific behavior.
+     *
+     * This is the recommended way to access events for a specific behavior because it provides proper type checking
+     * and enforces the correctness of the used Behavior type including all enabled features.
      */
-    eventsOf<T extends Behavior.Type>(type: T) {
-        if (!this.behaviors.has(type)) {
-            throw new ImplementationError(`Behavior ${type.id} is not supported by this endpoint`);
+    eventsOf<T extends Behavior.Type>(type: T | string): Behavior.EventsOf<T>;
+
+    eventsOf(type: Behavior.Type | string): unknown {
+        if (typeof type === "string") {
+            if (!(type in this.#stateView)) {
+                throw new ImplementationError(`Behavior ${type} is not supported by ${this}`);
+            }
+        } else {
+            if (!this.behaviors.has(type)) {
+                throw new ImplementationError(`Behavior ${type.id} is not supported by this endpoint`);
+            }
+            type = type.id;
         }
-        return this.#events[type.id] as Behavior.EventsOf<T>;
+        return this.#events[type];
     }
 
     get construction() {

package/src/endpoint/properties/EndpointContainer.ts

@@ -72,6 +72,10 @@ export class EndpointContainer<T extends Endpoint = Endpoint>
         return this.#children.deleted;
     }
 
+    get empty() {
+        return this.#children.empty;
+    }
+
     get size() {
         return this.#children.size;
     }

package/src/endpoints/joint-fabric-administrator.ts

@@ -9,7 +9,9 @@
 import {
     JointFabricDatastoreServer as BaseJointFabricDatastoreServer
 } from "../behaviors/joint-fabric-datastore/JointFabricDatastoreServer.js";
-import { JointFabricPkiServer as BaseJointFabricPkiServer } from "../behaviors/joint-fabric-pki/JointFabricPkiServer.js";
+import {
+    JointFabricAdministratorServer as BaseJointFabricAdministratorServer
+} from "../behaviors/joint-fabric-administrator/JointFabricAdministratorServer.js";
 import { MutableEndpoint } from "../endpoint/type/MutableEndpoint.js";
 import { DeviceClassification } from "#model";
 import { SupportedBehaviors } from "../endpoint/properties/SupportedBehaviors.js";
@@ -20,8 +22,8 @@ import { Identity } from "#general";
  * signed by the Joint Fabric Anchor Root CA.
  *
  * A client wanting to access the capabilities of the Joint Fabric Administrator may use the Joint Commissioning Method
- * to be commissioned onto the Joint Fabric. Once commissioned, a client may access the capabilities of the Joint Fabric
- * Administrator.
+ * (as specified in the Matter core specification) to be commissioned onto the Joint Fabric. Once commissioned, a client
+ * may access the capabilities of the Joint Fabric Administrator.
  *
  * @see {@link MatterSpecification.v141.Device} § 2.9
  */
@@ -36,17 +38,20 @@ export namespace JointFabricAdministratorRequirements {
     export const JointFabricDatastoreServer = BaseJointFabricDatastoreServer;
 
     /**
-     * The JointFabricPki cluster is required by the Matter specification.
+     * The JointFabricAdministrator cluster is required by the Matter specification.
      *
-     * We provide this alias to the default implementation {@link JointFabricPkiServer} for convenience.
+     * We provide this alias to the default implementation {@link JointFabricAdministratorServer} for convenience.
      */
-    export const JointFabricPkiServer = BaseJointFabricPkiServer;
+    export const JointFabricAdministratorServer = BaseJointFabricAdministratorServer;
 
     /**
      * An implementation for each server cluster supported by the endpoint per the Matter specification.
      */
     export const server = {
-        mandatory: { JointFabricDatastore: JointFabricDatastoreServer, JointFabricPki: JointFabricPkiServer }
+        mandatory: {
+            JointFabricDatastore: JointFabricDatastoreServer,
+            JointFabricAdministrator: JointFabricAdministratorServer
+        }
     };
 }
 
@@ -58,7 +63,7 @@ export const JointFabricAdministratorEndpointDefinition = MutableEndpoint({
     requirements: JointFabricAdministratorRequirements,
     behaviors: SupportedBehaviors(
         JointFabricAdministratorRequirements.server.mandatory.JointFabricDatastore,
-        JointFabricAdministratorRequirements.server.mandatory.JointFabricPki
+        JointFabricAdministratorRequirements.server.mandatory.JointFabricAdministrator
     )
 });
 

package/src/tags/AreaNamespaceTag.ts

@@ -20,8 +20,8 @@ export const AreaNamespaceTag = SemanticNamespace({
     tags: {
         Aisle: { id: 0x0, label: "Aisle" },
         Attic: { id: 0x1, label: "Attic" },
-        BackDoor: { id: 0x2, label: "Back Door" },
-        BackYard: { id: 0x3, label: "Back Yard" },
+        BackDoor: { id: 0x2, label: "BackDoor" },
+        BackYard: { id: 0x3, label: "BackYard" },
         Balcony: { id: 0x4, label: "Balcony" },
         Ballroom: { id: 0x5, label: "Ballroom" },
 
@@ -38,14 +38,19 @@ export const AreaNamespaceTag = SemanticNamespace({
          */
         Boxroom: { id: 0x9, label: "Boxroom" },
 
-        BreakfastRoom: { id: 0xa, label: "Breakfast Room" },
+        BreakfastRoom: { id: 0xa, label: "BreakfastRoom" },
         Carport: { id: 0xb, label: "Carport" },
         Cellar: { id: 0xc, label: "Cellar" },
         Cloakroom: { id: 0xd, label: "Cloakroom" },
+
+        /**
+         * A small room for storing clothing, linens, and other items.
+         */
         Closet: { id: 0xe, label: "Closet" },
+
         Conservatory: { id: 0xf, label: "Conservatory" },
         Corridor: { id: 0x10, label: "Corridor" },
-        CraftRoom: { id: 0x11, label: "Craft Room" },
+        CraftRoom: { id: 0x11, label: "CraftRoom" },
         Cupboard: { id: 0x12, label: "Cupboard" },
         Deck: { id: 0x13, label: "Deck" },
 
@@ -55,8 +60,8 @@ export const AreaNamespaceTag = SemanticNamespace({
         Den: { id: 0x14, label: "Den" },
 
         Dining: { id: 0x15, label: "Dining" },
-        DrawingRoom: { id: 0x16, label: "Drawing Room" },
-        DressingRoom: { id: 0x17, label: "Dressing Room" },
+        DrawingRoom: { id: 0x16, label: "DrawingRoom" },
+        DressingRoom: { id: 0x17, label: "DressingRoom" },
         Driveway: { id: 0x18, label: "Driveway" },
         Elevator: { id: 0x19, label: "Elevator" },
 
@@ -67,104 +72,135 @@ export const AreaNamespaceTag = SemanticNamespace({
 
         Entrance: { id: 0x1b, label: "Entrance" },
         Entryway: { id: 0x1c, label: "Entryway" },
-        FamilyRoom: { id: 0x1d, label: "Family Room" },
+        FamilyRoom: { id: 0x1d, label: "FamilyRoom" },
         Foyer: { id: 0x1e, label: "Foyer" },
-        FrontDoor: { id: 0x1f, label: "Front Door" },
-        FrontYard: { id: 0x20, label: "Front Yard" },
-        GameRoom: { id: 0x21, label: "Game Room" },
+        FrontDoor: { id: 0x1f, label: "FrontDoor" },
+        FrontYard: { id: 0x20, label: "FrontYard" },
+        GameRoom: { id: 0x21, label: "GameRoom" },
         Garage: { id: 0x22, label: "Garage" },
-        GarageDoor: { id: 0x23, label: "Garage Door" },
+        GarageDoor: { id: 0x23, label: "GarageDoor" },
         Garden: { id: 0x24, label: "Garden" },
-        GardenDoor: { id: 0x25, label: "Garden Door" },
+        GardenDoor: { id: 0x25, label: "GardenDoor" },
 
         /**
          * Also known as Guest Restroom
          */
-        GuestBathroom: { id: 0x26, label: "Guest Bathroom" },
+        GuestBathroom: { id: 0x26, label: "GuestBathroom" },
+
+        GuestBedroom: { id: 0x27, label: "GuestBedroom" },
+
+        /**
+         * Deprecated: was Guest Restroom; use 0x26 Guest Bathroom
+         */
+        Reserved1: { id: 0x28, label: "Reserved1" },
+
+        /**
+         * Also known as Guest Bedroom
+         */
+        GuestRoom: { id: 0x29, label: "GuestRoom" },
 
-        GuestBedroom: { id: 0x27, label: "Guest Bedroom" },
-        GuestRoom: { id: 0x28, label: "Guest Room" },
-        Gym: { id: 0x29, label: "Gym" },
-        Hallway: { id: 0x2a, label: "Hallway" },
+        Gym: { id: 0x2a, label: "Gym" },
+        Hallway: { id: 0x2b, label: "Hallway" },
 
         /**
          * A cozy room containing a fireplace or other point heat source
          */
-        HearthRoom: { id: 0x2b, label: "Hearth Room" },
+        HearthRoom: { id: 0x2c, label: "HearthRoom" },
 
-        KidsRoom: { id: 0x2c, label: "Kids Room" },
-        KidsBedroom: { id: 0x2d, label: "Kids Bedroom" },
-        Kitchen: { id: 0x2e, label: "Kitchen" },
-        LaundryRoom: { id: 0x2f, label: "Laundry Room" },
-        Lawn: { id: 0x30, label: "Lawn" },
-        Library: { id: 0x31, label: "Library" },
-        LivingRoom: { id: 0x32, label: "Living Room" },
-        Lounge: { id: 0x33, label: "Lounge" },
-        MediaTvRoom: { id: 0x34, label: "Media/TV Room" },
+        KidsRoom: { id: 0x2d, label: "KidsRoom" },
+        KidsBedroom: { id: 0x2e, label: "KidsBedroom" },
+        Kitchen: { id: 0x2f, label: "Kitchen" },
+
+        /**
+         * Deprecated: was Larder; use 0x3D Pantry
+         */
+        Reserved2: { id: 0x30, label: "Reserved2" },
+
+        LaundryRoom: { id: 0x31, label: "LaundryRoom" },
+        Lawn: { id: 0x32, label: "Lawn" },
+        Library: { id: 0x33, label: "Library" },
+        LivingRoom: { id: 0x34, label: "LivingRoom" },
+        Lounge: { id: 0x35, label: "Lounge" },
+        MediaTvRoom: { id: 0x36, label: "MediaTvRoom" },
 
         /**
          * A space used to remove soiled garments prior to entering the domicile proper
          */
-        MudRoom: { id: 0x35, label: "Mud Room" },
+        MudRoom: { id: 0x37, label: "MudRoom" },
 
-        MusicRoom: { id: 0x36, label: "Music Room" },
-        Nursery: { id: 0x37, label: "Nursery" },
-        Office: { id: 0x38, label: "Office" },
-        OutdoorKitchen: { id: 0x39, label: "Outdoor Kitchen" },
-        Outside: { id: 0x3a, label: "Outside" },
+        MusicRoom: { id: 0x38, label: "MusicRoom" },
+        Nursery: { id: 0x39, label: "Nursery" },
+        Office: { id: 0x3a, label: "Office" },
+        OutdoorKitchen: { id: 0x3b, label: "OutdoorKitchen" },
+        Outside: { id: 0x3c, label: "Outside" },
 
         /**
          * AKA a larder, a place where food is stored
          */
-        Pantry: { id: 0x3b, label: "Pantry" },
+        Pantry: { id: 0x3d, label: "Pantry" },
 
-        ParkingLot: { id: 0x3c, label: "Parking Lot" },
-        Parlor: { id: 0x3d, label: "Parlor" },
-        Patio: { id: 0x3e, label: "Patio" },
-        PlayRoom: { id: 0x3f, label: "Play Room" },
-        PoolRoom: { id: 0x40, label: "Pool Room" },
-        Porch: { id: 0x41, label: "Porch" },
-        PrimaryBathroom: { id: 0x42, label: "Primary Bathroom" },
-        PrimaryBedroom: { id: 0x43, label: "Primary Bedroom" },
-        Ramp: { id: 0x44, label: "Ramp" },
-        ReceptionRoom: { id: 0x45, label: "Reception Room" },
-        RecreationRoom: { id: 0x46, label: "Recreation Room" },
-        Roof: { id: 0x47, label: "Roof" },
-        Sauna: { id: 0x48, label: "Sauna" },
+        ParkingLot: { id: 0x3e, label: "ParkingLot" },
+        Parlor: { id: 0x3f, label: "Parlor" },
+        Patio: { id: 0x40, label: "Patio" },
+        PlayRoom: { id: 0x41, label: "PlayRoom" },
+
+        /**
+         * A room centered around a pool/billiards table
+         */
+        PoolRoom: { id: 0x42, label: "PoolRoom" },
+
+        Porch: { id: 0x43, label: "Porch" },
+        PrimaryBathroom: { id: 0x44, label: "PrimaryBathroom" },
+        PrimaryBedroom: { id: 0x45, label: "PrimaryBedroom" },
+        Ramp: { id: 0x46, label: "Ramp" },
+        ReceptionRoom: { id: 0x47, label: "ReceptionRoom" },
+        RecreationRoom: { id: 0x48, label: "RecreationRoom" },
+
+        /**
+         * Deprecated: was Restroom; use 0x06 Bathroom
+         */
+        Reserved3: { id: 0x49, label: "Reserved3" },
+
+        Roof: { id: 0x4a, label: "Roof" },
+        Sauna: { id: 0x4b, label: "Sauna" },
 
         /**
          * A utility space for cleaning dishes and laundry
          */
-        Scullery: { id: 0x49, label: "Scullery" },
+        Scullery: { id: 0x4c, label: "Scullery" },
 
-        SewingRoom: { id: 0x4a, label: "Sewing Room" },
-        Shed: { id: 0x4b, label: "Shed" },
-        SideDoor: { id: 0x4c, label: "Side Door" },
-        SideYard: { id: 0x4d, label: "Side Yard" },
-        SittingRoom: { id: 0x4e, label: "Sitting Room" },
+        SewingRoom: { id: 0x4d, label: "SewingRoom" },
+        Shed: { id: 0x4e, label: "Shed" },
+        SideDoor: { id: 0x4f, label: "SideDoor" },
+        SideYard: { id: 0x50, label: "SideYard" },
+        SittingRoom: { id: 0x51, label: "SittingRoom" },
 
         /**
          * An informal space meant to be 'cozy', 'snug', relaxed, meant to share with family or friends
          */
-        Snug: { id: 0x4f, label: "Snug" },
+        Snug: { id: 0x52, label: "Snug" },
+
+        Spa: { id: 0x53, label: "Spa" },
+        Staircase: { id: 0x54, label: "Staircase" },
+        SteamRoom: { id: 0x55, label: "SteamRoom" },
+        StorageRoom: { id: 0x56, label: "StorageRoom" },
+        Studio: { id: 0x57, label: "Studio" },
+        Study: { id: 0x58, label: "Study" },
+        SunRoom: { id: 0x59, label: "SunRoom" },
+        SwimmingPool: { id: 0x5a, label: "SwimmingPool" },
+        Terrace: { id: 0x5b, label: "Terrace" },
+        UtilityRoom: { id: 0x5c, label: "UtilityRoom" },
+
+        /**
+         * The innermost area of a large home
+         */
+        Ward: { id: 0x5d, label: "Ward" },
 
-        Spa: { id: 0x50, label: "Spa" },
-        Staircase: { id: 0x51, label: "Staircase" },
-        SteamRoom: { id: 0x52, label: "Steam Room" },
-        StorageRoom: { id: 0x53, label: "Storage Room" },
-        Studio: { id: 0x54, label: "Studio" },
-        Study: { id: 0x55, label: "Study" },
-        SunRoom: { id: 0x56, label: "Sun Room" },
-        SwimmingPool: { id: 0x57, label: "Swimming Pool" },
-        Terrace: { id: 0x58, label: "Terrace" },
+        Workshop: { id: 0x5e, label: "Workshop" },
 
         /**
          * A room dedicated to a toilet; a water closet / WC
          */
-        Toilet: { id: 0x59, label: "Toilet" },
-
-        UtilityRoom: { id: 0x5a, label: "Utility Room" },
-        Ward: { id: 0x5b, label: "Ward" },
-        Workshop: { id: 0x5c, label: "Workshop" }
+        Toilet: { id: 0x5f, label: "Toilet" }
     }
 });

package/src/tags/ClosureTag.ts

@@ -12,6 +12,13 @@ import { SemanticNamespace } from "../endpoint/type/SemanticNamespace.js";
  * The tags contained in this namespace may be used in any domain or context, to indicate an association with a feature
  * of a Closure, e.g. the button to activate opening a garage door.
  *
+ * > [!NOTE]
+ *
+ * > This namespace has been deprecated as of Matter 1.4.2.
+ *
+ * Clients SHOULD still have support for these tags, since the tags could be used by a server certified on a previous
+ * revision of Matter.
+ *
  * @see {@link MatterSpecification.v141.Namespace} § 2
  */
 export const ClosureTag = SemanticNamespace({

package/src/tags/CompassDirectionTag.ts

@@ -19,12 +19,12 @@ export const CompassDirectionTag = SemanticNamespace({
 
     tags: {
         Northward: { id: 0x0, label: "Northward" },
-        NorthEastward: { id: 0x1, label: "North-Eastward" },
+        NorthEastward: { id: 0x1, label: "NorthEastward" },
         Eastward: { id: 0x2, label: "Eastward" },
-        SouthEastward: { id: 0x3, label: "South-Eastward" },
+        SouthEastward: { id: 0x3, label: "SouthEastward" },
         Southward: { id: 0x4, label: "Southward" },
-        SouthWestward: { id: 0x5, label: "South-Westward" },
+        SouthWestward: { id: 0x5, label: "SouthWestward" },
         Westward: { id: 0x6, label: "Westward" },
-        NorthWestward: { id: 0x7, label: "North-Westward" }
+        NorthWestward: { id: 0x7, label: "NorthWestward" }
     }
 });

package/src/tags/CompassLocationTag.ts

@@ -20,12 +20,12 @@ export const CompassLocationTag = SemanticNamespace({
 
     tags: {
         North: { id: 0x0, label: "North" },
-        NorthEast: { id: 0x1, label: "North-East" },
+        NorthEast: { id: 0x1, label: "NorthEast" },
         East: { id: 0x2, label: "East" },
-        SouthEast: { id: 0x3, label: "South-East" },
+        SouthEast: { id: 0x3, label: "SouthEast" },
         South: { id: 0x4, label: "South" },
-        SouthWest: { id: 0x5, label: "South-West" },
+        SouthWest: { id: 0x5, label: "SouthWest" },
         West: { id: 0x6, label: "West" },
-        NorthWest: { id: 0x7, label: "North-West" }
+        NorthWest: { id: 0x7, label: "NorthWest" }
     }
 });

package/src/tags/LandmarkNamespaceTag.ts

@@ -18,56 +18,71 @@ export const LandmarkNamespaceTag = SemanticNamespace({
     id: 0x11,
 
     tags: {
-        AirConditioner: { id: 0x0, label: "Air Conditioner" },
-        AirPurifier: { id: 0x1, label: "Air Purifier" },
-        BackDoor: { id: 0x2, label: "Back Door" },
-        BarStool: { id: 0x3, label: "Bar Stool" },
-        BathMat: { id: 0x4, label: "Bath Mat" },
+        AirConditioner: { id: 0x0, label: "AirConditioner" },
+        AirPurifier: { id: 0x1, label: "AirPurifier" },
+        BackDoor: { id: 0x2, label: "BackDoor" },
+        BarStool: { id: 0x3, label: "BarStool" },
+        BathMat: { id: 0x4, label: "BathMat" },
         Bathtub: { id: 0x5, label: "Bathtub" },
         Bed: { id: 0x6, label: "Bed" },
         Bookshelf: { id: 0x7, label: "Bookshelf" },
         Chair: { id: 0x8, label: "Chair" },
-        ChristmasTree: { id: 0x9, label: "Christmas Tree" },
-        CoatRack: { id: 0xa, label: "Coat Rack" },
-        CoffeeTable: { id: 0xb, label: "Coffee Table" },
-        CookingRange: { id: 0xc, label: "Cooking Range" },
+        ChristmasTree: { id: 0x9, label: "ChristmasTree" },
+        CoatRack: { id: 0xa, label: "CoatRack" },
+        CoffeeTable: { id: 0xb, label: "CoffeeTable" },
+        CookingRange: { id: 0xc, label: "CookingRange" },
         Couch: { id: 0xd, label: "Couch" },
         Countertop: { id: 0xe, label: "Countertop" },
         Cradle: { id: 0xf, label: "Cradle" },
         Crib: { id: 0x10, label: "Crib" },
         Desk: { id: 0x11, label: "Desk" },
-        DiningTable: { id: 0x12, label: "Dining Table" },
+        DiningTable: { id: 0x12, label: "DiningTable" },
         Dishwasher: { id: 0x13, label: "Dishwasher" },
         Door: { id: 0x14, label: "Door" },
         Dresser: { id: 0x15, label: "Dresser" },
-        LaundryDryer: { id: 0x16, label: "Laundry Dryer" },
+        LaundryDryer: { id: 0x16, label: "LaundryDryer" },
         Fan: { id: 0x17, label: "Fan" },
         Fireplace: { id: 0x18, label: "Fireplace" },
         Freezer: { id: 0x19, label: "Freezer" },
-        FrontDoor: { id: 0x1a, label: "Front Door" },
-        HighChair: { id: 0x1b, label: "High Chair" },
-        KitchenIsland: { id: 0x1c, label: "Kitchen Island" },
+        FrontDoor: { id: 0x1a, label: "FrontDoor" },
+        HighChair: { id: 0x1b, label: "HighChair" },
+        KitchenIsland: { id: 0x1c, label: "KitchenIsland" },
         Lamp: { id: 0x1d, label: "Lamp" },
-        LitterBox: { id: 0x1e, label: "Litter Box" },
+        LitterBox: { id: 0x1e, label: "LitterBox" },
         Mirror: { id: 0x1f, label: "Mirror" },
         Nightstand: { id: 0x20, label: "Nightstand" },
         Oven: { id: 0x21, label: "Oven" },
-        PetBed: { id: 0x22, label: "Pet Bed" },
-        PetBowl: { id: 0x23, label: "Pet Bowl" },
-        PetCrate: { id: 0x24, label: "Pet Crate" },
+        PetBed: { id: 0x22, label: "PetBed" },
+        PetBowl: { id: 0x23, label: "PetBowl" },
+
+        /**
+         * An indoor furnishing for pets to rest or sleep inside
+         */
+        PetCrate: { id: 0x24, label: "PetCrate" },
+
         Refrigerator: { id: 0x25, label: "Refrigerator" },
-        ScratchingPost: { id: 0x26, label: "Scratching Post" },
-        ShoeRack: { id: 0x27, label: "Shoe Rack" },
+        ScratchingPost: { id: 0x26, label: "ScratchingPost" },
+        ShoeRack: { id: 0x27, label: "ShoeRack" },
+
+        /**
+         * An area where a showerhead dispenses water for people to shower
+         */
         Shower: { id: 0x28, label: "Shower" },
-        SideDoor: { id: 0x29, label: "Side Door" },
+
+        SideDoor: { id: 0x29, label: "SideDoor" },
         Sink: { id: 0x2a, label: "Sink" },
         Sofa: { id: 0x2b, label: "Sofa" },
         Stove: { id: 0x2c, label: "Stove" },
         Table: { id: 0x2d, label: "Table" },
         Toilet: { id: 0x2e, label: "Toilet" },
-        TrashCan: { id: 0x2f, label: "Trash Can" },
-        LaundryWasher: { id: 0x30, label: "Laundry Washer" },
+        TrashCan: { id: 0x2f, label: "TrashCan" },
+        LaundryWasher: { id: 0x30, label: "LaundryWasher" },
         Window: { id: 0x31, label: "Window" },
-        WineCooler: { id: 0x32, label: "Wine Cooler" }
+
+        /**
+         * A type of refrigerator that is shelved to hold wine bottles and (typically) display them through a glass
+         * front
+         */
+        WineCooler: { id: 0x32, label: "WineCooler" }
     }
 });

package/src/tags/LaundryTag.ts

@@ -19,8 +19,8 @@ export const LaundryTag = SemanticNamespace({
 
     tags: {
         Normal: { id: 0x0, label: "Normal" },
-        LightDry: { id: 0x1, label: "Light Dry" },
-        ExtraDry: { id: 0x2, label: "Extra Dry" },
-        NoDry: { id: 0x3, label: "No Dry" }
+        LightDry: { id: 0x1, label: "LightDry" },
+        ExtraDry: { id: 0x2, label: "ExtraDry" },
+        NoDry: { id: 0x3, label: "NoDry" }
     }
 });

package/src/tags/LocationTag.ts

@@ -34,8 +34,13 @@ export const LocationTag = SemanticNamespace({
         Inside: { id: 0x2, label: "Inside" },
 
         /**
-         * Element is located outside the equipment (e.g. a sensor "outside" a cabinet)
+         * Element is located outside the equipment (e.g. a sensor "outside" a cabinet).
          */
-        Outside: { id: 0x3, label: "Outside" }
+        Outside: { id: 0x3, label: "Outside" },
+
+        /**
+         * Element is a part of a location divided into zones (e.g. a yard irrigation zone).
+         */
+        Zone: { id: 0x4, label: "Zone" }
     }
 });

package/src/tags/NumberTag.ts

@@ -28,6 +28,26 @@ export const NumberTag = SemanticNamespace({
         Seven: { id: 0x7, label: "Seven" },
         Eight: { id: 0x8, label: "Eight" },
         Nine: { id: 0x9, label: "Nine" },
-        Ten: { id: 0xa, label: "Ten" }
+        Ten: { id: 0xa, label: "Ten" },
+        Eleven: { id: 0xb, label: "Eleven" },
+        Twelve: { id: 0xc, label: "Twelve" },
+        Thirteen: { id: 0xd, label: "Thirteen" },
+        Fourteen: { id: 0xe, label: "Fourteen" },
+        Fifteen: { id: 0xf, label: "Fifteen" },
+        Sixteen: { id: 0x10, label: "Sixteen" },
+        Seventeen: { id: 0x11, label: "Seventeen" },
+        Eighteen: { id: 0x12, label: "Eighteen" },
+        Nineteen: { id: 0x13, label: "Nineteen" },
+        Twenty: { id: 0x14, label: "Twenty" },
+        TwentyOne: { id: 0x15, label: "TwentyOne" },
+        TwentyTwo: { id: 0x16, label: "TwentyTwo" },
+        TwentyThree: { id: 0x17, label: "TwentyThree" },
+        TwentyFour: { id: 0x18, label: "TwentyFour" },
+        TwentyFive: { id: 0x19, label: "TwentyFive" },
+        TwentySix: { id: 0x1a, label: "TwentySix" },
+        TwentySeven: { id: 0x1b, label: "TwentySeven" },
+        TwentyEight: { id: 0x1c, label: "TwentyEight" },
+        TwentyNine: { id: 0x1d, label: "TwentyNine" },
+        Thirty: { id: 0x1e, label: "Thirty" }
     }
 });

package/src/tags/PositionTag.ts

@@ -23,6 +23,9 @@ import { SemanticNamespace } from "../endpoint/type/SemanticNamespace.js";
  * comprised of Arabic numerals encoded as a string to indicate the row/column of the item. Number words (e.g. "one",
  * "two", etc.) shall NOT be used to describe the position of the item. The first row/column shall use Label "1".
  *
+ * The following example illustrates a compound device comprised of 9 endpoints arranged in a 3x3 grid. This example
+ * uses position tags to indicate position.
+ *
  * @see {@link MatterSpecification.v141.Namespace} § 9
  */
 export const PositionTag = SemanticNamespace({

package/src/tags/RelativePositionTag.ts

@@ -26,7 +26,7 @@ export const RelativePositionTag = SemanticNamespace({
         /**
          * Area in proximity to the point of reference
          */
-        NextTo: { id: 0x1, label: "Next To" },
+        NextTo: { id: 0x1, label: "NextTo" },
 
         /**
          * The area surrounding the point the reference
@@ -35,7 +35,7 @@ export const RelativePositionTag = SemanticNamespace({
 
         On: { id: 0x3, label: "On" },
         Above: { id: 0x4, label: "Above" },
-        FrontOf: { id: 0x5, label: "Front Of" },
+        FrontOf: { id: 0x5, label: "FrontOf" },
         Behind: { id: 0x6, label: "Behind" }
     }
 });