eslint-plugin-unslop 0.4.1 → 0.4.2

package/dist/index.cjs

@@ -37,7 +37,7 @@ module.exports = __toCommonJS(index_exports);
 // package.json
 var package_default = {
   name: "eslint-plugin-unslop",
-  version: "0.4.1",
+  version: "0.4.2",
   description: "ESLint plugin with rules for reducing AI-generated code smells",
   repository: {
     type: "git",
@@ -945,6 +945,10 @@ function isLocalPublicExport(node) {
 function isEagerInit(node) {
   const t = node.type;
   if (t === "ExpressionStatement" || t === "IfStatement") return true;
+  if (t === "ExportDefaultDeclaration") {
+    const declType = strProp(prop(node, "declaration"), "type");
+    return declType === "CallExpression" || declType === "NewExpression";
+  }
   const inner = t === "ExportNamedDeclaration" ? prop(node, "declaration") : node;
   if (strProp(inner, "type") !== "VariableDeclaration") return false;
   const decls = prop(inner, "declarations");
@@ -1009,14 +1013,37 @@ function checkFieldOrder(ctx, members, classBody, hasComputed) {
 }
 function checkMethodOrder(ctx, members, classBody, hasComputed) {
   const methods = members.filter((m) => m.kind === "method");
+  const cyclic = findCyclicMethods(methods);
   for (const m of methods) {
-    if (!m.name) continue;
+    if (!m.name || cyclic.has(m.name)) continue;
     if (methods.some((o) => o !== m && o.thisDeps.has(m.name) && o.idx > m.idx)) {
       report(ctx, members, classBody, hasComputed, "moveMemberBelow", m);
       return;
     }
   }
 }
+function findCyclicMethods(methods) {
+  const byName = new Map(methods.filter((m) => m.name).map((m) => [m.name, m]));
+  const inCycle = /* @__PURE__ */ new Set();
+  for (const [name] of byName) {
+    if (methodReachesSelf(name, name, byName, /* @__PURE__ */ new Set())) {
+      inCycle.add(name);
+    }
+  }
+  return inCycle;
+}
+function methodReachesSelf(target, current, byName, visited) {
+  const entry = byName.get(current);
+  if (!entry) return false;
+  for (const dep of entry.thisDeps) {
+    if (!byName.has(dep)) continue;
+    if (dep === target) return true;
+    if (visited.has(dep)) continue;
+    visited.add(dep);
+    if (methodReachesSelf(target, dep, byName, visited)) return true;
+  }
+  return false;
+}
 function report(ctx, members, classBody, hasComputed, messageId, target) {
   const input = { ctx, members, classBody, hasComputed, messageId, target };
   doReport(input);
@@ -1227,8 +1254,7 @@ function checkTopLevel(ctx, p) {
   const cyclic = findCyclic(decls);
   const violations = findViolations(decls, eager, cyclic);
   if (violations.length === 0) return;
-  const safe = isFixSafe(ctx, entries);
-  reportAll(ctx, violations, safe, p, entries);
+  reportAll(ctx, violations, p, entries);
 }
 function collectEntries(p) {
   const entries = [];
@@ -1342,8 +1368,8 @@ function firstConsumer(name, decls) {
   }
   return best;
 }
-function reportAll(ctx, violations, safe, p, entries) {
-  doReportAll({ ctx, violations, safe, p, entries });
+function reportAll(ctx, violations, p, entries) {
+  doReportAll({ ctx, violations, p, entries });
 }
 function doReportAll(args) {
   for (let i = 0; i < args.violations.length; i++) {
@@ -1352,28 +1378,17 @@ function doReportAll(args) {
       node: v.node,
       messageId: isConst(v.name) ? "moveConstantBelow" : "moveHelperBelow",
       data: { name: v.name },
-      fix: args.safe && i === 0 ? buildTopFix(args.ctx, args.p, args.entries) : null
+      fix: i === 0 ? buildTopFix(args.ctx, args.p, args.entries) : null
     });
   }
 }
-function isFixSafe(ctx, entries) {
-  const src = ctx.sourceCode;
-  const stmts = entries.filter((e) => !e.isImport);
-  for (let i = 0; i < stmts.length - 1; i++) {
-    const cur = stmts[i].node;
-    const nxt = stmts[i + 1].node;
-    for (const c of src.getCommentsBefore(nxt)) {
-      if (c.range[0] > cur.range[1]) return false;
-    }
-  }
-  return true;
-}
 function isConst(name) {
   return /^[A-Z][A-Z_0-9]+$/.test(name);
 }
 function buildTopFix(ctx, p, entries) {
   return (fixer) => {
     const src = ctx.sourceCode;
+    const nodeTexts = buildNodeTexts(src, entries);
     const imports = entries.filter((e) => e.isImport);
     const externalReexports = entries.filter((e) => e.isExternalReexport);
     const localPublicApi = entries.filter(
@@ -1388,10 +1403,27 @@ function buildTopFix(ctx, p, entries) {
     );
     const sortedPrivate = kahnsSort(privateDecls);
     const all = [...imports, ...externalReexports, ...prioritizedPublicApi, ...sortedPrivate];
-    const text = all.map((e) => src.getText(e.node)).join("\n\n");
+    const text = all.map((e) => nodeTexts.get(e)).join("\n\n");
     return fixer.replaceTextRange([p.range[0], p.range[1]], text);
   };
 }
+function buildNodeTexts(src, entries) {
+  const result = /* @__PURE__ */ new Map();
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    const comments = src.getCommentsBefore(e.node);
+    const prevEnd = i > 0 ? entries[i - 1].node.range[1] : e.node.range[0];
+    const leadingComments = comments.filter((c) => c.range[0] >= prevEnd);
+    if (leadingComments.length > 0) {
+      const commentStart = leadingComments[0].range[0];
+      const fullText = src.getText().slice(commentStart, e.node.range[1]);
+      result.set(e, fullText);
+    } else {
+      result.set(e, src.getText(e.node));
+    }
+  }
+  return result;
+}
 function kahnsSort(decls) {
   const byName = new Map(decls.filter((e) => e.name).map((e) => [e.name, e]));
   const inDeg = buildInDegrees(decls, byName);