flow-upgrade 2.6.0 → 2.7.1

package/README.md

@@ -113,3 +113,16 @@ Converts:
 - `React.ElementConfig<React.AbstractComponent<Props, Instance>>` to `Props`
 - `React.ElementRef<React.AbstractComponent<Props, Instance>>` to `Instance`
 - `React.ElementRef<React.AbstractComponent<Props>` to `mixed`
+
+### Convert legacy Flow utility types to modern equivalents
+Converts legacy Flow utility types to TypeScript-compatible equivalents:
+- `$NonMaybeType<T>` to `NonNullable<T>`
+- `$ReadOnly<T>` to `Readonly<T>`
+- `$ReadOnlyArray<T>` to `ReadonlyArray<T>`
+- `$ReadOnlyMap<K, V>` to `ReadonlyMap<K, V>`
+- `$ReadOnlySet<T>` to `ReadonlySet<T>`
+- `$Keys<T>` to `keyof T`
+- `$Values<T>` to `Values<T>`
+- `mixed` to `unknown`
+
+Run with `yarn run flow-codemod convertLegacyUtilityTypes`.

package/dist/bin/runSpecificCodemod.js

@@ -7,8 +7,6 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _yargs = _interopRequireDefault(require("yargs/yargs"));
 
-var _upgrade = _interopRequireDefault(require("../upgrade"));
-
 var _path = _interopRequireDefault(require("path"));
 
 var _findFlowFiles = require("../findFlowFiles");
@@ -19,9 +17,7 @@ var _Styled = _interopRequireDefault(require("../Styled"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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; }
+require('../upgrade');
 
 const CODEMOD_DIR = _path.default.resolve(__dirname, '..', 'codemods');
 
@@ -72,7 +68,7 @@ async function main(args) {
     const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options);
     const {
       default: upgrade
-    } = await Promise.resolve(`${CODEMOD_DIR}/${codemodName}.js`).then(s => _interopRequireWildcard(require(s)));
+    } = await import(`${CODEMOD_DIR}/${codemodName}.js`);
 
     if (!options.silent) {
       console.log(_Styled.default.sectionHeader('Codemods'));

package/dist/bin/upgrade.js

@@ -7,10 +7,10 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _yargs = _interopRequireDefault(require("yargs/yargs"));
 
-var _upgrade = _interopRequireDefault(require("../upgrade"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+require('../upgrade');
+
 async function main(args) {
   const yargs = (0, _yargs.default)(args).usage('Usage: flow-upgrade <current version> <target version>').positional('current version', {
     describe: 'Your current flow version'
@@ -52,7 +52,7 @@ async function main(args) {
   const toVersion = yargs._[1];
 
   try {
-    await (0, _upgrade.default)(process.cwd(), fromVersion, toVersion, options);
+    await upgrade(process.cwd(), fromVersion, toVersion, options);
   } catch (error) {
     console.error(_chalk.default.red(error ? error.stack || error : error));
   }

package/dist/codemods/convertLegacyUtilityTypes.js

@@ -0,0 +1,82 @@
+"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)({
+  title: 'Convert legacy Flow utility types to modern equivalents',
+  describe: `
+Transforms legacy Flow utility types to TypeScript-compatible types:
+- \`$NonMaybeType<T>\` -> \`NonNullable<T>\`
+- \`$ReadOnly<T>\` -> \`Readonly<T>\`
+- \`$ReadOnlyArray<T>\` -> \`ReadonlyArray<T>\`
+- \`$ReadOnlyMap<K, V>\` -> \`ReadonlyMap<K, V>\`
+- \`$ReadOnlySet<T>\` -> \`ReadonlySet<T>\`
+- \`$Keys<T>\` -> \`keyof T\`
+- \`$Values<T>\` -> \`Values<T>\`
+- \`mixed\` -> \`unknown\``,
+  transform: context => {
+    return {
+      MixedTypeAnnotation(node) {
+        const newNode = _hermesTransform.t.GenericTypeAnnotation({
+          id: _hermesTransform.t.Identifier({
+            name: 'unknown'
+          })
+        });
+
+        context.replaceNode(node, newNode, {
+          keepComments: true
+        });
+      },
+
+      GenericTypeAnnotation(node) {
+        const id = node.id;
+
+        if (id.type !== 'Identifier') {
+          return;
+        }
+
+        const typeName = id.name;
+
+        if (typeName === '$Keys') {
+          if (node.typeParameters && node.typeParameters.params && node.typeParameters.params.length === 1) {
+            const newNode = _hermesTransform.t.KeyofTypeAnnotation({
+              argument: node.typeParameters.params[0]
+            });
+
+            context.replaceNode(node, newNode, {
+              keepComments: true
+            });
+          }
+
+          return;
+        }
+
+        const typeMap = {
+          $NonMaybeType: 'NonNullable',
+          $ReadOnly: 'Readonly',
+          $ReadOnlyArray: 'ReadonlyArray',
+          $ReadOnlyMap: 'ReadonlyMap',
+          $ReadOnlySet: 'ReadonlySet',
+          $Values: 'Values'
+        };
+        const modernType = typeMap[typeName];
+
+        if (modernType) {
+          context.modifyNodeInPlace(node.id, {
+            name: modernType
+          });
+        }
+      }
+
+    };
+  }
+});
+
+exports.default = _default;

package/dist/codemods/removeDuplicateClassProperties.js

@@ -148,9 +148,7 @@ var _default = (0, _Types.codemod)({
         }
 
         for (const memberToDelete of toDelete) {
-          var _memberToDelete$value;
-
-          if (memberToDelete.type === 'PropertyDefinition' && ((_memberToDelete$value = memberToDelete.value) === null || _memberToDelete$value === void 0 ? void 0 : _memberToDelete$value.type) === 'CallExpression') {
+          if (memberToDelete.type === 'PropertyDefinition' && memberToDelete.value?.type === 'CallExpression') {
             console.log(context.buildCodeFrame(memberToDelete.value, 'Deleted a property with a CallExpression value. You should double check this was safe.'));
           }
 
@@ -202,7 +200,7 @@ var _default = (0, _Types.codemod)({
         const subjectName = node.property.name;
         const member = instanceMembers.get(subjectName);
 
-        if ((member === null || member === void 0 ? void 0 : member.kind) !== 'Method') {
+        if (member?.kind !== 'Method') {
           return;
         }
 
@@ -231,12 +229,8 @@ var _default = (0, _Types.codemod)({
       },
 
       'ClassDeclaration, ClassExpression:exit'(node) {
-        var _classStack;
-
-        if (classStack && ((_classStack = classStack) === null || _classStack === void 0 ? void 0 : _classStack.current) === node) {
-          var _classStack2;
-
-          classStack = (_classStack2 = classStack) === null || _classStack2 === void 0 ? void 0 : _classStack2.parent;
+        if (classStack && classStack?.current === node) {
+          classStack = classStack?.parent;
         }
       }
 

package/dist/runCodemods.js

@@ -13,6 +13,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 async function runCodemods(codemods, filePaths, options) {
   const results = await Promise.allSettled(filePaths.map(async filePath => {
+    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 _fsExtra.default.readFile(filePath, 'utf8');
     let contents = originalContents;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-upgrade",
-  "version": "2.6.0",
+  "version": "2.7.1",
   "description": "A utility for upgrading your codebase to the latest version of Flow.",
   "engines": {
     "node": ">=14"
@@ -14,7 +14,7 @@
     "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__' --plugins=@babel/plugin-transform-modules-commonjs",
     "test": "jest",
     "flow": "flow",
     "prepublish": "yarn run build",
@@ -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"
@@ -54,6 +54,7 @@
     "flow-bin": "^0.227.0",
     "jest": "^27.5.1",
     "memfs": "^3.4.3",
-    "prettier": "2.8.8"
+    "prettier": "2.8.8",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.0"
   }
 }