diff --git a/change/change.go b/change/change.go index 5866739f0..3c743461a 100644 --- a/change/change.go +++ b/change/change.go @@ -3,9 +3,10 @@ package change import ( "encoding/json" + "github.com/gogo/protobuf/jsonpb" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" - "github.com/gogo/protobuf/jsonpb" ) func NewChangeFromRecord(record core.SmartblockRecordEnvelope) (*Change, error) { diff --git a/change/change_test.go b/change/change_test.go index e24c8b214..1f28b3fa5 100644 --- a/change/change_test.go +++ b/change/change_test.go @@ -11,15 +11,16 @@ import ( "strings" "testing" + "github.com/globalsign/mgo/bson" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "gopkg.in/yaml.v3" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/globalsign/mgo/bson" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" ) func TestStateBuildCases(t *testing.T) { diff --git a/change/changetest.go b/change/changetest.go index dc28d9007..2d1e78eba 100644 --- a/change/changetest.go +++ b/change/changetest.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + "github.com/gogo/protobuf/proto" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" - "github.com/gogo/protobuf/proto" ) func NewTestSmartBlock() *TestSmartblock { diff --git a/core/anytype/bootstrap.go b/core/anytype/bootstrap.go index 43d73d089..72d74858b 100644 --- a/core/anytype/bootstrap.go +++ b/core/anytype/bootstrap.go @@ -2,17 +2,14 @@ package anytype import ( "context" - "github.com/anytypeio/go-anytype-middleware/core/indexer" - "github.com/anytypeio/go-anytype-middleware/core/kanban" "os" - "github.com/anytypeio/go-anytype-middleware/core/account" - decorator "github.com/anytypeio/go-anytype-middleware/core/block/bookmark/bookmarkimporter" - "github.com/anytypeio/go-anytype-middleware/app" + "github.com/anytypeio/go-anytype-middleware/core/account" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/bookmark" + decorator "github.com/anytypeio/go-anytype-middleware/core/block/bookmark/bookmarkimporter" "github.com/anytypeio/go-anytype-middleware/core/block/doc" "github.com/anytypeio/go-anytype-middleware/core/block/export" importer "github.com/anytypeio/go-anytype-middleware/core/block/import" @@ -23,6 +20,8 @@ import ( "github.com/anytypeio/go-anytype-middleware/core/debug" "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/core/history" + "github.com/anytypeio/go-anytype-middleware/core/indexer" + "github.com/anytypeio/go-anytype-middleware/core/kanban" "github.com/anytypeio/go-anytype-middleware/core/recordsbatcher" "github.com/anytypeio/go-anytype-middleware/core/relation" "github.com/anytypeio/go-anytype-middleware/core/session" diff --git a/core/block/editor/dashboard.go b/core/block/editor/dashboard.go index 6f33a4624..c895198b5 100644 --- a/core/block/editor/dashboard.go +++ b/core/block/editor/dashboard.go @@ -1,6 +1,8 @@ package editor import ( + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" "github.com/anytypeio/go-anytype-middleware/core/block/editor/collection" _import "github.com/anytypeio/go-anytype-middleware/core/block/editor/import" @@ -13,7 +15,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" ) func NewDashboard(importServices _import.Services, dmservice DetailsModifier) *Dashboard { diff --git a/core/block/editor/dataview_test.go b/core/block/editor/dataview_test.go index 700162454..70fc24437 100644 --- a/core/block/editor/dataview_test.go +++ b/core/block/editor/dataview_test.go @@ -3,10 +3,11 @@ package editor import ( "testing" + "github.com/stretchr/testify/require" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock/smarttest" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/stretchr/testify/require" ) func TestDataview_SetDetails(t *testing.T) { diff --git a/core/block/editor/objecttype.go b/core/block/editor/objecttype.go index a750793a8..2abe2c78d 100644 --- a/core/block/editor/objecttype.go +++ b/core/block/editor/objecttype.go @@ -1,6 +1,10 @@ package editor import ( + "strings" + + "github.com/gogo/protobuf/types" + dataview2 "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" @@ -12,8 +16,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" - "strings" ) type ObjectType struct { diff --git a/core/block/editor/set.go b/core/block/editor/set.go index 714303a05..70f46e96a 100644 --- a/core/block/editor/set.go +++ b/core/block/editor/set.go @@ -2,13 +2,13 @@ package editor import ( "fmt" - "github.com/anytypeio/go-anytype-middleware/core/block/restriction" "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" dataview "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" "github.com/anytypeio/go-anytype-middleware/core/block/editor/stext" "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" + "github.com/anytypeio/go-anytype-middleware/core/block/restriction" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" diff --git a/core/block/editor/smartblock/smartblock_test.go b/core/block/editor/smartblock/smartblock_test.go index 7514971f2..eaec605b2 100644 --- a/core/block/editor/smartblock/smartblock_test.go +++ b/core/block/editor/smartblock/smartblock_test.go @@ -2,29 +2,31 @@ package smartblock import ( "context" - "github.com/anytypeio/go-anytype-middleware/app" - "github.com/anytypeio/go-anytype-middleware/app/testapp" - "github.com/anytypeio/go-anytype-middleware/core/block/restriction" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" - "github.com/anytypeio/go-anytype-middleware/util/testMock/mockDoc" - "github.com/anytypeio/go-anytype-middleware/util/testMock/mockRelation" - "github.com/gogo/protobuf/types" "testing" - "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" - "github.com/anytypeio/go-anytype-middleware/core/block/simple" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/anytypeio/go-anytype-middleware/util/testMock" - "github.com/anytypeio/go-anytype-middleware/util/testMock/mockSource" + "github.com/gogo/protobuf/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/anytypeio/go-anytype-middleware/app" + "github.com/anytypeio/go-anytype-middleware/app/testapp" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/core/block/restriction" + "github.com/anytypeio/go-anytype-middleware/core/block/simple" + "github.com/anytypeio/go-anytype-middleware/pb" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/util/pbtypes" + "github.com/anytypeio/go-anytype-middleware/util/testMock" + "github.com/anytypeio/go-anytype-middleware/util/testMock/mockDoc" + "github.com/anytypeio/go-anytype-middleware/util/testMock/mockRelation" + "github.com/anytypeio/go-anytype-middleware/util/testMock/mockSource" + + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" ) func TestSmartBlock_Init(t *testing.T) { diff --git a/core/block/editor/state/change.go b/core/block/editor/state/change.go index b2f82f1ea..42adbfbb5 100644 --- a/core/block/editor/state/change.go +++ b/core/block/editor/state/change.go @@ -5,20 +5,19 @@ import ( "fmt" "strings" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - - "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" + "github.com/gogo/protobuf/types" + "github.com/hashicorp/go-multierror" + "github.com/mb0/diff" "github.com/anytypeio/go-anytype-middleware/core/block/simple" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" pb2 "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" - "github.com/hashicorp/go-multierror" - "github.com/mb0/diff" ) type snapshotOptions struct { diff --git a/core/block/editor/state/change_test.go b/core/block/editor/state/change_test.go index 211b89bf2..7b6348393 100644 --- a/core/block/editor/state/change_test.go +++ b/core/block/editor/state/change_test.go @@ -2,16 +2,17 @@ package state import ( "fmt" - "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" "testing" + "github.com/gogo/protobuf/types" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/block/simple/dataview" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/anytypeio/go-anytype-middleware/util/pbtypes" ) func makeStoreWithTwoKeysAndValue(first, second, value string) *types.Struct { diff --git a/core/block/editor/state/normalize.go b/core/block/editor/state/normalize.go index 7053db1ee..6223639da 100644 --- a/core/block/editor/state/normalize.go +++ b/core/block/editor/state/normalize.go @@ -2,11 +2,13 @@ package state import ( "fmt" + + "github.com/globalsign/mgo/bson" + "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/globalsign/mgo/bson" ) var ( diff --git a/core/block/editor/state/normalize_test.go b/core/block/editor/state/normalize_test.go index 64ad556a9..db59e5be8 100644 --- a/core/block/editor/state/normalize_test.go +++ b/core/block/editor/state/normalize_test.go @@ -5,14 +5,16 @@ import ( "io/ioutil" "testing" - "github.com/anytypeio/go-anytype-middleware/core/block/simple" - "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/anytypeio/go-anytype-middleware/core/block/simple" + "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/util/pbtypes" + + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" ) func TestState_Normalize(t *testing.T) { diff --git a/core/block/editor/state/state.go b/core/block/editor/state/state.go index 7f32603c8..03140f98b 100644 --- a/core/block/editor/state/state.go +++ b/core/block/editor/state/state.go @@ -7,20 +7,20 @@ import ( "strings" "time" - "github.com/anytypeio/go-anytype-middleware/core/session" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" + "github.com/gogo/protobuf/types" "github.com/ipfs/go-cid" "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/block/undo" + "github.com/anytypeio/go-anytype-middleware/core/session" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" textutil "github.com/anytypeio/go-anytype-middleware/util/text" - "github.com/gogo/protobuf/types" ) var log = logging.Logger("anytype-mw-state") diff --git a/core/block/editor/state/state_test.go b/core/block/editor/state/state_test.go index f416372d4..53a558e7d 100644 --- a/core/block/editor/state/state_test.go +++ b/core/block/editor/state/state_test.go @@ -4,15 +4,16 @@ import ( "math/rand" "testing" + "github.com/globalsign/mgo/bson" + "github.com/gogo/protobuf/types" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/globalsign/mgo/bson" - "github.com/gogo/protobuf/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestState_Add(t *testing.T) { diff --git a/core/block/editor/subobject.go b/core/block/editor/subobject.go index a9de60751..03728b7d2 100644 --- a/core/block/editor/subobject.go +++ b/core/block/editor/subobject.go @@ -2,6 +2,10 @@ package editor import ( "fmt" + "strings" + + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" "github.com/anytypeio/go-anytype-middleware/core/block/editor/clipboard" "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" @@ -15,8 +19,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" - "strings" ) func NewSubObject() *SubObject { diff --git a/core/block/editor/subobjectcollection.go b/core/block/editor/subobjectcollection.go index 844e51c8e..87b7a84ff 100644 --- a/core/block/editor/subobjectcollection.go +++ b/core/block/editor/subobjectcollection.go @@ -3,6 +3,10 @@ package editor import ( "errors" "fmt" + "strings" + + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" @@ -16,8 +20,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" - "strings" ) var ( diff --git a/core/block/editor/threaddb.go b/core/block/editor/threaddb.go index 90b18bf42..083400b0a 100644 --- a/core/block/editor/threaddb.go +++ b/core/block/editor/threaddb.go @@ -3,13 +3,14 @@ package editor import ( "fmt" + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/source" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" ) func NewThreadDB(migrator AccountMigrator) *ThreadDB { diff --git a/core/block/editor/workspaces.go b/core/block/editor/workspaces.go index 102ef9fac..d971b7d35 100644 --- a/core/block/editor/workspaces.go +++ b/core/block/editor/workspaces.go @@ -2,35 +2,33 @@ package editor import ( "fmt" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/anytypeio/go-anytype-middleware/util/slice" "strings" "time" "github.com/globalsign/mgo/bson" + "github.com/gogo/protobuf/types" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr/net" + "github.com/textileio/go-threads/core/thread" "github.com/anytypeio/go-anytype-middleware/app" - "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" "github.com/anytypeio/go-anytype-middleware/core/block/source" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" smartblock2 "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" database2 "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/pkg/lib/util" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" - ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr/net" - "github.com/textileio/go-threads/core/thread" - - "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" - "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/util/slice" ) const ( diff --git a/core/block/service.go b/core/block/service.go index 6600954e4..93d091aaf 100644 --- a/core/block/service.go +++ b/core/block/service.go @@ -5,21 +5,14 @@ import ( "encoding/base64" "errors" "fmt" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "net/url" "strings" "time" - "github.com/anytypeio/go-anytype-middleware/core/relation" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" - "github.com/ipfs/go-datastore/query" - - "github.com/anytypeio/go-anytype-middleware/core/session" - "github.com/anytypeio/go-anytype-middleware/util/internalflag" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" "github.com/hashicorp/go-multierror" + "github.com/ipfs/go-datastore/query" "github.com/textileio/go-threads/core/thread" "github.com/anytypeio/go-anytype-middleware/app" @@ -37,27 +30,34 @@ import ( "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/editor/stext" "github.com/anytypeio/go-anytype-middleware/core/block/editor/table" - _ "github.com/anytypeio/go-anytype-middleware/core/block/editor/table" "github.com/anytypeio/go-anytype-middleware/core/block/process" "github.com/anytypeio/go-anytype-middleware/core/block/restriction" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/file" - _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" "github.com/anytypeio/go-anytype-middleware/core/block/source" "github.com/anytypeio/go-anytype-middleware/core/event" + "github.com/anytypeio/go-anytype-middleware/core/relation" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" + "github.com/anytypeio/go-anytype-middleware/core/session" "github.com/anytypeio/go-anytype-middleware/core/status" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" coresb "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" + "github.com/anytypeio/go-anytype-middleware/util/internalflag" "github.com/anytypeio/go-anytype-middleware/util/linkpreview" "github.com/anytypeio/go-anytype-middleware/util/ocache" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/uri" + + _ "github.com/anytypeio/go-anytype-middleware/core/block/editor/table" + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/file" + _ "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" ) const ( diff --git a/core/block/simple/dataview/dataview.go b/core/block/simple/dataview/dataview.go index 1036cbed8..fa8c89e48 100644 --- a/core/block/simple/dataview/dataview.go +++ b/core/block/simple/dataview/dataview.go @@ -4,18 +4,17 @@ import ( "errors" "fmt" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" - "github.com/globalsign/mgo/bson" + "github.com/gogo/protobuf/proto" + "github.com/google/uuid" "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/block/simple/base" "github.com/anytypeio/go-anytype-middleware/pb" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/proto" - "github.com/google/uuid" ) var _ Block = (*Dataview)(nil) diff --git a/core/block/source/anytypeprofile.go b/core/block/source/anytypeprofile.go index 960f1df30..fc21874e0 100644 --- a/core/block/source/anytypeprofile.go +++ b/core/block/source/anytypeprofile.go @@ -2,17 +2,17 @@ package source import ( "context" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" ) func NewAnytypeProfile(a core.Service, id string) (s Source) { diff --git a/core/block/source/bundledobjecttype.go b/core/block/source/bundledobjecttype.go index b2f2eeac5..6b1926cb7 100644 --- a/core/block/source/bundledobjecttype.go +++ b/core/block/source/bundledobjecttype.go @@ -2,15 +2,16 @@ package source import ( "context" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/anytypeio/go-anytype-middleware/pb" + + "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/gogo/protobuf/types" ) func NewBundledObjectType(a core.Service, id string) (s Source) { diff --git a/core/block/source/bundledrelation.go b/core/block/source/bundledrelation.go index 450729e8b..37e480818 100644 --- a/core/block/source/bundledrelation.go +++ b/core/block/source/bundledrelation.go @@ -3,17 +3,18 @@ package source import ( "context" "fmt" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "strings" + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/util/pbtypes" ) func NewBundledRelation(a core.Service, id string) (s Source) { diff --git a/core/block/source/date.go b/core/block/source/date.go index dce393665..aedfd6c4d 100644 --- a/core/block/source/date.go +++ b/core/block/source/date.go @@ -2,19 +2,19 @@ package source import ( "context" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "strings" "time" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" ) func NewDate(a core.Service, id string) (s Source) { diff --git a/core/block/source/files.go b/core/block/source/files.go index 4e0e56642..7b176e292 100644 --- a/core/block/source/files.go +++ b/core/block/source/files.go @@ -2,17 +2,18 @@ package source import ( "context" - "github.com/anytypeio/go-anytype-middleware/pb" "strings" "time" + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" ) var getFileTimeout = time.Second * 5 diff --git a/core/block/source/service.go b/core/block/source/service.go index a9c59cd28..6b4c45d62 100644 --- a/core/block/source/service.go +++ b/core/block/source/service.go @@ -2,9 +2,11 @@ package source import ( "fmt" - "github.com/gogo/protobuf/types" "sync" + "github.com/gogo/protobuf/types" + "github.com/textileio/go-threads/core/thread" + "github.com/anytypeio/go-anytype-middleware/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/status" @@ -12,7 +14,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/textileio/go-threads/core/thread" ) const CName = "source" diff --git a/core/block/source/source.go b/core/block/source/source.go index 3eba207a3..a2329b982 100644 --- a/core/block/source/source.go +++ b/core/block/source/source.go @@ -8,8 +8,10 @@ import ( "sync" "time" + "github.com/cheggaaa/mb" "github.com/gogo/protobuf/types" "github.com/textileio/go-threads/core/logstore" + "github.com/textileio/go-threads/core/thread" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" @@ -22,8 +24,6 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/cheggaaa/mb" - "github.com/textileio/go-threads/core/thread" ) var log = logging.Logger("anytype-mw-source") diff --git a/core/block/source/static.go b/core/block/source/static.go index 578d8b0f4..f124dfeb0 100644 --- a/core/block/source/static.go +++ b/core/block/source/static.go @@ -2,10 +2,10 @@ package source import ( "context" - "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" @@ -13,11 +13,11 @@ import ( func (s *service) NewStaticSource(id string, sbType model.SmartBlockType, doc *state.State, pushChange func(p PushChangeParams) (string, error)) SourceWithType { return &static{ - id: id, - sbType: sbType, - doc: doc, - a: s.anytype, - s: s, + id: id, + sbType: sbType, + doc: doc, + a: s.anytype, + s: s, pushChange: pushChange, } } diff --git a/core/block/source/threaddb.go b/core/block/source/threaddb.go index 26c51575b..588ab259d 100644 --- a/core/block/source/threaddb.go +++ b/core/block/source/threaddb.go @@ -3,23 +3,24 @@ package source import ( "context" "fmt" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/textileio/go-threads/core/db" - "github.com/textileio/go-threads/core/thread" - threadsUtil "github.com/textileio/go-threads/util" "strings" "sync" "time" + "github.com/gogo/protobuf/types" + "github.com/textileio/go-threads/core/db" + "github.com/textileio/go-threads/core/thread" + threadsDb "github.com/textileio/go-threads/db" + threadsUtil "github.com/textileio/go-threads/util" + "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" - threadsDb "github.com/textileio/go-threads/db" ) const ( diff --git a/core/block/source/virtual.go b/core/block/source/virtual.go index d1296e8ef..85501dfd6 100644 --- a/core/block/source/virtual.go +++ b/core/block/source/virtual.go @@ -2,13 +2,15 @@ package source import ( "context" + + "github.com/google/uuid" + "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/google/uuid" ) func NewVirtual(a core.Service, t model.SmartBlockType) (s Source) { diff --git a/core/block_dataview.go b/core/block_dataview.go index 79677f3b2..b2878a58b 100644 --- a/core/block_dataview.go +++ b/core/block_dataview.go @@ -2,6 +2,7 @@ package core import ( "context" + "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" diff --git a/core/indexer/indexer.go b/core/indexer/indexer.go index 37d56e30c..ec47f016f 100644 --- a/core/indexer/indexer.go +++ b/core/indexer/indexer.go @@ -4,38 +4,37 @@ import ( "context" "crypto/sha256" "fmt" - "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" - "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" - "github.com/anytypeio/go-anytype-middleware/core/relation" - "github.com/anytypeio/go-anytype-middleware/metrics" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" - "github.com/anytypeio/go-anytype-middleware/util/ocache" "math" "sort" "strings" "sync" "time" - "github.com/anytypeio/go-anytype-middleware/core/block/doc" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" - - "github.com/anytypeio/go-anytype-middleware/core/anytype/config" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" + "github.com/gogo/protobuf/types" ds "github.com/ipfs/go-datastore" "github.com/textileio/go-threads/core/thread" "github.com/anytypeio/go-anytype-middleware/app" + "github.com/anytypeio/go-anytype-middleware/core/anytype/config" + "github.com/anytypeio/go-anytype-middleware/core/block/doc" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" + "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" "github.com/anytypeio/go-anytype-middleware/core/block/source" + "github.com/anytypeio/go-anytype-middleware/core/relation" + "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/ftsearch" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" + "github.com/anytypeio/go-anytype-middleware/util/ocache" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" ) const ( diff --git a/core/indexer/indexer_test.go b/core/indexer/indexer_test.go index a604f57ed..985dea4a8 100644 --- a/core/indexer/indexer_test.go +++ b/core/indexer/indexer_test.go @@ -2,17 +2,16 @@ package indexer_test import ( "context" - "github.com/anytypeio/go-anytype-middleware/app" - "github.com/anytypeio/go-anytype-middleware/core/relation" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/anytypeio/go-anytype-middleware/util/testMock/mockRelation" - "github.com/gogo/protobuf/types" "io" "io/ioutil" "os" "testing" + "github.com/gogo/protobuf/types" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/require" + + "github.com/anytypeio/go-anytype-middleware/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block/doc" @@ -20,6 +19,8 @@ import ( "github.com/anytypeio/go-anytype-middleware/core/block/source" "github.com/anytypeio/go-anytype-middleware/core/indexer" "github.com/anytypeio/go-anytype-middleware/core/recordsbatcher" + "github.com/anytypeio/go-anytype-middleware/core/relation" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" @@ -27,12 +28,12 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/ftsearch" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/util/pbtypes" "github.com/anytypeio/go-anytype-middleware/util/testMock" "github.com/anytypeio/go-anytype-middleware/util/testMock/mockBuiltinTemplate" "github.com/anytypeio/go-anytype-middleware/util/testMock/mockDoc" + "github.com/anytypeio/go-anytype-middleware/util/testMock/mockRelation" "github.com/anytypeio/go-anytype-middleware/util/testMock/mockStatus" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/require" ) func TestNewIndexer(t *testing.T) { diff --git a/core/relation/relationutils/option.go b/core/relation/relationutils/option.go index c9c0740df..7ca5a9b1a 100644 --- a/core/relation/relationutils/option.go +++ b/core/relation/relationutils/option.go @@ -1,10 +1,11 @@ package relationutils import ( + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" ) func OptionFromStruct(st *types.Struct) *Option { diff --git a/core/relation/service.go b/core/relation/service.go index 8956802b9..71ebe8828 100644 --- a/core/relation/service.go +++ b/core/relation/service.go @@ -6,19 +6,19 @@ import ( "net/url" "sync" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" + "github.com/globalsign/mgo/bson" + "github.com/gogo/protobuf/types" + "github.com/ipfs/go-datastore/query" "github.com/anytypeio/go-anytype-middleware/app" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/globalsign/mgo/bson" - "github.com/gogo/protobuf/types" - "github.com/ipfs/go-datastore/query" ) const CName = "relation" diff --git a/core/relations.go b/core/relations.go index 161915252..419dc5607 100644 --- a/core/relations.go +++ b/core/relations.go @@ -6,7 +6,6 @@ import ( "fmt" "strings" - "github.com/anytypeio/go-anytype-middleware/util/slice" "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/core/block" @@ -17,6 +16,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" + "github.com/anytypeio/go-anytype-middleware/util/slice" ) func (mw *Middleware) ObjectTypeRelationList(cctx context.Context, req *pb.RpcObjectTypeRelationListRequest) *pb.RpcObjectTypeRelationListResponse { diff --git a/core/relations_test.go b/core/relations_test.go index 6b66e571d..29912a25b 100644 --- a/core/relations_test.go +++ b/core/relations_test.go @@ -2,17 +2,19 @@ package core import ( "context" + "io/ioutil" + "net/http" + "os" + "testing" + + "github.com/gogo/protobuf/types" + "github.com/stretchr/testify/require" + "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/gogo/protobuf/types" - "github.com/stretchr/testify/require" - "io/ioutil" - "net/http" - "os" - "testing" ) func start(t *testing.T, eventSender event.Sender) (setId string, rootPath string, mw *Middleware, close func() error) { diff --git a/core/workspace.go b/core/workspace.go index 05607fb7d..ad25d4fe8 100644 --- a/core/workspace.go +++ b/core/workspace.go @@ -2,6 +2,7 @@ package core import ( "context" + "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/core/block" diff --git a/util/builtinobjects/builtinobjects.go b/util/builtinobjects/builtinobjects.go index f6a1fd100..80ea4e2db 100644 --- a/util/builtinobjects/builtinobjects.go +++ b/util/builtinobjects/builtinobjects.go @@ -4,28 +4,28 @@ import ( "archive/zip" "bytes" "context" - _ "embed" "fmt" - "github.com/anytypeio/go-anytype-middleware/core/anytype/config" - "github.com/anytypeio/go-anytype-middleware/core/block" - "github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark" - "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" - "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" - relation2 "github.com/anytypeio/go-anytype-middleware/core/relation" - "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" - "github.com/gogo/protobuf/types" - "github.com/textileio/go-threads/core/thread" "io" "io/ioutil" "path/filepath" "strings" "sync" + "github.com/gogo/protobuf/types" + "github.com/textileio/go-threads/core/thread" + "github.com/anytypeio/go-anytype-middleware/app" + "github.com/anytypeio/go-anytype-middleware/core/anytype/config" + "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/simple" + "github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark" + "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" "github.com/anytypeio/go-anytype-middleware/core/block/simple/relation" + "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" "github.com/anytypeio/go-anytype-middleware/core/block/source" + relation2 "github.com/anytypeio/go-anytype-middleware/core/relation" + "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" @@ -34,6 +34,8 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" + + _ "embed" ) const CName = "builtinobjects" diff --git a/util/pbtypes/compare.go b/util/pbtypes/compare.go index 3a1c4fd4c..21607c18d 100644 --- a/util/pbtypes/compare.go +++ b/util/pbtypes/compare.go @@ -3,9 +3,10 @@ package pbtypes import ( "sort" + "github.com/gogo/protobuf/types" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" ) func StructEqualIgnore(det1 *types.Struct, det2 *types.Struct, excludeKeys []string) (equal bool) { diff --git a/util/pbtypes/compare_test.go b/util/pbtypes/compare_test.go index dd4fe6b6b..5d1fc2a67 100644 --- a/util/pbtypes/compare_test.go +++ b/util/pbtypes/compare_test.go @@ -4,8 +4,9 @@ import ( "reflect" "testing" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/gogo/protobuf/types" + + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" ) func TestStructDiff(t *testing.T) { diff --git a/util/pbtypes/copy.go b/util/pbtypes/copy.go index 9f8c557df..9a80621dd 100644 --- a/util/pbtypes/copy.go +++ b/util/pbtypes/copy.go @@ -1,13 +1,13 @@ package pbtypes import ( - "github.com/anytypeio/go-anytype-middleware/pb" "sync" - "github.com/anytypeio/go-anytype-middleware/util/slice" - - "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/gogo/protobuf/types" + + "github.com/anytypeio/go-anytype-middleware/pb" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" + "github.com/anytypeio/go-anytype-middleware/util/slice" ) var bytesPool = &sync.Pool{ diff --git a/util/pbtypes/pbtypes.go b/util/pbtypes/pbtypes.go index f2bf5f6e9..31b837dd0 100644 --- a/util/pbtypes/pbtypes.go +++ b/util/pbtypes/pbtypes.go @@ -6,11 +6,11 @@ import ( "github.com/gogo/protobuf/jsonpb" "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/types" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" "github.com/anytypeio/go-anytype-middleware/util/slice" - "github.com/gogo/protobuf/types" ) func Int64(v int64) *types.Value {