Merge pull request #1 from osspkg/dev

add buffer

Author: markus621

.golangci.yml

@@ -368,7 +368,6 @@ linters:
     - errorlint
     - bodyclose
     - exportloopref
-    - gci
     - gosec
     - lll
   fast: false

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, Mikhail Knyazhev <[email protected]>
+Copyright (c) 2024-2025, Mikhail Knyazhev <[email protected]>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

Makefile

@@ -23,8 +23,8 @@ build:
 tests:
 	devtool test
 
-.PHONY: pre-commite
-pre-commite: setup lint build tests
+.PHONY: pre-commit
+pre-commit: setup license lint build tests
 
 .PHONY: ci
 ci: install setup lint build tests

ascii.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 

cache/cache_simple.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/cache_time.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/cache_time_test.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/common.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import "time"

codec/encdec.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -31,7 +31,7 @@ type (
 	Codec struct {
 		Encode func(in interface{}) ([]byte, error)
 		Decode func(b []byte, out interface{}) error
-		Merge  func(dst map[string]interface{}, src map[string]interface{}) error
+		Merge  func(dst map[string]interface{}, src ...map[string]interface{})
 	}
 	encoders struct {
 		list map[string]Codec
@@ -54,7 +54,7 @@ func (v *encoders) Add(
 	ext string,
 	enc func(interface{}) ([]byte, error),
 	dec func([]byte, interface{}) error,
-	merge func(map[string]interface{}, map[string]interface{}) error,
+	merge func(map[string]interface{}, ...map[string]interface{}),
 ) *encoders {
 	v.mux.Lock(func() {
 		v.list[ext] = Codec{

codec/encdec_blob.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -53,9 +53,7 @@ func (v *BlobEncoder) Encode(configs ...interface{}) error {
 		if err = codec.Decode(bb, &tmp); err != nil {
 			return err
 		}
-		if err = codec.Merge(out, tmp); err != nil {
-			return err
-		}
+		codec.Merge(out, tmp)
 	}
 	v.Blob, err0 = codec.Encode(out)
 	return err0

codec/encdec_blob_test.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"go.osspkg.com/casecheck"
+
 	"go.osspkg.com/ioutils/codec"
 )
 

codec/encdec_file.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 

codec/encdec_file_test.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 

codec/map_merge.go

@@ -1,24 +1,27 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
 package codec
 
-func mapMerge(dst map[string]interface{}, src map[string]interface{}) error {
-	for k, v := range src {
-		vv, ok := dst[k]
-		if !ok {
+func mapMerge(dst map[string]interface{}, src ...map[string]interface{}) {
+	for _, next := range src {
+		for k, v := range next {
+			vv, ok := dst[k]
+			if !ok {
+				dst[k] = v
+				continue
+			}
+
+			m1, ok1 := vv.(map[string]interface{})
+			m2, ok2 := v.(map[string]interface{})
+			if ok2 && ok1 {
+				mapMerge(m1, m2)
+				continue
+			}
+
 			dst[k] = v
-			continue
 		}
-		vMap, vOk := v.(map[string]interface{})
-		vvMap, vvOk := vv.(map[string]interface{})
-		if vOk && vvOk {
-			return mapMerge(vvMap, vMap)
-		}
-		dst[k] = v
 	}
-
-	return nil
 }

codec/map_merge_test.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <[email protected]>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <[email protected]>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -17,6 +17,8 @@ func TestUnit_mapMerge(t *testing.T) {
 		"aa": map[string]interface{}{
 			"bb": "cc",
 		},
+		"yy": 123,
+		"ww": 123,
 	}
 	mapB := map[string]interface{}{
 		"zz": "xx",
@@ -26,10 +28,15 @@ func TestUnit_mapMerge(t *testing.T) {
 				"rr": "tt",
 			},
 		},
+		"ww": map[string]interface{}{
+			"gg": "hh",
+		},
 	}
 
-	casecheck.NoError(t, mapMerge(mapA, mapB))
+	mapMerge(mapA, mapB)
+
 	casecheck.Equal(t, map[string]interface{}{
+		"yy": 123,
 		"zz": "xx",
 		"qq": "ww",
 		"aa": map[string]interface{}{
@@ -39,5 +46,8 @@ func TestUnit_mapMerge(t *testing.T) {
 				"rr": "tt",
 			},
 		},
+		"ww": map[string]interface{}{
+			"gg": "hh",
+		},
 	}, mapA)
 }