perf: migrate encoding/json to encoding/json/v2

cmd/acceptguard/report.go

@@ -1,9 +1,12 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"os"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 func writeJSON(path string, findings []finding) error {
@@ -13,10 +16,9 @@ func writeJSON(path string, findings []finding) error {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	return enc.Encode(findings)
+	return json.MarshalEncode(enc, findings)
 }
 
 func printReport(findings []finding) {

cmd/bdaudit/issues.go

@@ -2,10 +2,12 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"encoding/json/v2"
 	"fmt"
 	"os"
 	"strings"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 const statusClosed = "closed"
@@ -61,7 +63,7 @@ func loadIssues(path string) (map[string]issue, error) {
 		}
 
 		var iss issue
-		if unmarshalErr := json.Unmarshal([]byte(text), &iss); unmarshalErr != nil {
+		if unmarshalErr := json.Unmarshal([]byte(text), &iss, jsonx.V1()); unmarshalErr != nil {
 			return nil, fmt.Errorf("%s:%d: %w", path, line, unmarshalErr)
 		}
 		if iss.ID == "" {

cmd/bdaudit/report.go

@@ -1,11 +1,14 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"io"
 	"os"
 	"strings"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 type report struct {
@@ -23,10 +26,9 @@ func writeJSONReport(path string, rep report) error {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	if encErr := enc.Encode(rep); encErr != nil {
+	if encErr := json.MarshalEncode(enc, rep); encErr != nil {
 		return fmt.Errorf("encode json: %w", encErr)
 	}
 

cmd/bodyclass/report.go

@@ -1,10 +1,13 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"os"
 	"sort"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 type serviceReport struct {
@@ -68,10 +71,9 @@ func writeJSON(path string, results []serviceReport) {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	if encErr := enc.Encode(results); encErr != nil {
+	if encErr := json.MarshalEncode(enc, results); encErr != nil {
 		fatal(encErr)
 	}
 

cmd/cfnattrgen/main.go

@@ -26,7 +26,8 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"flag"
 	"fmt"
 	"go/ast"
@@ -37,10 +38,12 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 type resourceTypeSpec struct {
-	Attributes map[string]json.RawMessage `json:"Attributes"`
+	Attributes map[string]jsontext.Value `json:"Attributes"`
 }
 
 type resourceSpec struct {
@@ -158,15 +161,15 @@ func runTrimSpec(specPath, outPath string) error {
 			continue
 		}
 
-		attrs := make(map[string]json.RawMessage, len(rt.Attributes))
+		attrs := make(map[string]jsontext.Value, len(rt.Attributes))
 		for attr := range rt.Attributes {
-			attrs[attr] = json.RawMessage("{}")
+			attrs[attr] = jsontext.Value("{}")
 		}
 
 		trimmed.ResourceTypes[name] = resourceTypeSpec{Attributes: attrs}
 	}
 
-	out, err := json.MarshalIndent(trimmed, "", "  ")
+	out, err := json.Marshal(trimmed, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 	if err != nil {
 		return fmt.Errorf("marshal trimmed spec: %w", err)
 	}
@@ -187,7 +190,7 @@ func loadSpec(path string) (*resourceSpec, error) {
 	}
 
 	var spec resourceSpec
-	if unmarshalErr := json.Unmarshal(data, &spec); unmarshalErr != nil {
+	if unmarshalErr := json.Unmarshal(data, &spec, jsonx.V1()); unmarshalErr != nil {
 		return nil, unmarshalErr
 	}
 
@@ -295,7 +298,7 @@ func buildTable(spec *resourceSpec, supportedTypes map[string]struct{}) map[stri
 }
 
 func renderJSON(table map[string][]string) ([]byte, error) {
-	out, err := json.MarshalIndent(table, "", "  ")
+	out, err := json.Marshal(table, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 	if err != nil {
 		return nil, err
 	}
@@ -359,7 +362,7 @@ func buildServices(spec *resourceSpec, literals map[string]struct{}) []string {
 const minTypeNameParts = 3
 
 func renderServices(services []string) ([]byte, error) {
-	out, err := json.MarshalIndent(services, "", "  ")
+	out, err := json.Marshal(services, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 	if err != nil {
 		return nil, err
 	}

cmd/cfnattrgen/regen_test.go

@@ -1,12 +1,14 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/v2"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 const (
@@ -90,7 +92,7 @@ func TestRenderJSON_Deterministic(t *testing.T) {
 	assert.Equal(t, first, second)
 
 	var roundTrip map[string][]string
-	require.NoError(t, json.Unmarshal(first, &roundTrip))
+	require.NoError(t, json.Unmarshal(first, &roundTrip, jsonx.V1()))
 	assert.Equal(t, table, roundTrip)
 }
 

cmd/cfnpropgen/main.go

@@ -8,11 +8,14 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"flag"
 	"fmt"
 	"os"
 	"slices"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 type propertySpec struct {
@@ -53,7 +56,7 @@ func readJSON(path string, v any) error {
 		return err
 	}
 
-	return json.Unmarshal(data, v)
+	return json.Unmarshal(data, v, jsonx.V1())
 }
 
 func run(specPath, typesPath, outPath, reqPath string) error {
@@ -67,7 +70,12 @@ func run(specPath, typesPath, outPath, reqPath string) error {
 		return fmt.Errorf("load types: %w", err)
 	}
 
-	out, err := json.MarshalIndent(buildSchemas(&spec, types), "", "  ")
+	out, err := json.Marshal(
+		buildSchemas(&spec, types),
+		jsonx.V1(),
+		jsontext.Multiline(true),
+		jsontext.WithIndent("  "),
+	)
 	if err != nil {
 		return fmt.Errorf("render: %w", err)
 	}
@@ -80,7 +88,12 @@ func run(specPath, typesPath, outPath, reqPath string) error {
 		return nil
 	}
 
-	req, err := json.MarshalIndent(buildRequired(&spec, types), "", "  ")
+	req, err := json.Marshal(
+		buildRequired(&spec, types),
+		jsonx.V1(),
+		jsontext.Multiline(true),
+		jsontext.WithIndent("  "),
+	)
 	if err != nil {
 		return fmt.Errorf("render required: %w", err)
 	}

cmd/clientcoverage/main.go

@@ -36,7 +36,8 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"flag"
 	"fmt"
 	"go/ast"
@@ -49,6 +50,8 @@ import (
 	"regexp"
 	"sort"
 	"strings"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 var (
@@ -650,7 +653,7 @@ func loadOpcensus(path string) ([]opService, error) {
 	}
 
 	var services []opService
-	if unmarshalErr := json.Unmarshal(data, &services); unmarshalErr != nil {
+	if unmarshalErr := json.Unmarshal(data, &services, jsonx.V1()); unmarshalErr != nil {
 		return nil, fmt.Errorf("parse %s: %w", path, unmarshalErr)
 	}
 
@@ -692,7 +695,7 @@ func main() {
 	rpt := buildReport(services, result)
 
 	if *jsonPath != "" {
-		data, marshalErr := json.MarshalIndent(rpt, "", "  ")
+		data, marshalErr := json.Marshal(rpt, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 		if marshalErr != nil {
 			fmt.Fprintln(os.Stderr, "marshal report:", marshalErr)
 			os.Exit(1)

cmd/enumcheck/report.go

@@ -1,9 +1,12 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"os"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 func writeJSON(path string, findings []finding) error {
@@ -12,10 +15,9 @@ func writeJSON(path string, findings []finding) error {
 		return err
 	}
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	if encErr := enc.Encode(findings); encErr != nil {
+	if encErr := json.MarshalEncode(enc, findings); encErr != nil {
 		_ = f.Close()
 
 		return encErr

cmd/errcodeaudit/report.go

@@ -1,9 +1,12 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"os"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 func writeJSON(path string, findings []finding) error {
@@ -13,10 +16,9 @@ func writeJSON(path string, findings []finding) error {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	return enc.Encode(findings)
+	return json.MarshalEncode(enc, findings)
 }
 
 func printReport(findings []finding) {

cmd/errtargetaudit/report.go

@@ -1,11 +1,14 @@
 package main
 
 import (
-	"encoding/json"
+	"encoding/json/jsontext"
+	"encoding/json/v2"
 	"fmt"
 	"os"
 	"sort"
 	"strings"
+
+	"github.com/blackbirdworks/gopherstack/pkgs/jsonx"
 )
 
 // lowResolutionThreshold gates the implausible-resolution guard --
@@ -211,10 +214,9 @@ func writeJSON(path string, scans []serviceScan) error {
 	}
 	defer f.Close()
 
-	enc := json.NewEncoder(f)
-	enc.SetIndent("", "  ")
+	enc := jsontext.NewEncoder(f, jsonx.V1(), jsontext.Multiline(true), jsontext.WithIndent("  "))
 
-	return enc.Encode(scans)
+	return json.MarshalEncode(enc, scans)
 }
 
 func printServiceScan(sr serviceScan) {