Omit redundant import modes in emitter

microsoft · Feb 8, 2022 · 7997a62 · 7997a62
1 parent 9ada046
commit 7997a62
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
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/...baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node12).js b/...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/...selines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js b/...selines/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/...baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node12).js b/...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/...selines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).js b/...selines/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/...baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node12).js b/...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/...selines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js b/...selines/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/...baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node12).js b/...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/...selines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js b/...selines/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/...baselines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node12).js b/...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/...selines/reference/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).js b/...selines/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;