Fixed case with facory with enforce-store-naming-convention rule (#122)

Release v0.9.1
effector · Sep 13, 2022 · f2348df · f2348df
1 parent e55a708
commit f2348df
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.9.1
+
+- Fixed factory usage with `enforce-store-naming-convention`
+
 ## v0.9.0
 
 - Add new rule `no-patronum-debug` ([PR #121](https://github.com/effector/eslint-plugin/pull/121) by @raidenmiro)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-effector",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Enforcing best practices for Effector",
   "keywords": [
     "eslint",

diff --git a/rules/enforce-store-naming-convention/enforce-store-naming-convention.js b/rules/enforce-store-naming-convention/enforce-store-naming-convention.js
@@ -76,19 +76,22 @@ module.exports = {
         // Store creation with method
         const STORE_CREATION_METHODS = ["createStore", "restore", "combine"];
         for (const method of STORE_CREATION_METHODS) {
-          const localMethod = importedFromEffector.get(method);          
+          const localMethod = importedFromEffector.get(method);
           if (!localMethod) {
             continue;
           }
-            
+
           const isEffectorStoreCreation = node.callee.name === localMethod;
           if (!isEffectorStoreCreation) {
             continue;
           }
 
-          const parentNode = traverseParentByType(node, "VariableDeclarator", ["Program"]);
+          const parentNode = traverseParentByType(node, "VariableDeclarator", [
+            "Program",
+          ]);
 
-          const resultSavedInVariable = parentNode.type === "VariableDeclarator";
+          const resultSavedInVariable =
+            parentNode?.type === "VariableDeclarator";
           if (!resultSavedInVariable) {
             continue;
           }
@@ -116,7 +119,8 @@ module.exports = {
             return;
           }
 
-          const resultSavedInVariable = node.parent.type === "VariableDeclarator";
+          const resultSavedInVariable =
+            node.parent.type === "VariableDeclarator";
 
           if (!resultSavedInVariable) {
             return;
@@ -141,10 +145,12 @@ module.exports = {
         if (
           STORE_IN_DOMAIN_CREATION_METHODS.includes(node.callee?.property?.name)
         ) {
+          const parentNode = traverseParentByType(node, "VariableDeclarator", [
+            "Program",
+          ]);
 
-          const parentNode = traverseParentByType(node, "VariableDeclarator", ["Program"]);
-
-          const resultSavedInVariable = parentNode.type === "VariableDeclarator";
+          const resultSavedInVariable =
+            parentNode.type === "VariableDeclarator";
           if (!resultSavedInVariable) {
             return;
           }

diff --git a/rules/enforce-store-naming-convention/prefix/enforce-store-naming-convention-prefix.test.js b/rules/enforce-store-naming-convention/prefix/enforce-store-naming-convention-prefix.test.js
@@ -21,6 +21,7 @@ ruleTester.run("effector/enforce-store-naming-convention-prefix.test", rule, {
     "correct-examples-issue-23.js",
     "correct-store-naming-with-handlers.js",
     "correct-store-naming-in-domain-with-handlers.js",
+    "correct-factory.js",
   ]
     .map(readExampleForTheRule)
     .map((code) => ({ code })),

diff --git a/rules/enforce-store-naming-convention/prefix/examples/correct-factory.js b/rules/enforce-store-naming-convention/prefix/examples/correct-factory.js
@@ -0,0 +1,7 @@
+import { createStore } from "effector";
+
+function createStoreEx(initial) {
+  return createStore(initial instanceof Function ? initial() : initial);
+}
+
+export { createStoreEx };