Omit redundant import modes in emitter

weswigham · weswigham · commit 7997a629ff63 · 2022-02-08T10:59:44.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -3994,7 +3994,7 @@ namespace ts {
             for (const directive of types) {
                 const pos = writer.getTextPos();
                 // Should we elide `resolution-mode` if it matches the mode the currentSourceFile defaults to?
-                writeComment(`/// <reference types="${directive.fileName}" ${directive.resolutionMode ? `resolution-mode="${directive.resolutionMode === ModuleKind.ESNext ? "import" : "require"}"` : ""}/>`);
+                writeComment(`/// <reference types="${directive.fileName}" ${directive.resolutionMode && directive.resolutionMode !== currentSourceFile?.impliedNodeFormat ? `resolution-mode="${directive.resolutionMode === ModuleKind.ESNext ? "import" : "require"}"` : ""}/>`);
                 if (bundleFileInfo) bundleFileInfo.sections.push({ pos, end: writer.getTextPos(), kind: !directive.resolutionMode ? BundleFileSectionKind.Type : directive.resolutionMode === ModuleKind.ESNext ? BundleFileSectionKind.TypeResolutionModeImport : BundleFileSectionKind.TypeResolutionModeRequire, data: directive.fileName });
                 writeLine();
             }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node12).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node12).js
@@ -30,6 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends RequireInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
@@ -30,6 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends RequireInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node12).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node12).js
@@ -34,6 +34,6 @@ export {};
 
 
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends ImportInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).js
@@ -34,6 +34,6 @@ export {};
 
 
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends ImportInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node12).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node12).js
@@ -33,6 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 //// [index.d.ts]
 /// <reference types="pkg" resolution-mode="import"/>
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends ImportInterface, RequireInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
@@ -33,6 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 
 //// [index.d.ts]
 /// <reference types="pkg" resolution-mode="import"/>
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 export interface LocalInterface extends ImportInterface, RequireInterface {
 }
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node12).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node12).js
@@ -44,10 +44,10 @@ exports.default = uses_js_1.default;
 
 
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
@@ -44,10 +44,10 @@ exports.default = uses_js_1.default;
 
 
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node12).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node12).js
@@ -64,15 +64,15 @@ export default [obj1, obj2.default];
 
 
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 declare const _default: ImportInterface;
 export default _default;
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 /// <reference types="pkg" resolution-mode="require"/>
 declare const _default: readonly [ImportInterface, RequireInterface];
 export default _default;
diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).js
@@ -64,15 +64,15 @@ export default [obj1, obj2.default];
 
 
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 declare const _default: ImportInterface;
 export default _default;
 //// [uses.d.ts]
-/// <reference types="pkg" resolution-mode="require"/>
+/// <reference types="pkg" />
 declare const _default: RequireInterface;
 export default _default;
 //// [index.d.ts]
-/// <reference types="pkg" resolution-mode="import"/>
+/// <reference types="pkg" />
 /// <reference types="pkg" resolution-mode="require"/>
 declare const _default: readonly [ImportInterface, RequireInterface];
 export default _default;

Original file line number	Diff line number	Diff line change
`@@ -3994,7 +3994,7 @@ namespace ts {`
`3994`	`3994`	`for (const directive of types) {`
`3995`	`3995`	`const pos = writer.getTextPos();`
`3996`	`3996`	// Should we elide `resolution-mode` if it matches the mode the currentSourceFile defaults to?
`3997`		- writeComment(`/// <reference types="${directive.fileName}" ${directive.resolutionMode ? `resolution-mode="${directive.resolutionMode === ModuleKind.ESNext ? "import" : "require"}"` : ""}/>`);
	`3997`	+ writeComment(`/// <reference types="${directive.fileName}" ${directive.resolutionMode && directive.resolutionMode !== currentSourceFile?.impliedNodeFormat ? `resolution-mode="${directive.resolutionMode === ModuleKind.ESNext ? "import" : "require"}"` : ""}/>`);
`3998`	`3998`	`if (bundleFileInfo) bundleFileInfo.sections.push({ pos, end: writer.getTextPos(), kind: !directive.resolutionMode ? BundleFileSectionKind.Type : directive.resolutionMode === ModuleKind.ESNext ? BundleFileSectionKind.TypeResolutionModeImport : BundleFileSectionKind.TypeResolutionModeRequire, data: directive.fileName });`
`3999`	`3999`	`writeLine();`
`4000`	`4000`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ Object.defineProperty(exports, "__esModule", { value: true });`
`30`	`30`
`31`	`31`
`32`	`32`	`//// [index.d.ts]`
`33`		`-/// <reference types="pkg" resolution-mode="require"/>`
	`33`	`+/// <reference types="pkg" />`
`34`	`34`	`export interface LocalInterface extends RequireInterface {`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ export {};`
`34`	`34`
`35`	`35`
`36`	`36`	`//// [index.d.ts]`
`37`		`-/// <reference types="pkg" resolution-mode="import"/>`
	`37`	`+/// <reference types="pkg" />`
`38`	`38`	`export interface LocalInterface extends ImportInterface {`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ Object.defineProperty(exports, "__esModule", { value: true });`
`33`	`33`
`34`	`34`	`//// [index.d.ts]`
`35`	`35`	`/// <reference types="pkg" resolution-mode="import"/>`
`36`		`-/// <reference types="pkg" resolution-mode="require"/>`
	`36`	`+/// <reference types="pkg" />`
`37`	`37`	`export interface LocalInterface extends ImportInterface, RequireInterface {`
`38`	`38`	`}`