Set implied node format during source file creation

internal/compiler/emitter.go

@@ -38,13 +38,13 @@ func (e *emitter) emit() {
 	e.emitBuildInfo(e.paths.buildInfoPath)
 }
 
-func (e *emitter) getModuleTransformer(emitContext *printer.EmitContext, resolver binder.ReferenceResolver) *transformers.Transformer {
+func (e *emitter) getModuleTransformer(emitContext *printer.EmitContext, resolver binder.ReferenceResolver, metaDataProvider transformers.MetaDataProvider) *transformers.Transformer {
 	options := e.host.Options()
 
 	switch options.GetEmitModuleKind() {
 	case core.ModuleKindPreserve:
 		// `ESModuleTransformer` contains logic for preserving CJS input syntax in `--module preserve`
-		return transformers.NewESModuleTransformer(emitContext, options, resolver)
+		return transformers.NewESModuleTransformer(emitContext, options, resolver, metaDataProvider)
 
 	case core.ModuleKindESNext,
 		core.ModuleKindES2022,
@@ -53,10 +53,10 @@ func (e *emitter) getModuleTransformer(emitContext *printer.EmitContext, resolve
 		core.ModuleKindNode16,
 		core.ModuleKindNodeNext,
 		core.ModuleKindCommonJS:
-		return transformers.NewImpliedModuleTransformer(emitContext, options, resolver)
+		return transformers.NewImpliedModuleTransformer(emitContext, options, resolver, metaDataProvider)
 
 	default:
-		return transformers.NewCommonJSModuleTransformer(emitContext, options, resolver)
+		return transformers.NewCommonJSModuleTransformer(emitContext, options, resolver, metaDataProvider)
 	}
 }
 
@@ -77,6 +77,10 @@ func (e *emitter) getScriptTransformers(emitContext *printer.EmitContext, source
 		referenceResolver = binder.NewReferenceResolver(options, binder.ReferenceResolverHooks{})
 	}
 
+	metaDataProvider := transformers.NewMetaDataProvider(func(file *ast.SourceFile) *ast.SourceFileMetaData {
+		return e.host.GetCachedSourceFileMetaDatas()[file.Path()]
+	})
+
 	// erase types
 	tx = append(tx, transformers.NewTypeEraserTransformer(emitContext, options))
 
@@ -89,7 +93,7 @@ func (e *emitter) getScriptTransformers(emitContext *printer.EmitContext, source
 	tx = append(tx, transformers.NewRuntimeSyntaxTransformer(emitContext, options, referenceResolver))
 
 	// transform module syntax
-	tx = append(tx, e.getModuleTransformer(emitContext, referenceResolver))
+	tx = append(tx, e.getModuleTransformer(emitContext, referenceResolver, metaDataProvider))
 	return tx
 }
 
@@ -105,7 +109,6 @@ func (e *emitter) emitJsFile(sourceFile *ast.SourceFile, jsFilePath string, sour
 	}
 
 	emitContext := printer.NewEmitContext()
-	emitContext.SetSourcefileMetaDatas(e.host.GetCachedSourceFileMetaDatas())
 	for _, transformer := range e.getScriptTransformers(emitContext, sourceFile) {
 		sourceFile = transformer.TransformSourceFile(sourceFile)
 	}

internal/printer/emitcontext.go

@@ -10,22 +10,20 @@ import (
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
-	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
 // Stores side-table information used during transformation that can be read by the printer to customize emit
 //
 // NOTE: EmitContext is not guaranteed to be thread-safe.
 type EmitContext struct {
-	Factory             *ast.NodeFactory // Required. The NodeFactory to use to create new nodes
-	autoGenerate        map[*ast.MemberName]*AutoGenerateInfo
-	textSource          map[*ast.StringLiteralNode]*ast.Node
-	original            map[*ast.Node]*ast.Node
-	emitNodes           core.LinkStore[*ast.Node, emitNode]
-	varScopeStack       core.Stack[*varScope]
-	letScopeStack       core.Stack[*varScope]
-	emitHelpers         collections.OrderedSet[*EmitHelper]
-	sourceFileMetaDatas map[tspath.Path]*ast.SourceFileMetaData
+	Factory       *ast.NodeFactory // Required. The NodeFactory to use to create new nodes
+	autoGenerate  map[*ast.MemberName]*AutoGenerateInfo
+	textSource    map[*ast.StringLiteralNode]*ast.Node
+	original      map[*ast.Node]*ast.Node
+	emitNodes     core.LinkStore[*ast.Node, emitNode]
+	varScopeStack core.Stack[*varScope]
+	letScopeStack core.Stack[*varScope]
+	emitHelpers   collections.OrderedSet[*EmitHelper]
 
 	isCustomPrologue           func(node *ast.Statement) bool
 	isHoistedFunction          func(node *ast.Statement) bool
@@ -627,10 +625,6 @@ func (c *EmitContext) NewRewriteRelativeImportExtensionsHelper(firstArgument *as
 	)
 }
 
-func (c *EmitContext) SetSourcefileMetaDatas(sourceFileMetaDatas map[tspath.Path]*ast.SourceFileMetaData) {
-	c.sourceFileMetaDatas = sourceFileMetaDatas
-}
-
 //
 // Original Node Tracking
 //
@@ -955,7 +949,3 @@ func (c *EmitContext) VisitIterationBody(body *ast.Statement, visitor *ast.NodeV
 
 	return updated
 }
-
-func (c *EmitContext) GetSourceFileMetaData(file *ast.SourceFile) *ast.SourceFileMetaData {
-	return c.sourceFileMetaDatas[file.Path()]
-}

internal/transformers/commonjsmodule.go

@@ -18,6 +18,7 @@ type CommonJSModuleTransformer struct {
 	assignmentPatternVisitor *ast.NodeVisitor // visits assignment patterns in a destructuring assignment
 	compilerOptions          *core.CompilerOptions
 	resolver                 binder.ReferenceResolver
+	metaDataProvider         MetaDataProvider
 	moduleKind               core.ModuleKind
 	languageVersion          core.ScriptTarget
 	currentSourceFile        *ast.SourceFile
@@ -26,7 +27,7 @@ type CommonJSModuleTransformer struct {
 	currentNode              *ast.Node // used for ancestor tracking via pushNode/popNode to detect expression identifiers
 }
 
-func NewCommonJSModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver) *Transformer {
+func NewCommonJSModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver, metaDataProvider MetaDataProvider) *Transformer {
 	if resolver == nil {
 		resolver = binder.NewReferenceResolver(compilerOptions, binder.ReferenceResolverHooks{})
 	}
@@ -37,6 +38,7 @@ func NewCommonJSModuleTransformer(emitContext *printer.EmitContext, compilerOpti
 	tx.assignmentPatternVisitor = emitContext.NewNodeVisitor(tx.visitAssignmentPattern)
 	tx.languageVersion = compilerOptions.GetEmitScriptTarget()
 	tx.moduleKind = compilerOptions.GetEmitModuleKind()
+	tx.metaDataProvider = metaDataProvider
 	return tx.newTransformer(tx.visit, emitContext)
 }
 
@@ -362,7 +364,7 @@ func (tx *CommonJSModuleTransformer) transformCommonJSModule(node *ast.SourceFil
 	result := tx.factory.UpdateSourceFile(node, statementList).AsSourceFile()
 	tx.emitContext.AddEmitHelper(result.AsNode(), tx.emitContext.ReadEmitHelpers()...)
 
-	externalHelpersImportDeclaration := createExternalHelpersImportDeclarationIfNeeded(tx.emitContext, result, tx.compilerOptions, false /*hasExportStarsToExportValues*/, false /*hasImportStar*/, false /*hasImportDefault*/)
+	externalHelpersImportDeclaration := createExternalHelpersImportDeclarationIfNeeded(tx.emitContext, result, tx.compilerOptions, tx.metaDataProvider, false /*hasExportStarsToExportValues*/, false /*hasImportStar*/, false /*hasImportDefault*/)
 	if externalHelpersImportDeclaration != nil {
 		prologue, rest := tx.emitContext.SplitStandardPrologue(result.Statements.Nodes)
 		custom, rest := tx.emitContext.SplitCustomPrologue(rest)
@@ -1680,7 +1682,7 @@ func (tx *CommonJSModuleTransformer) visitCallExpression(node *ast.CallExpressio
 
 func (tx *CommonJSModuleTransformer) shouldTransformImportCall() bool {
 	// !!! host.shouldTransformImportCall?
-	return shouldTransformImportCallWorker(tx.currentSourceFile, tx.compilerOptions, tx.emitContext.GetSourceFileMetaData(tx.currentSourceFile))
+	return shouldTransformImportCallWorker(tx.currentSourceFile, tx.compilerOptions, tx.metaDataProvider.GetSourceFileMetaData(tx.currentSourceFile))
 }
 
 func (tx *CommonJSModuleTransformer) visitImportCallExpression(node *ast.CallExpression, rewriteOrShim bool) *ast.Node {

internal/transformers/commonjsmodule_test.go

@@ -1027,8 +1027,11 @@ exports.a = a;`,
 
 			emitContext := printer.NewEmitContext()
 			resolver := binder.NewReferenceResolver(&compilerOptions, binder.ReferenceResolverHooks{})
+			metaDataProvider := NewMetaDataProvider(func(file *ast.SourceFile) *ast.SourceFileMetaData {
+				return nil
+			})
 			file = NewRuntimeSyntaxTransformer(emitContext, &compilerOptions, resolver).TransformSourceFile(file)
-			file = NewCommonJSModuleTransformer(emitContext, &compilerOptions, resolver).TransformSourceFile(file)
+			file = NewCommonJSModuleTransformer(emitContext, &compilerOptions, resolver, metaDataProvider).TransformSourceFile(file)
 			emittestutil.CheckEmit(t, emitContext, file, rec.output)
 		})
 	}

internal/transformers/esmodule.go

@@ -13,6 +13,7 @@ type ESModuleTransformer struct {
 	Transformer
 	compilerOptions         *core.CompilerOptions
 	resolver                binder.ReferenceResolver
+	metaDataProvider        MetaDataProvider
 	currentSourceFile       *ast.SourceFile
 	importRequireStatements *importRequireStatements
 	helperNameSubstitutions map[string]*ast.IdentifierNode
@@ -23,11 +24,11 @@ type importRequireStatements struct {
 	requireHelperName *ast.IdentifierNode
 }
 
-func NewESModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver) *Transformer {
+func NewESModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver, metaDataProvider MetaDataProvider) *Transformer {
 	if resolver == nil {
 		resolver = binder.NewReferenceResolver(compilerOptions, binder.ReferenceResolverHooks{})
 	}
-	tx := &ESModuleTransformer{compilerOptions: compilerOptions, resolver: resolver}
+	tx := &ESModuleTransformer{compilerOptions: compilerOptions, resolver: resolver, metaDataProvider: metaDataProvider}
 	return tx.newTransformer(tx.visit, emitContext)
 }
 
@@ -64,7 +65,7 @@ func (tx *ESModuleTransformer) visitSourceFile(node *ast.SourceFile) *ast.Node {
 	result := tx.visitor.VisitEachChild(node.AsNode()).AsSourceFile()
 	tx.emitContext.AddEmitHelper(result.AsNode(), tx.emitContext.ReadEmitHelpers()...)
 
-	externalHelpersImportDeclaration := createExternalHelpersImportDeclarationIfNeeded(tx.emitContext, result, tx.compilerOptions, false /*hasExportStarsToExportValues*/, false /*hasImportStar*/, false /*hasImportDefault*/)
+	externalHelpersImportDeclaration := createExternalHelpersImportDeclarationIfNeeded(tx.emitContext, result, tx.compilerOptions, tx.metaDataProvider, false /*hasExportStarsToExportValues*/, false /*hasImportStar*/, false /*hasImportDefault*/)
 	if externalHelpersImportDeclaration != nil || tx.importRequireStatements != nil {
 		prologue, rest := tx.emitContext.SplitStandardPrologue(result.Statements.Nodes)
 		statements := slices.Clone(prologue)

internal/transformers/esmodule_test.go

@@ -233,8 +233,11 @@ var __rewriteRelativeImportExtension;`,
 
 			emitContext := printer.NewEmitContext()
 			resolver := binder.NewReferenceResolver(&compilerOptions, binder.ReferenceResolverHooks{})
+			metaDataProvider := NewMetaDataProvider(func(file *ast.SourceFile) *ast.SourceFileMetaData {
+				return nil
+			})
 			file = NewRuntimeSyntaxTransformer(emitContext, &compilerOptions, resolver).TransformSourceFile(file)
-			file = NewESModuleTransformer(emitContext, &compilerOptions, resolver).TransformSourceFile(file)
+			file = NewESModuleTransformer(emitContext, &compilerOptions, resolver, metaDataProvider).TransformSourceFile(file)
 			emittestutil.CheckEmit(t, emitContext, file, rec.output)
 		})
 	}

internal/transformers/externalmoduleinfo.go

@@ -246,10 +246,10 @@ func (c *externalModuleInfoCollector) collectExportedVariableInfo(decl *ast.Node
 
 const externalHelpersModuleNameText = "tslib"
 
-func createExternalHelpersImportDeclarationIfNeeded(emitContext *printer.EmitContext, sourceFile *ast.SourceFile, compilerOptions *core.CompilerOptions, hasExportStarsToExportValues bool, hasImportStar bool, hasImportDefault bool) *ast.Node /*ImportDeclaration | ImportEqualsDeclaration*/ {
+func createExternalHelpersImportDeclarationIfNeeded(emitContext *printer.EmitContext, sourceFile *ast.SourceFile, compilerOptions *core.CompilerOptions, metaDataProvider MetaDataProvider, hasExportStarsToExportValues bool, hasImportStar bool, hasImportDefault bool) *ast.Node /*ImportDeclaration | ImportEqualsDeclaration*/ {
 	if compilerOptions.ImportHelpers.IsTrue() && ast.IsEffectiveExternalModule(sourceFile, compilerOptions) {
 		moduleKind := compilerOptions.GetEmitModuleKind()
-		impliedModuleKind := ast.GetImpliedNodeFormatForEmitWorker(sourceFile.FileName(), compilerOptions, emitContext.GetSourceFileMetaData(sourceFile))
+		impliedModuleKind := ast.GetImpliedNodeFormatForEmitWorker(sourceFile.FileName(), compilerOptions, metaDataProvider.GetSourceFileMetaData(sourceFile))
 		helpers := getImportedHelpers(emitContext, sourceFile)
 		if (moduleKind >= core.ModuleKindES2015 && moduleKind <= core.ModuleKindESNext) ||
 			impliedModuleKind == core.ModuleKindESNext ||
@@ -291,7 +291,7 @@ func createExternalHelpersImportDeclarationIfNeeded(emitContext *printer.EmitCon
 			}
 		} else {
 			// When we emit to a non-ES module, generate a synthetic `import tslib = require("tslib")` to be further transformed.
-			externalHelpersModuleName := getOrCreateExternalHelpersModuleNameIfNeeded(emitContext, sourceFile, compilerOptions, helpers, hasExportStarsToExportValues, hasImportStar || hasImportDefault, emitContext.GetSourceFileMetaData(sourceFile))
+			externalHelpersModuleName := getOrCreateExternalHelpersModuleNameIfNeeded(emitContext, sourceFile, compilerOptions, helpers, hasExportStarsToExportValues, hasImportStar || hasImportDefault, metaDataProvider.GetSourceFileMetaData(sourceFile))
 			if externalHelpersModuleName != nil {
 				externalHelpersImportDeclaration := emitContext.Factory.NewImportEqualsDeclaration(
 					nil,   /*modifiers*/

internal/transformers/impliedmodule.go

@@ -9,17 +9,18 @@ import (
 
 type ImpliedModuleTransformer struct {
 	Transformer
-	compilerOptions *core.CompilerOptions
-	resolver        binder.ReferenceResolver
-	cjsTransformer  *Transformer
-	esmTransformer  *Transformer
+	compilerOptions  *core.CompilerOptions
+	resolver         binder.ReferenceResolver
+	metaDataProvider MetaDataProvider
+	cjsTransformer   *Transformer
+	esmTransformer   *Transformer
 }
 
-func NewImpliedModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver) *Transformer {
+func NewImpliedModuleTransformer(emitContext *printer.EmitContext, compilerOptions *core.CompilerOptions, resolver binder.ReferenceResolver, metaDataProvider MetaDataProvider) *Transformer {
 	if resolver == nil {
 		resolver = binder.NewReferenceResolver(compilerOptions, binder.ReferenceResolverHooks{})
 	}
-	tx := &ImpliedModuleTransformer{compilerOptions: compilerOptions, resolver: resolver}
+	tx := &ImpliedModuleTransformer{compilerOptions: compilerOptions, resolver: resolver, metaDataProvider: metaDataProvider}
 	return tx.newTransformer(tx.visit, emitContext)
 }
 
@@ -41,12 +42,12 @@ func (tx *ImpliedModuleTransformer) visitSourceFile(node *ast.SourceFile) *ast.N
 	var transformer *Transformer
 	if format >= core.ModuleKindES2015 {
 		if tx.esmTransformer == nil {
-			tx.esmTransformer = NewESModuleTransformer(tx.emitContext, tx.compilerOptions, tx.resolver)
+			tx.esmTransformer = NewESModuleTransformer(tx.emitContext, tx.compilerOptions, tx.resolver, tx.metaDataProvider)
 		}
 		transformer = tx.esmTransformer
 	} else {
 		if tx.cjsTransformer == nil {
-			tx.cjsTransformer = NewCommonJSModuleTransformer(tx.emitContext, tx.compilerOptions, tx.resolver)
+			tx.cjsTransformer = NewCommonJSModuleTransformer(tx.emitContext, tx.compilerOptions, tx.resolver, tx.metaDataProvider)
 		}
 		transformer = tx.cjsTransformer
 	}
@@ -56,5 +57,5 @@ func (tx *ImpliedModuleTransformer) visitSourceFile(node *ast.SourceFile) *ast.N
 
 func (tx *ImpliedModuleTransformer) getEmitModuleFormatOfFile(node *ast.SourceFile) core.ModuleKind {
 	// !!! host.getEmitModuleFormatOfFile?
-	return ast.GetEmitModuleFormatOfFileWorker(node, tx.compilerOptions, tx.emitContext.GetSourceFileMetaData(node))
+	return ast.GetEmitModuleFormatOfFileWorker(node, tx.compilerOptions, tx.metaDataProvider.GetSourceFileMetaData(node))
 }

internal/transformers/metadataprovider.go

@@ -0,0 +1,21 @@
+package transformers
+
+import "github.com/microsoft/typescript-go/internal/ast"
+
+type MetaDataProvider interface {
+	GetSourceFileMetaData(file *ast.SourceFile) *ast.SourceFileMetaData
+}
+
+type metaDataProvider struct {
+	getSourceFileMetaData func(file *ast.SourceFile) *ast.SourceFileMetaData
+}
+
+func NewMetaDataProvider(getSourceFileMetaData func(file *ast.SourceFile) *ast.SourceFileMetaData) MetaDataProvider {
+	return &metaDataProvider{
+		getSourceFileMetaData: getSourceFileMetaData,
+	}
+}
+
+func (r *metaDataProvider) GetSourceFileMetaData(file *ast.SourceFile) *ast.SourceFileMetaData {
+	return r.getSourceFileMetaData(file)
+}