flow-upgrade 2.2.0 → 2.4.0

package/README.md

@@ -88,3 +88,13 @@ Part of the upgrade to 0.201
 Converts usages of the deprecated and unsafe `$Shape` utility type to its replacement, [`Partial`](https://flow.org/en/docs/types/utilities/#toc-partial).
 
 Run with `yarn run flow-codemod convertShapeToPartial`.
+
+### Migrate type casts `(x: T)` to `as` expressions `x as T`
+Converts usages of the old casting syntax `(x: T)` to the new casting syntax `x as T`.
+
+Run with `yarn run flow-codemod typeCastToAsExpression`.
+
+### Migrate internal Flow types for React to public-facing ones
+Converts usages of the internal React types like `React$Node` to public facing ones like `React.Node`.
+
+Run with `yarn run flow-codemod replaceReactDollarUtilityTypes`.

package/dist/Styled.js

@@ -1,14 +1,5 @@
 "use strict";
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 const chalk = require('chalk');
 
 exports.divider = function divider() {
@@ -24,16 +15,9 @@ exports.upgradeTitle = function upgradeTitle(title, n) {
 };
 
 exports.codeblock = function codeblock(code) {
-  return code // Add indentation to the beginning of every line of code.
-  .split('\n').map(line => `    ${line}`).join('\n') // Add highlighting for puncuation. We need to do this first otherwise it
-  // breaks the other colors.
-  .replace(/([={}()\[\];<>,:.*/])/g, chalk.grey('$1')) // Add highlighting for reserved keywords.
-  .replace(/(import|from|typeof|type|class|extends|static|return|function)/g, chalk.magenta('$1')) // Add highlighting for strings.
-  .replace(/('[^\n]*')/g, chalk.green('$1'));
+  return code.split('\n').map(line => `    ${line}`).join('\n').replace(/([={}()\[\];<>,:.*/])/g, chalk.grey('$1')).replace(/(import|from|typeof|type|class|extends|static|return|function)/g, chalk.magenta('$1')).replace(/('[^\n]*')/g, chalk.green('$1'));
 };
 
 exports.list = function list(items) {
-  return items.map(item => // Indent every item and add a `- ` to the beginning of each line.
-  item.split('\n').map((line, i) => `${i === 0 ? chalk.grey('- ') : '  '}${line}`).join('\n')) // Combine all of our items into one list string.
-  .join('\n');
+  return items.map(item => item.split('\n').map((line, i) => `${i === 0 ? chalk.grey('- ') : '  '}${line}`).join('\n')).join('\n');
 };

package/dist/Types.js

@@ -5,15 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.codemod = codemod;
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 function codemod(config) {
   return { ...config,
     kind: 'codemod'

package/dist/bin/runSpecificCodemod.js

@@ -1,14 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -79,11 +69,10 @@ async function main(args) {
   const directory = process.cwd();
 
   try {
-    const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options); // $FlowExpectedError[unsupported-syntax]
-
+    const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options);
     const {
       default: upgrade
-    } = await Promise.resolve(`${CODEMOD_DIR}/${codemodName}.js`).then(s => _interopRequireWildcard(require(s))); // Tell the user what we are about to do.
+    } = await Promise.resolve(`${CODEMOD_DIR}/${codemodName}.js`).then(s => _interopRequireWildcard(require(s)));
 
     if (!options.silent) {
       console.log(_Styled.default.sectionHeader('Codemods'));
@@ -92,7 +81,7 @@ async function main(args) {
       console.log();
       console.log(_Styled.default.upgradeTitle(upgrade.title, 1));
       console.log();
-      console.log(upgrade.description);
+      console.log(upgrade.describe);
       console.log();
       console.log(_Styled.default.divider());
       console.log();
@@ -104,7 +93,6 @@ async function main(args) {
       case 'codemod':
         await (0, _runCodemods.default)([upgrade], filePaths, options);
         break;
-      // Throw an error for all other kinds of upgrades.
 
       default:
         throw new Error(`Unexpected upgrade kind: '${upgrade.kind}'`);

package/dist/bin/upgrade.js

@@ -1,14 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -57,11 +47,7 @@ async function main(args) {
     prettierOptions,
     silent: !!yargs.silent,
     yes: !!yargs.yes
-  }; // For now we are asking for the version numbers out of convenience. When we add
-  // upgrades for future versions we will need to check `.flowconfig` or
-  // `flow-bin` for the current version and allow the new version to be
-  // configurable. (But still default to the latest version.)
-
+  };
   const fromVersion = yargs._[0];
   const toVersion = yargs._[1];
 

package/dist/codemodUtils/getClassMemberName.js

@@ -5,15 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getClassMemberName = getClassMemberName;
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 function getClassMemberName(member) {
   if (member.key.type === 'PrivateIdentifier') {
     return `#${member.key.name}`;

package/dist/codemodUtils/replaceMethodWithArrowProp.js

@@ -7,39 +7,12 @@ exports.replaceMethodWithArrowProp = replaceMethodWithArrowProp;
 
 var _hermesTransform = require("hermes-transform");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
-
-/**
- * Converts method definition to an arrow function property
- * ```
- * method<T>(arg) { ... }
- * // to
- * +method = <T>(arg) => { ... };
- * ```
- */
 function replaceMethodWithArrowProp(context, method, name) {
   context.replaceNode(method, _hermesTransform.t.PropertyDefinition({
     computed: false,
     declare: false,
     key: _hermesTransform.t.Identifier({
       name,
-      // for types-first compliance, this should ideally be filled out for
-      // non-private members. However it's *super* complicated to correctly
-      // handle these cases statically (type parameters and default args make
-      // it hard).
-      // So instead we just ignore it and they can be filled later using a
-      // type-aware codemod like
-      // ```
-      // flow codemod annotate-exports --write --munge-underscore-members --max-type-size 25
-      // ```
       typeAnnotation: null
     }),
     optional: false,
@@ -52,7 +25,6 @@ function replaceMethodWithArrowProp(context, method, name) {
       typeParameters: method.value.typeParameters,
       returnType: method.value.returnType
     }),
-    // methods are readonly, so we mark the property as readonly as well
     variance: _hermesTransform.t.Variance({
       kind: 'plus'
     })

package/dist/codemods/collapseObjectInitialization.js

@@ -9,18 +9,9 @@ var _hermesTransform = require("hermes-transform");
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Collapse Object Initialization',
-  description: 'Converts static object assignments to inline properties',
+  describe: 'Converts static object assignments to inline properties',
   transform: context => {
     function getStatementContainerArray(stmtNode) {
       const parent = stmtNode.parent;
@@ -38,7 +29,6 @@ var _default = (0, _Types.codemod)({
 
         case 'Program':
           {
-            // $FlowIgnore[incompatible-return]
             return parent.body;
           }
 
@@ -109,7 +99,7 @@ var _default = (0, _Types.codemod)({
       const memberPropertyNode = leftNode.property;
 
       if (memberObjectNode.type === 'Identifier' && memberObjectNode.name === idNode.name && memberPropertyNode.type === 'Identifier') {
-        const shorthand = !leftNode.computed && exprRightNode.type === 'Identifier' && exprRightNode.name === memberPropertyNode.name; // $FlowIgnore[incompatible-type-arg] You gonna have to trust me
+        const shorthand = !leftNode.computed && exprRightNode.type === 'Identifier' && exprRightNode.name === memberPropertyNode.name;
 
         const property = _hermesTransform.t.Property({
           key: memberPropertyNode,
@@ -117,7 +107,6 @@ var _default = (0, _Types.codemod)({
           computed: leftNode.computed,
           kind: 'init',
           method: false,
-          // $FlowIgnore[incompatible-call]
           shorthand
         });
 
@@ -211,8 +200,7 @@ var _default = (0, _Types.codemod)({
           }, 0);
 
           if (assignmentRefsCount !== objectProperties.length) {
-            console.error(context.buildCodeFrame(stmtNode, 'Object had non inlinable and inlineable properties')); // If you don't wish to codemod these mixed objects return here.
-            // return;
+            console.error(context.buildCodeFrame(stmtNode, 'Object had non inlinable and inlineable properties'));
           }
 
           const keyNames = new Set();

package/dist/codemods/convertImplicitInexactObjectTypes.js

@@ -7,22 +7,12 @@ exports.default = void 0;
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Make implicitly inexact object types explicitly inexact',
-  description: 'Convert implicitly inexact object type syntax `{}` to explicitly inexact `{...}`',
+  describe: 'Convert implicitly inexact object type syntax `{}` to explicitly inexact `{...}`',
   transform: context => {
     return {
       ':not(InterfaceDeclaration, InterfaceTypeAnnotation, DeclareInterface, DeclareClass) > ObjectTypeAnnotation[inexact=false][exact=false]'(node) {
-        // $FlowFixMe[incompatible-call] `inexact` can be true, as is the case with `{...}`
         context.modifyNodeInPlace(node, {
           inexact: true
         });

package/dist/codemods/convertShapeToPartial.js

@@ -7,18 +7,9 @@ exports.default = void 0;
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Convert `$Shape` to `Partial`',
-  description: 'Converts usage of the `$Shape` utility type to `Partial`. It is possible that this will create type errors that you will have to resolve.',
+  describe: 'Converts usage of the `$Shape` utility type to `Partial`. It is possible that this will create type errors that you will have to resolve.',
   transform: context => {
     return {
       'GenericTypeAnnotation[id.name="$Shape"][typeParameters.params.length > 0]'(node) {

package/dist/codemods/removeAnnotationsInDestructuring.js

@@ -7,18 +7,9 @@ exports.default = void 0;
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Remove Annotations In Destructuring',
-  description: 'Remove annotations nested inside of destructuring. These are not valid Flow syntax.',
+  describe: 'Remove annotations nested inside of destructuring. These are not valid Flow syntax.',
   transform: context => {
     return {
       ':matches(ArrayPattern, ObjectPattern) > :matches(Identifier, ArrayPattern, ObjectPattern)[typeAnnotation!=null]'(node) {

package/dist/codemods/removeDuplicateClassProperties.js

@@ -11,15 +11,6 @@ var _replaceMethodWithArrowProp = require("../codemodUtils/replaceMethodWithArro
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 function getKind(member) {
   switch (member.type) {
     case 'MethodDefinition':
@@ -63,8 +54,7 @@ function findDuplicates(membersMap) {
           member
         };
         continue;
-      } // handle the valid cases
-
+      }
 
       switch (lastMember.kind) {
         case 'GetterSetter':
@@ -105,8 +95,7 @@ function findDuplicates(membersMap) {
           }
 
           break;
-      } // overwrite and delete the old member as it's incompatible
-
+      }
 
       if (lastMember.kind === 'GetterSetter') {
         toDelete.push(lastMember.getter);
@@ -127,11 +116,10 @@ function findDuplicates(membersMap) {
 
 var _default = (0, _Types.codemod)({
   title: 'Remove Duplicate Class Properties',
-  description: 'Removes useless duplicate class properties and fixes bad constructor binding in those classes',
+  describe: 'Removes useless duplicate class properties and fixes bad constructor binding in those classes',
   transform: context => {
     let classStack = null;
     return {
-      // find and delete duplicated members
       'ClassDeclaration, ClassExpression'(node) {
         const staticMembers = new Map();
         const instanceMembers = new Map();
@@ -141,7 +129,6 @@ var _default = (0, _Types.codemod)({
           const name = (0, _getClassMemberName.getClassMemberName)(member);
 
           if (name == null) {
-            // unsupported computed member
             continue;
           }
 
@@ -158,8 +145,7 @@ var _default = (0, _Types.codemod)({
 
         if (toDelete.size === 0) {
           return;
-        } // mark members for deletion
-
+        }
 
         for (const memberToDelete of toDelete) {
           var _memberToDelete$value;
@@ -169,9 +155,7 @@ var _default = (0, _Types.codemod)({
           }
 
           context.removeNode(memberToDelete);
-        } // we need the final list of instance members so we can
-        // fix up rebinding later
-
+        }
 
         const newInstanceMembers = new Map();
 
@@ -195,8 +179,7 @@ var _default = (0, _Types.codemod)({
             kind,
             member
           });
-        } // push the stack
-
+        }
 
         classStack = {
           current: node,
@@ -205,7 +188,6 @@ var _default = (0, _Types.codemod)({
         };
       },
 
-      // remove unnecessary .bind in constructor
       'MethodDefinition[kind = "constructor"] ExpressionStatement > AssignmentExpression[operator = "="] > MemberExpression[object.type = "ThisExpression"].left'(node) {
         if (!classStack) {
           return;
@@ -218,7 +200,7 @@ var _default = (0, _Types.codemod)({
         }
 
         const subjectName = node.property.name;
-        const member = instanceMembers.get(subjectName); // the subject member must be a method
+        const member = instanceMembers.get(subjectName);
 
         if ((member === null || member === void 0 ? void 0 : member.kind) !== 'Method') {
           return;
@@ -231,26 +213,23 @@ var _default = (0, _Types.codemod)({
           throw new Error('this cannot happen');
         }
 
-        const right = assignmentExpr.right; // we're looking for `this.thing = this.thing.bind(this)`
+        const right = assignmentExpr.right;
 
         if (right.type !== 'CallExpression' || right.arguments.length !== 1 || right.arguments[0].type !== 'ThisExpression' || right.callee.type !== 'MemberExpression' || right.callee.computed || right.callee.property.type !== 'Identifier' || right.callee.property.name !== 'bind' || right.callee.object.type !== 'MemberExpression' || right.callee.object.computed || right.callee.object.object.type !== 'ThisExpression' || right.callee.object.property.type !== 'Identifier' || right.callee.object.property.name !== subjectName) {
           console.log(context.buildCodeFrame(right, `${subjectName} was reassigned, but not to a bind. You can probably manually correct this.`));
           return;
-        } // remove the bind assignment and...
-
+        }
 
         context.removeStatement(exprStatement);
         const method = member.member;
 
         if (method.type !== 'MethodDefinition') {
           throw new Error('this cannot happen');
-        } // convert the method to an arrow function
-
+        }
 
         (0, _replaceMethodWithArrowProp.replaceMethodWithArrowProp)(context, method, subjectName);
       },
 
-      // pop the stack
       'ClassDeclaration, ClassExpression:exit'(node) {
         var _classStack;
 

package/dist/codemods/removeExplicitlyExactObjectTypeSyntax.js

@@ -7,18 +7,9 @@ exports.default = void 0;
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Remove explicitly exact object type syntax',
-  description: 'Convert explicitly exact object type syntax `{| |}` to be just be `{ }`. To be done after you turn on `exact_by_default=true` in your `.flowconfig`.',
+  describe: 'Convert explicitly exact object type syntax `{| |}` to be just be `{ }`. To be done after you turn on `exact_by_default=true` in your `.flowconfig`.',
   transform: context => {
     return {
       'ObjectTypeAnnotation[exact=true]'(node) {

package/dist/codemods/renamePartial.js

@@ -7,18 +7,9 @@ exports.default = void 0;
 
 var _Types = require("../Types");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Rename `$Partial` to `Partial`',
-  description: 'Renames the `$Partial` type utility to `Partial`.',
+  describe: 'Renames the `$Partial` type utility to `Partial`.',
   transform: context => {
     return {
       'GenericTypeAnnotation[id.name="$Partial"][typeParameters.params.length > 0]'(node) {

package/dist/codemods/replaceReactDollarUtilityTypes.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _hermesTransform = require("hermes-transform");
+
+var _Types = require("../Types");
+
+const UTILITY_TYPES = new Set(['React$ComponentType', 'React$AbstractComponent', 'React$Element', 'React$MixedElement', 'React$ElementType', 'React$Key', 'React$Ref', 'React$RefSetter', 'React$Node', 'React$Context', 'React$Portal', 'React$ElementProps', 'React$ElementConfig', 'React$ElementRef', 'React$Config', 'React$Config', 'React$RefObject']);
+
+var _default = (0, _Types.codemod)({
+  title: 'Replace React$SomeUtilityType with React.SomeUtilityType.',
+  transform: context => {
+    return {
+      GenericTypeAnnotation(node) {
+        if (typeof node.id.name !== 'string') {
+          return;
+        }
+
+        const utilTypeName = node.id.name;
+
+        if (!UTILITY_TYPES.has(utilTypeName)) {
+          return;
+        }
+
+        const newNode = _hermesTransform.t.GenericTypeAnnotation({
+          id: _hermesTransform.t.QualifiedTypeIdentifier({
+            id: _hermesTransform.t.Identifier({
+              name: utilTypeName.substring('React$'.length)
+            }),
+            qualification: _hermesTransform.t.Identifier({
+              name: 'React'
+            })
+          }),
+          typeParameters: node.typeParameters
+        });
+
+        context.replaceNode(node, newNode);
+      }
+
+    };
+  }
+});
+
+exports.default = _default;

package/dist/codemods/typeCastToAsExpression.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _Types = require("../Types");
+
+var _hermesTransform = require("hermes-transform");
+
+function convertTypeCast(node) {
+  const {
+    expression,
+    typeAnnotation: {
+      typeAnnotation
+    }
+  } = node;
+  return _hermesTransform.t.AsExpression({
+    expression: expression.type === 'TypeCastExpression' ? convertTypeCast(expression) : expression,
+    typeAnnotation
+  });
+}
+
+var _default = (0, _Types.codemod)({
+  title: 'Update type casting syntax',
+  describe: 'Convert type cast expressions `(<expr>: <type>)` to as expressions `<expr> as <type>`',
+  transform: context => {
+    return {
+      TypeCastExpression(node) {
+        context.replaceNode(node, convertTypeCast(node), {
+          keepComments: true
+        });
+        context.skipTraversal();
+      }
+
+    };
+  }
+});
+
+exports.default = _default;

package/dist/codemods/typeParameterBoundExactEmptyObjectToInexact.js

@@ -9,18 +9,9 @@ var _Types = require("../Types");
 
 var _hermesTransform = require("hermes-transform");
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = (0, _Types.codemod)({
   title: 'Replace `T: {}` with `T: {...}` in type parameter bounds',
-  description: 'Replace `T: {}` with `T: {...}` in type parameter bounds',
+  describe: 'Replace `T: {}` with `T: {...}` in type parameter bounds',
   transform: context => {
     return {
       TypeParameter(node) {
@@ -32,10 +23,6 @@ var _default = (0, _Types.codemod)({
               properties: [],
               callProperties: [],
               exact: false,
-
-              /* $FlowExpectedError[incompatible-call]
-               * TODO: hermes-transform mandates that inexact must be
-               * `false`, which is wrong. */
               inexact: true,
               indexers: [],
               internalSlots: []

package/dist/findFlowFiles.js

@@ -16,125 +16,70 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
-
-/**
- * How many bytes we should look at for the Flow pragma.
- */
 const PRAGMA_BYTES = 5000;
-/**
- * Finds all of the Flow files in the provided directory as efficiently as
- * possible.
- */
 
 async function findFlowFiles({
   includeNonAtFlow,
   rootDirectory
 }) {
-  // All the valid file paths that we have found.
-  const filePaths = []; // Begin the recursion!
-
+  const filePaths = [];
   await processDirectory(rootDirectory);
   return filePaths;
-  /**
-   * Process a directory by looking at all of its entries and recursing
-   * through child directories as is appropriate.
-   */
 
   async function processDirectory(directory) {
-    // Read the directory...
-    const fileNames = await _fsExtra.default.readdir(directory); // Process every file name that we got from reading the directory.
-
+    const fileNames = await _fsExtra.default.readdir(directory);
     await Promise.all(fileNames.map(fileName => processFilePath(directory, fileName)));
   }
-  /**
-   * Process a directory file path by seeing if it is a directory and either
-   * recursing or adding it to filePaths.
-   */
-
 
   async function processFilePath(directory, fileName) {
-    // Get the file file path for this file.
-    const filePath = _path.default.join(directory, fileName); // Get the stats for the file.
+    const filePath = _path.default.join(directory, fileName);
 
-
-    const stats = await _fsExtra.default.lstat(filePath); // If this is a directory...
+    const stats = await _fsExtra.default.lstat(filePath);
 
     if (stats.isDirectory()) {
-      // ...and it is not an ignored directory...
       if (fileName !== 'node_modules' && fileName !== 'flow-typed' && fileName !== '__flowtests__') {
-        // ...then recursively process the directory.
         await processDirectory(filePath);
       }
     } else if (stats.isFile()) {
-      // Otherwise if this is a JavaScript/JSX file and it is not an ignored
-      // JavaScript file...
       const fileIsJsOrJsx = /\.jsx?$/.test(fileName);
       const fileIsIgnored = fileName.endsWith('-flowtest.js');
 
       if (fileIsJsOrJsx && !fileIsIgnored) {
-        // Then process the file path as JavaScript.
         await processJavaScriptFilePath(filePath, stats.size);
-      } // If this is a Flow file then we don't need to check the file pragma
-      // and can add the file to our paths immediately.
-
+      }
 
       if (fileName.endsWith('.flow')) {
         filePaths.push(filePath);
       }
     }
   }
-  /**
-   * Check if a file path really is a Flow file by looking for the 
-   * header pragma.
-   */
-
 
   async function processJavaScriptFilePath(filePath, fileByteSize) {
-    // If `all` was configured then we don't need to check for the Flow
-    // header pragma.
     if (includeNonAtFlow) {
       filePaths.push(filePath);
       return;
-    } // Open the file path.
-
-
-    const file = await _fsExtra.default.open(filePath, 'r'); // Get the smaller of our pragma chars constant and the file byte size.
-
-    const bytes = Math.min(PRAGMA_BYTES, fileByteSize); // Create the buffer we will read to.
-
-    const buffer = Buffer.alloc(bytes); // Read a set number of bytes from the file.
+    }
 
-    await _fsExtra.default.read(file, buffer, 0, bytes, 0); // If the buffer has the  pragma then add the file path to our
-    // final file paths array.
+    const file = await _fsExtra.default.open(filePath, 'r');
+    const bytes = Math.min(PRAGMA_BYTES, fileByteSize);
+    const buffer = Buffer.alloc(bytes);
+    await _fsExtra.default.read(file, buffer, 0, bytes, 0);
 
     if (buffer.includes('@flow')) {
       filePaths.push(filePath);
-    } // Close the file.
-
+    }
 
     await _fsExtra.default.close(file);
   }
 }
 
 async function findFlowFilesWithSpinner(rootDirectory, options) {
-  // Create a new spinner.
   const spinner = (0, _ora.default)({
     text: _chalk.default.italic.cyan('Finding all the Flow files to be upgraded...'),
     color: 'cyan',
     isSilent: options.silent
-  }); // Start the spinner.
-
-  spinner.start(); // Find all of the Flow files in the directory we are upgrading.
-
+  });
+  spinner.start();
   const filePaths = await (() => {
     try {
       return findFlowFiles({
@@ -142,13 +87,11 @@ async function findFlowFilesWithSpinner(rootDirectory, options) {
         includeNonAtFlow: options.all
       });
     } catch (error) {
-      // Stop the spinner if we get an error.
       spinner.stop();
       throw error;
     }
-  })(); // Stop the spinner.
-
-  spinner.stop(); // Log the number of Flow files that we found.
+  })();
+  spinner.stop();
 
   if (!options.silent) {
     console.log(`Found ${_chalk.default.bold.cyan(filePaths.length)} Flow files.`);

package/dist/runCodemods.js

@@ -11,22 +11,13 @@ var _hermesTransform = require("hermes-transform");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 async function runCodemods(codemods, filePaths, options) {
   const results = await Promise.allSettled(filePaths.map(async filePath => {
     const originalContents = await _fsExtra.default.readFile(filePath, 'utf8');
     let contents = originalContents;
 
     for (const codemod of codemods) {
-      contents = (0, _hermesTransform.transform)(contents, codemod.transform, options.prettierOptions);
+      contents = await (0, _hermesTransform.transform)(contents, codemod.transform, options.prettierOptions);
     }
 
     if (originalContents !== contents) {

package/dist/upgrade.js

@@ -23,36 +23,19 @@ var _upgrades = require("./upgrades");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
-
-/**
- * Decides all of the upgrades that will need to be run when moving from one
- * version to another and runs them asynchronously.
- */
 async function upgrade(directory, currentVersion, nextVersion, options) {
   const log = options.silent ? () => {} : (...messages) => console.log(...messages);
-  const allUpgrades = []; // Collect all of the upgrades we will need to run.
+  const allUpgrades = [];
 
   for (let i = 0; i < _upgrades.VERSION_UPGRADES.length; i++) {
     const {
       version,
       upgrades
-    } = _upgrades.VERSION_UPGRADES[i]; // If the version number is larger then the version we are upgrading to we
-    // are done! Do not add any more upgrades,
+    } = _upgrades.VERSION_UPGRADES[i];
 
     if (_semver.default.cmp(version, '>', nextVersion)) {
       break;
-    } // If the version number is larget then the current version, but not larger
-    // then the next version then we want to run the upgrades for this version.
-
+    }
 
     if (_semver.default.cmp(version, '>', currentVersion)) {
       upgrades.forEach(upgrade => allUpgrades.push(upgrade));
@@ -63,8 +46,7 @@ async function upgrade(directory, currentVersion, nextVersion, options) {
   log(_Styled.default.sectionHeader('flow-upgrade'));
   log();
   {
-    const titleStyled = _chalk.default.bold('flow-upgrade'); // Log the initial intro message for our user.
-
+    const titleStyled = _chalk.default.bold('flow-upgrade');
 
     const message = `
 Thank you for choosing to upgrade Flow. In every release the Flow community adds
@@ -100,40 +82,29 @@ Excluding any JavaScript files in node_modules directories, in flow-typed
 directories, in __flowtests__ directories, or files ending in -flowtest.js.
 `.slice(1);
     log(message);
-  } // Find all of the Flow files in the directory we are upgrading.
-
-  const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options); // Make sure the user knows that they should review their information before
-  // proceeding.
-
+  }
+  const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options);
   log(_chalk.default.bold.red('Please review this information to make sure that it is correct before proceeding.'));
-  log(); // Ask the user for confirmation.
-
-  const answer = options.yes || (await new _promptConfirm.default('Are you ready to begin the upgrade?').run()); // If the user did not let us continue then log a new line and do not
-  // continue.
+  log();
+  const answer = options.yes || (await new _promptConfirm.default('Are you ready to begin the upgrade?').run());
 
   if (!answer) {
     log();
     return;
-  } // Run through all of our upgrades.
-
+  }
 
   while (allUpgrades.length) {
-    // Put some space between us and the last upgrade.
-    log(); // Get the next upgrade.
-
+    log();
     const upgrade = allUpgrades.shift();
 
     switch (upgrade.kind) {
-      // If this is a codemod, collect all codemods after it as well and execute
-      // those codemods together.
       case 'codemod':
         {
-          const codemods = [upgrade]; // While the next upgrade is a codemod, add it to our `codemods` array.
+          const codemods = [upgrade];
 
           while (allUpgrades[0] && allUpgrades[0].kind === 'codemod') {
             codemods.push(allUpgrades.shift());
-          } // Tell the user what we are about to do.
-
+          }
 
           log(_Styled.default.sectionHeader('Codemods'));
           log();
@@ -148,18 +119,16 @@ directories, in __flowtests__ directories, or files ending in -flowtest.js.
           codemods.forEach((u, i) => {
             log(_Styled.default.upgradeTitle(u.title, i + 1));
             log();
-            log(u.description);
+            log(u.describe);
             log();
             log(_Styled.default.divider());
             log();
           });
           log(`Running ${_chalk.default.bold.cyan(codemods.length)} codemods...`);
-          log(); // Run all of our codemods.
-
+          log();
           await (0, _runCodemods.default)(codemods, filePaths, options);
           break;
         }
-      // Throw an error for all other kinds of upgrades.
 
       default:
         throw new Error(`Unexpected upgrade kind: '${upgrade.kind}'`);

package/dist/upgrades/0.170.0/index.js

@@ -9,15 +9,6 @@ var _removeDuplicateClassProperties = _interopRequireDefault(require("../../code
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = {
   version: '0.170.0',
   upgrades: [_removeDuplicateClassProperties.default]

package/dist/upgrades/0.176.0/index.js

@@ -9,15 +9,6 @@ var _removeAnnotationsInDestructuring = _interopRequireDefault(require("../../co
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = {
   version: '0.176.0',
   upgrades: [_removeAnnotationsInDestructuring.default]

package/dist/upgrades/0.201.0/index.js

@@ -9,15 +9,6 @@ var _renamePartial = _interopRequireDefault(require("../../codemods/renamePartia
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = {
   version: '0.201.0',
   upgrades: [_renamePartial.default]

package/dist/upgrades/0.84.0/index.js

@@ -9,15 +9,6 @@ var _convertImplicitInexactObjectTypes = _interopRequireDefault(require("../../c
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 var _default = {
   version: '0.84.0',
   upgrades: [_convertImplicitInexactObjectTypes.default]

package/dist/upgrades/index.js

@@ -15,19 +15,5 @@ var _4 = _interopRequireDefault(require("./0.201.0"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
-
-/**
- * Holds all of the upgrades that need to be run to upgrade to each version from
- * the last version of Flow.
- */
 const VERSION_UPGRADES = [_.default, _2.default, _3.default, _4.default];
 exports.VERSION_UPGRADES = VERSION_UPGRADES;

package/dist/utils/redirectConsole.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * 
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -29,22 +20,19 @@ const oldConsole = {
 };
 
 function redirectConsole(reporter_) {
-  const reporter = typeof reporter_ === 'function' ? reporter_(oldConsole) : reporter_; // $FlowExpectedError[cannot-write]
+  const reporter = typeof reporter_ === 'function' ? reporter_(oldConsole) : reporter_;
 
   console.log = (...args) => {
     reporter.onStdout(util.format(...args));
-  }; // $FlowExpectedError[cannot-write]
-
+  };
 
   console.info = (...args) => {
     reporter.onStdout(util.format(...args));
-  }; // $FlowExpectedError[cannot-write]
-
+  };
 
   console.warn = (...args) => {
     reporter.onStdout('[WARN]' + util.format(...args));
-  }; // $FlowExpectedError[cannot-write]
-
+  };
 
   console.error = (...args) => {
     reporter.onStderr(util.format(...args));
@@ -53,7 +41,6 @@ function redirectConsole(reporter_) {
 
 function restoreConsole() {
   for (const [name, fn] of Object.entries(oldConsole)) {
-    // $FlowExpectedError
     console[name] = fn;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-upgrade",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "A utility for upgrading your codebase to the latest version of Flow.",
   "engines": {
     "node": ">=14"
@@ -15,7 +15,8 @@
   },
   "scripts": {
     "build": "rm -rf dist && babel src --out-dir dist --ignore '**/__tests__'",
-    "test": "jest --watch",
+    "test": "jest",
+    "flow": "flow",
     "prepublish": "yarn run build",
     "postpublish": "node ./scripts/postpublish.js"
   },
@@ -29,28 +30,30 @@
   "homepage": "https://github.com/facebook/flow/tree/master/packages/flow-upgrade#readme",
   "dependencies": {
     "@babel/highlight": "^7.18.6",
+    "babel-plugin-syntax-hermes-parser": "0.23.0",
     "chalk": "^2.0.1",
     "fs-extra": "10.1.0",
-    "hermes-estree": "0.10.0",
-    "hermes-parser": "0.10.0",
-    "hermes-transform": "0.10.0",
+    "hermes-estree": "0.23.0",
+    "hermes-parser": "0.23.0",
+    "hermes-transform": "0.23.0",
     "klaw-sync": "^6.0.0",
     "ora": "^5.4.1",
+    "prettier-plugin-hermes-parser": "0.23.0",
     "prompt-confirm": "^1.2.0",
     "semver": "^7.3.7",
     "yargs": "^17.0.1"
   },
   "peerDependencies": {
-    "prettier": "2.7.1"
+    "prettier": "2.8.8"
   },
   "devDependencies": {
     "@babel/cli": "^7.14.8",
     "@babel/core": "^7.14.8",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-flow": "^7.14.5",
-    "flow-bin": "^0.178.0",
+    "flow-bin": "^0.227.0",
     "jest": "^27.5.1",
     "memfs": "^3.4.3",
-    "prettier": "2.7.1"
+    "prettier": "2.8.8"
   }
 }