Merge pull request #3 from gowebpki/bugfix/2-json-null

Bugfix/2 json null

jcs.go

@@ -30,8 +30,10 @@ type jcsData struct {
 }
 
 // JSON standard escapes (modulo \u)
-var asciiEscapes = []byte{'\\', '"', 'b', 'f', 'n', 'r', 't'}
-var binaryEscapes = []byte{'\\', '"', '\b', '\f', '\n', '\r', '\t'}
+var (
+	asciiEscapes  = []byte{'\\', '"', 'b', 'f', 'n', 'r', 't'}
+	binaryEscapes = []byte{'\\', '"', '\b', '\f', '\n', '\r', '\t'}
+)
 
 // JSON literals
 var literals = []string{"true", "false", "null"}
@@ -47,7 +49,7 @@ func Transform(jsonData []byte) ([]byte, error) {
 	jd.jsonData = jsonData
 	j := &jd
 
-	transformed, err := j.parseElement()
+	transformed, err := j.parseEntry()
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +79,7 @@ func (j *jcsData) nextChar() (byte, error) {
 	return 0, errors.New("Unexpected EOF reached")
 }
 
-//scan advances index on jsonData to the first non whitespace character and returns it.
+// scan advances index on jsonData to the first non whitespace character and returns it.
 func (j *jcsData) scan() (byte, error) {
 	for {
 		c, err := j.nextChar()
@@ -147,6 +149,28 @@ CoreLoop:
 	return quotedString.String()
 }
 
+// parseEntry is the entrypoint into the parsing control flow
+func (j *jcsData) parseEntry() (string, error) {
+	c, err := j.scan()
+	if err != nil {
+		return "", err
+	}
+	j.index--
+
+	switch c {
+	case '{', '"', '[':
+		return j.parseElement()
+	default:
+		value, err := parseLiteral(string(j.jsonData))
+		if err != nil {
+			return "", err
+		}
+
+		j.index = len(j.jsonData)
+		return value, nil
+	}
+}
+
 func (j *jcsData) parseQuotedString() (string, error) {
 	var rawString strings.Builder
 
@@ -237,9 +261,10 @@ func (j *jcsData) parseSimpleType() (string, error) {
 	var token strings.Builder
 
 	j.index--
-	//no condition is needed here.
-	//if the buffer reaches EOF scan returns an error, or we terminate because the
-	//json simple type terminates
+
+	// no condition is needed here.
+	// if the buffer reaches EOF scan returns an error, or we terminate because the
+	// json simple type terminates
 	for {
 		c, err := j.scan()
 		if err != nil {
@@ -258,7 +283,10 @@ func (j *jcsData) parseSimpleType() (string, error) {
 		return "", errors.New("Missing argument")
 	}
 
-	value := token.String()
+	return parseLiteral(token.String())
+}
+
+func parseLiteral(value string) (string, error) {
 	// Is it a JSON literal?
 	for _, literal := range literals {
 		if literal == value {
@@ -391,7 +419,7 @@ CoreLoop:
 		}
 
 		if c == '}' {
-			//advance index because of peeked '}'
+			// advance index because of peeked '}'
 			j.index++
 			break
 		}

jcs_test.go

@@ -9,7 +9,7 @@ package jcs
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -31,16 +31,34 @@ func errorOccurred(activity string, err error) string {
 }
 
 func doesNotMatchExpected(expectedField, expectedValue, actualField, actualValue string) string {
-	return failedBecause(fmt.Sprintf("%s [%s] does not match expected %s [%s]\n", actualField, actualValue, expectedField, expectedValue))
+	return failedBecause(
+		fmt.Sprintf(
+			"%s [%s] does not match expected %s [%s]\n",
+			actualField,
+			actualValue,
+			expectedField,
+			expectedValue,
+		),
+	)
 }
 
 func TestTransform(t *testing.T) {
-	r := require.New(t)
-
 	testCases := []struct {
 		desc     string
 		filename string
 	}{
+		{
+			desc:     "Null",
+			filename: "null.json",
+		},
+		{
+			desc:     "True",
+			filename: "true.json",
+		},
+		{
+			desc:     "False",
+			filename: "false.json",
+		},
 		{
 			desc:     "Arrays",
 			filename: "arrays.json",
@@ -72,11 +90,15 @@ func TestTransform(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.desc, func(t *testing.T) {
-			input, err := ioutil.ReadFile(filepath.Join(pathTestData,
+			tC := tC
+			t.Parallel()
+			r := require.New(t)
+
+			input, err := os.ReadFile(filepath.Join(pathTestData,
 				pathInputRelativeToTestData, tC.filename))
 			r.NoError(err, errorOccurred("reading test input json", err))
 
-			output, err := ioutil.ReadFile(filepath.Join(pathTestData,
+			output, err := os.ReadFile(filepath.Join(pathTestData,
 				pathOutputRelativeToTestData, tC.filename))
 			r.NoError(err, errorOccurred("reading expected transformed output sample", err))
 
@@ -86,8 +108,24 @@ func TestTransform(t *testing.T) {
 			twiceTransformed, err := Transform(input)
 			r.NoError(err, errorOccurred("transforming transformed input", err))
 
-			r.True(bytes.Equal(transformed, output), doesNotMatchExpected("JSON", string(output), "transformed JSON", string(transformed)))
-			r.True(bytes.Equal(twiceTransformed, transformed), doesNotMatchExpected("transformed JSON", string(transformed), "twice transformed JSON", string(twiceTransformed)))
+			r.True(
+				bytes.Equal(transformed, output),
+				doesNotMatchExpected(
+					"JSON",
+					string(output),
+					"transformed JSON",
+					string(transformed),
+				),
+			)
+			r.True(
+				bytes.Equal(twiceTransformed, transformed),
+				doesNotMatchExpected(
+					"transformed JSON",
+					string(transformed),
+					"twice transformed JSON",
+					string(twiceTransformed),
+				),
+			)
 		})
 	}
 }

test/verify-canonicalization.go → test/verify-canonicalization/verify-canonicalization.go

@@ -51,9 +51,9 @@ func verify(fileName string) {
 	recycled, err2 := jcs.Transform(actual)
 	check(err2)
 	expected := read(fileName, "output")
-	var utf8InHex = "\nFile: " + fileName
-	var byteCount = 0
-	var next = false
+	utf8InHex := "\nFile: " + fileName
+	byteCount := 0
+	next := false
 	for _, b := range actual {
 		if byteCount%32 == 0 {
 			utf8InHex = utf8InHex + "\n"
@@ -83,7 +83,7 @@ func main() {
 		verify(file.Name())
 	}
 	if failures == 0 {
-		fmt.Println("All tests succeeded!\n")
+		fmt.Println("All tests succeeded!")
 	} else {
 		fmt.Printf("\n****** ERRORS: %d *******\n", failures)
 	}

testdata/input/false.json

@@ -0,0 +1 @@
+false

testdata/input/null.json

@@ -0,0 +1 @@
+null

testdata/input/true.json

@@ -0,0 +1 @@
+true

testdata/outhex/false.txt

@@ -0,0 +1 @@
+66 61 6C 73 65

testdata/outhex/null.txt

@@ -0,0 +1 @@
+6E 75 6C 6C

testdata/outhex/true.txt

@@ -0,0 +1 @@
+74 72 75 65

testdata/output/false.json

@@ -0,0 +1 @@
+false

testdata/output/null.json

@@ -0,0 +1 @@
+null

testdata/output/true.json

@@ -0,0 +1 @@
+true