flow-upgrade 2.5.0 → 2.7.0

package/dist/codemods/replaceReactDollarUtilityTypes.js

@@ -1,17 +1,7 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _hermesTransform = require("hermes-transform");
-
-var _Types = require("../Types");
-
+import { t } from 'hermes-transform';
+import { codemod } from '../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)({
+export default codemod({
   title: 'Replace React$SomeUtilityType with React.SomeUtilityType.',
   transform: context => {
     return {
@@ -26,23 +16,20 @@ var _default = (0, _Types.codemod)({
           return;
         }
 
-        const newNode = _hermesTransform.t.GenericTypeAnnotation({
-          id: _hermesTransform.t.QualifiedTypeIdentifier({
-            id: _hermesTransform.t.Identifier({
+        const newNode = t.GenericTypeAnnotation({
+          id: t.QualifiedTypeIdentifier({
+            id: t.Identifier({
               name: utilTypeName.substring('React$'.length)
             }),
-            qualification: _hermesTransform.t.Identifier({
+            qualification: t.Identifier({
               name: 'React'
             })
           }),
           typeParameters: node.typeParameters
         });
-
         context.replaceNode(node, newNode);
       }
 
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/replaceTemporaryTypes.js

@@ -1,15 +1,7 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _hermesTransform = require("hermes-transform");
-
-var _Types = require("../Types");
-
-var _default = (0, _Types.codemod)({
+import { t } from 'hermes-transform';
+import { codemod } from '../Types';
+export default codemod({
+  title: 'Replace $TEMPORARY$ types',
   describe: ['Converts:', ' - `$TEMPORARY$object<{props}>` to `$ReadOnly<{props}>`', ' - `$TEMPORARY$array<T>` to `$ReadOnlyArray<T>`', ' - `$TEMPORARY$number<42>` annotations to `number`', ' - `$TEMPORARY$string<"foo">` annotations to `string`'].join('\n'),
   transform: context => {
     return {
@@ -18,7 +10,7 @@ var _default = (0, _Types.codemod)({
 
         if (id.type === 'Identifier' && id.name === '$TEMPORARY$object' && node.typeParameters != null) {
           context.modifyNodeInPlace(node, {
-            id: _hermesTransform.t.Identifier({
+            id: t.Identifier({
               name: '$ReadOnly'
             })
           });
@@ -26,23 +18,21 @@ var _default = (0, _Types.codemod)({
 
         if (id.type === 'Identifier' && id.name === '$TEMPORARY$array' && node.typeParameters != null) {
           context.modifyNodeInPlace(node, {
-            id: _hermesTransform.t.Identifier({
+            id: t.Identifier({
               name: '$ReadOnlyArray'
             })
           });
         }
 
         if (id.type === 'Identifier' && id.name === '$TEMPORARY$number') {
-          const new_node = _hermesTransform.t.NumberTypeAnnotation();
-
+          const new_node = t.NumberTypeAnnotation();
           context.replaceNode(node, new_node, {
             keepComments: true
           });
         }
 
         if (id.type === 'Identifier' && id.name === '$TEMPORARY$string') {
-          const new_node = _hermesTransform.t.StringTypeAnnotation();
-
+          const new_node = t.StringTypeAnnotation();
           context.replaceNode(node, new_node, {
             keepComments: true
           });
@@ -51,6 +41,4 @@ var _default = (0, _Types.codemod)({
 
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/typeCastToAsExpression.js

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

package/dist/codemods/typeParameterBoundExactEmptyObjectToInexact.js

@@ -1,15 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _Types = require("../Types");
-
-var _hermesTransform = require("hermes-transform");
-
-var _default = (0, _Types.codemod)({
+import { codemod } from '../Types';
+import { t } from 'hermes-transform';
+export default codemod({
   title: 'Replace `T: {}` with `T: {...}` in type parameter bounds',
   describe: 'Replace `T: {}` with `T: {...}` in type parameter bounds',
   transform: context => {
@@ -19,7 +10,7 @@ var _default = (0, _Types.codemod)({
           const annotation = node.bound.typeAnnotation;
 
           if (annotation.type === 'ObjectTypeAnnotation' && !annotation.inexact && annotation.properties.length === 0 && annotation.callProperties.length === 0 && annotation.indexers.length === 0 && annotation.internalSlots.length === 0) {
-            context.replaceNode(annotation, _hermesTransform.t.ObjectTypeAnnotation({
+            context.replaceNode(annotation, t.ObjectTypeAnnotation({
               properties: [],
               callProperties: [],
               exact: false,
@@ -33,6 +24,4 @@ var _default = (0, _Types.codemod)({
 
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/findFlowFiles.js

@@ -1,24 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findFlowFiles = findFlowFiles;
-exports.findFlowFilesWithSpinner = findFlowFilesWithSpinner;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _ora = _interopRequireDefault(require("ora"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+import path from 'path';
+import fs from 'fs-extra';
+import ora from 'ora';
+import chalk from 'chalk';
 const PRAGMA_BYTES = 5000;
-
-async function findFlowFiles({
+export async function findFlowFiles({
   includeNonAtFlow,
   rootDirectory
 }) {
@@ -27,14 +12,13 @@ async function findFlowFiles({
   return filePaths;
 
   async function processDirectory(directory) {
-    const fileNames = await _fsExtra.default.readdir(directory);
+    const fileNames = await fs.readdir(directory);
     await Promise.all(fileNames.map(fileName => processFilePath(directory, fileName)));
   }
 
   async function processFilePath(directory, fileName) {
-    const filePath = _path.default.join(directory, fileName);
-
-    const stats = await _fsExtra.default.lstat(filePath);
+    const filePath = path.join(directory, fileName);
+    const stats = await fs.lstat(filePath);
 
     if (stats.isDirectory()) {
       if (fileName !== 'node_modules' && fileName !== 'flow-typed' && fileName !== '__flowtests__') {
@@ -60,22 +44,21 @@ async function findFlowFiles({
       return;
     }
 
-    const file = await _fsExtra.default.open(filePath, 'r');
+    const file = await fs.open(filePath, 'r');
     const bytes = Math.min(PRAGMA_BYTES, fileByteSize);
     const buffer = Buffer.alloc(bytes);
-    await _fsExtra.default.read(file, buffer, 0, bytes, 0);
+    await fs.read(file, buffer, 0, bytes, 0);
 
     if (buffer.includes('@flow')) {
       filePaths.push(filePath);
     }
 
-    await _fsExtra.default.close(file);
+    await fs.close(file);
   }
 }
-
-async function findFlowFilesWithSpinner(rootDirectory, options) {
-  const spinner = (0, _ora.default)({
-    text: _chalk.default.italic.cyan('Finding all the Flow files to be upgraded...'),
+export async function findFlowFilesWithSpinner(rootDirectory, options) {
+  const spinner = ora({
+    text: chalk.italic.cyan('Finding all the Flow files to be upgraded...'),
     color: 'cyan',
     isSilent: options.silent
   });
@@ -94,7 +77,7 @@ async function findFlowFilesWithSpinner(rootDirectory, options) {
   spinner.stop();
 
   if (!options.silent) {
-    console.log(`Found ${_chalk.default.bold.cyan(filePaths.length)} Flow files.`);
+    console.log(`Found ${chalk.bold.cyan(filePaths.length)} Flow files.`);
     console.log();
   }
 

package/dist/runCodemods.js

@@ -1,27 +1,24 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = runCodemods;
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _hermesTransform = require("hermes-transform");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-async function runCodemods(codemods, filePaths, options) {
+import fs from 'fs-extra';
+import { transform } from 'hermes-transform';
+export default async function runCodemods(codemods, filePaths, options) {
   const results = await Promise.allSettled(filePaths.map(async filePath => {
-    const originalContents = await _fsExtra.default.readFile(filePath, 'utf8');
+    if (typeof require !== 'undefined' && require.cache) {
+      Object.keys(require.cache).forEach(key => {
+        if (key.includes('hermes-transform') || key.includes('prettier')) {
+          delete require.cache[key];
+        }
+      });
+    }
+
+    const originalContents = await fs.readFile(filePath, 'utf8');
     let contents = originalContents;
 
     for (const codemod of codemods) {
-      contents = await (0, _hermesTransform.transform)(contents, codemod.transform, options.prettierOptions);
+      contents = await transform(contents, codemod.transform, options.prettierOptions);
     }
 
     if (originalContents !== contents) {
-      await _fsExtra.default.writeFile(filePath, contents, 'utf8');
+      await fs.writeFile(filePath, contents, 'utf8');
     }
   }));
 }

package/dist/upgrade.js

@@ -1,53 +1,35 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = upgrade;
-
-var _semver = _interopRequireDefault(require("semver"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _ora = _interopRequireDefault(require("ora"));
-
-var _promptConfirm = _interopRequireDefault(require("prompt-confirm"));
-
-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 }; }
-
-async function upgrade(directory, currentVersion, nextVersion, options) {
+import semver from 'semver';
+import chalk from 'chalk';
+import ora from 'ora';
+import Confirm from 'prompt-confirm';
+import Styled from './Styled';
+import { findFlowFilesWithSpinner } from './findFlowFiles';
+import runCodemods from './runCodemods';
+import { VERSION_UPGRADES } from './upgrades';
+export default async function upgrade(directory, currentVersion, nextVersion, options) {
   const log = options.silent ? () => {} : (...messages) => console.log(...messages);
   const allUpgrades = [];
 
-  for (let i = 0; i < _upgrades.VERSION_UPGRADES.length; i++) {
+  for (let i = 0; i < VERSION_UPGRADES.length; i++) {
     const {
       version,
       upgrades
-    } = _upgrades.VERSION_UPGRADES[i];
+    } = VERSION_UPGRADES[i];
 
-    if (_semver.default.cmp(version, '>', nextVersion)) {
+    if (semver.cmp(version, '>', nextVersion)) {
       break;
     }
 
-    if (_semver.default.cmp(version, '>', currentVersion)) {
+    if (semver.cmp(version, '>', currentVersion)) {
       upgrades.forEach(upgrade => allUpgrades.push(upgrade));
     }
   }
 
   log();
-  log(_Styled.default.sectionHeader('flow-upgrade'));
+  log(Styled.sectionHeader('flow-upgrade'));
   log();
   {
-    const titleStyled = _chalk.default.bold('flow-upgrade');
-
+    const titleStyled = chalk.bold('flow-upgrade');
     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
@@ -65,28 +47,28 @@ 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.default.bold.magenta(currentVersion)}
-The Flow version you're upgrading to:   ${_chalk.default.bold.green(nextVersion)}
+The Flow version you're upgrading from: ${chalk.bold.magenta(currentVersion)}
+The Flow version you're upgrading to:   ${chalk.bold.green(nextVersion)}
 
-We will assume that your code is valid Flow ${_chalk.default.bold.magenta(currentVersion)} code.
+We will assume that your code is valid Flow ${chalk.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((u, i) => _Styled.default.upgradeTitle(u.title, i + 1)).join('\n')}
+${allUpgrades.map((u, i) => Styled.upgradeTitle(u.title, i + 1)).join('\n')}
 
-Today we will be upgrading all JavaScript files using Flow in: ${_chalk.default.bold.magenta(directory)}
+Today we will be upgrading all JavaScript files using Flow in: ${chalk.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);
     log(message);
   }
-  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.'));
+  const filePaths = await findFlowFilesWithSpinner(directory, options);
+  log(chalk.bold.red('Please review this information to make sure that it is correct before proceeding.'));
   log();
-  const answer = options.yes || (await new _promptConfirm.default('Are you ready to begin the upgrade?').run());
+  const answer = options.yes || (await new Confirm('Are you ready to begin the upgrade?').run());
 
   if (!answer) {
     log();
@@ -106,27 +88,27 @@ directories, in __flowtests__ directories, or files ending in -flowtest.js.
             codemods.push(allUpgrades.shift());
           }
 
-          log(_Styled.default.sectionHeader('Codemods'));
+          log(Styled.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(codemods.map((u, i) => Styled.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(Styled.divider());
           log();
           codemods.forEach((u, i) => {
-            log(_Styled.default.upgradeTitle(u.title, i + 1));
+            log(Styled.upgradeTitle(u.title, i + 1));
             log();
             log(u.describe);
             log();
-            log(_Styled.default.divider());
+            log(Styled.divider());
             log();
           });
-          log(`Running ${_chalk.default.bold.cyan(codemods.length)} codemods...`);
+          log(`Running ${chalk.bold.cyan(codemods.length)} codemods...`);
           log();
-          await (0, _runCodemods.default)(codemods, filePaths, options);
+          await runCodemods(codemods, filePaths, options);
           break;
         }
 

package/dist/upgrades/0.170.0/index.js

@@ -1,16 +1,5 @@
-"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 }; }
-
-var _default = {
+import removeDuplicateClassProperties from '../../codemods/removeDuplicateClassProperties';
+export default {
   version: '0.170.0',
-  upgrades: [_removeDuplicateClassProperties.default]
-};
-exports.default = _default;
+  upgrades: [removeDuplicateClassProperties]
+};

package/dist/upgrades/0.176.0/index.js

@@ -1,16 +1,5 @@
-"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 }; }
-
-var _default = {
+import removeAnnotationsInDestructuring from '../../codemods/removeAnnotationsInDestructuring';
+export default {
   version: '0.176.0',
-  upgrades: [_removeAnnotationsInDestructuring.default]
-};
-exports.default = _default;
+  upgrades: [removeAnnotationsInDestructuring]
+};

package/dist/upgrades/0.201.0/index.js

@@ -1,16 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _renamePartial = _interopRequireDefault(require("../../codemods/renamePartial"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = {
+import renamePartial from '../../codemods/renamePartial';
+export default {
   version: '0.201.0',
-  upgrades: [_renamePartial.default]
-};
-exports.default = _default;
+  upgrades: [renamePartial]
+};

package/dist/upgrades/0.84.0/index.js

@@ -1,16 +1,5 @@
-"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 }; }
-
-var _default = {
+import convertImplicitInexactObjectTypes from '../../codemods/convertImplicitInexactObjectTypes';
+export default {
   version: '0.84.0',
-  upgrades: [_convertImplicitInexactObjectTypes.default]
-};
-exports.default = _default;
+  upgrades: [convertImplicitInexactObjectTypes]
+};

package/dist/upgrades/index.js

@@ -1,19 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.VERSION_UPGRADES = void 0;
-
-var _ = _interopRequireDefault(require("./0.84.0"));
-
-var _2 = _interopRequireDefault(require("./0.170.0"));
-
-var _3 = _interopRequireDefault(require("./0.176.0"));
-
-var _4 = _interopRequireDefault(require("./0.201.0"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const VERSION_UPGRADES = [_.default, _2.default, _3.default, _4.default];
-exports.VERSION_UPGRADES = VERSION_UPGRADES;
+import v0_84_0 from './0.84.0';
+import v0_170_0 from './0.170.0';
+import v0_176_0 from './0.176.0';
+import v0_201_0 from './0.201.0';
+export const VERSION_UPGRADES = [v0_84_0, v0_170_0, v0_176_0, v0_201_0];

package/dist/utils/redirectConsole.js

@@ -1,25 +1,13 @@
 '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; }
-
+import * as util from 'util';
 const oldConsole = {
   error: console.error,
   info: console.info,
   log: console.log,
   warn: console.warn
 };
-
-function redirectConsole(reporter_) {
+export function redirectConsole(reporter_) {
   const reporter = typeof reporter_ === 'function' ? reporter_(oldConsole) : reporter_;
 
   console.log = (...args) => {
@@ -38,8 +26,7 @@ function redirectConsole(reporter_) {
     reporter.onStderr(util.format(...args));
   };
 }
-
-function restoreConsole() {
+export function restoreConsole() {
   for (const [name, fn] of Object.entries(oldConsole)) {
     console[name] = fn;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-upgrade",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "A utility for upgrading your codebase to the latest version of Flow.",
   "engines": {
     "node": ">=14"
@@ -30,15 +30,15 @@
   "homepage": "https://github.com/facebook/flow/tree/master/packages/flow-upgrade#readme",
   "dependencies": {
     "@babel/highlight": "^7.18.6",
-    "babel-plugin-syntax-hermes-parser": "0.24.0",
+    "babel-plugin-syntax-hermes-parser": "0.33.3",
     "chalk": "^2.0.1",
     "fs-extra": "10.1.0",
-    "hermes-estree": "0.24.0",
-    "hermes-parser": "0.24.0",
-    "hermes-transform": "0.24.0",
+    "hermes-estree": "0.33.3",
+    "hermes-parser": "0.33.3",
+    "hermes-transform": "0.33.3",
     "klaw-sync": "^6.0.0",
     "ora": "^5.4.1",
-    "prettier-plugin-hermes-parser": "0.24.0",
+    "prettier-plugin-hermes-parser": "0.29.1",
     "prompt-confirm": "^1.2.0",
     "semver": "^7.3.7",
     "yargs": "^17.0.1"