hermes-transform 0.20.0 → 0.21.0

package/dist/transform/TransformContext.js

@@ -68,7 +68,9 @@ function getTransformContext() {
         return null;
       }
 
-      return nodes.map(node => {
+      return nodes.map(node_ => {
+        const node = node_;
+
         if (node == null) {
           // $FlowExpectedError[incompatible-return]
           return node;
@@ -157,7 +159,6 @@ function getTransformContext() {
     }
   };
   const replaceAPIs = {
-    // $FlowFixMe[incompatible-exact]
     replaceNode: (target, nodeToReplaceWith, options) => {
       pushMutation((0, _ReplaceNode.createReplaceNodeMutation)(target, (0, _detachedNode.asDetachedNode)(nodeToReplaceWith), options));
     },
@@ -173,8 +174,7 @@ function getTransformContext() {
 
       const cloned = (0, _detachedNode.shallowCloneNode)(node, newProps, {
         preserveLocation: true
-      }); // $FlowExpectedError[incompatible-call]
-
+      });
       replaceAPIs.replaceNode(node, cloned, options);
     }
   };
@@ -197,7 +197,6 @@ function getTransformContext() {
 
 function toArray(thing) {
   if (Array.isArray(thing)) {
-    // $FlowExpectedError[incompatible-return]
     return thing;
   }
 

package/dist/transform/TransformContext.js.flow

@@ -331,72 +331,64 @@ export function getTransformContext(): TransformContextAdditions {
 
   const cloneAPIs: TransformCloneAPIs = {
     // $FlowFixMe[incompatible-exact]
-    shallowCloneNode: ((
-      node: ?ESNode,
-    ): // $FlowExpectedError[incompatible-cast]
-    ?DetachedNode<ESNode> => {
+    shallowCloneNode: (((node: ?ESNode): ?DetachedNode<ESNode> => {
       if (node == null) {
         return null;
       }
 
       return shallowCloneNode(node, {});
-    }: TransformCloneAPIs['shallowCloneNode']),
+    }: $FlowFixMe): TransformCloneAPIs['shallowCloneNode']),
 
-    shallowCloneNodeWithOverrides: ((
+    shallowCloneNodeWithOverrides: (((
       node: ?ESNode,
       newProps?: $ReadOnly<{...}> = {},
-    ): // $FlowExpectedError[incompatible-cast]
-    // $FlowExpectedError[prop-missing]
+    ): // $FlowExpectedError[prop-missing]
     ?DetachedNode<ESNode> => {
       if (node == null) {
         return null;
       }
 
       return shallowCloneNode(node, newProps);
-    }: TransformCloneAPIs['shallowCloneNodeWithOverrides']),
+    }: $FlowFixMe): TransformCloneAPIs['shallowCloneNodeWithOverrides']),
 
     // $FlowFixMe[incompatible-exact]
-    shallowCloneArray: (<T: ESNode>(
+    shallowCloneArray: ((<T: ESNode>(
       nodes: ?$ReadOnlyArray<?T>,
-    ): // $FlowExpectedError[incompatible-cast]
-    ?$ReadOnlyArray<DetachedNode<?ESNode>> => {
+    ): ?$ReadOnlyArray<DetachedNode<?ESNode>> => {
       if (nodes == null) {
         return null;
       }
 
-      return nodes.map((node): DetachedNode<?ESNode> => {
+      return nodes.map((node_: ?T): DetachedNode<?ESNode> => {
+        const node: ?ESNode = node_;
         if (node == null) {
           // $FlowExpectedError[incompatible-return]
           return node;
         }
-        return shallowCloneNode<T>(node, {});
+        return shallowCloneNode<ESNode>(node, {});
       });
-    }: TransformCloneAPIs['shallowCloneArray']),
+    }: $FlowFixMe): TransformCloneAPIs['shallowCloneArray']),
 
     // $FlowFixMe[incompatible-exact]
-    deepCloneNode: ((
-      node: ?ESNode,
-    ): // $FlowExpectedError[incompatible-cast]
-    ?DetachedNode<ESNode> => {
+    deepCloneNode: (((node: ?ESNode): ?DetachedNode<ESNode> => {
       if (node == null) {
         return null;
       }
 
       return deepCloneNode(node, {});
-    }: TransformCloneAPIs['deepCloneNode']),
+    }: $FlowFixMe): TransformCloneAPIs['deepCloneNode']),
 
-    deepCloneNodeWithOverrides: ((
+    deepCloneNodeWithOverrides: (((
       node: ?ESNode,
       newProps?: $ReadOnly<{...}> = {},
-    ): // $FlowExpectedError[incompatible-cast]
-    // $FlowExpectedError[prop-missing]
+    ): // $FlowExpectedError[prop-missing]
     ?DetachedNode<ESNode> => {
       if (node == null) {
         return null;
       }
 
       return deepCloneNode(node, newProps);
-    }: TransformCloneAPIs['deepCloneNodeWithOverrides']),
+    }: $FlowFixMe): TransformCloneAPIs['deepCloneNodeWithOverrides']),
   };
   const commentAPIs: TransformCommentAPIs = {
     getComments: ((node): Array<Comment> => {
@@ -504,8 +496,7 @@ export function getTransformContext(): TransformContextAdditions {
     }: TransformRemoveAPIs['removeStatement']),
   };
   const replaceAPIs: TransformReplaceAPIs = {
-    // $FlowFixMe[incompatible-exact]
-    replaceNode: ((
+    replaceNode: (((
       target: ESNode,
       nodeToReplaceWith: MaybeDetachedNode<ESNode>,
       options?: ReplaceNodeOptions,
@@ -517,7 +508,7 @@ export function getTransformContext(): TransformContextAdditions {
           options,
         ),
       );
-    }: TransformReplaceAPIs['replaceNode']),
+    }: $FlowFixMe): TransformReplaceAPIs['replaceNode']),
 
     replaceStatementWithMany: ((
       target,
@@ -544,8 +535,11 @@ export function getTransformContext(): TransformContextAdditions {
       }
 
       const cloned = shallowCloneNode(node, newProps, {preserveLocation: true});
-      // $FlowExpectedError[incompatible-call]
-      replaceAPIs.replaceNode(node, cloned, options);
+      replaceAPIs.replaceNode(
+        (node: $FlowFixMe),
+        (cloned: $FlowFixMe),
+        options,
+      );
     }: TransformModifyAPIs['modifyNodeInPlace']),
   };
 
@@ -568,8 +562,7 @@ export function getTransformContext(): TransformContextAdditions {
 
 function toArray<T>(thing: SingleOrArray<T>): $ReadOnlyArray<T> {
   if (Array.isArray(thing)) {
-    // $FlowExpectedError[incompatible-return]
-    return thing;
+    return (thing: $FlowFixMe);
   }
   return [thing];
 }

package/dist/transform/mutations/RemoveNode.js

@@ -26,7 +26,7 @@ function createRemoveNodeMutation(node) {
   };
 }
 
-const VALID_ENUM_MEMBER_PARENTS = ['EnumBooleanBody', 'EnumNumberBody', 'EnumStringBody', 'EnumSymbolBody'];
+const VALID_ENUM_MEMBER_PARENTS = ['EnumBooleanBody', 'EnumNumberBody', 'EnumBigIntBody', 'EnumStringBody', 'EnumSymbolBody'];
 const VALID_FUNCTION_PARAMETER_PARENTS = ['ArrowFunctionExpression', 'FunctionDeclaration', 'FunctionExpression'];
 const VALID_PROPERTY_PARENTS = ['ObjectExpression', 'ObjectPattern'];
 const VALID_COMPONENT_TYPE_PARAMETER_PARENTS = ['DeclareComponent', 'ComponentTypeAnnotation'];
@@ -139,9 +139,10 @@ function getRemovalParent(node) {
 
           case 'ObjectPattern':
             return 'properties';
+          // $FlowFixMe[incompatible-type]
 
-          case 'CallExpression':
           case 'OptionalCallExpression':
+          case 'CallExpression':
           case 'NewExpression':
             return 'arguments';
 
@@ -158,9 +159,10 @@ function getRemovalParent(node) {
 
           case 'ObjectExpression':
             return 'properties';
+          // $FlowFixMe[incompatible-type]
 
-          case 'CallExpression':
           case 'OptionalCallExpression':
+          case 'CallExpression':
           case 'NewExpression':
             return 'arguments';
 

package/dist/transform/mutations/RemoveNode.js.flow

@@ -70,6 +70,7 @@ export function createRemoveNodeMutation(
 const VALID_ENUM_MEMBER_PARENTS: $ReadOnlyArray<string> = [
   'EnumBooleanBody',
   'EnumNumberBody',
+  'EnumBigIntBody',
   'EnumStringBody',
   'EnumSymbolBody',
 ];
@@ -214,8 +215,9 @@ function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
           case 'ObjectPattern':
             return 'properties';
 
-          case 'CallExpression':
+          // $FlowFixMe[incompatible-type]
           case 'OptionalCallExpression':
+          case 'CallExpression':
           case 'NewExpression':
             return 'arguments';
 
@@ -244,8 +246,9 @@ function getRemovalParent(node: RemoveNodeMutation['node']): $ReadOnly<{
           case 'ObjectExpression':
             return 'properties';
 
-          case 'CallExpression':
+          // $FlowFixMe[incompatible-type]
           case 'OptionalCallExpression':
+          case 'CallExpression':
           case 'NewExpression':
             return 'arguments';
 

package/dist/transform/mutations/ReplaceNode.js

@@ -60,18 +60,19 @@ function getParentKey(target) {
   const parent = target.parent;
 
   for (const key of (0, _hermesParser.getVisitorKeys)(parent)) {
-    if ((0, _hermesParser.isNode)( // $FlowExpectedError[prop-missing]
-    parent[key])) {
-      if (parent[key] === target) {
+    const child = parent[key];
+
+    if ((0, _hermesParser.isNode)(child)) {
+      if (child === target) {
         return {
           type: 'single',
           parent,
           key
         };
       }
-    } else if (Array.isArray(parent[key])) {
-      for (let i = 0; i < parent[key].length; i += 1) {
-        const current = parent[key][i];
+    } else if (Array.isArray(child)) {
+      for (let i = 0; i < child.length; i += 1) {
+        const current = child[i];
         const originalNode = (0, _detachedNode.getOriginalNode)(current);
 
         if (current === target || originalNode === target) {

package/dist/transform/mutations/ReplaceNode.js.flow

@@ -88,18 +88,14 @@ function getParentKey(target: ESNode): $ReadOnly<
 > {
   const parent = target.parent;
   for (const key of getVisitorKeys(parent)) {
-    if (
-      isNode(
-        // $FlowExpectedError[prop-missing]
-        parent[key],
-      )
-    ) {
-      if (parent[key] === target) {
+    const child = (parent: $FlowFixMe)[key];
+    if (isNode(child)) {
+      if (child === target) {
         return {type: 'single', parent, key};
       }
-    } else if (Array.isArray(parent[key])) {
-      for (let i = 0; i < parent[key].length; i += 1) {
-        const current = parent[key][i];
+    } else if (Array.isArray(child)) {
+      for (let i = 0; i < child.length; i += 1) {
+        const current = child[i];
         const originalNode = getOriginalNode(current);
         if (current === target || originalNode === target) {
           return {type: 'array', parent, key, targetIndex: i};

package/dist/traverse/traverse.js

@@ -109,8 +109,6 @@ function traverseWithContext(code, ast, scopeManager, additionalContext, visitor
 
   Object.keys(selectors).forEach(selector => {
     // flow doesn't want us to be general here - but it's safe
-    // $FlowExpectedError[incompatible-type]
-    // $FlowExpectedError[prop-missing]
     const listener = selectors[selector];
 
     if (listener) {

package/dist/traverse/traverse.js.flow

@@ -175,9 +175,7 @@ export function traverseWithContext<T = TraversalContextBase>(
   // add all the selectors from the visitor as listeners
   Object.keys(selectors).forEach(selector => {
     // flow doesn't want us to be general here - but it's safe
-    // $FlowExpectedError[incompatible-type]
-    // $FlowExpectedError[prop-missing]
-    const listener: ?EmitterListener = selectors[selector];
+    const listener: ?EmitterListener = (selectors: $FlowFixMe)[selector];
     if (listener) {
       emitter.on(selector, listener);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-transform",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Tools built on top of Hermes-ESTree to enable codebase transformation",
   "main": "dist/index.js",
   "license": "MIT",
@@ -12,13 +12,14 @@
     "@babel/code-frame": "^7.16.0",
     "esquery": "^1.4.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.20.0",
-    "hermes-estree": "0.20.0",
-    "hermes-parser": "0.20.0"
+    "hermes-eslint": "0.21.0",
+    "hermes-estree": "0.21.0",
+    "hermes-parser": "0.21.0",
+    "string-width": "4.2.3"
   },
   "peerDependencies": {
     "prettier": "^3.0.0 || ^2.7.1",
-    "prettier-plugin-hermes-parser": "0.20.0"
+    "prettier-plugin-hermes-parser": "0.21.0"
   },
   "files": [
     "dist",