Introduce mark operation to Text.setStyle

api/converter/from_pb.go

@@ -432,11 +432,11 @@ func fromStyle(pbStyle *api.Operation_Style) (*operations.Style, error) {
 	if err != nil {
 		return nil, err
 	}
-	from, err := fromTextNodePos(pbStyle.From)
+	from, err := fromTextNodeBoundary(pbStyle.From)
 	if err != nil {
 		return nil, err
 	}
-	to, err := fromTextNodePos(pbStyle.To)
+	to, err := fromTextNodeBoundary(pbStyle.To)
 	if err != nil {
 		return nil, err
 	}
@@ -580,6 +580,34 @@ func fromTextNodePos(
 	), nil
 }
 
+func fromTextNodeBoundary(
+	pbBoundary *api.TextNodeBoundary,
+) (*crdt.RGATreeSplitNodeBoundary, error) {
+	createdAt, err := fromTimeTicket(pbBoundary.CreatedAt)
+	if err != nil {
+		return nil, err
+	}
+
+	var boundaryType crdt.BoundaryType
+	switch pbType := pbBoundary.Type; pbType {
+	case api.BoundaryType_BOUNDARY_TYPE_BEFORE:
+		boundaryType = crdt.Before
+	case api.BoundaryType_BOUNDARY_TYPE_AFTER:
+		boundaryType = crdt.After
+	case api.BoundaryType_BOUNDARY_TYPE_START:
+		boundaryType = crdt.Start
+	case api.BoundaryType_BOUNDARY_TYPE_END:
+		boundaryType = crdt.End
+	case api.BoundaryType_BOUNDARY_TYPE_NONE:
+		boundaryType = crdt.None
+	}
+
+	return crdt.NewRGATreeSplitNodeBoundary(
+		crdt.NewRGATreeSplitNodeID(createdAt, int(pbBoundary.Offset)),
+		boundaryType,
+	), nil
+}
+
 // FromTreeNodes converts protobuf tree nodes to crdt.TreeNode. The last node
 // in the slice is the root node, because the slice is in post-order.
 func FromTreeNodes(pbNodes []*api.TreeNode) (*crdt.TreeNode, error) {

api/converter/to_pb.go

@@ -355,8 +355,8 @@ func toStyle(style *operations.Style) (*api.Operation_Style_, error) {
 	return &api.Operation_Style_{
 		Style: &api.Operation_Style{
 			ParentCreatedAt:     ToTimeTicket(style.ParentCreatedAt()),
-			From:                toTextNodePos(style.From()),
-			To:                  toTextNodePos(style.To()),
+			From:                toTextNodeBoundary(style.From()),
+			To:                  toTextNodeBoundary(style.To()),
 			CreatedAtMapByActor: toCreatedAtMapByActor(style.CreatedAtMapByActor()),
 			Attributes:          style.Attributes(),
 			ExecutedAt:          ToTimeTicket(style.ExecutedAt()),
@@ -470,6 +470,15 @@ func toTextNodePos(pos *crdt.RGATreeSplitNodePos) *api.TextNodePos {
 	}
 }
 
+func toTextNodeBoundary(boundary *crdt.RGATreeSplitNodeBoundary) *api.TextNodeBoundary {
+	pbBoundaryType := toBoundaryType(boundary.Type())
+	return &api.TextNodeBoundary{
+		CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
+		Offset:    int32(boundary.ID().Offset()),
+		Type:      pbBoundaryType,
+	}
+}
+
 func toCreatedAtMapByActor(
 	createdAtMapByActor map[string]*time.Ticket,
 ) map[string]*api.TimeTicket {
@@ -514,6 +523,21 @@ func toCounterType(valueType crdt.CounterType) (api.ValueType, error) {
 	return 0, fmt.Errorf("%d, %w", valueType, ErrUnsupportedCounterType)
 }
 
+func toBoundaryType(boundaryType crdt.BoundaryType) api.BoundaryType {
+	switch boundaryType {
+	case crdt.Before:
+		return api.BoundaryType_BOUNDARY_TYPE_BEFORE
+	case crdt.After:
+		return api.BoundaryType_BOUNDARY_TYPE_AFTER
+	case crdt.Start:
+		return api.BoundaryType_BOUNDARY_TYPE_START
+	case crdt.End:
+		return api.BoundaryType_BOUNDARY_TYPE_END
+	default:
+		return api.BoundaryType_BOUNDARY_TYPE_NONE
+	}
+}
+
 // ToUpdatableProjectFields converts the given model format to Protobuf format.
 func ToUpdatableProjectFields(fields *types.UpdatableProjectFields) (*api.UpdatableProjectFields, error) {
 	pbUpdatableProjectFields := &api.UpdatableProjectFields{}