hermes-parser 0.32.0 → 0.32.1

package/dist/transform/SimpleTransform.js

@@ -20,8 +20,15 @@ var _astNodeMutationHelpers = require("./astNodeMutationHelpers");
 
 function setParentPointer(node, parent) {
   if (parent != null) {
-    // $FlowExpectedError[cannot-write]
-    node.parent = parent;
+    if (Array.isArray(node)) {
+      for (const item of node) {
+        // $FlowExpectedError[cannot-write]
+        item.parent = parent;
+      }
+    } else {
+      // $FlowExpectedError[cannot-write]
+      node.parent = parent;
+    }
   }
 }
 /**
@@ -51,7 +58,12 @@ class SimpleTransform {
           if (resultNode != null) {
             // Ensure the new node has the correct parent pointers before recursing again.
             setParentPointer(resultNode, parent);
-            traversedResultNode = this.transform(resultNode, options);
+
+            if (Array.isArray(resultNode)) {
+              traversedResultNode = resultNode.map(item => this.transform(item, options)).filter(item => item != null);
+            } else {
+              traversedResultNode = this.transform(resultNode, options);
+            }
           }
 
           if (parent == null) {
@@ -59,7 +71,11 @@ class SimpleTransform {
               throw new Error('SimpleTransform infra error: Parent not set on non root node, this should not be possible');
             }
 
-            resultRootNode = traversedResultNode;
+            if (Array.isArray(traversedResultNode)) {
+              throw new Error('SimpleTransform: invalid array result for root node');
+            } else {
+              resultRootNode = traversedResultNode;
+            }
           } else if (traversedResultNode == null) {
             (0, _astNodeMutationHelpers.removeNodeOnParent)(node, parent, options.visitorKeys);
           } else {

package/dist/transform/SimpleTransform.js.flow

@@ -29,7 +29,9 @@ import {
  *     children are then traversed.
  *   - return null, signals the node should be deleted from the AST.
  */
-export type TransformCallback = (node: ESNode) => ESNode | null;
+export type TransformCallback = (
+  node: ESNode,
+) => ESNode | $ReadOnlyArray<ESNode> | null;
 
 export type TransformOptions = $ReadOnly<{
   /** The callback function which is called on entering each node. */
@@ -39,10 +41,20 @@ export type TransformOptions = $ReadOnly<{
   visitorKeys?: ?VisitorKeysType,
 }>;
 
-function setParentPointer(node: ESNode, parent: ?ESNode): void {
+function setParentPointer(
+  node: ESNode | $ReadOnlyArray<ESNode>,
+  parent: ?ESNode,
+): void {
   if (parent != null) {
-    // $FlowExpectedError[cannot-write]
-    node.parent = parent;
+    if (Array.isArray(node)) {
+      for (const item of node) {
+        // $FlowExpectedError[cannot-write]
+        item.parent = parent;
+      }
+    } else {
+      // $FlowExpectedError[cannot-write]
+      node.parent = parent;
+    }
   }
 }
 
@@ -63,15 +75,23 @@ export class SimpleTransform {
         // Ensure the parent pointers are correctly set before entering the node.
         setParentPointer(node, parent);
 
-        const resultNode = options.transform(node);
+        const resultNode: ESNode | $ReadOnlyArray<ESNode> | null =
+          options.transform(node);
         if (resultNode !== node) {
-          let traversedResultNode = null;
+          let traversedResultNode: ESNode | $ReadOnlyArray<ESNode> | null =
+            null;
 
           if (resultNode != null) {
             // Ensure the new node has the correct parent pointers before recursing again.
             setParentPointer(resultNode, parent);
 
-            traversedResultNode = this.transform(resultNode, options);
+            if (Array.isArray(resultNode)) {
+              traversedResultNode = resultNode
+                .map(item => this.transform(item, options))
+                .filter(item => item != null);
+            } else {
+              traversedResultNode = this.transform(resultNode, options);
+            }
           }
 
           if (parent == null) {
@@ -80,7 +100,13 @@ export class SimpleTransform {
                 'SimpleTransform infra error: Parent not set on non root node, this should not be possible',
               );
             }
-            resultRootNode = traversedResultNode;
+            if (Array.isArray(traversedResultNode)) {
+              throw new Error(
+                'SimpleTransform: invalid array result for root node',
+              );
+            } else {
+              resultRootNode = traversedResultNode;
+            }
           } else if (traversedResultNode == null) {
             removeNodeOnParent(node, parent, options.visitorKeys);
           } else {

package/dist/transform/astNodeMutationHelpers.js

@@ -34,6 +34,7 @@ function getParentKey(target, parent, visitorKeys) {
   for (const key of (0, _getVisitorKeys.getVisitorKeys)(parent, visitorKeys)) {
     if ((0, _getVisitorKeys.isNode)( // $FlowExpectedError[prop-missing]
     parent[key])) {
+      // $FlowFixMe[invalid-compare]
       if (parent[key] === target) {
         return {
           type: 'single',
@@ -73,9 +74,13 @@ function replaceNodeOnParent(originalNode, originalNodeParent, nodeToReplaceWith
   if (replacementParent.type === 'array') {
     // $FlowExpectedError[prop-missing]
     parent[replacementParent.key] = (0, _astArrayMutationHelpers.replaceInArray)( // $FlowExpectedError[prop-missing]
-    parent[replacementParent.key], replacementParent.targetIndex, [nodeToReplaceWith]);
+    parent[replacementParent.key], replacementParent.targetIndex, Array.isArray(nodeToReplaceWith) ? nodeToReplaceWith : [nodeToReplaceWith]);
   } else {
-    // $FlowExpectedError[prop-missing]
+    if (Array.isArray(nodeToReplaceWith)) {
+      throw new Error(`Cannot insert array into non-array parent type: ${parent.type}`);
+    } // $FlowExpectedError[prop-missing]
+
+
     parent[replacementParent.key] = nodeToReplaceWith;
   }
 }

package/dist/transform/astNodeMutationHelpers.js.flow

@@ -48,6 +48,7 @@ function getParentKey(
         parent[key],
       )
     ) {
+      // $FlowFixMe[invalid-compare]
       if (parent[key] === target) {
         return {type: 'single', node: parent, key};
       }
@@ -74,7 +75,7 @@ function getParentKey(
 export function replaceNodeOnParent(
   originalNode: ESNode,
   originalNodeParent: ESNode,
-  nodeToReplaceWith: ESNode,
+  nodeToReplaceWith: ESNode | $ReadOnlyArray<ESNode>,
   visitorKeys?: ?VisitorKeysType,
 ): void {
   const replacementParent = getParentKey(
@@ -89,9 +90,16 @@ export function replaceNodeOnParent(
       // $FlowExpectedError[prop-missing]
       parent[replacementParent.key],
       replacementParent.targetIndex,
-      [nodeToReplaceWith],
+      Array.isArray(nodeToReplaceWith)
+        ? nodeToReplaceWith
+        : [nodeToReplaceWith],
     );
   } else {
+    if (Array.isArray(nodeToReplaceWith)) {
+      throw new Error(
+        `Cannot insert array into non-array parent type: ${parent.type}`,
+      );
+    }
     // $FlowExpectedError[prop-missing]
     parent[replacementParent.key] = nodeToReplaceWith;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "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.32.0"
+    "hermes-estree": "0.32.1"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",