flow-upgrade 2.34.0 → 2.36.0

package/dist/Styled.js

@@ -1,23 +1,18 @@
 "use strict";
 
 const chalk = require('chalk');
-
 exports.divider = function divider() {
   return chalk.grey(Array(80).fill('=').join(''));
 };
-
 exports.sectionHeader = function sectionHeader(header) {
   return chalk.bold(`# ${header}`);
 };
-
 exports.upgradeTitle = function upgradeTitle(title, n) {
   return chalk.bold(`${chalk.grey(`${n}.`)} ${chalk.blue(title)}`);
 };
-
 exports.codeblock = function codeblock(code) {
   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 => item.split('\n').map((line, i) => `${i === 0 ? chalk.grey('- ') : '  '}${line}`).join('\n')).join('\n');
 };

package/dist/Types.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.codemod = codemod;
-
 function codemod(config) {
-  return { ...config,
+  return {
+    ...config,
     kind: 'codemod'
   };
 }

package/dist/bin/runSpecificCodemod.js

@@ -2,34 +2,20 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 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");
-
 var _runCodemods = _interopRequireDefault(require("../runCodemods"));
-
 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; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const CODEMOD_DIR = _path.default.resolve(__dirname, '..', 'codemods');
-
 async function main(args) {
   const codemodNames = _fsExtra.default.readdirSync(CODEMOD_DIR, {
     withFileTypes: false
   }).map(f => _path.default.parse(f).name);
-
   const yargs = (0, _yargs.default)(args).usage('Usage: flow-upgrade-codemod <codemod name>').positional('codemod name', {
     describe: 'Your current flow version',
     choices: codemodNames
@@ -56,7 +42,6 @@ async function main(args) {
     if (!yargs.prettierrc) {
       return {};
     }
-
     return _fsExtra.default.readJSON(yargs.prettierrc);
   })();
   const options = {
@@ -67,13 +52,11 @@ async function main(args) {
   };
   const codemodName = yargs._[0];
   const directory = process.cwd();
-
   try {
     const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options);
     const {
       default: upgrade
     } = await Promise.resolve(`${CODEMOD_DIR}/${codemodName}.js`).then(s => _interopRequireWildcard(require(s)));
-
     if (!options.silent) {
       console.log(_Styled.default.sectionHeader('Codemods'));
       console.log();
@@ -88,12 +71,10 @@ async function main(args) {
       console.log(`Running ${_chalk.default.bold.cyan(1)} codemod...`);
       console.log();
     }
-
     switch (upgrade.kind) {
       case 'codemod':
         await (0, _runCodemods.default)([upgrade], filePaths, options);
         break;
-
       default:
         throw new Error(`Unexpected upgrade kind: '${upgrade.kind}'`);
     }
@@ -101,5 +82,4 @@ async function main(args) {
     console.error(_chalk.default.red(error ? error.stack || error : error));
   }
 }
-
 void main(process.argv.slice(2));

package/dist/bin/upgrade.js

@@ -2,15 +2,10 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 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 }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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'
@@ -39,7 +34,6 @@ async function main(args) {
     if (!yargs.prettierrc) {
       return {};
     }
-
     return _fsExtra.default.readJSON(yargs.prettierrc);
   })();
   const options = {
@@ -50,12 +44,10 @@ async function main(args) {
   };
   const fromVersion = yargs._[0];
   const toVersion = yargs._[1];
-
   try {
     await (0, _upgrade.default)(process.cwd(), fromVersion, toVersion, options);
   } catch (error) {
     console.error(_chalk.default.red(error ? error.stack || error : error));
   }
 }
-
 void main(process.argv.slice(2));

package/dist/codemodUtils/getClassMemberName.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getClassMemberName = getClassMemberName;
-
 function getClassMemberName(member) {
   if (member.key.type === 'PrivateIdentifier') {
     return `#${member.key.name}`;
   }
-
   if (member.computed === true || member.key.type !== 'Identifier') {
     return null;
   }
-
   return member.key.name;
 }

package/dist/codemodUtils/replaceMethodWithArrowProp.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.replaceMethodWithArrowProp = replaceMethodWithArrowProp;
-
 var _hermesTransform = require("hermes-transform");
-
 function replaceMethodWithArrowProp(context, method, name) {
   context.replaceNode(method, _hermesTransform.t.PropertyDefinition({
     computed: false,

package/dist/codemods/collapseObjectInitialization.js

@@ -4,103 +4,79 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _hermesTransform = require("hermes-transform");
-
 var _Types = require("../Types");
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Collapse Object Initialization',
   describe: 'Converts static object assignments to inline properties',
   transform: context => {
     function getStatementContainerArray(stmtNode) {
       const parent = stmtNode.parent;
-
       switch (parent.type) {
         case 'SwitchCase':
           {
             return parent.consequent;
           }
-
         case 'BlockStatement':
           {
             return parent.body;
           }
-
         case 'Program':
           {
             return parent.body;
           }
-
         default:
           return null;
       }
     }
-
     function getNextSibling(node) {
       if (node == null) {
         return null;
       }
-
       const parentContainer = getStatementContainerArray(node);
-
       if (parentContainer == null) {
         return null;
       }
-
       const nodeIndex = parentContainer.indexOf(node);
-
       if (nodeIndex === -1) {
         return null;
       }
-
       return parentContainer[nodeIndex + 1];
     }
-
     function containsReference(node, references) {
       return references.some(reference => {
         const refRange = reference.identifier.range;
         return node.range[0] <= refRange[0] && refRange[1] <= node.range[1];
       });
     }
-
     function processStmtNode(idNode, references, stmtNode) {
       if (stmtNode.type !== 'ExpressionStatement') {
         return {
           type: 'abort'
         };
       }
-
       const exprNode = stmtNode.expression;
-
       if (exprNode.type !== 'AssignmentExpression') {
         return {
           type: 'abort'
         };
       }
-
       const leftNode = exprNode.left;
-
       if (leftNode.type !== 'MemberExpression') {
         return {
           type: 'abort'
         };
       }
-
       const exprRightNode = exprNode.right;
-
       if (containsReference(exprRightNode, references)) {
         return {
           type: 'abort'
         };
       }
-
       const memberObjectNode = leftNode.object;
       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;
-
         const property = _hermesTransform.t.Property({
           key: memberPropertyNode,
           value: exprRightNode,
@@ -109,7 +85,6 @@ var _default = (0, _Types.codemod)({
           method: false,
           shorthand
         });
-
         return {
           type: 'property',
           keyName: memberPropertyNode.name,
@@ -117,67 +92,50 @@ var _default = (0, _Types.codemod)({
           computed: leftNode.computed
         };
       }
-
       return {
         type: 'abort'
       };
     }
-
     function isWriteToObject(ref) {
       let currNode = ref.identifier;
-
       while (currNode.parent.type === 'MemberExpression' && currNode.parent.object === currNode) {
         currNode = currNode.parent;
       }
-
       return currNode.parent.type === 'AssignmentExpression';
     }
-
     return {
       VariableDeclarator(node) {
         const initNode = node.init;
-
         if (initNode == null || initNode.type !== 'ObjectExpression' || initNode.properties.length > 0) {
           return;
         }
-
         const idNode = node.id;
-
         if (idNode.type !== 'Identifier' || idNode.typeAnnotation != null) {
           return;
         }
-
         const stmtNode = node.parent;
-
         if (stmtNode.type !== 'VariableDeclaration') {
           throw new Error(context.buildCodeFrame(stmtNode, `This is not right, parent of VariableDeclarator should always be a VariableDeclaration, instead got a "${stmtNode.type}"`));
         }
-
         const binding = context.getBinding(idNode.name);
-
         if (binding == null) {
           throw new Error(context.buildCodeFrame(idNode, `No binding found for node of name "${idNode.name}"`));
         }
-
         let nextStmtNode = stmtNode;
         let finish = false;
         const objectProperties = [];
-
         while (finish !== true && (nextStmtNode = getNextSibling(nextStmtNode)) && nextStmtNode != null) {
           const out = processStmtNode(idNode, binding.references, nextStmtNode);
-
           switch (out.type) {
             case 'abort':
               {
                 finish = true;
                 break;
               }
-
             case 'skip':
               {
                 break;
               }
-
             case 'property':
               {
                 const {
@@ -189,36 +147,28 @@ var _default = (0, _Types.codemod)({
               }
           }
         }
-
         if (objectProperties.length > 0) {
           const assignmentRefsCount = binding.references.reduce((acc, ref) => {
             if (isWriteToObject(ref)) {
               return acc + 1;
             }
-
             return acc;
           }, 0);
-
           if (assignmentRefsCount !== objectProperties.length) {
             console.error(context.buildCodeFrame(stmtNode, 'Object had non inlinable and inlineable properties'));
           }
-
           const keyNames = new Set();
-
           for (const [{
             keyName,
             computed
           }, _] of objectProperties) {
             const name = `${computed ? 'c' : 'v'}-${keyName}`;
-
             if (keyNames.has(name)) {
               console.error(context.buildCodeFrame(stmtNode, `Object has duplicate key of "${keyName}"`));
               return;
             }
-
             keyNames.add(name);
           }
-
           const newProperties = objectProperties.map(([{
             property
           }, _]) => property);
@@ -230,9 +180,6 @@ var _default = (0, _Types.codemod)({
           });
         }
       }
-
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/convertImplicitInexactObjectTypes.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Types = require("../Types");
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Make implicitly inexact object types explicitly inexact',
   describe: 'Convert implicitly inexact object type syntax `{}` to explicitly inexact `{...}`',
   transform: context => {
@@ -17,9 +15,6 @@ var _default = (0, _Types.codemod)({
           inexact: true
         });
       }
-
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/convertLegacyUtilityTypes.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Types = require("../Types");
-
 var _hermesTransform = require("hermes-transform");
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Convert legacy Flow utility types to modern equivalents',
   describe: `
 Transforms legacy Flow utility types to TypeScript-compatible types:
@@ -29,35 +26,27 @@ Transforms legacy Flow utility types to TypeScript-compatible types:
             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',
@@ -67,16 +56,12 @@ Transforms legacy Flow utility types to TypeScript-compatible types:
           $Values: 'Values'
         };
         const modernType = typeMap[typeName];
-
         if (modernType) {
           context.modifyNodeInPlace(node.id, {
             name: modernType
           });
         }
       }
-
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/convertShapeToPartial.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Types = require("../Types");
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Convert `$Shape` to `Partial`',
   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 => {
@@ -17,9 +15,6 @@ var _default = (0, _Types.codemod)({
           name: 'Partial'
         });
       }
-
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/eliminateAbstractComponent.js

@@ -4,24 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Types = require("../Types");
-
 var _hermesTransform = require("hermes-transform");
-
 function eliminateAbstractComponent(node) {
   const {
     id: maybeQualifiedIdentifier,
     typeParameters
   } = node;
-
   if (maybeQualifiedIdentifier.type === 'QualifiedTypeIdentifier' && maybeQualifiedIdentifier.qualification.name === 'React' && maybeQualifiedIdentifier.id.name === 'AbstractComponent' && typeParameters != null) {
     const [config, instance, renders] = typeParameters.params;
-
     if (renders != null) {
       return null;
     }
-
     if (instance == null || instance.type === 'MixedTypeAnnotation') {
       return _hermesTransform.t.GenericTypeAnnotation({
         id: _hermesTransform.t.QualifiedTypeIdentifier({
@@ -37,26 +31,20 @@ function eliminateAbstractComponent(node) {
         })
       });
     }
-
     return null;
   }
-
   if (maybeQualifiedIdentifier.type === 'QualifiedTypeIdentifier' && maybeQualifiedIdentifier.qualification.name === 'React' && maybeQualifiedIdentifier.id.name === 'ElementConfig' && typeParameters != null && typeParameters.params.length === 1 && typeParameters.params[0].type === 'GenericTypeAnnotation' && typeParameters.params[0].id.type === 'QualifiedTypeIdentifier' && typeParameters.params[0].id.qualification.name === 'React' && typeParameters.params[0].id.id.name === 'AbstractComponent' && typeParameters.params[0].typeParameters != null && typeParameters.params[0].typeParameters.params.length >= 1) {
     return typeParameters.params[0].typeParameters.params[0];
   }
-
   if (maybeQualifiedIdentifier.type === 'QualifiedTypeIdentifier' && maybeQualifiedIdentifier.qualification.name === 'React' && maybeQualifiedIdentifier.id.name === 'ElementRef' && typeParameters != null && typeParameters.params.length === 1 && typeParameters.params[0].type === 'GenericTypeAnnotation' && typeParameters.params[0].id.type === 'QualifiedTypeIdentifier' && typeParameters.params[0].id.qualification.name === 'React' && typeParameters.params[0].id.id.name === 'AbstractComponent' && typeParameters.params[0].typeParameters != null && typeParameters.params[0].typeParameters.params.length >= 2) {
     return typeParameters.params[0].typeParameters.params[1];
   }
-
   if (maybeQualifiedIdentifier.type === 'QualifiedTypeIdentifier' && maybeQualifiedIdentifier.qualification.name === 'React' && maybeQualifiedIdentifier.id.name === 'ElementRef' && typeParameters != null && typeParameters.params.length === 1 && typeParameters.params[0].type === 'GenericTypeAnnotation' && typeParameters.params[0].id.type === 'QualifiedTypeIdentifier' && typeParameters.params[0].id.qualification.name === 'React' && typeParameters.params[0].id.id.name === 'AbstractComponent' && typeParameters.params[0].typeParameters != null && typeParameters.params[0].typeParameters.params.length === 1) {
     return _hermesTransform.t.MixedTypeAnnotation({});
   }
-
   return null;
 }
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Eliminate `React.AbstractComponent<...>`',
   describe: `
 - \`React.AbstractComponent<Props>\` -> \`React.ComponentType<Props>\`
@@ -67,16 +55,12 @@ var _default = (0, _Types.codemod)({
     return {
       GenericTypeAnnotation(node) {
         const replacement = eliminateAbstractComponent(node);
-
         if (replacement) {
           context.replaceNode(node, replacement, {
             keepComments: true
           });
         }
       }
-
     };
   }
-});
-
-exports.default = _default;
+});

package/dist/codemods/removeAnnotationsInDestructuring.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Types = require("../Types");
-
-var _default = (0, _Types.codemod)({
+var _default = exports.default = (0, _Types.codemod)({
   title: 'Remove Annotations In Destructuring',
   describe: 'Remove annotations nested inside of destructuring. These are not valid Flow syntax.',
   transform: context => {
@@ -17,15 +15,11 @@ var _default = (0, _Types.codemod)({
           typeAnnotation: null
         });
       },
-
       ':matches(ArrayPattern, ObjectPattern) > :matches(RestElement, Property) > [typeAnnotation!=null]'(node) {
         context.modifyNodeInPlace(node, {
           typeAnnotation: null
         });
       }
-
     };
   }
-});
-
-exports.default = _default;
+});