@saasmakers/eslint 1.0.26 → 1.0.27

package/dist/index.cjs

@@ -63,7 +63,7 @@ function checkUnion(context, node, maxLineLength, minItems) {
 function collapseBlankLine(text) {
   return text.replace(/\n[^\S\n]*\n[^\S\n]*/, "\n");
 }
-function expressionStartsWithIdentifier(node, identifier) {
+function expressionStartsWithIdentifier$1(node, identifier) {
   if (node.type === index$1.distExports.AST_NODE_TYPES.Identifier && node.name === identifier) {
     return true;
   }
@@ -73,17 +73,17 @@ function expressionStartsWithIdentifier(node, identifier) {
       return true;
     }
     if (callee.type === index$1.distExports.AST_NODE_TYPES.MemberExpression) {
-      return expressionStartsWithIdentifier(callee.object, identifier);
+      return expressionStartsWithIdentifier$1(callee.object, identifier);
     }
     if (callee.type === index$1.distExports.AST_NODE_TYPES.ChainExpression) {
-      return expressionStartsWithIdentifier(callee.expression, identifier);
+      return expressionStartsWithIdentifier$1(callee.expression, identifier);
     }
   }
   if (node.type === index$1.distExports.AST_NODE_TYPES.MemberExpression) {
-    return expressionStartsWithIdentifier(node.object, identifier);
+    return expressionStartsWithIdentifier$1(node.object, identifier);
   }
   if (node.type === index$1.distExports.AST_NODE_TYPES.ChainExpression) {
-    return expressionStartsWithIdentifier(node.expression, identifier);
+    return expressionStartsWithIdentifier$1(node.expression, identifier);
   }
   return false;
 }
@@ -211,10 +211,10 @@ function hasLineCommentBetween(prevNode, nextNode, sourceCode) {
   });
 }
 function isAssertExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "assert");
+  return expressionStartsWithIdentifier$1(expression, "assert");
 }
 function isConsoleExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "console");
+  return expressionStartsWithIdentifier$1(expression, "console");
 }
 function isDirectivePrologue(node) {
   if (node.expression.type !== index$1.distExports.AST_NODE_TYPES.Literal) {
@@ -223,7 +223,7 @@ function isDirectivePrologue(node) {
   return typeof node.expression.value === "string";
 }
 function isExpectExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "expect");
+  return expressionStartsWithIdentifier$1(expression, "expect");
 }
 function isOwnLineComment(comment, sourceCode) {
   if (comment.type !== "Line") {
@@ -403,6 +403,7 @@ const rule$4 = {
   }
 };
 
+const teardownViMethods = /* @__PURE__ */ new Set(["restoreAllMocks", "unstubAllGlobals", "useRealTimers"]);
 function compareTests(testA, testB) {
   const functionA = getFunctionName(testA);
   const functionB = getFunctionName(testB);
@@ -418,6 +419,40 @@ function compareTests(testA, testB) {
   const specificNameB = getSpecificName(testB);
   return specificNameA.localeCompare(specificNameB);
 }
+function expressionStartsWithIdentifier(node, identifier) {
+  if (node.type === index$1.distExports.AST_NODE_TYPES.Identifier && node.name === identifier) {
+    return true;
+  }
+  if (node.type === index$1.distExports.AST_NODE_TYPES.CallExpression) {
+    const { callee } = node;
+    if (callee.type === index$1.distExports.AST_NODE_TYPES.Identifier && callee.name === identifier) {
+      return true;
+    }
+    if (callee.type === index$1.distExports.AST_NODE_TYPES.MemberExpression) {
+      return expressionStartsWithIdentifier(callee.object, identifier);
+    }
+    if (callee.type === index$1.distExports.AST_NODE_TYPES.ChainExpression) {
+      return expressionStartsWithIdentifier(callee.expression, identifier);
+    }
+  }
+  if (node.type === index$1.distExports.AST_NODE_TYPES.MemberExpression) {
+    return expressionStartsWithIdentifier(node.object, identifier);
+  }
+  if (node.type === index$1.distExports.AST_NODE_TYPES.ChainExpression) {
+    return expressionStartsWithIdentifier(node.expression, identifier);
+  }
+  return false;
+}
+function getExpressionFromStatement(statement) {
+  if (statement.type !== index$1.distExports.AST_NODE_TYPES.ExpressionStatement) {
+    return null;
+  }
+  let { expression } = statement;
+  if (expression.type === index$1.distExports.AST_NODE_TYPES.AwaitExpression) {
+    expression = expression.argument;
+  }
+  return expression;
+}
 function getFunctionName(testName) {
   const parts = testName.split(".");
   return parts.slice(0, 2).join(".");
@@ -431,6 +466,20 @@ function getSpecificName(testName) {
   }
   return parts.slice(specialIndex + 1).join(".");
 }
+function getTestCallbackBlockBody(node) {
+  const callback = node.arguments[1];
+  if (!callback) {
+    return null;
+  }
+  if (callback.type !== index$1.distExports.AST_NODE_TYPES.FunctionExpression && callback.type !== index$1.distExports.AST_NODE_TYPES.ArrowFunctionExpression) {
+    return null;
+  }
+  const { body } = callback;
+  if (body.type !== index$1.distExports.AST_NODE_TYPES.BlockStatement) {
+    return null;
+  }
+  return body;
+}
 function getTestName(node) {
   const firstArgument = node.arguments[0];
   if (firstArgument?.type === index$1.distExports.AST_NODE_TYPES.Literal && typeof firstArgument.value === "string") {
@@ -451,12 +500,78 @@ function getTestPriority(testName) {
     return 1;
   }
 }
+function hasAssertMethodCall(expression) {
+  if (expression.type !== index$1.distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type === index$1.distExports.AST_NODE_TYPES.MemberExpression && callee.property.type === index$1.distExports.AST_NODE_TYPES.Identifier && callee.property.name.startsWith("assert")) {
+    if (callee.object.type === index$1.distExports.AST_NODE_TYPES.Identifier && callee.object.name === "expect") {
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+function isAssertionCountExpression(expression) {
+  if (expression.type !== index$1.distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type !== index$1.distExports.AST_NODE_TYPES.MemberExpression || callee.object.type !== index$1.distExports.AST_NODE_TYPES.Identifier || callee.property.type !== index$1.distExports.AST_NODE_TYPES.Identifier) {
+    return false;
+  }
+  if (callee.object.name === "expect" && (callee.property.name === "assertions" || callee.property.name === "hasAssertions")) {
+    return true;
+  }
+  return callee.object.name === "assert" && callee.property.name === "plan";
+}
+function isAssertionCountStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression) {
+    return false;
+  }
+  return isAssertionCountExpression(expression);
+}
+function isAssertionExpression(expression) {
+  if (isAssertionCountExpression(expression)) {
+    return false;
+  }
+  if (expressionStartsWithIdentifier(expression, "assert") || expressionStartsWithIdentifier(expression, "expect")) {
+    return true;
+  }
+  return hasAssertMethodCall(expression);
+}
+function isAssertionStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression) {
+    return false;
+  }
+  return isAssertionExpression(expression);
+}
+function isTeardownStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression || expression.type !== index$1.distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type === index$1.distExports.AST_NODE_TYPES.Identifier && callee.name === "cleanup") {
+    return true;
+  }
+  if (callee.type === index$1.distExports.AST_NODE_TYPES.MemberExpression && callee.object.type === index$1.distExports.AST_NODE_TYPES.Identifier && callee.object.name === "vi" && callee.property.type === index$1.distExports.AST_NODE_TYPES.Identifier && teardownViMethods.has(callee.property.name)) {
+    return true;
+  }
+  return false;
+}
 const rule$3 = {
   defaultOptions: [],
   meta: {
-    docs: { description: "Enforce sorted test functions grouped by method with sorted metrics, errors, exceptions and middlewares" },
+    docs: { description: "Enforce sorted test functions and setup-before-assertions layout in test bodies" },
     fixable: "code",
-    messages: { sortError: "Test functions should be grouped by method with sorted metrics, errors, exceptions and middlewares." },
+    messages: {
+      setupAfterAssertion: "Setup statements must appear before assertions in test bodies.",
+      sortError: "Test functions should be grouped by method with sorted metrics, errors, exceptions and middlewares."
+    },
     schema: [],
     type: "suggestion"
   },
@@ -464,6 +579,25 @@ const rule$3 = {
     if (!context.filename.endsWith(".spec.ts") && !context.filename.endsWith(".test.ts")) {
       return {};
     }
+    function handleTestBody(node) {
+      const callbackBody = getTestCallbackBlockBody(node);
+      if (!callbackBody) {
+        return;
+      }
+      const firstAssertionIndex = callbackBody.body.findIndex(isAssertionStatement);
+      if (firstAssertionIndex === -1) {
+        return;
+      }
+      for (const statement of callbackBody.body.slice(firstAssertionIndex + 1)) {
+        if (isAssertionStatement(statement) || isAssertionCountStatement(statement) || isTeardownStatement(statement)) {
+          continue;
+        }
+        context.report({
+          messageId: "setupAfterAssertion",
+          node: statement
+        });
+      }
+    }
     function handleTestGroup(node) {
       const testGroup = node.arguments[0];
       if (!testGroup || !node.arguments[1]) {
@@ -512,6 +646,8 @@ const rule$3 = {
     }
     return {
       'CallExpression[callee.name="describe"]': handleTestGroup,
+      'CallExpression[callee.name="it"]': handleTestBody,
+      'CallExpression[callee.name="test"]': handleTestBody,
       'CallExpression[callee.object.name="describe"][callee.property.name="concurrent"]': handleTestGroup,
       'CallExpression[callee.object.name="test"][callee.property.name="group"]': handleTestGroup
     };

package/dist/index.d.cts

@@ -5198,7 +5198,7 @@ declare const _default: {
             maxLineLength?: number;
             minItems?: number;
         } | undefined)?], unknown, RuleListener>;
-        'ts-format-tests': RuleModule<"sortError", [], unknown, RuleListener>;
+        'ts-format-tests': RuleModule<"setupAfterAssertion" | "sortError", [], unknown, RuleListener>;
         'vue-format-i18n': RuleModule<"sortError" | "indentError" | "invalidJson" | "invalidLocale" | "missingLocale" | "missingTranslations" | "unusedString", [({
             locales?: string[];
         } | undefined)?], unknown, RuleListener>;

package/dist/index.d.mts

@@ -5198,7 +5198,7 @@ declare const _default: {
             maxLineLength?: number;
             minItems?: number;
         } | undefined)?], unknown, RuleListener>;
-        'ts-format-tests': RuleModule<"sortError", [], unknown, RuleListener>;
+        'ts-format-tests': RuleModule<"setupAfterAssertion" | "sortError", [], unknown, RuleListener>;
         'vue-format-i18n': RuleModule<"sortError" | "indentError" | "invalidJson" | "invalidLocale" | "missingLocale" | "missingTranslations" | "unusedString", [({
             locales?: string[];
         } | undefined)?], unknown, RuleListener>;

package/dist/index.d.ts

@@ -5198,7 +5198,7 @@ declare const _default: {
             maxLineLength?: number;
             minItems?: number;
         } | undefined)?], unknown, RuleListener>;
-        'ts-format-tests': RuleModule<"sortError", [], unknown, RuleListener>;
+        'ts-format-tests': RuleModule<"setupAfterAssertion" | "sortError", [], unknown, RuleListener>;
         'vue-format-i18n': RuleModule<"sortError" | "indentError" | "invalidJson" | "invalidLocale" | "missingLocale" | "missingTranslations" | "unusedString", [({
             locales?: string[];
         } | undefined)?], unknown, RuleListener>;

package/dist/index.mjs

@@ -61,7 +61,7 @@ function checkUnion(context, node, maxLineLength, minItems) {
 function collapseBlankLine(text) {
   return text.replace(/\n[^\S\n]*\n[^\S\n]*/, "\n");
 }
-function expressionStartsWithIdentifier(node, identifier) {
+function expressionStartsWithIdentifier$1(node, identifier) {
   if (node.type === distExports.AST_NODE_TYPES.Identifier && node.name === identifier) {
     return true;
   }
@@ -71,17 +71,17 @@ function expressionStartsWithIdentifier(node, identifier) {
       return true;
     }
     if (callee.type === distExports.AST_NODE_TYPES.MemberExpression) {
-      return expressionStartsWithIdentifier(callee.object, identifier);
+      return expressionStartsWithIdentifier$1(callee.object, identifier);
     }
     if (callee.type === distExports.AST_NODE_TYPES.ChainExpression) {
-      return expressionStartsWithIdentifier(callee.expression, identifier);
+      return expressionStartsWithIdentifier$1(callee.expression, identifier);
     }
   }
   if (node.type === distExports.AST_NODE_TYPES.MemberExpression) {
-    return expressionStartsWithIdentifier(node.object, identifier);
+    return expressionStartsWithIdentifier$1(node.object, identifier);
   }
   if (node.type === distExports.AST_NODE_TYPES.ChainExpression) {
-    return expressionStartsWithIdentifier(node.expression, identifier);
+    return expressionStartsWithIdentifier$1(node.expression, identifier);
   }
   return false;
 }
@@ -209,10 +209,10 @@ function hasLineCommentBetween(prevNode, nextNode, sourceCode) {
   });
 }
 function isAssertExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "assert");
+  return expressionStartsWithIdentifier$1(expression, "assert");
 }
 function isConsoleExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "console");
+  return expressionStartsWithIdentifier$1(expression, "console");
 }
 function isDirectivePrologue(node) {
   if (node.expression.type !== distExports.AST_NODE_TYPES.Literal) {
@@ -221,7 +221,7 @@ function isDirectivePrologue(node) {
   return typeof node.expression.value === "string";
 }
 function isExpectExpression(expression) {
-  return expressionStartsWithIdentifier(expression, "expect");
+  return expressionStartsWithIdentifier$1(expression, "expect");
 }
 function isOwnLineComment(comment, sourceCode) {
   if (comment.type !== "Line") {
@@ -401,6 +401,7 @@ const rule$4 = {
   }
 };
 
+const teardownViMethods = /* @__PURE__ */ new Set(["restoreAllMocks", "unstubAllGlobals", "useRealTimers"]);
 function compareTests(testA, testB) {
   const functionA = getFunctionName(testA);
   const functionB = getFunctionName(testB);
@@ -416,6 +417,40 @@ function compareTests(testA, testB) {
   const specificNameB = getSpecificName(testB);
   return specificNameA.localeCompare(specificNameB);
 }
+function expressionStartsWithIdentifier(node, identifier) {
+  if (node.type === distExports.AST_NODE_TYPES.Identifier && node.name === identifier) {
+    return true;
+  }
+  if (node.type === distExports.AST_NODE_TYPES.CallExpression) {
+    const { callee } = node;
+    if (callee.type === distExports.AST_NODE_TYPES.Identifier && callee.name === identifier) {
+      return true;
+    }
+    if (callee.type === distExports.AST_NODE_TYPES.MemberExpression) {
+      return expressionStartsWithIdentifier(callee.object, identifier);
+    }
+    if (callee.type === distExports.AST_NODE_TYPES.ChainExpression) {
+      return expressionStartsWithIdentifier(callee.expression, identifier);
+    }
+  }
+  if (node.type === distExports.AST_NODE_TYPES.MemberExpression) {
+    return expressionStartsWithIdentifier(node.object, identifier);
+  }
+  if (node.type === distExports.AST_NODE_TYPES.ChainExpression) {
+    return expressionStartsWithIdentifier(node.expression, identifier);
+  }
+  return false;
+}
+function getExpressionFromStatement(statement) {
+  if (statement.type !== distExports.AST_NODE_TYPES.ExpressionStatement) {
+    return null;
+  }
+  let { expression } = statement;
+  if (expression.type === distExports.AST_NODE_TYPES.AwaitExpression) {
+    expression = expression.argument;
+  }
+  return expression;
+}
 function getFunctionName(testName) {
   const parts = testName.split(".");
   return parts.slice(0, 2).join(".");
@@ -429,6 +464,20 @@ function getSpecificName(testName) {
   }
   return parts.slice(specialIndex + 1).join(".");
 }
+function getTestCallbackBlockBody(node) {
+  const callback = node.arguments[1];
+  if (!callback) {
+    return null;
+  }
+  if (callback.type !== distExports.AST_NODE_TYPES.FunctionExpression && callback.type !== distExports.AST_NODE_TYPES.ArrowFunctionExpression) {
+    return null;
+  }
+  const { body } = callback;
+  if (body.type !== distExports.AST_NODE_TYPES.BlockStatement) {
+    return null;
+  }
+  return body;
+}
 function getTestName(node) {
   const firstArgument = node.arguments[0];
   if (firstArgument?.type === distExports.AST_NODE_TYPES.Literal && typeof firstArgument.value === "string") {
@@ -449,12 +498,78 @@ function getTestPriority(testName) {
     return 1;
   }
 }
+function hasAssertMethodCall(expression) {
+  if (expression.type !== distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type === distExports.AST_NODE_TYPES.MemberExpression && callee.property.type === distExports.AST_NODE_TYPES.Identifier && callee.property.name.startsWith("assert")) {
+    if (callee.object.type === distExports.AST_NODE_TYPES.Identifier && callee.object.name === "expect") {
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+function isAssertionCountExpression(expression) {
+  if (expression.type !== distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type !== distExports.AST_NODE_TYPES.MemberExpression || callee.object.type !== distExports.AST_NODE_TYPES.Identifier || callee.property.type !== distExports.AST_NODE_TYPES.Identifier) {
+    return false;
+  }
+  if (callee.object.name === "expect" && (callee.property.name === "assertions" || callee.property.name === "hasAssertions")) {
+    return true;
+  }
+  return callee.object.name === "assert" && callee.property.name === "plan";
+}
+function isAssertionCountStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression) {
+    return false;
+  }
+  return isAssertionCountExpression(expression);
+}
+function isAssertionExpression(expression) {
+  if (isAssertionCountExpression(expression)) {
+    return false;
+  }
+  if (expressionStartsWithIdentifier(expression, "assert") || expressionStartsWithIdentifier(expression, "expect")) {
+    return true;
+  }
+  return hasAssertMethodCall(expression);
+}
+function isAssertionStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression) {
+    return false;
+  }
+  return isAssertionExpression(expression);
+}
+function isTeardownStatement(statement) {
+  const expression = getExpressionFromStatement(statement);
+  if (!expression || expression.type !== distExports.AST_NODE_TYPES.CallExpression) {
+    return false;
+  }
+  const { callee } = expression;
+  if (callee.type === distExports.AST_NODE_TYPES.Identifier && callee.name === "cleanup") {
+    return true;
+  }
+  if (callee.type === distExports.AST_NODE_TYPES.MemberExpression && callee.object.type === distExports.AST_NODE_TYPES.Identifier && callee.object.name === "vi" && callee.property.type === distExports.AST_NODE_TYPES.Identifier && teardownViMethods.has(callee.property.name)) {
+    return true;
+  }
+  return false;
+}
 const rule$3 = {
   defaultOptions: [],
   meta: {
-    docs: { description: "Enforce sorted test functions grouped by method with sorted metrics, errors, exceptions and middlewares" },
+    docs: { description: "Enforce sorted test functions and setup-before-assertions layout in test bodies" },
     fixable: "code",
-    messages: { sortError: "Test functions should be grouped by method with sorted metrics, errors, exceptions and middlewares." },
+    messages: {
+      setupAfterAssertion: "Setup statements must appear before assertions in test bodies.",
+      sortError: "Test functions should be grouped by method with sorted metrics, errors, exceptions and middlewares."
+    },
     schema: [],
     type: "suggestion"
   },
@@ -462,6 +577,25 @@ const rule$3 = {
     if (!context.filename.endsWith(".spec.ts") && !context.filename.endsWith(".test.ts")) {
       return {};
     }
+    function handleTestBody(node) {
+      const callbackBody = getTestCallbackBlockBody(node);
+      if (!callbackBody) {
+        return;
+      }
+      const firstAssertionIndex = callbackBody.body.findIndex(isAssertionStatement);
+      if (firstAssertionIndex === -1) {
+        return;
+      }
+      for (const statement of callbackBody.body.slice(firstAssertionIndex + 1)) {
+        if (isAssertionStatement(statement) || isAssertionCountStatement(statement) || isTeardownStatement(statement)) {
+          continue;
+        }
+        context.report({
+          messageId: "setupAfterAssertion",
+          node: statement
+        });
+      }
+    }
     function handleTestGroup(node) {
       const testGroup = node.arguments[0];
       if (!testGroup || !node.arguments[1]) {
@@ -510,6 +644,8 @@ const rule$3 = {
     }
     return {
       'CallExpression[callee.name="describe"]': handleTestGroup,
+      'CallExpression[callee.name="it"]': handleTestBody,
+      'CallExpression[callee.name="test"]': handleTestBody,
       'CallExpression[callee.object.name="describe"][callee.property.name="concurrent"]': handleTestGroup,
       'CallExpression[callee.object.name="test"][callee.property.name="group"]': handleTestGroup
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasmakers/eslint",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "private": false,
   "description": "Shared ESLint config and rules for SaaS Makers projects",
   "license": "MIT",