types: fix types logic

Author: zchee

types.go

@@ -11,15 +11,16 @@ import (
 	"strconv"
 
 	"github.com/francoispqt/gojay"
-	jsoniter "github.com/json-iterator/go"
 )
 
+const Version = "2.0"
+
 // ID is a Request identifier.
 // Only one of either the Name or Number members will be set, using the
 // number form if the Name is the empty string.
 type ID struct {
-	Name   string
-	Number int64
+	Name   string `json:"name,omitempty"`
+	Number int64  `json:"number,omitempty"`
 }
 
 // String returns a string representation of the ID.
@@ -32,35 +33,35 @@ func (id *ID) String() string {
 	if id.Name != "" {
 		return strconv.Quote(id.Name)
 	}
+
 	return "#" + strconv.FormatInt(id.Number, 10)
 }
 
 // MarshalJSON implements json.MarshalJSON.
 func (id *ID) MarshalJSON() ([]byte, error) {
 	if id.Name != "" {
-		return jsoniter.ConfigFastest.Marshal(id.Name)
+		return json.Marshal(id.Name)
 	}
-	return jsoniter.ConfigFastest.Marshal(id.Number)
+
+	return json.Marshal(id.Number)
 }
 
 // UnmarshalJSON implements json.UnmarshalJSON.
 func (id *ID) UnmarshalJSON(data []byte) error {
 	*id = ID{}
-	if err := jsoniter.ConfigFastest.Unmarshal(data, &id.Number); err == nil {
+	if err := json.Unmarshal(data, &id.Number); err == nil {
 		return nil
 	}
-	return jsoniter.ConfigFastest.Unmarshal(data, &id.Name)
-}
 
-// Message is a general message as defined by JSON-RPC. The language server protocol always uses "2.0" as the jsonrpc version.
-type Message struct {
-	JSONRPC string `json:"jsonrpc"`
+	return json.Unmarshal(data, &id.Name)
 }
 
 // RawMessage is the same as json.RawMessage.
-type RawMessage struct {
-	*gojay.EmbeddedJSON
-}
+type RawMessage gojay.EmbeddedJSON
+
+var _ io.Reader = (*RawMessage)(nil)
+var _ json.Marshaler = (*RawMessage)(nil)
+var _ json.Unmarshaler = (*RawMessage)(nil)
 
 // Read implements io.Reader.
 func (m *RawMessage) Read(p []byte) (n int, err error) {
@@ -71,7 +72,7 @@ func (m *RawMessage) Read(p []byte) (n int, err error) {
 		return 0, io.EOF
 	}
 
-	n = copy(p, *m.EmbeddedJSON)
+	n = copy(p, *m)
 
 	return n, nil
 }
@@ -80,11 +81,11 @@ func (m *RawMessage) Read(p []byte) (n int, err error) {
 //
 // MarshalJSON returns m as the JSON encoding of m.
 func (m RawMessage) MarshalJSON() ([]byte, error) {
-	if m.EmbeddedJSON == nil {
+	if &m == nil {
 		return []byte("null"), nil
 	}
 
-	return *m.EmbeddedJSON, nil
+	return m, nil
 }
 
 // UnmarshalJSON implements json.Unmarshaler.
@@ -95,20 +96,17 @@ func (m *RawMessage) UnmarshalJSON(data []byte) error {
 		return errors.New("json.RawMessage: UnmarshalJSON on nil pointer")
 	}
 
-	*m.EmbeddedJSON = append((*m.EmbeddedJSON)[0:0], data...)
+	*m = append((*m)[0:0], data...)
 
 	return nil
 }
 
-var _ io.Reader = (*RawMessage)(nil)
-var _ json.Marshaler = (*RawMessage)(nil)
-var _ json.Unmarshaler = (*RawMessage)(nil)
-
 // Request is a request message to describe a request between the client and the server.
 //
 // Every processed request must send a response back to the sender of the request.
 type Request struct {
-	Message
+	// JSONRPC is a general message as defined by JSON-RPC.
+	JSONRPC string `json:"jsonrpc"`
 
 	// The request id.
 	ID *ID `json:"id"`
@@ -131,7 +129,8 @@ func (r *Request) IsNotify() bool {
 // conform to the JSON RPC specification.
 // The result property of the ResponseMessage should be set to null in this case to signal a successful request.
 type Response struct {
-	Message
+	// JSONRPC is a general message as defined by JSON-RPC.
+	JSONRPC string `json:"jsonrpc"`
 
 	// The request id.
 	ID *ID `json:"id"`
@@ -144,11 +143,34 @@ type Response struct {
 	Result *RawMessage `json:"result,omitempty"`
 }
 
+// Combined represents a all the fields of both Request and Response.
+type Combined struct {
+	// JSONRPC is a general message as defined by JSON-RPC.
+	JSONRPC string `json:"jsonrpc"`
+
+	// The request id.
+	ID *ID `json:"id,omitempty"`
+
+	// The method to be invoked.
+	Method string `json:"method"`
+
+	// The method's params.
+	Params *RawMessage `json:"params,omitempty"`
+
+	// The error object in case a request fails.
+	Error *Error `json:"error,omitempty"`
+
+	// The result of a request. This member is REQUIRED on success.
+	// This member MUST NOT exist if there was an error invoking the method.
+	Result *RawMessage `json:"result,omitempty"`
+}
+
 // NotificationMessage is a notification message.
 //
 // A processed notification message must not send a response back. They work like events.
 type NotificationMessage struct {
-	Message
+	// JSONRPC is a general message as defined by JSON-RPC.
+	JSONRPC string `json:"jsonrpc"`
 
 	// Method is the method to be invoked.
 	Method string `json:"method"`