Revert "fix(require-returns-check, require-yields-check); allow * and any types to avoid reporting of missing return; fixes #950"

This reverts commit 496904b.

Author: brettz9

README.md

@@ -17875,7 +17875,7 @@ function quux () {
 }
 
 /**
- * @returns {SomeType} Foo.
+ * @returns {*} Foo.
  */
 const quux = () => foo;
 
@@ -18276,14 +18276,14 @@ function quux (path) {
 };
 
 /**
- * @returns {SomeType} Foo.
+ * @returns {*} Foo.
  */
 const quux = () => new Promise((resolve) => {
   resolve(3);
 });
 
 /**
- * @returns {SomeType} Foo.
+ * @returns {*} Foo.
  */
 const quux = function () {
   return new Promise((resolve) => {
@@ -18420,16 +18420,6 @@ export function f(): string {
 
   interface I {}
 }
-
-/**
- * @param {boolean} bar A fun variable.
- * @returns {*} Anything at all!
- */
-function foo( bar ) {
-  if ( bar ) {
-    return functionWithUnknownReturnType();
-  }
-}
 ````
 
 

src/iterateJsdoc.js

@@ -724,8 +724,8 @@ const getUtils = (
     return jsdocUtils.getTagStructureForMode(mde, settings.structuredTags);
   };
 
-  utils.mayBeUndefinedTypeTag = (tag) => {
-    return jsdocUtils.mayBeUndefinedTypeTag(tag, settings.mode);
+  utils.hasDefinedTypeTag = (tag) => {
+    return jsdocUtils.hasDefinedTypeTag(tag, settings.mode);
   };
 
   utils.hasValueOrExecutorHasNonEmptyResolveValue = (anyPromiseAsReturn, allBranches) => {

src/jsdocUtils.js

@@ -464,29 +464,26 @@ const hasATag = (jsdoc, targetTagNames) => {
 };
 
 /**
- * Checks if the JSDoc comment declares an undefined type.
+ * Checks if the JSDoc comment declares a defined type.
  *
  * @param {JsDocTag} tag
  *   the tag which should be checked.
  * @param {"jsdoc"|"closure"|"typescript"} mode
  * @returns {boolean}
- *   true in case a defined type is undeclared; otherwise false.
+ *   true in case a defined type is declared; otherwise false.
  */
-const mayBeUndefinedTypeTag = (tag, mode) => {
+const hasDefinedTypeTag = (tag, mode) => {
   // The function should not continue in the event the type is not defined...
   if (typeof tag === 'undefined' || tag === null) {
-    return true;
+    return false;
   }
 
   // .. same applies if it declares an `{undefined}` or `{void}` type
   const tagType = tag.type.trim();
 
   // Exit early if matching
-  if (
-    tagType === 'undefined' || tagType === 'void' ||
-    tagType === '*' || tagType === 'any'
-  ) {
-    return true;
+  if (tagType === 'undefined' || tagType === 'void') {
+    return false;
   }
 
   let parsedTypes;
@@ -509,11 +506,11 @@ const mayBeUndefinedTypeTag = (tag, mode) => {
       return elem.type === 'JsdocTypeUndefined' ||
         elem.type === 'JsdocTypeName' && elem.value === 'void';
     })) {
-    return true;
+    return false;
   }
 
   // In any other case, a type is present
-  return false;
+  return true;
 };
 
 /**
@@ -1242,6 +1239,7 @@ export default {
   getTagsByType,
   getTagStructureForMode,
   hasATag,
+  hasDefinedTypeTag,
   hasParams,
   hasReturnValue,
   hasTag,
@@ -1253,7 +1251,6 @@ export default {
   isNamepathDefiningTag,
   isSetter,
   isValidTag,
-  mayBeUndefinedTypeTag,
   overrideTagStructure,
   parseClosureTemplateTag,
   pathDoesNotBeginWith,

src/rules/requireReturnsCheck.js

@@ -92,7 +92,7 @@ export default iterateJsdoc(({
     !returnNever &&
     (
       reportMissingReturnForUndefinedTypes ||
-      !utils.mayBeUndefinedTypeTag(tag)
+      utils.hasDefinedTypeTag(tag)
     ) &&
     !utils.hasValueOrExecutorHasNonEmptyResolveValue(
       exemptAsync,

src/rules/requireYieldsCheck.js

@@ -90,7 +90,7 @@ export default iterateJsdoc(({
         return true;
       }
 
-      return !utils.mayBeUndefinedTypeTag(yieldTag) && !utils.hasYieldValue();
+      return utils.hasDefinedTypeTag(yieldTag) && !utils.hasYieldValue();
     };
 
     // In case a yield value is declared in JSDoc, we also expect one in the code.
@@ -120,7 +120,7 @@ export default iterateJsdoc(({
           return true;
         }
 
-        return !utils.mayBeUndefinedTypeTag(nextTag) && !utils.hasYieldReturnValue();
+        return utils.hasDefinedTypeTag(nextTag) && !utils.hasYieldReturnValue();
       };
 
       if (shouldReportNext()) {

test/jsdocUtils.js

@@ -68,10 +68,10 @@ describe('jsdocUtils', () => {
       });
     });
   });
-  describe('mayBeUndefinedTypeTag()', () => {
+  describe('hasDefinedTypeTag()', () => {
     context('Missing tag', () => {
       it('should return `false` with a missing tag', () => {
-        expect(jsdocUtils.mayBeUndefinedTypeTag(null)).to.equal(true);
+        expect(jsdocUtils.hasDefinedTypeTag(null)).to.equal(false);
       });
     });
   });

test/rules/assertions/requireReturnsCheck.js

@@ -701,7 +701,7 @@ export default {
     {
       code: `
           /**
-           * @returns {SomeType} Foo.
+           * @returns {*} Foo.
            */
           const quux = () => foo;
       `,
@@ -1306,7 +1306,7 @@ export default {
     {
       code: `
       /**
-       * @returns {SomeType} Foo.
+       * @returns {*} Foo.
        */
       const quux = () => new Promise((resolve) => {
         resolve(3);
@@ -1316,7 +1316,7 @@ export default {
     {
       code: `
       /**
-       * @returns {SomeType} Foo.
+       * @returns {*} Foo.
        */
       const quux = function () {
         return new Promise((resolve) => {
@@ -1505,18 +1505,5 @@ export default {
       `,
       parser: require.resolve('@typescript-eslint/parser'),
     },
-    {
-      code: `
-      /**
-       * @param {boolean} bar A fun variable.
-       * @returns {*} Anything at all!
-       */
-      function foo( bar ) {
-        if ( bar ) {
-          return functionWithUnknownReturnType();
-        }
-      }
-      `,
-    },
   ],
 };