@cedarjs/eslint-plugin 6.0.0-canary.2893 → 6.0.0-canary.2895

package/dist/cell-type-annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-type-annotations.d.ts","sourceRoot":"","sources":["../src/cell-type-annotations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAA;AAqHlE,eAAO,MAAM,mBAAmB,8GAya9B,CAAA"}
+{"version":3,"file":"cell-type-annotations.d.ts","sourceRoot":"","sources":["../src/cell-type-annotations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAA;AAwHlE,eAAO,MAAM,mBAAmB,8GAiZ9B,CAAA"}

package/dist/cell-type-annotations.js

@@ -143,14 +143,12 @@ const cellTypeAnnotations = createRule({
       }
     }
     function checkAfterQuery(fn, reportNode) {
-      const missingReturn = !fn.returnType;
       const firstParam = fn.params[0];
       const missingParam = !!firstParam && !paramHasTypeAnnotation(firstParam);
-      if (!missingReturn && !missingParam) {
+      if (!missingParam) {
         return;
       }
       const shouldImport = needsImportEdit("DataObject");
-      const location = missingReturn && missingParam ? "parameter and return type" : missingReturn ? "return type" : "parameter";
       context.report({
         node: reportNode,
         messageId: "needsTypeAnnotation",
@@ -158,29 +156,21 @@ const cellTypeAnnotations = createRule({
           name: "afterQuery",
           typeName: "DataObject",
           kind: "function",
-          location
+          location: "parameter"
         },
         *fix(fixer) {
           if (firstParam && isUnparenthesizedArrowParam(fn, firstParam, sourceCode)) {
             yield* insertWrappedAnnotations(
               fixer,
               firstParam,
-              missingParam ? "DataObject" : null,
-              missingReturn ? "DataObject" : null
+              "DataObject",
+              null
+            );
+          } else if (firstParam) {
+            yield fixer.insertTextAfter(
+              getParamPattern(firstParam),
+              ": DataObject"
             );
-          } else {
-            if (missingParam && firstParam) {
-              yield fixer.insertTextAfter(
-                getParamPattern(firstParam),
-                ": DataObject"
-              );
-            }
-            if (missingReturn) {
-              const closingParen = getParamsClosingParen(sourceCode, fn);
-              if (closingParen) {
-                yield fixer.insertTextAfter(closingParen, ": DataObject");
-              }
-            }
           }
           if (shouldImport) {
             yield* importEdit(fixer, "DataObject");
@@ -189,24 +179,21 @@ const cellTypeAnnotations = createRule({
       });
     }
     function checkIsEmpty(fn, reportNode) {
-      const missingReturn = !fn.returnType;
       const [responseParam, optionsParam] = fn.params;
       const missingResponseType = !!responseParam && !paramHasTypeAnnotation(responseParam);
       const missingOptionsType = !!optionsParam && !paramHasTypeAnnotation(optionsParam);
-      if (!missingReturn && !missingResponseType && !missingOptionsType) {
+      if (!missingResponseType && !missingOptionsType) {
         return;
       }
-      const missingParams = missingResponseType || missingOptionsType;
-      const shouldImport = missingParams && needsImportEdit("DataObject");
-      const location = missingReturn && missingParams ? "parameters and return type" : missingReturn ? "return type" : "parameters";
+      const shouldImport = needsImportEdit("DataObject");
       context.report({
         node: reportNode,
         messageId: "needsTypeAnnotation",
         data: {
           name: "isEmpty",
-          typeName: missingReturn ? "boolean" : "DataObject",
+          typeName: "DataObject",
           kind: "function",
-          location
+          location: "parameters"
         },
         *fix(fixer) {
           if (responseParam && isUnparenthesizedArrowParam(fn, responseParam, sourceCode)) {
@@ -214,7 +201,7 @@ const cellTypeAnnotations = createRule({
               fixer,
               responseParam,
               missingResponseType ? "DataObject" : null,
-              missingReturn ? "boolean" : null
+              null
             );
           } else {
             if (missingResponseType && responseParam) {
@@ -229,12 +216,6 @@ const cellTypeAnnotations = createRule({
                 ": { isDataEmpty: (data: DataObject) => boolean }"
               );
             }
-            if (missingReturn) {
-              const closingParen = getParamsClosingParen(sourceCode, fn);
-              if (closingParen) {
-                yield fixer.insertTextAfter(closingParen, ": boolean");
-              }
-            }
           }
           if (shouldImport) {
             yield* importEdit(fixer, "DataObject");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/eslint-plugin",
-  "version": "6.0.0-canary.2893",
+  "version": "6.0.0-canary.2895",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -27,7 +27,7 @@
     "eslint": "8.57.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2893",
+    "@cedarjs/framework-tools": "6.0.0-canary.2895",
     "@types/eslint": "8.56.12",
     "@types/estree": "1.0.9",
     "@typescript-eslint/parser": "8.60.1",