flow-remove-types 2.266.1 → 2.268.0

package/flow-remove-types

@@ -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) {

package/index.js

@@ -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,60 @@ 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 trailing brace
+        if (getLabel(context.ast.tokens[idxEnd + 1]) === '}') {
+          removeNode(context, context.ast.tokens[idxEnd + 1]);
+        } else {
+          // last specifier has a trailing comma, skip it
+          removeNode(context, context.ast.tokens[idxEnd + 2]);
+        }
+      }
+    }
   },
 
   ImportSpecifier: function (context, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-remove-types",
-  "version": "2.266.1",
+  "version": "2.268.0",
   "description": "Removes Flow type annotations from JavaScript files with speed and simplicity.",
   "author": {
     "name": "Flow Team",
@@ -44,7 +44,7 @@
     "es6"
   ],
   "dependencies": {
-    "hermes-parser": "0.25.1",
+    "hermes-parser": "0.28.0",
     "pirates": "^3.0.2",
     "vlq": "^0.2.1"
   },