flow-parser 0.319.0 → 0.321.0

package/{oxidized → dist}/babel/TransformESTreeToBabel.js

@@ -30,6 +30,7 @@ const FlowESTreeAndBabelVisitorKeys = { ..._ESTreeVisitorKeys.default,
   ClassPrivateMethod: ['key', 'params', 'body', 'returnType', 'typeParameters'],
   ClassProperty: ['key', 'value', 'typeAnnotation', 'variance'],
   ClassPrivateProperty: ['key', 'value', 'typeAnnotation', 'variance'],
+  DeclareVariable: ['id'],
   Directive: ['value'],
   DirectiveLiteral: [],
   ExportNamespaceSpecifier: ['exported'],
@@ -435,11 +436,18 @@ function mapTypeofTypeAnnotation(node) {
 }
 
 function mapDeclareVariable(node) {
-  if (node.kind != null) {
-    delete node.kind;
+  var _babelNode$declaratio;
+
+  const babelNode = node;
+
+  if (babelNode.id == null && Array.isArray(babelNode.declarations) && ((_babelNode$declaratio = babelNode.declarations[0]) == null ? void 0 : _babelNode$declaratio.id) != null) {
+    babelNode.id = babelNode.declarations[0].id;
   }
 
-  return node;
+  delete babelNode.declarations;
+  delete babelNode.kind;
+  delete babelNode.implicitDeclare;
+  return babelNode;
 }
 
 function mapJSXElement(node) {

package/{oxidized → dist}/babel/TransformESTreeToBabel.js.flow

@@ -68,6 +68,7 @@ const FlowESTreeAndBabelVisitorKeys: VisitorKeys = {
   ClassPrivateMethod: ['key', 'params', 'body', 'returnType', 'typeParameters'],
   ClassProperty: ['key', 'value', 'typeAnnotation', 'variance'],
   ClassPrivateProperty: ['key', 'value', 'typeAnnotation', 'variance'],
+  DeclareVariable: ['id'],
   Directive: ['value'],
   DirectiveLiteral: [],
   ExportNamespaceSpecifier: ['exported'],
@@ -778,11 +779,18 @@ function mapTypeofTypeAnnotation(
 }
 
 function mapDeclareVariable(node: DeclareVariable): DeclareVariable {
-  if (node.kind != null) {
-    // $FlowExpectedError[cannot-write]
-    delete node.kind;
+  const babelNode: $FlowFixMe = node;
+  if (
+    babelNode.id == null &&
+    Array.isArray(babelNode.declarations) &&
+    babelNode.declarations[0]?.id != null
+  ) {
+    babelNode.id = babelNode.declarations[0].id;
   }
-  return node;
+  delete babelNode.declarations;
+  delete babelNode.kind;
+  delete babelNode.implicitDeclare;
+  return babelNode;
 }
 
 function mapJSXElement(node: JSXElement): JSXElement {

package/{oxidized/oxidized-src → dist}/estree/StripFlowTypesForBabel.js

@@ -40,19 +40,32 @@ function createAnyTypeAnnotation(node) {
   };
 }
 
+function declareVariableDeclarator(id, node) {
+  return {
+    type: 'VariableDeclarator',
+    id,
+    init: null,
+    loc: node.loc,
+    range: node.range,
+    parent: EMPTY_PARENT
+  };
+}
+
 function mapDeclareEnum(node) {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
+      typeAnnotation: createAnyTypeAnnotation(node.body),
+      loc: node.body.loc,
+      range: node.body.range,
+      parent: EMPTY_PARENT
+    }
+  });
   return {
     type: 'DeclareVariable',
     kind: 'const',
-    id: nodeWith(node.id, {
-      typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: createAnyTypeAnnotation(node.body),
-        loc: node.body.loc,
-        range: node.body.range,
-        parent: EMPTY_PARENT
-      }
-    }),
+    declarations: [declareVariableDeclarator(id, node)],
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent
@@ -60,18 +73,20 @@ function mapDeclareEnum(node) {
 }
 
 function mapDeclareNamespace(node) {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
+      typeAnnotation: createAnyTypeAnnotation(node.body),
+      loc: node.body.loc,
+      range: node.body.range,
+      parent: EMPTY_PARENT
+    }
+  });
   return {
     type: 'DeclareVariable',
     kind: 'const',
-    id: nodeWith(node.id, {
-      typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: createAnyTypeAnnotation(node.body),
-        loc: node.body.loc,
-        range: node.body.range,
-        parent: EMPTY_PARENT
-      }
-    }),
+    declarations: [declareVariableDeclarator(id, node)],
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent

package/{oxidized → dist}/estree/StripFlowTypesForBabel.js.flow

@@ -30,6 +30,8 @@ import type {
   QualifiedTypeIdentifier,
   QualifiedTypeofIdentifier,
   AFunction,
+  BindingName,
+  VariableDeclarator,
 } from 'flow-estree';
 
 import {SimpleTransform} from '../transform/SimpleTransform';
@@ -71,22 +73,39 @@ function createAnyTypeAnnotation(node: ESNode): AnyTypeAnnotation {
   };
 }
 
+function declareVariableDeclarator(
+  id: BindingName,
+  node: ESNode,
+): VariableDeclarator {
+  return {
+    type: 'VariableDeclarator',
+    id,
+    init: null,
+    loc: node.loc,
+    range: node.range,
+    parent: EMPTY_PARENT,
+  };
+}
+
 /**
  * Convert DeclareEnum nodes to DeclareVariable
  */
 function mapDeclareEnum(node: DeclareEnum): DeclareVariable {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
+      typeAnnotation: createAnyTypeAnnotation(node.body),
+      loc: node.body.loc,
+      range: node.body.range,
+      parent: EMPTY_PARENT,
+    },
+  });
+
   return {
     type: 'DeclareVariable',
     kind: 'const',
-    id: nodeWith(node.id, {
-      typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: createAnyTypeAnnotation(node.body),
-        loc: node.body.loc,
-        range: node.body.range,
-        parent: EMPTY_PARENT,
-      },
-    }),
+    declarations: [declareVariableDeclarator(id, node)],
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent,
@@ -97,18 +116,21 @@ function mapDeclareEnum(node: DeclareEnum): DeclareVariable {
  * Convert DeclareNamespace nodes to DeclareVariable
  */
 function mapDeclareNamespace(node: DeclareNamespace): DeclareVariable {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
+      typeAnnotation: createAnyTypeAnnotation(node.body),
+      loc: node.body.loc,
+      range: node.body.range,
+      parent: EMPTY_PARENT,
+    },
+  });
+
   return {
     type: 'DeclareVariable',
     kind: 'const',
-    id: nodeWith(node.id, {
-      typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: createAnyTypeAnnotation(node.body),
-        loc: node.body.loc,
-        range: node.body.range,
-        parent: EMPTY_PARENT,
-      },
-    }),
+    declarations: [declareVariableDeclarator(id, node)],
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent,

package/{oxidized/oxidized-src → dist}/estree/TransformComponentSyntax.js

@@ -23,24 +23,37 @@ function createDefaultPosition() {
   };
 }
 
-function mapDeclareComponent(node) {
+function declareVariableDeclarator(id, node) {
   return {
-    type: 'DeclareVariable',
-    id: nodeWith(node.id, {
+    type: 'VariableDeclarator',
+    id,
+    init: null,
+    loc: node.loc,
+    range: node.range,
+    parent: EMPTY_PARENT
+  };
+}
+
+function mapDeclareComponent(node) {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
       typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: {
-          type: 'AnyTypeAnnotation',
-          loc: node.loc,
-          range: node.range,
-          parent: EMPTY_PARENT
-        },
+        type: 'AnyTypeAnnotation',
         loc: node.loc,
         range: node.range,
         parent: EMPTY_PARENT
-      }
-    }),
+      },
+      loc: node.loc,
+      range: node.range,
+      parent: EMPTY_PARENT
+    }
+  });
+  return {
+    type: 'DeclareVariable',
+    declarations: [declareVariableDeclarator(id, node)],
     kind: 'const',
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent

package/{oxidized → dist}/estree/TransformComponentSyntax.js.flow

@@ -47,6 +47,7 @@ import type {
   BindingName,
   ObjectTypePropertySignature,
   ObjectTypeSpreadProperty,
+  VariableDeclarator,
 } from 'flow-estree';
 
 import {SimpleTransform} from '../transform/SimpleTransform';
@@ -66,24 +67,41 @@ function createDefaultPosition(): Position {
   };
 }
 
-function mapDeclareComponent(node: DeclareComponent): DeclareVariable {
+function declareVariableDeclarator(
+  id: BindingName,
+  node: ESNode,
+): VariableDeclarator {
   return {
-    type: 'DeclareVariable',
-    id: nodeWith(node.id, {
+    type: 'VariableDeclarator',
+    id,
+    init: null,
+    loc: node.loc,
+    range: node.range,
+    parent: EMPTY_PARENT,
+  };
+}
+
+function mapDeclareComponent(node: DeclareComponent): DeclareVariable {
+  const id = nodeWith(node.id, {
+    typeAnnotation: {
+      type: 'TypeAnnotation',
       typeAnnotation: {
-        type: 'TypeAnnotation',
-        typeAnnotation: {
-          type: 'AnyTypeAnnotation',
-          loc: node.loc,
-          range: node.range,
-          parent: EMPTY_PARENT,
-        },
+        type: 'AnyTypeAnnotation',
         loc: node.loc,
         range: node.range,
         parent: EMPTY_PARENT,
       },
-    }),
+      loc: node.loc,
+      range: node.range,
+      parent: EMPTY_PARENT,
+    },
+  });
+
+  return {
+    type: 'DeclareVariable',
+    declarations: [declareVariableDeclarator(id, node)],
     kind: 'const',
+    implicitDeclare: false,
     loc: node.loc,
     range: node.range,
     parent: node.parent,

package/{oxidized → dist}/generated/ESTreeVisitorKeys.js

@@ -51,7 +51,7 @@ module.exports = {
   DeclareNamespace: ['id', 'body'],
   DeclareOpaqueType: ['id', 'typeParameters', 'impltype', 'lowerBound', 'upperBound', 'supertype'],
   DeclareTypeAlias: ['id', 'typeParameters', 'right'],
-  DeclareVariable: ['id'],
+  DeclareVariable: ['declarations'],
   DeclaredPredicate: ['value'],
   Decorator: ['expression'],
   DoWhileStatement: ['body', 'test'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-parser",
-  "version": "0.319.0",
+  "version": "0.321.0",
   "description": "JavaScript parser written in OCaml. Produces ESTree AST",
   "homepage": "https://flow.org",
   "license": "MIT",
@@ -9,21 +9,20 @@
     "email": "flow@fb.com"
   },
   "files": [
-    "flow_parser.js",
-    "oxidized"
+    "dist",
+    "README.md"
   ],
-  "main": "flow_parser.js",
+  "main": "dist/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/facebook/flow.git",
     "directory": "packages/flow-parser"
   },
   "scripts": {
-    "test": "node test/run_tests.js",
-    "build": "make js"
+    "test": "node test/run_tests.js"
   },
   "dependencies": {
-    "flow-estree": "0.319.0"
+    "flow-estree": "0.321.0"
   },
   "devDependencies": {
     "@babel/generator": "7.7.4",