Bugfixes for TS types transformer (#4791)

parcel-bundler · Jun 23, 2020 · 6e1abea · 6e1abea
1 parent c12022d
commit 6e1abea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/packages/core/integration-tests/test/integration/ts-types/externals/expected.d.ts b/packages/core/integration-tests/test/integration/ts-types/externals/expected.d.ts
@@ -1,10 +1,11 @@
 import * as React from "react";
 import { ReactNode } from "react";
-import { External } from "external";
+import External from "external";
+import Default, { Named } from "other-external";
 interface Props {
     children: ReactNode;
 }
 export const Component: React.FC<Props>;
-export { External };
+export { External, Default, Named };
 
 //# sourceMappingURL=types.d.ts.map
diff --git a/packages/core/integration-tests/test/integration/ts-types/externals/index.tsx b/packages/core/integration-tests/test/integration/ts-types/externals/index.tsx
@@ -1,7 +1,8 @@
 import {ReactNode} from 'react';
 import * as React from 'react';
 import {OtherComponent} from './other';
-import {External} from 'external';
+import External from 'external';
+import Default, {Named} from 'other-external';
 
 interface Props {
   children: ReactNode
@@ -11,4 +12,4 @@ export const Component: React.FC<Props> = (props) => {
   return <OtherComponent>{props.children}</OtherComponent>;
 }
 
-export {External};
+export {External, Default, Named};
diff --git a/packages/transformers/typescript-types/src/collect.js b/packages/transformers/typescript-types/src/collect.js
@@ -42,9 +42,11 @@ export function collect(
             '*',
           );
         }
-      } else if (node.importClause.name) {
+      }
+
+      if (node.importClause.name) {
         currentModule.addImport(
-          node.importClause.name,
+          node.importClause.name.text,
           node.moduleSpecifier.text,
           'default',
         );
@@ -84,7 +86,7 @@ export function collect(
       }
     }
 
-    if (ts.isVariableStatement(node)) {
+    if (ts.isVariableStatement(node) && node.modifiers) {
       let isExported = node.modifiers.some(
         m => m.kind === ts.SyntaxKind.ExportKeyword,
       );

diff --git a/packages/transformers/typescript-types/src/shake.js b/packages/transformers/typescript-types/src/shake.js
@@ -233,7 +233,9 @@ function generateImports(ts: TypeScriptModule, moduleGraph: TSModuleGraph) {
     if (defaultSpecifier || namedSpecifiers.length > 0) {
       let importClause = ts.createImportClause(
         defaultSpecifier,
-        ts.createNamedImports(namedSpecifiers),
+        namedSpecifiers.length > 0
+          ? ts.createNamedImports(namedSpecifiers)
+          : undefined,
       );
       importStatements.push(
         ts.createImportDeclaration(