Fix moduleDetection for node18, fix __esModule in detect=force (#2045)

jakebailey · web-flow · commit ea4e944bb688 · 2025-11-10T19:58:31.000Z
diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go
@@ -232,12 +232,11 @@ func (options *CompilerOptions) GetEmitModuleDetectionKind() ModuleDetectionKind
 	if options.ModuleDetection != ModuleDetectionKindNone {
 		return options.ModuleDetection
 	}
-	switch options.GetEmitModuleKind() {
-	case ModuleKindNode16, ModuleKindNode20, ModuleKindNodeNext:
+	moduleKind := options.GetEmitModuleKind()
+	if ModuleKindNode16 <= moduleKind && moduleKind <= ModuleKindNodeNext {
 		return ModuleDetectionKindForce
-	default:
-		return ModuleDetectionKindAuto
 	}
+	return ModuleDetectionKindAuto
 }
 
 func (options *CompilerOptions) GetResolvePackageJsonExports() bool {
diff --git a/internal/transformers/moduletransforms/commonjsmodule.go b/internal/transformers/moduletransforms/commonjsmodule.go
@@ -247,7 +247,7 @@ func (tx *CommonJSModuleTransformer) visitSourceFile(node *ast.SourceFile) *ast.
 func (tx *CommonJSModuleTransformer) shouldEmitUnderscoreUnderscoreESModule() bool {
 	if tspath.FileExtensionIsOneOf(tx.currentSourceFile.FileName(), tspath.SupportedJSExtensionsFlat) &&
 		tx.currentSourceFile.CommonJSModuleIndicator != nil &&
-		(tx.currentSourceFile.ExternalModuleIndicator == nil /*|| tx.currentSourceFile.ExternalModuleIndicator == true*/) { // !!!
+		(tx.currentSourceFile.ExternalModuleIndicator == nil || tx.currentSourceFile.ExternalModuleIndicator.Kind == ast.KindSourceFile) {
 		return false
 	}
 	if tx.currentModuleInfo.exportEquals == nil && ast.IsExternalModule(tx.currentSourceFile) {
diff --git a/testdata/baselines/reference/submodule/compiler/tripleSlashTypesReferenceWithMissingExports(module=node18).js b/testdata/baselines/reference/submodule/compiler/tripleSlashTypesReferenceWithMissingExports(module=node18).js
@@ -14,5 +14,7 @@ interface GlobalThing { a: number }
 const a: GlobalThing = { a: 0 };
 
 //// [usage.js]
+"use strict";
 /// <reference types="pkg" />
+Object.defineProperty(exports, "__esModule", { value: true });
 const a = { a: 0 };
diff --git a/testdata/baselines/reference/submodule/compiler/tripleSlashTypesReferenceWithMissingExports(module=node18).js.diff b/testdata/baselines/reference/submodule/compiler/tripleSlashTypesReferenceWithMissingExports(module=node18).js.diff
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).js
@@ -35,7 +35,6 @@ const a = {};
 module.exports = a;
 //// [file.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // cjs format file
 const a = {};
 module.exports = a;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node16).js.diff
@@ -1,14 +1,6 @@
 --- old.nodeModulesAllowJsExportAssignment(module=node16).js
 +++ new.nodeModulesAllowJsExportAssignment(module=node16).js
-@@= skipped -34, +34 lines =@@
- module.exports = a;
- //// [file.js]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
- // cjs format file
- const a = {};
- module.exports = a;
-@@= skipped -15, +16 lines =@@
+@@= skipped -49, +49 lines =@@
 
 
  //// [index.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).js
@@ -34,6 +34,7 @@ module.exports = a;
 const a = {};
 module.exports = a;
 //// [file.js]
+"use strict";
 // cjs format file
 const a = {};
 module.exports = a;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node18).js.diff
@@ -1,14 +1,6 @@
 --- old.nodeModulesAllowJsExportAssignment(module=node18).js
 +++ new.nodeModulesAllowJsExportAssignment(module=node18).js
-@@= skipped -33, +33 lines =@@
- const a = {};
- module.exports = a;
- //// [file.js]
--"use strict";
- // cjs format file
- const a = {};
- module.exports = a;
-@@= skipped -16, +15 lines =@@
+@@= skipped -49, +49 lines =@@
 
 
  //// [index.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).js
@@ -35,7 +35,6 @@ const a = {};
 module.exports = a;
 //// [file.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // cjs format file
 const a = {};
 module.exports = a;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=node20).js.diff
@@ -1,14 +1,6 @@
 --- old.nodeModulesAllowJsExportAssignment(module=node20).js
 +++ new.nodeModulesAllowJsExportAssignment(module=node20).js
-@@= skipped -34, +34 lines =@@
- module.exports = a;
- //// [file.js]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
- // cjs format file
- const a = {};
- module.exports = a;
-@@= skipped -15, +16 lines =@@
+@@= skipped -49, +49 lines =@@
 
 
  //// [index.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).js
@@ -35,7 +35,6 @@ const a = {};
 module.exports = a;
 //// [file.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // cjs format file
 const a = {};
 module.exports = a;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsExportAssignment(module=nodenext).js.diff
@@ -1,14 +1,6 @@
 --- old.nodeModulesAllowJsExportAssignment(module=nodenext).js
 +++ new.nodeModulesAllowJsExportAssignment(module=nodenext).js
-@@= skipped -34, +34 lines =@@
- module.exports = a;
- //// [file.js]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
- // cjs format file
- const a = {};
- module.exports = a;
-@@= skipped -15, +16 lines =@@
+@@= skipped -49, +49 lines =@@
 
 
  //// [index.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js
@@ -22,11 +22,9 @@ three.foo;
 
 //// [1.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 module.exports = {};
 //// [2.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 export var foo = 0;
 exports.foo = 0;
 //// [3.cjs]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff
@@ -1,14 +1,9 @@
 --- old.nodeModulesCJSEmit1(module=node18).js
 +++ new.nodeModulesCJSEmit1(module=node18).js
-@@= skipped -21, +21 lines =@@
-
- //// [1.cjs]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -24, +24 lines =@@
  module.exports = {};
  //// [2.cjs]
  "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
 +export var foo = 0;
  exports.foo = 0;
  //// [3.cjs]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node20).js b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node20).js
@@ -22,11 +22,9 @@ three.foo;
 
 //// [1.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 module.exports = {};
 //// [2.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 export var foo = 0;
 exports.foo = 0;
 //// [3.cjs]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node20).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node20).js.diff
@@ -1,14 +1,9 @@
 --- old.nodeModulesCJSEmit1(module=node20).js
 +++ new.nodeModulesCJSEmit1(module=node20).js
-@@= skipped -21, +21 lines =@@
-
- //// [1.cjs]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -24, +24 lines =@@
  module.exports = {};
  //// [2.cjs]
  "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
 +export var foo = 0;
  exports.foo = 0;
  //// [3.cjs]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=nodenext).js
@@ -22,11 +22,9 @@ three.foo;
 
 //// [1.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 module.exports = {};
 //// [2.cjs]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 export var foo = 0;
 exports.foo = 0;
 //// [3.cjs]
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=nodenext).js.diff
@@ -1,14 +1,9 @@
 --- old.nodeModulesCJSEmit1(module=nodenext).js
 +++ new.nodeModulesCJSEmit1(module=nodenext).js
-@@= skipped -21, +21 lines =@@
-
- //// [1.cjs]
- "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -24, +24 lines =@@
  module.exports = {};
  //// [2.cjs]
  "use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
 +export var foo = 0;
  exports.foo = 0;
  //// [3.cjs]

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,11 @@ func (options *CompilerOptions) GetEmitModuleDetectionKind() ModuleDetectionKind`
`232`	`232`	`if options.ModuleDetection != ModuleDetectionKindNone {`
`233`	`233`	`return options.ModuleDetection`
`234`	`234`	`}`
`235`		`- switch options.GetEmitModuleKind() {`
`236`		`- case ModuleKindNode16, ModuleKindNode20, ModuleKindNodeNext:`
	`235`	`+ moduleKind := options.GetEmitModuleKind()`
	`236`	`+ if ModuleKindNode16 <= moduleKind && moduleKind <= ModuleKindNodeNext {`
`237`	`237`	`return ModuleDetectionKindForce`
`238`		`- default:`
`239`		`- return ModuleDetectionKindAuto`
`240`	`238`	`}`
	`239`	`+ return ModuleDetectionKindAuto`
`241`	`240`	`}`
`242`	`241`
`243`	`242`	`func (options *CompilerOptions) GetResolvePackageJsonExports() bool {`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ func (tx CommonJSModuleTransformer) visitSourceFile(node ast.SourceFile) *ast.`
`247`	`247`	`func (tx *CommonJSModuleTransformer) shouldEmitUnderscoreUnderscoreESModule() bool {`
`248`	`248`	`if tspath.FileExtensionIsOneOf(tx.currentSourceFile.FileName(), tspath.SupportedJSExtensionsFlat) &&`
`249`	`249`	`tx.currentSourceFile.CommonJSModuleIndicator != nil &&`
`250`		`- (tx.currentSourceFile.ExternalModuleIndicator == nil /\|\| tx.currentSourceFile.ExternalModuleIndicator == true/) { // !!!`
	`250`	`+ (tx.currentSourceFile.ExternalModuleIndicator == nil \|\| tx.currentSourceFile.ExternalModuleIndicator.Kind == ast.KindSourceFile) {`
`251`	`251`	`return false`
`252`	`252`	`}`
`253`	`253`	`if tx.currentModuleInfo.exportEquals == nil && ast.IsExternalModule(tx.currentSourceFile) {`