eslint-plugin-effector 0.7.3 → 0.7.6

package/README.md

@@ -6,16 +6,27 @@ Enforcing best practices for [Effector](http://effector.dev/)
 
 ## Installation
 
-First, install [ESLint](http://eslint.org):
+Install [ESLint](http://eslint.org) and `eslint-plugin-effector`:
+
+### pnpm
+
+```
+$ pnpm install --dev eslint
+$ pnpm install --dev eslint-plugin-effector
+```
+
+### yarn
 
 ```
-$ yarn add -D eslint
+$ yarn add --dev eslint
+$ yarn add --dev eslint-plugin-effector
 ```
 
-Next, install `eslint-plugin-effector`:
+### npm
 
 ```
-$ yarn add -D eslint-plugin-effector
+$ npm install --dev eslint
+$ npm install --dev eslint-plugin-effector
 ```
 
 ## Usage
@@ -72,7 +83,7 @@ This preset is recommended for projects that use [React](https://reactjs.org) wi
 
 #### plugin:effector/future
 
-This preset contains rules wich enforce _future-effector_ code-style.
+This preset contains rules, which enforce _future-effector_ code-style.
 
 - [effector/no-forward](rules/no-forward/no-forward.md)
 - [effector/no-guard](rules/no-guard/no-guard.md)
@@ -86,5 +97,5 @@ This preset contains rules wich enforce _future-effector_ code-style.
 3. Commit changes by `git commit -m "Release X.X.X"`
 4. Create git tag for release by `git tag -a vX.X.X -m "vX.X.X"`
 5. Push changes to remote by `git push --follow-tags`
-6. Release package to registry by `yarn clean-publish`
+6. Release package to registry by `pnpm clean-publish`
 7. Fill release page with changelog on GitHub

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-effector",
-  "version": "0.7.3",
+  "version": "0.7.6",
   "description": "Enforcing best practices for Effector",
   "keywords": [
     "eslint",

package/rules/keep-options-order/config.js

@@ -1,3 +1,3 @@
-const correctOrder = ["clock", "source", "filter", "fn", "target"];
+const correctOrder = ["clock", "source", "filter", "fn", "target", "greedy"];
 
 module.exports = { correctOrder };

package/rules/mandatory-useEvent/mandatory-useEvent.js

@@ -45,7 +45,7 @@ module.exports = {
           return;
         }
 
-        if (isInsideUseEventCall({ node, context })) {
+        if (isInsideEffectorHook({ node, context })) {
           return;
         }
 
@@ -61,7 +61,7 @@ module.exports = {
   },
 };
 
-function isInsideUseEventCall({ node, context }) {
+function isInsideEffectorHook({ node, context }) {
   const calleeParentNode = traverseParentByType(node.parent, "CallExpression");
 
   if (!calleeParentNode?.callee) return false;
@@ -69,6 +69,6 @@ function isInsideUseEventCall({ node, context }) {
   return nodeTypeIs.effectorReactHook({
     node: calleeParentNode.callee,
     context,
-    hook: ["useEvent", "useUnit"],
+    hook: ["useEvent", "useUnit", "useStore"],
   });
 }

package/rules/no-forward/no-forward.js

@@ -16,7 +16,7 @@ module.exports = {
     messages: {
       noForward:
         "Instead of `forward` you can use `sample`, it is more extendable.",
-      replaceWithSample: "Repalce `forward` with `sample`.",
+      replaceWithSample: "Replace `forward` with `sample`.",
     },
     schema: [],
     hasSuggestions: true,

package/rules/no-guard/no-guard.js

@@ -16,7 +16,7 @@ module.exports = {
     messages: {
       noGuard:
         "Instead of `guard` you can use `sample`, it is more extendable.",
-      replaceWithSample: "Repalce `guard` with `sample`.",
+      replaceWithSample: "Replace `guard` with `sample`.",
     },
     schema: [],
     hasSuggestions: true,

package/rules/prefer-sample-over-forward-with-mapping/prefer-sample-over-forward-with-mapping.js

@@ -21,7 +21,7 @@ module.exports = {
         "Instead of `forward` with `{{ eventName }}.map` you can use `sample`",
       overPrepend:
         "Instead of `forward` with `{{ eventName }}.prepend` you can use `sample`",
-      replaceWithSample: "Repalce `forward` with `sample`.",
+      replaceWithSample: "Replace `forward` with `sample`.",
     },
     schema: [],
     hasSuggestions: true,

package/utils/extract-imported-from.js

@@ -1,6 +1,10 @@
 function extractImportedFrom({ importMap, nodeMap, node, packageName }) {
   if (node.source.value === packageName) {
     for (const s of node.specifiers) {
+      if (s.type === "ImportDefaultSpecifier") {
+        continue;
+      }
+
       importMap.set(s.imported.name, s.local.name);
       nodeMap?.set(s.imported.name, s);
     }

package/utils/replace-by-sample.js

@@ -88,7 +88,11 @@ function* replaceBySample(
     })})`
   );
 
-  yield fixer.replaceText(importNodes.get(methodName), "sample");
+  const importNode = importNodes.get(methodName);
+
+  if (!importNodes.has("sample")) {
+    yield fixer.insertTextAfter(importNode, ", sample");
+  }
 }
 
 module.exports = { replaceForwardBySample, replaceGuardBySample };