Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ const {
const { createLinkToRule } = require("../../utils/create-link-to-rule");
const { nodeTypeIs } = require("../../utils/node-type-is");
const { traverseParentByType } = require("../../utils/traverse-parent-by-type");
const {
traverseRealDeclaration,
} = require("../../utils/traverse-real-declaration");
const { nodeName } = require("../../utils/node-name");
const { nodeRange } = require("../../utils/node-range");

module.exports = {
meta: {
Expand Down Expand Up @@ -47,23 +52,27 @@ module.exports = {
if (parserServices?.program) {
return {
VariableDeclarator(node) {
const isEffectorStore = nodeTypeIs.store({
node,
context,
});

if (!isEffectorStore) {
return;
}

const storeName = node.id.name;
const realNodes = traverseRealDeclaration(node);

if (namingOf.store.isInvalid({ name: storeName, context })) {
reportStoreNameConventionViolation({
for (const realNode of realNodes) {
const isEffectorStore = nodeTypeIs.store({
node: realNode,
context,
node,
storeName,
});

if (!isEffectorStore) {
continue;
}

const storeName = nodeName(realNode);

if (namingOf.store.isInvalid({ name: storeName, context })) {
reportStoreNameConventionViolation({
context,
node: realNode,
storeName,
});
}
}
},
};
Expand Down Expand Up @@ -197,7 +206,7 @@ function reportStoreNameConventionViolation({ context, node, storeName }) {
messageId: "renameStore",
data: { storeName, correctedStoreName },
fix(fixer) {
return fixer.replaceTextRange(node.id.range, correctedStoreName);
return fixer.replaceTextRange(nodeRange(node), correctedStoreName);
},
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,46 @@ const readExampleForTheRule = (name) => ({
filename: join(__dirname, "examples", name),
});

ruleTester.run(
"enforce-store-naming-convention-prefix.ts.test",
rule,
{
valid: ["correct-store-naming.ts", "correct-issue-139.ts"].map(
readExampleForTheRule
),
ruleTester.run("enforce-store-naming-convention-prefix.ts.test", rule, {
valid: ["correct-store-naming.ts", "correct-issue-139.ts"].map(
readExampleForTheRule
),

invalid: [
// Errors
...["incorrect-store-naming.ts"]
.map(readExampleForTheRule)
.map((result) => ({
...result,
errors: [
{
messageId: "invalidName",
type: "VariableDeclarator",
suggestions: [
{
messageId: "renameStore",
output: result.code.replace("justStore", "$justStore"),
},
],
},
],
})),
],
}
);
invalid: [
// Errors
...["incorrect-store-naming.ts"]
.map(readExampleForTheRule)
.map((result) => ({
...result,
errors: [
{
messageId: "invalidName",
type: "VariableDeclarator",
suggestions: [
{
messageId: "renameStore",
output: result.code.replace("justStore", "$justStore"),
},
],
},
],
})),
...["incorrect-store-after-destruction.ts"]
.map(readExampleForTheRule)
.map((result) => ({
...result,
errors: [
{
messageId: "invalidName",
type: "Identifier",
suggestions: [
{
messageId: "renameStore",
output: result.code.replace("justStore", "$justStore"),
},
],
},
],
})),
],
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { createStore } from "effector";

function createCustomStore() {
return [createStore(null)];
}

const [justStore] = createCustomStore();

export { justStore };
5 changes: 5 additions & 0 deletions utils/node-name.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function nodeName(node) {
return node.id?.name ?? node.name;
}

module.exports = { nodeName };
5 changes: 5 additions & 0 deletions utils/node-range.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function nodeRange(node) {
return node.id?.range ?? node.range;
}

module.exports = { nodeRange };
9 changes: 9 additions & 0 deletions utils/traverse-real-declaration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function traverseRealDeclaration(node) {
if (node?.id?.type === "ArrayPattern") {
return node.id.elements;
}

return [node];
}

module.exports = { traverseRealDeclaration };