flow-upgrade 1.1.0 → 2.0.0

package/dist/upgrade.js

@@ -1,69 +1,72 @@
-'use strict';
+"use strict";
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = upgrade;
 
-/**
- * @format
- * 
- */
+var _semver = _interopRequireDefault(require("semver"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _ora = _interopRequireDefault(require("ora"));
+
+var _promptConfirm = _interopRequireDefault(require("prompt-confirm"));
 
-const semver = require('semver');
-const chalk = require('chalk');
-const ora = require('ora');
-const Confirm = require('prompt-confirm');
-const Styled = require('./Styled');
-const findFlowFiles = require('./findFlowFiles');
+var _Styled = _interopRequireDefault(require("./Styled"));
+
+var _findFlowFiles = require("./findFlowFiles");
+
+var _runCodemods = _interopRequireDefault(require("./runCodemods"));
+
+var _upgrades = require("./upgrades");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
- * Holds all of the upgrades that need to be run to upgrade to each version from
- * the last version of Flow.
+ * 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 VERSION_UPGRADES = [
-// We started writing and distributing upgrades with `flow-upgrade` after Flow
-// version 0.52.0. We assume that you have valid Flow 0.52.0 code and are not
-// backporting any previous automated upgrades.
-
-{
-  version: '0.53.0',
-  upgrades: [require('./upgrades/0.53.0/ReactComponentExplicitTypeArgs'), require('./upgrades/0.53.0/ReactComponentSimplifyTypeArgs'), require('./upgrades/0.53.0/ReactUtilityTypes')]
-}, {
-  version: '0.84.0',
-  upgrades: [require('./upgrades/0.84.0/ExplicitInexactObjectSyntax')]
-}];
 
 /**
  * Decides all of the upgrades that will need to be run when moving from one
  * version to another and runs them asynchronously.
  */
-module.exports = (() => {
-  var _ref = _asyncToGenerator(function* (directory, currentVersion, nextVersion, options) {
-    const allUpgrades = [];
-    // Collect all of the upgrades we will need to run.
-    for (let i = 0; i < VERSION_UPGRADES.length; i++) {
-      var _VERSION_UPGRADES$i = VERSION_UPGRADES[i];
-      const version = _VERSION_UPGRADES$i.version,
-            upgrades = _VERSION_UPGRADES$i.upgrades;
-      // If the version number is larger then the version we are upgrading to we
-      // are done! Do not add any more upgrades,
-
-      if (semver.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.cmp(version, '>', currentVersion)) {
-        upgrades.forEach(function (upgrade) {
-          return allUpgrades.push(upgrade);
-        });
-      }
+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.
+
+  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,
+
+    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));
     }
-    console.log();
-    console.log(Styled.sectionHeader('flow-upgrade'));
-    console.log();
-    {
-      const titleStyled = chalk.bold('flow-upgrade');
-      // Log the initial intro message for our user.
-      const message = `
+  }
+
+  log();
+  log(_Styled.default.sectionHeader('flow-upgrade'));
+  log();
+  {
+    const titleStyled = _chalk.default.bold('flow-upgrade'); // Log the initial intro message for our user.
+
+
+    const message = `
 Thank you for choosing to upgrade Flow. In every release the Flow community adds
 new features and improves the performance of Flow to better serve you and your
 team. Upgrading gives you the best that Flow has to offer.
@@ -80,115 +83,86 @@ using git make sure you've commit the changes in your working directory.) After
 running ${titleStyled} review the changes that were made and manually tweak
 your code until you are happy with the upgrade.
 
-The Flow version you're upgrading from: ${chalk.bold.magenta(currentVersion)}
-The Flow version you're upgrading to:   ${chalk.bold.green(nextVersion)}
+The Flow version you're upgrading from: ${_chalk.default.bold.magenta(currentVersion)}
+The Flow version you're upgrading to:   ${_chalk.default.bold.green(nextVersion)}
 
-We will assume that your code is valid Flow ${chalk.bold.magenta(currentVersion)} code.
+We will assume that your code is valid Flow ${_chalk.default.bold.magenta(currentVersion)} code.
 
 We will be running the following steps to upgrade your codebase. Each step will
 print a short message explaining what it does before it runs, but we won't stop
 to ask you for reconfirmation once we begin upgrading.
 
-${allUpgrades.map(function (u, i) {
-        return Styled.upgradeTitle(u.title, i + 1);
-      }).join('\n')}
+${allUpgrades.map((u, i) => _Styled.default.upgradeTitle(u.title, i + 1)).join('\n')}
 
-Today we will be upgrading all JavaScript files using Flow in: ${chalk.bold.magenta(directory)}
+Today we will be upgrading all JavaScript files using Flow in: ${_chalk.default.bold.magenta(directory)}
 
 Excluding any JavaScript files in node_modules directories, in flow-typed
 directories, in __flowtests__ directories, or files ending in -flowtest.js.
 `.slice(1);
-      console.log(message);
-    }
-    // Create a new spinner.
-    const spinner = ora({
-      text: chalk.italic.cyan('Finding all the Flow files to be upgraded...'),
-      color: 'cyan'
-    });
-    // Start the spinner.
-    spinner.start();
-    // Find all of the Flow files in the directory we are upgrading.
-    let filePaths;
-    try {
-      filePaths = yield findFlowFiles(directory, options);
-    } 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.
-    console.log(`Found ${chalk.bold.cyan(filePaths.length)} Flow files.`);
-    console.log();
-    // Make sure the user knows that they should review their information before
-    // proceeding.
-    console.log(chalk.bold.red('Please review this information to make sure that it is correct before proceeding.'));
-    console.log();
-    // Ask the user for confirmation.
-    const answer = yield new Confirm('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.
-    if (!answer) {
-      console.log();
-      return;
+    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.
+
+  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.
+
+  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.
+
+    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.
+
+          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();
+          log('We are now going to run the following codemods:');
+          log();
+          log(codemods.map((u, i) => _Styled.default.upgradeTitle(u.title, i + 1)).join('\n'));
+          log();
+          log('Following is a short description of each codemod listed above so ' + 'that you know\nhow your code is being upgraded.');
+          log();
+          log(_Styled.default.divider());
+          log();
+          codemods.forEach((u, i) => {
+            log(_Styled.default.upgradeTitle(u.title, i + 1));
+            log();
+            log(u.description);
+            log();
+            log(_Styled.default.divider());
+            log();
+          });
+          log(`Running ${_chalk.default.bold.cyan(codemods.length)} codemods...`);
+          log(); // Run all of our codemods.
+
+          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}'`);
     }
-    // Run through all of our upgrades.
-    while (allUpgrades.length) {
-      // Put some space between us and the last upgrade.
-      console.log();
-      // Get the next upgrade.
-      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.
-            while (allUpgrades[0] && allUpgrades[0].kind === 'codemod') {
-              codemods.push(allUpgrades.shift());
-            }
-            // Tell the user what we are about to do.
-            console.log(Styled.sectionHeader('Codemods'));
-            console.log();
-            console.log('We are now going to run the following codemods:');
-            console.log();
-            console.log(codemods.map(function (u, i) {
-              return Styled.upgradeTitle(u.title, i + 1);
-            }).join('\n'));
-            console.log();
-            console.log('Following is a short description of each codemod listed above so ' + 'that you know\nhow your code is being upgraded.');
-            console.log();
-            console.log(Styled.divider());
-            console.log();
-            codemods.forEach(function (u, i) {
-              console.log(Styled.upgradeTitle(u.title, i + 1));
-              console.log();
-              console.log(u.description);
-              console.log();
-              console.log(Styled.divider());
-              console.log();
-            });
-            console.log(`Running ${chalk.bold.cyan(codemods.length)} codemods...`);
-            console.log();
-            // Run all of our codemods.
-            const runCodemods = require('./codemods/runCodemods');
-            yield runCodemods(codemods.map(function ({ transformPath }) {
-              return transformPath;
-            }), filePaths);
-            break;
-          }
-        // Throw an error for all other kinds of upgrades.
-        default:
-          throw new Error(`Unexpected upgrade kind: '${upgrade.kind}'`);
-      }
-    }
-  });
-
-  function upgrade(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
   }
-
-  return upgrade;
-})();
+}

package/dist/upgrades/0.170.0/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _removeDuplicateClassProperties = _interopRequireDefault(require("../../codemods/removeDuplicateClassProperties"));
+
+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]
+};
+exports.default = _default;

package/dist/upgrades/0.176.0/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _removeAnnotationsInDestructuring = _interopRequireDefault(require("../../codemods/removeAnnotationsInDestructuring"));
+
+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]
+};
+exports.default = _default;

package/dist/upgrades/0.84.0/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _convertImplicitInexactObjectTypes = _interopRequireDefault(require("../../codemods/convertImplicitInexactObjectTypes"));
+
+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]
+};
+exports.default = _default;

package/dist/upgrades/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VERSION_UPGRADES = void 0;
+
+var _ = _interopRequireDefault(require("./0.170.0"));
+
+var _2 = _interopRequireDefault(require("./0.176.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];
+exports.VERSION_UPGRADES = VERSION_UPGRADES;

package/dist/utils/redirectConsole.js

@@ -0,0 +1,59 @@
+/**
+ * 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", {
+  value: true
+});
+exports.redirectConsole = redirectConsole;
+exports.restoreConsole = restoreConsole;
+
+var util = _interopRequireWildcard(require("util"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const oldConsole = {
+  error: console.error,
+  info: console.info,
+  log: console.log,
+  warn: console.warn
+};
+
+function redirectConsole(reporter_) {
+  const reporter = typeof reporter_ === 'function' ? reporter_(oldConsole) : reporter_; // $FlowExpectedError[cannot-write]
+
+  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));
+  };
+}
+
+function restoreConsole() {
+  for (const [name, fn] of Object.entries(oldConsole)) {
+    // $FlowExpectedError
+    console[name] = fn;
+  }
+}

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "flow-upgrade",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "A utility for upgrading your codebase to the latest version of Flow.",
   "engines": {
-    "node": ">=6"
+    "node": ">=14"
   },
+  "license": "MIT",
   "files": [
     "dist"
   ],
-  "bin": "./dist/index.js",
+  "bin": {
+    "flow-upgrade": "./dist/bin/index.js",
+    "flow-codemod": "./dist/bin/runSpecificCodemod.js"
+  },
   "scripts": {
-    "build": "rm -rf dist && babel src --out-dir dist --ignore __tests__",
+    "build": "rm -rf dist && babel src --out-dir dist --ignore '**/__tests__'",
     "test": "jest --watch",
-    "prepublish": "npm run build",
+    "prepublish": "yarn run build",
     "postpublish": "node ./scripts/postpublish.js"
   },
   "repository": {
@@ -23,26 +27,30 @@
     "url": "https://github.com/facebook/flow/issues"
   },
   "homepage": "https://github.com/facebook/flow/tree/master/packages/flow-upgrade#readme",
-  "jest": {
-    "rootDir": "src",
-    "testMatch": [
-      "**/__tests__/*-test.js"
-    ]
-  },
   "dependencies": {
+    "@babel/highlight": "^7.18.6",
     "chalk": "^2.0.1",
-    "graceful-fs": "^4.1.11",
-    "jscodeshift": "git://github.com/jbrown215/jscodeshift.git",
-    "ora": "^1.3.0",
+    "fs-extra": "10.1.0",
+    "hermes-estree": "0.9.0",
+    "hermes-parser": "0.9.0",
+    "hermes-transform": "0.9.0",
+    "klaw-sync": "^6.0.0",
+    "ora": "^5.4.1",
     "prompt-confirm": "^1.2.0",
-    "semver": "^5.3.0",
-    "yargs": "^8.0.2"
+    "semver": "^7.3.7",
+    "yargs": "^17.0.1"
+  },
+  "peerDependencies": {
+    "prettier": "^2.4.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-flow": "^6.23.0",
-    "flow-bin": "0.74.0",
-    "jest": "^20.0.4"
+    "@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",
+    "jest": "^27.5.1",
+    "memfs": "^3.4.3",
+    "prettier": "^2.4.1"
   }
 }