Merge pull request #152 from simplabs/has-task-call-expression-helper

Move `hasTaskCallExpression` to utils

Author: Mikek2252

rules/no-debug.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { hasTaskDecorator } = require('../utils/utils');
+const { hasTaskDecorator, hasTaskCallExpression } = require('../utils/utils');
 
 module.exports = {
   create(context) {
@@ -47,31 +47,6 @@ module.exports = {
   },
 };
 
-function hasTaskCallExpression(node) {
-  return Boolean(findTaskCallExpression(node));
-}
-
-function findTaskCallExpression(node) {
-  if (isTaskCallExpression(node)) {
-    return node;
-  }
-
-  if (node.type === 'CallExpression' && node.callee.type === 'MemberExpression') {
-    return findTaskCallExpression(node.callee.object);
-  }
-}
-
-function isTaskCallExpression(node) {
-  return (
-    node.type === 'CallExpression' &&
-    node.callee.type === 'Identifier' &&
-    node.callee.name === 'task' &&
-    node.arguments[0] &&
-    node.arguments[0].type === 'FunctionExpression' &&
-    node.arguments[0].generator
-  );
-}
-
 function hasDebugCallee(node) {
   let { callee } = node;
   return (

rules/require-task-name-suffix.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { hasTaskDecorator } = require('../utils/utils');
+const { hasTaskDecorator, hasTaskCallExpression } = require('../utils/utils');
 
 module.exports = {
   create(context) {
@@ -52,28 +52,3 @@ module.exports = {
     };
   },
 };
-
-function hasTaskCallExpression(node) {
-  return Boolean(findTaskCallExpression(node));
-}
-
-function findTaskCallExpression(node) {
-  if (isTaskCallExpression(node)) {
-    return node;
-  }
-
-  if (node.type === 'CallExpression' && node.callee.type === 'MemberExpression') {
-    return findTaskCallExpression(node.callee.object);
-  }
-}
-
-function isTaskCallExpression(node) {
-  return (
-    node.type === 'CallExpression' &&
-    node.callee.type === 'Identifier' &&
-    node.callee.name === 'task' &&
-    node.arguments[0] &&
-    node.arguments[0].type === 'FunctionExpression' &&
-    node.arguments[0].generator
-  );
-}

utils/utils.js

@@ -2,7 +2,7 @@
 
 const TASK_TYPES = ['task', 'restartableTask', 'dropTask', 'keepLatestTask', 'enqueueTask'];
 
-module.exports = { hasTaskDecorator };
+module.exports = { hasTaskDecorator, hasTaskCallExpression };
 
 function hasTaskDecorator(node) {
   if (!node.decorators) return false;
@@ -19,3 +19,28 @@ function hasTaskDecorator(node) {
     );
   });
 }
+
+function hasTaskCallExpression(node) {
+  return Boolean(findTaskCallExpression(node));
+}
+
+function findTaskCallExpression(node) {
+  if (isTaskCallExpression(node)) {
+    return node;
+  }
+
+  if (node.type === 'CallExpression' && node.callee.type === 'MemberExpression') {
+    return findTaskCallExpression(node.callee.object);
+  }
+}
+
+function isTaskCallExpression(node) {
+  return (
+    node.type === 'CallExpression' &&
+    node.callee.type === 'Identifier' &&
+    node.callee.name === 'task' &&
+    node.arguments[0] &&
+    node.arguments[0].type === 'FunctionExpression' &&
+    node.arguments[0].generator
+  );
+}