@sarj/eslint-plugin 16.23.1 → 16.23.3

package/dist/index.cjs

@@ -424,7 +424,21 @@ function isScriptFile(filename) {
   return SCRIPT_FILE_RE.test(scopedFilename(filename));
 }
 function scopedFilename(input) {
-  return (typeof input === "string" ? input : input.filename).replaceAll("\\", "/");
+  if (typeof input === "string") return input.replaceAll("\\", "/");
+  const filename = input.filename.replaceAll("\\", "/");
+  const cwd = input.cwd.replaceAll("\\", "/");
+  const fileWindows = windowsAbsolute(filename);
+  const cwdWindows = windowsAbsolute(cwd);
+  let scoped = filename;
+  if (fileWindows && cwdWindows) scoped = import_node_path.win32.relative(cwd, filename).replaceAll("\\", "/");
+  else if (!fileWindows && !cwdWindows && import_node_path.posix.isAbsolute(filename) && import_node_path.posix.isAbsolute(cwd)) {
+    scoped = import_node_path.posix.relative(cwd, filename);
+  }
+  if (windowsAbsolute(scoped) || import_node_path.posix.isAbsolute(scoped)) return scoped;
+  return `./${import_node_path.posix.normalize(scoped)}`;
+}
+function windowsAbsolute(filename) {
+  return /^[A-Za-z]:\//u.test(filename) || filename.startsWith("//");
 }
 function matchesAnyPattern(filename, patterns) {
   const normalized = filename.replaceAll("\\", "/");
@@ -869,7 +883,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.23.1",
+  version: "16.23.3",
   packageManager: "npm@12.2.0",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",
@@ -26573,7 +26587,7 @@ var STEPDOWN_DOCUMENTATION = {
   category: "maintainability",
   limitations: [
     "Generated and test files, cycles, dynamic or escaped references, overload targets, and helpers with multiple callers are excluded; immutable local callable aliases are followed only when every use stays in the caller. Function bodies include nested sibling helpers.",
-    "Class helpers must be private; their sole caller may be public, protected, or private.",
+    "Class helpers must be private; their sole caller may be public, protected, or private by default. Set privateBandOnly alongside accessibility ordering to restrict class reports to private callers; module and nested function ordering is unchanged.",
     "Runtime class-field, static-block, computed-member, and decorator barriers are never crossed; non-hoisted module helpers also cannot cross eager execution or unrelated initialization.",
     "This rule is report-only: reordering methods can change reflective property order, and moving module declarations can change initialization behavior or introduce temporal-dead-zone failures. Review module cycles and eager callers manually."
   ],
@@ -26894,7 +26908,7 @@ function walk(node, visitorKeys, visit, nestedFunction = false) {
   const nested = nestedFunction || isFunction(node) || node.type === import_utils142.AST_NODE_TYPES.ClassDeclaration || node.type === import_utils142.AST_NODE_TYPES.ClassExpression;
   forEachAstChild(node, visitorKeys, (child) => walk(child, visitorKeys, visit, nested));
 }
-function classScope(context, node, computedReferences) {
+function classScope(context, node, computedReferences, privateBandOnly) {
   const methods = node.body.body.filter(
     (member) => member.type === import_utils142.AST_NODE_TYPES.MethodDefinition
   );
@@ -26907,7 +26921,7 @@ function classScope(context, node, computedReferences) {
     return name !== null && key !== null && implementationCounts.get(key) === 1 ? [{ key, name, node: method }] : [];
   });
   const definitions2 = scopeDefinitions.filter(
-    ({ key, node: method }) => (method.accessibility === "private" || method.key.type === import_utils142.AST_NODE_TYPES.PrivateIdentifier) && counts.get(key) === 1 && method.decorators.length === 0 && !method.computed && method.kind === "method"
+    ({ key, node: method }) => isPrivateMethod(method) && counts.get(key) === 1 && method.decorators.length === 0 && !method.computed && method.kind === "method"
   );
   if (definitions2.length === 0) return;
   const methodKeys = new Set(scopeDefinitions.map((definition) => definition.key));
@@ -27036,6 +27050,7 @@ function classScope(context, node, computedReferences) {
     runtimeBarrierPrefix.push((runtimeBarrierPrefix.at(-1) ?? 0) + (isClassRuntimeBarrier(member) ? 1 : 0));
   }
   const canMove = (helper, caller) => {
+    if (privateBandOnly && !isPrivateMethod(caller.node)) return false;
     const helperIndex = memberIndexes.get(helper.node);
     const callerIndex = memberIndexes.get(caller.node);
     if (helperIndex === void 0 || callerIndex === void 0) return false;
@@ -27043,6 +27058,9 @@ function classScope(context, node, computedReferences) {
   };
   reportMisordered(context, definitions2, scopeDefinitions, calls, pinned, canMove);
 }
+function isPrivateMethod(node) {
+  return node.type === import_utils142.AST_NODE_TYPES.MethodDefinition && (node.accessibility === "private" || node.key.type === import_utils142.AST_NODE_TYPES.PrivateIdentifier);
+}
 function classReceiverBindings(context, node) {
   const classReceivers = /* @__PURE__ */ new Map();
   if (node.id !== null) {
@@ -27083,13 +27101,22 @@ var stepdown_default = createRule({
   meta: {
     type: "suggestion",
     docs: { description: "Place a private helper below its sole direct same-scope caller." },
-    schema: [],
+    schema: [{
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        privateBandOnly: {
+          type: "boolean",
+          description: "Restrict class reports to private callers when another rule owns accessibility-band ordering."
+        }
+      }
+    }],
     messages: {
       helperAboveOnlyCaller: "Private helper `{{helper}}` is defined above its only caller `{{caller}}`; move it below the caller."
     }
   },
-  defaultOptions: [],
-  create(context) {
+  defaultOptions: [{}],
+  create(context, [options]) {
     if (isTestFile(context) || isGeneratedFile(context, context.sourceCode.text)) return {};
     const classes = [];
     const functionBodies = [];
@@ -27110,7 +27137,7 @@ var stepdown_default = createRule({
         walk(program, context.sourceCode.visitorKeys, (node) => {
           if (node.type === import_utils142.AST_NODE_TYPES.MemberExpression && node.computed) computedReferences.push(node);
         });
-        for (const node of classes) classScope(context, node, computedReferences);
+        for (const node of classes) classScope(context, node, computedReferences, options.privateBandOnly === true);
       }
     };
   }

package/dist/index.d.cts

@@ -295,7 +295,9 @@ declare const RULES: {
     readonly "require-static-next-matcher": DocumentedRule<readonly [], "dynamicMatcher">;
     readonly "require-zod-form-validation": DocumentedRule<readonly [], "missingZodValidation">;
     readonly "store-insert-requires-on-conflict": DocumentedRule<readonly [], "storeInsertRequiresOnConflict">;
-    readonly stepdown: DocumentedRule<[], "helperAboveOnlyCaller">;
+    readonly stepdown: DocumentedRule<[{
+        readonly privateBandOnly?: boolean;
+    }], "helperAboveOnlyCaller">;
     readonly "source-coupled-test": DocumentedRule<readonly [], "rawSourceOracle">;
     readonly "sole-export-matches-filename": DocumentedRule<[], "matchSoleExport">;
     readonly "require-pascal-case-zod-schema-name": DocumentedRule<readonly [], "requirePascalSchema">;
@@ -1134,7 +1136,9 @@ declare const PLUGIN: {
         readonly "require-static-next-matcher": DocumentedRule<readonly [], "dynamicMatcher">;
         readonly "require-zod-form-validation": DocumentedRule<readonly [], "missingZodValidation">;
         readonly "store-insert-requires-on-conflict": DocumentedRule<readonly [], "storeInsertRequiresOnConflict">;
-        readonly stepdown: DocumentedRule<[], "helperAboveOnlyCaller">;
+        readonly stepdown: DocumentedRule<[{
+            readonly privateBandOnly?: boolean;
+        }], "helperAboveOnlyCaller">;
         readonly "source-coupled-test": DocumentedRule<readonly [], "rawSourceOracle">;
         readonly "sole-export-matches-filename": DocumentedRule<[], "matchSoleExport">;
         readonly "require-pascal-case-zod-schema-name": DocumentedRule<readonly [], "requirePascalSchema">;

package/dist/index.d.ts

@@ -295,7 +295,9 @@ declare const RULES: {
     readonly "require-static-next-matcher": DocumentedRule<readonly [], "dynamicMatcher">;
     readonly "require-zod-form-validation": DocumentedRule<readonly [], "missingZodValidation">;
     readonly "store-insert-requires-on-conflict": DocumentedRule<readonly [], "storeInsertRequiresOnConflict">;
-    readonly stepdown: DocumentedRule<[], "helperAboveOnlyCaller">;
+    readonly stepdown: DocumentedRule<[{
+        readonly privateBandOnly?: boolean;
+    }], "helperAboveOnlyCaller">;
     readonly "source-coupled-test": DocumentedRule<readonly [], "rawSourceOracle">;
     readonly "sole-export-matches-filename": DocumentedRule<[], "matchSoleExport">;
     readonly "require-pascal-case-zod-schema-name": DocumentedRule<readonly [], "requirePascalSchema">;
@@ -1134,7 +1136,9 @@ declare const PLUGIN: {
         readonly "require-static-next-matcher": DocumentedRule<readonly [], "dynamicMatcher">;
         readonly "require-zod-form-validation": DocumentedRule<readonly [], "missingZodValidation">;
         readonly "store-insert-requires-on-conflict": DocumentedRule<readonly [], "storeInsertRequiresOnConflict">;
-        readonly stepdown: DocumentedRule<[], "helperAboveOnlyCaller">;
+        readonly stepdown: DocumentedRule<[{
+            readonly privateBandOnly?: boolean;
+        }], "helperAboveOnlyCaller">;
         readonly "source-coupled-test": DocumentedRule<readonly [], "rawSourceOracle">;
         readonly "sole-export-matches-filename": DocumentedRule<[], "matchSoleExport">;
         readonly "require-pascal-case-zod-schema-name": DocumentedRule<readonly [], "requirePascalSchema">;

package/dist/index.js

@@ -288,7 +288,7 @@ function isTypeOnly(node) {
 import { AST_NODE_TYPES as AST_NODE_TYPES4, ASTUtils as ASTUtils2 } from "@typescript-eslint/utils";
 
 // src/rules/_paths.ts
-import { posix } from "path";
+import { posix, win32 } from "path";
 var LINE_TERMINATOR_RE = /[\n\r\u2028\u2029]/u;
 var SCRIPT_FILE_RE = /(?:^|[\\/])scripts[\\/]|\.mjs$/;
 var STORY_FILE_RE = /\.stories\.[cm]?[jt]sx?$/i;
@@ -373,7 +373,21 @@ function isScriptFile(filename) {
   return SCRIPT_FILE_RE.test(scopedFilename(filename));
 }
 function scopedFilename(input) {
-  return (typeof input === "string" ? input : input.filename).replaceAll("\\", "/");
+  if (typeof input === "string") return input.replaceAll("\\", "/");
+  const filename = input.filename.replaceAll("\\", "/");
+  const cwd = input.cwd.replaceAll("\\", "/");
+  const fileWindows = windowsAbsolute(filename);
+  const cwdWindows = windowsAbsolute(cwd);
+  let scoped = filename;
+  if (fileWindows && cwdWindows) scoped = win32.relative(cwd, filename).replaceAll("\\", "/");
+  else if (!fileWindows && !cwdWindows && posix.isAbsolute(filename) && posix.isAbsolute(cwd)) {
+    scoped = posix.relative(cwd, filename);
+  }
+  if (windowsAbsolute(scoped) || posix.isAbsolute(scoped)) return scoped;
+  return `./${posix.normalize(scoped)}`;
+}
+function windowsAbsolute(filename) {
+  return /^[A-Za-z]:\//u.test(filename) || filename.startsWith("//");
 }
 function matchesAnyPattern(filename, patterns) {
   const normalized = filename.replaceAll("\\", "/");
@@ -822,7 +836,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.23.1",
+  version: "16.23.3",
   packageManager: "npm@12.2.0",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",
@@ -26597,7 +26611,7 @@ var STEPDOWN_DOCUMENTATION = {
   category: "maintainability",
   limitations: [
     "Generated and test files, cycles, dynamic or escaped references, overload targets, and helpers with multiple callers are excluded; immutable local callable aliases are followed only when every use stays in the caller. Function bodies include nested sibling helpers.",
-    "Class helpers must be private; their sole caller may be public, protected, or private.",
+    "Class helpers must be private; their sole caller may be public, protected, or private by default. Set privateBandOnly alongside accessibility ordering to restrict class reports to private callers; module and nested function ordering is unchanged.",
     "Runtime class-field, static-block, computed-member, and decorator barriers are never crossed; non-hoisted module helpers also cannot cross eager execution or unrelated initialization.",
     "This rule is report-only: reordering methods can change reflective property order, and moving module declarations can change initialization behavior or introduce temporal-dead-zone failures. Review module cycles and eager callers manually."
   ],
@@ -26918,7 +26932,7 @@ function walk(node, visitorKeys, visit, nestedFunction = false) {
   const nested = nestedFunction || isFunction(node) || node.type === AST_NODE_TYPES121.ClassDeclaration || node.type === AST_NODE_TYPES121.ClassExpression;
   forEachAstChild(node, visitorKeys, (child) => walk(child, visitorKeys, visit, nested));
 }
-function classScope(context, node, computedReferences) {
+function classScope(context, node, computedReferences, privateBandOnly) {
   const methods = node.body.body.filter(
     (member) => member.type === AST_NODE_TYPES121.MethodDefinition
   );
@@ -26931,7 +26945,7 @@ function classScope(context, node, computedReferences) {
     return name !== null && key !== null && implementationCounts.get(key) === 1 ? [{ key, name, node: method }] : [];
   });
   const definitions2 = scopeDefinitions.filter(
-    ({ key, node: method }) => (method.accessibility === "private" || method.key.type === AST_NODE_TYPES121.PrivateIdentifier) && counts.get(key) === 1 && method.decorators.length === 0 && !method.computed && method.kind === "method"
+    ({ key, node: method }) => isPrivateMethod(method) && counts.get(key) === 1 && method.decorators.length === 0 && !method.computed && method.kind === "method"
   );
   if (definitions2.length === 0) return;
   const methodKeys = new Set(scopeDefinitions.map((definition) => definition.key));
@@ -27060,6 +27074,7 @@ function classScope(context, node, computedReferences) {
     runtimeBarrierPrefix.push((runtimeBarrierPrefix.at(-1) ?? 0) + (isClassRuntimeBarrier(member) ? 1 : 0));
   }
   const canMove = (helper, caller) => {
+    if (privateBandOnly && !isPrivateMethod(caller.node)) return false;
     const helperIndex = memberIndexes.get(helper.node);
     const callerIndex = memberIndexes.get(caller.node);
     if (helperIndex === void 0 || callerIndex === void 0) return false;
@@ -27067,6 +27082,9 @@ function classScope(context, node, computedReferences) {
   };
   reportMisordered(context, definitions2, scopeDefinitions, calls, pinned, canMove);
 }
+function isPrivateMethod(node) {
+  return node.type === AST_NODE_TYPES121.MethodDefinition && (node.accessibility === "private" || node.key.type === AST_NODE_TYPES121.PrivateIdentifier);
+}
 function classReceiverBindings(context, node) {
   const classReceivers = /* @__PURE__ */ new Map();
   if (node.id !== null) {
@@ -27107,13 +27125,22 @@ var stepdown_default = createRule({
   meta: {
     type: "suggestion",
     docs: { description: "Place a private helper below its sole direct same-scope caller." },
-    schema: [],
+    schema: [{
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        privateBandOnly: {
+          type: "boolean",
+          description: "Restrict class reports to private callers when another rule owns accessibility-band ordering."
+        }
+      }
+    }],
     messages: {
       helperAboveOnlyCaller: "Private helper `{{helper}}` is defined above its only caller `{{caller}}`; move it below the caller."
     }
   },
-  defaultOptions: [],
-  create(context) {
+  defaultOptions: [{}],
+  create(context, [options]) {
     if (isTestFile(context) || isGeneratedFile(context, context.sourceCode.text)) return {};
     const classes = [];
     const functionBodies = [];
@@ -27134,7 +27161,7 @@ var stepdown_default = createRule({
         walk(program, context.sourceCode.visitorKeys, (node) => {
           if (node.type === AST_NODE_TYPES121.MemberExpression && node.computed) computedReferences.push(node);
         });
-        for (const node of classes) classScope(context, node, computedReferences);
+        for (const node of classes) classScope(context, node, computedReferences, options.privateBandOnly === true);
       }
     };
   }

package/package.json

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