Merge branch 'main' into zap

Author: AryaHassanli

errata/load.go

@@ -16,8 +16,8 @@ import (
 //go:embed default.yaml
 var defaultErrata []byte
 
-func LoadErrata(config *config.Config) (*Collection, error) {
-	b := loadErrataFile(config.Root())
+func LoadErrata(config *config.Config, errataPath string) (*Collection, error) {
+	b := loadErrataFile(config.Root(), errataPath)
 	if b == nil {
 		b = defaultErrata
 	}
@@ -82,11 +82,16 @@ type overlayErrata struct {
 	ZAP      *SDK      `yaml:"zap,omitempty"`
 }
 
-func loadErrataFile(specRoot string) []byte {
-	if specRoot == "" {
-		return nil
+func loadErrataFile(specRoot string, overridePath string) []byte {
+	var errataPath string
+	if overridePath != "" {
+		errataPath = overridePath
+	} else {
+		if specRoot == "" {
+			return nil
+		}
+		errataPath = filepath.Join(specRoot, ".github/alchemy/errata.yaml")
 	}
-	errataPath := filepath.Join(specRoot, ".github/alchemy/errata.yaml")
 	exists, err := files.Exists(errataPath)
 	if err != nil {
 		slog.Warn("error checking for errata path", slog.Any("error", err))

matter/constraint/hex.go

@@ -22,7 +22,7 @@ func (c *HexLimit) ASCIIDocString(dataType *types.DataType) string {
 		case 4:
 			return fmt.Sprintf("0x%08X", uint32(val))
 		case 8:
-			return fmt.Sprintf("0x%16X", uint64(val))
+			return fmt.Sprintf("0x%016X", uint64(val))
 		}
 	}
 	return fmt.Sprintf("0x%X", uint64(val))

matter/spec/option.go

@@ -31,7 +31,8 @@ func (bo BuilderOptions) List() (options []BuilderOption) {
 }
 
 type ParserOptions struct {
-	Root string `name:"spec-root" default:"connectedhomeip-spec" aliases:"specRoot" help:"the src root of your clone of CHIP-Specifications/connectedhomeip-spec"  group:"Spec:"`
+	Root       string `name:"spec-root" default:"connectedhomeip-spec" aliases:"specRoot" help:"the src root of your clone of CHIP-Specifications/connectedhomeip-spec" group:"Spec:"`
+	ErrataPath string `name:"errata-path" help:"the path to the errata file" group:"Spec:"`
 }
 
 func (po *ParserOptions) AfterApply() error {
@@ -49,6 +50,21 @@ func (po *ParserOptions) AfterApply() error {
 	if !exists {
 		return fmt.Errorf("spec root \"%s\" does not exist", po.Root)
 	}
+	if po.ErrataPath != "" {
+		if !filepath.IsAbs(po.ErrataPath) {
+			po.ErrataPath, err = filepath.Abs(po.ErrataPath)
+			if err != nil {
+				return err
+			}
+		}
+		exists, err = files.Exists(po.ErrataPath)
+		if err != nil {
+			return err
+		}
+		if !exists {
+			return fmt.Errorf("errata path \"%s\" does not exist", po.ErrataPath)
+		}
+	}
 	return nil
 }
 

matter/spec/pipeline.go

@@ -29,7 +29,7 @@ func Build(cxt context.Context, parserOptions ParserOptions, processingOptions p
 	}
 
 	var ec *errata.Collection
-	ec, err = errata.LoadErrata(cfg)
+	ec, err = errata.LoadErrata(cfg, parserOptions.ErrataPath)
 	if err != nil {
 		return
 	}

matter/types/extreme.go

@@ -124,7 +124,7 @@ func (ce *DataTypeExtreme) ZapString(dataType *DataType) string {
 				case 4:
 					return fmt.Sprintf("0x%08X", uint32(val))
 				case 8:
-					return fmt.Sprintf("0x%16X", uint64(val))
+					return fmt.Sprintf("0x%016X", uint64(val))
 
 				}
 			}
@@ -163,7 +163,7 @@ func (ce *DataTypeExtreme) DataModelString(dataType *DataType) string {
 				case 4:
 					return fmt.Sprintf("0x%08X", uint32(val))
 				case 8:
-					return fmt.Sprintf("0x%16X", uint64(val))
+					return fmt.Sprintf("0x%016X", uint64(val))
 
 				}
 			}
@@ -212,7 +212,7 @@ func (ce *DataTypeExtreme) formatUint64(dataType *DataType, val uint64) string {
 			case 4:
 				return fmt.Sprintf("0x%08X", uint32(val))
 			case 8:
-				return fmt.Sprintf("0x%16X", uint64(val))
+				return fmt.Sprintf("0x%016X", uint64(val))
 
 			}
 		}