@sarj/eslint-plugin 15.5.0 → 15.6.0

package/dist/index.cjs

@@ -4231,7 +4231,7 @@ var import_utils21 = require("@typescript-eslint/utils");
 var noGenericSingleExportModuleDocumentation = {
   summary: "Disallow generic module stems when one runtime export already names the responsibility.",
   rationale: "A generic filename hides the sole exported responsibility and makes navigation less descriptive.",
-  remediation: "Rename the module after its single runtime export.",
+  remediation: "Choose a responsibility-bearing module name or colocate the export with its domain.",
   category: "maintainability",
   limitations: ["Only configured generic stems with exactly one public runtime export are reported."],
   examples: [
@@ -4240,36 +4240,21 @@ var noGenericSingleExportModuleDocumentation = {
   ]
 };
 var GENERIC_STEMS = /* @__PURE__ */ new Set([
-  "base",
   "common",
-  "constant",
-  "constants",
-  "core",
-  "enum",
-  "enums",
   "helper",
   "helpers",
   "misc",
-  "model",
-  "models",
   "shared",
   "stuff",
-  "type",
-  "types",
   "util",
   "utils"
 ]);
-var CONVENTIONAL_STEMS = /* @__PURE__ */ new Set(["base", "models"]);
 var CJS_OBJECT_EXPORT_METHODS = /* @__PURE__ */ new Set(["assign", "defineProperties", "defineProperty"]);
 function fileParts(filename) {
   const base = filename.replaceAll("\\", "/").split("/").at(-1) ?? "";
   const extension = base.match(/(\.[cm]?[jt]sx?)$/u)?.[1] ?? ".ts";
-  const segments = base.slice(0, -extension.length).split(".");
-  return {
-    extension,
-    stem: segments[0]?.toLowerCase() ?? "",
-    suffixes: segments.slice(1)
-  };
+  const [stem3 = "", ...suffixes] = base.slice(0, -extension.length).split(".");
+  return { stem: stem3, suffixes: suffixes.map((suffix) => suffix.toLowerCase()) };
 }
 function declaredNames(declaration) {
   if (declaration.declare === true) return [];
@@ -4285,50 +4270,6 @@ function declaredNames(declaration) {
     (item) => item.id.type === import_utils21.AST_NODE_TYPES.Identifier ? [item.id.name] : []
   );
 }
-function typeOnlyBindings(program) {
-  const names = /* @__PURE__ */ new Set();
-  const runtimeNames = /* @__PURE__ */ new Set();
-  for (const statement of program.body) {
-    const declaration = statement.type === import_utils21.AST_NODE_TYPES.ExportNamedDeclaration ? statement.declaration : statement;
-    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSInterfaceDeclaration || declaration?.type === import_utils21.AST_NODE_TYPES.TSTypeAliasDeclaration) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSEnumDeclaration && declaration.const) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (statement.type === import_utils21.AST_NODE_TYPES.ImportDeclaration) {
-      for (const specifier of statement.specifiers) {
-        if (statement.importKind === "type" || specifier.type === import_utils21.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === "type") {
-          names.add(specifier.local.name);
-        } else {
-          runtimeNames.add(specifier.local.name);
-        }
-      }
-      continue;
-    }
-    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSDeclareFunction && declaration.id !== null) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (declaration !== null && declaration.declare === true) {
-      if ((declaration.type === import_utils21.AST_NODE_TYPES.ClassDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.FunctionDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.TSEnumDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.TSModuleDeclaration) && declaration.id !== null && declaration.id.type === import_utils21.AST_NODE_TYPES.Identifier) names.add(declaration.id.name);
-      if (declaration.type === import_utils21.AST_NODE_TYPES.VariableDeclaration) {
-        for (const item of declaration.declarations) {
-          if (item.id.type === import_utils21.AST_NODE_TYPES.Identifier) names.add(item.id.name);
-        }
-      }
-      continue;
-    }
-    if (declaration !== null && "type" in declaration) {
-      for (const name of declaredNames(declaration)) {
-        runtimeNames.add(name);
-      }
-    }
-  }
-  return new Set([...names].filter((name) => !runtimeNames.has(name)));
-}
 function runtimeExports(program) {
   const exports2 = [];
   const typeBindings = typeOnlyBindings(program);
@@ -4367,25 +4308,49 @@ function runtimeExports(program) {
   const unique = new Map(exports2.map((entry) => [entry.key, entry]));
   return { exports: [...unique.values()], ambiguous };
 }
-function publicTypeExportCount(program) {
+function typeOnlyBindings(program) {
   const names = /* @__PURE__ */ new Set();
-  const typeBindings = typeOnlyBindings(program);
+  const runtimeNames = /* @__PURE__ */ new Set();
   for (const statement of program.body) {
-    if (statement.type !== import_utils21.AST_NODE_TYPES.ExportNamedDeclaration) continue;
-    const declaration = statement.declaration;
-    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSInterfaceDeclaration || declaration?.type === import_utils21.AST_NODE_TYPES.TSTypeAliasDeclaration) names.add(declaration.id.name);
-    for (const specifier of statement.specifiers) {
-      const local = specifier.local.type === import_utils21.AST_NODE_TYPES.Identifier ? specifier.local.name : specifier.local.value;
-      if (statement.exportKind !== "type" && specifier.exportKind !== "type" && !typeBindings.has(local)) {
-        continue;
+    const declaration = statement.type === import_utils21.AST_NODE_TYPES.ExportNamedDeclaration ? statement.declaration : statement;
+    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSInterfaceDeclaration || declaration?.type === import_utils21.AST_NODE_TYPES.TSTypeAliasDeclaration) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSEnumDeclaration && declaration.const) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (statement.type === import_utils21.AST_NODE_TYPES.ImportDeclaration) {
+      for (const specifier of statement.specifiers) {
+        if (statement.importKind === "type" || specifier.type === import_utils21.AST_NODE_TYPES.ImportSpecifier && specifier.importKind === "type") {
+          names.add(specifier.local.name);
+        } else {
+          runtimeNames.add(specifier.local.name);
+        }
+      }
+      continue;
+    }
+    if (declaration?.type === import_utils21.AST_NODE_TYPES.TSDeclareFunction && declaration.id !== null) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (declaration !== null && declaration.declare === true) {
+      if ((declaration.type === import_utils21.AST_NODE_TYPES.ClassDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.FunctionDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.TSEnumDeclaration || declaration.type === import_utils21.AST_NODE_TYPES.TSModuleDeclaration) && declaration.id !== null && declaration.id.type === import_utils21.AST_NODE_TYPES.Identifier) names.add(declaration.id.name);
+      if (declaration.type === import_utils21.AST_NODE_TYPES.VariableDeclaration) {
+        for (const item of declaration.declarations) {
+          if (item.id.type === import_utils21.AST_NODE_TYPES.Identifier) names.add(item.id.name);
+        }
+      }
+      continue;
+    }
+    if (declaration !== null && "type" in declaration) {
+      for (const name of declaredNames(declaration)) {
+        runtimeNames.add(name);
       }
-      names.add(specifier.exported.type === import_utils21.AST_NODE_TYPES.Identifier ? specifier.exported.name : specifier.exported.value);
     }
   }
-  return names.size;
-}
-function kebabCase(name) {
-  return name.replaceAll(/oauth/giu, "Oauth").replaceAll(/graphql/giu, "Graphql").replaceAll(/grpc/giu, "Grpc").replaceAll(/([a-z\d])([A-Z])/gu, "$1-$2").replaceAll(/([A-Z]+)([A-Z][a-z])/gu, "$1-$2").replaceAll(/[_\s]+/gu, "-").replaceAll(/-+/gu, "-").replaceAll(/^-|-$/gu, "").toLowerCase();
+  return new Set([...names].filter((name) => !runtimeNames.has(name)));
 }
 function isGlobalIdentifier(context, node) {
   const variable = import_utils21.ASTUtils.findVariable(context.sourceCode.getScope(node), node.name);
@@ -4407,14 +4372,14 @@ var no_generic_single_export_module_default = createRule({
     docs: { description: "Disallow generic module stems when one runtime export already names the responsibility." },
     schema: [],
     messages: {
-      genericSingleExport: "Module stem `{{stem}}` is generic and its only runtime export is `{{exported}}`; rename the file to `{{expected}}`."
+      genericSingleExport: "Module stem `{{stem}}` is generic and its only runtime export is `{{exported}}`; choose a responsibility-bearing module name or colocate the export with its domain."
     }
   },
   defaultOptions: [],
   create(context) {
     const file = fileParts(context.filename);
     const { stem: stem3 } = file;
-    if (!GENERIC_STEMS.has(stem3) || CONVENTIONAL_STEMS.has(stem3) || isTestFile(context.filename) || isGeneratedFile(context.filename, context.sourceCode.text)) return {};
+    if (!GENERIC_STEMS.has(stem3) || isTestFile(context.filename) || isGeneratedFile(context.filename, context.sourceCode.text)) return {};
     let hasCommonJsExport = false;
     return {
       CallExpression(node) {
@@ -4427,25 +4392,19 @@ var no_generic_single_export_module_default = createRule({
       },
       "Program:exit"(program) {
         if (hasCommonJsExport) return;
-        if ((stem3 === "type" || stem3 === "types") && publicTypeExportCount(program) >= 2) return;
         const exports2 = runtimeExports(program);
         if (exports2.ambiguous || exports2.exports.length !== 1) return;
         const onlyExport = exports2.exports[0];
         if (onlyExport === void 0) return;
         const { name: exported, node } = onlyExport;
         if (isConventionalFrameworkUtility(context.filename, exported)) return;
-        const expectedStem = kebabCase(exported);
-        const suffixStem = file.suffixes.map(kebabCase).join("-");
-        const currentResponsibility = [stem3, suffixStem].filter(Boolean).join("-");
-        if (expectedStem === currentResponsibility || GENERIC_STEMS.has(expectedStem) || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(expectedStem)) return;
-        const suffixTail = suffixStem === "" ? "" : `-${suffixStem}`;
-        const renameStem = suffixTail !== "" && expectedStem.endsWith(suffixTail) ? expectedStem.slice(0, -suffixTail.length) : expectedStem;
-        if (renameStem === "" || GENERIC_STEMS.has(renameStem)) return;
-        const suffix = file.suffixes.map((part) => `.${kebabCase(part)}`).join("");
+        const exportedRole = exported.replaceAll(/[^a-z0-9]/giu, "").toLowerCase();
+        const pathRole = [stem3, ...file.suffixes].join("").replaceAll(/[^a-z0-9]/giu, "");
+        if (exportedRole === pathRole && file.suffixes.length > 0) return;
         context.report({
           node,
           messageId: "genericSingleExport",
-          data: { stem: stem3, exported, expected: `${renameStem}${suffix}${file.extension}` }
+          data: { stem: stem3, exported }
         });
       }
     };
@@ -13908,8 +13867,13 @@ var import_utils68 = require("@typescript-eslint/utils");
 var stepdownDocumentation = {
   summary: "Place a private helper below its sole direct same-scope caller.",
   rationale: "Caller-first ordering lets a reader follow the main flow before descending into implementation details.",
-  remediation: "Move the private helper immediately below its sole caller.",
+  remediation: "Move the private helper below its sole caller.",
   category: "maintainability",
+  limitations: [
+    "Generated and test files, cycles, dynamic references, overload targets, and helpers with multiple callers are excluded.",
+    "Class methods are reported only when both helper and caller are private so accessibility ordering remains authoritative.",
+    "Runtime class-field, static-block, computed-member, and decorator barriers are never crossed."
+  ],
   examples: [
     { id: "caller-before-helper", title: "Place the caller first", outcome: "no-match", files: [{ path: "src/run.ts", source: "function run() { return load(); }\nfunction load() { return 1; }" }], focusPath: "src/run.ts", expectedCount: 0, public: true },
     { id: "helper-before-caller", title: "Do not lead with a sole-caller helper", outcome: "match", files: [{ path: "src/run.ts", source: "function load() { return 1; }\nfunction run() { return load(); }" }], focusPath: "src/run.ts", expectedCount: 1, public: true }
@@ -13918,7 +13882,7 @@ var stepdownDocumentation = {
 function isFunction(node) {
   return node.type === import_utils68.AST_NODE_TYPES.ArrowFunctionExpression || node.type === import_utils68.AST_NODE_TYPES.FunctionDeclaration || node.type === import_utils68.AST_NODE_TYPES.FunctionExpression;
 }
-function reportMisordered(context, candidates, scopeDefinitions, calls, pinned) {
+function reportMisordered(context, candidates, scopeDefinitions, calls, pinned, canMove = () => true) {
   const byName = new Map(scopeDefinitions.map((definition) => [definition.name, definition]));
   const cycles = cycleComponents(calls);
   const callers = /* @__PURE__ */ new Map();
@@ -13936,7 +13900,7 @@ function reportMisordered(context, candidates, scopeDefinitions, calls, pinned)
     const callerName2 = helperCallers[0];
     if (callerName2 === void 0 || cycles.has(helper.name) && cycles.get(helper.name) === cycles.get(callerName2)) continue;
     const caller = byName.get(callerName2);
-    if (caller === void 0 || helper.node.range[0] >= caller.node.range[0]) continue;
+    if (caller === void 0 || helper.node.range[0] >= caller.node.range[0] || !canMove(helper, caller)) continue;
     context.report({
       node: helper.node,
       messageId: "helperAboveOnlyCaller",
@@ -14016,8 +13980,10 @@ function moduleScope(context, program) {
     })
   );
   const exported = exportedNames(program);
-  const scopeDefinitions = declarations.filter((node) => counts.get(node.name) === 1 && !overloadNames.has(node.name));
-  const definitions = scopeDefinitions.filter((definition) => !exported.has(definition.name));
+  const scopeDefinitions = declarations.filter((node) => counts.get(node.name) === 1);
+  const definitions = scopeDefinitions.filter(
+    (definition) => !exported.has(definition.name) && !overloadNames.has(definition.name)
+  );
   const byFunction = new Map(scopeDefinitions.map((definition) => [definition.functionNode, definition]));
   const calls = /* @__PURE__ */ new Map();
   const pinned = /* @__PURE__ */ new Set();
@@ -14261,11 +14227,36 @@ function classScope(context, node, computedReferenceNames) {
       return [definition.name, accessibility2];
     })
   );
+  const methodByName = new Map(scopeDefinitions.map((definition) => [definition.name, definition.node]));
   for (const [caller, callees] of calls) {
-    if (accessibility.get(caller) === "private") continue;
+    const callerMethod = methodByName.get(caller);
+    if (accessibility.get(caller) === "private" && callerMethod?.type === import_utils68.AST_NODE_TYPES.MethodDefinition && callerMethod.decorators.length === 0) continue;
     for (const callee of callees) pinned.add(callee);
   }
-  reportMisordered(context, definitions, scopeDefinitions, calls, pinned);
+  const memberIndexes = new Map(node.body.body.map((member, index) => [member, index]));
+  const runtimeBarrierPrefix = [0];
+  for (const member of node.body.body) {
+    runtimeBarrierPrefix.push((runtimeBarrierPrefix.at(-1) ?? 0) + (isClassRuntimeBarrier(member) ? 1 : 0));
+  }
+  reportMisordered(context, definitions, scopeDefinitions, calls, pinned, (helper, caller) => {
+    const helperIndex = memberIndexes.get(helper.node);
+    const callerIndex = memberIndexes.get(caller.node);
+    if (helperIndex === void 0 || callerIndex === void 0) return false;
+    return runtimeBarrierPrefix[callerIndex + 1] === runtimeBarrierPrefix[helperIndex + 1];
+  });
+}
+function isClassRuntimeBarrier(member) {
+  switch (member.type) {
+    case import_utils68.AST_NODE_TYPES.StaticBlock:
+      return true;
+    case import_utils68.AST_NODE_TYPES.PropertyDefinition:
+    case import_utils68.AST_NODE_TYPES.AccessorProperty:
+      return member.static || member.computed || member.decorators.length > 0 || member.value !== null;
+    case import_utils68.AST_NODE_TYPES.MethodDefinition:
+      return member.computed || member.decorators.length > 0;
+    default:
+      return false;
+  }
 }
 var stepdown_default = createRule({
   name: "stepdown",
@@ -14590,7 +14581,7 @@ var rules = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "15.5.0"
+  version: "15.6.0"
 };
 var applicationOnlyRules = [
   "no-restricted-library-load",

package/dist/index.d.cts

@@ -415,7 +415,7 @@ type FlatPreset = {
 declare const plugin: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "15.5.0";
+        readonly version: "15.6.0";
     };
     readonly rules: {
         readonly "duplicate-test-body": DocumentedRule<readonly [], "duplicateTestBody">;

package/dist/index.d.ts

@@ -415,7 +415,7 @@ type FlatPreset = {
 declare const plugin: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "15.5.0";
+        readonly version: "15.6.0";
     };
     readonly rules: {
         readonly "duplicate-test-body": DocumentedRule<readonly [], "duplicateTestBody">;

package/dist/index.js

@@ -4193,7 +4193,7 @@ import { AST_NODE_TYPES as AST_NODE_TYPES16, ASTUtils as ASTUtils4 } from "@type
 var noGenericSingleExportModuleDocumentation = {
   summary: "Disallow generic module stems when one runtime export already names the responsibility.",
   rationale: "A generic filename hides the sole exported responsibility and makes navigation less descriptive.",
-  remediation: "Rename the module after its single runtime export.",
+  remediation: "Choose a responsibility-bearing module name or colocate the export with its domain.",
   category: "maintainability",
   limitations: ["Only configured generic stems with exactly one public runtime export are reported."],
   examples: [
@@ -4202,36 +4202,21 @@ var noGenericSingleExportModuleDocumentation = {
   ]
 };
 var GENERIC_STEMS = /* @__PURE__ */ new Set([
-  "base",
   "common",
-  "constant",
-  "constants",
-  "core",
-  "enum",
-  "enums",
   "helper",
   "helpers",
   "misc",
-  "model",
-  "models",
   "shared",
   "stuff",
-  "type",
-  "types",
   "util",
   "utils"
 ]);
-var CONVENTIONAL_STEMS = /* @__PURE__ */ new Set(["base", "models"]);
 var CJS_OBJECT_EXPORT_METHODS = /* @__PURE__ */ new Set(["assign", "defineProperties", "defineProperty"]);
 function fileParts(filename) {
   const base = filename.replaceAll("\\", "/").split("/").at(-1) ?? "";
   const extension = base.match(/(\.[cm]?[jt]sx?)$/u)?.[1] ?? ".ts";
-  const segments = base.slice(0, -extension.length).split(".");
-  return {
-    extension,
-    stem: segments[0]?.toLowerCase() ?? "",
-    suffixes: segments.slice(1)
-  };
+  const [stem3 = "", ...suffixes] = base.slice(0, -extension.length).split(".");
+  return { stem: stem3, suffixes: suffixes.map((suffix) => suffix.toLowerCase()) };
 }
 function declaredNames(declaration) {
   if (declaration.declare === true) return [];
@@ -4247,50 +4232,6 @@ function declaredNames(declaration) {
     (item) => item.id.type === AST_NODE_TYPES16.Identifier ? [item.id.name] : []
   );
 }
-function typeOnlyBindings(program) {
-  const names = /* @__PURE__ */ new Set();
-  const runtimeNames = /* @__PURE__ */ new Set();
-  for (const statement of program.body) {
-    const declaration = statement.type === AST_NODE_TYPES16.ExportNamedDeclaration ? statement.declaration : statement;
-    if (declaration?.type === AST_NODE_TYPES16.TSInterfaceDeclaration || declaration?.type === AST_NODE_TYPES16.TSTypeAliasDeclaration) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (declaration?.type === AST_NODE_TYPES16.TSEnumDeclaration && declaration.const) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (statement.type === AST_NODE_TYPES16.ImportDeclaration) {
-      for (const specifier of statement.specifiers) {
-        if (statement.importKind === "type" || specifier.type === AST_NODE_TYPES16.ImportSpecifier && specifier.importKind === "type") {
-          names.add(specifier.local.name);
-        } else {
-          runtimeNames.add(specifier.local.name);
-        }
-      }
-      continue;
-    }
-    if (declaration?.type === AST_NODE_TYPES16.TSDeclareFunction && declaration.id !== null) {
-      names.add(declaration.id.name);
-      continue;
-    }
-    if (declaration !== null && declaration.declare === true) {
-      if ((declaration.type === AST_NODE_TYPES16.ClassDeclaration || declaration.type === AST_NODE_TYPES16.FunctionDeclaration || declaration.type === AST_NODE_TYPES16.TSEnumDeclaration || declaration.type === AST_NODE_TYPES16.TSModuleDeclaration) && declaration.id !== null && declaration.id.type === AST_NODE_TYPES16.Identifier) names.add(declaration.id.name);
-      if (declaration.type === AST_NODE_TYPES16.VariableDeclaration) {
-        for (const item of declaration.declarations) {
-          if (item.id.type === AST_NODE_TYPES16.Identifier) names.add(item.id.name);
-        }
-      }
-      continue;
-    }
-    if (declaration !== null && "type" in declaration) {
-      for (const name of declaredNames(declaration)) {
-        runtimeNames.add(name);
-      }
-    }
-  }
-  return new Set([...names].filter((name) => !runtimeNames.has(name)));
-}
 function runtimeExports(program) {
   const exports = [];
   const typeBindings = typeOnlyBindings(program);
@@ -4329,25 +4270,49 @@ function runtimeExports(program) {
   const unique = new Map(exports.map((entry) => [entry.key, entry]));
   return { exports: [...unique.values()], ambiguous };
 }
-function publicTypeExportCount(program) {
+function typeOnlyBindings(program) {
   const names = /* @__PURE__ */ new Set();
-  const typeBindings = typeOnlyBindings(program);
+  const runtimeNames = /* @__PURE__ */ new Set();
   for (const statement of program.body) {
-    if (statement.type !== AST_NODE_TYPES16.ExportNamedDeclaration) continue;
-    const declaration = statement.declaration;
-    if (declaration?.type === AST_NODE_TYPES16.TSInterfaceDeclaration || declaration?.type === AST_NODE_TYPES16.TSTypeAliasDeclaration) names.add(declaration.id.name);
-    for (const specifier of statement.specifiers) {
-      const local = specifier.local.type === AST_NODE_TYPES16.Identifier ? specifier.local.name : specifier.local.value;
-      if (statement.exportKind !== "type" && specifier.exportKind !== "type" && !typeBindings.has(local)) {
-        continue;
+    const declaration = statement.type === AST_NODE_TYPES16.ExportNamedDeclaration ? statement.declaration : statement;
+    if (declaration?.type === AST_NODE_TYPES16.TSInterfaceDeclaration || declaration?.type === AST_NODE_TYPES16.TSTypeAliasDeclaration) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (declaration?.type === AST_NODE_TYPES16.TSEnumDeclaration && declaration.const) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (statement.type === AST_NODE_TYPES16.ImportDeclaration) {
+      for (const specifier of statement.specifiers) {
+        if (statement.importKind === "type" || specifier.type === AST_NODE_TYPES16.ImportSpecifier && specifier.importKind === "type") {
+          names.add(specifier.local.name);
+        } else {
+          runtimeNames.add(specifier.local.name);
+        }
+      }
+      continue;
+    }
+    if (declaration?.type === AST_NODE_TYPES16.TSDeclareFunction && declaration.id !== null) {
+      names.add(declaration.id.name);
+      continue;
+    }
+    if (declaration !== null && declaration.declare === true) {
+      if ((declaration.type === AST_NODE_TYPES16.ClassDeclaration || declaration.type === AST_NODE_TYPES16.FunctionDeclaration || declaration.type === AST_NODE_TYPES16.TSEnumDeclaration || declaration.type === AST_NODE_TYPES16.TSModuleDeclaration) && declaration.id !== null && declaration.id.type === AST_NODE_TYPES16.Identifier) names.add(declaration.id.name);
+      if (declaration.type === AST_NODE_TYPES16.VariableDeclaration) {
+        for (const item of declaration.declarations) {
+          if (item.id.type === AST_NODE_TYPES16.Identifier) names.add(item.id.name);
+        }
+      }
+      continue;
+    }
+    if (declaration !== null && "type" in declaration) {
+      for (const name of declaredNames(declaration)) {
+        runtimeNames.add(name);
       }
-      names.add(specifier.exported.type === AST_NODE_TYPES16.Identifier ? specifier.exported.name : specifier.exported.value);
     }
   }
-  return names.size;
-}
-function kebabCase(name) {
-  return name.replaceAll(/oauth/giu, "Oauth").replaceAll(/graphql/giu, "Graphql").replaceAll(/grpc/giu, "Grpc").replaceAll(/([a-z\d])([A-Z])/gu, "$1-$2").replaceAll(/([A-Z]+)([A-Z][a-z])/gu, "$1-$2").replaceAll(/[_\s]+/gu, "-").replaceAll(/-+/gu, "-").replaceAll(/^-|-$/gu, "").toLowerCase();
+  return new Set([...names].filter((name) => !runtimeNames.has(name)));
 }
 function isGlobalIdentifier(context, node) {
   const variable = ASTUtils4.findVariable(context.sourceCode.getScope(node), node.name);
@@ -4369,14 +4334,14 @@ var no_generic_single_export_module_default = createRule({
     docs: { description: "Disallow generic module stems when one runtime export already names the responsibility." },
     schema: [],
     messages: {
-      genericSingleExport: "Module stem `{{stem}}` is generic and its only runtime export is `{{exported}}`; rename the file to `{{expected}}`."
+      genericSingleExport: "Module stem `{{stem}}` is generic and its only runtime export is `{{exported}}`; choose a responsibility-bearing module name or colocate the export with its domain."
     }
   },
   defaultOptions: [],
   create(context) {
     const file = fileParts(context.filename);
     const { stem: stem3 } = file;
-    if (!GENERIC_STEMS.has(stem3) || CONVENTIONAL_STEMS.has(stem3) || isTestFile(context.filename) || isGeneratedFile(context.filename, context.sourceCode.text)) return {};
+    if (!GENERIC_STEMS.has(stem3) || isTestFile(context.filename) || isGeneratedFile(context.filename, context.sourceCode.text)) return {};
     let hasCommonJsExport = false;
     return {
       CallExpression(node) {
@@ -4389,25 +4354,19 @@ var no_generic_single_export_module_default = createRule({
       },
       "Program:exit"(program) {
         if (hasCommonJsExport) return;
-        if ((stem3 === "type" || stem3 === "types") && publicTypeExportCount(program) >= 2) return;
         const exports = runtimeExports(program);
         if (exports.ambiguous || exports.exports.length !== 1) return;
         const onlyExport = exports.exports[0];
         if (onlyExport === void 0) return;
         const { name: exported, node } = onlyExport;
         if (isConventionalFrameworkUtility(context.filename, exported)) return;
-        const expectedStem = kebabCase(exported);
-        const suffixStem = file.suffixes.map(kebabCase).join("-");
-        const currentResponsibility = [stem3, suffixStem].filter(Boolean).join("-");
-        if (expectedStem === currentResponsibility || GENERIC_STEMS.has(expectedStem) || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(expectedStem)) return;
-        const suffixTail = suffixStem === "" ? "" : `-${suffixStem}`;
-        const renameStem = suffixTail !== "" && expectedStem.endsWith(suffixTail) ? expectedStem.slice(0, -suffixTail.length) : expectedStem;
-        if (renameStem === "" || GENERIC_STEMS.has(renameStem)) return;
-        const suffix = file.suffixes.map((part) => `.${kebabCase(part)}`).join("");
+        const exportedRole = exported.replaceAll(/[^a-z0-9]/giu, "").toLowerCase();
+        const pathRole = [stem3, ...file.suffixes].join("").replaceAll(/[^a-z0-9]/giu, "");
+        if (exportedRole === pathRole && file.suffixes.length > 0) return;
         context.report({
           node,
           messageId: "genericSingleExport",
-          data: { stem: stem3, exported, expected: `${renameStem}${suffix}${file.extension}` }
+          data: { stem: stem3, exported }
         });
       }
     };
@@ -13883,8 +13842,13 @@ import { AST_NODE_TYPES as AST_NODE_TYPES54, ASTUtils as ASTUtils15 } from "@typ
 var stepdownDocumentation = {
   summary: "Place a private helper below its sole direct same-scope caller.",
   rationale: "Caller-first ordering lets a reader follow the main flow before descending into implementation details.",
-  remediation: "Move the private helper immediately below its sole caller.",
+  remediation: "Move the private helper below its sole caller.",
   category: "maintainability",
+  limitations: [
+    "Generated and test files, cycles, dynamic references, overload targets, and helpers with multiple callers are excluded.",
+    "Class methods are reported only when both helper and caller are private so accessibility ordering remains authoritative.",
+    "Runtime class-field, static-block, computed-member, and decorator barriers are never crossed."
+  ],
   examples: [
     { id: "caller-before-helper", title: "Place the caller first", outcome: "no-match", files: [{ path: "src/run.ts", source: "function run() { return load(); }\nfunction load() { return 1; }" }], focusPath: "src/run.ts", expectedCount: 0, public: true },
     { id: "helper-before-caller", title: "Do not lead with a sole-caller helper", outcome: "match", files: [{ path: "src/run.ts", source: "function load() { return 1; }\nfunction run() { return load(); }" }], focusPath: "src/run.ts", expectedCount: 1, public: true }
@@ -13893,7 +13857,7 @@ var stepdownDocumentation = {
 function isFunction(node) {
   return node.type === AST_NODE_TYPES54.ArrowFunctionExpression || node.type === AST_NODE_TYPES54.FunctionDeclaration || node.type === AST_NODE_TYPES54.FunctionExpression;
 }
-function reportMisordered(context, candidates, scopeDefinitions, calls, pinned) {
+function reportMisordered(context, candidates, scopeDefinitions, calls, pinned, canMove = () => true) {
   const byName = new Map(scopeDefinitions.map((definition) => [definition.name, definition]));
   const cycles = cycleComponents(calls);
   const callers = /* @__PURE__ */ new Map();
@@ -13911,7 +13875,7 @@ function reportMisordered(context, candidates, scopeDefinitions, calls, pinned)
     const callerName2 = helperCallers[0];
     if (callerName2 === void 0 || cycles.has(helper.name) && cycles.get(helper.name) === cycles.get(callerName2)) continue;
     const caller = byName.get(callerName2);
-    if (caller === void 0 || helper.node.range[0] >= caller.node.range[0]) continue;
+    if (caller === void 0 || helper.node.range[0] >= caller.node.range[0] || !canMove(helper, caller)) continue;
     context.report({
       node: helper.node,
       messageId: "helperAboveOnlyCaller",
@@ -13991,8 +13955,10 @@ function moduleScope(context, program) {
     })
   );
   const exported = exportedNames(program);
-  const scopeDefinitions = declarations.filter((node) => counts.get(node.name) === 1 && !overloadNames.has(node.name));
-  const definitions = scopeDefinitions.filter((definition) => !exported.has(definition.name));
+  const scopeDefinitions = declarations.filter((node) => counts.get(node.name) === 1);
+  const definitions = scopeDefinitions.filter(
+    (definition) => !exported.has(definition.name) && !overloadNames.has(definition.name)
+  );
   const byFunction = new Map(scopeDefinitions.map((definition) => [definition.functionNode, definition]));
   const calls = /* @__PURE__ */ new Map();
   const pinned = /* @__PURE__ */ new Set();
@@ -14236,11 +14202,36 @@ function classScope(context, node, computedReferenceNames) {
       return [definition.name, accessibility2];
     })
   );
+  const methodByName = new Map(scopeDefinitions.map((definition) => [definition.name, definition.node]));
   for (const [caller, callees] of calls) {
-    if (accessibility.get(caller) === "private") continue;
+    const callerMethod = methodByName.get(caller);
+    if (accessibility.get(caller) === "private" && callerMethod?.type === AST_NODE_TYPES54.MethodDefinition && callerMethod.decorators.length === 0) continue;
     for (const callee of callees) pinned.add(callee);
   }
-  reportMisordered(context, definitions, scopeDefinitions, calls, pinned);
+  const memberIndexes = new Map(node.body.body.map((member, index) => [member, index]));
+  const runtimeBarrierPrefix = [0];
+  for (const member of node.body.body) {
+    runtimeBarrierPrefix.push((runtimeBarrierPrefix.at(-1) ?? 0) + (isClassRuntimeBarrier(member) ? 1 : 0));
+  }
+  reportMisordered(context, definitions, scopeDefinitions, calls, pinned, (helper, caller) => {
+    const helperIndex = memberIndexes.get(helper.node);
+    const callerIndex = memberIndexes.get(caller.node);
+    if (helperIndex === void 0 || callerIndex === void 0) return false;
+    return runtimeBarrierPrefix[callerIndex + 1] === runtimeBarrierPrefix[helperIndex + 1];
+  });
+}
+function isClassRuntimeBarrier(member) {
+  switch (member.type) {
+    case AST_NODE_TYPES54.StaticBlock:
+      return true;
+    case AST_NODE_TYPES54.PropertyDefinition:
+    case AST_NODE_TYPES54.AccessorProperty:
+      return member.static || member.computed || member.decorators.length > 0 || member.value !== null;
+    case AST_NODE_TYPES54.MethodDefinition:
+      return member.computed || member.decorators.length > 0;
+    default:
+      return false;
+  }
 }
 var stepdown_default = createRule({
   name: "stepdown",
@@ -14568,7 +14559,7 @@ var rules = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "15.5.0"
+  version: "15.6.0"
 };
 var applicationOnlyRules = [
   "no-restricted-library-load",

package/package.json

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