Adapt ZAP to Support Both List Type Definition Formats for Attributes (#1530)

* support parsing list type in both formats

* add unit test

Author: ethanzhouyc

src-electron/zcl/zcl-loader-silabs.js

@@ -630,6 +630,12 @@ function prepareCluster(cluster, context, isExtension = false) {
           attribute.$.reportingPolicy
         )
       }
+      /* If the XML uses `array="true" type="X"` to define a list type,
+         convert it to `type="array" entryType="X"` to support both formats */
+      if (attribute.$.array == 'true') {
+        attribute.$.entryType = attribute.$.type
+        attribute.$.type = 'array'
+      }
       let storagePolicy = dbEnum.storagePolicy.any
       if (context.listsUseAttributeAccessInterface && attribute.$.entryType) {
         storagePolicy = dbEnum.storagePolicy.attributeAccessInterface

test/zcl-loader.test.js

@@ -555,3 +555,42 @@ test(
   },
   testUtil.timeout.long()
 )
+
+test(
+  'test Matter list-typed attribute loading in memory',
+  async () => {
+    let db = await dbApi.initRamDatabase()
+    try {
+      await dbApi.loadSchema(db, env.schemaFile(), env.zapVersion())
+      let ctx = await zclLoader.loadZcl(db, env.builtinMatterZclMetafile())
+      let packageId = ctx.packageId
+
+      let zclCluster = await queryZcl.selectClusterByCode(db, packageId, 0x001f)
+
+      /* Verify that the ACL attribute, defined using the list type format `array="true" type="X"` in XML,
+        is correctly parsed and stored in the database as an array of AccessControlEntryStruct. */
+      let attributes = await dbApi.dbAll(
+        db,
+        "SELECT * FROM ATTRIBUTE WHERE CLUSTER_REF = ? AND CODE = 0x0000 AND NAME = 'ACL'",
+        [zclCluster.id]
+      )
+      expect(attributes.length).toBe(1)
+      let aclAttribute = attributes[0]
+      expect(aclAttribute.TYPE).toBe('array')
+      expect(aclAttribute.ARRAY_TYPE).toBe('AccessControlEntryStruct')
+
+      // verify that the ACL attribute data retrieved from the database is an array of AccessControlEntryStruct after mapping
+      let aclAttributeMapped = await queryZcl.selectAttributeById(
+        db,
+        aclAttribute.ATTRIBUTE_ID
+      )
+      expect(aclAttributeMapped).not.toBe(null)
+      expect(aclAttributeMapped.name).toBe('ACL')
+      expect(aclAttributeMapped.entryType).toBe('AccessControlEntryStruct')
+      expect(aclAttributeMapped.isArray).toBe(1)
+    } finally {
+      await dbApi.closeDatabase(db)
+    }
+  },
+  testUtil.timeout.long()
+)

zcl-builtin/matter/data-model/chip/access-control-cluster.xml

@@ -72,7 +72,9 @@ limitations under the License.
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances.</description>
 
-    <attribute side="server" code="0x0000" define="ACL" type="ARRAY" entryType="AccessControlEntryStruct" writable="true">
+    <!-- Modified attribute definition from `type="array" entryType="X"` to `array="true" type="X"`  
+     to support testing loading list-typed attributes -->
+    <attribute side="server" code="0x0000" define="ACL" array="true" type="AccessControlEntryStruct" writable="true">
       <description>ACL</description>
       <access op="read" privilege="administer"/>
       <access op="write" privilege="administer"/>