Merge pull request #49 from goccy/feature/fix-stream-encoding

Fix stream encoding

Author: goccy

encode.go

@@ -102,9 +102,11 @@ func (e *Encoder) EncodeWithOption(v interface{}, opts ...EncodeOption) error {
 	if err := e.encode(v); err != nil {
 		return err
 	}
+	e.buf = append(e.buf, '\n')
 	if _, err := e.w.Write(e.buf); err != nil {
 		return err
 	}
+	e.buf = e.buf[:0]
 	return nil
 }
 
@@ -315,6 +317,14 @@ func (e *Encoder) encodeNull() {
 	e.buf = append(e.buf, 'n', 'u', 'l', 'l')
 }
 
+func (e *Encoder) encodeKey(code *opcode) {
+	if e.enabledHTMLEscape {
+		e.encodeBytes(code.escapedKey)
+	} else {
+		e.encodeBytes(code.key)
+	}
+}
+
 func (e *Encoder) encodeString(s string) {
 	if e.enabledHTMLEscape {
 		e.encodeEscapedString(s)

encode_compile.go

@@ -1,6 +1,7 @@
 package json
 
 import (
+	"bytes"
 	"fmt"
 	"reflect"
 	"unsafe"
@@ -890,6 +891,12 @@ func (e *Encoder) compileStruct(ctx *encodeCompileContext, isPtr bool) (*opcode,
 			}
 		}
 		key := fmt.Sprintf(`"%s":`, tag.key)
+
+		var buf bytes.Buffer
+		enc := NewEncoder(&buf)
+		enc.encodeEscapedString(tag.key)
+		escapedKey := fmt.Sprintf(`%s:`, string(enc.buf))
+		enc.release()
 		fieldCode := &opcode{
 			typ:          valueCode.typ,
 			displayIdx:   fieldOpcodeIndex,
@@ -898,6 +905,7 @@ func (e *Encoder) compileStruct(ctx *encodeCompileContext, isPtr bool) (*opcode,
 			indent:       ctx.indent,
 			anonymousKey: field.Anonymous,
 			key:          []byte(key),
+			escapedKey:   []byte(escapedKey),
 			isTaggedKey:  tag.isTaggedKey,
 			displayKey:   tag.key,
 			offset:       field.Offset,

encode_opcode.go

@@ -13,6 +13,7 @@ type opcode struct {
 	typ          *rtype // go type
 	displayIdx   int    // opcode index
 	key          []byte // struct field key
+	escapedKey   []byte // struct field key ( HTML escaped )
 	displayKey   string // key text to display
 	isTaggedKey  bool   // whether tagged key
 	anonymousKey bool   // whether anonymous key
@@ -78,6 +79,7 @@ func (c *opcode) copy(codeMap map[uintptr]*opcode) *opcode {
 		typ:          c.typ,
 		displayIdx:   c.displayIdx,
 		key:          c.key,
+		escapedKey:   c.escapedKey,
 		displayKey:   c.displayKey,
 		isTaggedKey:  c.isTaggedKey,
 		anonymousKey: c.anonymousKey,

encode_string.go

@@ -308,22 +308,22 @@ func (e *Encoder) writeStringSlowPathWithHTMLEscaped(i int, s string, valLen int
 
 func (e *Encoder) encodeNoEscapedString(s string) {
 	valLen := len(s)
-	e.buf = append(e.buf, '"')
 
 	// write string, the fast path, without utf8 and escape support
 	i := 0
 	for ; i < valLen; i++ {
 		c := s[i]
-		if c > 31 && c != '"' && c != '\\' {
-			e.buf = append(e.buf, c)
-		} else {
+		if c <= 31 || c == '"' || c == '\\' {
 			break
 		}
 	}
+	e.buf = append(e.buf, '"')
 	if i == valLen {
+		e.buf = append(e.buf, s...)
 		e.buf = append(e.buf, '"')
 		return
 	}
+	e.buf = append(e.buf, s[:i]...)
 	e.writeStringSlowPath(i, s, valLen)
 }