Fix a bug where default import statements were not renamed correctly …

…when resolving a .d.ts rollup naming conflict
microsoft · Mar 6, 2020 · 05fc1ee · 05fc1ee
1 parent f82d777
commit 05fc1ee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/apps/api-extractor/src/generators/DtsEmitHelpers.ts b/apps/api-extractor/src/generators/DtsEmitHelpers.ts
@@ -16,7 +16,12 @@ export class DtsEmitHelpers {
   public static emitImport(stringWriter: StringWriter, collectorEntity: CollectorEntity, astImport: AstImport): void {
     switch (astImport.importKind) {
       case AstImportKind.DefaultImport:
-        stringWriter.writeLine(`import ${astImport.exportName} from '${astImport.modulePath}';`);
+        if (collectorEntity.nameForEmit !== astImport.exportName) {
+          stringWriter.write(`import { default as ${collectorEntity.nameForEmit} }`);
+        } else {
+          stringWriter.write(`import ${astImport.exportName}`);
+        }
+        stringWriter.writeLine(` from '${astImport.modulePath}';`);
         break;
       case AstImportKind.NamedImport:
         if (collectorEntity.nameForEmit !== astImport.exportName) {

diff --git a/build-tests/api-extractor-test-01/dist/api-extractor-test-01-beta.d.ts b/build-tests/api-extractor-test-01/dist/api-extractor-test-01-beta.d.ts
@@ -12,7 +12,7 @@
 /// <reference types="jest" />
 /// <reference lib="es2015.symbol.wellknown" />
 /// <reference lib="es2018.intl" />
-import Long from 'long';
+import { default as Long_2 } from 'long';
 import { MAX_UNSIGNED_VALUE } from 'long';
 
 /**
@@ -309,7 +309,7 @@ declare const unexportedCustomSymbol: unique symbol;
 
 /** @public */
 export declare class UseLong {
-    use_long(): Long;
+    use_long(): Long_2;
 }
 
 /* Excluded from this release type: VARIABLE */

diff --git a/build-tests/api-extractor-test-01/dist/api-extractor-test-01-public.d.ts b/build-tests/api-extractor-test-01/dist/api-extractor-test-01-public.d.ts
@@ -12,7 +12,7 @@
 /// <reference types="jest" />
 /// <reference lib="es2015.symbol.wellknown" />
 /// <reference lib="es2018.intl" />
-import Long from 'long';
+import { default as Long_2 } from 'long';
 import { MAX_UNSIGNED_VALUE } from 'long';
 
 /**
@@ -302,7 +302,7 @@ declare const unexportedCustomSymbol: unique symbol;
 
 /** @public */
 export declare class UseLong {
-    use_long(): Long;
+    use_long(): Long_2;
 }
 
 /* Excluded from this release type: VARIABLE */

diff --git a/build-tests/api-extractor-test-01/dist/api-extractor-test-01.d.ts b/build-tests/api-extractor-test-01/dist/api-extractor-test-01.d.ts
@@ -12,7 +12,7 @@
 /// <reference types="jest" />
 /// <reference lib="es2015.symbol.wellknown" />
 /// <reference lib="es2018.intl" />
-import Long from 'long';
+import { default as Long_2 } from 'long';
 import { MAX_UNSIGNED_VALUE } from 'long';
 
 /**
@@ -330,7 +330,7 @@ declare const unexportedCustomSymbol: unique symbol;
 
 /** @public */
 export declare class UseLong {
-    use_long(): Long;
+    use_long(): Long_2;
 }
 
 /** @alpha */

diff --git a/build-tests/api-extractor-test-01/etc/api-extractor-test-01.api.md b/build-tests/api-extractor-test-01/etc/api-extractor-test-01.api.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import Long from 'long';
+import { default as Long_2 } from 'long';
 import { MAX_UNSIGNED_VALUE } from 'long';
 
 // @public
@@ -190,7 +190,7 @@ export class TypeReferencesInAedoc {
 // @public (undocumented)
 export class UseLong {
     // (undocumented)
-    use_long(): Long;
+    use_long(): Long_2;
 }
 
 // @alpha (undocumented)