@blumintinc/eslint-plugin-blumint 0.1.2 → 0.1.3

package/lib/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testingAFunction = void 0;
 const array_methods_this_context_1 = require("./rules/array-methods-this-context");
 const export_if_in_doubt_1 = require("./rules/export-if-in-doubt");
 const extract_global_constants_1 = require("./rules/extract-global-constants");
@@ -14,7 +13,7 @@ const prefer_type_over_interface_1 = require("./rules/prefer-type-over-interface
 module.exports = {
     meta: {
         name: '@blumintinc/eslint-plugin-blumint',
-        version: '0.1.2',
+        version: '0.1.3',
     },
     parseOptions: {
         ecmaVersion: 2020,
@@ -49,9 +48,4 @@ module.exports = {
         'prefer-type-over-interface': prefer_type_over_interface_1.preferTypeOverInterface,
     },
 };
-const testingAFunction = (input) => {
-    const a = input?.A;
-    return a;
-};
-exports.testingAFunction = testingAFunction;
 //# sourceMappingURL=index.js.map

package/lib/rules/array-methods-this-context.js

@@ -50,7 +50,7 @@ exports.arrayMethodsThisContext = (0, createRule_1.createRule)({
     meta: {
         type: 'problem',
         docs: {
-            description: 'Disallow async callbacks for Array.filter',
+            description: 'Prevent misuse of Array methods in OOP',
             recommended: 'error',
         },
         schema: [],

package/lib/rules/extract-global-constants.js

@@ -13,7 +13,8 @@ exports.extractGlobalConstants = (0, createRule_1.createRule)({
                 const scope = context.getScope();
                 const hasDependencies = node.declarations.some((declaration) => declaration.init &&
                     ASTHelpers_1.ASTHelpers.declarationIncludesIdentifier(declaration.init));
-                if (!hasDependencies && scope.type === 'function') {
+                if (!hasDependencies &&
+                    (scope.type === 'function' || scope.type === 'block')) {
                     const constName = node.declarations[0].id.name;
                     context.report({
                         node,
@@ -49,7 +50,7 @@ exports.extractGlobalConstants = (0, createRule_1.createRule)({
     meta: {
         type: 'suggestion',
         docs: {
-            description: 'Extract constants/functions from React components to the global scope when possible',
+            description: 'Extract constants/functions to the global scope when possible',
             recommended: 'error',
         },
         schema: [],

package/lib/utils/ASTHelpers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ASTHelpers = void 0;
-// import { RuleContext } from '@typescript-eslint/utils/dist/ts-eslint';
 class ASTHelpers {
     static blockIncludesIdentifier(block) {
         for (const statement of block.body) {
@@ -15,10 +14,14 @@ class ASTHelpers {
         if (!node) {
             return false;
         }
-        console.log('visting node of type', node.type);
         switch (node.type) {
             case 'BlockStatement':
-                return ASTHelpers.blockIncludesIdentifier(node);
+                return node.body.some((statement) => statement.type === 'BlockStatement' &&
+                    ASTHelpers.blockIncludesIdentifier(statement));
+            case 'IfStatement':
+                return (this.declarationIncludesIdentifier(node.test) ||
+                    this.declarationIncludesIdentifier(node.consequent) ||
+                    this.declarationIncludesIdentifier(node.alternate));
             case 'Identifier':
                 return true;
             case 'SpreadElement':
@@ -64,39 +67,6 @@ class ASTHelpers {
                 return false;
         }
     }
-    // public static declarationIncludesIdentifier(
-    //   node: TSESTree.Expression | null,
-    // ): boolean {
-    //   if (!node) {
-    //     return false;
-    //   }
-    //   switch (node.type) {
-    //     case 'Identifier':
-    //       return true;
-    //     case 'ArrayExpression':
-    //       return node.elements.some(
-    //         (element) =>
-    //           element &&
-    //           (element.type === 'SpreadElement'
-    //             ? ASTHelpers.declarationIncludesIdentifier(element.argument)
-    //             : ASTHelpers.declarationIncludesIdentifier(element)),
-    //       );
-    //     case 'ObjectExpression':
-    //       return node.properties.some((property) => {
-    //         if (property.type === 'Property') {
-    //           return ASTHelpers.declarationIncludesIdentifier(property.key);
-    //         } else if (property.type === 'SpreadElement') {
-    //           return ASTHelpers.declarationIncludesIdentifier(property.argument);
-    //         }
-    //         return false;
-    //       });
-    //     default:
-    //       return (
-    //         ASTHelpers.declarationIncludesIdentifier((node as any).left) ||
-    //         ASTHelpers.declarationIncludesIdentifier((node as any).right)
-    //       );
-    //   }
-    // }
     static isNode(value) {
         return typeof value === 'object' && value !== null && 'type' in value;
     }
@@ -104,14 +74,12 @@ class ASTHelpers {
         if (node.type === 'ReturnStatement') {
             return true;
         }
-        else if (node.type === 'IfStatement') {
-            // Check both branches of the if statement
+        if (node.type === 'IfStatement') {
             const consequentHasReturn = ASTHelpers.hasReturnStatement(node.consequent);
             const alternateHasReturn = !!node.alternate && ASTHelpers.hasReturnStatement(node.alternate);
             return consequentHasReturn && alternateHasReturn;
         }
-        else if (node.type === 'BlockStatement') {
-            // Check all statements in the block
+        if (node.type === 'BlockStatement') {
             for (const statement of node.body) {
                 if (ASTHelpers.hasReturnStatement(statement)) {
                     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blumintinc/eslint-plugin-blumint",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Custom eslint rules for use at BluMint",
   "keywords": [
     "eslint",