👔 up: rename the new sub package encodx to encodes

encodx/encodx.go → encodes/encodes.go

@@ -1,4 +1,4 @@
-package encodx
+package encodes
 
 import (
 	"encoding/base32"

encodes/encodes_test.go

@@ -0,0 +1,29 @@
+package encodes_test
+
+import (
+	"testing"
+
+	"github.com/gookit/goutil/encodes"
+	"github.com/gookit/goutil/testutil/assert"
+)
+
+func TestBaseDecode(t *testing.T) {
+	is := assert.New(t)
+
+	is.Eq("GEZGCYTD", encodes.B32Encode("12abc"))
+	is.Eq("12abc", encodes.B32Decode("GEZGCYTD"))
+
+	// b23 hex
+	is.Eq("64P62OJ3", encodes.B32Hex.EncodeToString([]byte("12abc")))
+	// fmt.Println(time.Now().Format("20060102150405"))
+	dateStr := "20230908101122"
+	is.Eq("68O34CPG74O3GC9G64OJ4CG", encodes.B32Hex.EncodeToString([]byte(dateStr)))
+
+	is.Eq("YWJj", encodes.B64Encode("abc"))
+	is.Eq("abc", encodes.B64Decode("YWJj"))
+
+	is.Eq([]byte("YWJj"), encodes.B64EncodeBytes([]byte("abc")))
+	is.Eq([]byte("abc"), encodes.B64DecodeBytes([]byte("YWJj")))
+
+	is.Eq("MTJhYmM", encodes.B64URL.EncodeToString([]byte("12abc")))
+}

encodx/hashutil/hashutil.go → encodes/hashutil/hashutil.go

@@ -12,7 +12,7 @@ import (
 	"hash/crc64"
 	"strings"
 
-	"github.com/gookit/goutil/encodx"
+	"github.com/gookit/goutil/encodes"
 )
 
 // hash algorithm names
@@ -59,8 +59,8 @@ func Hash32(algo string, src any) string {
 // Base32Bytes generate base32 hash bytes by given algorithm
 func Base32Bytes(algo string, src any) []byte {
 	bs := HashSum(algo, src)
-	dst := make([]byte, encodx.B32Hex.EncodedLen(len(bs)))
-	encodx.B32Hex.Encode(dst, bs)
+	dst := make([]byte, encodes.B32Hex.EncodedLen(len(bs)))
+	encodes.B32Hex.Encode(dst, bs)
 	return dst
 }
 
@@ -72,8 +72,8 @@ func Hash64(algo string, src any) string {
 // Base64Bytes generate base64 hash bytes by given algorithm
 func Base64Bytes(algo string, src any) []byte {
 	bs := HashSum(algo, src)
-	dst := make([]byte, encodx.B64Std.EncodedLen(len(bs)))
-	encodx.B64Std.Encode(dst, bs)
+	dst := make([]byte, encodes.B64Std.EncodedLen(len(bs)))
+	encodes.B64Std.Encode(dst, bs)
 	return dst
 }
 

encodx/secutil/aes_crypt_test.go → encodes/secutil/aes_crypt_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gookit/goutil/byteutil"
 	"github.com/gookit/goutil/dump"
-	"github.com/gookit/goutil/strutil/secutil"
+	"github.com/gookit/goutil/encodes/secutil"
 	"github.com/gookit/goutil/testutil/assert"
 )
 

strutil/encode.go

@@ -111,11 +111,8 @@ func B32Decode(str string) string {
 	return string(dec)
 }
 
-// base64 encoding with no padding
-var (
-	B64Std = base64.StdEncoding.WithPadding(base64.NoPadding)
-	B64URL = base64.URLEncoding.WithPadding(base64.NoPadding)
-)
+// B64Std base64 encoding with no padding
+var B64Std = base64.StdEncoding.WithPadding(base64.NoPadding)
 
 // B64Encode base64 encode
 func B64Encode(str string) string {

strutil/random.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/gookit/goutil/byteutil"
-	"github.com/gookit/goutil/encodx"
 )
 
 // some consts string chars
@@ -89,7 +88,7 @@ func RandWithTpl(n int, letters string) string {
 //	token, err := RandomString(16) // eg: "I7S4yFZddRMxQoudLZZ-eg"
 func RandomString(length int) (string, error) {
 	b, err := RandomBytes(length)
-	return encodx.B64URL.EncodeToString(b), err
+	return encodes.B64URL.EncodeToString(b), err
 }
 
 // RandomBytes generate