feat: require-return-type always-enforce (#436)

gajus · Nov 12, 2019 · 45ee910 · 45ee910
1 parent da05064
commit 45ee910
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/rules/requireReturnType.js b/src/rules/requireReturnType.js
@@ -9,7 +9,7 @@ const schema = [
     additionalProperties: false,
     properties: {
       annotateUndefined: {
-        enum: ['always', 'never', 'ignore'],
+        enum: ['always', 'never', 'ignore', 'always-enforce'],
         type: 'string',
       },
       excludeArrowFunctions: {
@@ -123,7 +123,10 @@ const create = (context) => {
       context.report(functionNode, 'Must not annotate undefined return type.');
     } else if (isFunctionReturnUndefined && !isReturnTypeAnnotationUndefined && annotateUndefined === 'always') {
       context.report(functionNode, 'Must annotate undefined return type.');
-    } else if (!isFunctionReturnUndefined && !isReturnTypeAnnotationUndefined && annotateReturn && !returnType && !shouldFilterNode(functionNode)) {
+    } else if (
+      (annotateUndefined === 'always-enforce' || !isFunctionReturnUndefined && !isReturnTypeAnnotationUndefined) &&
+        annotateReturn && !returnType && !shouldFilterNode(functionNode)
+    ) {
       context.report(functionNode, 'Missing return type annotation.');
     }
   };

diff --git a/tests/rules/assertions/requireReturnType.js b/tests/rules/assertions/requireReturnType.js
@@ -473,6 +473,7 @@ export default {
                   'always',
                   'never',
                   'ignore',
+                  'always-enforce',
                 ],
                 type: 'string',
               },
@@ -516,20 +517,23 @@ export default {
               'always',
               'never',
               'ignore',
+              'always-enforce',
             ],
           },
           parentSchema: {
             enum: [
               'always',
               'never',
               'ignore',
+              'always-enforce',
             ],
             type: 'string',
           },
           schema: [
             'always',
             'never',
             'ignore',
+            'always-enforce',
           ],
           schemaPath: '#/items/1/properties/annotateUndefined/enum',
         },