@sarj/eslint-plugin 18.2.1 → 18.3.1

package/dist/index.js

@@ -1,6 +1,3 @@
-// src/rules/prefer-zod-enum-validator.ts
-import { AST_NODE_TYPES as AST_NODE_TYPES4 } from "@typescript-eslint/utils";
-
 // src/rules/_eslint-rule.ts
 import { ESLintUtils } from "@typescript-eslint/utils";
 
@@ -487,21 +484,21 @@ function validateExpectedSuggestion(value, exampleId, messageIds) {
   assertFields(value, ["messageId", "output"], exampleId);
 }
 function validateExpectedLocation(value, exampleId) {
-  if (!isObject(value) || !("line" in value) || !positiveCoordinate(value.line) || !("column" in value) || !positiveCoordinate(value.column)) {
+  if (!isObject(value) || !("line" in value) || typeof value.line !== "number" || !positiveCoordinate(value.line) || !("column" in value) || typeof value.column !== "number" || !positiveCoordinate(value.column)) {
     throw new TypeError(`${exampleId}: expected diagnostic location requires positive integer coordinates`);
   }
   if (!("end" in value)) {
     assertFields(value, ["line", "column"], exampleId);
     return;
   }
-  if (!isObject(value.end) || !("line" in value.end) || !positiveCoordinate(value.end.line) || !("column" in value.end) || !positiveCoordinate(value.end.column) || value.end.line < value.line || value.end.line === value.line && value.end.column < value.column) {
+  if (!isObject(value.end) || !("line" in value.end) || typeof value.end.line !== "number" || !positiveCoordinate(value.end.line) || !("column" in value.end) || typeof value.end.column !== "number" || !positiveCoordinate(value.end.column) || value.end.line < value.line || value.end.line === value.line && value.end.column < value.column) {
     throw new TypeError(`${exampleId}: expected diagnostic end point must be complete and ordered`);
   }
   assertFields(value.end, ["line", "column"], exampleId);
   assertFields(value, ["line", "column", "end"], exampleId);
 }
 function positiveCoordinate(value) {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 1;
+  return Number.isSafeInteger(value) && value >= 1;
 }
 function assertFields(value, expected, exampleId) {
   const fields2 = Object.keys(value);
@@ -653,6 +650,56 @@ function commentLineEnd(sourceText, start) {
   return end === -1 ? sourceText.length : start + end;
 }
 
+// src/rules/no-explicit-type-predicate.ts
+var NO_EXPLICIT_TYPE_PREDICATE_DOCUMENTATION = {
+  defaultLevel: "warning",
+  summary: "Use compiler-checked narrowing instead of handwritten type predicates.",
+  rationale: "TypeScript trusts an explicit value is Type annotation without proving that its implementation recognizes that type in both branches. A stale or partial predicate can make callers read properties that do not exist. Direct discriminator checks and inferred predicates keep narrowing tied to the implementation.",
+  remediation: "For owned variants, check the discriminated union's tag directly or let TypeScript infer a simple discriminator helper or null filter. Parse unknown external data with a specific schema and consume its validated value or discriminated result. Do not replace a predicate with a cast or a schema boolean wrapper that repeats the same unchecked type claim. If a native API cannot express the required static contract, isolate that boundary and use an exact-rule local suppression explaining the constraint.",
+  category: "maintainability",
+  autofix: "none",
+  requiresTypeInformation: false,
+  limitations: [
+    "This is an explicit design policy, including otherwise correct handwritten predicates. Reports every authored TypeScript is predicate, including asserts value is Type, method and callback annotations, function types, overloads, ambient signatures and predicates inside casts or satisfies expressions.",
+    "Direct discriminator checks, compiler-inferred predicates, ordinary boolean returns and plain asserts condition remain valid. A tag on unknown input does not validate its payload. Imported library guard calls and imported predicate types are not redeclarations and are not inspected.",
+    "Shared generated, vendored and declaration-file exclusions apply. Maintained test implementations remain checked; strings, comments and JSDoc text are not TypeScript predicate nodes. There is no exemption based on helper names, imports or body shape.",
+    "No automatic fix or suggestion removes an annotation: public and callback contracts, overloads, both narrowing branches, emitted declarations and existing TypeScript versions may depend on it. Review callers and preserve intentional runtime behavior when migrating. Existing partial and contradictory predicate rules retain their separate correctness checks."
+  ],
+  references: [
+    "https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions",
+    "https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-5.html#inferred-type-predicates",
+    "https://zod.dev/basics"
+  ],
+  examples: [
+    { id: "manual-predicate", title: "Avoid an unchecked narrowing annotation", outcome: "match", files: [{ path: "src/job.ts", source: "type Job = { kind: 'queued'; queue: string } | { kind: 'done'; result: string }; type Done = Extract<Job, {kind: 'done'}>; function isDone(job: Job): job is Done { return job.kind === 'done'; } function render(job: Job) { return isDone(job) ? job.result : job.queue; }" }], focusPath: "src/job.ts", expectedCount: 1, public: true },
+    { id: "direct-discriminator", title: "Let the compiler narrow the tagged union", outcome: "no-match", files: [{ path: "src/job.ts", source: "type Job = { kind: 'queued'; queue: string } | { kind: 'done'; result: string }; function render(job: Job) { return job.kind === 'done' ? job.result : job.queue; }" }], focusPath: "src/job.ts", expectedCount: 0, public: true },
+    { id: "inferred-predicate", scenarioId: "inference", title: "Infer a discriminator helper from its body", outcome: "no-match", files: [{ path: "src/job.ts", source: "type Job = { kind: 'queued'; queue: string } | { kind: 'done'; result: string }; const isDone = (job: Job) => job.kind === 'done';" }], focusPath: "src/job.ts", expectedCount: 0, public: true },
+    { id: "written-predicate", scenarioId: "inference", title: "A written predicate remains an unchecked promise", outcome: "match", files: [{ path: "src/job.ts", source: "type Job = { kind: 'queued'; queue: string } | { kind: 'done'; result: string }; type Done = Extract<Job, {kind: 'done'}>; const isDone = (job: Job): job is Done => job.kind === 'done';" }], focusPath: "src/job.ts", expectedCount: 1, public: true }
+  ]
+};
+var no_explicit_type_predicate_default = createRule({
+  name: "no-explicit-type-predicate",
+  documentation: NO_EXPLICIT_TYPE_PREDICATE_DOCUMENTATION,
+  meta: {
+    type: "suggestion",
+    docs: { description: NO_EXPLICIT_TYPE_PREDICATE_DOCUMENTATION.summary },
+    schema: [],
+    messages: { noExplicitTypePredicate: "Replace this handwritten type predicate with a direct discriminator check or compiler-inferred narrowing. Parse unknown data with a schema and consume the validated result; preserve required external callable contracts." }
+  },
+  defaultOptions: [],
+  create(context) {
+    if (isGeneratedFile(context, context.sourceCode.text)) return {};
+    return {
+      TSTypePredicate(node) {
+        if (node.typeAnnotation != null) context.report({ node, messageId: "noExplicitTypePredicate" });
+      }
+    };
+  }
+});
+
+// src/rules/prefer-zod-enum-validator.ts
+import { AST_NODE_TYPES as AST_NODE_TYPES4 } from "@typescript-eslint/utils";
+
 // src/rules/_static-string.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES3, ASTUtils } from "@typescript-eslint/utils";
 
@@ -3663,7 +3710,7 @@ function fixtureConstructor(source, value) {
   const use = value.params[1];
   if (use?.type !== AST_NODE_TYPES27.Identifier) return null;
   const binding3 = stableBinding(source, use);
-  const calls = scopeNodes(value.body, source).filter((node) => node.type === AST_NODE_TYPES27.CallExpression && !node.optional && node.arguments.length === 1 && node.callee.type === AST_NODE_TYPES27.Identifier && stableBinding(source, node.callee) === binding3);
+  const calls = scopeNodes(value.body, source).filter((node) => node.type === AST_NODE_TYPES27.CallExpression).filter((node) => !node.optional && node.arguments.length === 1 && node.callee.type === AST_NODE_TYPES27.Identifier && stableBinding(source, node.callee) === binding3);
   if (calls.length !== 1 || binding3 === null) return null;
   const argument = calls[0]?.arguments[0];
   return argument === void 0 || argument.type === AST_NODE_TYPES27.SpreadElement ? null : newConstructor(source, argument);
@@ -3686,17 +3733,12 @@ function scopeNodes(root, source) {
     if (node === void 0) continue;
     result.push(node);
     if (node !== root && (node.type === AST_NODE_TYPES27.ArrowFunctionExpression || node.type === AST_NODE_TYPES27.FunctionExpression || node.type === AST_NODE_TYPES27.FunctionDeclaration || node.type === AST_NODE_TYPES27.ClassDeclaration || node.type === AST_NODE_TYPES27.ClassExpression)) continue;
-    for (const key of source.visitorKeys[node.type] ?? []) {
-      const value = Reflect.get(node, key);
-      if (Array.isArray(value)) pending.push(...value.filter(isNode2));
-      else if (isNode2(value)) pending.push(value);
-    }
+    forEachAstChild(node, source.visitorKeys, (child) => {
+      pending.push(child);
+    });
   }
   return result;
 }
-function isNode2(value) {
-  return typeof value === "object" && value !== null && "type" in value && typeof value.type === "string";
-}
 function testApiCallee(expression) {
   let node = unwrapExpression(expression);
   while (node.type === AST_NODE_TYPES27.MemberExpression && !node.optional && TEST_MODIFIERS.has(ASTUtils14.getPropertyName(node) ?? "")) node = unwrapExpression(node.object);
@@ -6266,7 +6308,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "18.2.1",
+  version: "18.3.1",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",
@@ -6321,8 +6363,8 @@ var package_default = {
   license: "MIT",
   dependencies: {
     "@eslint/core": "1.2.1",
-    "@typescript-eslint/typescript-estree": "^8.72.0",
-    "@typescript-eslint/utils": "^8.72.0",
+    "@typescript-eslint/typescript-estree": "^8.72.1",
+    "@typescript-eslint/utils": "^8.72.1",
     "jsonc-parser": "^3.3.1",
     "ts-api-utils": "2.5.0"
   },
@@ -6330,28 +6372,28 @@ var package_default = {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.8.1",
     "@eslint/compat": "^2.1.1",
     "@eslint/js": "10.0.1",
-    "@shadcn/lint": "0.2.3",
+    "@shadcn/lint": "0.2.5",
     "@types/eslint-plugin-no-unsanitized": "4.1.0",
     "@types/node": "26.6.5",
-    "@typescript-eslint/parser": "8.72.0",
-    "@typescript-eslint/rule-tester": "8.72.0",
-    "@typescript-eslint/utils": "8.72.0",
+    "@typescript-eslint/parser": "8.72.1",
+    "@typescript-eslint/rule-tester": "8.72.1",
+    "@typescript-eslint/utils": "8.72.1",
     "@typescript/native": "npm:typescript@7.0.2",
     "@vitest/eslint-plugin": "1.6.28",
-    eslint: "10.13.0",
+    eslint: "10.14.0",
     "eslint-node-test": "1.0.1",
     "eslint-plugin-eslint-plugin": "7.6.2",
     "eslint-plugin-better-tailwindcss": "^4.10.0",
     "eslint-plugin-jest": "29.17.0",
-    "eslint-plugin-jsdoc": "65.4.2",
+    "eslint-plugin-jsdoc": "65.4.4",
     "eslint-plugin-n": "^18.5.0",
     "eslint-plugin-perfectionist": "5.13.0",
-    "eslint-plugin-playwright": "2.12.1",
+    "eslint-plugin-playwright": "2.12.2",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-regexp": "3.3.1",
-    "eslint-plugin-security": "4.2.0",
+    "eslint-plugin-regexp": "3.3.3",
+    "eslint-plugin-security": "4.2.1",
     "eslint-plugin-no-unsanitized": "4.1.5",
     "eslint-plugin-simple-import-sort": "^14.0.0",
     "eslint-plugin-testing-library": "7.16.2",
@@ -6363,7 +6405,7 @@ var package_default = {
     tsup: "9.0.0",
     syncpack: "15.3.3",
     typescript: "npm:@typescript/typescript6@6.0.2",
-    "typescript-eslint": "^8.72.0",
+    "typescript-eslint": "^8.72.1",
     uuid: "13.0.0",
     vitest: "5.0.5",
     zod: "4.6.7"
@@ -6912,7 +6954,7 @@ function existingFactoryContractFix(sourceCode, candidate2) {
   const contract = contractStatement?.type === AST_NODE_TYPES46.ExportNamedDeclaration ? contractStatement.declaration : null;
   const implementation = classStatement?.type === AST_NODE_TYPES46.ExportNamedDeclaration ? classStatement.declaration : classStatement;
   const factory = factoryStatement?.type === AST_NODE_TYPES46.ExportNamedDeclaration ? factoryStatement.declaration : null;
-  if (contract?.type !== AST_NODE_TYPES46.TSTypeAliasDeclaration || worker?.type !== AST_NODE_TYPES46.TSInterfaceDeclaration || implementation?.type !== AST_NODE_TYPES46.ClassDeclaration || implementation !== candidate2 || !ordinaryClass(implementation) || !ordinaryFactory(factory))
+  if (contract?.type !== AST_NODE_TYPES46.TSTypeAliasDeclaration || worker?.type !== AST_NODE_TYPES46.TSInterfaceDeclaration || implementation?.type !== AST_NODE_TYPES46.ClassDeclaration || implementation !== candidate2 || !ordinaryClass(implementation) || factory?.type !== AST_NODE_TYPES46.FunctionDeclaration || !ordinaryFactory(factory))
     return null;
   const operation2 = contractOperation(contract);
   if (operation2 === null || interfaceOperation(worker) !== operation2)
@@ -6931,7 +6973,7 @@ function ordinaryClass(node) {
   return node.id !== null && !node.declare && !node.abstract && node.decorators.length === 0 && node.superClass === null && node.implements.length === 0 && node.typeParameters === void 0 && node.body.body.length === 2;
 }
 function ordinaryFactory(node) {
-  return node?.type === AST_NODE_TYPES46.FunctionDeclaration && node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.params.length === 1 && node.body.body.length === 1;
+  return node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.params.length === 1 && node.body.body.length === 1;
 }
 function interfaceOperation(node) {
   return !node.declare && node.extends.length === 0 && node.typeParameters === void 0 ? singletonOperation(node.body.body) : null;
@@ -7507,8 +7549,8 @@ var publicMethodNames = (body3, functionAliases) => {
 };
 var isFluentConstructionObject = (node, getText) => {
   if (node.id === null) return false;
-  const methods = node.body.body.filter(
-    (member3) => member3.type === AST_NODE_TYPES47.MethodDefinition && member3.kind === "method" && !member3.static && member3.accessibility !== "private" && member3.accessibility !== "protected" && member3.value.body !== null
+  const methods = node.body.body.filter((member3) => member3.type === AST_NODE_TYPES47.MethodDefinition).filter(
+    (member3) => member3.kind === "method" && !member3.static && member3.accessibility !== "private" && member3.accessibility !== "protected" && member3.value.body !== null
   );
   if (methods.length === 0) return false;
   return methods.every((member3) => {
@@ -7672,7 +7714,7 @@ var require_port_for_service_default = createRule({
         const ctor = node.body.body.find(
           (member3) => member3.type === AST_NODE_TYPES47.MethodDefinition && member3.kind === "constructor" && member3.value.body !== null && member3.value.body !== void 0
         );
-        if (ctor === void 0) return;
+        if (ctor?.type !== AST_NODE_TYPES47.MethodDefinition) return;
         const constructorFacts = readConstructor(
           ctor,
           objectTypes,
@@ -7739,7 +7781,7 @@ function createServiceOperationResolver(program) {
     const ctor = node.body.body.find(
       (member3) => member3.type === AST_NODE_TYPES47.MethodDefinition && member3.kind === "constructor" && member3.value.body !== null
     );
-    if (ctor === void 0) return [];
+    if (ctor?.type !== AST_NODE_TYPES47.MethodDefinition) return [];
     const declared = () => declaredTypes ??= fileTypeIndex(program);
     const facts = readConstructor(
       ctor,
@@ -9314,7 +9356,7 @@ function ordinaryHostReference(reference) {
 }
 
 // src/rules/no-contradictory-type-predicate.ts
-var RUNTIME_KINDS = /* @__PURE__ */ new Set(["string", "number", "bigint", "boolean", "symbol", "undefined", "object", "function"]);
+var RUNTIME_KINDS = ["string", "number", "bigint", "boolean", "symbol", "undefined", "object", "function"];
 var PRIMITIVE_KINDS = [
   [ts24.TypeFlags.String, "string"],
   [ts24.TypeFlags.Number, "number"],
@@ -9393,7 +9435,7 @@ var no_contradictory_type_predicate_default = createRule({
       if (hasSeparatePredicateContract(services.esTreeNodeToTSNodeMap.get(node), checker)) return;
       const parameter = node.params.find((candidate2) => candidate2.type === AST_NODE_TYPES56.Identifier && candidate2.name === name);
       const expression = singleReturn(node);
-      if (parameter?.typeAnnotation === void 0 || expression === void 0) return;
+      if (parameter?.type !== AST_NODE_TYPES56.Identifier || parameter.typeAnnotation === void 0 || expression === void 0) return;
       const check = typeofCheck(expression);
       if (check !== void 0 && !sameParameter(parameter, check.parameter, context.sourceCode)) return;
       const input = checker.getTypeAtLocation(services.esTreeNodeToTSNodeMap.get(check?.parameter ?? parameter));
@@ -9484,15 +9526,13 @@ function typeofCheck(expression) {
   if (value.type !== AST_NODE_TYPES56.BinaryExpression || value.operator !== "===" && value.operator !== "==") return void 0;
   for (const [tested, expected] of [[value.left, value.right], [value.right, value.left]]) {
     const operand = unwrapExpression(tested);
-    const kind = staticString(expected);
-    if (operand.type !== AST_NODE_TYPES56.UnaryExpression || operand.operator !== "typeof" || operand.argument.type !== AST_NODE_TYPES56.Identifier || kind === null || !isRuntimeKind(kind)) continue;
+    const expectedKind = staticString(expected);
+    const kind = RUNTIME_KINDS.find((candidate2) => candidate2 === expectedKind);
+    if (operand.type !== AST_NODE_TYPES56.UnaryExpression || operand.operator !== "typeof" || operand.argument.type !== AST_NODE_TYPES56.Identifier || kind === void 0) continue;
     return { parameter: operand.argument, kind };
   }
   return void 0;
 }
-function isRuntimeKind(value) {
-  return RUNTIME_KINDS.has(value);
-}
 function sameParameter(declared, tested, sourceCode) {
   const parameter = ASTUtils35.findVariable(sourceCode.getScope(declared), declared.name);
   return parameter !== null && parameter === ASTUtils35.findVariable(sourceCode.getScope(tested), tested.name);
@@ -9541,9 +9581,9 @@ import { AST_NODE_TYPES as AST_NODE_TYPES57, ASTUtils as ASTUtils36 } from "@typ
 import ts25 from "typescript";
 function uuidPredicateWitness(expression, parameter, sourceCode, services) {
   const success = unwrapExpression(expression);
-  if (!member(success, "success")) return void 0;
+  if (success.type !== AST_NODE_TYPES57.MemberExpression || !member(success, "success")) return void 0;
   const parse2 = unwrapExpression(success.object);
-  if (parse2.type !== AST_NODE_TYPES57.CallExpression || parse2.optional || parse2.arguments.length !== 1 || !member(parse2.callee, "safeParse")) return void 0;
+  if (parse2.type !== AST_NODE_TYPES57.CallExpression || parse2.optional || parse2.arguments.length !== 1 || parse2.callee.type !== AST_NODE_TYPES57.MemberExpression || !member(parse2.callee, "safeParse")) return void 0;
   const argument = parse2.arguments[0];
   if (argument === void 0 || unwrapExpression(argument).type !== AST_NODE_TYPES57.Identifier) return void 0;
   const value = unwrapExpression(argument);
@@ -9562,13 +9602,13 @@ function binding(node, sourceCode) {
   return ASTUtils36.findVariable(sourceCode.getScope(node), node.name);
 }
 function member(node, name) {
-  return node?.type === AST_NODE_TYPES57.MemberExpression && !node.optional && !node.computed && node.property.type === AST_NODE_TYPES57.Identifier && node.property.name === name;
+  return !node.optional && !node.computed && node.property.type === AST_NODE_TYPES57.Identifier && node.property.name === name;
 }
 function uuidNamespace(initializer, sourceCode, services) {
-  if (!noArguments(initializer) || !member(initializer.callee, "uuid")) return null;
+  if (initializer.type !== AST_NODE_TYPES57.CallExpression || !noArguments(initializer) || initializer.callee.type !== AST_NODE_TYPES57.MemberExpression || !member(initializer.callee, "uuid")) return null;
   let receiver = unwrapExpression(initializer.callee.object);
   let legacy = false;
-  if (noArguments(receiver) && member(receiver.callee, "string")) {
+  if (receiver.type === AST_NODE_TYPES57.CallExpression && noArguments(receiver) && receiver.callee.type === AST_NODE_TYPES57.MemberExpression && member(receiver.callee, "string")) {
     receiver = unwrapExpression(receiver.callee.object);
     legacy = true;
   }
@@ -9584,7 +9624,7 @@ function uuidNamespace(initializer, sourceCode, services) {
   return namespace ?? null;
 }
 function noArguments(node) {
-  return node.type === AST_NODE_TYPES57.CallExpression && !node.optional && node.arguments.length === 0;
+  return !node.optional && node.arguments.length === 0;
 }
 function installedZod(node, services) {
   const checker = services.program.getTypeChecker();
@@ -9604,7 +9644,7 @@ function closedSchema(schema) {
     const receiver = outerExpression(reference.identifier);
     const property = receiver.parent;
     if (property?.type === AST_NODE_TYPES57.ExportSpecifier && property.local === receiver) return true;
-    if (!member(property, "safeParse") || property.object !== receiver) return false;
+    if (property?.type !== AST_NODE_TYPES57.MemberExpression || !member(property, "safeParse") || property.object !== receiver) return false;
     const call = property.parent;
     return call?.type === AST_NODE_TYPES57.CallExpression && call.callee === property && !call.optional && call.arguments.length === 1 && call.arguments[0]?.type !== AST_NODE_TYPES57.SpreadElement;
   });
@@ -10070,10 +10110,10 @@ function literalSelectorFix(sourceCode, parameter) {
   if (sourceCode.ast.body.length !== 4 || sourceCode.getAllComments().length > 0)
     return null;
   const [first, second, declaration, statement] = sourceCode.ast.body;
-  if (!isLiteralOperation(first) || !isLiteralOperation(second) || declaration?.type !== AST_NODE_TYPES60.VariableDeclaration || declaration.declare || declaration.kind !== "const" || declaration.declarations.length !== 1 || statement?.type !== AST_NODE_TYPES60.ExportNamedDeclaration || statement.declaration?.type !== AST_NODE_TYPES60.FunctionDeclaration)
+  if (first?.type !== AST_NODE_TYPES60.FunctionDeclaration || !isLiteralOperation(first) || second?.type !== AST_NODE_TYPES60.FunctionDeclaration || !isLiteralOperation(second) || declaration?.type !== AST_NODE_TYPES60.VariableDeclaration || declaration.declare || declaration.kind !== "const" || declaration.declarations.length !== 1 || statement?.type !== AST_NODE_TYPES60.ExportNamedDeclaration || statement.declaration?.type !== AST_NODE_TYPES60.FunctionDeclaration)
     return null;
   const binding3 = declaration.declarations[0];
-  if (binding3?.id.type !== AST_NODE_TYPES60.Identifier || binding3.id.typeAnnotation !== void 0 || !isSelector(binding3.init, parameter))
+  if (binding3?.id.type !== AST_NODE_TYPES60.Identifier || binding3.id.typeAnnotation !== void 0 || binding3.init?.type !== AST_NODE_TYPES60.ArrowFunctionExpression || binding3.init.body.type !== AST_NODE_TYPES60.ConditionalExpression || !isSelector(binding3.init, parameter))
     return null;
   const branch = binding3.init.body;
   const whenTrue = operation(sourceCode, branch.consequent, first, second);
@@ -10095,13 +10135,12 @@ function literalSelectorFix(sourceCode, parameter) {
   ];
 }
 function isLiteralOperation(node) {
-  if (node?.type !== AST_NODE_TYPES60.FunctionDeclaration || node.id === null || node.declare || node.async || node.generator || node.params.length !== 0 || node.typeParameters !== void 0 || node.returnType !== void 0 || node.body.body.length !== 1)
+  if (node.id === null || node.declare || node.async || node.generator || node.params.length !== 0 || node.typeParameters !== void 0 || node.returnType !== void 0 || node.body.body.length !== 1)
     return false;
   const returned2 = node.body.body[0];
   return returned2?.type === AST_NODE_TYPES60.ReturnStatement && returned2.argument?.type === AST_NODE_TYPES60.Literal && typeof returned2.argument.value === "string";
 }
 function isSelector(node, parameter) {
-  if (node?.type !== AST_NODE_TYPES60.ArrowFunctionExpression) return false;
   const actual = node.params[0];
   return actual?.type === AST_NODE_TYPES60.Identifier && actual.name === parameter.name && !node.async && node.typeParameters === void 0 && node.returnType === void 0 && node.params.length === 1 && !actual.optional && actual.typeAnnotation?.typeAnnotation.type === AST_NODE_TYPES60.TSBooleanKeyword && node.body.type === AST_NODE_TYPES60.ConditionalExpression && node.body.test === parameter;
 }
@@ -11928,10 +11967,6 @@ import { AST_NODE_TYPES as AST_NODE_TYPES74 } from "@typescript-eslint/utils";
 var TEST_CALLERS = /* @__PURE__ */ new Set(["it", "test"]);
 var ASSERTION_NAMES = /* @__PURE__ */ new Set(["assert", "expect"]);
 var TEST_MODIFIERS2 = /* @__PURE__ */ new Set(["concurrent", "fails", "only", "sequential", "skip"]);
-var FUNCTION_TYPES = /* @__PURE__ */ new Set([
-  AST_NODE_TYPES74.FunctionExpression,
-  AST_NODE_TYPES74.ArrowFunctionExpression
-]);
 var OMITTED_AST_KEYS = /* @__PURE__ */ new Set([
   "end",
   "loc",
@@ -12113,7 +12148,7 @@ function testBody(call, sourceCode) {
     return null;
   }
   const callback = call.arguments.map(unwrapExpression).find(
-    (argument) => argument.type !== AST_NODE_TYPES74.SpreadElement && FUNCTION_TYPES.has(argument.type)
+    (argument) => argument.type === AST_NODE_TYPES74.FunctionExpression || argument.type === AST_NODE_TYPES74.ArrowFunctionExpression
   );
   if (callback === void 0 || call.arguments.length !== 2 || containsInlineSnapshot(callback.body)) {
     return null;
@@ -15407,7 +15442,7 @@ function uuidModule(sourceCode, kind) {
   const native = statements[offset + 1];
   const legacy = statements[offset + 2];
   const exported = statements[offset + 3];
-  if (imported !== null && imported?.type !== AST_NODE_TYPES87.ImportDeclaration || declaration?.type !== AST_NODE_TYPES87.VariableDeclaration || declaration.kind !== "const" || declaration.declare || declaration.declarations.length !== 1 || !stringFunction(native) || !stringFunction(legacy) || exported?.type !== AST_NODE_TYPES87.ExportNamedDeclaration || exported.specifiers.length !== 0 || exported.source !== null || !arrayFunction(exported.declaration))
+  if (imported !== null && imported?.type !== AST_NODE_TYPES87.ImportDeclaration || declaration?.type !== AST_NODE_TYPES87.VariableDeclaration || declaration.kind !== "const" || declaration.declare || declaration.declarations.length !== 1 || native?.type !== AST_NODE_TYPES87.FunctionDeclaration || !stringFunction(native) || legacy?.type !== AST_NODE_TYPES87.FunctionDeclaration || !stringFunction(legacy) || exported?.type !== AST_NODE_TYPES87.ExportNamedDeclaration || exported.specifiers.length !== 0 || exported.source !== null || exported.declaration?.type !== AST_NODE_TYPES87.FunctionDeclaration || !arrayFunction(exported.declaration))
     return null;
   const provider = declaration.declarations[0];
   if (provider === void 0 || !nativeProvider(sourceCode, provider) || !providerRead(sourceCode, returned(native), provider) || !exportedReads(
@@ -15429,7 +15464,7 @@ function arrayFunction(node) {
   return annotation?.type === AST_NODE_TYPES87.TSArrayType && annotation.elementType.type === AST_NODE_TYPES87.TSStringKeyword;
 }
 function ordinaryFunction(node) {
-  return node?.type === AST_NODE_TYPES87.FunctionDeclaration && node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.params.length === 0 && node.body.body.length === 1 && node.body.body[0]?.type === AST_NODE_TYPES87.ReturnStatement && node.body.body[0].argument !== null;
+  return node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.params.length === 0 && node.body.body.length === 1 && node.body.body[0]?.type === AST_NODE_TYPES87.ReturnStatement && node.body.body[0].argument !== null;
 }
 function returned(node) {
   const statement = node.body.body[0];
@@ -15441,14 +15476,14 @@ function nativeProvider(sourceCode, node) {
   if (node.id.type !== AST_NODE_TYPES87.Identifier || node.id.typeAnnotation !== void 0)
     return false;
   const call = node.init;
-  if (call?.type !== AST_NODE_TYPES87.CallExpression || call.optional || call.typeArguments !== void 0 || call.arguments.length !== 1 || !member2(call.callee, "bind") || !member2(call.callee.object, "randomUUID"))
+  if (call?.type !== AST_NODE_TYPES87.CallExpression || call.optional || call.typeArguments !== void 0 || call.arguments.length !== 1 || call.callee.type !== AST_NODE_TYPES87.MemberExpression || !member2(call.callee, "bind") || call.callee.object.type !== AST_NODE_TYPES87.MemberExpression || !member2(call.callee.object, "randomUUID"))
     return false;
   const receiver = call.callee.object.object;
   const argument = call.arguments[0];
   return receiver.type === AST_NODE_TYPES87.Identifier && receiver.name === "crypto" && argument?.type === AST_NODE_TYPES87.Identifier && argument.name === "crypto" && (ASTUtils49.findVariable(sourceCode.getScope(receiver), "crypto")?.defs.length ?? 0) === 0 && (ASTUtils49.findVariable(sourceCode.getScope(argument), "crypto")?.defs.length ?? 0) === 0;
 }
 function member2(node, property) {
-  return node.type === AST_NODE_TYPES87.MemberExpression && !node.computed && !node.optional && node.property.type === AST_NODE_TYPES87.Identifier && node.property.name === property;
+  return !node.computed && !node.optional && node.property.type === AST_NODE_TYPES87.Identifier && node.property.name === property;
 }
 function providerRead(sourceCode, node, declaration) {
   return node.type === AST_NODE_TYPES87.CallExpression && !node.optional && node.typeArguments === void 0 && node.arguments.length === 0 && node.callee.type === AST_NODE_TYPES87.Identifier && sameBinding2(sourceCode, node.callee, declaration);
@@ -15477,7 +15512,7 @@ function exportedReads(sourceCode, node, native, legacy, imported) {
   return nilImport !== void 0 && sameBinding2(sourceCode, nil, nilImport);
 }
 function isUuidRecipe(sourceCode, node, reported) {
-  if (node.type !== AST_NODE_TYPES87.CallExpression || node.optional || node.typeArguments !== void 0 || !member2(node.callee, "replace") || node.callee.object.type !== AST_NODE_TYPES87.Literal || node.callee.object.value !== UUID_TEMPLATE || node.arguments.length !== IMPORT_COUNT)
+  if (node.type !== AST_NODE_TYPES87.CallExpression || node.optional || node.typeArguments !== void 0 || node.callee.type !== AST_NODE_TYPES87.MemberExpression || !member2(node.callee, "replace") || node.callee.object.type !== AST_NODE_TYPES87.Literal || node.callee.object.value !== UUID_TEMPLATE || node.arguments.length !== IMPORT_COUNT)
     return false;
   const [pattern, callback] = node.arguments;
   if (pattern?.type !== AST_NODE_TYPES87.Literal || !("regex" in pattern) || pattern.regex.pattern !== "[xy]" || pattern.regex.flags !== "g" || callback?.type !== AST_NODE_TYPES87.ArrowFunctionExpression || callback.async || callback.typeParameters !== void 0 || callback.returnType !== void 0 || callback.params.length !== 1 || callback.params[0]?.type !== AST_NODE_TYPES87.Identifier || callback.params[0].typeAnnotation !== void 0 || callback.params[0].optional || callback.body.type !== AST_NODE_TYPES87.BlockStatement || callback.body.body.length !== IMPORT_COUNT)
@@ -16029,8 +16064,8 @@ function serverActionErrorResults(sourceCode) {
   if (nodes.some((node) => node.type === AST_NODE_TYPES91.CallExpression && node.callee.type === AST_NODE_TYPES91.Identifier && node.callee.name === "eval")) return [];
   const analysis = new ActionResults(sourceCode);
   const actionSet = new Set(actions);
-  return nodes.filter((node) => {
-    if (node.type !== AST_NODE_TYPES91.ReturnStatement || node.argument === null) return false;
+  return nodes.filter((node) => node.type === AST_NODE_TYPES91.ReturnStatement).filter((node) => {
+    if (node.argument === null) return false;
     const owner = functionOwner(node);
     return owner !== null && actionSet.has(owner) && escapingActionReturn(node, owner, sourceCode) && analysis.payload(node.argument, owner);
   });
@@ -17012,7 +17047,7 @@ function existingDomainComparisonFix(sourceCode, comparison2) {
   if (comparison2.operator !== "===" || sourceCode.ast.body.length !== 2 || sourceCode.getAllComments().length !== 0)
     return null;
   const [comparator, exported] = sourceCode.ast.body;
-  if (!isOrdinary(comparator) || comparator.id === null || exported?.type !== AST_NODE_TYPES93.ExportNamedDeclaration || exported.exportKind !== "value" || !isOrdinary(exported.declaration))
+  if (comparator?.type !== AST_NODE_TYPES93.FunctionDeclaration || !isOrdinary(comparator) || comparator.id === null || exported?.type !== AST_NODE_TYPES93.ExportNamedDeclaration || exported.exportKind !== "value" || exported.declaration?.type !== AST_NODE_TYPES93.FunctionDeclaration || !isOrdinary(exported.declaration))
     return null;
   const fields2 = comparatorFields(comparator);
   const elements = callerElements(exported.declaration);
@@ -17031,7 +17066,7 @@ function existingDomainComparisonFix(sourceCode, comparison2) {
   );
 }
 function isOrdinary(node) {
-  return node?.type === AST_NODE_TYPES93.FunctionDeclaration && node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.body.body.length === 1;
+  return node.id !== null && !node.declare && !node.async && !node.generator && node.typeParameters === void 0 && node.body.body.length === 1;
 }
 function comparatorFields(node) {
   const [left, right] = node.params;
@@ -18269,7 +18304,7 @@ function reportClass(context, services, owner) {
   if (contract === null) return;
   const groups = /* @__PURE__ */ new Map();
   for (const member3 of owner.body.body) {
-    if (!candidate(member3)) continue;
+    if (member3.type !== AST_NODE_TYPES100.MethodDefinition || !candidate(member3)) continue;
     const name = convertibleMemberName(member3);
     if (name === null || contract.has(name)) continue;
     if (member3.accessibility === "private" || member3.key.type === AST_NODE_TYPES100.PrivateIdentifier) continue;
@@ -18289,7 +18324,7 @@ function reportClass(context, services, owner) {
   }
 }
 function candidate(member3) {
-  return member3.type === AST_NODE_TYPES100.MethodDefinition && member3.kind !== "constructor" && !member3.static && member3.accessibility !== "protected" && !member3.override && !member3.computed && member3.key.type === AST_NODE_TYPES100.Identifier && member3.value.body !== null;
+  return member3.kind !== "constructor" && !member3.static && member3.accessibility !== "protected" && !member3.override && !member3.computed && member3.key.type === AST_NODE_TYPES100.Identifier && member3.value.body !== null;
 }
 function interfaceNames(services, owner) {
   const tsOwner = services.esTreeNodeToTSNodeMap.get(owner);
@@ -18461,7 +18496,7 @@ var SINGLE_STATEMENT_HOSTS = /* @__PURE__ */ new Set([
   AST_NODE_TYPES102.IfStatement,
   AST_NODE_TYPES102.WhileStatement
 ]);
-var FUNCTION_TYPES2 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES = /* @__PURE__ */ new Set([
   AST_NODE_TYPES102.ArrowFunctionExpression,
   AST_NODE_TYPES102.FunctionDeclaration,
   AST_NODE_TYPES102.FunctionExpression
@@ -18491,7 +18526,7 @@ function fallbackFollowsTry(tryStatement) {
   return last?.type === AST_NODE_TYPES102.ReturnStatement && hasFollowingStatement(tryStatement);
 }
 function hasFollowingStatement(node) {
-  for (let current = node; current !== void 0 && !FUNCTION_TYPES2.has(current.type); current = current.parent) {
+  for (let current = node; current !== void 0 && !FUNCTION_TYPES.has(current.type); current = current.parent) {
     const slot = statementSlot(current);
     if (slot !== null && slot.index < slot.list.length - 1) return true;
   }
@@ -18579,7 +18614,7 @@ var no_log_only_catch_default = createRule({
     function hasFollowingCoercionCheck(owner, left, coercion) {
       let current = owner;
       let slot = statementSlot(current);
-      while (slot === null && current.parent !== void 0 && !FUNCTION_TYPES2.has(current.parent.type)) {
+      while (slot === null && current.parent !== void 0 && !FUNCTION_TYPES.has(current.parent.type)) {
         current = current.parent;
         slot = statementSlot(current);
       }
@@ -18664,7 +18699,7 @@ var TEST_NAMES = /* @__PURE__ */ new Set(["it", "test"]);
 var TEST_MODIFIERS3 = /* @__PURE__ */ new Set(["concurrent", "fails", "only", "sequential", "skip"]);
 var TEST_BUILDERS = /* @__PURE__ */ new Set(["each", "for", "runIf", "skipIf"]);
 var ASSERTION_NAMES2 = /* @__PURE__ */ new Set(["assert", "assertType", "expect", "expectTypeOf"]);
-var FUNCTION_TYPES3 = /* @__PURE__ */ new Set([AST_NODE_TYPES103.ArrowFunctionExpression, AST_NODE_TYPES103.FunctionExpression, AST_NODE_TYPES103.FunctionDeclaration]);
+var FUNCTION_TYPES2 = /* @__PURE__ */ new Set([AST_NODE_TYPES103.ArrowFunctionExpression, AST_NODE_TYPES103.FunctionExpression, AST_NODE_TYPES103.FunctionDeclaration]);
 function staticMemberName3(node) {
   if (!node.computed && node.property.type === AST_NODE_TYPES103.Identifier) return node.property.name;
   if (node.computed && node.property.type === AST_NODE_TYPES103.Literal && typeof node.property.value === "string") return node.property.value;
@@ -18677,7 +18712,6 @@ function rootIdentifier2(callee) {
   return null;
 }
 function isDirectTestCallback(node, context) {
-  if (node.type !== AST_NODE_TYPES103.ArrowFunctionExpression && node.type !== AST_NODE_TYPES103.FunctionExpression) return false;
   const call = directArgumentCall(node);
   if (call === null) return false;
   const root = testRoot(call.callee);
@@ -18697,12 +18731,12 @@ function testRoot(callee) {
   return modifier !== null && TEST_MODIFIERS3.has(modifier) ? testRoot(callee.object) : null;
 }
 function nearestFunction(node) {
-  for (let current = node.parent; current !== void 0 && current !== null; current = current.parent) if (FUNCTION_TYPES3.has(current.type)) return current;
+  for (let current = node.parent; current !== void 0 && current !== null; current = current.parent) if (FUNCTION_TYPES2.has(current.type)) return current;
   return null;
 }
 function walkOwnScope(node, predicate) {
   if (predicate(node)) return true;
-  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES3.has(child.type) && walkOwnScope(child, predicate));
+  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES2.has(child.type) && walkOwnScope(child, predicate));
 }
 function isAssertion(node, context) {
   if (node.type !== AST_NODE_TYPES103.CallExpression) return false;
@@ -18794,7 +18828,7 @@ var no_bare_return_from_test_catch_default = createRule({
       ReturnStatement(node) {
         if (node.argument !== null) return;
         const owner = nearestFunction(node);
-        if (owner === null || !isDirectTestCallback(owner, context)) return;
+        if (owner?.type !== AST_NODE_TYPES103.ArrowFunctionExpression && owner?.type !== AST_NODE_TYPES103.FunctionExpression || !isDirectTestCallback(owner, context)) return;
         let catchClause = null;
         for (let current = node.parent; current !== owner; current = current?.parent) {
           if (current?.type === AST_NODE_TYPES103.CatchClause) {
@@ -19424,7 +19458,7 @@ function labeledTupleObjectFix(sourceCode, annotation) {
   if (sourceCode.ast.body.length !== 2 || sourceCode.getAllComments().length > 0)
     return null;
   const [helper, statement] = sourceCode.ast.body;
-  if (!isOrdinary2(helper) || statement?.type !== AST_NODE_TYPES107.ExportNamedDeclaration || !isOrdinary2(statement.declaration) || helper.returnType?.typeAnnotation !== annotation)
+  if (helper?.type !== AST_NODE_TYPES107.FunctionDeclaration || !isOrdinary2(helper) || statement?.type !== AST_NODE_TYPES107.ExportNamedDeclaration || statement.declaration?.type !== AST_NODE_TYPES107.FunctionDeclaration || !isOrdinary2(statement.declaration) || helper.returnType?.typeAnnotation !== annotation)
     return null;
   const caller = statement.declaration;
   const fields2 = tupleFields(helper);
@@ -19449,7 +19483,7 @@ function labeledTupleObjectFix(sourceCode, annotation) {
   ];
 }
 function isOrdinary2(node) {
-  return node?.type === AST_NODE_TYPES107.FunctionDeclaration && node.id !== null && !node.declare && !node.async && !node.generator && node.params.length === 0 && node.typeParameters === void 0;
+  return node.id !== null && !node.declare && !node.async && !node.generator && node.params.length === 0 && node.typeParameters === void 0;
 }
 function tupleFields(helper) {
   const tuple = helper.returnType?.typeAnnotation;
@@ -20780,7 +20814,7 @@ var PREVIEW_LENGTH = 40;
 var SQL_KEYWORD_RE = /\b(SELECT|INSERT|UPDATE|DELETE|FROM|WHERE|JOIN|VALUES|ON CONFLICT|RETURNING|GROUP BY|ORDER BY)\b/;
 var IDENTIFIER_RE = /^[a-z_][a-z0-9_.]*$/;
 var URL_PATH_RE = /^\/(?=[^\s]*[A-Za-z0-9])[A-Za-z0-9._~!$&'()*+,;=:@%/?#{}\u005B\u005D-]+$/;
-var FUNCTION_TYPES4 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES3 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES114.FunctionDeclaration,
   AST_NODE_TYPES114.FunctionExpression,
   AST_NODE_TYPES114.ArrowFunctionExpression
@@ -20854,7 +20888,7 @@ function preview(value) {
 }
 function enclosingFunction4(node) {
   for (let current = node.parent; current != null; current = current.parent) {
-    if (FUNCTION_TYPES4.has(current.type)) {
+    if (FUNCTION_TYPES3.has(current.type)) {
       return current;
     }
   }
@@ -22319,9 +22353,6 @@ function isSentinelArgument(arg) {
 function isFunctionNode(node) {
   return node.type === AST_NODE_TYPES119.FunctionDeclaration || node.type === AST_NODE_TYPES119.FunctionExpression || node.type === AST_NODE_TYPES119.ArrowFunctionExpression;
 }
-function isNode3(value) {
-  return typeof value === "object" && value !== null && typeof value.type === "string";
-}
 function walkWithinScope(node, visit) {
   let found = false;
   const recurse = (current) => {
@@ -22448,7 +22479,7 @@ function enclosingFunctionName(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
     if (isFunctionNode(current)) {
-      if ("id" in current && isNode3(current.id) && current.id.type === AST_NODE_TYPES119.Identifier) {
+      if ("id" in current && current.id !== null && current.id.type === AST_NODE_TYPES119.Identifier) {
         return current.id.name;
       }
       const parent = current.parent;
@@ -22549,7 +22580,7 @@ function functionReturnsSameSentinelKindElsewhere(catchNode, kind) {
 function enclosingFunctionBody(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
-    if (isFunctionNode(current) && "body" in current && isNode3(current.body) && current.body.type === AST_NODE_TYPES119.BlockStatement) {
+    if (isFunctionNode(current) && current.body?.type === AST_NODE_TYPES119.BlockStatement) {
       return current.body;
     }
     current = current.parent;
@@ -22956,7 +22987,7 @@ var TEST_CALLERS2 = /* @__PURE__ */ new Set([
   "beforeEach",
   "afterEach"
 ]);
-var FUNCTION_TYPES5 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES4 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES121.FunctionDeclaration,
   AST_NODE_TYPES121.FunctionExpression,
   AST_NODE_TYPES121.ArrowFunctionExpression
@@ -22991,7 +23022,7 @@ function isHelperSleep(node) {
 }
 function nearestEnclosingFunction(node) {
   for (let current = node.parent; current != null; current = current.parent) {
-    if (!FUNCTION_TYPES5.has(current.type)) {
+    if (!FUNCTION_TYPES4.has(current.type)) {
       continue;
     }
     const grandparent = current.parent;
@@ -25998,7 +26029,7 @@ var ASSERTION_ROOTS = /* @__PURE__ */ new Set([
   "expect",
   "expectTypeOf"
 ]);
-var FUNCTION_TYPES6 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES5 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES135.FunctionDeclaration,
   AST_NODE_TYPES135.FunctionExpression,
   AST_NODE_TYPES135.ArrowFunctionExpression
@@ -26033,7 +26064,7 @@ function isTestCaller(callee, isFrameworkTest) {
 }
 function nearestEnclosingFunction2(node) {
   for (let current = node.parent; current != null; current = current.parent) {
-    if (FUNCTION_TYPES6.has(current.type)) {
+    if (FUNCTION_TYPES5.has(current.type)) {
       return current;
     }
   }
@@ -26066,7 +26097,7 @@ function walkOwnScope2(node, predicate) {
   if (predicate(node)) {
     return true;
   }
-  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES6.has(child.type) && walkOwnScope2(child, predicate));
+  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES5.has(child.type) && walkOwnScope2(child, predicate));
 }
 function isAssertion2(node, isFrameworkAssertion) {
   if (node.type !== AST_NODE_TYPES135.CallExpression) return false;
@@ -26079,7 +26110,7 @@ function opensSubtest(node, callbackParameters) {
   }
   const callee = unwrapExpression(node.callee);
   return callee.type === AST_NODE_TYPES135.MemberExpression && staticMemberName6(callee) === "test" && callee.object.type === AST_NODE_TYPES135.Identifier && callbackParameters.has(callee.object.name) && node.arguments.some(
-    (argument) => argument.type !== AST_NODE_TYPES135.SpreadElement && FUNCTION_TYPES6.has(argument.type)
+    (argument) => argument.type !== AST_NODE_TYPES135.SpreadElement && FUNCTION_TYPES5.has(argument.type)
   );
 }
 var LOOP_CARRIED_CONTROL = /* @__PURE__ */ new Set([
@@ -26445,7 +26476,7 @@ var PREFER_ECMASCRIPT_PRIVATE_MEMBERS_DOCUMENTATION = {
 function reportClass2(context, owner, services) {
   const groups = /* @__PURE__ */ new Map();
   for (const member3 of owner.body.body) {
-    if (!isConvertible(member3)) continue;
+    if (member3.type !== AST_NODE_TYPES138.MethodDefinition && member3.type !== AST_NODE_TYPES138.PropertyDefinition && member3.type !== AST_NODE_TYPES138.AccessorProperty || !isConvertible(member3)) continue;
     const name = convertibleMemberName(member3);
     if (name === null) continue;
     const members = groups.get(name) ?? [];
@@ -26464,7 +26495,6 @@ function reportClass2(context, owner, services) {
   }
 }
 function isConvertible(member3) {
-  if (member3.type !== AST_NODE_TYPES138.MethodDefinition && member3.type !== AST_NODE_TYPES138.PropertyDefinition && member3.type !== AST_NODE_TYPES138.AccessorProperty) return false;
   return member3.accessibility === "private" && !(member3.type === AST_NODE_TYPES138.MethodDefinition && member3.kind === "constructor") && !member3.computed && member3.key.type === AST_NODE_TYPES138.Identifier && member3.decorators.length === 0 && !("declare" in member3 && member3.declare) && !member3.override && !(member3.type === AST_NODE_TYPES138.MethodDefinition && member3.value.body === null);
 }
 var prefer_ecmascript_private_members_default = createRule({
@@ -28159,7 +28189,7 @@ var MUTATING_METHODS2 = /* @__PURE__ */ new Set([
   // Object-ish escape hatches
   "assign"
 ]);
-var FUNCTION_TYPES7 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES6 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES146.FunctionDeclaration,
   AST_NODE_TYPES146.FunctionExpression,
   AST_NODE_TYPES146.ArrowFunctionExpression
@@ -28181,8 +28211,8 @@ function unwrap3(node) {
   return node;
 }
 var HAS_STATEFUL_FLAG_RE = /[gy]/;
-function isRegexLiteral(node) {
-  return node.type === AST_NODE_TYPES146.Literal && "regex" in node && node.regex !== void 0;
+function literalRegex(node) {
+  return node.type === AST_NODE_TYPES146.Literal && "regex" in node ? node.regex : void 0;
 }
 function isLiteralOnly(node, depth) {
   if (depth > MAX_LITERAL_DEPTH) {
@@ -28191,7 +28221,7 @@ function isLiteralOnly(node, depth) {
   const inner = unwrap3(node);
   switch (inner.type) {
     case AST_NODE_TYPES146.Literal: {
-      return !(isRegexLiteral(inner) && HAS_STATEFUL_FLAG_RE.test(inner.regex.flags));
+      return !HAS_STATEFUL_FLAG_RE.test(literalRegex(inner)?.flags ?? "");
     }
     case AST_NODE_TYPES146.TemplateLiteral: {
       return inner.expressions.length === 0;
@@ -28225,11 +28255,12 @@ function isLiteralOnly(node, depth) {
 }
 function classify(init, checkRegex, sourceCode) {
   const node = unwrapObjectFreeze(init, sourceCode);
-  if (isRegexLiteral(node)) {
+  const regex = literalRegex(node);
+  if (regex !== void 0) {
     if (!checkRegex) {
       return null;
     }
-    if (HAS_STATEFUL_FLAG_RE.test(node.regex.flags)) {
+    if (HAS_STATEFUL_FLAG_RE.test(regex.flags)) {
       return null;
     }
     return { kind: "regex", size: 1 };
@@ -28256,7 +28287,7 @@ function unwrapObjectFreeze(node, sourceCode) {
 function enclosingFunction5(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
-    if (FUNCTION_TYPES7.has(current.type)) {
+    if (FUNCTION_TYPES6.has(current.type)) {
       return current;
     }
     current = current.parent;
@@ -28560,7 +28591,7 @@ var I18N_RECEIVER_NAMES = /* @__PURE__ */ new Set([
   "i18n",
   "intl"
 ]);
-var FUNCTION_TYPES8 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES7 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES147.ArrowFunctionExpression,
   AST_NODE_TYPES147.FunctionDeclaration,
   AST_NODE_TYPES147.FunctionExpression
@@ -28586,7 +28617,7 @@ function outermostEnclosingFunction(node) {
   let outermost;
   let current = node.parent ?? void 0;
   while (current !== void 0) {
-    if (FUNCTION_TYPES8.has(current.type)) {
+    if (FUNCTION_TYPES7.has(current.type)) {
       outermost = current;
     }
     current = current.parent ?? void 0;
@@ -28609,7 +28640,7 @@ function subtreeSome(root, predicate, skipDeferredFunctions = false) {
     if (typeof candidate2.type !== "string") {
       return;
     }
-    if (skipDeferredFunctions && FUNCTION_TYPES8.has(candidate2.type)) return;
+    if (skipDeferredFunctions && FUNCTION_TYPES7.has(candidate2.type)) return;
     if (predicate(candidate2)) {
       found = true;
       return;
@@ -28724,7 +28755,7 @@ var prefer_module_level_schema_default = createRule({
     function isCovered(node) {
       let current = node.parent ?? void 0;
       while (current !== void 0) {
-        if (current !== node && isZodCall(current) && current.callee.type === AST_NODE_TYPES147.MemberExpression && ASTUtils94.getPropertyName(current.callee) !== null && factories.has(ASTUtils94.getPropertyName(current.callee) ?? "")) {
+        if (current !== node && current.type === AST_NODE_TYPES147.CallExpression && isZodCall(current) && current.callee.type === AST_NODE_TYPES147.MemberExpression && ASTUtils94.getPropertyName(current.callee) !== null && factories.has(ASTUtils94.getPropertyName(current.callee) ?? "")) {
           return true;
         }
         if (current.type === AST_NODE_TYPES147.CallExpression && (current.callee.type === AST_NODE_TYPES147.Identifier && memoCallees.has(current.callee.name) || current.callee.type === AST_NODE_TYPES147.MemberExpression && ASTUtils94.getPropertyName(current.callee) !== null && memoCallees.has(ASTUtils94.getPropertyName(current.callee) ?? ""))) {
@@ -28983,7 +29014,7 @@ var I18N_RECEIVER_NAMES2 = /* @__PURE__ */ new Set([
   "i18n",
   "intl"
 ]);
-var FUNCTION_TYPES9 = /* @__PURE__ */ new Set([
+var FUNCTION_TYPES8 = /* @__PURE__ */ new Set([
   AST_NODE_TYPES148.ArrowFunctionExpression,
   AST_NODE_TYPES148.FunctionDeclaration,
   AST_NODE_TYPES148.FunctionExpression
@@ -29031,7 +29062,7 @@ function outermostEnclosingFunction2(node) {
   let outermost;
   let current = node.parent ?? void 0;
   while (current !== void 0) {
-    if (FUNCTION_TYPES9.has(current.type)) outermost = current;
+    if (FUNCTION_TYPES8.has(current.type)) outermost = current;
     current = current.parent ?? void 0;
   }
   return outermost;
@@ -29050,7 +29081,7 @@ function subtreeSome2(root, predicate, skipDeferredFunctions = false) {
     }
     const candidate2 = value;
     if (typeof candidate2.type !== "string") return;
-    if (skipDeferredFunctions && FUNCTION_TYPES9.has(candidate2.type)) return;
+    if (skipDeferredFunctions && FUNCTION_TYPES8.has(candidate2.type)) return;
     if (predicate(candidate2)) {
       found = true;
       return;
@@ -29196,7 +29227,7 @@ var prefer_module_level_refined_schema_default = createRule({
       let current = node;
       while (current.parent != null) {
         current = current.parent;
-        if (FUNCTION_TYPES9.has(current.type)) return false;
+        if (FUNCTION_TYPES8.has(current.type)) return false;
         if (current.type === AST_NODE_TYPES148.CallExpression && (factoryName(current, FACTORIES) !== null || factoryName(current, COMPOSITE_FACTORIES) !== null))
           return true;
       }
@@ -31072,7 +31103,7 @@ var prefer_non_nullable_collection_default = createRule({
           const bindingProperty = parameter.properties.find(
             (entry) => entry.type === AST_NODE_TYPES158.Property && !entry.computed && ASTUtils102.getPropertyName(entry) === property.name
           );
-          if (bindingProperty === void 0) continue;
+          if (bindingProperty?.type !== AST_NODE_TYPES158.Property) continue;
           const value = bindingProperty.value;
           const binding3 = value.type === AST_NODE_TYPES158.AssignmentPattern ? value.left : value;
           if (binding3.type !== AST_NODE_TYPES158.Identifier) {
@@ -35885,7 +35916,7 @@ function injectedMembers(owner) {
   const constructor = owner.body.body.find(
     (member3) => member3.type === AST_NODE_TYPES174.MethodDefinition && member3.kind === "constructor"
   );
-  if (constructor === void 0) return injected;
+  if (constructor?.type !== AST_NODE_TYPES174.MethodDefinition) return injected;
   const parameters = /* @__PURE__ */ new Set();
   for (const parameter of constructor.value.params) {
     for (const name of parameterNames(parameter)) parameters.add(name);
@@ -38628,6 +38659,7 @@ var RETIRED_RULES = {
 
 // src/index.ts
 var RULES = {
+  "no-explicit-type-predicate": no_explicit_type_predicate_default,
   "prefer-zod-enum-validator": prefer_zod_enum_validator_default,
   "no-growing-array-spread-in-loop": no_growing_array_spread_in_loop_default,
   "no-logical-or-fallback": no_logical_or_fallback_default,
@@ -38810,6 +38842,7 @@ var RULE_POLICY = {
   "@sarj/no-invalid-typed-mutation": ["error", "both"],
   "@sarj/no-contradictory-type-predicate": ["error", "both"],
   "@sarj/no-partial-type-predicate": ["error", "both"],
+  "@sarj/no-explicit-type-predicate": ["warn", "both"],
   "@sarj/no-boolean-selector-parameter": ["warn", "both"],
   "@sarj/no-invalid-zod-custom-parse": ["error", "both"],
   "@sarj/no-contradictory-overload-return": ["error", "both"],