@sarj/eslint-plugin 15.26.3 → 15.26.4

package/dist/index.cjs

@@ -656,13 +656,17 @@ var import_typescript3 = __toESM(require("typescript"), 1);
 // src/rules/_for-each-ast-child.ts
 function forEachAstChild(node, visitorKeys, visit) {
   for (const key of visitorKeys[node.type] ?? []) {
-    const value = node[key];
-    if (Array.isArray(value)) {
-      const children = value;
-      for (const child of children) if (isNode(child) && visit(child) === true) return true;
-    } else if (isNode(value)) {
-      if (visit(value) === true) return true;
-    }
+    if (forEachAstChildKey(node, key, visit)) return true;
+  }
+  return false;
+}
+function forEachAstChildKey(node, key, visit) {
+  const value = node[key];
+  if (Array.isArray(value)) {
+    const children = value;
+    for (const child of children) if (isNode(child) && visit(child) === true) return true;
+  } else if (isNode(value)) {
+    if (visit(value) === true) return true;
   }
   return false;
 }
@@ -3987,6 +3991,17 @@ var import_utils27 = require("@typescript-eslint/utils");
 
 // src/rules/_sql.ts
 var import_utils26 = require("@typescript-eslint/utils");
+
+// src/rules/_for-each-own-ast-child.ts
+function forEachOwnAstChild(node, visit, includeKey = () => true) {
+  for (const key of Object.keys(node)) {
+    if (key === "parent" || !includeKey(key)) continue;
+    if (forEachAstChildKey(node, key, visit)) return true;
+  }
+  return false;
+}
+
+// src/rules/_sql.ts
 function stripSqlNoise(text) {
   return scanSqlNoise(text);
 }
@@ -4118,17 +4133,7 @@ function isJoinedFragmentArray(node) {
 }
 function markConsumed(node, consumed) {
   consumed.add(node);
-  for (const key of Object.keys(node)) {
-    if (key === "parent") {
-      continue;
-    }
-    const value = node[key];
-    for (const child of Array.isArray(value) ? value : [value]) {
-      if (child !== null && typeof child === "object" && "type" in child) {
-        markConsumed(child, consumed);
-      }
-    }
-  }
+  forEachOwnAstChild(node, (child) => markConsumed(child, consumed));
 }
 function createSqlListener(handler) {
   const consumed = /* @__PURE__ */ new WeakSet();
@@ -4753,9 +4758,6 @@ var PURE_CONSTRUCTORS = /* @__PURE__ */ new Set([
   "Response",
   "AbortController"
 ]);
-function isNode3(value) {
-  return typeof value === "object" && value !== null && typeof value.type === "string";
-}
 function isPureCall(node) {
   const callee = node.callee;
   if (callee.type !== import_utils30.AST_NODE_TYPES.MemberExpression) {
@@ -4793,27 +4795,7 @@ function subtreeMatches(stmt, predicate, descendIntoFunctions = false) {
       found = true;
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      if (!descendIntoFunctions && NESTED_FUNCTION_TYPES.has(current.type) && key === "body") {
-        continue;
-      }
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode3(child)) {
-            visit(child);
-          }
-        }
-      } else if (isNode3(value)) {
-        visit(value);
-      }
-      if (found) {
-        return;
-      }
-    }
+    forEachOwnAstChild(current, visit, (key) => descendIntoFunctions || !NESTED_FUNCTION_TYPES.has(current.type) || key !== "body");
   };
   visit(stmt);
   return found;
@@ -7169,17 +7151,7 @@ function nearestFunction(node) {
 }
 function walkOwnScope(node, predicate) {
   if (predicate(node)) return true;
-  for (const key of Object.keys(node)) {
-    if (key === "parent") continue;
-    const value = node[key];
-    for (const child of Array.isArray(value) ? value : [value]) {
-      if (typeof child === "object" && child !== null && typeof child.type === "string") {
-        const childNode = child;
-        if (!FUNCTION_TYPES3.has(childNode.type) && walkOwnScope(childNode, predicate)) return true;
-      }
-    }
-  }
-  return false;
+  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES3.has(child.type) && walkOwnScope(child, predicate));
 }
 function isAssertion(node, context) {
   if (node.type !== import_utils44.AST_NODE_TYPES.CallExpression) return false;
@@ -9966,7 +9938,7 @@ function isSentinelArgument(arg) {
 function isFunctionNode(node) {
   return node.type === import_utils61.AST_NODE_TYPES.FunctionDeclaration || node.type === import_utils61.AST_NODE_TYPES.FunctionExpression || node.type === import_utils61.AST_NODE_TYPES.ArrowFunctionExpression;
 }
-function isNode4(value) {
+function isNode3(value) {
   return typeof value === "object" && value !== null && typeof value.type === "string";
 }
 function walkWithinScope(node, visit) {
@@ -9982,21 +9954,10 @@ function walkWithinScope(node, visit) {
     if (isFunctionNode(current)) {
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode4(child)) {
-            recurse(child);
-          }
-        }
-      } else if (isNode4(value)) {
-        recurse(value);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return found;
+    });
   };
   recurse(node);
   return found;
@@ -10043,22 +10004,10 @@ function subtreeReadsName(node, name) {
     if (shadowsName(current)) {
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      if (isNonReadingProperty(current, key)) continue;
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode4(child)) {
-            recurse(child);
-          }
-        }
-      } else if (isNode4(value)) {
-        recurse(value);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return found;
+    }, (key) => !isNonReadingProperty(current, key));
   };
   recurse(node);
   return found;
@@ -10116,7 +10065,7 @@ function enclosingFunctionName(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
     if (isFunctionNode(current)) {
-      if ("id" in current && isNode4(current.id) && current.id.type === import_utils61.AST_NODE_TYPES.Identifier) {
+      if ("id" in current && isNode3(current.id) && current.id.type === import_utils61.AST_NODE_TYPES.Identifier) {
         return current.id.name;
       }
       const parent = current.parent;
@@ -10177,14 +10126,10 @@ function tryReturnsSafeParse(catchNode) {
     visitChildren(current);
   };
   function visitChildren(current) {
-    for (const key of Object.keys(current)) {
-      if (key === "parent") continue;
-      const value = current[key];
-      const children = Array.isArray(value) ? value : [value];
-      for (const child of children) {
-        if (isNode4(child)) recurse(child);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return sawUnsafeOperation;
+    });
   }
   recurse(tryBlock);
   return sawSafeParse && !sawUnsafeOperation;
@@ -10221,7 +10166,7 @@ function functionReturnsSameSentinelKindElsewhere(catchNode, kind) {
 function enclosingFunctionBody(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
-    if (isFunctionNode(current) && "body" in current && isNode4(current.body) && current.body.type === import_utils61.AST_NODE_TYPES.BlockStatement) {
+    if (isFunctionNode(current) && "body" in current && isNode3(current.body) && current.body.type === import_utils61.AST_NODE_TYPES.BlockStatement) {
       return current.body;
     }
     current = current.parent;
@@ -23278,7 +23223,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "15.26.3"
+  version: "15.26.4"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/dist/index.d.cts

@@ -996,7 +996,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "15.26.3";
+        readonly version: "15.26.4";
     };
     readonly rules: {
         readonly "no-conditional-empty-object-spread": DocumentedRule<[], "avoid">;

package/dist/index.d.ts

@@ -996,7 +996,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "15.26.3";
+        readonly version: "15.26.4";
     };
     readonly rules: {
         readonly "no-conditional-empty-object-spread": DocumentedRule<[], "avoid">;

package/dist/index.js

@@ -612,13 +612,17 @@ import ts3 from "typescript";
 // src/rules/_for-each-ast-child.ts
 function forEachAstChild(node, visitorKeys, visit) {
   for (const key of visitorKeys[node.type] ?? []) {
-    const value = node[key];
-    if (Array.isArray(value)) {
-      const children = value;
-      for (const child of children) if (isNode(child) && visit(child) === true) return true;
-    } else if (isNode(value)) {
-      if (visit(value) === true) return true;
-    }
+    if (forEachAstChildKey(node, key, visit)) return true;
+  }
+  return false;
+}
+function forEachAstChildKey(node, key, visit) {
+  const value = node[key];
+  if (Array.isArray(value)) {
+    const children = value;
+    for (const child of children) if (isNode(child) && visit(child) === true) return true;
+  } else if (isNode(value)) {
+    if (visit(value) === true) return true;
   }
   return false;
 }
@@ -3951,6 +3955,17 @@ import { AST_NODE_TYPES as AST_NODE_TYPES25 } from "@typescript-eslint/utils";
 
 // src/rules/_sql.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES24 } from "@typescript-eslint/utils";
+
+// src/rules/_for-each-own-ast-child.ts
+function forEachOwnAstChild(node, visit, includeKey = () => true) {
+  for (const key of Object.keys(node)) {
+    if (key === "parent" || !includeKey(key)) continue;
+    if (forEachAstChildKey(node, key, visit)) return true;
+  }
+  return false;
+}
+
+// src/rules/_sql.ts
 function stripSqlNoise(text) {
   return scanSqlNoise(text);
 }
@@ -4082,17 +4097,7 @@ function isJoinedFragmentArray(node) {
 }
 function markConsumed(node, consumed) {
   consumed.add(node);
-  for (const key of Object.keys(node)) {
-    if (key === "parent") {
-      continue;
-    }
-    const value = node[key];
-    for (const child of Array.isArray(value) ? value : [value]) {
-      if (child !== null && typeof child === "object" && "type" in child) {
-        markConsumed(child, consumed);
-      }
-    }
-  }
+  forEachOwnAstChild(node, (child) => markConsumed(child, consumed));
 }
 function createSqlListener(handler) {
   const consumed = /* @__PURE__ */ new WeakSet();
@@ -4717,9 +4722,6 @@ var PURE_CONSTRUCTORS = /* @__PURE__ */ new Set([
   "Response",
   "AbortController"
 ]);
-function isNode3(value) {
-  return typeof value === "object" && value !== null && typeof value.type === "string";
-}
 function isPureCall(node) {
   const callee = node.callee;
   if (callee.type !== AST_NODE_TYPES27.MemberExpression) {
@@ -4757,27 +4759,7 @@ function subtreeMatches(stmt, predicate, descendIntoFunctions = false) {
       found = true;
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      if (!descendIntoFunctions && NESTED_FUNCTION_TYPES.has(current.type) && key === "body") {
-        continue;
-      }
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode3(child)) {
-            visit(child);
-          }
-        }
-      } else if (isNode3(value)) {
-        visit(value);
-      }
-      if (found) {
-        return;
-      }
-    }
+    forEachOwnAstChild(current, visit, (key) => descendIntoFunctions || !NESTED_FUNCTION_TYPES.has(current.type) || key !== "body");
   };
   visit(stmt);
   return found;
@@ -7151,17 +7133,7 @@ function nearestFunction(node) {
 }
 function walkOwnScope(node, predicate) {
   if (predicate(node)) return true;
-  for (const key of Object.keys(node)) {
-    if (key === "parent") continue;
-    const value = node[key];
-    for (const child of Array.isArray(value) ? value : [value]) {
-      if (typeof child === "object" && child !== null && typeof child.type === "string") {
-        const childNode = child;
-        if (!FUNCTION_TYPES3.has(childNode.type) && walkOwnScope(childNode, predicate)) return true;
-      }
-    }
-  }
-  return false;
+  return forEachOwnAstChild(node, (child) => !FUNCTION_TYPES3.has(child.type) && walkOwnScope(child, predicate));
 }
 function isAssertion(node, context) {
   if (node.type !== AST_NODE_TYPES37.CallExpression) return false;
@@ -9948,7 +9920,7 @@ function isSentinelArgument(arg) {
 function isFunctionNode(node) {
   return node.type === AST_NODE_TYPES48.FunctionDeclaration || node.type === AST_NODE_TYPES48.FunctionExpression || node.type === AST_NODE_TYPES48.ArrowFunctionExpression;
 }
-function isNode4(value) {
+function isNode3(value) {
   return typeof value === "object" && value !== null && typeof value.type === "string";
 }
 function walkWithinScope(node, visit) {
@@ -9964,21 +9936,10 @@ function walkWithinScope(node, visit) {
     if (isFunctionNode(current)) {
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode4(child)) {
-            recurse(child);
-          }
-        }
-      } else if (isNode4(value)) {
-        recurse(value);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return found;
+    });
   };
   recurse(node);
   return found;
@@ -10025,22 +9986,10 @@ function subtreeReadsName(node, name) {
     if (shadowsName(current)) {
       return;
     }
-    for (const key of Object.keys(current)) {
-      if (key === "parent") {
-        continue;
-      }
-      if (isNonReadingProperty(current, key)) continue;
-      const value = current[key];
-      if (Array.isArray(value)) {
-        for (const child of value) {
-          if (isNode4(child)) {
-            recurse(child);
-          }
-        }
-      } else if (isNode4(value)) {
-        recurse(value);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return found;
+    }, (key) => !isNonReadingProperty(current, key));
   };
   recurse(node);
   return found;
@@ -10098,7 +10047,7 @@ function enclosingFunctionName(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
     if (isFunctionNode(current)) {
-      if ("id" in current && isNode4(current.id) && current.id.type === AST_NODE_TYPES48.Identifier) {
+      if ("id" in current && isNode3(current.id) && current.id.type === AST_NODE_TYPES48.Identifier) {
         return current.id.name;
       }
       const parent = current.parent;
@@ -10159,14 +10108,10 @@ function tryReturnsSafeParse(catchNode) {
     visitChildren(current);
   };
   function visitChildren(current) {
-    for (const key of Object.keys(current)) {
-      if (key === "parent") continue;
-      const value = current[key];
-      const children = Array.isArray(value) ? value : [value];
-      for (const child of children) {
-        if (isNode4(child)) recurse(child);
-      }
-    }
+    forEachOwnAstChild(current, (child) => {
+      recurse(child);
+      return sawUnsafeOperation;
+    });
   }
   recurse(tryBlock);
   return sawSafeParse && !sawUnsafeOperation;
@@ -10203,7 +10148,7 @@ function functionReturnsSameSentinelKindElsewhere(catchNode, kind) {
 function enclosingFunctionBody(node) {
   let current = node.parent;
   while (current !== void 0 && current !== null) {
-    if (isFunctionNode(current) && "body" in current && isNode4(current.body) && current.body.type === AST_NODE_TYPES48.BlockStatement) {
+    if (isFunctionNode(current) && "body" in current && isNode3(current.body) && current.body.type === AST_NODE_TYPES48.BlockStatement) {
       return current.body;
     }
     current = current.parent;
@@ -23299,7 +23244,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "15.26.3"
+  version: "15.26.4"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarj/eslint-plugin",
-  "version": "15.26.3",
+  "version": "15.26.4",
   "packageManager": "npm@12.0.2",
   "description": "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   "type": "module",