Merge pull request #13 from manicar2093/fix-null-unmarshal

fix: null unmarshal

.gitignore

@@ -1,2 +1,3 @@
 
 dist/
+.idea

echo.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-func (cb *Optional[T]) UnmarshalText(text []byte) error {
-	return cb.UnmarshalJSON([]byte(fmt.Sprintf("\"%s\"", text)))
+func (c *Optional[T]) UnmarshalText(text []byte) error {
+	return c.UnmarshalJSON([]byte(fmt.Sprintf("\"%s\"", text)))
 
 }

json.go

@@ -4,17 +4,24 @@ import (
 	"encoding/json"
 	"reflect"
 	"strconv"
+	"strings"
 )
 
 func (c *Optional[T]) UnmarshalJSON(data []byte) error {
-	unquoted, err := strconv.Unquote(string(data))
-	if err != nil {
-		return err
+	var (
+		err      error
+		asString = string(data)
+	)
+	if strings.HasPrefix(asString, "\"") {
+		asString, err = strconv.Unquote(asString)
+		if err != nil {
+			return err
+		}
 	}
-	if unquoted == "null" {
-		unquoted = ""
+	if asString == "null" {
+		asString = ""
 	}
-	c.isValidValue = getIsValidDataBool(unquoted)
+	c.isValidValue = getIsValidDataBool(asString)
 	if err := json.Unmarshal(data, &c.value); err != nil {
 		return err
 	}

json_test.go

@@ -35,16 +35,19 @@ var _ = Describe("Json", func() {
 		})
 
 		When("is as null", func() {
-			It("creates an empty optional", func() {
+			DescribeTable("creates an empty optional", func(jsonData []byte) {
 				var (
-					jsonData = []byte(`"null"`)
-					holder   = goption.Empty[string]()
+					holder = goption.Empty[string]()
 				)
 				err := holder.UnmarshalJSON(jsonData)
 
 				Expect(err).ToNot(HaveOccurred())
 				Expect(holder.IsPresent()).To(BeFalse())
-			})
+			},
+				Entry("null as string", []byte(`"null"`)),
+				Entry("native null", []byte(`null`)),
+			)
+
 		})
 
 		When("is zero", func() {