From 39d66c438c54703853c199bc97bbd4511e14a135 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 15:58:20 -0400
Subject: [PATCH 01/50] update to handle null expression and deploy to git

---
 common.ts                   | 2 +-
 package.json                | 4 +++-
 require-usememo-children.ts | 2 +-
 require-usememo.ts          | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common.ts b/common.ts
index 4512d15..4fb0bc2 100644
--- a/common.ts
+++ b/common.ts
@@ -61,7 +61,7 @@ export function getExpressionMemoStatus(
   context: Rule.RuleContext,
   expression: TSESTree.Expression
 ): MemoStatus {
-  switch (expression.type) {
+  switch (expression?.type) {
     case "ObjectExpression":
       return MemoStatus.UnmemoizedObject;
     case "ArrayExpression":
diff --git a/package.json b/package.json
index 471d2f5..c9ff39f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,9 @@
     "test": "jest",
     "build": "rm -rf dist && rollup -c",
     "prepublish:public": "npm run build && npm run bump-version",
-    "publish:public": "npm publish --access public"
+    "publish:public": "npm publish --access public",
+    "deploy": "yarn build && yarn publish-git",
+    "publish-git": "gitpkg publish"
   },
   "files": [
     "dist"
diff --git a/require-usememo-children.ts b/require-usememo-children.ts
index 209a3d5..0b1d7cd 100644
--- a/require-usememo-children.ts
+++ b/require-usememo-children.ts
@@ -58,7 +58,7 @@ const rule: Rule.RuleModule = {
           }
           if (child.type === "JSXExpressionContainer") {
             const { expression } = child;
-            if (expression.type !== "JSXEmptyExpression") {
+            if (expression?.type !== "JSXEmptyExpression") {
               switch (getExpressionMemoStatus(context, expression)) {
                 case MemoStatus.UnmemoizedObject:
                   report(node, "object-usememo-children");
diff --git a/require-usememo.ts b/require-usememo.ts
index 7702d72..2f24d12 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -77,7 +77,7 @@ const rule: Rule.RuleModule = {
         if (!isComplexComponent(parent)) return;
         if (value.type === "JSXExpressionContainer") {
           const { expression } = value;
-          if (expression.type !== "JSXEmptyExpression") {
+          if (expression?.type !== "JSXEmptyExpression") {
             switch (getExpressionMemoStatus(context, expression)) {
               case MemoStatus.UnmemoizedObject:
                 report(node, "object-usememo-props");

From 7a9693f829c715403963db594aadf1523d9f4237 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 15:59:47 -0400
Subject: [PATCH 02/50] forgot gitpkg

---
 package.json |   5 +-
 yarn.lock    | 334 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 329 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index c9ff39f..88d9bb2 100644
--- a/package.json
+++ b/package.json
@@ -32,5 +32,8 @@
   },
   "files": [
     "dist"
-  ]
+  ],
+  "dependencies": {
+    "gitpkg": "^1.0.0-beta.2"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index d005058..df6b1d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -615,6 +615,14 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/glob@^7.1.1":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
+  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/graceful-fs@^4.1.2":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -662,6 +670,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
+"@types/minimatch@*":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
 "@types/node@*":
   version "14.14.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
@@ -778,6 +791,14 @@ acorn@^7.1.0, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -998,6 +1019,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1018,6 +1044,20 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1091,6 +1131,14 @@ buffer-from@1.x, buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 builtin-modules@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
@@ -1138,7 +1186,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1163,6 +1211,11 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -1178,6 +1231,23 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.2.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -1187,6 +1257,11 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -1355,6 +1430,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -1377,6 +1459,20 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+del@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
+  integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
+  dependencies:
+    globby "^10.0.1"
+    graceful-fs "^4.2.2"
+    is-glob "^4.0.1"
+    is-path-cwd "^2.2.0"
+    is-path-inside "^3.0.1"
+    p-map "^3.0.0"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1436,7 +1532,7 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-end-of-stream@^1.1.0:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -1634,6 +1730,21 @@ execa@^3.2.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -1713,6 +1824,17 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.0.3:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.1.1:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
@@ -1820,6 +1942,11 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -1881,7 +2008,39 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0:
+git-remote-origin-url@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-3.1.0.tgz#c90c1cb0f66658566bbc900509ab093a1522d2b3"
+  integrity sha512-yVSfaTMO7Bqk6Xx3696ufNfjdrajX7Ig9GuAeO2V3Ji7stkDoBNFldnWIAsy0qviUd0Z+X2P6ziJENKztW7cBQ==
+  dependencies:
+    gitconfiglocal "^2.1.0"
+
+gitconfiglocal@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz#07c28685c55cc5338b27b5acbcfe34aeb92e43d1"
+  integrity sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==
+  dependencies:
+    ini "^1.3.2"
+
+gitpkg@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gitpkg/-/gitpkg-1.0.0-beta.2.tgz#afb8cc99fc38ebe60497d35ea13d323fc88377e8"
+  integrity sha512-ASD0wK+xDx/mPWwasUIKD6o0gKCwhY1KyfNkeTjmjMXHNGMTz1I344D4V+ndFlZPdUccdrMyxHD7XB99+Kl7Ag==
+  dependencies:
+    bluebird "^3.7.2"
+    chalk "^3.0.0"
+    del "^5.1.0"
+    end-of-stream "^1.4.4"
+    execa "^4.0.0"
+    find-up "^4.1.0"
+    git-remote-origin-url "^3.1.0"
+    make-dir "^3.0.2"
+    ora "^4.0.3"
+    semver "^7.1.3"
+    tar-fs "^2.0.1"
+    yargs "^15.3.1"
+
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -1919,6 +2078,20 @@ globals@^13.6.0:
   dependencies:
     type-fest "^0.20.2"
 
+globby@^10.0.1:
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
+
 globby@^11.0.1:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
@@ -1931,6 +2104,11 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+graceful-fs@^4.2.2:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
 graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -2040,12 +2218,17 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4:
+ignore@^5.1.1, ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -2071,6 +2254,11 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -2079,11 +2267,16 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2:
+inherits@2, inherits@^2.0.3, inherits@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@^1.3.2:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -2198,6 +2391,11 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -2215,6 +2413,16 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-cwd@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-inside@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -2882,6 +3090,13 @@ lodash@4.x, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+  dependencies:
+    chalk "^2.4.2"
+
 lolex@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
@@ -2896,7 +3111,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-make-dir@^3.0.0:
+make-dir@^3.0.0, make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -2932,7 +3147,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -2964,6 +3179,14 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 mime-db@1.46.0:
   version "1.46.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
@@ -3001,6 +3224,11 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp@1.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -3016,6 +3244,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -3176,6 +3409,20 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
+ora@^4.0.3:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.1.1.tgz#566cc0348a15c36f5f0e979612842e02ba9dddbc"
+  integrity sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==
+  dependencies:
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.2.0"
+    is-interactive "^1.0.0"
+    log-symbols "^3.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 p-each-series@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -3205,6 +3452,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-map@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -3277,6 +3531,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
 pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
@@ -3401,6 +3660,15 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
+readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 realpath-native@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
@@ -3526,6 +3794,14 @@ resolve@^1.10.0, resolve@^1.17.0, resolve@^1.19.0:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -3562,7 +3838,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3611,7 +3887,7 @@ saxes@^3.1.9:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.x, semver@^7.2.1, semver@^7.3.2:
+semver@7.x, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -3850,6 +4126,13 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -3921,6 +4204,27 @@ table@^6.0.4:
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
 
+tar-fs@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -4140,6 +4444,11 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
+util-deprecate@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
@@ -4199,6 +4508,13 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"

From 445c1a287a1ee137e4b78ef738638adb307a7de4 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 16:56:01 -0400
Subject: [PATCH 03/50] testing fixer

---
 package.json    | 2 +-
 require-memo.ts | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 88d9bb2..2b571e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",
diff --git a/require-memo.ts b/require-memo.ts
index 8209011..401ce8d 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -47,7 +47,14 @@ function checkFunction(
     const { id } = currentNode;
     if (id.type === "Identifier") {
       if (componentNameRegex.test(id.name)) {
-        context.report({ node, messageId: "memo-required" });
+        context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+          let scope = node.parent;
+
+          // const sourceCode = context.getSourceCode()
+          // let fixedCode = sourceCode.getText(undefined) + ' === null';
+
+          return fixer.replaceText(scope, '');
+      } });
       }
     }
   } else if (

From d0a895d2e49032c2ef931f616b087a8340ce0678 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 16:59:26 -0400
Subject: [PATCH 04/50] added version bump script

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2b571e1..ece167a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "prepublish:public": "npm run build && npm run bump-version",
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
-    "publish-git": "gitpkg publish"
+    "publish-git": "gitpkg publish",
+    "version-bump": "npm version patch && git add * && git commit -m \"version-bump\" && git push"
   },
   "files": [
     "dist"

From 89b40d6d2696862d79c65363056eebf67195a423 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 16:59:30 -0400
Subject: [PATCH 05/50] 0.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ece167a..a5b5395 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From d82589fe8ed0e0cb7a058d2726d92c40eb28a545 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 16:59:51 -0400
Subject: [PATCH 06/50] oops

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5b5395..d0f0598 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
-    "version-bump": "npm version patch && git add * && git commit -m \"version-bump\" && git push"
+    "version-bump": "npm version patch && git add . && git commit -m \"version-bump\" && git push"
   },
   "files": [
     "dist"

From 69128d1beb69b6e84e2bbfdfc2ecc3cb577efea4 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 16:59:57 -0400
Subject: [PATCH 07/50] 0.0.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d0f0598..d4796dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 9f54aa19c680ce4cb3de787e3a2299d1efaad6ee Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:00:23 -0400
Subject: [PATCH 08/50] allow-empty

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4796dd..e935b61 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
-    "version-bump": "npm version patch && git add . && git commit -m \"version-bump\" && git push"
+    "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\" && git push"
   },
   "files": [
     "dist"

From 8409b9e79a6a83c68df51a2aa8f95edd4662e33a Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:00:27 -0400
Subject: [PATCH 09/50] 0.0.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e935b61..8e9baf2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 36cf8343bf5e07cbf56938b6e371ecbea53592d5 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:00:27 -0400
Subject: [PATCH 10/50] version-bump


From 52261127162a2459b04cabe665542b07a68600ed Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:02:37 -0400
Subject: [PATCH 11/50] bump version

---
 package.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8e9baf2..e126402 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.7",
+  "version": "0.1.0",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",
@@ -29,7 +29,9 @@
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
-    "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\" && git push"
+    "version": "",
+    "postversion": "git push && git push --tags && npm publish",
+    "version-bump": "npm version minor --force -m \"bump version\""
   },
   "files": [
     "dist"

From d5cec89070c1bf73e1e1696e677015b5d7c30415 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:03:18 -0400
Subject: [PATCH 12/50] bump version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e126402..27bf9d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",
@@ -30,7 +30,7 @@
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
     "version": "",
-    "postversion": "git push && git push --tags && npm publish",
+    "postversion": "git push && git push --tags",
     "version-bump": "npm version minor --force -m \"bump version\""
   },
   "files": [

From 53abc681ae06acf9df12484682822ae9c73044b5 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:03:52 -0400
Subject: [PATCH 13/50] more version bump

---
 package.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 27bf9d8..8e9baf2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.2.0",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",
@@ -29,9 +29,7 @@
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
-    "version": "",
-    "postversion": "git push && git push --tags",
-    "version-bump": "npm version minor --force -m \"bump version\""
+    "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\" && git push"
   },
   "files": [
     "dist"

From b9c62efa95b45afa3cfe931b904151c4bd315072 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:03:55 -0400
Subject: [PATCH 14/50] 0.0.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8e9baf2..96c6b35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From ef37ad7214d3e66490283bfd2d7cde5a90ff6bdd Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:03:55 -0400
Subject: [PATCH 15/50] version-bump


From e123320dd57e9e2d09e5fb8a9839e36aec57da43 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:04:20 -0400
Subject: [PATCH 16/50] again

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 96c6b35..b721872 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "gitpkg publish",
-    "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\" && git push"
+    "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\""
   },
   "files": [
     "dist"

From db238e899050601f7b3a794c856681f257ca0d71 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:04:23 -0400
Subject: [PATCH 17/50] 0.0.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b721872..55f38a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 48923ae9d776e3889094e815a862ecf4da37eb98 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:04:23 -0400
Subject: [PATCH 18/50] version-bump


From b6189342da0a3b6a0dffc75715809d146d7c46b3 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:04:42 -0400
Subject: [PATCH 19/50] rollback to 4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 55f38a9..5cb50b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.9",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 5440fc9d1af2285fe81072e943fb66ed168f4d3a Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:05:21 -0400
Subject: [PATCH 20/50] rollback to 3

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5cb50b2..1b53fee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.4",
+  "version": "0.0.3",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",
@@ -28,7 +28,7 @@
     "prepublish:public": "npm run build && npm run bump-version",
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
-    "publish-git": "gitpkg publish",
+    "publish-git": "yarn version-bump && gitpkg publish",
     "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\""
   },
   "files": [

From 0ac81a83dd44fc648a3cb35a525d6e5468d4bcbe Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:05:33 -0400
Subject: [PATCH 21/50] 0.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1b53fee..2c3f820 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From bc7122e88f58d314187f979f29c9ca55939fd512 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:05:33 -0400
Subject: [PATCH 22/50] version-bump


From cf7fb09f20928c2270c9ef45a8c074a5bbeb2ec0 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:05:56 -0400
Subject: [PATCH 23/50] 0.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2c3f820..fa95de3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From e9702c4be37764201188cffd3b2129c1e2aa1324 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:07:02 -0400
Subject: [PATCH 24/50] 0.0.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa95de3..a84a173 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 5521f2a175ad7531b7c17ae77967d019577f3c17 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:07:02 -0400
Subject: [PATCH 25/50] version-bump


From 9802455252c681f5bea9023dbcb7a2f0763b20e5 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:10:29 -0400
Subject: [PATCH 26/50] added fixable meta

---
 require-memo.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/require-memo.ts b/require-memo.ts
index 401ce8d..19bca88 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -75,6 +75,7 @@ function checkFunction(
 
 const rule: Rule.RuleModule = {
   meta: {
+    fixable: 'code',
     messages: {
       "memo-required": "Component definition not wrapped in React.memo()",
     },

From f6c3b68adc67374864aebc67d7bb21b0c6bff01a Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:11:36 -0400
Subject: [PATCH 27/50] devdep

---
 package.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a84a173..4a800ae 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
     "jest": "^25.0.0",
     "rollup": "^2.43.1",
     "ts-jest": "^26.5.4",
-    "typescript": "^4.2.3"
+    "typescript": "^4.2.3",
+    "gitpkg": "^1.0.0-beta.2"
   },
   "scripts": {
     "test": "jest",
@@ -33,8 +34,5 @@
   },
   "files": [
     "dist"
-  ],
-  "dependencies": {
-    "gitpkg": "^1.0.0-beta.2"
-  }
+  ]
 }

From c62ef2262ab5b39fd3f57f0a0ce38699a83f9ae2 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:11:50 -0400
Subject: [PATCH 28/50] 0.0.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4a800ae..3dd2bac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 065e8c92fc3772d0f2285c0d6da7c324601d7596 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:11:50 -0400
Subject: [PATCH 29/50] version-bump


From 6caf90805433f23b2680ce960b5e1643987ff2c0 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:14:35 -0400
Subject: [PATCH 30/50] add fixable to each

---
 require-usememo-children.ts | 1 +
 require-usememo.ts          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/require-usememo-children.ts b/require-usememo-children.ts
index 0b1d7cd..e99e351 100644
--- a/require-usememo-children.ts
+++ b/require-usememo-children.ts
@@ -30,6 +30,7 @@ const messages = {
 const rule: Rule.RuleModule = {
   meta: {
     messages,
+    fixable: 'code',
     schema: [
       {
         type: "object",
diff --git a/require-usememo.ts b/require-usememo.ts
index 2f24d12..b7ebad0 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -55,6 +55,7 @@ const messages = {
 
 const rule: Rule.RuleModule = {
   meta: {
+    fixable: 'code',
     messages,
     schema: [
       {

From c52aea2b565771d47efca996123e0fa7e88097cc Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:14:50 -0400
Subject: [PATCH 31/50] 0.0.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3dd2bac..648e372 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 7d673b9ef5d6b82163e52a60e631515fecdd22f7 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:14:50 -0400
Subject: [PATCH 32/50] version-bump


From 328d8bf184ce6664dd1c6664ca9f851c0a137d93 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:19:40 -0400
Subject: [PATCH 33/50] 0.0.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 648e372..9ae04f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From 8fa03df04e5118cac3685ec50126177efd170351 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 14 Oct 2021 17:19:40 -0400
Subject: [PATCH 34/50] version-bump


From 78b253e7d0fcc19bc1cf238622e72d8c96042124 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Fri, 15 Oct 2021 12:11:23 -0400
Subject: [PATCH 35/50] testing

---
 __tests__/require-memo.ts | 96 +++++++++++++++++++++++++++++++--------
 package.json              |  1 +
 require-memo.ts           |  9 +---
 3 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index c360228..56d9b8a 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -8,75 +8,133 @@ const ruleTester = new RuleTester({
   },
 });
 
+function normalizeIndent(strings: TemplateStringsArray) {
+  const codeLines = strings[0].split('\n');
+  const match = codeLines[1].match(/\s+/);
+  const leftPadding = match ? match[0].length : 0;
+  return codeLines.map(line => line.substr(leftPadding)).join('\n');
+}
+
 ruleTester.run("memo", rule, {
   valid: [
     {
-      code: `const Component = React.memo(() => <div />)`,
+      code: normalizeIndent`
+        const Component = React.memo(() => <div />)
+      `,
     },
     {
-      code: `const Component = memo(() => <div />)`,
+      code: normalizeIndent`
+        const Component = memo(() => <div />)
+      `,
     },
     {
-      code: `const Component = memo(useRef(() => <div />))`,
+      code: normalizeIndent`
+        const Component = memo(useRef(() => <div />))
+      `,
     },
     {
-      code: `const Component = React.useRef(React.memo(() => <div />))`,
+      code: normalizeIndent`
+        const Component = React.useRef(React.memo(() => <div />))
+      `,
     },
     {
-      code: `const myFunction = () => <div />`,
+      code: normalizeIndent`
+        const myFunction = () => <div />
+      `,
     },
     {
-      code: `const myFunction = wrapper(() => <div />)`,
+      code: normalizeIndent`
+        const myFunction = wrapper(() => <div />)
+      `,
     },
     {
-      code: `const Component = React.memo(function() { return <div />; });`,
+      code: normalizeIndent`
+        const Component = React.memo(function() { return <div />; });
+      `,
     },
     {
-      code: `const Component = memo(function Component() { return <div />; });`,
+      code: normalizeIndent`
+        const Component = memo(function Component() { return <div />; });
+      `,
     },
     {
-      code: `const myFunction = () => <div />`,
+      code: normalizeIndent`
+        const myFunction = () => <div />
+      `,
     },
     {
-      code: `const myFunction = wrapper(() => <div />)`,
+      code: normalizeIndent`
+        const myFunction = wrapper(() => <div />)
+      `,
     },
     {
-      code: `function myFunction() { return <div />; }`,
+      code: normalizeIndent`
+        function myFunction() { return <div />; }
+      `,
     },
     {
-      code: `const myFunction = wrapper(function() { return <div /> })`,
+      code: normalizeIndent`
+        const myFunction = wrapper(function() { return <div /> })
+      `,
     },
     {
       filename: "dir/myFunction.js",
       parserOptions: { ecmaVersion: 6, sourceType: "module" },
-      code: `export default function() { return <div /> };`,
+      code: normalizeIndent`
+        export default function() { return <div /> };
+      `,
     },
   ],
   invalid: [
     {
-      code: `const Component = () => <div />`,
+      code: normalizeIndent`
+        const Component = () => <div />
+      `,
       errors: [{ messageId: "memo-required" }],
+      output: normalizeIndent`
+        const Component = React.memo(() => <div />)
+      `
     },
     {
-      code: `const Component = useRef(() => <div />)`,
+      code: normalizeIndent`
+        const Component = useRef(() => <div />)
+      `,
       errors: [{ messageId: "memo-required" }],
+      output: normalizeIndent`
+        const Component = memo(useRef(() => <div />))
+      `
     },
     {
-      code: `const Component = function Component() { return <div />; }`,
+      code: normalizeIndent`
+        const Component = function Component() { return <div />; }
+      `,
       errors: [{ messageId: "memo-required" }],
+      output: normalizeIndent`
+        const Component = function Component() { return <div />; }
+      `
     },
     {
-      code: `const Component = useRef(function() { return <div />; })`,
+      code: normalizeIndent`
+        const Component = useRef(function() { return <div />; })
+      `,
       errors: [{ messageId: "memo-required" }],
+      output: normalizeIndent`
+        const Component = useRef(function() { return <div />; })
+      `
     },
     {
-      code: `function Component() { return <div />; }`,
+      code: normalizeIndent`
+        function Component() { return <div />; }
+      `,
       errors: [{ messageId: "memo-required" }],
+      output: normalizeIndent`
+        function Component() { return <div />; }
+      `
     },
     // {
     //   filename: "dir/Component.js",
     //   parserOptions: { ecmaVersion: 6, sourceType: "module" },
-    //   code: `export default function() { return <div /> };`,
+    //   code: export default function() { return <div /> };,
     //   errors: [{ messageId: "memo-required" }],
     // },
   ],
diff --git a/package.json b/package.json
index 9ae04f0..5455ddb 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
   },
   "scripts": {
     "test": "jest",
+    "test-watch": "jest --watch",
     "build": "rm -rf dist && rollup -c",
     "prepublish:public": "npm run build && npm run bump-version",
     "publish:public": "npm publish --access public",
diff --git a/require-memo.ts b/require-memo.ts
index 19bca88..78b1e6d 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -47,14 +47,7 @@ function checkFunction(
     const { id } = currentNode;
     if (id.type === "Identifier") {
       if (componentNameRegex.test(id.name)) {
-        context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
-          let scope = node.parent;
-
-          // const sourceCode = context.getSourceCode()
-          // let fixedCode = sourceCode.getText(undefined) + ' === null';
-
-          return fixer.replaceText(scope, '');
-      } });
+        context.report({ node, messageId: "memo-required" });
       }
     }
   } else if (

From 3a2374deaf5d775b6b0765f5ac52b281cdae3d71 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Fri, 15 Oct 2021 12:56:40 -0400
Subject: [PATCH 36/50] added some autofixes for require-memo

---
 __tests__/require-memo.ts |  2 +-
 require-memo.ts           | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index 56d9b8a..1aed843 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -101,7 +101,7 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        const Component = memo(useRef(() => <div />))
+        const Component = React.memo(useRef(() => <div />))
       `
     },
     {
diff --git a/require-memo.ts b/require-memo.ts
index 78b1e6d..2d9cc52 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -25,6 +25,14 @@ function isMemoCallExpression(node: Rule.Node) {
   return false;
 }
 
+// context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+//   let scope = node.body
+//   const sourceCode = context.getSourceCode();
+//   let fixedCode = `memo(${sourceCode.getText(scope)})`
+
+//   return fixer.replaceText(scope, fixedCode);
+// } });
+
 function checkFunction(
   context: Rule.RuleContext,
   node: (
@@ -47,6 +55,22 @@ function checkFunction(
     const { id } = currentNode;
     if (id.type === "Identifier") {
       if (componentNameRegex.test(id.name)) {
+        if (node.type === 'ArrowFunctionExpression') {
+          context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+            const parent = node.parent
+            let scope
+            if (parent.type === 'VariableDeclarator') {
+              scope = node
+            } else {
+              scope = parent
+            }
+            const sourceCode = context.getSourceCode();
+            let fixedCode = `React.memo(${sourceCode.getText(scope)})`
+
+            return fixer.replaceText(scope, fixedCode);
+          } });
+          return
+        }
         context.report({ node, messageId: "memo-required" });
       }
     }

From 59ae0c35935c94e4bba69dbc2dc5279d4daad60b Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Fri, 15 Oct 2021 13:11:01 -0400
Subject: [PATCH 37/50] added linking steps

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 5455ddb..7dea93d 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,14 @@
     "test": "jest",
     "test-watch": "jest --watch",
     "build": "rm -rf dist && rollup -c",
+    "build-and-watch": "rm -rf dist && rollup -c --watch",
     "prepublish:public": "npm run build && npm run bump-version",
     "publish:public": "npm publish --access public",
     "deploy": "yarn build && yarn publish-git",
     "publish-git": "yarn version-bump && gitpkg publish",
+    "link-to-web": "cd ../web && yarn link-eslint-plugin-react-memo-auto && cd ../eslint-plugin-react-memo && yarn build-and-watch",
+    "link-prepare": "yarn install && yarn link && echo 'Now run \"yarn link-eslint-plugin-react-memo\" in mobile and web. And make sure you are running \"yarn build-and-watch\" to keep those dist folders available.'",
+    "unlink-prepare": "yarn install && yarn unlink && echo 'Now run \"yarn unlink-eslint-plugin-react-memo\" in mobile and web. And make sure you are running \"yarn build-and-watch\" to keep those dist folders available.'",
     "version-bump": "npm version patch && git add . && git commit --allow-empty -m \"version-bump\""
   },
   "files": [

From f83360df18de4d71dc28241add642d60087f2576 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Fri, 15 Oct 2021 13:40:31 -0400
Subject: [PATCH 38/50] moved normalizeIndent to utils and setup usememo spec

---
 __tests__/require-memo.ts    |  11 +-
 __tests__/require-usememo.ts | 274 ++++++++++++++++++++++++-----------
 utils/index.ts               |   6 +
 3 files changed, 200 insertions(+), 91 deletions(-)
 create mode 100644 utils/index.ts

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index 1aed843..e40eaac 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -1,5 +1,6 @@
 import { RuleTester } from "eslint";
 import rule from "../require-memo";
+import { normalizeIndent } from '../utils';
 
 const ruleTester = new RuleTester({
   parser: require.resolve("@typescript-eslint/parser"),
@@ -8,13 +9,6 @@ const ruleTester = new RuleTester({
   },
 });
 
-function normalizeIndent(strings: TemplateStringsArray) {
-  const codeLines = strings[0].split('\n');
-  const match = codeLines[1].match(/\s+/);
-  const leftPadding = match ? match[0].length : 0;
-  return codeLines.map(line => line.substr(leftPadding)).join('\n');
-}
-
 ruleTester.run("memo", rule, {
   valid: [
     {
@@ -104,6 +98,7 @@ ruleTester.run("memo", rule, {
         const Component = React.memo(useRef(() => <div />))
       `
     },
+    // TODO: setup autofixer for these
     {
       code: normalizeIndent`
         const Component = function Component() { return <div />; }
@@ -113,6 +108,7 @@ ruleTester.run("memo", rule, {
         const Component = function Component() { return <div />; }
       `
     },
+    // TODO: setup autofixer for these
     {
       code: normalizeIndent`
         const Component = useRef(function() { return <div />; })
@@ -122,6 +118,7 @@ ruleTester.run("memo", rule, {
         const Component = useRef(function() { return <div />; })
       `
     },
+    // TODO: setup autofixer for these
     {
       code: normalizeIndent`
         function Component() { return <div />; }
diff --git a/__tests__/require-usememo.ts b/__tests__/require-usememo.ts
index cbe60de..66dfa2d 100644
--- a/__tests__/require-usememo.ts
+++ b/__tests__/require-usememo.ts
@@ -1,5 +1,6 @@
 import { RuleTester } from "eslint";
 import rule from "../require-usememo";
+import { normalizeIndent } from '../utils';
 
 const ruleTester = new RuleTester({
   parser: require.resolve("@typescript-eslint/parser"),
@@ -11,134 +12,239 @@ const ruleTester = new RuleTester({
 ruleTester.run("useMemo", rule, {
   valid: [
     {
-      code: `const Component = () => {
-      const myObject = React.useMemo(() => ({}), []);
-      return <Child prop={myObject} />;
-    }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = React.useMemo(() => ({}), []);
+          return <Child prop={myObject} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-      const myArray = useMemo(() => [], []);
-      return <Child prop={myArray} />;
-    }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = useMemo(() => [], []);
+          return <Child prop={myArray} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-      const myArray = React.useMemo(() => new Object(), []);
-      return <Child prop={myArray} />;
-    }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = React.useMemo(() => new Object(), []);
+          return <Child prop={myArray} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myObject = {};
-        return <div prop={myObject} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = {};
+          return <div prop={myObject} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myArray = [];
-        return <div prop={myArray} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = [];
+          return <div prop={myArray} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myNumber1 = 123;
-        const myNumber2 = 123 + 456;
-        const myString1 = 'abc';
-        const myString2 = \`abc\`;
-        return <div n1={myNumber} n2={myNumber2} s1={myString1} s2={myString2} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myNumber1 = 123;
+          const myNumber2 = 123 + 456;
+          const myString1 = 'abc';
+          const myString2 = \`abc\`;
+          return <div n1={myNumber} n2={myNumber2} s1={myString1} s2={myString2} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myObject = memoize({});
-        return <Child prop={myObject} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = memoize({});
+          return <Child prop={myObject} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myArray = lodash.memoize([]);
-        return <Child prop={myArray} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = lodash.memoize([]);
+          return <Child prop={myArray} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myComplexString = css\`color: red;\`;
-        return <Child prop={myComplexString} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myComplexString = css\`color: red;\`;
+          return <Child prop={myComplexString} />;
+        }
+      `,
     },
   ],
   invalid: [
     {
-      code: `const Component = () => {
-        const myObject = {};
-        return <Child prop={myObject} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = {};
+          return <Child prop={myObject} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myObject = React.useMemo(() => ({}), []);
+          return <Child prop={myObject} />;
+        }
+      `,
       errors: [{ messageId: "object-usememo-props" }],
     },
     {
-      code: `const Component = () => {
-        const myArray = [];
-        return <Child prop={myArray} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = [];
+          return <Child prop={myArray} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myArray = useMemo(() => [], []);
+          return <Child prop={myArray} />;
+        }
+      `,
       errors: [{ messageId: "array-usememo-props" }],
     },
     {
-      code: `const Component = () => {
-        const myInstance = new Object();
-        return <Child prop={myInstance} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myInstance = new Object();
+          return <Child prop={myInstance} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myInstance = React.useMemo(() => new Object(), []);
+          return <Child prop={myInstance} />;
+        }
+      `,
       errors: [{ messageId: "instance-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        let myObject = useMemo({});
-        myObject = {a: 'b'};
-        return <Child prop={myObject} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          let myObject = useMemo({});
+          myObject = {a: 'b'};
+          return <Child prop={myObject} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          let myObject = useMemo({});
+          myObject = {a: 'b'};
+          return <Child prop={myObject} />;
+        }
+      `,
       errors: [{ messageId: "usememo-const" }],
     },
-    {
-      code: `const Component = () => {
-        return <Child prop={{}} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={{}} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          return <Child prop={{}} />;
+        }
+      `,
       errors: [{ messageId: "object-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        return <Child prop={[]} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={[]} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          return <Child prop={[]} />;
+        }
+      `,
       errors: [{ messageId: "array-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        const myObject = memoize({});
-        return <Child prop={myObject} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = memoize({});
+          return <Child prop={myObject} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myObject = memoize({});
+          return <Child prop={myObject} />;
+        }
+      `,
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
+    // TODO: setup autofixer for these
     {
-      code: `const Component = () => {
-        const myArray = lodash.memoize([]);
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = lodash.memoize([]);
+        return <Child prop={myArray} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myArray = lodash.memoize([]);
         return <Child prop={myArray} />;
-      }`,
+        }
+      `,
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        const myArray1 = [];
-        const myArray2 = React.useMemo(() => myArray1, [myArray1]);
-        return <Child prop={myArray2} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray1 = [];
+          const myArray2 = React.useMemo(() => myArray1, [myArray1]);
+          return <Child prop={myArray2} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myArray1 = [];
+          const myArray2 = React.useMemo(() => myArray1, [myArray1]);
+          return <Child prop={myArray2} />;
+        }
+      `,
       errors: [{ messageId: "array-usememo-deps" }],
     },
-    {
-      code: `const Component = () => {
-        const myComplexString = css\`color: red;\`;
-        return <Child prop={myComplexString} />;
-      }`,
+    // TODO: setup autofixer for these
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myComplexString = css\`color: red;\`;
+          return <Child prop={myComplexString} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myComplexString = css\`color: red;\`;
+          return <Child prop={myComplexString} />;
+        }
+      `,
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
diff --git a/utils/index.ts b/utils/index.ts
new file mode 100644
index 0000000..bbd47f5
--- /dev/null
+++ b/utils/index.ts
@@ -0,0 +1,6 @@
+export function normalizeIndent(strings: TemplateStringsArray) {
+  const codeLines = strings[0].split('\n');
+  const match = codeLines[1].match(/\s+/);
+  const leftPadding = match ? match[0].length : 0;
+  return codeLines.map(line => line.substr(leftPadding)).join('\n');
+}

From b47445e82d76c5ca1ae86e0dafc3274701406188 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Mon, 18 Oct 2021 11:43:14 -0400
Subject: [PATCH 39/50] some autofixers working checking in to safely refactor

---
 __tests__/require-memo.ts             |  16 +--
 __tests__/require-usecallback.ts      |   6 +-
 __tests__/require-usememo-children.ts |   6 +-
 __tests__/require-usememo.ts          |  26 ++---
 package.json                          |   6 +-
 require-memo.ts                       | 153 ++++++++++++++++++++++++--
 require-usememo.ts                    |  62 ++++++++++-
 yarn.lock                             |   5 +
 8 files changed, 241 insertions(+), 39 deletions(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index e40eaac..ed43e66 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -13,7 +13,7 @@ ruleTester.run("memo", rule, {
   valid: [
     {
       code: normalizeIndent`
-        const Component = React.memo(() => <div />)
+        const Component = memo(() => <div />)
       `,
     },
     {
@@ -28,7 +28,7 @@ ruleTester.run("memo", rule, {
     },
     {
       code: normalizeIndent`
-        const Component = React.useRef(React.memo(() => <div />))
+        const Component = useRef(memo(() => <div />))
       `,
     },
     {
@@ -43,7 +43,7 @@ ruleTester.run("memo", rule, {
     },
     {
       code: normalizeIndent`
-        const Component = React.memo(function() { return <div />; });
+        const Component = memo(function() { return <div />; });
       `,
     },
     {
@@ -86,7 +86,7 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        const Component = React.memo(() => <div />)
+        const Component = memo(() => <div />)
       `
     },
     {
@@ -95,10 +95,10 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        const Component = React.memo(useRef(() => <div />))
+        const Component = memo(useRef(() => <div />))
       `
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = function Component() { return <div />; }
@@ -108,7 +108,7 @@ ruleTester.run("memo", rule, {
         const Component = function Component() { return <div />; }
       `
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = useRef(function() { return <div />; })
@@ -118,7 +118,7 @@ ruleTester.run("memo", rule, {
         const Component = useRef(function() { return <div />; })
       `
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         function Component() { return <div />; }
diff --git a/__tests__/require-usecallback.ts b/__tests__/require-usecallback.ts
index 6c3726e..2edae44 100644
--- a/__tests__/require-usecallback.ts
+++ b/__tests__/require-usecallback.ts
@@ -12,7 +12,7 @@ ruleTester.run("useCallback", rule, {
   valid: [
     {
       code: `const Component = () => {
-      const myFn = React.useCallback(function() {}, []);
+      const myFn = useCallback(function() {}, []);
       return <Child prop={myFn} />;
     }`,
     },
@@ -44,7 +44,7 @@ ruleTester.run("useCallback", rule, {
     {
       code: `const Component = () => {
       const myFn1 = useCallback(() => [], []);
-      const myFn2 = React.useCallback(() => myFn1, [myFn1]);
+      const myFn2 = useCallback(() => myFn1, [myFn1]);
       return <Child prop={myFn2} />;
       }`,
     },
@@ -115,7 +115,7 @@ ruleTester.run("useCallback", rule, {
     {
       code: `const Component = () => {
         const myFn1 = () => [];
-        const myFn2 = React.useCallback(() => myFn1, [myFn1]);
+        const myFn2 = useCallback(() => myFn1, [myFn1]);
         return <Child prop={myFn2} />;
       }`,
       errors: [{ messageId: "function-usecallback-deps" }],
diff --git a/__tests__/require-usememo-children.ts b/__tests__/require-usememo-children.ts
index ec7c8f5..696e246 100644
--- a/__tests__/require-usememo-children.ts
+++ b/__tests__/require-usememo-children.ts
@@ -12,7 +12,7 @@ ruleTester.run("useMemo children", rule, {
   valid: [
     {
       code: `const Component = () => {
-      const children = React.useMemo(() => <div><Grandchild /></div>, []);
+      const children = useMemo(() => <div><Grandchild /></div>, []);
       return <Child>{children}</Child>;
     }`,
     },
@@ -23,7 +23,7 @@ ruleTester.run("useMemo children", rule, {
     },
     {
       code: `const Component = () => {
-      const renderFn = React.useCallback(() => <div><Grandchild /></div>, []);
+      const renderFn = useCallback(() => <div><Grandchild /></div>, []);
       return <Child>{renderFn}</Child>;
     }`,
     },
@@ -31,7 +31,7 @@ ruleTester.run("useMemo children", rule, {
   invalid: [
     {
       code: `const Component = () => {
-      const children = React.useMemo(() => <div><Grandchild /></div>, []);
+      const children = useMemo(() => <div><Grandchild /></div>, []);
       return <Child>
         <>
           {children}
diff --git a/__tests__/require-usememo.ts b/__tests__/require-usememo.ts
index 66dfa2d..f34ebaf 100644
--- a/__tests__/require-usememo.ts
+++ b/__tests__/require-usememo.ts
@@ -14,7 +14,7 @@ ruleTester.run("useMemo", rule, {
     {
       code: normalizeIndent`
         const Component = () => {
-          const myObject = React.useMemo(() => ({}), []);
+          const myObject = useMemo(() => ({}), []);
           return <Child prop={myObject} />;
         }
       `,
@@ -30,7 +30,7 @@ ruleTester.run("useMemo", rule, {
     {
       code: normalizeIndent`
         const Component = () => {
-          const myArray = React.useMemo(() => new Object(), []);
+          const myArray = useMemo(() => new Object(), []);
           return <Child prop={myArray} />;
         }
       `,
@@ -97,7 +97,7 @@ ruleTester.run("useMemo", rule, {
       `,
       output: normalizeIndent`
         const Component = () => {
-          const myObject = React.useMemo(() => ({}), []);
+          const myObject = useMemo(() => ({}), []);
           return <Child prop={myObject} />;
         }
       `,
@@ -127,13 +127,13 @@ ruleTester.run("useMemo", rule, {
       `,
       output: normalizeIndent`
         const Component = () => {
-          const myInstance = React.useMemo(() => new Object(), []);
+          const myInstance = useMemo(() => new Object(), []);
           return <Child prop={myInstance} />;
         }
       `,
       errors: [{ messageId: "instance-usememo-props" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -151,7 +151,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "usememo-const" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -165,7 +165,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "object-usememo-props" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -179,7 +179,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "array-usememo-props" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -196,7 +196,7 @@ ruleTester.run("useMemo", rule, {
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -213,25 +213,25 @@ ruleTester.run("useMemo", rule, {
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
           const myArray1 = [];
-          const myArray2 = React.useMemo(() => myArray1, [myArray1]);
+          const myArray2 = useMemo(() => myArray1, [myArray1]);
           return <Child prop={myArray2} />;
         }
       `,
       output: normalizeIndent`
         const Component = () => {
           const myArray1 = [];
-          const myArray2 = React.useMemo(() => myArray1, [myArray1]);
+          const myArray2 = useMemo(() => myArray1, [myArray1]);
           return <Child prop={myArray2} />;
         }
       `,
       errors: [{ messageId: "array-usememo-deps" }],
     },
-    // TODO: setup autofixer for these
+    // TODO: setup autofixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
diff --git a/package.json b/package.json
index 7dea93d..4306328 100644
--- a/package.json
+++ b/package.json
@@ -14,17 +14,19 @@
     "@rollup/plugin-typescript": "^8.2.1",
     "@types/eslint": "^7.2.7",
     "@types/jest": "^26.0.22",
+    "@types/lodash": "^4.14.175",
     "@typescript-eslint/parser": "^4.19.0",
     "@typescript-eslint/types": "^4.19.0",
     "eslint": "^7.23.0",
+    "gitpkg": "^1.0.0-beta.2",
     "jest": "^25.0.0",
     "rollup": "^2.43.1",
     "ts-jest": "^26.5.4",
-    "typescript": "^4.2.3",
-    "gitpkg": "^1.0.0-beta.2"
+    "typescript": "^4.2.3"
   },
   "scripts": {
     "test": "jest",
+    "test-debug": "node --inspect-brk node_modules/.bin/jest --watch",
     "test-watch": "jest --watch",
     "build": "rm -rf dist && rollup -c",
     "build-and-watch": "rm -rf dist && rollup -c --watch",
diff --git a/require-memo.ts b/require-memo.ts
index 2d9cc52..ba838e5 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -25,13 +25,152 @@ function isMemoCallExpression(node: Rule.Node) {
   return false;
 }
 
-// context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
-//   let scope = node.body
-//   const sourceCode = context.getSourceCode();
-//   let fixedCode = `memo(${sourceCode.getText(scope)})`
 
-//   return fixer.replaceText(scope, fixedCode);
-// } });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 function checkFunction(
   context: Rule.RuleContext,
@@ -65,7 +204,7 @@ function checkFunction(
               scope = parent
             }
             const sourceCode = context.getSourceCode();
-            let fixedCode = `React.memo(${sourceCode.getText(scope)})`
+            let fixedCode = `memo(${sourceCode.getText(scope)})`
 
             return fixer.replaceText(scope, fixedCode);
           } });
diff --git a/require-usememo.ts b/require-usememo.ts
index b7ebad0..a25b95e 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -81,13 +81,69 @@ const rule: Rule.RuleModule = {
           if (expression?.type !== "JSXEmptyExpression") {
             switch (getExpressionMemoStatus(context, expression)) {
               case MemoStatus.UnmemoizedObject:
-                report(node, "object-usememo-props");
+                // @ts-ignore
+                context.report({ node, messageId: "object-usememo-props", fix: (fixer): Rule.Fix => {
+                  const sourceCode = context.getSourceCode();
+                  // @ts-ignore
+                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr.properties : null)?.[0]?.writeExpr.parent
+                  // console.warn(definition)
+                  const [name, value] = sourceCode.getText(definition).split('=')
+                  let fixedCode = ''
+                  if(name && value) {
+                    fixedCode = `${name.trim()} = useMemo(() => (${value.trim()}), [])`
+                  }
+
+                  // return fixer.replaceText(scope, fixedCode);
+                  if(definition) {
+                    return fixer.replaceText(definition, fixedCode)
+                  } else {
+                    console.warn(context.getScope().references)
+                  }
+                } });
                 break;
               case MemoStatus.UnmemoizedArray:
-                report(node, "array-usememo-props");
+                // @ts-ignore
+                context.report({ node, messageId: "array-usememo-props", fix: (fixer): Rule.Fix => {
+                  const sourceCode = context.getSourceCode();
+                  // @ts-ignore
+                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent
+                  // console.warn(definition)
+                  const [name, value] = sourceCode.getText(definition).split('=')
+                  let fixedCode = ''
+                  if(name && value) {
+                    fixedCode = `${name.trim()} = useMemo(() => ${value.trim()}, [])`
+                  }
+
+                  // return fixer.replaceText(scope, fixedCode);
+                  if(definition) {
+                    return fixer.replaceText(definition, fixedCode)
+                  } else {
+                    // console.warn(context.getScope().references)
+                  }
+                } });
                 break;
               case MemoStatus.UnmemoizedNew:
-                report(node, "instance-usememo-props");
+                // @ts-ignore
+                context.report({ node, messageId: "instance-usememo-props", fix: (fixer): Rule.Fix => {
+                  const sourceCode = context.getSourceCode();
+                  // @ts-ignore
+                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent
+                  // console.warn(definition)
+                  const [name, value] = sourceCode.getText(definition).split('=')
+                  let fixedCode = ''
+                  if(name && value) {
+                    fixedCode = `${name.trim()} = useMemo(() => ${value.trim()}, [])`
+                  }
+
+                  // return fixer.replaceText(scope, fixedCode);
+                  if(definition) {
+                    return fixer.replaceText(definition, fixedCode)
+                  } else {
+                    // @ts-ignore
+                    // console.warn(context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent)
+                    // console.warn(context.getScope().references)
+                  }
+                } });
                 break;
               case MemoStatus.UnmemoizedFunction:
                 report(node, "function-usecallback-props");
diff --git a/yarn.lock b/yarn.lock
index df6b1d6..ef3260e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -670,6 +670,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
+"@types/lodash@^4.14.175":
+  version "4.14.175"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45"
+  integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw==
+
 "@types/minimatch@*":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"

From 50c01744fc9c4146d9d271531735f374acba69a9 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Mon, 18 Oct 2021 12:56:03 -0400
Subject: [PATCH 40/50] refactor fixer

---
 package.json       |  7 +++--
 require-usememo.ts | 78 +++++++++++-----------------------------------
 yarn.lock          | 12 ++++++-
 3 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/package.json b/package.json
index 4306328..b5fe0c1 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@types/jest": "^26.0.22",
     "@types/lodash": "^4.14.175",
     "@typescript-eslint/parser": "^4.19.0",
-    "@typescript-eslint/types": "^4.19.0",
+    "@typescript-eslint/types": "^5.0.0",
     "eslint": "^7.23.0",
     "gitpkg": "^1.0.0-beta.2",
     "jest": "^25.0.0",
@@ -41,5 +41,8 @@
   },
   "files": [
     "dist"
-  ]
+  ],
+  "dependencies": {
+    "typescript-eslint": "^0.0.1-alpha.0"
+  }
 }
diff --git a/require-usememo.ts b/require-usememo.ts
index a25b95e..b53fe72 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -1,6 +1,8 @@
 import { Rule } from "eslint";
 import * as ESTree from "estree";
 import { TSESTree } from "@typescript-eslint/types";
+import { Node } from "@typescript-eslint/types/dist/ast-spec"
+
 import {
   getExpressionMemoStatus,
   isComplexComponent,
@@ -70,8 +72,20 @@ const rule: Rule.RuleModule = {
       context.report({ node, messageId: messageId as string });
     }
 
+    const fix = (fixer: Rule.RuleFixer, implicitReturn: boolean = true): Rule.Fix | null => {
+      const sourceCode = context.getSourceCode();
+      const references = context.getScope()?.references
+      const filteredRefs = references?.filter((reference) => reference?.writeExpr)
+      // @ts-ignore
+      const definition = filteredRefs?.[0]?.writeExpr?.parent
+      if (!definition) return null
+      const [name, value] = sourceCode.getText(definition).split('=')
+      const fixedCode = `${name.trim()} = useMemo(() => ${implicitReturn ? value.trim() : `(${value.trim()})`}, [])`
+      return fixer.replaceText(definition, fixedCode)
+    }
+
     return {
-      JSXAttribute: (node: ESTree.Node & Rule.NodeParentExtension) => {
+      JSXAttribute: (node: Rule.Node & Rule.NodeParentExtension) => {
         const { parent, value } = (node as unknown) as TSESTree.JSXAttribute &
           Rule.NodeParentExtension;
         if (value === null) return;
@@ -81,69 +95,13 @@ const rule: Rule.RuleModule = {
           if (expression?.type !== "JSXEmptyExpression") {
             switch (getExpressionMemoStatus(context, expression)) {
               case MemoStatus.UnmemoizedObject:
-                // @ts-ignore
-                context.report({ node, messageId: "object-usememo-props", fix: (fixer): Rule.Fix => {
-                  const sourceCode = context.getSourceCode();
-                  // @ts-ignore
-                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr.properties : null)?.[0]?.writeExpr.parent
-                  // console.warn(definition)
-                  const [name, value] = sourceCode.getText(definition).split('=')
-                  let fixedCode = ''
-                  if(name && value) {
-                    fixedCode = `${name.trim()} = useMemo(() => (${value.trim()}), [])`
-                  }
-
-                  // return fixer.replaceText(scope, fixedCode);
-                  if(definition) {
-                    return fixer.replaceText(definition, fixedCode)
-                  } else {
-                    console.warn(context.getScope().references)
-                  }
-                } });
+                context.report({ node, messageId: "object-usememo-props", fix: (fixer) => fix(fixer, false) });
                 break;
               case MemoStatus.UnmemoizedArray:
-                // @ts-ignore
-                context.report({ node, messageId: "array-usememo-props", fix: (fixer): Rule.Fix => {
-                  const sourceCode = context.getSourceCode();
-                  // @ts-ignore
-                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent
-                  // console.warn(definition)
-                  const [name, value] = sourceCode.getText(definition).split('=')
-                  let fixedCode = ''
-                  if(name && value) {
-                    fixedCode = `${name.trim()} = useMemo(() => ${value.trim()}, [])`
-                  }
-
-                  // return fixer.replaceText(scope, fixedCode);
-                  if(definition) {
-                    return fixer.replaceText(definition, fixedCode)
-                  } else {
-                    // console.warn(context.getScope().references)
-                  }
-                } });
+                context.report({ node, messageId: "array-usememo-props", fix });
                 break;
               case MemoStatus.UnmemoizedNew:
-                // @ts-ignore
-                context.report({ node, messageId: "instance-usememo-props", fix: (fixer): Rule.Fix => {
-                  const sourceCode = context.getSourceCode();
-                  // @ts-ignore
-                  const definition = context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent
-                  // console.warn(definition)
-                  const [name, value] = sourceCode.getText(definition).split('=')
-                  let fixedCode = ''
-                  if(name && value) {
-                    fixedCode = `${name.trim()} = useMemo(() => ${value.trim()}, [])`
-                  }
-
-                  // return fixer.replaceText(scope, fixedCode);
-                  if(definition) {
-                    return fixer.replaceText(definition, fixedCode)
-                  } else {
-                    // @ts-ignore
-                    // console.warn(context.getScope().references.filter((reference) => reference.writeExpr ? reference.writeExpr : null)?.[0]?.writeExpr.parent)
-                    // console.warn(context.getScope().references)
-                  }
-                } });
+                context.report({ node, messageId: "instance-usememo-props", fix });
                 break;
               case MemoStatus.UnmemoizedFunction:
                 report(node, "function-usecallback-props");
diff --git a/yarn.lock b/yarn.lock
index ef3260e..52e642b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -737,11 +737,16 @@
     "@typescript-eslint/types" "4.19.0"
     "@typescript-eslint/visitor-keys" "4.19.0"
 
-"@typescript-eslint/types@4.19.0", "@typescript-eslint/types@^4.19.0":
+"@typescript-eslint/types@4.19.0":
   version "4.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.19.0.tgz#5181d5d2afd02e5b8f149ebb37ffc8bd7b07a568"
   integrity sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==
 
+"@typescript-eslint/types@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.0.0.tgz#25d93f6d269b2d25fdc51a0407eb81ccba60eb0f"
+  integrity sha512-dU/pKBUpehdEqYuvkojmlv0FtHuZnLXFBn16zsDmlFF3LXkOpkAQ2vrKc3BidIIve9EMH2zfTlxqw9XM0fFN5w==
+
 "@typescript-eslint/typescript-estree@4.19.0":
   version "4.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz#8a709ffa400284ab72df33376df085e2e2f61147"
@@ -4409,6 +4414,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typescript-eslint@^0.0.1-alpha.0:
+  version "0.0.1-alpha.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-0.0.1-alpha.0.tgz#285d68a4e96588295cd436278801bcb6a6b916c1"
+  integrity sha512-1hNKM37dAWML/2ltRXupOq2uqcdRQyDFphl+341NTPXFLLLiDhErXx8VtaSLh3xP7SyHZdcCgpt9boYYVb3fQg==
+
 typescript@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"

From 55328c7c5f80d064371ac18a6546d9a326d0cc96 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Mon, 18 Oct 2021 14:01:56 -0400
Subject: [PATCH 41/50] handle usecallback

---
 __tests__/require-memo.ts        |   6 +-
 __tests__/require-usecallback.ts | 230 +++++++++++++++++++++----------
 __tests__/require-usememo.ts     |  14 +-
 require-usememo.ts               |  30 +++-
 utils/index.ts                   |   2 +
 5 files changed, 194 insertions(+), 88 deletions(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index ed43e66..8dc9966 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -98,7 +98,7 @@ ruleTester.run("memo", rule, {
         const Component = memo(useRef(() => <div />))
       `
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = function Component() { return <div />; }
@@ -108,7 +108,7 @@ ruleTester.run("memo", rule, {
         const Component = function Component() { return <div />; }
       `
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = useRef(function() { return <div />; })
@@ -118,7 +118,7 @@ ruleTester.run("memo", rule, {
         const Component = useRef(function() { return <div />; })
       `
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         function Component() { return <div />; }
diff --git a/__tests__/require-usecallback.ts b/__tests__/require-usecallback.ts
index 2edae44..20f48ef 100644
--- a/__tests__/require-usecallback.ts
+++ b/__tests__/require-usecallback.ts
@@ -1,5 +1,6 @@
 import { RuleTester } from "eslint";
 import rule from "../require-usememo";
+import { normalizeIndent } from '../utils';
 
 const ruleTester = new RuleTester({
   parser: require.resolve("@typescript-eslint/parser"),
@@ -11,113 +12,198 @@ const ruleTester = new RuleTester({
 ruleTester.run("useCallback", rule, {
   valid: [
     {
-      code: `const Component = () => {
-      const myFn = useCallback(function() {}, []);
-      return <Child prop={myFn} />;
-    }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = useCallback(function() {}, []);
+          return <Child prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-      const myFn = useCallback(() => {}, []);
-      return <Child prop={myFn} />;
-    }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = useCallback(() => {}, []);
+          return <Child prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myFn = function() {};
-        return <div prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = function() {};
+          return <div prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myFn = () => {};
-        return <div prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = () => {};
+          return <div prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `
-      const myFn = () => {};
-      const Component = () => {
-        return <div prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const myFn = () => {};
+        const Component = () => {
+          return <div prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-      const myFn1 = useCallback(() => [], []);
-      const myFn2 = useCallback(() => myFn1, [myFn1]);
-      return <Child prop={myFn2} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn1 = useCallback(() => [], []);
+          const myFn2 = useCallback(() => myFn1, [myFn1]);
+          return <Child prop={myFn2} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myFn = memoize(() => {});
-        return <Child prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = memoize(() => {});
+          return <Child prop={myFn} />;
+        }
+      `,
     },
     {
-      code: `const Component = () => {
-        const myFn = lodash.memoize(() => []);
-        return <Child prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = lodash.memoize(() => []);
+          return <Child prop={myFn} />;
+        }
+      `,
     },
   ],
   invalid: [
     {
-      code: `const Component = () => {
-        const myFn = function myFn() {};
-        return <Child prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = function myFn() {};
+          return <Child prop={myFn} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myFn = useCallback(function() {}, []);
+          return <Child prop={myFn} />;
+        }
+      `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
     {
-      code: `const Component = () => {
-        const myFn = () => {};
-        return <Child prop={myFn} />;
-      }`,
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = () => {};
+          return <Child prop={myFn} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myFn = useCallback(() => {}, []);
+          return <Child prop={myFn} />;
+        }
+      `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
-    {
-      code: `const Component = () => {
-        let myFn = useCallback(() => ({}));
-        myFn = () => ({});
-        return <Child prop={myFn} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          let myFn = useCallback(() => ({}));
+          myFn = () => ({});
+          return <Child prop={myFn} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          let myFn = useCallback(() => ({}));
+          myFn = () => ({});
+          return <Child prop={myFn} />;
+        }
+      `,
       errors: [{ messageId: "usememo-const" }],
     },
-    {
-      code: `const Component = () => {
-        return <Child prop={() => {}} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => {}} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => {}} />;
+        }
+      `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
-    {
-      code: `const Component = () => {
-        return <Child prop={() => []} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => []} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => []} />;
+        }
+      `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
-    {
-      code: `const Component = () => {
-        const myFn = memoize(() => {});
-        return <Child prop={myFn} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = memoize(() => {});
+          return <Child prop={myFn} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myFn = memoize(() => {});
+          return <Child prop={myFn} />;
+        }
+      `,
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        const myFn = lodash.memoize(() => []);
-        return <Child prop={myFn} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = lodash.memoize(() => []);
+          return <Child prop={myFn} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myFn = lodash.memoize(() => []);
+          return <Child prop={myFn} />;
+        }
+      `,
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    {
-      code: `const Component = () => {
-        const myFn1 = () => [];
-        const myFn2 = useCallback(() => myFn1, [myFn1]);
-        return <Child prop={myFn2} />;
-      }`,
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn1 = () => [];
+          const myFn2 = useCallback(() => myFn1, [myFn1]);
+          return <Child prop={myFn2} />;
+        }
+      `,
+      output: normalizeIndent`
+        const Component = () => {
+          const myFn1 = () => [];
+          const myFn2 = useCallback(() => myFn1, [myFn1]);
+          return <Child prop={myFn2} />;
+        }
+      `,
       errors: [{ messageId: "function-usecallback-deps" }],
     },
   ],
diff --git a/__tests__/require-usememo.ts b/__tests__/require-usememo.ts
index f34ebaf..7077b22 100644
--- a/__tests__/require-usememo.ts
+++ b/__tests__/require-usememo.ts
@@ -133,7 +133,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "instance-usememo-props" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -151,7 +151,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "usememo-const" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -165,7 +165,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "object-usememo-props" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -179,7 +179,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "array-usememo-props" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -196,7 +196,7 @@ ruleTester.run("useMemo", rule, {
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -213,7 +213,7 @@ ruleTester.run("useMemo", rule, {
       options: [{ strict: true }],
       errors: [{ messageId: "unknown-usememo-props" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
@@ -231,7 +231,7 @@ ruleTester.run("useMemo", rule, {
       `,
       errors: [{ messageId: "array-usememo-deps" }],
     },
-    // TODO: setup autofixer for the following spec (output currently matches code)
+    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = () => {
diff --git a/require-usememo.ts b/require-usememo.ts
index b53fe72..5101f13 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -2,6 +2,7 @@ import { Rule } from "eslint";
 import * as ESTree from "estree";
 import { TSESTree } from "@typescript-eslint/types";
 import { Node } from "@typescript-eslint/types/dist/ast-spec"
+import { isArrowFn } from "./utils";
 
 import {
   getExpressionMemoStatus,
@@ -72,18 +73,35 @@ const rule: Rule.RuleModule = {
       context.report({ node, messageId: messageId as string });
     }
 
-    const fix = (fixer: Rule.RuleFixer, implicitReturn: boolean = true): Rule.Fix | null => {
+    const useMemoFix = (fixer: Rule.RuleFixer, implicitReturn: boolean = true): Rule.Fix | null => {
       const sourceCode = context.getSourceCode();
       const references = context.getScope()?.references
       const filteredRefs = references?.filter((reference) => reference?.writeExpr)
       // @ts-ignore
       const definition = filteredRefs?.[0]?.writeExpr?.parent
       if (!definition) return null
-      const [name, value] = sourceCode.getText(definition).split('=')
+      const [name, value] = sourceCode.getText(definition).split(/=(.+)/)
       const fixedCode = `${name.trim()} = useMemo(() => ${implicitReturn ? value.trim() : `(${value.trim()})`}, [])`
       return fixer.replaceText(definition, fixedCode)
     }
 
+    const useCallbackFix = (fixer: Rule.RuleFixer): Rule.Fix | null => {
+      let fixedCode = ''
+      const sourceCode = context.getSourceCode();
+      const references = context.getScope()?.references
+      const filteredRefs = references?.filter((reference) => reference?.writeExpr)
+      // @ts-ignore
+      const definition = filteredRefs?.[0]?.writeExpr?.parent
+      if (!definition) return null
+      const [name, value] = sourceCode.getText(definition).split(/=(.+)/)
+      if(isArrowFn(value)){
+        fixedCode = `${name.trim()} = useCallback(${value.trim()}, [])`
+      } else {
+        fixedCode = `${name.trim()} = useCallback(${value.replace(`function ${name.trim()}`, 'function').trim()}, [])`
+      }
+      return fixer.replaceText(definition, fixedCode)
+    }
+
     return {
       JSXAttribute: (node: Rule.Node & Rule.NodeParentExtension) => {
         const { parent, value } = (node as unknown) as TSESTree.JSXAttribute &
@@ -95,16 +113,16 @@ const rule: Rule.RuleModule = {
           if (expression?.type !== "JSXEmptyExpression") {
             switch (getExpressionMemoStatus(context, expression)) {
               case MemoStatus.UnmemoizedObject:
-                context.report({ node, messageId: "object-usememo-props", fix: (fixer) => fix(fixer, false) });
+                context.report({ node, messageId: "object-usememo-props", fix: (fixer) => useMemoFix(fixer, false) });
                 break;
               case MemoStatus.UnmemoizedArray:
-                context.report({ node, messageId: "array-usememo-props", fix });
+                context.report({ node, messageId: "array-usememo-props", fix: (fixer) => useMemoFix(fixer) });
                 break;
               case MemoStatus.UnmemoizedNew:
-                context.report({ node, messageId: "instance-usememo-props", fix });
+                context.report({ node, messageId: "instance-usememo-props", fix: (fixer) => useMemoFix(fixer) });
                 break;
               case MemoStatus.UnmemoizedFunction:
-                report(node, "function-usecallback-props");
+                context.report({ node, messageId: "function-usecallback-props", fix: useCallbackFix });
                 break;
               case MemoStatus.UnmemoizedFunctionCall:
               case MemoStatus.UnmemoizedOther:
diff --git a/utils/index.ts b/utils/index.ts
index bbd47f5..58636dd 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -4,3 +4,5 @@ export function normalizeIndent(strings: TemplateStringsArray) {
   const leftPadding = match ? match[0].length : 0;
   return codeLines.map(line => line.substr(leftPadding)).join('\n');
 }
+
+export function isArrowFn(fn: string) { return /^[^{]+?=>/.test(fn.toString()); };

From 6497b2ab0bf42c9a935d3a30fb5da44bebc608ec Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Mon, 18 Oct 2021 14:04:43 -0400
Subject: [PATCH 42/50] accidentally committed a bunch of spaces

---
 require-memo.ts | 147 ------------------------------------------------
 1 file changed, 147 deletions(-)

diff --git a/require-memo.ts b/require-memo.ts
index ba838e5..9c2e116 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -25,153 +25,6 @@ function isMemoCallExpression(node: Rule.Node) {
   return false;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 function checkFunction(
   context: Rule.RuleContext,
   node: (

From 57d24c40d068c5176495580ae532c6a29cfac4d8 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Tue, 19 Oct 2021 14:30:00 -0400
Subject: [PATCH 43/50] commen out fixers and specs for now

---
 __tests__/require-usecallback.ts | 283 +++++++++++++++++++------------
 __tests__/require-usememo.ts     | 266 ++++++++++++++---------------
 require-usememo-children.ts      |   3 -
 require-usememo.ts               |  23 ++-
 4 files changed, 323 insertions(+), 252 deletions(-)

diff --git a/__tests__/require-usecallback.ts b/__tests__/require-usecallback.ts
index 20f48ef..f6270d6 100644
--- a/__tests__/require-usecallback.ts
+++ b/__tests__/require-usecallback.ts
@@ -85,12 +85,12 @@ ruleTester.run("useCallback", rule, {
           return <Child prop={myFn} />;
         }
       `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myFn = useCallback(function() {}, []);
-          return <Child prop={myFn} />;
-        }
-      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myFn = useCallback(function() {}, []);
+      //     return <Child prop={myFn} />;
+      //   }
+      // `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
     {
@@ -100,111 +100,174 @@ ruleTester.run("useCallback", rule, {
           return <Child prop={myFn} />;
         }
       `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myFn = useCallback(() => {}, []);
-          return <Child prop={myFn} />;
-        }
-      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myFn = useCallback(() => {}, []);
+      //     return <Child prop={myFn} />;
+      //   }
+      // `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          let myFn = useCallback(() => ({}));
-          myFn = () => ({});
-          return <Child prop={myFn} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          let myFn = useCallback(() => ({}));
-          myFn = () => ({});
-          return <Child prop={myFn} />;
-        }
-      `,
-      errors: [{ messageId: "usememo-const" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          return <Child prop={() => {}} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          return <Child prop={() => {}} />;
-        }
-      `,
-      errors: [{ messageId: "function-usecallback-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          return <Child prop={() => []} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          return <Child prop={() => []} />;
-        }
-      `,
-      errors: [{ messageId: "function-usecallback-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myFn = memoize(() => {});
-          return <Child prop={myFn} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myFn = memoize(() => {});
-          return <Child prop={myFn} />;
-        }
-      `,
-      options: [{ strict: true }],
-      errors: [{ messageId: "unknown-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myFn = lodash.memoize(() => []);
-          return <Child prop={myFn} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myFn = lodash.memoize(() => []);
-          return <Child prop={myFn} />;
-        }
-      `,
-      options: [{ strict: true }],
-      errors: [{ messageId: "unknown-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myFn1 = () => [];
-          const myFn2 = useCallback(() => myFn1, [myFn1]);
-          return <Child prop={myFn2} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myFn1 = () => [];
-          const myFn2 = useCallback(() => myFn1, [myFn1]);
-          return <Child prop={myFn2} />;
-        }
-      `,
-      errors: [{ messageId: "function-usecallback-deps" }],
-    },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       let myFn = useCallback(() => ({}));
+    //       myFn = () => ({});
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       let myFn = useCallback(() => ({}));
+    //       myFn = () => ({});
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "usememo-const" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={() => {}} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={() => {}} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "function-usecallback-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={() => []} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={() => []} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "function-usecallback-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn = memoize(() => {});
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn = memoize(() => {});
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   options: [{ strict: true }],
+    //   errors: [{ messageId: "unknown-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn = lodash.memoize(() => []);
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn = lodash.memoize(() => []);
+    //       return <Child prop={myFn} />;
+    //     }
+    //   `,
+    //   options: [{ strict: true }],
+    //   errors: [{ messageId: "unknown-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn1 = () => [];
+    //       const myFn2 = useCallback(() => myFn1, [myFn1]);
+    //       return <Child prop={myFn2} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myFn1 = () => [];
+    //       const myFn2 = useCallback(() => myFn1, [myFn1]);
+    //       return <Child prop={myFn2} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "function-usecallback-deps" }],
+    // },
+    // {
+    //   code: normalizeIndent`
+    //     // @flow
+    //     import { d2Uri } from 'd2/utils/Routes'
+    //     import { prettyNumber } from '@vydia/js-core'
+    //     import { useHistory } from 'react-router'
+    //     import { useIsLabel } from 'd2/hooks/useIsLabel'
+    //     import { useOrganizationTotalConflictsBoxQuery, useUserTotalConflictsBoxQuery } from './queries'
+    //     import SummaryBox from 'd2/components/SummaryBox'
+    //     import useTranslations from './translations'
+    //     import type { StatelessFunctionalComponent } from 'react'
+
+    //     const TotalConflictsBox: StatelessFunctionalComponent<{}> = () => {
+    //       const [isLabel] = useIsLabel()
+    //       const [organizationData] = useOrganizationTotalConflictsBoxQuery({ isLabel })
+    //       const [userData] = useUserTotalConflictsBoxQuery({ isLabel })
+    //       const t = useTranslations()
+    //       const history = useHistory()
+
+    //       const data = isLabel ? organizationData : userData
+    //       return (<SummaryBox
+    //         icon='ban'
+    //         onClick={() => history.push(d2Uri('/insights/conflicts'))}
+    //         testID='WidgetDashboard-TotalConflictsBox'
+    //         title={isLabel ? t.labelTotalConflicts : t.userTotalConflicts}
+    //         value={data && prettyNumber(data.totalConflicts)}
+    //       />)
+    //     }
+
+    //     export default TotalConflictsBox
+    //   `,
+    //   output: normalizeIndent`
+    //     // @flow
+    //     import { d2Uri } from 'd2/utils/Routes'
+    //     import { prettyNumber } from '@vydia/js-core'
+    //     import { useHistory } from 'react-router'
+    //     import { useIsLabel } from 'd2/hooks/useIsLabel'
+    //     import { useOrganizationTotalConflictsBoxQuery, useUserTotalConflictsBoxQuery } from './queries'
+    //     import SummaryBox from 'd2/components/SummaryBox'
+    //     import useTranslations from './translations'
+    //     import type { StatelessFunctionalComponent } from 'react'
+
+    //     const TotalConflictsBox: StatelessFunctionalComponent<{}> = () => {
+    //       const [isLabel] = useIsLabel()
+    //       const [organizationData] = useOrganizationTotalConflictsBoxQuery({ isLabel })
+    //       const [userData] = useUserTotalConflictsBoxQuery({ isLabel })
+    //       const t = useTranslations()
+    //       const history = useHistory()
+
+    //       const data = isLabel ? organizationData : userData
+    //       return (<SummaryBox
+    //         icon='ban'
+    //         onClick={() => history.push(d2Uri('/insights/conflicts'))}
+    //         testID='WidgetDashboard-TotalConflictsBox'
+    //         title={isLabel ? t.labelTotalConflicts : t.userTotalConflicts}
+    //         value={data && prettyNumber(data.totalConflicts)}
+    //       />)
+    //     }
+
+    //     export default TotalConflictsBox
+    //   `,
+    //   errors: [{ messageId: "function-usecallback-props"}]
+    // }
   ],
 });
diff --git a/__tests__/require-usememo.ts b/__tests__/require-usememo.ts
index 7077b22..bb3d43c 100644
--- a/__tests__/require-usememo.ts
+++ b/__tests__/require-usememo.ts
@@ -95,12 +95,12 @@ ruleTester.run("useMemo", rule, {
           return <Child prop={myObject} />;
         }
       `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myObject = useMemo(() => ({}), []);
-          return <Child prop={myObject} />;
-        }
-      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myObject = useMemo(() => ({}), []);
+      //     return <Child prop={myObject} />;
+      //   }
+      // `,
       errors: [{ messageId: "object-usememo-props" }],
     },
     {
@@ -110,12 +110,12 @@ ruleTester.run("useMemo", rule, {
           return <Child prop={myArray} />;
         }
       `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myArray = useMemo(() => [], []);
-          return <Child prop={myArray} />;
-        }
-      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myArray = useMemo(() => [], []);
+      //     return <Child prop={myArray} />;
+      //   }
+      // `,
       errors: [{ messageId: "array-usememo-props" }],
     },
     {
@@ -125,128 +125,128 @@ ruleTester.run("useMemo", rule, {
           return <Child prop={myInstance} />;
         }
       `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myInstance = useMemo(() => new Object(), []);
-          return <Child prop={myInstance} />;
-        }
-      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myInstance = useMemo(() => new Object(), []);
+      //     return <Child prop={myInstance} />;
+      //   }
+      // `,
       errors: [{ messageId: "instance-usememo-props" }],
     },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          let myObject = useMemo({});
-          myObject = {a: 'b'};
-          return <Child prop={myObject} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          let myObject = useMemo({});
-          myObject = {a: 'b'};
-          return <Child prop={myObject} />;
-        }
-      `,
-      errors: [{ messageId: "usememo-const" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          return <Child prop={{}} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          return <Child prop={{}} />;
-        }
-      `,
-      errors: [{ messageId: "object-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          return <Child prop={[]} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          return <Child prop={[]} />;
-        }
-      `,
-      errors: [{ messageId: "array-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myObject = memoize({});
-          return <Child prop={myObject} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myObject = memoize({});
-          return <Child prop={myObject} />;
-        }
-      `,
-      options: [{ strict: true }],
-      errors: [{ messageId: "unknown-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myArray = lodash.memoize([]);
-        return <Child prop={myArray} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myArray = lodash.memoize([]);
-        return <Child prop={myArray} />;
-        }
-      `,
-      options: [{ strict: true }],
-      errors: [{ messageId: "unknown-usememo-props" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myArray1 = [];
-          const myArray2 = useMemo(() => myArray1, [myArray1]);
-          return <Child prop={myArray2} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myArray1 = [];
-          const myArray2 = useMemo(() => myArray1, [myArray1]);
-          return <Child prop={myArray2} />;
-        }
-      `,
-      errors: [{ messageId: "array-usememo-deps" }],
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        const Component = () => {
-          const myComplexString = css\`color: red;\`;
-          return <Child prop={myComplexString} />;
-        }
-      `,
-      output: normalizeIndent`
-        const Component = () => {
-          const myComplexString = css\`color: red;\`;
-          return <Child prop={myComplexString} />;
-        }
-      `,
-      options: [{ strict: true }],
-      errors: [{ messageId: "unknown-usememo-props" }],
-    },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       let myObject = useMemo({});
+    //       myObject = {a: 'b'};
+    //       return <Child prop={myObject} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       let myObject = useMemo({});
+    //       myObject = {a: 'b'};
+    //       return <Child prop={myObject} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "usememo-const" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={{}} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={{}} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "object-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={[]} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       return <Child prop={[]} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "array-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myObject = memoize({});
+    //       return <Child prop={myObject} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myObject = memoize({});
+    //       return <Child prop={myObject} />;
+    //     }
+    //   `,
+    //   options: [{ strict: true }],
+    //   errors: [{ messageId: "unknown-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myArray = lodash.memoize([]);
+    //     return <Child prop={myArray} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myArray = lodash.memoize([]);
+    //     return <Child prop={myArray} />;
+    //     }
+    //   `,
+    //   options: [{ strict: true }],
+    //   errors: [{ messageId: "unknown-usememo-props" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myArray1 = [];
+    //       const myArray2 = useMemo(() => myArray1, [myArray1]);
+    //       return <Child prop={myArray2} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myArray1 = [];
+    //       const myArray2 = useMemo(() => myArray1, [myArray1]);
+    //       return <Child prop={myArray2} />;
+    //     }
+    //   `,
+    //   errors: [{ messageId: "array-usememo-deps" }],
+    // },
+    // // TODO: setup fixer for the following spec (output currently matches code)
+    // {
+    //   code: normalizeIndent`
+    //     const Component = () => {
+    //       const myComplexString = css\`color: red;\`;
+    //       return <Child prop={myComplexString} />;
+    //     }
+    //   `,
+    //   output: normalizeIndent`
+    //     const Component = () => {
+    //       const myComplexString = css\`color: red;\`;
+    //       return <Child prop={myComplexString} />;
+    //     }
+    //   `,
+    //   options: [{ strict: true }],
+    //   errors: [{ messageId: "unknown-usememo-props" }],
+    // },
   ],
 });
diff --git a/require-usememo-children.ts b/require-usememo-children.ts
index e99e351..e1ccb47 100644
--- a/require-usememo-children.ts
+++ b/require-usememo-children.ts
@@ -7,9 +7,6 @@ import {
   MemoStatus,
 } from "./common";
 
-const componentNameRegex = /^[^a-z]/;
-const hookNameRegex = /^use[A-Z0-9].*$/;
-
 const messages = {
   "object-usememo-children":
     "Object literal should be wrapped in React.useMemo() when used as children",
diff --git a/require-usememo.ts b/require-usememo.ts
index 5101f13..300a856 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -10,11 +10,22 @@ import {
   MemoStatus,
 } from "./common";
 
-const hookNameRegex = /^use[A-Z0-9].*$/;
+const hookNames: string[] = [
+  'useState',
+  'useEffect',
+  'useContext',
+  'useReducer',
+  'useCallback',
+  'useMemo',
+  'useRef',
+  'useImperativeHandle',
+  'useLayoutEffect',
+  'useDebugValue',
+]
 
 function isHook(node: TSESTree.Node) {
   if (node.type === "Identifier") {
-    return hookNameRegex.test(node.name);
+    return Boolean(hookNames.find(a => a.includes(node.name)));
   } else if (
     node.type === "MemberExpression" &&
     !node.computed &&
@@ -113,16 +124,16 @@ const rule: Rule.RuleModule = {
           if (expression?.type !== "JSXEmptyExpression") {
             switch (getExpressionMemoStatus(context, expression)) {
               case MemoStatus.UnmemoizedObject:
-                context.report({ node, messageId: "object-usememo-props", fix: (fixer) => useMemoFix(fixer, false) });
+                context.report({ node, messageId: "object-usememo-props" });
                 break;
               case MemoStatus.UnmemoizedArray:
-                context.report({ node, messageId: "array-usememo-props", fix: (fixer) => useMemoFix(fixer) });
+                context.report({ node, messageId: "array-usememo-props" });
                 break;
               case MemoStatus.UnmemoizedNew:
-                context.report({ node, messageId: "instance-usememo-props", fix: (fixer) => useMemoFix(fixer) });
+                context.report({ node, messageId: "instance-usememo-props" });
                 break;
               case MemoStatus.UnmemoizedFunction:
-                context.report({ node, messageId: "function-usecallback-props", fix: useCallbackFix });
+                context.report({ node, messageId: "function-usecallback-props" });
                 break;
               case MemoStatus.UnmemoizedFunctionCall:
               case MemoStatus.UnmemoizedOther:

From 3c6152f1d967cc1955208accb5784371f0d2c699 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Tue, 19 Oct 2021 14:31:28 -0400
Subject: [PATCH 44/50] 0.0.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b5fe0c1..447a68b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From e1e5e15497cb2d8132f7a40227c2b0b6ac9df084 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Tue, 19 Oct 2021 14:31:28 -0400
Subject: [PATCH 45/50] version-bump


From 42b638cff566873a03f5058e251935bdf4ff3385 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Wed, 20 Oct 2021 10:11:05 -0400
Subject: [PATCH 46/50] rolled back fixers, have memo fixing but broken on one
 spec

---
 __tests__/require-memo.ts | 17 ++++++++++----
 require-memo.ts           | 47 ++++++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index 8dc9966..29fbbae 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -86,6 +86,8 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
+        import { memo } from 'react'
+
         const Component = memo(() => <div />)
       `
     },
@@ -95,17 +97,20 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
+        import { memo } from 'react'
+
         const Component = memo(useRef(() => <div />))
       `
     },
-    // TODO: setup fixer for the following spec (output currently matches code)
     {
       code: normalizeIndent`
         const Component = function Component() { return <div />; }
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        const Component = function Component() { return <div />; }
+        import { memo } from 'react'
+
+        const Component = memo(function Component() { return <div />; })
       `
     },
     // TODO: setup fixer for the following spec (output currently matches code)
@@ -115,7 +120,9 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        const Component = useRef(function() { return <div />; })
+        import { memo } from 'react'
+
+        const Component = useRef(memo(function() { return <div />; }))
       `
     },
     // TODO: setup fixer for the following spec (output currently matches code)
@@ -125,7 +132,9 @@ ruleTester.run("memo", rule, {
       `,
       errors: [{ messageId: "memo-required" }],
       output: normalizeIndent`
-        function Component() { return <div />; }
+        import { memo } from 'react'
+
+        memo(function Component() { return <div />; })
       `
     },
     // {
diff --git a/require-memo.ts b/require-memo.ts
index 9c2e116..383d211 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -47,23 +47,23 @@ function checkFunction(
     const { id } = currentNode;
     if (id.type === "Identifier") {
       if (componentNameRegex.test(id.name)) {
-        if (node.type === 'ArrowFunctionExpression') {
-          context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
-            const parent = node.parent
-            let scope
-            if (parent.type === 'VariableDeclarator') {
-              scope = node
-            } else {
-              scope = parent
-            }
-            const sourceCode = context.getSourceCode();
-            let fixedCode = `memo(${sourceCode.getText(scope)})`
-
-            return fixer.replaceText(scope, fixedCode);
-          } });
-          return
-        }
-        context.report({ node, messageId: "memo-required" });
+        context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+          const parent = node.parent
+          let scope
+          if (parent.type === 'VariableDeclarator') {
+            scope = node
+          } else {
+            scope = parent
+          }
+          const sourceCode = context.getSourceCode();
+// FIX THIS FOR FAILING SPEC
+          let fixedCode = `memo(${sourceCode.getText(scope)})`
+          // @ts-ignore
+          return [
+            fixer.insertTextBefore(parent.parent.parent, 'import { memo } from \'react\'\n\n'),
+            fixer.replaceText(scope, fixedCode),
+          ]
+        } });
       }
     }
   } else if (
@@ -71,7 +71,18 @@ function checkFunction(
     currentNode.type === "Program"
   ) {
     if (node.id !== null && componentNameRegex.test(node.id.name)) {
-      context.report({ node, messageId: "memo-required" });
+      context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+        // const parent = node?.parent
+        let scope = node
+
+        const sourceCode = context.getSourceCode();
+        let fixedCode = `memo(${sourceCode.getText(scope)})`
+        // @ts-ignore
+        return [
+          fixer.insertTextBefore(node, 'import { memo } from \'react\'\n\n'),
+          fixer.replaceText(node, fixedCode),
+        ]
+      } });
     } else {
       if (context.getFilename() === "<input>") return;
       const filename = path.basename(context.getFilename());

From 7dba0df29f0e909ae92d3f1c182d38183347596f Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Wed, 20 Oct 2021 11:12:31 -0400
Subject: [PATCH 47/50] this is very hacky but it works

---
 __tests__/require-usecallback.ts | 190 ++++++++++++-------------
 __tests__/require-usememo.ts     | 230 +++++++++++++++----------------
 require-memo.ts                  |   4 +
 require-usememo.ts               |  30 +---
 utils/index.ts                   |  30 ++++
 5 files changed, 245 insertions(+), 239 deletions(-)

diff --git a/__tests__/require-usecallback.ts b/__tests__/require-usecallback.ts
index f6270d6..368fe6e 100644
--- a/__tests__/require-usecallback.ts
+++ b/__tests__/require-usecallback.ts
@@ -108,104 +108,104 @@ ruleTester.run("useCallback", rule, {
       // `,
       errors: [{ messageId: "function-usecallback-props" }],
     },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          let myFn = useCallback(() => ({}));
+          myFn = () => ({});
+          return <Child prop={myFn} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     let myFn = useCallback(() => ({}));
+      //     myFn = () => ({});
+      //     return <Child prop={myFn} />;
+      //   }
+      // `,
+      errors: [{ messageId: "usememo-const" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => {}} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     return <Child prop={() => {}} />;
+      //   }
+      // `,
+      errors: [{ messageId: "function-usecallback-props" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={() => []} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     return <Child prop={() => []} />;
+      //   }
+      // `,
+      errors: [{ messageId: "function-usecallback-props" }],
+    },
     // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       let myFn = useCallback(() => ({}));
-    //       myFn = () => ({});
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       let myFn = useCallback(() => ({}));
-    //       myFn = () => ({});
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "usememo-const" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={() => {}} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={() => {}} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "function-usecallback-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={() => []} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={() => []} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "function-usecallback-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn = memoize(() => {});
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn = memoize(() => {});
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   options: [{ strict: true }],
-    //   errors: [{ messageId: "unknown-usememo-props" }],
-    // },
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = memoize(() => {});
+          return <Child prop={myFn} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myFn = memoize(() => {});
+      //     return <Child prop={myFn} />;
+      //   }
+      // `,
+      options: [{ strict: true }],
+      errors: [{ messageId: "unknown-usememo-props" }],
+    },
     // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn = lodash.memoize(() => []);
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn = lodash.memoize(() => []);
-    //       return <Child prop={myFn} />;
-    //     }
-    //   `,
-    //   options: [{ strict: true }],
-    //   errors: [{ messageId: "unknown-usememo-props" }],
-    // },
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn = lodash.memoize(() => []);
+          return <Child prop={myFn} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myFn = lodash.memoize(() => []);
+      //     return <Child prop={myFn} />;
+      //   }
+      // `,
+      options: [{ strict: true }],
+      errors: [{ messageId: "unknown-usememo-props" }],
+    },
     // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn1 = () => [];
-    //       const myFn2 = useCallback(() => myFn1, [myFn1]);
-    //       return <Child prop={myFn2} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myFn1 = () => [];
-    //       const myFn2 = useCallback(() => myFn1, [myFn1]);
-    //       return <Child prop={myFn2} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "function-usecallback-deps" }],
-    // },
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myFn1 = () => [];
+          const myFn2 = useCallback(() => myFn1, [myFn1]);
+          return <Child prop={myFn2} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myFn1 = () => [];
+      //     const myFn2 = useCallback(() => myFn1, [myFn1]);
+      //     return <Child prop={myFn2} />;
+      //   }
+      // `,
+      errors: [{ messageId: "function-usecallback-deps" }],
+    },
     // {
     //   code: normalizeIndent`
     //     // @flow
diff --git a/__tests__/require-usememo.ts b/__tests__/require-usememo.ts
index bb3d43c..856dc8b 100644
--- a/__tests__/require-usememo.ts
+++ b/__tests__/require-usememo.ts
@@ -133,120 +133,120 @@ ruleTester.run("useMemo", rule, {
       // `,
       errors: [{ messageId: "instance-usememo-props" }],
     },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       let myObject = useMemo({});
-    //       myObject = {a: 'b'};
-    //       return <Child prop={myObject} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       let myObject = useMemo({});
-    //       myObject = {a: 'b'};
-    //       return <Child prop={myObject} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "usememo-const" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={{}} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={{}} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "object-usememo-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={[]} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       return <Child prop={[]} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "array-usememo-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myObject = memoize({});
-    //       return <Child prop={myObject} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myObject = memoize({});
-    //       return <Child prop={myObject} />;
-    //     }
-    //   `,
-    //   options: [{ strict: true }],
-    //   errors: [{ messageId: "unknown-usememo-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myArray = lodash.memoize([]);
-    //     return <Child prop={myArray} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myArray = lodash.memoize([]);
-    //     return <Child prop={myArray} />;
-    //     }
-    //   `,
-    //   options: [{ strict: true }],
-    //   errors: [{ messageId: "unknown-usememo-props" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myArray1 = [];
-    //       const myArray2 = useMemo(() => myArray1, [myArray1]);
-    //       return <Child prop={myArray2} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myArray1 = [];
-    //       const myArray2 = useMemo(() => myArray1, [myArray1]);
-    //       return <Child prop={myArray2} />;
-    //     }
-    //   `,
-    //   errors: [{ messageId: "array-usememo-deps" }],
-    // },
-    // // TODO: setup fixer for the following spec (output currently matches code)
-    // {
-    //   code: normalizeIndent`
-    //     const Component = () => {
-    //       const myComplexString = css\`color: red;\`;
-    //       return <Child prop={myComplexString} />;
-    //     }
-    //   `,
-    //   output: normalizeIndent`
-    //     const Component = () => {
-    //       const myComplexString = css\`color: red;\`;
-    //       return <Child prop={myComplexString} />;
-    //     }
-    //   `,
-    //   options: [{ strict: true }],
-    //   errors: [{ messageId: "unknown-usememo-props" }],
-    // },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          let myObject = useMemo({});
+          myObject = {a: 'b'};
+          return <Child prop={myObject} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     let myObject = useMemo({});
+      //     myObject = {a: 'b'};
+      //     return <Child prop={myObject} />;
+      //   }
+      // `,
+      errors: [{ messageId: "usememo-const" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={{}} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     return <Child prop={{}} />;
+      //   }
+      // `,
+      errors: [{ messageId: "object-usememo-props" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          return <Child prop={[]} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     return <Child prop={[]} />;
+      //   }
+      // `,
+      errors: [{ messageId: "array-usememo-props" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myObject = memoize({});
+          return <Child prop={myObject} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myObject = memoize({});
+      //     return <Child prop={myObject} />;
+      //   }
+      // `,
+      options: [{ strict: true }],
+      errors: [{ messageId: "unknown-usememo-props" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray = lodash.memoize([]);
+        return <Child prop={myArray} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myArray = lodash.memoize([]);
+      //   return <Child prop={myArray} />;
+      //   }
+      // `,
+      options: [{ strict: true }],
+      errors: [{ messageId: "unknown-usememo-props" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myArray1 = [];
+          const myArray2 = useMemo(() => myArray1, [myArray1]);
+          return <Child prop={myArray2} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myArray1 = [];
+      //     const myArray2 = useMemo(() => myArray1, [myArray1]);
+      //     return <Child prop={myArray2} />;
+      //   }
+      // `,
+      errors: [{ messageId: "array-usememo-deps" }],
+    },
+    // TODO: setup fixer for the following spec (output currently matches code)
+    {
+      code: normalizeIndent`
+        const Component = () => {
+          const myComplexString = css\`color: red;\`;
+          return <Child prop={myComplexString} />;
+        }
+      `,
+      // output: normalizeIndent`
+      //   const Component = () => {
+      //     const myComplexString = css\`color: red;\`;
+      //     return <Child prop={myComplexString} />;
+      //   }
+      // `,
+      options: [{ strict: true }],
+      errors: [{ messageId: "unknown-usememo-props" }],
+    },
   ],
 });
diff --git a/require-memo.ts b/require-memo.ts
index 383d211..bc8510e 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -57,7 +57,11 @@ function checkFunction(
           }
           const sourceCode = context.getSourceCode();
 // FIX THIS FOR FAILING SPEC
+          const text = sourceCode.getText(scope);
           let fixedCode = `memo(${sourceCode.getText(scope)})`
+          if (text.startsWith('useRef(function')) {
+            fixedCode = `useRef(${sourceCode.getText(scope).replace('useRef', 'memo')})`
+          }
           // @ts-ignore
           return [
             fixer.insertTextBefore(parent.parent.parent, 'import { memo } from \'react\'\n\n'),
diff --git a/require-usememo.ts b/require-usememo.ts
index 300a856..28606d5 100644
--- a/require-usememo.ts
+++ b/require-usememo.ts
@@ -2,7 +2,7 @@ import { Rule } from "eslint";
 import * as ESTree from "estree";
 import { TSESTree } from "@typescript-eslint/types";
 import { Node } from "@typescript-eslint/types/dist/ast-spec"
-import { isArrowFn } from "./utils";
+import { isArrowFn, isHook } from "./utils";
 
 import {
   getExpressionMemoStatus,
@@ -10,34 +10,6 @@ import {
   MemoStatus,
 } from "./common";
 
-const hookNames: string[] = [
-  'useState',
-  'useEffect',
-  'useContext',
-  'useReducer',
-  'useCallback',
-  'useMemo',
-  'useRef',
-  'useImperativeHandle',
-  'useLayoutEffect',
-  'useDebugValue',
-]
-
-function isHook(node: TSESTree.Node) {
-  if (node.type === "Identifier") {
-    return Boolean(hookNames.find(a => a.includes(node.name)));
-  } else if (
-    node.type === "MemberExpression" &&
-    !node.computed &&
-    isHook(node.property)
-  ) {
-    const obj = node.object;
-    return obj.type === "Identifier" && obj.name === "React";
-  } else {
-    return false;
-  }
-}
-
 const messages = {
   "object-usememo-props":
     "Object literal should be wrapped in React.useMemo() when used as a prop",
diff --git a/utils/index.ts b/utils/index.ts
index 58636dd..b530bcf 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -1,3 +1,5 @@
+import { TSESTree } from "@typescript-eslint/types";
+
 export function normalizeIndent(strings: TemplateStringsArray) {
   const codeLines = strings[0].split('\n');
   const match = codeLines[1].match(/\s+/);
@@ -6,3 +8,31 @@ export function normalizeIndent(strings: TemplateStringsArray) {
 }
 
 export function isArrowFn(fn: string) { return /^[^{]+?=>/.test(fn.toString()); };
+
+export const hookNames: string[] = [
+  'useState',
+  'useEffect',
+  'useContext',
+  'useReducer',
+  'useCallback',
+  'useMemo',
+  'useRef',
+  'useImperativeHandle',
+  'useLayoutEffect',
+  'useDebugValue',
+]
+
+export function isHook(node: TSESTree.Node) {
+  if (node.type === "Identifier") {
+    return Boolean(hookNames.find(a => a.includes(node.name)));
+  } else if (
+    node.type === "MemberExpression" &&
+    !node.computed &&
+    isHook(node.property)
+  ) {
+    const obj = node.object;
+    return obj.type === "Identifier" && obj.name === "React";
+  } else {
+    return false;
+  }
+}

From a9347e3074522b1d21a46b2684c376baa4382492 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 28 Oct 2021 13:00:40 -0400
Subject: [PATCH 48/50] updates

---
 __tests__/require-memo.ts |  81 +++++++++++++---------------
 require-memo.ts           | 111 ++++++++++++++++++++++++++++++--------
 2 files changed, 126 insertions(+), 66 deletions(-)

diff --git a/__tests__/require-memo.ts b/__tests__/require-memo.ts
index 29fbbae..eaa5e24 100644
--- a/__tests__/require-memo.ts
+++ b/__tests__/require-memo.ts
@@ -81,61 +81,56 @@ ruleTester.run("memo", rule, {
   ],
   invalid: [
     {
-      code: normalizeIndent`
-        const Component = () => <div />
-      `,
+      code: `import { memo } from 'react'
+const Component = () => <div />`,
       errors: [{ messageId: "memo-required" }],
-      output: normalizeIndent`
-        import { memo } from 'react'
-
-        const Component = memo(() => <div />)
-      `
+      output: `import { memo } from 'react'
+const Component = memo(() => <div />)`
     },
     {
-      code: normalizeIndent`
-        const Component = useRef(() => <div />)
-      `,
+      code: `// @flow
+      import { map } from 'lodash'
+const Component = useRef(() => <div />)`,
       errors: [{ messageId: "memo-required" }],
-      output: normalizeIndent`
-        import { memo } from 'react'
+      output: `// @flow
+import { memo } from 'react'
+      import { map } from 'lodash'
+const Component = memo(useRef(() => <div />))`
+    },
+//     {
+//       code: `const Component = function Component() { return <div />; }`,
+//       errors: [{ messageId: "memo-required" }],
+//       output: `import { memo } from 'react'
+// const Component = memo(function Component() { return <div />; })`
+//     },
+//     {
+//       code: `const Component = useRef(function() { return <div />; })`,
+//       errors: [{ messageId: "memo-required" }],
+//       output: `import { memo } from 'react'
+// const Component = useRef(memo(function() { return <div />; }))`
+//     },
+    {
+      code: `// @flow
+import { map } from 'lodash'
 
-        const Component = memo(useRef(() => <div />))
-      `
-    },
-    {
-      code: normalizeIndent`
-        const Component = function Component() { return <div />; }
-      `,
+console.warn('Hello World')
+function Component() { return <div />; }`,
       errors: [{ messageId: "memo-required" }],
-      output: normalizeIndent`
-        import { memo } from 'react'
+      output: `// @flow
+import { memo } from 'react'
+import { map } from 'lodash'
 
-        const Component = memo(function Component() { return <div />; })
-      `
+console.warn('Hello World')
+memo(function Component() { return <div />; })`
     },
-    // TODO: setup fixer for the following spec (output currently matches code)
     {
-      code: normalizeIndent`
-        const Component = useRef(function() { return <div />; })
-      `,
-      errors: [{ messageId: "memo-required" }],
-      output: normalizeIndent`
-        import { memo } from 'react'
+      code: `import { memo } from 'react'
 
-        const Component = useRef(memo(function() { return <div />; }))
-      `
-    },
-    // TODO: setup fixer for the following spec (output currently matches code)
-    {
-      code: normalizeIndent`
-        function Component() { return <div />; }
-      `,
+function Component() { return <div />; }`,
       errors: [{ messageId: "memo-required" }],
-      output: normalizeIndent`
-        import { memo } from 'react'
+      output: `import { memo } from 'react'
 
-        memo(function Component() { return <div />; })
-      `
+memo(function Component() { return <div />; })`
     },
     // {
     //   filename: "dir/Component.js",
diff --git a/require-memo.ts b/require-memo.ts
index bc8510e..f37e725 100644
--- a/require-memo.ts
+++ b/require-memo.ts
@@ -3,6 +3,7 @@ import * as ESTree from "estree";
 import * as path from "path";
 
 const componentNameRegex = /^[^a-z]/;
+const memoImportText = 'import { memo } from \'react\'\n'
 
 function isMemoCallExpression(node: Rule.Node) {
   if (node.type !== "CallExpression") return false;
@@ -32,7 +33,8 @@ function checkFunction(
     | ESTree.FunctionExpression
     | ESTree.FunctionDeclaration
   ) &
-    Rule.NodeParentExtension
+    Rule.NodeParentExtension,
+  alreadyImportedMemo: boolean
 ) {
   let currentNode = node.parent;
   while (currentNode.type === "CallExpression") {
@@ -47,7 +49,8 @@ function checkFunction(
     const { id } = currentNode;
     if (id.type === "Identifier") {
       if (componentNameRegex.test(id.name)) {
-        context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
+        context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix | null  => {
+          // @ts-ignore
           const parent = node.parent
           let scope
           if (parent.type === 'VariableDeclarator') {
@@ -55,18 +58,42 @@ function checkFunction(
           } else {
             scope = parent
           }
+
           const sourceCode = context.getSourceCode();
-// FIX THIS FOR FAILING SPEC
+
+          const getIndexToInsertImport = () => {
+            const allComments = sourceCode.getAllComments()
+            let insertImportLoc = 1
+            for (let i = 0, l = allComments.length; i < l; i++) {
+              const comment = allComments[i]
+              // @ts-ignore
+              const commentIsBackToBackWithPrev = comment.loc.start.line <= insertImportLoc + 1
+
+              if (!commentIsBackToBackWithPrev) break
+              // @ts-ignore
+              insertImportLoc = comment.loc.end.line
+            }
+            try {
+              return sourceCode.getIndexFromLoc({ line: insertImportLoc + 1, column: 0 })
+            } catch {
+              null
+            }
+          }
+
+          const importIndex = getIndexToInsertImport()
           const text = sourceCode.getText(scope);
-          let fixedCode = `memo(${sourceCode.getText(scope)})`
+          // @ts-ignore
+          const fullSourceText = sourceCode.getText();
+
+          let fixedCode = `memo(${text})`
           if (text.startsWith('useRef(function')) {
-            fixedCode = `useRef(${sourceCode.getText(scope).replace('useRef', 'memo')})`
+            fixedCode = `useRef(${text.replace('useRef', 'memo')})`
           }
           // @ts-ignore
           return [
-            fixer.insertTextBefore(parent.parent.parent, 'import { memo } from \'react\'\n\n'),
+            importIndex && !alreadyImportedMemo ? fixer.insertTextAfterRange([importIndex, importIndex], memoImportText) : null,
             fixer.replaceText(scope, fixedCode),
-          ]
+          ].filter(i => i)
         } });
       }
     }
@@ -76,16 +103,38 @@ function checkFunction(
   ) {
     if (node.id !== null && componentNameRegex.test(node.id.name)) {
       context.report({ node, messageId: "memo-required", fix: (fixer): Rule.Fix => {
-        // const parent = node?.parent
         let scope = node
-
         const sourceCode = context.getSourceCode();
-        let fixedCode = `memo(${sourceCode.getText(scope)})`
+
+        const getIndexToInsertImport = () => {
+          const allComments = sourceCode.getAllComments()
+          let insertImportLoc = 1
+          for (let i = 0, l = allComments.length; i < l; i++) {
+            const comment = allComments[i]
+            // @ts-ignore
+            const commentIsBackToBackWithPrev = comment.loc.start.line <= insertImportLoc + 1
+
+            if (!commentIsBackToBackWithPrev) break
+            // @ts-ignore
+            insertImportLoc = comment.loc.end.line
+          }
+          try {
+            return sourceCode.getIndexFromLoc({ line: insertImportLoc + 1, column: 0 })
+          } catch {
+            null
+          }
+        }
+
+        const importIndex = getIndexToInsertImport()
+
+        const text = sourceCode.getText(scope);
+        const fullSourceText = sourceCode.getText();
+        let fixedCode = `memo(${text})`
         // @ts-ignore
         return [
-          fixer.insertTextBefore(node, 'import { memo } from \'react\'\n\n'),
+          importIndex && !alreadyImportedMemo ? fixer.insertTextAfterRange([importIndex, importIndex], memoImportText) : null,
           fixer.replaceText(node, fixedCode),
-        ]
+        ].filter(i => i)
       } });
     } else {
       if (context.getFilename() === "<input>") return;
@@ -104,17 +153,33 @@ const rule: Rule.RuleModule = {
       "memo-required": "Component definition not wrapped in React.memo()",
     },
   },
-  create: (context) => ({
-    ArrowFunctionExpression(node) {
-      checkFunction(context, node);
-    },
-    FunctionDeclaration(node) {
-      checkFunction(context, node);
-    },
-    FunctionExpression(node) {
-      checkFunction(context, node);
-    },
-  }),
+  create: (context) => {
+    let alreadyImportedMemo = false
+
+    return {
+      ImportDeclaration (node) {
+        if (alreadyImportedMemo) return
+
+        if (node.source.value === 'react') {
+          const specifiers = node.specifiers
+          for (let i = 0, l = specifiers.length; i < l && !alreadyImportedMemo; i++) {
+            // @ts-ignore
+            const name = specifiers[i]?.imported?.name
+            if (name === 'memo') alreadyImportedMemo = true
+          }
+        }
+      },
+      ArrowFunctionExpression(node) {
+        checkFunction(context, node, alreadyImportedMemo);
+      },
+      FunctionDeclaration(node) {
+        checkFunction(context, node, alreadyImportedMemo);
+      },
+      FunctionExpression(node) {
+        checkFunction(context, node, alreadyImportedMemo);
+      },
+    }
+  },
 };
 
 export default rule;

From c5c1cd7aba55d1f27ecbe91cf4f774ac6f8d2317 Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 28 Oct 2021 13:00:46 -0400
Subject: [PATCH 49/50] 0.0.11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 447a68b..e62ba0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-memo",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "",
   "main": "dist/index.js",
   "author": "Stefano J. Attardi <github@attardi.org>",

From eb0a513b0f105be10732ee617389f340d3660a9b Mon Sep 17 00:00:00 2001
From: Dan Vassallo <danielvassallo87@gmail.com>
Date: Thu, 28 Oct 2021 13:00:46 -0400
Subject: [PATCH 50/50] version-bump