@matter/model 0.11.9-alpha.0-20241206-22f233334 → 0.11.9-alpha.0-20241207-b604cfa44

package/dist/esm/standard/elements/OperationalCredentials.js

@@ -11,16 +11,18 @@ import {
   CommandElement as Command,
   DatatypeElement as Datatype
 } from "../../elements/index.js";
-const OperationalCredentials = Cluster({
-  name: "OperationalCredentials",
-  id: 62,
-  classification: "node",
-  pics: "OPCREDS",
-  details: "This cluster is used to add or remove Node Operational credentials on a Commissionee or Node, as well as manage the associated Fabrics.",
-  xref: { document: "core", section: "11.18" },
-  children: [
-    Attribute({ name: "ClusterRevision", id: 65533, type: "ClusterRevision", default: 1 }),
-    Attribute({
+const OperationalCredentials = Cluster(
+  {
+    name: "OperationalCredentials",
+    id: 62,
+    classification: "node",
+    pics: "OPCREDS",
+    details: "This cluster is used to add or remove Node Operational credentials on a Commissionee or Node, as well as manage the associated Fabrics.",
+    xref: { document: "core", section: "11.18" }
+  },
+  Attribute({ name: "ClusterRevision", id: 65533, type: "ClusterRevision", default: 1 }),
+  Attribute(
+    {
       name: "Nocs",
       id: 0,
       type: "list",
@@ -29,10 +31,12 @@ const OperationalCredentials = Cluster({
       constraint: "max supportedFabrics",
       quality: "N C",
       details: "This attribute contains all NOCs applicable to this Node, encoded as a read-only list of NOCStruct.\nOperational Certificates shall be added through the AddNOC command, and shall be removed through the RemoveFabric command.\nUpon Factory Data Reset, this attribute shall be set to a default value of an empty list.\nThe number of entries in this list shall match the number of entries in the Fabrics attribute.",
-      xref: { document: "core", section: "11.18.5.1" },
-      children: [Field({ name: "entry", type: "NOCStruct" })]
-    }),
-    Attribute({
+      xref: { document: "core", section: "11.18.5.1" }
+    },
+    Field({ name: "entry", type: "NOCStruct" })
+  ),
+  Attribute(
+    {
       name: "Fabrics",
       id: 1,
       type: "list",
@@ -41,32 +45,34 @@ const OperationalCredentials = Cluster({
       constraint: "max supportedFabrics",
       quality: "N",
       details: "This attribute describes all fabrics to which this Node is commissioned, encoded as a read-only list of FabricDescriptorStruct. This information may be computed directly from the NOCs attribute.\nUpon Factory Data Reset, this attribute shall be set to a default value of an empty list.\nThe number of entries in this list shall match the number of entries in the NOCs attribute.",
-      xref: { document: "core", section: "11.18.5.2" },
-      children: [Field({ name: "entry", type: "FabricDescriptorStruct" })]
-    }),
-    Attribute({
-      name: "SupportedFabrics",
-      id: 2,
-      type: "uint8",
-      access: "R V",
-      conformance: "M",
-      constraint: "5 to 254",
-      quality: "F",
-      details: "This attribute contains the number of Fabrics that are supported by the device. This value is fixed for a particular device.",
-      xref: { document: "core", section: "11.18.5.3" }
-    }),
-    Attribute({
-      name: "CommissionedFabrics",
-      id: 3,
-      type: "uint8",
-      access: "R V",
-      conformance: "M",
-      constraint: "max supportedFabrics",
-      quality: "N",
-      details: "This attribute contains the number of Fabrics to which the device is currently commissioned. This attribute shall be equal to the following:\n  \u2022 The number of entries in the NOCs attribute.\n  \u2022 The number of entries in the Fabrics attribute.\nUpon Factory Data Reset, this attribute shall be set to a default value of 0.",
-      xref: { document: "core", section: "11.18.5.4" }
-    }),
-    Attribute({
+      xref: { document: "core", section: "11.18.5.2" }
+    },
+    Field({ name: "entry", type: "FabricDescriptorStruct" })
+  ),
+  Attribute({
+    name: "SupportedFabrics",
+    id: 2,
+    type: "uint8",
+    access: "R V",
+    conformance: "M",
+    constraint: "5 to 254",
+    quality: "F",
+    details: "This attribute contains the number of Fabrics that are supported by the device. This value is fixed for a particular device.",
+    xref: { document: "core", section: "11.18.5.3" }
+  }),
+  Attribute({
+    name: "CommissionedFabrics",
+    id: 3,
+    type: "uint8",
+    access: "R V",
+    conformance: "M",
+    constraint: "max supportedFabrics",
+    quality: "N",
+    details: "This attribute contains the number of Fabrics to which the device is currently commissioned. This attribute shall be equal to the following:\n  \u2022 The number of entries in the NOCs attribute.\n  \u2022 The number of entries in the Fabrics attribute.\nUpon Factory Data Reset, this attribute shall be set to a default value of 0.",
+    xref: { document: "core", section: "11.18.5.4" }
+  }),
+  Attribute(
+    {
       name: "TrustedRootCertificates",
       id: 4,
       type: "list",
@@ -75,20 +81,22 @@ const OperationalCredentials = Cluster({
       constraint: "max supportedFabrics[max 400]",
       quality: "N C",
       details: "This attribute shall contain a read-only list of Trusted Root CA Certificates installed on the Node, as octet strings containing their Matter Certificate Encoding representation.\nThese certificates are installed through the AddTrustedRootCertificate command.\nDepending on the method of storage employed by the server, either shared storage for identical root certificates shared by many fabrics, or individually stored root certificate per fabric, multiple identical root certificates may legally appear within the list.\nTo match a root with a given fabric, the root certificate\u2019s subject and subject public key need to be cross-referenced with the NOC or ICAC certificates that appear in the NOCs attribute for a given fabric.\nUpon Factory Data Reset, this attribute shall be set to a default value whereby the list is empty.",
-      xref: { document: "core", section: "11.18.5.5" },
-      children: [Field({ name: "entry", type: "octstr" })]
-    }),
-    Attribute({
-      name: "CurrentFabricIndex",
-      id: 5,
-      type: "fabric-idx",
-      access: "R V",
-      conformance: "M",
-      default: 0,
-      details: "This attribute shall contain accessing fabric index.\nThis attribute is useful to contextualize Fabric-Scoped entries obtained from response commands or attribute reads, since a given Fabric may be referenced by a different Fabric Index locally on a remote Node.",
-      xref: { document: "core", section: "11.18.5.6" }
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.5.5" }
+    },
+    Field({ name: "entry", type: "octstr" })
+  ),
+  Attribute({
+    name: "CurrentFabricIndex",
+    id: 5,
+    type: "fabric-idx",
+    access: "R V",
+    conformance: "M",
+    default: 0,
+    details: "This attribute shall contain accessing fabric index.\nThis attribute is useful to contextualize Fabric-Scoped entries obtained from response commands or attribute reads, since a given Fabric may be referenced by a different Fabric Index locally on a remote Node.",
+    xref: { document: "core", section: "11.18.5.6" }
+  }),
+  Command(
+    {
       name: "AttestationRequest",
       id: 0,
       access: "A",
@@ -96,38 +104,40 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "AttestationResponse",
       details: "This command shall be generated to request the Attestation Information, in the form of an AttestationResponse Command. If the AttestationNonce that is provided in the command is malformed, a recipient shall fail the command with a Status Code of INVALID_COMMAND. The AttestationNonce field shall be used in the computation of the Attestation Information.",
-      xref: { document: "core", section: "11.18.6.1" },
-      children: [Field({ name: "AttestationNonce", id: 0, type: "octstr", conformance: "M", constraint: "32" })]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.1" }
+    },
+    Field({ name: "AttestationNonce", id: 0, type: "octstr", conformance: "M", constraint: "32" })
+  ),
+  Command(
+    {
       name: "AttestationResponse",
       id: 1,
       conformance: "M",
       direction: "response",
       details: "This command shall be generated in response to an Attestation Request command.\nSee Section 11.18.4.7, \u201CAttestation Information\u201D for details about the generation of the fields within this response command.\nSee Section F.2, \u201CDevice Attestation Response test vector\u201D for an example computation of an AttestationResponse.",
-      xref: { document: "core", section: "11.18.6.2" },
-      children: [
-        Field({
-          name: "AttestationElements",
-          id: 0,
-          type: "octstr",
-          conformance: "M",
-          constraint: "max 900",
-          details: "This field shall contain the octet string of the serialized attestation_elements_message.",
-          xref: { document: "core", section: "11.18.6.2.1" }
-        }),
-        Field({
-          name: "AttestationSignature",
-          id: 1,
-          type: "octstr",
-          conformance: "M",
-          constraint: "64",
-          details: "This field shall contain the octet string of the necessary attestation_signature as described in Section 11.18.4.7, \u201CAttestation Information\u201D.",
-          xref: { document: "core", section: "11.18.6.2.2" }
-        })
-      ]
+      xref: { document: "core", section: "11.18.6.2" }
+    },
+    Field({
+      name: "AttestationElements",
+      id: 0,
+      type: "octstr",
+      conformance: "M",
+      constraint: "max 900",
+      details: "This field shall contain the octet string of the serialized attestation_elements_message.",
+      xref: { document: "core", section: "11.18.6.2.1" }
     }),
-    Command({
+    Field({
+      name: "AttestationSignature",
+      id: 1,
+      type: "octstr",
+      conformance: "M",
+      constraint: "64",
+      details: "This field shall contain the octet string of the necessary attestation_signature as described in Section 11.18.4.7, \u201CAttestation Information\u201D.",
+      xref: { document: "core", section: "11.18.6.2.2" }
+    })
+  ),
+  Command(
+    {
       name: "CertificateChainRequest",
       id: 2,
       access: "A",
@@ -135,33 +145,31 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "CertificateChainResponse",
       details: "If the CertificateType is not a valid value per CertificateChainTypeEnum then the command shall fail with a Status Code of INVALID_COMMAND.",
-      xref: { document: "core", section: "11.18.6.3" },
-      children: [Field({
-        name: "CertificateType",
-        id: 0,
-        type: "CertificateChainTypeEnum",
-        conformance: "M",
-        constraint: "desc"
-      })]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.3" }
+    },
+    Field({ name: "CertificateType", id: 0, type: "CertificateChainTypeEnum", conformance: "M", constraint: "desc" })
+  ),
+  Command(
+    {
       name: "CertificateChainResponse",
       id: 3,
       conformance: "M",
       direction: "response",
       details: "This command shall be generated in response to a CertificateChainRequest command.",
-      xref: { document: "core", section: "11.18.6.4" },
-      children: [Field({
-        name: "Certificate",
-        id: 0,
-        type: "octstr",
-        conformance: "M",
-        constraint: "max 600",
-        details: "This field shall be the DER encoded certificate corresponding to the CertificateType field in the CertificateChainRequest command.",
-        xref: { document: "core", section: "11.18.6.4.1" }
-      })]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.4" }
+    },
+    Field({
+      name: "Certificate",
+      id: 0,
+      type: "octstr",
+      conformance: "M",
+      constraint: "max 600",
+      details: "This field shall be the DER encoded certificate corresponding to the CertificateType field in the CertificateChainRequest command.",
+      xref: { document: "core", section: "11.18.6.4.1" }
+    })
+  ),
+  Command(
+    {
       name: "CsrRequest",
       id: 4,
       access: "A",
@@ -169,41 +177,41 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "CsrResponse",
       details: "This command shall be generated to execute the Node Operational CSR Procedure and subsequently return the NOCSR Information, in the form of a CSRResponse Command.\nThe CSRNonce field shall be used in the computation of the NOCSR Information. If the CSRNonce is malformed, then this command shall fail with an INVALID_COMMAND status code.\nIf the IsForUpdateNOC field is present and set to true, but the command was received over a PASE session, the command shall fail with an INVALID_COMMAND status code, as it would never be possible to use a resulting subsequent certificate issued from the CSR with the UpdateNOC command, which is forbidden over PASE sessions.\nIf the IsForUpdateNOC field is present and set to true, the internal state of the CSR associated keypair shall be tagged as being for a subsequent UpdateNOC, otherwise the internal state of the CSR shall be tagged as being for a subsequent AddNOC. See AddNOC and UpdateNOC for details about the processing.\nIf this command is received without an armed fail-safe context (see Section 11.10.6.2, \u201CArmFailSafe Command\u201D), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator.\nIf a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf the Node Operational Key Pair generated during processing of the Node Operational CSR Procedure is found to collide with an existing key pair already previously generated and installed, and that check had been executed, then this command shall fail with a FAILURE status code sent back to the initiator.",
-      xref: { document: "core", section: "11.18.6.5" },
-      children: [
-        Field({ name: "CsrNonce", id: 0, type: "octstr", conformance: "M", constraint: "32" }),
-        Field({ name: "IsForUpdateNoc", id: 1, type: "bool", conformance: "O", default: false })
-      ]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.5" }
+    },
+    Field({ name: "CsrNonce", id: 0, type: "octstr", conformance: "M", constraint: "32" }),
+    Field({ name: "IsForUpdateNoc", id: 1, type: "bool", conformance: "O", default: false })
+  ),
+  Command(
+    {
       name: "CsrResponse",
       id: 5,
       conformance: "M",
       direction: "response",
       details: "This command shall be generated in response to a CSRRequest Command.\nSee Section 11.18.4.9, \u201CNOCSR Information\u201D for details about the generation of the fields within this response command.\nSee Section F.3, \u201CNode Operational CSR Response test vector\u201D for an example computation of a CSRResponse.",
-      xref: { document: "core", section: "11.18.6.6" },
-      children: [
-        Field({
-          name: "NocsrElements",
-          id: 0,
-          type: "octstr",
-          conformance: "M",
-          constraint: "max 900",
-          details: "This field shall contain the octet string of the serialized nocsr_elements_message.",
-          xref: { document: "core", section: "11.18.6.6.1" }
-        }),
-        Field({
-          name: "AttestationSignature",
-          id: 1,
-          type: "octstr",
-          conformance: "M",
-          constraint: "64",
-          details: "This field shall contain the octet string of the necessary attestation_signature as described in Section 11.18.4.9, \u201CNOCSR Information\u201D.",
-          xref: { document: "core", section: "11.18.6.6.2" }
-        })
-      ]
+      xref: { document: "core", section: "11.18.6.6" }
+    },
+    Field({
+      name: "NocsrElements",
+      id: 0,
+      type: "octstr",
+      conformance: "M",
+      constraint: "max 900",
+      details: "This field shall contain the octet string of the serialized nocsr_elements_message.",
+      xref: { document: "core", section: "11.18.6.6.1" }
     }),
-    Command({
+    Field({
+      name: "AttestationSignature",
+      id: 1,
+      type: "octstr",
+      conformance: "M",
+      constraint: "64",
+      details: "This field shall contain the octet string of the necessary attestation_signature as described in Section 11.18.4.9, \u201CNOCSR Information\u201D.",
+      xref: { document: "core", section: "11.18.6.6.2" }
+    })
+  ),
+  Command(
+    {
       name: "AddNoc",
       id: 6,
       access: "A",
@@ -211,38 +219,38 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "NocResponse",
       details: "This command shall add a new NOC chain to the device and commission a new Fabric association upon successful validation of all arguments and preconditions.\nThe new value shall immediately be reflected in the NOCs list attribute.\nA Commissioner or Administrator shall issue this command after issuing the CSRRequest command and receiving its response.\nA Commissioner or Administrator SHOULD issue this command after performing the Attestation Procedure.",
-      xref: { document: "core", section: "11.18.6.8" },
-      children: [
-        Field({ name: "NocValue", id: 0, type: "octstr", conformance: "M", constraint: "max 400" }),
-        Field({ name: "IcacValue", id: 1, type: "octstr", conformance: "O", constraint: "max 400" }),
-        Field({
-          name: "IpkValue",
-          id: 2,
-          type: "octstr",
-          conformance: "M",
-          constraint: "16",
-          details: "This field shall contain the value of the Epoch Key for the Identity Protection Key (IPK) to set for the Fabric which is to be added. This is needed to bootstrap a necessary configuration value for subsequent CASE to succeed. See Section 4.14.2.6.1, \u201CIdentity Protection Key (IPK)\u201D for details.\nThe IPK shall be provided as an octet string of length CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES.\nOn successful execution of the AddNOC command, the side-effect of having provided this field shall be equivalent to having done a GroupKeyManagement cluster KeySetWrite command invocation using the newly joined fabric as the accessing fabric and with the following argument fields (assuming KeySetWrite allowed a GroupKeySetID set to 0):",
-          xref: { document: "core", section: "11.18.6.8.1" }
-        }),
-        Field({
-          name: "CaseAdminSubject",
-          id: 3,
-          type: "subject-id",
-          conformance: "M",
-          details: 'If the AddNOC command succeeds according to the semantics of the following subsections, then the Access Control SubjectID shall be used to atomically add an Access Control Entry enabling that Subject to subsequently administer the Node whose operational identity is being added by this command.\nThe format of the new Access Control Entry, created from this, shall be:\nNOTE\nUnless such an Access Control Entry is added atomically as described here, there would be no way for the caller on its given Fabric to eventually add another Access Control Entry for CASE authentication mode, to enable the new Administrator to administer the device, since the Fabric Scoping of the Access Control List prevents the current Node from being able to write new entries scoped to that Fabric, if the session is established from CASE. While a session established from PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide symmetry between both types of session establishment, both of which need to eventually add an "Administer Node over CASE" Access Control Entry to finalize new Fabric configuration and subsequently be able to call the CommissioningComplete command.',
-          xref: { document: "core", section: "11.18.6.8.2" }
-        }),
-        Field({
-          name: "AdminVendorId",
-          id: 4,
-          type: "vendor-id",
-          conformance: "M",
-          details: 'This field shall be set to the Vendor ID of the entity issuing the AddNOC command. This value shall NOT be one of the reserved Vendor ID values defined in Table 1, \u201CVendor ID Allocations\u201D.\n### Effect When Received\nIf this command is received without an armed fail-safe context (see Section 11.10.6.2, \u201CArmFailSafe Command\u201D), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator.\nIf a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf the prior CSRRequest state that preceded AddNOC had the IsForUpdateNOC field indicated as true, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf no prior AddTrustedRootCertificate command was successfully executed within the fail-safe timer period, then this command shall process an error by responding with a NOCResponse with a StatusCode of InvalidNOC as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D. In other words, AddNOC always requires that the client provides the root of trust certificate within the same Fail- Safe context as the rest of the new fabric\u2019s operational credentials, even if some other fabric already uses the exact same root of trust certificate.\nIf the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab\nricID> pair already present on the device, then the device shall process the error by responding with a StatusCode of FabricConflict as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nIf the device already has the CommissionedFabrics attribute equal to the SupportedFabrics attribute, then the device\u2019s operational credentials table is considered full and the device shall process the error by responding with a StatusCode of TableFull as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nIf the CaseAdminSubject field is not a valid ACL subject in the context of AuthMode set to CASE, such as not being in either the Operational or CASE Authenticated Tag range, then the device shall process the error by responding with a StatusCode of InvalidAdminSubject as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nOtherwise, the command is considered an addition of credentials, also known as "joining a fabric", and the following shall apply:\n  1. A new FabricIndex shall be allocated, taking the next valid fabric-index value in       monotonically incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is       reserved and using 255 (0xFF) would prevent cluster specifications from using nullable       fabric-idx fields.\n  2. An entry within the Fabrics attribute table shall be added, reflecting the matter-fabric-id       RDN within the NOC\u2019s subject, along with the public key of the trusted root of the chain and       the AdminVendorID field.\n  3. The operational key pair associated with the incoming NOC from the NOCValue, and generated by       the prior CSRRequest command, shall be recorded for subsequent use during CASE within the       fail-safe timer period (see Section 5.5, \u201CCommissioning Flows\u201D).\n  4. The incoming NOCValue and ICACValue (if present) shall be stored under the FabricIndex       associated with the new Fabric Scope, along with the RootCACertificate provided with the       prior successful AddTrustedRootCertificate command invoked in the same fail-safe period.\n    a. Implementation of certificate chain storage may separate or otherwise encode the components        of the array in implementation-specific ways, as long as they follow the correct format when        being read from the NOCs list or used within other protocols such as CASE.\n  5. The NOCs list shall reflect the incoming NOC from the NOCValue field and ICAC from the       ICACValue field (if present).\n  6. The operational discovery service record shall immediately reflect the new Operational       Identifier, such that the Node immediately begins to exist within the Fabric and becomes       reachable over CASE under the new operational identity.\n  7. The receiver shall create and add a new Access Control Entry using the CaseAdminSubject field       to grant subsequent Administer access to an Administrator member of the new Fabric. It is       recommended that the Administrator presented in CaseAdminSubject exist within the same entity       that is currently invoking the AddNOC command, within another of the Fabrics of which it is a       member.\n  8. The incoming IPKValue shall be stored in the Fabric-scoped slot within the Group Key       Management cluster (see KeySetWrite), for subsequent use during CASE.\n  9. The Fabric Index associated with the armed fail-safe context (see Section 11.10.6.2,       \u201CArmFailSafe Command\u201D) shall be updated to match the Fabric Index just allocated.\n  10. If the current secure session was established with PASE, the receiver shall:\n    a. Augment the secure session context with the FabricIndex generated above, such that        subsequent interactions have the proper accessing fabric.\n  11. If the current secure session was established with CASE, subsequent configuration of the       newly installed Fabric requires the opening of a new CASE session from the Administrator from       the Fabric just installed. This Administrator is the one listed in the CaseAdminSubject       argument.\nThereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex field matching the FabricIndex under which the new Node Operational Certificate (NOC) is scoped.',
-          xref: { document: "core", section: "11.18.6.8.3" }
-        })
-      ]
+      xref: { document: "core", section: "11.18.6.8" }
+    },
+    Field({ name: "NocValue", id: 0, type: "octstr", conformance: "M", constraint: "max 400" }),
+    Field({ name: "IcacValue", id: 1, type: "octstr", conformance: "O", constraint: "max 400" }),
+    Field({
+      name: "IpkValue",
+      id: 2,
+      type: "octstr",
+      conformance: "M",
+      constraint: "16",
+      details: "This field shall contain the value of the Epoch Key for the Identity Protection Key (IPK) to set for the Fabric which is to be added. This is needed to bootstrap a necessary configuration value for subsequent CASE to succeed. See Section 4.14.2.6.1, \u201CIdentity Protection Key (IPK)\u201D for details.\nThe IPK shall be provided as an octet string of length CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES.\nOn successful execution of the AddNOC command, the side-effect of having provided this field shall be equivalent to having done a GroupKeyManagement cluster KeySetWrite command invocation using the newly joined fabric as the accessing fabric and with the following argument fields (assuming KeySetWrite allowed a GroupKeySetID set to 0):",
+      xref: { document: "core", section: "11.18.6.8.1" }
+    }),
+    Field({
+      name: "CaseAdminSubject",
+      id: 3,
+      type: "subject-id",
+      conformance: "M",
+      details: 'If the AddNOC command succeeds according to the semantics of the following subsections, then the Access Control SubjectID shall be used to atomically add an Access Control Entry enabling that Subject to subsequently administer the Node whose operational identity is being added by this command.\nThe format of the new Access Control Entry, created from this, shall be:\nNOTE\nUnless such an Access Control Entry is added atomically as described here, there would be no way for the caller on its given Fabric to eventually add another Access Control Entry for CASE authentication mode, to enable the new Administrator to administer the device, since the Fabric Scoping of the Access Control List prevents the current Node from being able to write new entries scoped to that Fabric, if the session is established from CASE. While a session established from PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide symmetry between both types of session establishment, both of which need to eventually add an "Administer Node over CASE" Access Control Entry to finalize new Fabric configuration and subsequently be able to call the CommissioningComplete command.',
+      xref: { document: "core", section: "11.18.6.8.2" }
     }),
-    Command({
+    Field({
+      name: "AdminVendorId",
+      id: 4,
+      type: "vendor-id",
+      conformance: "M",
+      details: 'This field shall be set to the Vendor ID of the entity issuing the AddNOC command. This value shall NOT be one of the reserved Vendor ID values defined in Table 1, \u201CVendor ID Allocations\u201D.\n### Effect When Received\nIf this command is received without an armed fail-safe context (see Section 11.10.6.2, \u201CArmFailSafe Command\u201D), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator.\nIf a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf the prior CSRRequest state that preceded AddNOC had the IsForUpdateNOC field indicated as true, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf no prior AddTrustedRootCertificate command was successfully executed within the fail-safe timer period, then this command shall process an error by responding with a NOCResponse with a StatusCode of InvalidNOC as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D. In other words, AddNOC always requires that the client provides the root of trust certificate within the same Fail- Safe context as the rest of the new fabric\u2019s operational credentials, even if some other fabric already uses the exact same root of trust certificate.\nIf the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab\nricID> pair already present on the device, then the device shall process the error by responding with a StatusCode of FabricConflict as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nIf the device already has the CommissionedFabrics attribute equal to the SupportedFabrics attribute, then the device\u2019s operational credentials table is considered full and the device shall process the error by responding with a StatusCode of TableFull as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nIf the CaseAdminSubject field is not a valid ACL subject in the context of AuthMode set to CASE, such as not being in either the Operational or CASE Authenticated Tag range, then the device shall process the error by responding with a StatusCode of InvalidAdminSubject as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D.\nOtherwise, the command is considered an addition of credentials, also known as "joining a fabric", and the following shall apply:\n  1. A new FabricIndex shall be allocated, taking the next valid fabric-index value in       monotonically incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is       reserved and using 255 (0xFF) would prevent cluster specifications from using nullable       fabric-idx fields.\n  2. An entry within the Fabrics attribute table shall be added, reflecting the matter-fabric-id       RDN within the NOC\u2019s subject, along with the public key of the trusted root of the chain and       the AdminVendorID field.\n  3. The operational key pair associated with the incoming NOC from the NOCValue, and generated by       the prior CSRRequest command, shall be recorded for subsequent use during CASE within the       fail-safe timer period (see Section 5.5, \u201CCommissioning Flows\u201D).\n  4. The incoming NOCValue and ICACValue (if present) shall be stored under the FabricIndex       associated with the new Fabric Scope, along with the RootCACertificate provided with the       prior successful AddTrustedRootCertificate command invoked in the same fail-safe period.\n    a. Implementation of certificate chain storage may separate or otherwise encode the components        of the array in implementation-specific ways, as long as they follow the correct format when        being read from the NOCs list or used within other protocols such as CASE.\n  5. The NOCs list shall reflect the incoming NOC from the NOCValue field and ICAC from the       ICACValue field (if present).\n  6. The operational discovery service record shall immediately reflect the new Operational       Identifier, such that the Node immediately begins to exist within the Fabric and becomes       reachable over CASE under the new operational identity.\n  7. The receiver shall create and add a new Access Control Entry using the CaseAdminSubject field       to grant subsequent Administer access to an Administrator member of the new Fabric. It is       recommended that the Administrator presented in CaseAdminSubject exist within the same entity       that is currently invoking the AddNOC command, within another of the Fabrics of which it is a       member.\n  8. The incoming IPKValue shall be stored in the Fabric-scoped slot within the Group Key       Management cluster (see KeySetWrite), for subsequent use during CASE.\n  9. The Fabric Index associated with the armed fail-safe context (see Section 11.10.6.2,       \u201CArmFailSafe Command\u201D) shall be updated to match the Fabric Index just allocated.\n  10. If the current secure session was established with PASE, the receiver shall:\n    a. Augment the secure session context with the FabricIndex generated above, such that        subsequent interactions have the proper accessing fabric.\n  11. If the current secure session was established with CASE, subsequent configuration of the       newly installed Fabric requires the opening of a new CASE session from the Administrator from       the Fabric just installed. This Administrator is the one listed in the CaseAdminSubject       argument.\nThereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex field matching the FabricIndex under which the new Node Operational Certificate (NOC) is scoped.',
+      xref: { document: "core", section: "11.18.6.8.3" }
+    })
+  ),
+  Command(
+    {
       name: "UpdateNoc",
       id: 7,
       access: "F A",
@@ -250,50 +258,50 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "NocResponse",
       details: "This command shall replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. The new value shall immediately be reflected in the NOCs list attribute.\nA Commissioner or Administrator shall issue this command after issuing the CSRRequest Command and receiving its response.\nA Commissioner or Administrator SHOULD issue this command after performing the Attestation Procedure.\nEffect When Received\nIf this command is received without an armed fail-safe context (see Section 11.10.6.2, \u201CArmFailSafe Command\u201D), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator.\nIf a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf a prior AddTrustedRootCertificate command was successfully invoked within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator, since the only valid following logical operation is invoking the AddNOC command.\nIf the prior CSRRequest state that preceded UpdateNOC had the IsForUpdateNOC field indicated as false, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf any of the following conditions arise, the Node shall process an error by responding with an\nNOCResponse with a StatusCode of InvalidNOC as described in Section 11.18.6.7.2, \u201CHandling Errors\u201D:\n  \u2022 The NOC provided in the NOCValue does not refer in its subject to the FabricID associated with     the accessing fabric.\n  \u2022 The ICAC provided in the ICACValue (if present) has a FabricID in its subject that does not     match the FabricID associated with the accessing fabric.\nOtherwise, the command is considered an update of existing credentials for a given Fabric, and the following shall apply:\n  1. The Operational Certificate under the accessing fabric index in the NOCs list shall be updated      to match the incoming NOCValue and ICACValue (if present), such that the Node\u2019s Operational      Identifier within the Fabric immediately changes.\n    a. The operational key pair associated with the incoming NOC from the NOCValue, and generated        by the prior CSRRequest command, shall be committed to permanent storage, for subsequent use        during CASE.\n    b. The operational discovery service record shall immediately reflect the new Operational        Identifier.\n    c. All internal data reflecting the prior operational identifier of the Node within the Fabric        shall be revoked and removed, to an outcome equivalent to the disappearance of the prior        Node, except for the ongoing CASE session context, which shall temporarily remain valid        until the NOCResponse has been successfully delivered or until the next transport-layer        error, so that the response can be received by the Administrator invoking the command.\nThereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex field matching the FabricIndex under which the updated NOC is scoped.",
-      xref: { document: "core", section: "11.18.6.9" },
-      children: [
-        Field({ name: "NocValue", id: 0, type: "octstr", access: "F", conformance: "M", constraint: "max 400" }),
-        Field({ name: "IcacValue", id: 1, type: "octstr", access: "F", conformance: "O", constraint: "max 400" }),
-        Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
-      ]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.9" }
+    },
+    Field({ name: "NocValue", id: 0, type: "octstr", access: "F", conformance: "M", constraint: "max 400" }),
+    Field({ name: "IcacValue", id: 1, type: "octstr", access: "F", conformance: "O", constraint: "max 400" }),
+    Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
+  ),
+  Command(
+    {
       name: "NocResponse",
       id: 8,
       conformance: "M",
       direction: "response",
       details: "This command shall be generated in response to the following commands:\n  \u2022 AddNOC\n  \u2022 UpdateNOC\n  \u2022 UpdateFabricLabel\n  \u2022 RemoveFabric\nIt provides status information about the success or failure of those commands.",
-      xref: { document: "core", section: "11.18.6.10" },
-      children: [
-        Field({
-          name: "StatusCode",
-          id: 0,
-          type: "NodeOperationalCertStatusEnum",
-          conformance: "M",
-          details: "This field shall contain an NOCStatus value representing the status of an operation involving a NOC.",
-          xref: { document: "core", section: "11.18.6.10.1" }
-        }),
-        Field({
-          name: "FabricIndex",
-          id: 1,
-          type: "fabric-idx",
-          conformance: "O",
-          constraint: "1 to 254",
-          details: "This field shall be present whenever StatusCode has a value of OK. If present, it shall contain the Fabric Index of the Fabric last added, removed or updated.",
-          xref: { document: "core", section: "11.18.6.10.2" }
-        }),
-        Field({
-          name: "DebugText",
-          id: 2,
-          type: "string",
-          conformance: "O",
-          constraint: "max 128",
-          details: "This field may contain debugging textual information from the cluster implementation, which SHOULD NOT be presented to user interfaces in any way. Its purpose is to help developers in troubleshooting errors and the contents may go into logs or crash reports.",
-          xref: { document: "core", section: "11.18.6.10.3" }
-        })
-      ]
+      xref: { document: "core", section: "11.18.6.10" }
+    },
+    Field({
+      name: "StatusCode",
+      id: 0,
+      type: "NodeOperationalCertStatusEnum",
+      conformance: "M",
+      details: "This field shall contain an NOCStatus value representing the status of an operation involving a NOC.",
+      xref: { document: "core", section: "11.18.6.10.1" }
     }),
-    Command({
+    Field({
+      name: "FabricIndex",
+      id: 1,
+      type: "fabric-idx",
+      conformance: "O",
+      constraint: "1 to 254",
+      details: "This field shall be present whenever StatusCode has a value of OK. If present, it shall contain the Fabric Index of the Fabric last added, removed or updated.",
+      xref: { document: "core", section: "11.18.6.10.2" }
+    }),
+    Field({
+      name: "DebugText",
+      id: 2,
+      type: "string",
+      conformance: "O",
+      constraint: "max 128",
+      details: "This field may contain debugging textual information from the cluster implementation, which SHOULD NOT be presented to user interfaces in any way. Its purpose is to help developers in troubleshooting errors and the contents may go into logs or crash reports.",
+      xref: { document: "core", section: "11.18.6.10.3" }
+    })
+  ),
+  Command(
+    {
       name: "UpdateFabricLabel",
       id: 9,
       access: "F A",
@@ -301,22 +309,22 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "NocResponse",
       details: "This command shall be used by an Administrator to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. An Administrator shall use this command to set the Label to a string (possibly selected by the user themselves) that the user can recognize and relate to this Administrator\n  \u2022 during the commissioning process, and\n  \u2022 whenever the user chooses to update this string.\nThe Label field, along with the VendorID field in the same entry of the Fabrics attribute, SHOULD be used by Administrators to provide additional per-fabric context when operations such as RemoveFabric are considered or used.",
-      xref: { document: "core", section: "11.18.6.11" },
-      children: [
-        Field({
-          name: "Label",
-          id: 0,
-          type: "string",
-          access: "F",
-          conformance: "M",
-          constraint: "max 32",
-          details: "This field shall contain the label to set for the fabric associated with the current secure session.\nEffect on Receipt\nIf the Label field is identical to a Label already in use by a Fabric within the Fabrics list that is not the accessing fabric, then an NOCResponse with a StatusCode of LabelConflict shall be returned for the command and there shall NOT be any permanent changes to any Fabric data.\nOtherwise, the Label field for the accessing fabric shall immediately be updated to reflect the Label argument provided. Following the update, an NOCResponse with a StatusCode of OK shall be returned.\nIf the command was invoked within a fail-safe context after a successful UpdateNOC command, then the label update shall apply to the pending update state that will be reverted if fail-safe expires prior to a CommissioningComplete command. In other words, label updates apply to the state of the Fabrics Attribute as currently visible, even for an existing fabric currently in process of being updated.",
-          xref: { document: "core", section: "11.18.6.11.1" }
-        }),
-        Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
-      ]
+      xref: { document: "core", section: "11.18.6.11" }
+    },
+    Field({
+      name: "Label",
+      id: 0,
+      type: "string",
+      access: "F",
+      conformance: "M",
+      constraint: "max 32",
+      details: "This field shall contain the label to set for the fabric associated with the current secure session.\nEffect on Receipt\nIf the Label field is identical to a Label already in use by a Fabric within the Fabrics list that is not the accessing fabric, then an NOCResponse with a StatusCode of LabelConflict shall be returned for the command and there shall NOT be any permanent changes to any Fabric data.\nOtherwise, the Label field for the accessing fabric shall immediately be updated to reflect the Label argument provided. Following the update, an NOCResponse with a StatusCode of OK shall be returned.\nIf the command was invoked within a fail-safe context after a successful UpdateNOC command, then the label update shall apply to the pending update state that will be reverted if fail-safe expires prior to a CommissioningComplete command. In other words, label updates apply to the state of the Fabrics Attribute as currently visible, even for an existing fabric currently in process of being updated.",
+      xref: { document: "core", section: "11.18.6.11.1" }
     }),
-    Command({
+    Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
+  ),
+  Command(
+    {
       name: "RemoveFabric",
       id: 10,
       access: "A",
@@ -324,18 +332,20 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "NocResponse",
       details: "This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data.\nIf the given Fabric being removed is the last one to reference a given Trusted Root CA Certificate stored in the Trusted Root Certificates list, then that Trusted Root Certificate shall be removed.\nWARNING\nThis command, if referring to an already existing Fabric not under the control of the invoking Administrator, shall ONLY be invoked after obtaining some form of explicit user consent through some method executed by the Administrator or Commissioner. This method of obtaining consent SHOULD employ as much data as possible about the existing Fabric associations within the Fabrics list, so that likelihood is as small as possible of a user removing a Fabric unwittingly. If a method exists for an Administrator or Commissioner to convey Fabric Removal to an entity related to that Fabric, whether in-band or out-of-band, then this method SHOULD be used to notify the other Administrative Domain\u2019s party of the removal. Otherwise, users may only observe the removal of a Fabric association as persistently failing attempts to reach a Node operationally.",
-      xref: { document: "core", section: "11.18.6.12" },
-      children: [Field({
-        name: "FabricIndex",
-        id: 0,
-        type: "fabric-idx",
-        conformance: "M",
-        constraint: "1 to 254",
-        details: "This field shall contain the Fabric Index reference (see fabric-index) associated with the Fabric which is to be removed from the device.\nEffect on Receipt\nIf the FabricIndex field does not match the FabricIndex of any entry within the Fabrics list, then an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and there shall NOT be any permanent changes to any device data.\nOtherwise, one of the following outcomes shall occur:\n  1. If the FabricIndex matches the last remaining entry in the Fabrics list, then the device shall      delete all Matter related data on the node which was created since it was commissioned. This\nincludes all Fabric-Scoped data, including Access Control List, bindings, scenes, group keys, operational certificates, etc. All Trusted Roots shall also be removed. If a time synchronization cluster is present on the Node, the TrustedTimeSource and DefaultNtp shall be set to null. Any Matter related data including logs, secure sessions, exchanges and interaction model constructs shall also be removed. Since this operation involves the removal of the secure session data that may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a response before terminating its secure session with the target.\n2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the process of irrevocably deleting all associated Fabric-Scoped data, including Access Control List, bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any operational certificate shall also be removed. If a time synchronization cluster is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model constructs related to the Operational Identity under the given Fabric shall also be removed. Following the removal, an NOCResponse with a StatusCode of OK shall be returned.\n3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process of irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any operational certificate shall also be removed. If a time synchronization cluster is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model constructs related to the Operational Identity under the given Fabric shall also be removed. Since this operation involves the removal of the secure session data that may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a response before terminating its secure session with the target.",
-        xref: { document: "core", section: "11.18.6.12.1" }
-      })]
-    }),
-    Command({
+      xref: { document: "core", section: "11.18.6.12" }
+    },
+    Field({
+      name: "FabricIndex",
+      id: 0,
+      type: "fabric-idx",
+      conformance: "M",
+      constraint: "1 to 254",
+      details: "This field shall contain the Fabric Index reference (see fabric-index) associated with the Fabric which is to be removed from the device.\nEffect on Receipt\nIf the FabricIndex field does not match the FabricIndex of any entry within the Fabrics list, then an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and there shall NOT be any permanent changes to any device data.\nOtherwise, one of the following outcomes shall occur:\n  1. If the FabricIndex matches the last remaining entry in the Fabrics list, then the device shall      delete all Matter related data on the node which was created since it was commissioned. This\nincludes all Fabric-Scoped data, including Access Control List, bindings, scenes, group keys, operational certificates, etc. All Trusted Roots shall also be removed. If a time synchronization cluster is present on the Node, the TrustedTimeSource and DefaultNtp shall be set to null. Any Matter related data including logs, secure sessions, exchanges and interaction model constructs shall also be removed. Since this operation involves the removal of the secure session data that may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a response before terminating its secure session with the target.\n2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the process of irrevocably deleting all associated Fabric-Scoped data, including Access Control List, bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any operational certificate shall also be removed. If a time synchronization cluster is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model constructs related to the Operational Identity under the given Fabric shall also be removed. Following the removal, an NOCResponse with a StatusCode of OK shall be returned.\n3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process of irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any operational certificate shall also be removed. If a time synchronization cluster is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model constructs related to the Operational Identity under the given Fabric shall also be removed. Since this operation involves the removal of the secure session data that may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a response before terminating its secure session with the target.",
+      xref: { document: "core", section: "11.18.6.12.1" }
+    })
+  ),
+  Command(
+    {
       name: "AddTrustedRootCertificate",
       id: 11,
       access: "A",
@@ -343,184 +353,152 @@ const OperationalCredentials = Cluster({
       direction: "request",
       response: "status",
       details: "This command shall add a Trusted Root CA Certificate, provided as its Matter Certificate Encoding representation, to the TrustedRootCertificates Attribute list and shall ensure the next AddNOC command executed uses the provided certificate as its root of trust.\nIf the certificate from the RootCACertificate field is already installed, based on exact byte-for-byte equality, then this command shall succeed with no change to the list.\nIf this command is received without an armed fail-safe context (see Section 11.10.6.2, \u201CArmFailSafe Command\u201D), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator.\nIf a prior AddTrustedRootCertificate command was successfully invoked within the fail-safe timer period, which would cause the new invocation to add a second root certificate within a given fail- safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.\nIf the certificate from the RootCACertificate field fails any validity checks, not fulfilling all the requirements for a valid Matter Certificate Encoding representation, including a truncated or oversize value, then this command shall fail with an INVALID_COMMAND status code sent back to the initiator.\nNote that the only method of removing a trusted root is by removing the Fabric that uses it as its root of trust using the RemoveFabric command.",
-      xref: { document: "core", section: "11.18.6.13" },
-      children: [
-        Field({ name: "RootCaCertificate", id: 0, type: "octstr", conformance: "M", constraint: "max 400" })
-      ]
-    }),
-    Datatype({
+      xref: { document: "core", section: "11.18.6.13" }
+    },
+    Field({ name: "RootCaCertificate", id: 0, type: "octstr", conformance: "M", constraint: "max 400" })
+  ),
+  Datatype(
+    {
       name: "CertificateChainTypeEnum",
       type: "enum8",
       details: "This enumeration is used by the CertificateChainRequest command to convey which certificate from the device attestation certificate chain to transmit back to the client.",
-      xref: { document: "core", section: "11.18.4.2" },
-      children: [
-        Field({
-          name: "DacCertificate",
-          id: 1,
-          conformance: "M",
-          description: "Request the DER- encoded DAC certificate"
-        }),
-        Field({
-          name: "PaiCertificate",
-          id: 2,
-          conformance: "M",
-          description: "Request the DER- encoded PAI certificate"
-        })
-      ]
-    }),
-    Datatype({
+      xref: { document: "core", section: "11.18.4.2" }
+    },
+    Field({ name: "DacCertificate", id: 1, conformance: "M", description: "Request the DER- encoded DAC certificate" }),
+    Field({ name: "PaiCertificate", id: 2, conformance: "M", description: "Request the DER- encoded PAI certificate" })
+  ),
+  Datatype(
+    {
       name: "NodeOperationalCertStatusEnum",
       type: "enum8",
       details: "This enumeration is used by the NOCResponse common response command to convey detailed outcome of several of this cluster\u2019s operations.",
-      xref: { document: "core", section: "11.18.4.3" },
-      children: [
-        Field({ name: "Ok", id: 0, conformance: "M", description: "OK, no error" }),
-        Field({
-          name: "InvalidPublicKey",
-          id: 1,
-          conformance: "M",
-          description: "Public Key in the NOC does not match the public key in the NOCSR"
-        }),
-        Field({
-          name: "InvalidNodeOpId",
-          id: 2,
-          conformance: "M",
-          description: "The Node Operational ID in the NOC is not formatted correctly."
-        }),
-        Field({
-          name: "InvalidNoc",
-          id: 3,
-          conformance: "M",
-          description: "Any other validation error in NOC chain"
-        }),
-        Field({
-          name: "MissingCsr",
-          id: 4,
-          conformance: "M",
-          description: "No record of prior CSR for which this NOC could match"
-        }),
-        Field({
-          name: "TableFull",
-          id: 5,
-          conformance: "M",
-          description: "NOCs table full, cannot add another one"
-        }),
-        Field({
-          name: "InvalidAdminSubject",
-          id: 6,
-          conformance: "M",
-          description: "Invalid CaseAdminSubject field for an AddNOC command."
-        }),
-        Field({
-          name: "FabricConflict",
-          id: 9,
-          conformance: "M",
-          description: "Trying to AddNOC instead of UpdateNOC against an existing Fabric."
-        }),
-        Field({
-          name: "LabelConflict",
-          id: 10,
-          conformance: "M",
-          description: "Label already exists on another Fabric."
-        }),
-        Field({
-          name: "InvalidFabricIndex",
-          id: 11,
-          conformance: "M",
-          description: "FabricIndex argument is invalid."
-        })
-      ]
+      xref: { document: "core", section: "11.18.4.3" }
+    },
+    Field({ name: "Ok", id: 0, conformance: "M", description: "OK, no error" }),
+    Field({
+      name: "InvalidPublicKey",
+      id: 1,
+      conformance: "M",
+      description: "Public Key in the NOC does not match the public key in the NOCSR"
+    }),
+    Field({
+      name: "InvalidNodeOpId",
+      id: 2,
+      conformance: "M",
+      description: "The Node Operational ID in the NOC is not formatted correctly."
+    }),
+    Field({ name: "InvalidNoc", id: 3, conformance: "M", description: "Any other validation error in NOC chain" }),
+    Field({
+      name: "MissingCsr",
+      id: 4,
+      conformance: "M",
+      description: "No record of prior CSR for which this NOC could match"
+    }),
+    Field({ name: "TableFull", id: 5, conformance: "M", description: "NOCs table full, cannot add another one" }),
+    Field({
+      name: "InvalidAdminSubject",
+      id: 6,
+      conformance: "M",
+      description: "Invalid CaseAdminSubject field for an AddNOC command."
     }),
-    Datatype({
+    Field({
+      name: "FabricConflict",
+      id: 9,
+      conformance: "M",
+      description: "Trying to AddNOC instead of UpdateNOC against an existing Fabric."
+    }),
+    Field({ name: "LabelConflict", id: 10, conformance: "M", description: "Label already exists on another Fabric." }),
+    Field({ name: "InvalidFabricIndex", id: 11, conformance: "M", description: "FabricIndex argument is invalid." })
+  ),
+  Datatype(
+    {
       name: "NOCStruct",
       type: "struct",
       details: "This encodes a fabric sensitive NOC chain, underpinning a commissioned Operational Identity for a given Node.\nNote that the Trusted Root CA Certificate is not included in this structure. The roots are available in the TrustedRootCertificates attribute of the Node Operational Credentials cluster.",
-      xref: { document: "core", section: "11.18.4.4" },
-      children: [
-        Field({
-          name: "Noc",
-          id: 1,
-          type: "octstr",
-          access: "S",
-          conformance: "M",
-          constraint: "max 400",
-          details: "This field shall contain the NOC for the struct\u2019s associated fabric, encoded using Matter Certificate Encoding.",
-          xref: { document: "core", section: "11.18.4.4.1" }
-        }),
-        Field({
-          name: "Icac",
-          id: 2,
-          type: "octstr",
-          access: "S",
-          conformance: "M",
-          constraint: "max 400",
-          quality: "X",
-          details: "This field shall contain the ICAC or the struct\u2019s associated fabric, encoded using Matter Certificate Encoding. If no ICAC is present in the chain, this field shall be set to null.",
-          xref: { document: "core", section: "11.18.4.4.2" }
-        }),
-        Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
-      ]
+      xref: { document: "core", section: "11.18.4.4" }
+    },
+    Field({
+      name: "Noc",
+      id: 1,
+      type: "octstr",
+      access: "S",
+      conformance: "M",
+      constraint: "max 400",
+      details: "This field shall contain the NOC for the struct\u2019s associated fabric, encoded using Matter Certificate Encoding.",
+      xref: { document: "core", section: "11.18.4.4.1" }
+    }),
+    Field({
+      name: "Icac",
+      id: 2,
+      type: "octstr",
+      access: "S",
+      conformance: "M",
+      constraint: "max 400",
+      quality: "X",
+      details: "This field shall contain the ICAC or the struct\u2019s associated fabric, encoded using Matter Certificate Encoding. If no ICAC is present in the chain, this field shall be set to null.",
+      xref: { document: "core", section: "11.18.4.4.2" }
     }),
-    Datatype({
+    Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
+  ),
+  Datatype(
+    {
       name: "FabricDescriptorStruct",
       type: "struct",
       details: "This structure encodes a Fabric Reference for a fabric within which a given Node is currently commissioned.",
-      xref: { document: "core", section: "11.18.4.5" },
-      children: [
-        Field({
-          name: "RootPublicKey",
-          id: 1,
-          type: "octstr",
-          access: "F",
-          conformance: "M",
-          constraint: "65",
-          details: "This field shall contain the public key for the trusted root that scopes the fabric referenced by FabricIndex and its associated operational credential (see Section 6.4.5.3, \u201CTrusted Root CA Certificates\u201D). The format for the key shall be the same as that used in the ec-pub-key field of the Matter Certificate Encoding for the root in the operational certificate chain.",
-          xref: { document: "core", section: "11.18.4.5.1" }
-        }),
-        Field({
-          name: "VendorId",
-          id: 2,
-          type: "vendor-id",
-          access: "F",
-          conformance: "M",
-          constraint: "desc",
-          details: "This field shall contain the value of AdminVendorID provided in the AddNOC command that led to the creation of this FabricDescriptorStruct. The set of allowed values is defined in AdminVendorID.\nThe intent is to provide some measure of user transparency about which entities have Administer privileges on the Node.",
-          xref: { document: "core", section: "11.18.4.5.2" }
-        }),
-        Field({
-          name: "FabricId",
-          id: 3,
-          type: "fabric-id",
-          access: "F",
-          conformance: "M",
-          details: "This field shall contain the FabricID allocated to the fabric referenced by FabricIndex. This field shall match the value found in the matter-fabric-id field from the operational certificate providing the operational identity under this Fabric.",
-          xref: { document: "core", section: "11.18.4.5.3" }
-        }),
-        Field({
-          name: "NodeId",
-          id: 4,
-          type: "node-id",
-          access: "F",
-          conformance: "M",
-          details: "This field shall contain the NodeID in use within the fabric referenced by FabricIndex. This field shall match the value found in the matter-node-id field from the operational certificate providing this operational identity.",
-          xref: { document: "core", section: "11.18.4.5.4" }
-        }),
-        Field({
-          name: "Label",
-          id: 5,
-          type: "string",
-          access: "F",
-          conformance: "M",
-          constraint: "max 32",
-          default: "",
-          details: "This field shall contain a commissioner-set label for the fabric referenced by FabricIndex. This label is set by the UpdateFabricLabel command.",
-          xref: { document: "core", section: "11.18.4.5.5" }
-        }),
-        Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
-      ]
-    })
-  ]
-});
+      xref: { document: "core", section: "11.18.4.5" }
+    },
+    Field({
+      name: "RootPublicKey",
+      id: 1,
+      type: "octstr",
+      access: "F",
+      conformance: "M",
+      constraint: "65",
+      details: "This field shall contain the public key for the trusted root that scopes the fabric referenced by FabricIndex and its associated operational credential (see Section 6.4.5.3, \u201CTrusted Root CA Certificates\u201D). The format for the key shall be the same as that used in the ec-pub-key field of the Matter Certificate Encoding for the root in the operational certificate chain.",
+      xref: { document: "core", section: "11.18.4.5.1" }
+    }),
+    Field({
+      name: "VendorId",
+      id: 2,
+      type: "vendor-id",
+      access: "F",
+      conformance: "M",
+      constraint: "desc",
+      details: "This field shall contain the value of AdminVendorID provided in the AddNOC command that led to the creation of this FabricDescriptorStruct. The set of allowed values is defined in AdminVendorID.\nThe intent is to provide some measure of user transparency about which entities have Administer privileges on the Node.",
+      xref: { document: "core", section: "11.18.4.5.2" }
+    }),
+    Field({
+      name: "FabricId",
+      id: 3,
+      type: "fabric-id",
+      access: "F",
+      conformance: "M",
+      details: "This field shall contain the FabricID allocated to the fabric referenced by FabricIndex. This field shall match the value found in the matter-fabric-id field from the operational certificate providing the operational identity under this Fabric.",
+      xref: { document: "core", section: "11.18.4.5.3" }
+    }),
+    Field({
+      name: "NodeId",
+      id: 4,
+      type: "node-id",
+      access: "F",
+      conformance: "M",
+      details: "This field shall contain the NodeID in use within the fabric referenced by FabricIndex. This field shall match the value found in the matter-node-id field from the operational certificate providing this operational identity.",
+      xref: { document: "core", section: "11.18.4.5.4" }
+    }),
+    Field({
+      name: "Label",
+      id: 5,
+      type: "string",
+      access: "F",
+      conformance: "M",
+      constraint: "max 32",
+      default: "",
+      details: "This field shall contain a commissioner-set label for the fabric referenced by FabricIndex. This label is set by the UpdateFabricLabel command.",
+      xref: { document: "core", section: "11.18.4.5.5" }
+    }),
+    Field({ name: "FabricIndex", id: 254, type: "FabricIndex" })
+  )
+);
 MatterDefinition.children.push(OperationalCredentials);
 export {
   OperationalCredentials