Rework matter-devices.xml handling based on feedback from SDK group

Author: hasty

cmd/zap/cmd.go

@@ -128,7 +128,7 @@ func zapTemplates(cmd *cobra.Command, args []string) (err error) {
 
 	var patchedDeviceTypes pipeline.Map[string, *pipeline.Data[[]byte]]
 	if deviceTypes.Size() > 0 {
-		deviceTypePatcher := generate.NewDeviceTypesPatcher(sdkRoot, specBuilder.Spec, clusterAliases)
+		deviceTypePatcher := generate.NewDeviceTypesPatcher(sdkRoot, specBuilder.Spec, clusterAliases, generate.DeviceTypePatcherGenerateFeatureXML(featureXML))
 		patchedDeviceTypes, err = pipeline.Process[[]*matter.DeviceType, []byte](cxt, pipelineOptions, deviceTypePatcher, deviceTypes)
 		if err != nil {
 			return err

zap/generate/cluster.go

@@ -123,9 +123,7 @@ func (tg *TemplateGenerator) populateCluster(configurator *zap.Configurator, cle
 		commands[c] = []*matter.Number{}
 	}
 
-	de := xml.SetOrCreateSimpleElement(cle, "domain", "")
-	de.CreateAttr("name", matter.DomainNames[configurator.Doc.Domain])
-	de.SetText("")
+	xml.SetOrCreateSimpleElement(cle, "domain", matter.DomainNames[configurator.Doc.Domain])
 	clusterName := cluster.Name
 	if errata.ClusterName != "" {
 		clusterName = errata.ClusterName

zap/generate/conformance.go

@@ -9,6 +9,9 @@ import (
 
 func renderConformance(doc *spec.Doc, identifierStore conformance.IdentifierStore, c conformance.Conformance, parent *etree.Element) error {
 	removeConformance(parent)
+	if conformance.IsMandatory(c) {
+		return nil
+	}
 	return dm.RenderConformanceElement(doc, identifierStore, c, parent)
 }
 
@@ -18,7 +21,7 @@ func removeConformance(parent *etree.Element) {
 		switch child := child.(type) {
 		case *etree.Element:
 			switch child.Tag {
-			case "mandatoryConform", "optionalConform", "disableConform", "provisionalConform", "deprecateConform", "otherwiseConform":
+			case "mandatoryConform", "optionalConform", "disableConform", "disallowConform", "provisionalConform", "deprecateConform", "otherwiseConform":
 				trash = append(trash, child)
 			}
 		}