hermes-parser 0.17.1 → 0.18.0

package/dist/estree/StripComponentSyntax.js

@@ -129,7 +129,7 @@ function mapComponentParameters(params) {
   } // Optimize `component Foo(...props: Props) {}` to `function Foo(props: Props) {}
 
 
-  if (params.length === 1 && params[0].type === 'RestElement' && (params[0].argument.type === 'Identifier' || params[0].argument.type === 'ObjectPattern')) {
+  if (params.length === 1 && params[0].type === 'RestElement' && params[0].argument.type === 'Identifier') {
     var _restElementArgument$, _restElementArgument$2;
 
     const restElementArgument = params[0].argument;
@@ -151,7 +151,7 @@ function mapComponentParameters(params) {
 
     return true;
   });
-  const propsProperties = paramsWithoutRef.map(mapComponentParameter);
+  const propsProperties = paramsWithoutRef.flatMap(mapComponentParameter);
   let props = null;
 
   if (propsProperties.length === 0) {
@@ -208,13 +208,32 @@ function mapComponentParameter(param) {
   switch (param.type) {
     case 'RestElement':
       {
-        const a = nodeWith(param, {
-          typeAnnotation: null,
-          argument: nodeWith(param.argument, {
-            typeAnnotation: null
-          })
-        });
-        return a;
+        switch (param.argument.type) {
+          case 'Identifier':
+            {
+              const a = nodeWith(param, {
+                typeAnnotation: null,
+                argument: nodeWith(param.argument, {
+                  typeAnnotation: null
+                })
+              });
+              return [a];
+            }
+
+          case 'ObjectPattern':
+            {
+              return param.argument.properties.map(property => {
+                return nodeWith(property, {
+                  typeAnnotation: null
+                });
+              });
+            }
+
+          default:
+            {
+              throw (0, _createSyntaxError.createSyntaxError)(param, `Unhandled ${param.argument.type} encountered in restParameter`);
+            }
+        }
       }
 
     case 'ComponentParameter':
@@ -237,7 +256,7 @@ function mapComponentParameter(param) {
 
 
         if (param.name.type === 'Identifier' && param.shorthand && (value.type === 'Identifier' || value.type === 'AssignmentPattern')) {
-          return {
+          return [{
             type: 'Property',
             key: param.name,
             kind: 'init',
@@ -248,11 +267,11 @@ function mapComponentParameter(param) {
             loc: param.loc,
             range: param.range,
             parent: EMPTY_PARENT
-          };
+          }];
         } // Complex params
 
 
-        return {
+        return [{
           type: 'Property',
           key: param.name,
           kind: 'init',
@@ -263,7 +282,7 @@ function mapComponentParameter(param) {
           loc: param.loc,
           range: param.range,
           parent: EMPTY_PARENT
-        };
+        }];
       }
 
     default:

package/dist/estree/StripComponentSyntax.js.flow

@@ -160,8 +160,7 @@ function mapComponentParameters(
   if (
     params.length === 1 &&
     params[0].type === 'RestElement' &&
-    (params[0].argument.type === 'Identifier' ||
-      params[0].argument.type === 'ObjectPattern')
+    params[0].argument.type === 'Identifier'
   ) {
     const restElementArgument = params[0].argument;
     return {
@@ -189,7 +188,7 @@ function mapComponentParameters(
     return true;
   });
 
-  const propsProperties = paramsWithoutRef.map(mapComponentParameter);
+  const propsProperties = paramsWithoutRef.flatMap(mapComponentParameter);
 
   let props = null;
   if (propsProperties.length === 0) {
@@ -250,14 +249,31 @@ function mapComponentParameters(
 
 function mapComponentParameter(
   param: ComponentParameter | RestElement,
-): DestructuringObjectProperty | RestElement {
+): Array<DestructuringObjectProperty | RestElement> {
   switch (param.type) {
     case 'RestElement': {
-      const a = nodeWith(param, {
-        typeAnnotation: null,
-        argument: nodeWith(param.argument, {typeAnnotation: null}),
-      });
-      return a;
+      switch (param.argument.type) {
+        case 'Identifier': {
+          const a = nodeWith(param, {
+            typeAnnotation: null,
+            argument: nodeWith(param.argument, {typeAnnotation: null}),
+          });
+          return [a];
+        }
+        case 'ObjectPattern': {
+          return param.argument.properties.map(property => {
+            return nodeWith(property, {
+              typeAnnotation: null,
+            });
+          });
+        }
+        default: {
+          throw createSyntaxError(
+            param,
+            `Unhandled ${param.argument.type} encountered in restParameter`,
+          );
+        }
+      }
     }
     case 'ComponentParameter': {
       let value;
@@ -281,33 +297,37 @@ function mapComponentParameter(
         param.shorthand &&
         (value.type === 'Identifier' || value.type === 'AssignmentPattern')
       ) {
-        return {
+        return [
+          {
+            type: 'Property',
+            key: param.name,
+            kind: 'init',
+            value,
+            method: false,
+            shorthand: true,
+            computed: false,
+            loc: param.loc,
+            range: param.range,
+            parent: EMPTY_PARENT,
+          },
+        ];
+      }
+
+      // Complex params
+      return [
+        {
           type: 'Property',
           key: param.name,
           kind: 'init',
           value,
           method: false,
-          shorthand: true,
+          shorthand: false,
           computed: false,
           loc: param.loc,
           range: param.range,
           parent: EMPTY_PARENT,
-        };
-      }
-
-      // Complex params
-      return {
-        type: 'Property',
-        key: param.name,
-        kind: 'init',
-        value,
-        method: false,
-        shorthand: false,
-        computed: false,
-        loc: param.loc,
-        range: param.range,
-        parent: EMPTY_PARENT,
-      };
+        },
+      ];
     }
     default: {
       throw createSyntaxError(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "A JavaScript parser built from the Hermes engine",
   "main": "dist/index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "url": "git@github.com:facebook/hermes.git"
   },
   "dependencies": {
-    "hermes-estree": "0.17.1"
+    "hermes-estree": "0.18.0"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",