feat: Upgrade to v2 module and update dependencies (#59)

- Update module and internal import paths to include `/v2`
- Upgrade `go.mongodb.org/mongo-driver` dependency to v2
- Update the README.md and README-zh_CN.md
- **creator**, **aggregator**, **deleter**: Adjust `Options` parameters for compatibility with mongo-driver v2
- **updater**: Adjust `Options` parameters and update `Upsert` method for compatibility with mongo-driver v2
- **finder**: Adjust `Options` parameters and update `Distinct` and `DistinctWithParse` methods for compatibility with mongo-driver v2
- **bson**: Refactor `dToM` function for compatibility with mongo-driver v2

Author: chenmingyong0423

README-zh_CN.md

@@ -27,9 +27,14 @@
 - 支持插件化编程
 
 # 安装
-```go
-go get github.com/chenmingyong0423/go-mongox
-```
+- 如果使用 `mongo-driver 1.x` 版本：
+    ```go
+    go get github.com/chenmingyong0423/go-mongox
+    ```
+- 如果使用 `mongo-driver 2.x` 版本：
+    ```go
+    go get github.com/chenmingyong0423/go-mongox/v2
+    ```
 
 # 快速开始
 - `go mongox` 指南： [https://go-mongox.dev](https://go-mongox.dev)

README.md

@@ -27,9 +27,14 @@ English | [中文简体](./README-zh_CN.md)
 - Plugin programming support
 
 # Install
-```go
-go get github.com/chenmingyong0423/go-mongox
-```
+- If you are using `mongo-driver 1.x` version:
+    ```go
+    go get github.com/chenmingyong0423/go-mongox
+    ```
+- If you are using `mongo-driver 2.x` version:
+    ```go
+    go get github.com/chenmingyong0423/go-mongox/v2
+    ```
 
 # Getting Started
 - `go mongox` Guides: [https://go-mongox.dev](https://go-mongox.dev/en)

aggregator/aggregator.go

@@ -17,16 +17,18 @@ package aggregator
 import (
 	"context"
 
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 //go:generate mockgen -source=aggregator.go -destination=../mock/aggregator.mock.go -package=mocks
 type iAggregator[T any] interface {
-	Aggregate(ctx context.Context, opts ...*options.AggregateOptions) ([]*T, error)
-	AggregateWithParse(ctx context.Context, result any, opts ...*options.AggregateOptions) error
+	Aggregate(ctx context.Context, opts ...options.Lister[options.AggregateOptions]) ([]*T, error)
+	AggregateWithParse(ctx context.Context, result any, opts ...options.Lister[options.AggregateOptions]) error
 }
 
+var _ iAggregator[any] = (*Aggregator[any])(nil)
+
 type Aggregator[T any] struct {
 	collection *mongo.Collection
 	pipeline   any
@@ -43,7 +45,7 @@ func (a *Aggregator[T]) Pipeline(pipeline any) *Aggregator[T] {
 	return a
 }
 
-func (a *Aggregator[T]) Aggregate(ctx context.Context, opts ...*options.AggregateOptions) ([]*T, error) {
+func (a *Aggregator[T]) Aggregate(ctx context.Context, opts ...options.Lister[options.AggregateOptions]) ([]*T, error) {
 	cursor, err := a.collection.Aggregate(ctx, a.pipeline, opts...)
 	if err != nil {
 		return nil, err
@@ -60,7 +62,7 @@ func (a *Aggregator[T]) Aggregate(ctx context.Context, opts ...*options.Aggregat
 
 // AggregateWithParse is used to parse the result of the aggregation
 // result must be a pointer to a slice
-func (a *Aggregator[T]) AggregateWithParse(ctx context.Context, result any, opts ...*options.AggregateOptions) error {
+func (a *Aggregator[T]) AggregateWithParse(ctx context.Context, result any, opts ...options.Lister[options.AggregateOptions]) error {
 	cursor, err := a.collection.Aggregate(ctx, a.pipeline, opts...)
 	if err != nil {
 		return err

aggregator/aggregator_e2e_test.go

@@ -20,22 +20,20 @@ import (
 	"context"
 	"testing"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
-
+	"github.com/chenmingyong0423/go-mongox/v2/bsonx"
 	"github.com/stretchr/testify/require"
 
-	"github.com/chenmingyong0423/go-mongox/bsonx"
-
-	"github.com/chenmingyong0423/go-mongox/builder/aggregation"
-	"github.com/chenmingyong0423/go-mongox/builder/query"
+	"github.com/chenmingyong0423/go-mongox/v2/builder/aggregation"
+	"github.com/chenmingyong0423/go-mongox/v2/builder/query"
 
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/readpref"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
 )
 
 func getCollection(t *testing.T) *mongo.Collection {
-	client, err := mongo.Connect(context.Background(), options.Client().ApplyURI("mongodb://localhost:27017").SetAuth(options.Credential{
+	client, err := mongo.Connect(options.Client().ApplyURI("mongodb://localhost:27017").SetAuth(options.Credential{
 		Username:   "test",
 		Password:   "test",
 		AuthSource: "db-test",
@@ -64,7 +62,7 @@ func TestAggregator_e2e_Aggregation(t *testing.T) {
 		after  func(ctx context.Context, t *testing.T)
 
 		pipeline           any
-		aggregationOptions []*options.AggregateOptions
+		aggregationOptions []options.Lister[options.AggregateOptions]
 
 		ctx     context.Context
 		want    []*TestUser
@@ -190,7 +188,7 @@ func TestAggregator_e2e_Aggregation(t *testing.T) {
 				require.Equal(t, int64(2), deleteResult.DeletedCount)
 			},
 			pipeline: aggregation.NewStageBuilder().Sort(bsonx.M("age", 1)).Build(),
-			aggregationOptions: []*options.AggregateOptions{
+			aggregationOptions: []options.Lister[options.AggregateOptions]{
 				options.Aggregate().SetCollation(&options.Collation{Locale: "en", Strength: 2}),
 			},
 			want: []*TestUser{
@@ -214,7 +212,7 @@ func TestAggregator_e2e_Aggregation(t *testing.T) {
 			if err == nil {
 				require.Equal(t, len(tc.want), len(testUsers))
 				for _, tu := range testUsers {
-					var zero primitive.ObjectID
+					var zero bson.ObjectID
 					tu.ID = zero
 				}
 				require.ElementsMatch(t, tc.want, testUsers)
@@ -239,7 +237,7 @@ func TestAggregator_e2e_AggregateWithParse(t *testing.T) {
 		before             func(ctx context.Context, t *testing.T)
 		after              func(ctx context.Context, t *testing.T)
 		pipeline           any
-		aggregationOptions *options.AggregateOptions
+		aggregationOptions []options.Lister[options.AggregateOptions]
 		ctx                context.Context
 		result             any
 		want               []*User
@@ -301,9 +299,11 @@ func TestAggregator_e2e_AggregateWithParse(t *testing.T) {
 				{Id: "1", Name: "cmy", Age: 24, IsProgrammer: true},
 				{Id: "2", Name: "gopher", Age: 20, IsProgrammer: true},
 			},
-			aggregationOptions: options.Aggregate().SetCollation(&options.Collation{Locale: "en", Strength: 2}),
-			ctx:                context.Background(),
-			wantErr:            require.NoError,
+			aggregationOptions: []options.Lister[options.AggregateOptions]{
+				options.Aggregate().SetCollation(&options.Collation{Locale: "en", Strength: 2}),
+			},
+			ctx:     context.Background(),
+			wantErr: require.NoError,
 		},
 		{
 			name: "got error from cursor",
@@ -320,18 +320,20 @@ func TestAggregator_e2e_AggregateWithParse(t *testing.T) {
 				require.NoError(t, err)
 				require.Equal(t, int64(2), deleteResult.DeletedCount)
 			},
-			pipeline:           aggregation.NewStageBuilder().Set(bsonx.M("is_programmer", true)).Sort(bsonx.M("name", 1)).Build(),
-			result:             []string{},
-			want:               []*User{},
-			aggregationOptions: options.Aggregate().SetCollation(&options.Collation{Locale: "en", Strength: 2}),
-			ctx:                context.Background(),
-			wantErr:            require.Error,
+			pipeline: aggregation.NewStageBuilder().Set(bsonx.M("is_programmer", true)).Sort(bsonx.M("name", 1)).Build(),
+			result:   []string{},
+			want:     []*User{},
+			aggregationOptions: []options.Lister[options.AggregateOptions]{
+				options.Aggregate().SetCollation(&options.Collation{Locale: "en", Strength: 2}),
+			},
+			ctx:     context.Background(),
+			wantErr: require.Error,
 		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			tc.before(tc.ctx, t)
-			err := aggregator.Pipeline(tc.pipeline).AggregateWithParse(tc.ctx, &tc.result, tc.aggregationOptions)
+			err := aggregator.Pipeline(tc.pipeline).AggregateWithParse(tc.ctx, &tc.result, tc.aggregationOptions...)
 			tc.after(tc.ctx, t)
 			tc.wantErr(t, err)
 			if err == nil {

aggregator/aggregator_test.go

@@ -20,18 +20,17 @@ import (
 	"testing"
 	"time"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
-
-	mocks "github.com/chenmingyong0423/go-mongox/mock"
+	mocks "github.com/chenmingyong0423/go-mongox/v2/mock"
 
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.uber.org/mock/gomock"
 )
 
 type TestUser struct {
-	ID           primitive.ObjectID `bson:"_id,omitempty"`
-	Name         string             `bson:"name"`
+	ID           bson.ObjectID `bson:"_id,omitempty"`
+	Name         string        `bson:"name"`
 	Age          int64
 	UnknownField string    `bson:"-"`
 	CreatedAt    time.Time `bson:"created_at"`
@@ -56,8 +55,8 @@ type TestTempUser struct {
 }
 
 type IllegalUser struct {
-	ID   primitive.ObjectID `bson:"_id,omitempty"`
-	Name string             `bson:"name"`
+	ID   bson.ObjectID `bson:"_id,omitempty"`
+	Name string        `bson:"name"`
 	Age  string
 }
 

bsonx/bsonx.go

@@ -15,7 +15,9 @@
 package bsonx
 
 import (
-	"go.mongodb.org/mongo-driver/bson"
+	"bytes"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func M(key string, value any) bson.M {
@@ -79,7 +81,9 @@ func dToM(d bson.D) bson.M {
 		return nil
 	}
 	var m bson.M
-	err = bson.Unmarshal(marshal, &m)
+	decoder := bson.NewDecoder(bson.NewDocumentReader(bytes.NewReader(marshal)))
+	decoder.DefaultDocumentM()
+	err = decoder.Decode(&m)
 	if err != nil {
 		return nil
 	}

bsonx/bsonx_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func TestD(t *testing.T) {

bsonx/builder.go

@@ -14,7 +14,7 @@
 
 package bsonx
 
-import "go.mongodb.org/mongo-driver/bson"
+import "go.mongodb.org/mongo-driver/v2/bson"
 
 // DBuilder is a builder for bson.D
 type DBuilder struct {

bsonx/builder_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func TestDBuilder(t *testing.T) {

builder/aggregation/accumulators_builder.go

@@ -15,7 +15,7 @@
 package aggregation
 
 import (
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type accumulatorsBuilder struct {