no-thenable: Fix Object.fromEntries() check (#2130)

sindresorhus · May 17, 2023 · f3265b9 · f3265b9
1 parent f10f1a6
commit f3265b9
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 55 deletions.
diff --git a/rules/no-thenable.js b/rules/no-thenable.js
@@ -86,29 +86,35 @@ const cases = [
 		},
 		messageId: MESSAGE_ID_OBJECT,
 	},
-	// TODO[@fisker]: Bug, we are checking wrong pattern `Object.fromEntries(['then', …])`
 	// `Object.fromEntries([['then', …]])`
 	{
 		selector: 'CallExpression',
 		* getNodes(node, context) {
-			if (!isMethodCall(node, {
-				object: 'Object',
-				method: 'fromEntries',
-				argumentsLength: 1,
-				optionalCall: false,
-				optionalMember: false,
-			})) {
+			if (!(
+				isMethodCall(node, {
+					object: 'Object',
+					method: 'fromEntries',
+					argumentsLength: 1,
+					optionalCall: false,
+					optionalMember: false,
+				})
+				&& node.arguments[0].type === 'ArrayExpression'
+			)) {
 				return;
 			}
 
-			const [firstArgument] = node.arguments;
-			if (firstArgument.type !== 'ArrayExpression') {
-				return;
-			}
+			for (const pairs of node.arguments[0].elements) {
+				if (
+					pairs?.type === 'ArrayExpression'
+					&& pairs.elements[0]
+					&& pairs.elements[0].type !== 'SpreadElement'
+				) {
+					const [key] = pairs.elements;
 
-			const [firstElement] = firstArgument.elements;
-			if (isStringThen(firstElement, context)) {
-				yield firstElement;
+					if (isStringThen(key, context)) {
+						yield key;
+					}
+				}
 			}
 		},
 		messageId: MESSAGE_ID_OBJECT,

diff --git a/test/no-thenable.mjs b/test/no-thenable.mjs
@@ -49,8 +49,17 @@ test.snapshot({
 
 		// `Object.fromEntries`
 		'Object.fromEntries([then, 1])',
-		'Object.fromEntries(["notThen", "then"])',
-		'const NOT_THEN = "not-then";Object.fromEntries([NOT_THEN, 1])',
+		'Object.fromEntries([,,])',
+		'Object.fromEntries([[,,],[]])',
+		'const NOT_THEN = "not-then";Object.fromEntries([[NOT_THEN, 1]])',
+		'Object.fromEntries([[["then", 1]]])',
+		'NotObject.fromEntries([["then", 1]])',
+		'Object.notFromEntries([["then", 1]])',
+		'Object.fromEntries?.([["then", 1]])',
+		'Object?.fromEntries([["then", 1]])',
+		'Object.fromEntries([[..."then", 1]])',
+		'Object.fromEntries([["then", 1]], extraArgument)',
+		'Object.fromEntries(...[["then", 1]])',
 
 		// `{Object,Reflect}.defineProperty`
 		'Object.defineProperty(foo, then, 1)',
@@ -143,9 +152,11 @@ test.snapshot({
 		'const THEN = "then";Reflect.defineProperty(foo, THEN, 1)',
 
 		// `Object.fromEntries`
-		'Object.fromEntries(["then", 1])',
-		'Object.fromEntries([`then`, 1])',
-		'const THEN = "then";Object.fromEntries([THEN, 1])',
+		'Object.fromEntries([["then", 1]])',
+		'Object.fromEntries([["then"]])',
+		'Object.fromEntries([[`then`, 1]])',
+		'const THEN = "then";Object.fromEntries([[THEN, 1]])',
+		'Object.fromEntries([foo, ["then", 1]])',
 
 		// `export`
 		'const then = 1; export {then}',
@@ -177,5 +188,6 @@ test.snapshot({
 		'export let {foo, ...then} = 1',
 		'export var {foo, ...then} = 1',
 		'export const {foo: {bar: [{baz: then}]}} = 1',
+		'export const notThen = 1, then = 1',
 	],
 });