pull upstream

internal/compiler/emitter.go

@@ -133,7 +133,9 @@ func (e *emitter) emitJSFile(sourceFile *ast.SourceFile, jsFilePath string, sour
 		return
 	}
 
-	emitContext := printer.NewEmitContext()
+	emitContext, putEmitContext := printer.GetEmitContext()
+	defer putEmitContext()
+
 	for _, transformer := range getScriptTransformers(emitContext, e.host, sourceFile) {
 		sourceFile = transformer.TransformSourceFile(sourceFile)
 	}
@@ -175,7 +177,8 @@ func (e *emitter) emitDeclarationFile(sourceFile *ast.SourceFile, declarationFil
 	}
 
 	var diags []*ast.Diagnostic
-	emitContext := printer.NewEmitContext()
+	emitContext, putEmitContext := printer.GetEmitContext()
+	defer putEmitContext()
 	for _, transformer := range e.getDeclarationTransformers(emitContext, sourceFile, declarationFilePath, declarationMapPath) {
 		sourceFile = transformer.TransformSourceFile(sourceFile)
 		diags = append(diags, transformer.GetDiagnostics()...)

internal/fourslash/tests/gen/pathCompletionsPackageJsonExportsBundlerNoNodeCondition_test.go

@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition(t *testing.T) {
     "./only-for-node": {
       "node": "./something.js"
     },
-    "./for-everywhere": "./other.js",
+    "./for-everywhere": "./other.js"
   }
 }
 // @Filename: /node_modules/foo/something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonExportsCustomConditions_test.go

@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsCustomConditions(t *testing.T) {
   "exports": {
     "./only-with-custom-conditions": {
       "custom-condition": "./something.js"
-    },
+    }
   }
 }
 // @Filename: /node_modules/foo/something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonImportsBundlerNoNodeCondition_test.go

@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsBundlerNoNodeCondition(t *testing.T) {
     "#only-for-node": {
       "node": "./something.js"
     },
-    "#for-everywhere": "./other.js",
+    "#for-everywhere": "./other.js"
   }
 }
 // @Filename: /something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonImportsCustomConditions_test.go

@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsCustomConditions(t *testing.T) {
   "imports": {
     "#only-with-custom-conditions": {
       "custom-condition": "./something.js"
-    },
+    }
   }
 }
 // @Filename: /something.d.ts

internal/packagejson/packagejson.go

@@ -36,7 +36,7 @@ type Fields struct {
 func Parse(data []byte) (Fields, error) {
 	var f Fields
 	if err := json2.Unmarshal(data, &f); err != nil {
-		return f, err
+		return Fields{}, err
 	}
 	return f, nil
 }

internal/printer/emitcontext.go

@@ -3,6 +3,7 @@ package printer
 import (
 	"maps"
 	"slices"
+	"sync"
 	"sync/atomic"
 
 	"github.com/microsoft/typescript-go/internal/ast"
@@ -37,6 +38,20 @@ func NewEmitContext() *EmitContext {
 	return c
 }
 
+var emitContextPool = sync.Pool{
+	New: func() any {
+		return NewEmitContext()
+	},
+}
+
+func GetEmitContext() (*EmitContext, func()) {
+	c := emitContextPool.Get().(*EmitContext)
+	return c, func() {
+		c.Reset()
+		emitContextPool.Put(c)
+	}
+}
+
 func (c *EmitContext) Reset() {
 	*c = EmitContext{
 		Factory: c.Factory,

internal/project/projectreferencesprogram_test.go

@@ -283,7 +283,7 @@ func filesForSymlinkReferences(preserveSymlinks bool, scope string) (files map[s
 	files = map[string]any{
 		"/user/username/projects/myproject/packages/B/package.json": `{
 			"main": "lib/index.js",
-			"types": "lib/index.d.ts",
+			"types": "lib/index.d.ts"
 		}`,
 		aTest: fmt.Sprintf(`
 			import { foo } from '%sb';

internal/testutil/tsbaseline/type_symbol_baseline.go

@@ -347,7 +347,8 @@ func (walker *typeWriterWalker) writeTypeOrSymbol(node *ast.Node, isSymbolWalk b
 	fileChecker, done := walker.getTypeCheckerForCurrentFile()
 	defer done()
 
-	ctx := printer.NewEmitContext()
+	ctx, putCtx := printer.GetEmitContext()
+	defer putCtx()
 
 	if !isSymbolWalk {
 		// Don't try to get the type of something that's already a type.

testdata/baselines/reference/submodule/compiler/narrowingUnionToUnion.types.diff

@@ -1,15 +1,6 @@
 --- old.narrowingUnionToUnion.types
 +++ new.narrowingUnionToUnion.types
-@@= skipped -32, +32 lines =@@
- >x : T | undefined
-
-         x;  // T & Falsy | undefined
-->x : (T & null) | (T & "") | (T & 0) | (T & false) | (T & 0n) | undefined
-+>x : (T & null) | (T & "") | (T & 0) | (T & 0n) | (T & false) | undefined
-     }
- }
-
-@@= skipped -212, +212 lines =@@
+@@= skipped -244, +244 lines =@@
          }
      },
      (value?: string) => {

testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js

@@ -7,7 +7,7 @@ export const a = <div></div>;
     "name": "@types/react",
     "version": "0.0.1",
     "main": "",
-    "types": "index.d.ts",
+    "types": "index.d.ts"
 }
 //// [index.d.ts]
 declare namespace JSX {