eslint-plugin-drizzle 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eslint-plugin-drizzle",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Eslint plugin for drizzle users to avoid common pitfalls",
     "main": "src/index.js",
     "scripts": {

package/src/enforce-delete-with-where.js

@@ -14,7 +14,7 @@ const deleteRule = createRule({
         },
         fixable: 'code',
         messages: {
-            enforceDeleteWithWhere: 'Without `.where(...)` you will delete all the rows in a table. If you didn\'t want to do it, please use `db.delete(...).where(...)` instead. Otherwise you can ignore this rule here',
+            enforceDeleteWithWhere: "Without `.where(...)` you will delete all the rows in a table. If you didn't want to do it, please use `db.delete(...).where(...)` instead. Otherwise you can ignore this rule here",
         },
         schema: [{
                 type: 'object',
@@ -30,7 +30,7 @@ const deleteRule = createRule({
         return {
             MemberExpression: (node) => {
                 if (node.property.type === 'Identifier') {
-                    if ((0, options_1.isDrizzleObj)(node, options) && node.property.name === 'delete' && lastNodeName !== 'where') {
+                    if (node.property.name === 'delete' && lastNodeName !== 'where' && (0, options_1.isDrizzleObj)(node, options)) {
                         context.report({
                             node,
                             messageId: 'enforceDeleteWithWhere',

package/src/utils/options.js

@@ -3,17 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDrizzleObj = void 0;
 const isDrizzleObj = (node, options) => {
     const drizzleObjectName = options[0].drizzleObjectName;
-    if (node.object.type === 'Identifier' && typeof drizzleObjectName === 'string'
-        && node.object.name === drizzleObjectName) {
-        return true;
-    }
-    if (Array.isArray(drizzleObjectName)) {
-        if (drizzleObjectName.length === 0) {
+    if (node.object.type === 'Identifier') {
+        if (typeof drizzleObjectName === 'string'
+            && node.object.name === drizzleObjectName) {
             return true;
         }
-        if (node.object.type === 'Identifier' && drizzleObjectName.includes(node.object.name)) {
+        if (Array.isArray(drizzleObjectName)) {
+            if (drizzleObjectName.length === 0) {
+                return true;
+            }
+            if (drizzleObjectName.includes(node.object.name)) {
+                return true;
+            }
+        }
+    }
+    else if (node.object.type === 'MemberExpression' && node.object.property.type === 'Identifier') {
+        if (typeof drizzleObjectName === 'string'
+            && node.object.property.name === drizzleObjectName) {
             return true;
         }
+        if (Array.isArray(drizzleObjectName)) {
+            if (drizzleObjectName.length === 0) {
+                return true;
+            }
+            if (drizzleObjectName.includes(node.object.property.name)) {
+                return true;
+            }
+        }
     }
     return false;
 };