Merge pull request #131 from Xvezda/feature/refactor

Fix utils test

Author: Xvezda

src/utils.js

@@ -267,18 +267,6 @@ const collectPaths = (node, untilPredicate) => {
   return paths.reverse();
 };
 
-/**
- * @private
- * @param {import('@typescript-eslint/utils').ParserServicesWithTypeInformation} services
- * @param {import('@typescript-eslint/utils').TSESTree.Node} node
- * @return {import('typescript').Declaration[] | undefined}
- */
-const getDeclarationsByNode = (services, node) => {
-  return services
-    .getSymbolAtLocation(node)
-    ?.declarations;
-};
-
 /**
  * Get call expression node's signature.
  *
@@ -366,16 +354,20 @@ const getCalleeDeclaration = (services, node) => {
       .getTypeAtLocation(calleeNode)
       .symbol;
 
-    if (!symbol || !symbol.valueDeclaration) return null;
+    if (!symbol || !symbol.valueDeclaration) {
+      const declarations = services
+        .getSymbolAtLocation(calleeNode)
+        ?.declarations;
 
-    declaration = symbol.valueDeclaration;
-  }
-  if (!declaration) return null;
+      if (!declarations?.length) return null;
 
-
-  if (!declaration) {
-    return null;
+      // If there are multiple declarations, we take the first one.
+      declaration = declarations[0];
+    } else {
+      declaration = symbol.valueDeclaration;
+    }
   }
+  if (!declaration) return null;
 
   switch (node.type) {
     /**
@@ -428,80 +420,6 @@ const getCalleeDeclaration = (services, node) => {
       return null;
   }
 };
-/**
- * Get all declaration nodes of the callee from the given node's type.
- *
- * @public
- * @param {import('@typescript-eslint/utils').ParserServicesWithTypeInformation} services
- * @param {import('@typescript-eslint/utils').TSESTree.Expression} node
- * @return {import('typescript').Node[]}
- */
-const getCalleeDeclarations = (services, node) => {
-  /** @type {import('@typescript-eslint/utils').TSESTree.Node | null} */
-  const calleeNode = getCallee(node);
-  if (!calleeNode) return [];
-
-  const declarations = getDeclarationsByNode(services, calleeNode);
-  if (!declarations || !declarations.length) {
-    return [];
-  }
-
-  switch (node.type) {
-    /**
-     * Return type of setter when assigning
-     *
-     * @example
-     * ```
-     * foo.bar = 'baz';
-     * //  ^ This can be a setter
-     * ```
-     */
-    case AST_NODE_TYPES.AssignmentExpression: {
-      const setter = declarations
-        .filter(declaration => {
-          const declarationNode =
-            services.tsNodeToESTreeNodeMap.get(declaration);
-
-          return isAccessorNode(declarationNode) &&
-            declarationNode.kind === 'set';
-        });
-
-      return setter;
-    }
-    /**
-     * Return type of getter when accessing
-     *
-     * @example
-     * ```
-     * const baz = foo.bar;
-     * //              ^ This can be a getter
-     * ```
-     */
-    case AST_NODE_TYPES.MemberExpression: {
-      const getter = declarations
-        .filter(declaration => {
-          const declarationNode =
-            services.tsNodeToESTreeNodeMap.get(declaration);
-
-          return isAccessorNode(declarationNode) &&
-            declarationNode.kind === 'get';
-        });
-
-      if (getter.length) {
-        return getter;
-      }
-      // It is method call
-      if (node.parent?.type === AST_NODE_TYPES.CallExpression) {
-        return declarations;
-      }
-      return [];
-    }
-    case AST_NODE_TYPES.CallExpression:
-      return declarations;
-    default:
-      return [];
-  }
-};
 
 /**
  * @public
@@ -1025,7 +943,6 @@ module.exports = {
   getCallSignatureDeclaration,
   getCallee,
   getCalleeDeclaration,
-  getCalleeDeclarations,
   getJSDocThrowsTags,
   getJSDocThrowsTagTypes,
   toFlattenedTypeArray,

tests/utils.test.js

@@ -20,7 +20,7 @@ const {
   findParent,
   getCallSignatureDeclaration,
   getCallee,
-  getCalleeDeclarations,
+  getCalleeDeclaration,
   getJSDocThrowsTags,
   getJSDocThrowsTagTypes,
   toFlattenedTypeArray,
@@ -455,8 +455,8 @@ debugger;
     );
   });
 
-  describe('getCalleeDeclarations', () => {
-    test('get declaration of a function calls', (t) => {
+  describe('getCalleeDeclaration', () => {
+    test.only('get declaration of a function calls', (t) => {
       const { ast, services, sourceCode } = parse(`
 // foo declaration
 function foo() {}
@@ -500,31 +500,31 @@ obj.baz = 42;
 
       t.assert.ok(
         sourceCode
-        .getCommentsBefore(
-          services.tsNodeToESTreeNodeMap
-            .get(getCalleeDeclarations(services, callExpression)[0])
-        )
-        .some(({ value }) => value.includes('foo declaration')),
+          .getCommentsBefore(
+            services.tsNodeToESTreeNodeMap
+              .get(getCalleeDeclaration(services, callExpression))
+          )
+          .some(({ value }) => value.includes('foo declaration')),
         '`foo()` must return the declaration of `foo`',
       );
 
       t.assert.ok(
         sourceCode
-        .getCommentsBefore(
-          services.tsNodeToESTreeNodeMap
-          .get(getCalleeDeclarations(services, memberExpression)[0]),
-        )
-        .some(({ value }) => value.includes('bar declaration')),
+          .getCommentsBefore(
+            services.tsNodeToESTreeNodeMap
+              .get(getCalleeDeclaration(services, memberExpression)),
+          )
+          .some(({ value }) => value.includes('bar declaration')),
         '`const value = obj.bar` must return the declaration of `obj.bar`',
       );
 
       t.assert.ok(
         sourceCode
-        .getCommentsBefore(
-          services.tsNodeToESTreeNodeMap
-          .get(getCalleeDeclarations(services, assignmentExpression)[0]),
-        )
-        .some(({ value }) => value.includes('baz declaration')),
+          .getCommentsBefore(
+            services.tsNodeToESTreeNodeMap
+              .get(getCalleeDeclaration(services, assignmentExpression)),
+          )
+          .some(({ value }) => value.includes('baz declaration')),
         '`obj.baz = 42` must return the declaration of `obj.baz`',
       );
     });
@@ -561,13 +561,13 @@ obj.baz = 42;
       const assignmentExpression = map.get(AST_NODE_TYPES.AssignmentExpression);
 
       t.assert.equal(
-        getCalleeDeclarations(services, memberExpression).length,
-        0
+        getCalleeDeclaration(services, memberExpression),
+        null
       );
 
       t.assert.equal(
-        getCalleeDeclarations(services, assignmentExpression).length,
-        0
+        getCalleeDeclaration(services, assignmentExpression),
+        null
       );
     });
 
@@ -579,9 +579,9 @@ a;
 
       const identifier = getFirstFoundIdentifier(ast, 'a');
       t.assert.equal(
-        getCalleeDeclarations(services, identifier).length,
-        0,
-        'non-callable node should return nothing',
+        getCalleeDeclaration(services, identifier),
+        null,
+        'non-callable node should return null',
       );
     });
   });