Update fork

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# automatically generated by terraform - please do not edit here
+* @form3tech-oss/contributors-codeowners 

.github/workflows/easyjson.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [ 1.17, 1.16, 1.15 ]
+        go: [ 1.23 ]
     steps:
       - uses: actions/checkout@v2
 
@@ -33,31 +33,31 @@ jobs:
       - name: Build and Run tests
         run: make
 
-  test-non-amd64:
-    runs-on: ubuntu-latest
-    name: Test on ${{ matrix.distro }} ${{ matrix.arch }}
-    strategy:
-      matrix:
-        include:
-          - arch: ppc64le
-            distro: ubuntu20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: uraimo/run-on-arch-action@master
-        with:
-          arch: ${{ matrix.arch }}
-          distro: ${{ matrix.distro }}
-          install: |
-            apt-get update
-            apt install -y curl wget make gcc
-            latestGo=$(curl "https://golang.org/VERSION?m=text")
-            wget --quiet "https://dl.google.com/go/${latestGo}.linux-${{ matrix.arch }}.tar.gz"
-            rm -f $(which go)
-            rm -rf /usr/local/go
-            tar -C /usr/local -xzf "${latestGo}.linux-${{ matrix.arch }}.tar.gz"
-          run: |
-            export PATH=/usr/local/go/bin:$PATH
-            export PATH=~/go/bin:$PATH
-            printf "Go Version: $(go version)\n"
-            go install golang.org/x/lint/golint@latest
-            make
+  # test-arm64:
+  #   runs-on: ubuntu-latest
+  #   name: Test on ${{ matrix.distro }} ${{ matrix.arch }}
+  #   strategy:
+  #     matrix:
+  #       include:
+  #         - arch: arm64
+  #           distro: ubuntu24.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: uraimo/run-on-arch-action@master
+  #       with:
+  #         arch: ${{ matrix.arch }}
+  #         distro: ${{ matrix.distro }}
+  #         install: |
+  #           apt-get update
+  #           apt install -y curl wget make gcc
+  #           latestGo=$(curl "https://golang.org/VERSION?m=text")
+  #           wget --quiet "https://dl.google.com/go/${latestGo}.linux-${{ matrix.arch }}.tar.gz"
+  #           rm -f $(which go)
+  #           rm -rf /usr/local/go
+  #           tar -C /usr/local -xzf "${latestGo}.linux-${{ matrix.arch }}.tar.gz"
+  #         run: |
+  #           export PATH=/usr/local/go/bin:$PATH
+  #           export PATH=~/go/bin:$PATH
+  #           printf "Go Version: $(go version)\n"
+  #           go install golang.org/x/lint/golint@latest
+  #           make

Makefile

@@ -1,3 +1,6 @@
+VERSION := $(shell git describe --tags --always --dirty)
+COMMIT  := $(shell git rev-parse --short HEAD)
+
 all: test
 
 clean:
@@ -6,7 +9,8 @@ clean:
 	rm -rf benchmark/*_easyjson.go
 
 build:
-	go build -o ./bin/easyjson ./easyjson
+	go build -ldflags="-s -w -X 'main.Version=$(VERSION)' -X 'main.Commit=$(COMMIT)'" -o ./bin/easyjson ./easyjson
+
 
 generate: build
 	bin/easyjson -stubs \
@@ -46,7 +50,8 @@ generate: build
 		./tests/intern.go \
 		./tests/nocopy.go \
 		./tests/escaping.go \
-		./tests/nested_marshaler.go
+		./tests/nested_marshaler.go \
+		./tests/text_marshaler.go
 	bin/easyjson -snake_case ./tests/snake.go
 	bin/easyjson -omit_empty ./tests/omitempty.go
 	bin/easyjson -build_tags=use_easyjson -disable_members_unescape ./benchmark/data.go

bootstrap/bootstrap.go

@@ -187,7 +187,10 @@ func (g *Generator) Run() error {
 		buildFlags := buildFlagsRegexp.FindAllString(g.GenBuildFlags, -1)
 		execArgs = append(execArgs, buildFlags...)
 	}
-	execArgs = append(execArgs, "-tags", g.BuildTags, filepath.Base(path))
+	if len(g.BuildTags) > 0 {
+		execArgs = append(execArgs, "-tags", g.BuildTags)
+	}
+	execArgs = append(execArgs, filepath.Base(path))
 	cmd := exec.Command("go", execArgs...)
 
 	cmd.Stdout = f

easyjson/main.go

@@ -16,6 +16,11 @@ import (
 	"github.com/mailru/easyjson/parser"
 )
 
+var (
+	Version = "dev" //
+	Commit  = "none"
+)
+
 var buildTags = flag.String("build_tags", "", "build tags to add to generated file")
 var genBuildFlags = flag.String("gen_build_flags", "", "build flags when running the generator while bootstrapping")
 var snakeCase = flag.Bool("snake_case", false, "use snake_case names instead of CamelCase by default")
@@ -31,6 +36,7 @@ var specifiedName = flag.String("output_filename", "", "specify the filename of
 var processPkg = flag.Bool("pkg", false, "process the whole package instead of just the given file")
 var disallowUnknownFields = flag.Bool("disallow_unknown_fields", false, "return error if any unknown field in json appeared")
 var skipMemberNameUnescaping = flag.Bool("disable_members_unescape", false, "don't perform unescaping of member names to improve performance")
+var showVersion = flag.Bool("version", false, "print version and exit")
 
 func generate(fname string) (err error) {
 	fInfo, err := os.Stat(fname)
@@ -98,6 +104,11 @@ func main() {
 
 	files := flag.Args()
 
+	if *showVersion {
+		fmt.Printf("easyjson generator\nversion: %s\ncommit:  %s\n", Version, Commit)
+		os.Exit(0)
+	}
+
 	gofile := os.Getenv("GOFILE")
 	if *processPkg {
 		gofile = filepath.Dir(gofile)

gen/decoder.go

@@ -63,22 +63,34 @@ func (g *Generator) genTypeDecoder(t reflect.Type, out string, tags fieldTags, i
 
 	unmarshalerIface := reflect.TypeOf((*easyjson.Unmarshaler)(nil)).Elem()
 	if reflect.PtrTo(t).Implements(unmarshalerIface) {
-		fmt.Fprintln(g.out, ws+"("+out+").UnmarshalEasyJSON(in)")
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  ("+out+").UnmarshalEasyJSON(in)")
+		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	}
 
 	unmarshalerIface = reflect.TypeOf((*json.Unmarshaler)(nil)).Elem()
 	if reflect.PtrTo(t).Implements(unmarshalerIface) {
-		fmt.Fprintln(g.out, ws+"if data := in.Raw(); in.Ok() {")
-		fmt.Fprintln(g.out, ws+"  in.AddError( ("+out+").UnmarshalJSON(data) )")
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  if data := in.Raw(); in.Ok() {")
+		fmt.Fprintln(g.out, ws+"    in.AddError( ("+out+").UnmarshalJSON(data) )")
+		fmt.Fprintln(g.out, ws+"  }")
 		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	}
 
 	unmarshalerIface = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
 	if reflect.PtrTo(t).Implements(unmarshalerIface) {
-		fmt.Fprintln(g.out, ws+"if data := in.UnsafeBytes(); in.Ok() {")
-		fmt.Fprintln(g.out, ws+"  in.AddError( ("+out+").UnmarshalText(data) )")
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  if data := in.UnsafeBytes(); in.Ok() {")
+		fmt.Fprintln(g.out, ws+"    in.AddError( ("+out+").UnmarshalText(data) )")
+		fmt.Fprintln(g.out, ws+"  }")
 		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	}
@@ -110,13 +122,21 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
 	ws := strings.Repeat("  ", indent)
 	// Check whether type is primitive, needs to be done after interface check.
 	if dec := customDecoders[t.String()]; dec != "" {
-		fmt.Fprintln(g.out, ws+out+" = "+dec)
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  "+out+" = "+dec)
+		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	} else if dec := primitiveStringDecoders[t.Kind()]; dec != "" && tags.asString {
 		if tags.intern && t.Kind() == reflect.String {
 			dec = "in.StringIntern()"
 		}
-		fmt.Fprintln(g.out, ws+out+" = "+g.getType(t)+"("+dec+")")
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  "+out+" = "+g.getType(t)+"("+dec+")")
+		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	} else if dec := primitiveDecoders[t.Kind()]; dec != "" {
 		if tags.intern && t.Kind() == reflect.String {
@@ -125,7 +145,11 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
 		if tags.noCopy && t.Kind() == reflect.String {
 			dec = "in.UnsafeString()"
 		}
-		fmt.Fprintln(g.out, ws+out+" = "+g.getType(t)+"("+dec+")")
+		fmt.Fprintln(g.out, ws+"if in.IsNull() {")
+		fmt.Fprintln(g.out, ws+"  in.Skip()")
+		fmt.Fprintln(g.out, ws+"} else {")
+		fmt.Fprintln(g.out, ws+"  "+out+" = "+g.getType(t)+"("+dec+")")
+		fmt.Fprintln(g.out, ws+"}")
 		return nil
 	}
 
@@ -320,7 +344,6 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
 		return fmt.Errorf("don't know how to decode %v", t)
 	}
 	return nil
-
 }
 
 func (g *Generator) interfaceIsEasyjsonUnmarshaller(t reflect.Type) bool {
@@ -514,11 +537,6 @@ func (g *Generator) genStructDecoder(t reflect.Type) error {
 	fmt.Fprintln(g.out, "  for !in.IsDelim('}') {")
 	fmt.Fprintf(g.out, "    key := in.UnsafeFieldName(%v)\n", g.skipMemberNameUnescaping)
 	fmt.Fprintln(g.out, "    in.WantColon()")
-	fmt.Fprintln(g.out, "    if in.IsNull() {")
-	fmt.Fprintln(g.out, "       in.Skip()")
-	fmt.Fprintln(g.out, "       in.WantComma()")
-	fmt.Fprintln(g.out, "       continue")
-	fmt.Fprintln(g.out, "    }")
 
 	fmt.Fprintln(g.out, "    switch key {")
 	for _, f := range fs {

gen/generator.go

@@ -517,7 +517,7 @@ func camelToSnake(name string) string {
 	if lastUpper != 0 {
 		ret.WriteRune(unicode.ToLower(lastUpper))
 	}
-	return string(ret.Bytes())
+	return ret.String()
 }
 
 func (SnakeCaseFieldNamer) GetJSONFieldName(t reflect.Type, f reflect.StructField) string {

go.mod

@@ -1,5 +1,5 @@
 module github.com/mailru/easyjson
 
-go 1.12
+go 1.20
 
 require github.com/josharian/intern v1.0.0

helpers.go

@@ -17,7 +17,7 @@ type Marshaler interface {
 	MarshalEasyJSON(w *jwriter.Writer)
 }
 
-// Marshaler is an easyjson-compatible unmarshaler interface.
+// Unmarshaler is an easyjson-compatible unmarshaler interface.
 type Unmarshaler interface {
 	UnmarshalEasyJSON(w *jlexer.Lexer)
 }