@bigbinary/eslint-plugin-neeto 1.1.19 → 1.1.20

package/dist/index.js

@@ -3885,7 +3885,7 @@
       name: ramda.test(PASCAL_CASE_REGEX)
     }
   };
-  var EXPORTED_WITH_T_PATTERN = {
+  var EXPORTED_WITH_T_PATTERN$1 = {
     type: TYPES.EXPORT_DEFAULT_DECLARATION,
     declaration: {
       type: TYPES.CALL_EXPRESSION,
@@ -4484,7 +4484,7 @@
           if (!isInsideComponentsDirectory(context)) return;
           var componentNodes = findMatchingNodesDeep(node.body, COMPONENT_PATTERN);
           if (ramda.isEmpty(componentNodes)) return;
-          var isExportedWithT = patternExistsDeep(EXPORTED_WITH_T_PATTERN, node);
+          var isExportedWithT = patternExistsDeep(EXPORTED_WITH_T_PATTERN$1, node);
           componentNodes.forEach(function (node) {
             var tFunctionMemeberExpressionNodes = findMatchingNodesDeep(node, T_FUNCTION_MEMBER_EXPRESSION_PATTERN);
             tFunctionMemeberExpressionNodes.forEach(function (node) {
@@ -6537,6 +6537,12 @@
       type: TYPES.IMPORT_SPECIFIER
     }]
   };
+
+  // const Component = withT(({ t, userName, ...otherProps }, randomProps) => {
+  //   const a = useRef();
+  //   const [isOpen, setIsOpen] = useState(false);
+  //   return (t("Hello"));
+  // });
   var WITH_T_HOC_PATTERN = {
     type: TYPES.VARIABLE_DECLARATION,
     kind: "const",
@@ -6563,11 +6569,107 @@
     }]
   };
 
+  // export default withT(Component);
+  var EXPORTED_WITH_T_PATTERN = {
+    type: TYPES.EXPORT_DEFAULT_DECLARATION,
+    declaration: {
+      type: TYPES.CALL_EXPRESSION,
+      callee: {
+        type: TYPES.IDENTIFIER,
+        name: "withT"
+      },
+      arguments: ramda.any(pure.matches({
+        type: TYPES.IDENTIFIER,
+        name: ramda.test(PASCAL_CASE_REGEX)
+      }))
+    }
+  };
+  var SMART_COMPONENT_PATTERN = {
+    type: TYPES.VARIABLE_DECLARATION,
+    kind: "const",
+    declarations: [{
+      type: TYPES.VARIABLE_DECLARATOR,
+      init: {
+        type: TYPES.ARROW_FUNCTION_EXPRESSION,
+        body: {
+          type: TYPES.BLOCK_STATEMENT,
+          body: function body(_body2) {
+            return _body2.length >= 2;
+          }
+        }
+      },
+      id: {
+        type: TYPES.IDENTIFIER,
+        name: ramda.test(PASCAL_CASE_REGEX)
+      }
+    }]
+  };
+
+  var getPropsCode = function getPropsCode(context, arrowFunctionExpression, props) {
+    if (ramda.isEmpty(arrowFunctionExpression.params)) return "";
+    if (props.type === TYPES.IDENTIFIER) {
+      return "{...".concat(getCode$1(context, props), " }");
+    }
+    if (props.type === TYPES.OBJECT_PATTERN) {
+      var _props$properties, _props$properties2, _props$properties2$0$;
+      if (((_props$properties = props.properties) === null || _props$properties === void 0 ? void 0 : _props$properties.length) === 1 && ((_props$properties2 = props.properties) === null || _props$properties2 === void 0 ? void 0 : (_props$properties2$0$ = _props$properties2[0].value) === null || _props$properties2$0$ === void 0 ? void 0 : _props$properties2$0$.name) === "t") {
+        return "";
+      }
+      return "{".concat(props.properties.map(function (property) {
+        return getCode$1(context, property);
+      }).filter(pure.isNot("t")).join(", "), " }");
+    }
+    return "";
+  };
+  var getCodeWithUseTranslationHook = function getCodeWithUseTranslationHook(context, arrowFunctionExpression) {
+    var _arrowFunctionExpress = _toArray(arrowFunctionExpression.params),
+      props = _arrowFunctionExpress[0],
+      restParams = _arrowFunctionExpress.slice(1);
+    var codeInsideBody = getCode$1(context, arrowFunctionExpression.body);
+    var codeWithUseTranslation = insertTextAfterPosition(0, codeInsideBody, "const { t } = useTranslation();\n");
+    var updatedProps = getPropsCode(context, arrowFunctionExpression, props);
+    var replacedCodeWithUseTranslation = "(".concat(updatedProps).concat(ramda.isEmpty(restParams) ? "" : "".concat(pure.isNotEmpty(updatedProps) ? ", " : "{}, ").concat(restParams.map(function (param) {
+      return getCode$1(context, param);
+    }).join(", ")), ") => ").concat(codeWithUseTranslation);
+    return replacedCodeWithUseTranslation;
+  };
+  var createUseTranslationImport = function createUseTranslationImport(context, fixer) {
+    return addFunctionImport({
+      context: context,
+      fixer: fixer,
+      functions: ["useTranslation"],
+      importPattern: REACT_I18_IMPORT_PATTERN
+    });
+  };
   var insertTextAfterPosition = function insertTextAfterPosition(position, inputString, textToInsert) {
     var firstCharacter = inputString.charAt(position);
     var restOfString = inputString.slice(position + 1);
     return firstCharacter + textToInsert + restOfString;
   };
+  var reportError = function reportError(_ref) {
+    var context = _ref.context,
+      node = _ref.node,
+      arrowFunctionExpression = _ref.arrowFunctionExpression,
+      _ref$isExportStatemen = _ref.isExportStatement,
+      isExportStatement = _ref$isExportStatemen === void 0 ? false : _ref$isExportStatemen;
+    return context.report({
+      node: node,
+      message: NO_WITH_T_IN_SMART_COMPONENTS,
+      fix: function fix(fixer) {
+        var fixers = [];
+        var replacedCodeWithUseTranslation = getCodeWithUseTranslationHook(context, arrowFunctionExpression);
+        if (isExportStatement) {
+          fixers.push(fixer.replaceText(node.declaration, node.declaration.arguments[0].name));
+          fixers.push(fixer.replaceText(arrowFunctionExpression, replacedCodeWithUseTranslation));
+        } else {
+          fixers.push(fixer.replaceText(node.declarations[0].init, replacedCodeWithUseTranslation));
+        }
+        var importUseTranslation = createUseTranslationImport(context, fixer);
+        importUseTranslation && fixers.push(importUseTranslation);
+        return fixers;
+      }
+    });
+  };
 
   var noWithTForSmartComponents = {
     meta: {
@@ -6579,52 +6681,26 @@
       fixable: "code"
     },
     create: function create(context) {
+      var componentDeclaration = null;
       return {
         VariableDeclaration: function VariableDeclaration(node) {
+          componentDeclaration = node;
           if (!pure.matches(WITH_T_HOC_PATTERN, node)) return;
           var arrowFunctionExpression = node.declarations[0].init.arguments[0];
-          var body = arrowFunctionExpression.body;
-          context.report({
+          reportError({
+            context: context,
             node: node,
-            message: NO_WITH_T_IN_SMART_COMPONENTS,
-            fix: function fix(fixer) {
-              var fixers = [];
-              var _arrowFunctionExpress = _toArray(arrowFunctionExpression.params),
-                props = _arrowFunctionExpress[0],
-                restParams = _arrowFunctionExpress.slice(1);
-              var getPropsCode = function getPropsCode() {
-                if (ramda.isEmpty(arrowFunctionExpression.params)) return "";
-                if (props.type === TYPES.IDENTIFIER) {
-                  return "{...".concat(getCode$1(context, props), " }");
-                }
-                if (props.type === TYPES.OBJECT_PATTERN) {
-                  var _props$properties, _props$properties2, _props$properties2$0$;
-                  if (((_props$properties = props.properties) === null || _props$properties === void 0 ? void 0 : _props$properties.length) === 1 && ((_props$properties2 = props.properties) === null || _props$properties2 === void 0 ? void 0 : (_props$properties2$0$ = _props$properties2[0].value) === null || _props$properties2$0$ === void 0 ? void 0 : _props$properties2$0$.name) === "t") {
-                    return "";
-                  }
-                  return "{".concat(props.properties.map(function (property) {
-                    return getCode$1(context, property);
-                  }).filter(pure.isNot("t")).join(", "), " }");
-                }
-                return "";
-              };
-              var codeInsideBody = getCode$1(context, body);
-              var codeWithUseTranslation = insertTextAfterPosition(0, codeInsideBody, "const { t } = useTranslation();\n");
-              var updatedProps = getPropsCode();
-              var replacedCodeWithUseTranslation = "(".concat(updatedProps).concat(ramda.isEmpty(restParams) ? "" : "".concat(pure.isNotEmpty(updatedProps) ? ", " : "").concat(restParams.map(function (param) {
-                return getCode$1(context, param);
-              }).join(", ")), ") => ").concat(codeWithUseTranslation);
-              var replaceIncorrectWithTCode = fixer.replaceText(node.declarations[0].init, replacedCodeWithUseTranslation);
-              fixers.push(replaceIncorrectWithTCode);
-              var importUseTranslation = addFunctionImport({
-                context: context,
-                fixer: fixer,
-                functions: ["useTranslation"],
-                importPattern: REACT_I18_IMPORT_PATTERN
-              });
-              importUseTranslation && fixers.push(importUseTranslation);
-              return fixers;
-            }
+            arrowFunctionExpression: arrowFunctionExpression
+          });
+        },
+        ExportDefaultDeclaration: function ExportDefaultDeclaration(node) {
+          if (!pure.matches(EXPORTED_WITH_T_PATTERN, node)) return;
+          if (!pure.matches(SMART_COMPONENT_PATTERN, componentDeclaration)) return;
+          reportError({
+            context: context,
+            node: node,
+            arrowFunctionExpression: componentDeclaration.declarations[0].init,
+            isExportStatement: true
           });
         }
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/eslint-plugin-neeto",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "main": "dist/index.js",
   "license": "UNLICENSED",
   "scripts": {