Merge branch 'main' into Planetscale-tests-speed-improvements

changelogs/eslint-plugin-drizzle/0.2.2.md

@@ -0,0 +1,3 @@
+# eslint-plugin-drizzle 0.2.2
+
+- fix: Correct detection of `drizzleObjectName` when it's a nested object

eslint-plugin-drizzle/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": {

eslint-plugin-drizzle/src/enforce-delete-with-where.ts

@@ -17,7 +17,8 @@ const deleteRule = createRule<Options, MessageIds>({
 		},
 		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',
@@ -33,7 +34,7 @@ const deleteRule = createRule<Options, MessageIds>({
 		return {
 			MemberExpression: (node) => {
 				if (node.property.type === 'Identifier') {
-					if (isDrizzleObj(node, options) && node.property.name === 'delete' && lastNodeName !== 'where') {
+					if (node.property.name === 'delete' && lastNodeName !== 'where' && isDrizzleObj(node, options)) {
 						context.report({
 							node,
 							messageId: 'enforceDeleteWithWhere',

eslint-plugin-drizzle/src/utils/options.ts

@@ -10,21 +10,40 @@ export const isDrizzleObj = (
 ) => {
 	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;

eslint-plugin-drizzle/tests/delete.test.ts

@@ -16,12 +16,17 @@ ruleTester.run('enforce delete with where (default options)', myRule, {
 		`dataSource
       .delete()
       .where()`,
+		`this.database.delete({}).where()`,
 	],
 	invalid: [
 		{
 			code: 'db.delete({})',
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],
 		},
+		{
+			code: 'this.dataSource.db.delete({})',
+			errors: [{ messageId: 'enforceDeleteWithWhere' }],
+		},
 		{
 			code: 'const a = await db.delete({})',
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],
@@ -41,6 +46,7 @@ ruleTester.run('enforce delete with where (default options)', myRule, {
 ruleTester.run('enforce delete with where (string option)', myRule, {
 	valid: [
 		{ code: 'const a = db.delete({}).where({});', options: [{ drizzleObjectName: 'db' }] },
+		{ code: 'const a = this.database.db.delete({}).where({});', options: [{ drizzleObjectName: 'db' }] },
 		{ code: 'const a = something.delete({})', options: [{ drizzleObjectName: 'db' }] },
 		{ code: 'delete db.something', options: [{ drizzleObjectName: 'db' }] },
 		{
@@ -61,6 +67,11 @@ ruleTester.run('enforce delete with where (string option)', myRule, {
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],
 			options: [{ drizzleObjectName: 'db' }],
 		},
+		{
+			code: 'this.database.db.delete({})',
+			errors: [{ messageId: 'enforceDeleteWithWhere' }],
+			options: [{ drizzleObjectName: 'db' }],
+		},
 		{
 			code: 'const a = await db.delete({})',
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],
@@ -77,6 +88,10 @@ ruleTester.run('enforce delete with where (string option)', myRule, {
 ruleTester.run('enforce delete with where (array option)', myRule, {
 	valid: [
 		{ code: 'const a = db.delete({}).where({});', options: [{ drizzleObjectName: ['db'] }] },
+		{
+			code: 'const a = this.database.dataSource.delete({}).where({});',
+			options: [{ drizzleObjectName: ['db', 'dataSource'] }],
+		},
 		{ code: 'delete db.something', options: [{ drizzleObjectName: ['db'] }] },
 		{
 			code: `dataSource
@@ -96,6 +111,11 @@ ruleTester.run('enforce delete with where (array option)', myRule, {
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],
 			options: [{ drizzleObjectName: ['db', 'anotherName'] }],
 		},
+		{
+			code: 'this.dataSource.db.delete({})',
+			errors: [{ messageId: 'enforceDeleteWithWhere' }],
+			options: [{ drizzleObjectName: ['db', 'anotherName'] }],
+		},
 		{
 			code: 'dataSource.delete({})',
 			errors: [{ messageId: 'enforceDeleteWithWhere' }],

eslint-plugin-drizzle/tests/update.test.ts

@@ -21,13 +21,22 @@ ruleTester.run('enforce update with where (default options)', myRule, {
 		`dataSource
       .update()
       .set()
+      .where()`,
+		`this
+      .dataSource
+      .update()
+      .set()
       .where()`,
 	],
 	invalid: [
 		{
 			code: 'db.update({}).set()',
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],
 		},
+		{
+			code: 'this.database.db.update({}).set()',
+			errors: [{ messageId: 'enforceUpdateWithWhere' }],
+		},
 		{
 			code: 'const a = await db.update({}).set()',
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],
@@ -48,6 +57,7 @@ ruleTester.run('enforce update with where (default options)', myRule, {
 ruleTester.run('enforce update with where (string option)', myRule, {
 	valid: [
 		{ code: 'const a = db.update({}).set().where({});', options: [{ drizzleObjectName: 'db' }] },
+		{ code: 'const a = this.database.db.update({}).set().where({});', options: [{ drizzleObjectName: 'db' }] },
 		{ code: 'update.db.update()', options: [{ drizzleObjectName: 'db' }] },
 		{
 			code: `dataSource
@@ -67,6 +77,11 @@ ruleTester.run('enforce update with where (string option)', myRule, {
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],
 			options: [{ drizzleObjectName: 'db' }],
 		},
+		{
+			code: 'this.dataSource.db.update({}).set({})',
+			errors: [{ messageId: 'enforceUpdateWithWhere' }],
+			options: [{ drizzleObjectName: 'db' }],
+		},
 		{
 			code: 'const a = await db.update({}).set()',
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],
@@ -83,6 +98,7 @@ ruleTester.run('enforce update with where (string option)', myRule, {
 ruleTester.run('enforce delete with where (array option)', myRule, {
 	valid: [
 		{ code: 'const a = db.update({}).set().where({});', options: [{ drizzleObjectName: ['db'] }] },
+		{ code: 'const a = this.dataSource.db.update({}).set().where({});', options: [{ drizzleObjectName: ['db'] }] },
 		{ code: 'update.db.something', options: [{ drizzleObjectName: ['db'] }] },
 		{
 			code: `dataSource
@@ -103,6 +119,11 @@ ruleTester.run('enforce delete with where (array option)', myRule, {
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],
 			options: [{ drizzleObjectName: ['db', 'anotherName'] }],
 		},
+		{
+			code: 'this.dataSource.db.update({}).set()',
+			errors: [{ messageId: 'enforceUpdateWithWhere' }],
+			options: [{ drizzleObjectName: ['db', 'anotherName'] }],
+		},
 		{
 			code: 'dataSource.update({}).set({})',
 			errors: [{ messageId: 'enforceUpdateWithWhere' }],