Commit7715955

authored

Fix helpers emit for .cjs files in ESM module mode (microsoft#61814)

1 parentfa2a0fc commit7715955Copy full SHA for 7715955

File tree

+45

-3

lines changed

+45

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -700,9 +700,10 @@ export function createExternalHelpersImportDeclarationIfNeeded(nodeFactory: Node`
`700`	`700`	`constimpliedModuleKind=getImpliedNodeFormatForEmitWorker(sourceFile,compilerOptions);`
`701`	`701`	`consthelpers=getImportedHelpers(sourceFile);`
`702`	`702`	`if(`
`703`		`-(moduleKind>=ModuleKind.ES2015&&moduleKind<=ModuleKind.ESNext)\|\|`
`704`		`-impliedModuleKind===ModuleKind.ESNext\|\|`
`705`		`-impliedModuleKind===undefined&&moduleKind===ModuleKind.Preserve`
	`703`	`+impliedModuleKind!==ModuleKind.CommonJS&&`
	`704`	`+((moduleKind>=ModuleKind.ES2015&&moduleKind<=ModuleKind.ESNext)\|\|`
	`705`	`+impliedModuleKind===ModuleKind.ESNext\|\|`
	`706`	`+impliedModuleKind===undefined&&moduleKind===ModuleKind.Preserve)`
`706`	`707`	`){`
`707`	`708`	// When we emit as an ES module, generate an `import` declaration that uses named imports for helpers.
`708`	`709`	// If we cannot determine the implied module kind under `module: preserve` we assume ESM.

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+notmodule.cts(1,23): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.`
	`2`	`+`
	`3`	`+`
	`4`	`+==== notmodule.cts (1 errors) ====`
	`5`	`+ export async function foo() {`
	`6`	`+ ~~~`
	`7`	`+!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.`
	`8`	`+ await 0;`
	`9`	`+ }`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+//// [tests/cases/compiler/ctsFileInEsnextHelpers.ts] ////`
	`2`	`+`
	`3`	`+//// [notmodule.cts]`
	`4`	`+exportasyncfunctionfoo(){`
	`5`	`+await0;`
	`6`	`+}`
	`7`	`+`
	`8`	`+//// [notmodule.cjs]`
	`9`	`+"use strict";`
	`10`	`+Object.defineProperty(exports,"__esModule",{value:true});`
	`11`	`+exports.foo=foo;`
	`12`	`+vartslib_1=require("tslib");`
	`13`	`+functionfoo(){`
	`14`	`+returntslib_1.__awaiter(this,void0,void0,function(){`
	`15`	`+returntslib_1.__generator(this,function(_a){`
	`16`	`+switch(_a.label){`
	`17`	`+case0:return[4/yield/,0];`
	`18`	`+case1:`
	`19`	`+_a.sent();`
	`20`	`+return[2/return/];`
	`21`	`+}`
	`22`	`+});`
	`23`	`+});`
	`24`	`+}`

Lines changed: 8 additions & 0 deletions

Comments

(0)