Improve S4123 (no-invalid-await): allow Pick<Promise> type #2755

vilchik-elena · 2021-08-11T14:49:21Z

yassin-kammoun-sonarsource

LGTM. I left a minor suggestion. Also, I would rename the PR (and the ticket maybe) because it's more about fixing the detection of Promise.prototype.then() than allowing Pick<Promise> type.

yassin-kammoun-sonarsource · 2021-08-12T07:57:54Z

eslint-bridge/src/rules/no-invalid-await.ts

+  if (thenProperty && thenProperty.declarations && thenProperty.declarations?.length > 0) {
+    const declaration = thenProperty.declarations[0];
+    return (
+      declaration.kind === ts.SyntaxKind.MethodSignature ||
+      declaration.kind === ts.SyntaxKind.MethodDeclaration
+    );
+  }
+  return false;


Suggested change

if (thenProperty && thenProperty.declarations && thenProperty.declarations?.length > 0) {

const declaration = thenProperty.declarations[0];

return (

declaration.kind === ts.SyntaxKind.MethodSignature ||

declaration.kind === ts.SyntaxKind.MethodDeclaration

);

}

return false;

return thenProperty?.declarations?.some(

d => d.kind === ts.SyntaxKind.MethodSignature || d.kind === ts.SyntaxKind.MethodDeclaration,

);