Skip to content

Commit

Permalink
Rename package names to match JS SDK (#395)
Browse files Browse the repository at this point in the history 
Related to yorkie-team/yorkie-js-sdk#314
  • Loading branch information
@hackerwins
hackerwins authored and Youngteac Hong committed Aug 16, 2022
1 parent 48b7faf commit b5321a4
Show file tree
Hide file tree
Showing 70 changed files with 2,105 additions and 2,097 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and Yorkie adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)

- Add `--auth-webhook-url`, `--name` flag to updateProject command: #376

### Changed

- Rename package names to match JS SDK: #395

## [0.2.15] - 2022-08-08

### Added
Expand Down
10 changes: 5 additions & 5 deletions api/converter/converter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/yorkie-team/yorkie/api/types"
api "github.com/yorkie-team/yorkie/api/yorkie/v1"
"github.com/yorkie-team/yorkie/pkg/document"
"github.com/yorkie-team/yorkie/pkg/document/proxy"
"github.com/yorkie-team/yorkie/pkg/document/json"
"github.com/yorkie-team/yorkie/pkg/document/time"
)

Expand All @@ -39,14 +39,14 @@ func TestConverter(t *testing.T) {

doc := document.New("d1")

err = doc.Update(func(root *proxy.ObjectProxy) error {
err = doc.Update(func(root *json.Object) error {
root.SetNewText("k1").Edit(0, 0, "A")
return nil
})
assert.NoError(t, err)
assert.Equal(t, `{"k1":"A"}`, doc.Marshal())

err = doc.Update(func(root *proxy.ObjectProxy) error {
err = doc.Update(func(root *json.Object) error {
root.SetNewText("k1").Edit(0, 0, "B")
return nil
})
Expand All @@ -64,7 +64,7 @@ func TestConverter(t *testing.T) {
t.Run("snapshot test", func(t *testing.T) {
doc := document.New("d1")

err := doc.Update(func(root *proxy.ObjectProxy) error {
err := doc.Update(func(root *json.Object) error {
// an object and primitive types
root.SetNewObject("k1").
SetNull("k1.0").
Expand Down Expand Up @@ -126,7 +126,7 @@ func TestConverter(t *testing.T) {
t.Run("change pack test", func(t *testing.T) {
d1 := document.New("d1")

err := d1.Update(func(root *proxy.ObjectProxy) error {
err := d1.Update(func(root *json.Object) error {
// an object and primitive types
root.SetNewObject("k1").
SetBool("k1.1", true).
Expand Down
62 changes: 31 additions & 31 deletions api/converter/from_bytes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"github.com/gogo/protobuf/proto"

api "github.com/yorkie-team/yorkie/api/yorkie/v1"
"github.com/yorkie-team/yorkie/pkg/document/json"
"github.com/yorkie-team/yorkie/pkg/document/crdt"
"github.com/yorkie-team/yorkie/pkg/document/time"
)

// BytesToObject creates an Object from the given byte array.
func BytesToObject(snapshot []byte) (*json.Object, error) {
func BytesToObject(snapshot []byte) (*crdt.Object, error) {
if snapshot == nil {
return json.NewObject(json.NewRHTPriorityQueueMap(), time.InitialTicket), nil
return crdt.NewObject(crdt.NewRHTPriorityQueueMap(), time.InitialTicket), nil
}

pbElem := &api.JSONElement{}
Expand All @@ -45,7 +45,7 @@ func BytesToObject(snapshot []byte) (*json.Object, error) {
return obj, nil
}

func fromJSONElement(pbElem *api.JSONElement) (json.Element, error) {
func fromJSONElement(pbElem *api.JSONElement) (crdt.Element, error) {
switch decoded := pbElem.Body.(type) {
case *api.JSONElement_JsonObject:
return fromJSONObject(decoded.JsonObject)
Expand All @@ -64,8 +64,8 @@ func fromJSONElement(pbElem *api.JSONElement) (json.Element, error) {
}
}

func fromJSONObject(pbObj *api.JSONElement_JSONObject) (*json.Object, error) {
members := json.NewRHTPriorityQueueMap()
func fromJSONObject(pbObj *api.JSONElement_JSONObject) (*crdt.Object, error) {
members := crdt.NewRHTPriorityQueueMap()
for _, pbNode := range pbObj.Nodes {
elem, err := fromJSONElement(pbNode.Element)
if err != nil {
Expand All @@ -89,7 +89,7 @@ func fromJSONObject(pbObj *api.JSONElement_JSONObject) (*json.Object, error) {
return nil, err
}

obj := json.NewObject(
obj := crdt.NewObject(
members,
createdAt,
)
Expand All @@ -99,8 +99,8 @@ func fromJSONObject(pbObj *api.JSONElement_JSONObject) (*json.Object, error) {
return obj, nil
}

func fromJSONArray(pbArr *api.JSONElement_JSONArray) (*json.Array, error) {
elements := json.NewRGATreeList()
func fromJSONArray(pbArr *api.JSONElement_JSONArray) (*crdt.Array, error) {
elements := crdt.NewRGATreeList()
for _, pbNode := range pbArr.Nodes {
elem, err := fromJSONElement(pbNode.Element)
if err != nil {
Expand All @@ -122,7 +122,7 @@ func fromJSONArray(pbArr *api.JSONElement_JSONArray) (*json.Array, error) {
return nil, err
}

arr := json.NewArray(
arr := crdt.NewArray(
elements,
createdAt,
)
Expand All @@ -133,7 +133,7 @@ func fromJSONArray(pbArr *api.JSONElement_JSONArray) (*json.Array, error) {

func fromJSONPrimitive(
pbPrim *api.JSONElement_Primitive,
) (*json.Primitive, error) {
) (*crdt.Primitive, error) {
createdAt, err := fromTimeTicket(pbPrim.CreatedAt)
if err != nil {
return nil, err
Expand All @@ -151,16 +151,16 @@ func fromJSONPrimitive(
return nil, err
}

primitive := json.NewPrimitive(
json.ValueFromBytes(valueType, pbPrim.Value),
primitive := crdt.NewPrimitive(
crdt.ValueFromBytes(valueType, pbPrim.Value),
createdAt,
)
primitive.SetMovedAt(movedAt)
primitive.SetRemovedAt(removedAt)
return primitive, nil
}

func fromJSONText(pbText *api.JSONElement_Text) (*json.Text, error) {
func fromJSONText(pbText *api.JSONElement_Text) (*crdt.Text, error) {
createdAt, err := fromTimeTicket(pbText.CreatedAt)
if err != nil {
return nil, err
Expand All @@ -174,7 +174,7 @@ func fromJSONText(pbText *api.JSONElement_Text) (*json.Text, error) {
return nil, err
}

rgaTreeSplit := json.NewRGATreeSplit(json.InitialTextNode())
rgaTreeSplit := crdt.NewRGATreeSplit(crdt.InitialTextNode())

current := rgaTreeSplit.InitialHead()
for _, pbNode := range pbText.Nodes {
Expand All @@ -196,7 +196,7 @@ func fromJSONText(pbText *api.JSONElement_Text) (*json.Text, error) {
}
}

text := json.NewText(
text := crdt.NewText(
rgaTreeSplit,
createdAt,
)
Expand All @@ -208,7 +208,7 @@ func fromJSONText(pbText *api.JSONElement_Text) (*json.Text, error) {

func fromJSONRichText(
pbText *api.JSONElement_RichText,
) (*json.RichText, error) {
) (*crdt.RichText, error) {
createdAt, err := fromTimeTicket(pbText.CreatedAt)
if err != nil {
return nil, err
Expand All @@ -222,7 +222,7 @@ func fromJSONRichText(
return nil, err
}

rgaTreeSplit := json.NewRGATreeSplit(json.InitialRichTextNode())
rgaTreeSplit := crdt.NewRGATreeSplit(crdt.InitialRichTextNode())

current := rgaTreeSplit.InitialHead()
for _, pbNode := range pbText.Nodes {
Expand All @@ -244,7 +244,7 @@ func fromJSONRichText(
}
}

text := json.NewRichText(
text := crdt.NewRichText(
rgaTreeSplit,
createdAt,
)
Expand All @@ -254,7 +254,7 @@ func fromJSONRichText(
return text, nil
}

func fromJSONCounter(pbCnt *api.JSONElement_Counter) (*json.Counter, error) {
func fromJSONCounter(pbCnt *api.JSONElement_Counter) (*crdt.Counter, error) {
createdAt, err := fromTimeTicket(pbCnt.CreatedAt)
if err != nil {
return nil, err
Expand All @@ -272,8 +272,8 @@ func fromJSONCounter(pbCnt *api.JSONElement_Counter) (*json.Counter, error) {
return nil, err
}

counter := json.NewCounter(
json.CounterValueFromBytes(counterType, pbCnt.Value),
counter := crdt.NewCounter(
crdt.CounterValueFromBytes(counterType, pbCnt.Value),
createdAt,
)
counter.SetMovedAt(movedAt)
Expand All @@ -282,14 +282,14 @@ func fromJSONCounter(pbCnt *api.JSONElement_Counter) (*json.Counter, error) {
return counter, nil
}

func fromTextNode(pbTextNode *api.TextNode) (*json.RGATreeSplitNode[*json.TextValue], error) {
func fromTextNode(pbTextNode *api.TextNode) (*crdt.RGATreeSplitNode[*crdt.TextValue], error) {
id, err := fromTextNodeID(pbTextNode.Id)
if err != nil {
return nil, err
}
textNode := json.NewRGATreeSplitNode(
textNode := crdt.NewRGATreeSplitNode(
id,
json.NewTextValue(pbTextNode.Value),
crdt.NewTextValue(pbTextNode.Value),
)
if pbTextNode.RemovedAt != nil {
removedAt, err := fromTimeTicket(pbTextNode.RemovedAt)
Expand All @@ -303,13 +303,13 @@ func fromTextNode(pbTextNode *api.TextNode) (*json.RGATreeSplitNode[*json.TextVa

func fromRichTextNode(
pbNode *api.RichTextNode,
) (*json.RGATreeSplitNode[*json.RichTextValue], error) {
) (*crdt.RGATreeSplitNode[*crdt.RichTextValue], error) {
id, err := fromTextNodeID(pbNode.Id)
if err != nil {
return nil, err
}

attrs := json.NewRHT()
attrs := crdt.NewRHT()
for _, pbAttr := range pbNode.Attributes {
updatedAt, err := fromTimeTicket(pbAttr.UpdatedAt)
if err != nil {
Expand All @@ -318,9 +318,9 @@ func fromRichTextNode(
attrs.Set(pbAttr.Key, pbAttr.Value, updatedAt)
}

textNode := json.NewRGATreeSplitNode(
textNode := crdt.NewRGATreeSplitNode(
id,
json.NewRichTextValue(attrs, pbNode.Value),
crdt.NewRichTextValue(attrs, pbNode.Value),
)
if pbNode.RemovedAt != nil {
removedAt, err := fromTimeTicket(pbNode.RemovedAt)
Expand All @@ -334,7 +334,7 @@ func fromRichTextNode(

func fromTextNodeID(
pbTextNodeID *api.TextNodeID,
) (*json.RGATreeSplitNodeID, error) {
) (*crdt.RGATreeSplitNodeID, error) {
if pbTextNodeID == nil {
return nil, nil
}
Expand All @@ -344,7 +344,7 @@ func fromTextNodeID(
return nil, err
}

return json.NewRGATreeSplitNodeID(
return crdt.NewRGATreeSplitNodeID(
createdAt,
int(pbTextNodeID.Offset),
), nil
Expand Down
Loading

0 comments on commit b5321a4

Please sign in to comment.