flow-remove-types 2.248.1 → 2.250.0

package/index.js

@@ -57,7 +57,7 @@ module.exports = function flowRemoveTypes(source, options) {
   }
 
   // This parse configuration is intended to be as permissive as possible.
-  var ast = parse(source, {types: true, tokens: true});
+  var ast = parse(source, {flow: all ? 'all' : 'detect', tokens: true});
 
   var removedNodes = [];
 
@@ -156,7 +156,6 @@ var removeFlowVisitor = {
   TypeAnnotation: removeNodeIfNotCommentType,
   TypePredicate: removeNodeIfNotCommentType,
   TypeParameterDeclaration: removeNode,
-  TypeParameterInstantiation: removeNode,
   InferredPredicate: removeInferredPredicateNode,
   OpaqueType: removeNode,
   DeclareOpaqueType: removeNode,
@@ -168,11 +167,7 @@ var removeFlowVisitor = {
   AsExpression: function (context, node, ast) {
     var typeIdx = findTokenIndexAtStartOfNode(ast.tokens, node.typeAnnotation);
     removeNode(context, ast.tokens[typeIdx - 1]); // `as` token
-    if (node.typeAnnotation.type === 'GenericTypeAnnotation') {
-      removeNode(context, ast.tokens[typeIdx]);
-    } else {
-      removeNode(context, node.typeAnnotation);
-    }
+    removeNode(context, node.typeAnnotation);
   },
 
   AsConstExpression: function (context, node, ast) {
@@ -311,6 +306,13 @@ var removeFlowVisitor = {
       }
     }
   },
+
+  TypeParameterInstantiation: function (context, node, ast, parent) {
+    // prevent interference with asExpression removal
+    if (parent.type !== 'GenericTypeAnnotation') {
+      removeNode(context, node);
+    }
+  },
 };
 
 // If this class declaration or expression implements interfaces, remove
@@ -561,7 +563,7 @@ function visit(ast, context, visitor) {
       if (node && typeof node === 'object' && (node.type || node.length)) {
         if (node.type) {
           var visitFn = visitor[node.type];
-          if (visitFn && visitFn(context, node, ast) === false) {
+          if (visitFn && visitFn(context, node, ast, parent) === false) {
             continue;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-remove-types",
-  "version": "2.248.1",
+  "version": "2.250.0",
   "description": "Removes Flow type annotations from JavaScript files with speed and simplicity.",
   "author": {
     "name": "Flow Team",