Merge branch 'develop' into fix/recognize-tsx-function-calls

buehler · Aug 9, 2017 · 47ee901 · 47ee901
2 parents a595f95 + f3ea09d
commit 47ee901
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "tslint": "^5.5.0",
     "tslint-config-airbnb": "^5.2.1",
     "tsutils": "^2.7.1",
-    "typedoc": "^0.7.1"
+    "typedoc": "^0.8.0"
   },
   "dependencies": {
     "lodash": "^4.17.4",

diff --git a/src/code-generators/typescript-generators/namedImport.ts b/src/code-generators/typescript-generators/namedImport.ts
@@ -49,8 +49,13 @@ export function generateNamedImport(
     const space = spaceBraces ? ' ' : '';
     const specifiers = imp.specifiers.sort(specifierSort).map(o => generateSymbolSpecifier(o)).join(', ');
     const lib = imp.libraryName;
+
+    let importSpecifiers = `${space}${specifiers}${space}`;
+    if (importSpecifiers.trim().length === 0) {
+        importSpecifiers = ' ';
+    }
 
-    const importString = `import {${space}${specifiers}${space}} from ${stringQuoteStyle}${lib}${stringQuoteStyle}${eol}`;
+    const importString = `import {${importSpecifiers}} from ${stringQuoteStyle}${lib}${stringQuoteStyle}${eol}`;
     if (importString.length > multiLineWrapThreshold) {
         const spacings = Array(tabSize + 1).join(' ');
         return multiLineImport(

diff --git a/test/code-generators/TypescriptCodeGenerator.spec.ts b/test/code-generators/TypescriptCodeGenerator.spec.ts
@@ -72,6 +72,7 @@ describe('TypescriptCodeGenerator', () => {
         new NamespaceImport('namespaceLib', 'namespaceAlias'),
         namedImport,
         multiLineNamedImport,
+        new NamedImport('emptyImport'),
     ];
 
     for (const generatable of generatables) {

diff --git a/test/code-generators/__snapshots__/TypescriptCodeGenerator.spec.ts.snap b/test/code-generators/__snapshots__/TypescriptCodeGenerator.spec.ts.snap
@@ -68,6 +68,8 @@ exports[`TypescriptCodeGenerator should generate the correct code for NamedImpor
 } from 'multiLineNamedLib';"
 `;
 
+exports[`TypescriptCodeGenerator should generate the correct code for NamedImport 3`] = `"import { } from 'emptyImport';"`;
+
 exports[`TypescriptCodeGenerator should generate the correct code for NamespaceImport 1`] = `"import * as namespaceAlias from 'namespaceLib';"`;
 
 exports[`TypescriptCodeGenerator should generate the correct code for ParameterDeclaration 1`] = `"param"`;