@@ -28,6 +28,9 @@ var usage = 'Usage: flow-remove-types [options] [sources] \n' +
 ' completely rather than only removing the type. THIS IS NOT\n' +
 ' SPEC COMPLIANT! Instead, use `declare foo: string;` for\n' +
 ' type-only fields.\n' +
+' --remove-empty-imports\n' +
+' If true, removes empty import statements that remain after removing\n' +
+' all type and typeof imports (e.g. `import {} from \'some-module\'`).\n' +
 ' -m, --sourcemaps Also output source map files. Optionally pass "inline"\n' +
 ' -q, --quiet Does not produce any output concerning successful progress.\n' +
 
@@ -85,6 +88,7 @@ var outFile;
 var all;
 var pretty;
 var ignoreUninitializedFields;
+var removeEmptyImports;
 var sourceMaps;
 var inlineSourceMaps;
 var quiet;
@@ -112,6 +116,8 @@ while (i < process.argv.length) {
 pretty = true;
 } else if (arg === '--ignore-uninitialized-fields') {
 ignoreUninitializedFields = true;
+} else if (arg === '--remove-empty-imports') {
+removeEmptyImports = true;
 } else if (arg === '-m' || arg === '--sourcemaps') {
 sourceMaps = true;
 if (process.argv[i] === 'inline') {
@@ -254,6 +260,7 @@ function transformSource(content, filepath) {
 all: all,
 pretty: pretty,
 ignoreUninitializedFields: ignoreUninitializedFields,
+removeEmptyImports: removeEmptyImports,
 });
 } catch (error) {
 if (error.loc) {

@@ -28,6 +28,10 @@ var vlq = require('vlq');
 * completely rather than only removing the type. THIS IS NOT SPEC
 * COMPLIANT! Instead, use `declare foo: string;` for type-only fields.
 *
+* - removeEmptyImports: (default: false)
+* If true, removes empty import statements that remain after removing
+* all type and typeof imports (e.g. `import {} from 'some-module'`).
+*
 * Returns an object with two methods:
 *
 * - .toString()
@@ -69,6 +73,7 @@ module.exports = function flowRemoveTypes(source, options) {
 ignoreUninitializedFields: Boolean(
 options && options.ignoreUninitializedFields,
 ),
+removeEmptyImports: Boolean(options && options.removeEmptyImports),
 };
 
 // Remove the flow pragma.
@@ -239,6 +244,55 @@ var removeFlowVisitor = {
 if (node.importKind === 'type' || node.importKind === 'typeof') {
 return removeNode(context, node);
 }
+
+if (
+context.removeEmptyImports &&
+node.importKind === 'value' &&
+node.specifiers.length > 0
+) {
+if (node.specifiers[0].type !== 'ImportDefaultSpecifier') {
+// Remove import declaration if all specifiers are type imports
+for (var i = 0; i < node.specifiers.length; i++) {
+if (
+node.specifiers[i].importKind !== 'type' &&
+node.specifiers[i].importKind !== 'typeof'
+) {
+return;
+}
+}
+return removeNode(context, node);
+} else if (node.specifiers.length > 1) {
+// Remove non-default specifiers completely
+// if all non-default specifiers are type imports
+for (var i = 1; i < node.specifiers.length; i++) {
+if (
+node.specifiers[i].importKind !== 'type' &&
+node.specifiers[i].importKind !== 'typeof'
+) {
+return;
+}
+}
+
+var defaultSpecifier = node.specifiers[0];
+var firstSpecifier = node.specifiers[1];
+var lastSpecifier = node.specifiers[node.specifiers.length - 1];
+
+var idxStart = findTokenIndexAtStartOfNode(
+context.ast.tokens,
+firstSpecifier,
+);
+var idxEnd = findTokenIndexAtEndOfNode(
+context.ast.tokens,
+lastSpecifier,
+);
+
+removeTrailingCommaNode(context, defaultSpecifier);
+// remove opening brace
+removeNode(context, context.ast.tokens[idxStart - 1]);
+// remove closing brace
+removeNode(context, context.ast.tokens[idxEnd + 1]);
+}
+}
 },
 
 ImportSpecifier: function (context, node) {

@@ -10,6 +10,9 @@
 # Generate expected output with --ignore-uninitialized-fields flag
 ./flow-remove-types --ignore-uninitialized-fields test/source.js > test/expected-uninitialized-fields.js;
 
+# Generate expected output with --remove-empty-imports flag
+./flow-remove-types --remove-empty-imports test/source.js > test/expected-empty-imports.js;
+
 # Generate expected output with --pretty flag
 ./flow-remove-types --pretty test/source.js > test/expected-pretty.js;
 

@@ -14,6 +14,11 @@ echo "Test: flow-remove-types --ignore-uninitialized-fields test/source.js"
 DIFF=$(./flow-remove-types --ignore-uninitialized-fields test/source.js | diff test/expected-uninitialized-fields.js -);
 if [ -n "$DIFF" ]; then echo "$DIFF"; exit 1; fi;
 
+# Test expected output with --remove-empty-imports flag
+echo "Test: flow-remove-types --remove-empty-imports test/source.js"
+DIFF=$(./flow-remove-types --remove-empty-imports test/source.js | diff test/expected-empty-imports.js -);
+if [ -n "$DIFF" ]; then echo "$DIFF"; exit 1; fi;
+
 # Test expected output with --pretty flag
 echo "Test: flow-remove-types --pretty test/source.js"
 DIFF=$(./flow-remove-types --pretty test/source.js | diff test/expected-pretty.js -);