Use json v2 directly, move utils to new jsonutil package (#1504)

Author: jakebailey

.golangci.yml

@@ -68,7 +68,7 @@ linters:
         main:
           deny:
             - pkg: 'encoding/json$'
-              desc: 'Use "github.com/microsoft/typescript-go/internal/json" instead.'
+              desc: 'Use "github.com/go-json-experiment/json" instead.'
 
   exclusions:
     rules:

internal/api/api.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/go-json-experiment/json"
 	"github.com/microsoft/typescript-go/internal/api/encoder"
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/astnav"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
-	"github.com/microsoft/typescript-go/internal/json"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
 	"github.com/microsoft/typescript-go/internal/project"
 	"github.com/microsoft/typescript-go/internal/tsoptions"

internal/api/proto.go

@@ -6,10 +6,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/go-json-experiment/json"
+	"github.com/go-json-experiment/json/jsontext"
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
-	"github.com/microsoft/typescript-go/internal/json"
 	"github.com/microsoft/typescript-go/internal/project"
 )
 
@@ -200,7 +201,7 @@ type GetSourceFileParams struct {
 	FileName string                  `json:"fileName"`
 }
 
-func unmarshalPayload(method string, payload json.Value) (any, error) {
+func unmarshalPayload(method string, payload jsontext.Value) (any, error) {
 	unmarshaler, ok := unmarshalers[Method(method)]
 	if !ok {
 		return nil, fmt.Errorf("unknown API method %q", method)

internal/api/server.go

@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/go-json-experiment/json"
 	"github.com/microsoft/typescript-go/internal/bundled"
 	"github.com/microsoft/typescript-go/internal/core"
-	"github.com/microsoft/typescript-go/internal/json"
 	"github.com/microsoft/typescript-go/internal/project"
 	"github.com/microsoft/typescript-go/internal/vfs"
 	"github.com/microsoft/typescript-go/internal/vfs/osvfs"

internal/collections/ordered_map.go

@@ -9,8 +9,8 @@ import (
 	"slices"
 	"strconv"
 
+	"github.com/go-json-experiment/json"
 	"github.com/go-json-experiment/json/jsontext"
-	"github.com/microsoft/typescript-go/internal/json"
 )
 
 // OrderedMap is an insertion ordered map.

internal/collections/ordered_map_test.go

@@ -5,8 +5,8 @@ import (
 	"slices"
 	"testing"
 
+	"github.com/go-json-experiment/json"
 	"github.com/microsoft/typescript-go/internal/collections"
-	"github.com/microsoft/typescript-go/internal/json"
 	"gotest.tools/v3/assert"
 )
 

internal/compiler/program.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/go-json-experiment/json"
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/binder"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/diagnostics"
-	"github.com/microsoft/typescript-go/internal/json"
 	"github.com/microsoft/typescript-go/internal/module"
 	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/outputpaths"

internal/core/core.go

@@ -9,7 +9,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/microsoft/typescript-go/internal/json"
+	"github.com/microsoft/typescript-go/internal/jsonutil"
 	"github.com/microsoft/typescript-go/internal/stringutil"
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
@@ -427,7 +427,7 @@ func FirstResult[T1 any](t1 T1, _ ...any) T1 {
 }
 
 func StringifyJson(input any, prefix string, indent string) (string, error) {
-	output, err := json.MarshalIndent(input, prefix, indent)
+	output, err := jsonutil.MarshalIndent(input, prefix, indent)
 	return string(output), err
 }
 

internal/diagnostics/generate.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/microsoft/typescript-go/internal/json"
+	"github.com/go-json-experiment/json"
 	"github.com/microsoft/typescript-go/internal/repo"
 )
 

internal/execute/tsc.go

@@ -14,7 +14,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/diagnostics"
 	"github.com/microsoft/typescript-go/internal/format"
 	"github.com/microsoft/typescript-go/internal/incremental"
-	"github.com/microsoft/typescript-go/internal/json"
+	"github.com/microsoft/typescript-go/internal/jsonutil"
 	"github.com/microsoft/typescript-go/internal/parser"
 	"github.com/microsoft/typescript-go/internal/pprof"
 	"github.com/microsoft/typescript-go/internal/tsoptions"
@@ -413,7 +413,7 @@ func emitFilesAndReportErrors(
 
 func showConfig(sys System, config *core.CompilerOptions) {
 	// !!!
-	_ = json.MarshalIndentWrite(sys.Writer(), config, "", "    ")
+	_ = jsonutil.MarshalIndentWrite(sys.Writer(), config, "", "    ")
 }
 
 func listFiles(sys System, program compiler.ProgramLike) {