@blumintinc/eslint-plugin-blumint 1.1.6 → 1.1.7

package/lib/index.js

@@ -39,7 +39,7 @@ const enforce_firestore_path_utils_1 = require("./rules/enforce-firestore-path-u
 module.exports = {
     meta: {
         name: '@blumintinc/eslint-plugin-blumint',
-        version: '1.1.6',
+        version: '1.1.7',
     },
     parseOptions: {
         ecmaVersion: 2020,

package/lib/rules/class-methods-read-top-to-bottom.js

@@ -49,10 +49,12 @@ exports.classMethodsReadTopToBottom = (0, createRule_1.createRule)({
                             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                             const memberNode = node.body.find((member) => getMemberName(member) === n);
                             const comments = sourceCode.getCommentsBefore(memberNode);
-                            memberNode.range = [
-                                Math.min(memberNode.range[0], Math.min(...comments.map((comment) => comment.range[0]))),
-                                Math.max(memberNode.range[1], Math.max(...comments.map((comment) => comment.range[1]))),
-                            ];
+                            memberNode.range = comments.length
+                                ? [
+                                    Math.min(memberNode.range[0], Math.min(...comments.map((comment) => comment.range[0]))),
+                                    Math.max(memberNode.range[1], Math.max(...comments.map((comment) => comment.range[1]))),
+                                ]
+                                : memberNode.range;
                             return sourceCode.getText(memberNode);
                         })
                             .join('\n');

package/lib/rules/consistent-callback-naming.js

@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 const createRule_1 = require("../utils/createRule");
+const utils_1 = require("@typescript-eslint/utils");
 const ts = __importStar(require("typescript"));
 module.exports = (0, createRule_1.createRule)({
     name: 'consistent-callback-naming',
@@ -150,14 +151,84 @@ module.exports = (0, createRule_1.createRule)({
             'FunctionDeclaration, VariableDeclarator'(node) {
                 const functionName = node.id?.type === 'Identifier' ? node.id.name : undefined;
                 if (functionName && functionName.startsWith('handle') && node.id) {
+                    // Skip autofixing for "handler" and "handlers"
+                    if (functionName === 'handler' || functionName === 'handlers') {
+                        context.report({
+                            node,
+                            messageId: 'callbackFunctionPrefix',
+                        });
+                        return;
+                    }
+                    // Skip autofixing for class parameters and getters
+                    const parent = node.parent;
+                    if (parent?.type === utils_1.AST_NODE_TYPES.PropertyDefinition || parent?.type === utils_1.AST_NODE_TYPES.MethodDefinition) {
+                        context.report({
+                            node,
+                            messageId: 'callbackFunctionPrefix',
+                        });
+                        return;
+                    }
+                    // Get all references to this variable
+                    const scope = context.getScope();
+                    const variable = scope.variables.find(v => v.name === functionName);
+                    const references = new Set(variable?.references ?? []);
+                    // Get references from all scopes
+                    const allScopes = [scope];
+                    let currentScope = scope;
+                    while (currentScope.upper) {
+                        currentScope = currentScope.upper;
+                        allScopes.push(currentScope);
+                    }
+                    // Get references from all scopes and their children
+                    for (const s of allScopes) {
+                        // Get references from current scope
+                        const currentVar = s.variables.find(v => v.name === functionName);
+                        if (currentVar) {
+                            currentVar.references.forEach(ref => references.add(ref));
+                        }
+                        // Get references from child scopes
+                        const childScopes = s.childScopes;
+                        for (const childScope of childScopes) {
+                            const childVar = childScope.variables.find(v => v.name === functionName);
+                            if (childVar) {
+                                childVar.references.forEach(ref => references.add(ref));
+                            }
+                        }
+                    }
+                    // Get references from sibling scopes
+                    const siblingScopes = scope.upper?.childScopes ?? [];
+                    for (const siblingScope of siblingScopes) {
+                        if (siblingScope !== scope) {
+                            const siblingVar = siblingScope.variables.find(v => v.name === functionName);
+                            if (siblingVar) {
+                                siblingVar.references.forEach(ref => references.add(ref));
+                            }
+                        }
+                    }
+                    // Get references from global scope
+                    const sourceCode = context.getSourceCode();
+                    if (sourceCode.scopeManager?.globalScope) {
+                        const globalVar = sourceCode.scopeManager.globalScope.variables.find(v => v.name === functionName);
+                        if (globalVar) {
+                            globalVar.references.forEach(ref => references.add(ref));
+                        }
+                    }
                     context.report({
                         node,
                         messageId: 'callbackFunctionPrefix',
-                        fix(fixer) {
+                        *fix(fixer) {
                             // Remove 'handle' prefix and convert first character to lowercase
                             const newName = functionName.slice(6).charAt(0).toLowerCase() +
                                 functionName.slice(7);
-                            return fixer.replaceText(node.id, newName);
+                            // Fix the declaration and all references
+                            const fixes = [];
+                            fixes.push(fixer.replaceText(node.id, newName));
+                            for (const ref of references) {
+                                if (ref.identifier !== node.id) {
+                                    fixes.push(fixer.replaceText(ref.identifier, newName));
+                                }
+                            }
+                            return fixes;
                         },
                     });
                 }
@@ -168,6 +239,22 @@ module.exports = (0, createRule_1.createRule)({
                     node.key.name &&
                     node.key.name.startsWith('handle')) {
                     const name = node.key.name;
+                    // Skip autofixing for "handler" and "handlers"
+                    if (name === 'handler' || name === 'handlers') {
+                        context.report({
+                            node: node.key,
+                            messageId: 'callbackFunctionPrefix',
+                        });
+                        return;
+                    }
+                    // Skip autofixing for class parameters and getters
+                    if (node.type === 'MethodDefinition' && node.kind === 'get') {
+                        context.report({
+                            node: node.key,
+                            messageId: 'callbackFunctionPrefix',
+                        });
+                        return;
+                    }
                     context.report({
                         node: node.key,
                         messageId: 'callbackFunctionPrefix',
@@ -179,6 +266,16 @@ module.exports = (0, createRule_1.createRule)({
                     });
                 }
             },
+            // Check constructor parameters
+            'TSParameterProperty'(node) {
+                if (node.parameter.type === 'Identifier' &&
+                    node.parameter.name.startsWith('handle')) {
+                    context.report({
+                        node,
+                        messageId: 'callbackFunctionPrefix',
+                    });
+                }
+            },
         };
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blumintinc/eslint-plugin-blumint",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Custom eslint rules for use within BluMint",
   "author": {
     "name": "Brodie McGuire",