Fix Zap branch on main

Author: AryaHassanli

matter/bitmap.go

@@ -341,16 +341,6 @@ func (bs BitSet) Identifier(name string) (types.Entity, bool) {
 	return nil, false
 }
 
-func (bs BitSet) Iterate() iter.Seq[types.Entity] {
-	return func(yield func(types.Entity) bool) {
-		for _, b := range bs {
-			if !yield(b) {
-				return
-			}
-		}
-	}
-}
-
 type AnonymousBitmap struct {
 	entity
 	Type *types.DataType `json:"type,omitempty"`

zap/regen/command.go

@@ -40,7 +40,7 @@ func commandFieldsHelper(spec *spec.Specification) func(matter.Command, *raymond
 	return func(cmd matter.Command, options *raymond.Options) raymond.SafeString {
 		fields := filterEntities(cmd.Fields)
 		if cmd.Access.FabricSensitivity == matter.FabricSensitivitySensitive {
-			fields = append(fields, &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, false), Conformance: conformance.Set{&conformance.Mandatory{}}})
+			fields = append(fields, &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, types.DataTypeRankScalar), Conformance: conformance.Set{&conformance.Mandatory{}}})
 		}
 		return enumerateEntitiesHelper(fields, spec, options)
 	}

zap/regen/field.go

@@ -45,7 +45,7 @@ func structFieldsHelper(spec *spec.Specification) func(s matter.Struct, options
 	return func(s matter.Struct, options *raymond.Options) raymond.SafeString {
 		fields := filterEntities(s.Fields)
 		if s.FabricScoping == matter.FabricScopingScoped {
-			fabricIndex := &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, false), Conformance: conformance.Set{&conformance.Mandatory{}}}
+			fabricIndex := &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, types.DataTypeRankScalar), Conformance: conformance.Set{&conformance.Mandatory{}}}
 			fabricIndex.SetParent(&s)
 			fields = append(fields, fabricIndex)
 		}
@@ -57,7 +57,7 @@ func eventFieldsHelper(spec *spec.Specification) func(e matter.Event, options *r
 	return func(e matter.Event, options *raymond.Options) raymond.SafeString {
 		fields := filterEntities(e.Fields)
 		if e.Access.FabricSensitivity == matter.FabricSensitivitySensitive {
-			fabricIndex := &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, false), Conformance: conformance.Set{&conformance.Mandatory{}}}
+			fabricIndex := &matter.Field{ID: matter.NewNumber(254), Name: "FabricIndex", Type: types.NewDataType(types.BaseDataTypeFabricIndex, types.DataTypeRankScalar), Conformance: conformance.Set{&conformance.Mandatory{}}}
 			fabricIndex.SetParent(&e)
 
 			fields = append(fields, fabricIndex)

zap/regen/helper.go

@@ -144,7 +144,7 @@ func maxValue(field matter.Field, fs matter.FieldSet) (max types.DataTypeExtreme
 
 	var maxDueToNullable bool
 	if hasNumericMax {
-		maxDueToNullable = types.Max(sdk.ToUnderlyingType(sdk.FindBaseType(field.Type)), true).ValueEquals(max)
+		maxDueToNullable = types.Max(sdk.ToUnderlyingType(sdk.FindBaseType(field.Type)), types.NullabilityNullable).ValueEquals(max)
 	}
 	if maxDueToNullable {
 		return

zap/regen/render.go

@@ -34,35 +34,35 @@ func NewIdlRenderer(spec *spec.Specification) (IdlRenderer, error) {
 		&matter.Field{
 			Name:        "GeneratedCommandList",
 			ID:          matter.NewNumber(65528),
-			Type:        types.NewDataType(types.BaseDataTypeCommandID, true),
+			Type:        types.NewDataType(types.BaseDataTypeCommandID, types.DataTypeRankList),
 			Access:      matter.Access{Read: matter.PrivilegeView},
 			Conformance: conformance.Set{&conformance.Mandatory{}},
 		},
 		&matter.Field{
 			Name:        "AcceptedCommandList",
 			ID:          matter.NewNumber(65529),
-			Type:        types.NewDataType(types.BaseDataTypeCommandID, true),
+			Type:        types.NewDataType(types.BaseDataTypeCommandID, types.DataTypeRankList),
 			Access:      matter.Access{Read: matter.PrivilegeView},
 			Conformance: conformance.Set{&conformance.Mandatory{}},
 		},
 		&matter.Field{
 			Name:        "AttributeList",
 			ID:          matter.NewNumber(65531),
-			Type:        types.NewDataType(types.BaseDataTypeAttributeID, true),
+			Type:        types.NewDataType(types.BaseDataTypeAttributeID, types.DataTypeRankList),
 			Access:      matter.Access{Read: matter.PrivilegeView},
 			Conformance: conformance.Set{&conformance.Mandatory{}},
 		},
 		&matter.Field{
 			Name:        "FeatureMap",
 			ID:          matter.NewNumber(65532),
-			Type:        types.NewDataType(types.BaseDataTypeMap32, false),
+			Type:        types.NewDataType(types.BaseDataTypeMap32, types.DataTypeRankScalar),
 			Access:      matter.Access{Read: matter.PrivilegeView},
 			Conformance: conformance.Set{&conformance.Mandatory{}},
 		},
 		&matter.Field{
 			Name:        "ClusterRevision",
 			ID:          matter.NewNumber(65533),
-			Type:        types.NewDataType(types.BaseDataTypeUInt16, false),
+			Type:        types.NewDataType(types.BaseDataTypeUInt16, types.DataTypeRankScalar),
 			Access:      matter.Access{Read: matter.PrivilegeView},
 			Conformance: conformance.Set{&conformance.Mandatory{}},
 		},
@@ -194,7 +194,7 @@ func (p IdlRenderer) Process(cxt context.Context, input *pipeline.Data[*zap.File
 	for fieldName, ns := range namespaces {
 		en := matter.NewEnum(ns.Source(), ns.Parent())
 		en.Name = fieldName + "Tag"
-		en.Type = types.NewDataType(types.BaseDataTypeEnum8, false)
+		en.Type = types.NewDataType(types.BaseDataTypeEnum8, types.DataTypeRankScalar)
 		for _, tag := range ns.SemanticTags {
 			nst := matter.NewEnumValue(tag.Source(), ns)
 			nst.Name = tag.Name