@xylabs/ts-scripts-yarn3 7.4.27 → 7.4.28

package/dist/xy/lint/index.mjs

@@ -1,5 +1,5 @@
 // src/xy/lint/cycleCommand.ts
-import chalk15 from "chalk";
+import chalk16 from "chalk";
 
 // src/lib/checkResult.ts
 import chalk from "chalk";
@@ -1021,10 +1021,237 @@ var knip = () => {
   return runSteps("Knip", [["yarn", ["knip", "--dependencies", "--no-exit-code"]]]);
 };
 
-// src/actions/package-lint.ts
+// src/actions/lintlint.ts
 import { readFileSync, writeFileSync } from "fs";
 import PATH from "path";
 import chalk13 from "chalk";
+import { findUp } from "find-up";
+function parseRuleValue(value) {
+  if (typeof value === "string") {
+    return { level: value };
+  }
+  if (typeof value === "number") {
+    return { level: String(value) };
+  }
+  if (Array.isArray(value) && value.length > 0) {
+    return {
+      level: String(value[0]),
+      options: value.length > 1 ? value.slice(1) : void 0
+    };
+  }
+  return void 0;
+}
+function normalizeLevel(level) {
+  if (level === "0" || level === "off") return "off";
+  if (level === "1" || level === "warn") return "warn";
+  if (level === "2" || level === "error") return "error";
+  return level;
+}
+function rulesMatch(a, b) {
+  if (normalizeLevel(a.level) !== normalizeLevel(b.level)) return false;
+  return JSON.stringify(a.options) === JSON.stringify(b.options);
+}
+function formatRule(entry) {
+  if (entry.options) {
+    return JSON.stringify([entry.level, ...entry.options]);
+  }
+  return JSON.stringify([entry.level]);
+}
+function mergeRulesFromBlocks(blocks) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const block of blocks) {
+    if (!block.rules) continue;
+    for (const [name, value] of Object.entries(block.rules)) {
+      const parsed = parseRuleValue(value);
+      if (parsed) merged.set(name, parsed);
+    }
+  }
+  return merged;
+}
+function detectSharedPackage(source) {
+  if (source.includes("@xylabs/eslint-config-react-flat")) return "@xylabs/eslint-config-react-flat";
+  if (source.includes("@xylabs/eslint-config-flat")) return "@xylabs/eslint-config-flat";
+  return void 0;
+}
+function extractLocalRuleBlocks(source) {
+  const blocks = [];
+  const ruleBlockRegex = /\{\s*(?:files\s*:\s*\[.*?\]\s*,\s*)?rules\s*:\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/g;
+  let match;
+  while ((match = ruleBlockRegex.exec(source)) !== null) {
+    blocks.push(match[1]);
+  }
+  return blocks;
+}
+function extractRulesFromSourceBlocks(blocks) {
+  const rules2 = /* @__PURE__ */ new Map();
+  for (const block of blocks) {
+    const ruleRegex = /['"]([^'"]+)['"]\s*:\s*(\[[\s\S]*?\](?=\s*,|\s*$))/gm;
+    let match;
+    while ((match = ruleRegex.exec(block)) !== null) {
+      rules2.set(match[1], match[2]);
+    }
+  }
+  return rules2;
+}
+async function resolveSharedConfig(configDir, sharedPkg) {
+  try {
+    const sharedModule = await import(sharedPkg);
+    const config2 = sharedModule.config ?? sharedModule.default;
+    if (Array.isArray(config2)) return config2;
+    return [];
+  } catch {
+    const distPath = PATH.resolve(configDir, "node_modules", sharedPkg, "dist", "node", "index.mjs");
+    try {
+      const sharedModule = await import(distPath);
+      const config2 = sharedModule.config ?? sharedModule.default;
+      if (Array.isArray(config2)) return config2;
+    } catch {
+      const neutralPath = PATH.resolve(configDir, "node_modules", sharedPkg, "dist", "neutral", "index.mjs");
+      const sharedModule = await import(neutralPath);
+      const config2 = sharedModule.config ?? sharedModule.default;
+      if (Array.isArray(config2)) return config2;
+    }
+    return [];
+  }
+}
+async function loadSharedRules(configDir, sharedPkg, verbose) {
+  const sharedBlocks = await resolveSharedConfig(configDir, sharedPkg);
+  const sharedRules = mergeRulesFromBlocks(sharedBlocks);
+  if (verbose) {
+    console.log(chalk13.gray(`Shared config defines ${sharedRules.size} rules`));
+  }
+  if (sharedRules.size === 0) {
+    console.error(chalk13.red("Could not load rules from shared config. Is it installed and built?"));
+    return void 0;
+  }
+  return sharedRules;
+}
+async function loadLocalRules(eslintConfigPath, source, verbose) {
+  const localModule = await import(eslintConfigPath);
+  const localConfig = localModule.default ?? localModule;
+  const localBlocks = Array.isArray(localConfig) ? localConfig : [localConfig];
+  const resolved = mergeRulesFromBlocks(localBlocks);
+  const localRuleBlocks = extractLocalRuleBlocks(source);
+  const explicit = extractRulesFromSourceBlocks(localRuleBlocks);
+  if (verbose) {
+    console.log(chalk13.gray(`Local config has ${explicit.size} explicit rule setting(s)`));
+  }
+  return { explicit, resolved };
+}
+function compareRules(explicitRuleNames, allResolvedRules, sharedRules) {
+  const redundant = [];
+  const overrides = [];
+  const additions = [];
+  for (const ruleName of explicitRuleNames.keys()) {
+    const resolvedEntry = allResolvedRules.get(ruleName);
+    const sharedEntry = sharedRules.get(ruleName);
+    if (!resolvedEntry) continue;
+    if (!sharedEntry) {
+      additions.push({ local: resolvedEntry, rule: ruleName });
+    } else if (rulesMatch(resolvedEntry, sharedEntry)) {
+      redundant.push({
+        local: resolvedEntry,
+        rule: ruleName,
+        shared: sharedEntry
+      });
+    } else {
+      overrides.push({
+        local: resolvedEntry,
+        rule: ruleName,
+        shared: sharedEntry
+      });
+    }
+  }
+  return {
+    additions,
+    overrides,
+    redundant
+  };
+}
+function reportResults({
+  additions,
+  overrides,
+  redundant
+}, verbose) {
+  if (redundant.length > 0) {
+    console.log(chalk13.yellow(`
+${redundant.length} redundant rule(s) (same as shared config \u2014 can be removed):`));
+    for (const { rule, local } of redundant) {
+      console.log(chalk13.yellow(`  ${rule}: ${formatRule(local)}`));
+    }
+  }
+  if (overrides.length > 0) {
+    console.log(chalk13.cyan(`
+${overrides.length} rule override(s) (different from shared config):`));
+    for (const {
+      rule,
+      local,
+      shared
+    } of overrides) {
+      console.log(chalk13.cyan(`  ${rule}:`));
+      console.log(chalk13.gray(`    shared: ${formatRule(shared)}`));
+      console.log(chalk13.white(`    local:  ${formatRule(local)}`));
+    }
+  }
+  if (additions.length > 0 && verbose) {
+    console.log(chalk13.gray(`
+${additions.length} local addition(s) (not in shared config):`));
+    for (const { rule, local } of additions) {
+      console.log(chalk13.gray(`  ${rule}: ${formatRule(local)}`));
+    }
+  }
+  if (redundant.length === 0 && overrides.length === 0) {
+    console.log(chalk13.green("No redundant or overridden rules found"));
+  }
+}
+function fixRedundantRules(eslintConfigPath, source, redundant) {
+  let updated = source;
+  for (const { rule } of redundant) {
+    const escaped = rule.replaceAll("/", String.raw`\/`);
+    const pattern = new RegExp(String.raw`[ \t]*['"]${escaped}['"]\s*:\s*\[[^\]]*\],?[ \t]*\n?`, "g");
+    updated = updated.replace(pattern, "");
+  }
+  updated = updated.replaceAll(/\n{3,}/g, "\n\n");
+  if (updated !== source) {
+    writeFileSync(eslintConfigPath, updated, "utf8");
+    console.log(chalk13.green(`
+Fixed: removed ${redundant.length} redundant rule(s)`));
+  }
+}
+async function lintlint({ fix: fix2, verbose } = {}) {
+  const eslintConfigPath = await findUp("eslint.config.mjs");
+  if (!eslintConfigPath) {
+    console.error(chalk13.red("No eslint.config.mjs found"));
+    return 1;
+  }
+  const configDir = PATH.dirname(eslintConfigPath);
+  if (verbose) {
+    console.log(chalk13.gray(`Found config: ${eslintConfigPath}`));
+  }
+  const source = readFileSync(eslintConfigPath, "utf8");
+  const sharedPkg = detectSharedPackage(source);
+  if (!sharedPkg) {
+    console.log(chalk13.yellow("No @xylabs/eslint-config-flat or @xylabs/eslint-config-react-flat imports found"));
+    return 0;
+  }
+  if (verbose) {
+    console.log(chalk13.gray(`Shared package: ${sharedPkg}`));
+  }
+  const sharedRules = await loadSharedRules(configDir, sharedPkg, !!verbose);
+  if (!sharedRules) return 1;
+  const { explicit, resolved } = await loadLocalRules(eslintConfigPath, source, !!verbose);
+  const results = compareRules(explicit, resolved, sharedRules);
+  reportResults(results, !!verbose);
+  if (results.redundant.length > 0 && fix2) {
+    fixRedundantRules(eslintConfigPath, source, results.redundant);
+  }
+  return results.redundant.length > 0 && !fix2 ? 1 : 0;
+}
+
+// src/actions/package-lint.ts
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import PATH2 from "path";
+import chalk14 from "chalk";
 import picomatch from "picomatch";
 function emptyResult() {
   return {
@@ -1034,12 +1261,12 @@ function emptyResult() {
   };
 }
 function readRootPackageJson(cwd) {
-  const raw = readFileSync(PATH.resolve(cwd, "package.json"), "utf8");
+  const raw = readFileSync2(PATH2.resolve(cwd, "package.json"), "utf8");
   return JSON.parse(raw);
 }
 function writeRootPackageJson(cwd, pkg) {
-  const path6 = PATH.resolve(cwd, "package.json");
-  writeFileSync(path6, `${JSON.stringify(pkg, null, 2)}
+  const path6 = PATH2.resolve(cwd, "package.json");
+  writeFileSync2(path6, `${JSON.stringify(pkg, null, 2)}
 `, "utf8");
 }
 function isMonorepo(pkg) {
@@ -1066,7 +1293,7 @@ function checkRootPrivate(pkg) {
 function fixRootPrivate(cwd, pkg) {
   pkg.private = true;
   writeRootPackageJson(cwd, pkg);
-  console.log(chalk13.green('  \u2714 Fixed: set "private": true in root package.json'));
+  console.log(chalk14.green('  \u2714 Fixed: set "private": true in root package.json'));
 }
 function checkNoPublishConfigOnPrivate(pkg) {
   const result = emptyResult();
@@ -1078,7 +1305,7 @@ function checkNoPublishConfigOnPrivate(pkg) {
 function fixNoPublishConfigOnPrivate(cwd, pkg) {
   delete pkg.publishConfig;
   writeRootPackageJson(cwd, pkg);
-  console.log(chalk13.green("  \u2714 Fixed: removed publishConfig from private root package.json"));
+  console.log(chalk14.green("  \u2714 Fixed: removed publishConfig from private root package.json"));
 }
 function checkDiscoverable(pkg, workspaces) {
   const result = emptyResult();
@@ -1097,22 +1324,22 @@ function logResults(label, result, fix2) {
   let errors = 0;
   let fixed = 0;
   for (const error of result.errors) {
-    console.log(chalk13.red(`  \u2717 ${error}`));
+    console.log(chalk14.red(`  \u2717 ${error}`));
     errors++;
   }
   for (const fixable of result.fixable) {
     if (fix2) {
       fixed++;
     } else {
-      console.log(chalk13.red(`  \u2717 ${fixable} (fixable)`));
+      console.log(chalk14.red(`  \u2717 ${fixable} (fixable)`));
       errors++;
     }
   }
   for (const warning of result.warnings) {
-    console.log(chalk13.yellow(`  \u26A0 ${warning}`));
+    console.log(chalk14.yellow(`  \u26A0 ${warning}`));
   }
   if (errors === 0 && fixed === 0 && result.warnings.length === 0) {
-    console.log(chalk13.green(`  \u2713 ${label}`));
+    console.log(chalk14.green(`  \u2713 ${label}`));
   }
   return { errors, fixed };
 }
@@ -1132,14 +1359,14 @@ function runChecks(entries, cwd, pkg, fix2) {
 }
 function logSummary(errors, fixed) {
   if (fixed > 0) {
-    console.log(chalk13.green(`
+    console.log(chalk14.green(`
   Fixed ${fixed} issue(s)`));
   }
   if (errors > 0) {
-    console.log(chalk13.red(`
+    console.log(chalk14.red(`
   ${errors} error(s) found`));
   } else if (fixed === 0) {
-    console.log(chalk13.green("\n  All checks passed"));
+    console.log(chalk14.green("\n  All checks passed"));
   }
 }
 function packageLintMonorepo(fix2 = false) {
@@ -1148,14 +1375,14 @@ function packageLintMonorepo(fix2 = false) {
   try {
     pkg = readRootPackageJson(cwd);
   } catch {
-    console.error(chalk13.red("Could not read package.json"));
+    console.error(chalk14.red("Could not read package.json"));
     return 1;
   }
   if (!isMonorepo(pkg)) {
-    console.log(chalk13.gray("Not a monorepo \u2014 skipping package-lint checks"));
+    console.log(chalk14.gray("Not a monorepo \u2014 skipping package-lint checks"));
     return 0;
   }
-  console.log(chalk13.green("Package Lint"));
+  console.log(chalk14.green("Package Lint"));
   const workspaces = yarnWorkspaces();
   const checks = [
     {
@@ -1189,13 +1416,13 @@ var publintAll = ({ verbose }) => {
 };
 
 // src/actions/relint.ts
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 var relintPackage = ({
   pkg,
   fix: fix2,
   verbose
 }) => {
-  console.log(chalk14.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
+  console.log(chalk15.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
   const start = Date.now();
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [${pkg}]`, [
     ["yarn", [
@@ -1205,7 +1432,7 @@ var relintPackage = ({
       fix2 ? "package-fix" : verbose ? "package-lint-verbose" : "package-lint"
     ]]
   ]);
-  console.log(chalk14.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk14.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk14.gray("seconds")}`));
+  console.log(chalk15.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk15.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk15.gray("seconds")}`));
   return result;
 };
 var relint = ({
@@ -1225,13 +1452,13 @@ var relint = ({
   });
 };
 var relintAllPackages = ({ fix: fix2 = false } = {}) => {
-  console.log(chalk14.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
+  console.log(chalk15.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
   const fixOptions = fix2 ? ["--fix"] : [];
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
     ["yarn", ["eslint", ...fixOptions]]
   ]);
-  console.log(chalk14.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk14.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk14.gray("seconds")}`));
+  console.log(chalk15.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk15.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk15.gray("seconds")}`));
   return result;
 };
 
@@ -1256,12 +1483,12 @@ var cycleCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Cycle");
     process.exitCode = await cycle({ pkg: argv.package });
-    console.log(chalk15.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk16.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/deplintCommand.ts
-import chalk16 from "chalk";
+import chalk17 from "chalk";
 var deplintCommand = {
   command: "deplint [package]",
   describe: "Deplint - Run Deplint",
@@ -1299,12 +1526,12 @@ var deplintCommand = {
       peerDeps: !!argv.peerDeps,
       verbose: !!argv.verbose
     });
-    console.log(chalk16.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk17.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/fixCommand.ts
-import chalk17 from "chalk";
+import chalk18 from "chalk";
 var fixCommand = {
   command: "fix [package]",
   describe: "Fix - Run Eslint w/fix",
@@ -1315,12 +1542,12 @@ var fixCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
     process.exitCode = fix();
-    console.log(chalk17.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk18.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/knipCommand.ts
-import chalk18 from "chalk";
+import chalk19 from "chalk";
 var knipCommand = {
   command: "knip",
   describe: "Knip - Run Knip",
@@ -1331,12 +1558,12 @@ var knipCommand = {
     if (argv.verbose) console.log("Knip");
     const start = Date.now();
     process.exitCode = knip();
-    console.log(chalk18.blue(`Knip finished in ${Date.now() - start}ms`));
+    console.log(chalk19.blue(`Knip finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/lintCommand.ts
-import chalk19 from "chalk";
+import chalk20 from "chalk";
 var lintCommand = {
   command: "lint [package]",
   describe: "Lint - Run Eslint",
@@ -1365,7 +1592,27 @@ var lintCommand = {
       cache: argv.cache,
       verbose: !!argv.verbose
     });
-    console.log(chalk19.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+  }
+};
+
+// src/xy/lint/lintlintCommand.ts
+var lintlintCommand = {
+  command: "lintlint",
+  describe: "Lint Lint - Check for redundant or overridden ESLint rules vs shared config",
+  builder: (yargs) => {
+    return yargs.option("fix", {
+      default: false,
+      description: "Remove redundant rules from local config",
+      type: "boolean"
+    });
+  },
+  handler: async (argv) => {
+    if (argv.verbose) console.log("Lint Lint");
+    process.exitCode = await lintlint({
+      fix: argv.fix,
+      verbose: !!argv.verbose
+    });
   }
 };
 
@@ -1387,7 +1634,7 @@ var packageLintCommand = {
 };
 
 // src/xy/lint/publintCommand.ts
-import chalk20 from "chalk";
+import chalk21 from "chalk";
 var publintCommand = {
   command: "publint [package]",
   describe: "Publint - Run Publint",
@@ -1398,12 +1645,12 @@ var publintCommand = {
     if (argv.verbose) console.log("Publint");
     const start = Date.now();
     process.exitCode = await publint({ pkg: argv.package, verbose: !!argv.verbose });
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/relintCommand.ts
-import chalk21 from "chalk";
+import chalk22 from "chalk";
 var relintCommand = {
   command: "relint [package]",
   describe: "Relint - Clean & Lint",
@@ -1414,12 +1661,12 @@ var relintCommand = {
     if (argv.verbose) console.log("Relinting");
     const start = Date.now();
     process.exitCode = relint();
-    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk22.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/sonarCommand.ts
-import chalk22 from "chalk";
+import chalk23 from "chalk";
 var sonarCommand = {
   command: "sonar",
   describe: "Sonar - Run Sonar Check",
@@ -1430,13 +1677,13 @@ var sonarCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Sonar Check");
     process.exitCode = sonar();
-    console.log(chalk22.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk23.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/index.ts
 var xyLintCommands = (args) => {
-  return args.command(cycleCommand).command(lintCommand).command(deplintCommand).command(fixCommand).command(relintCommand).command(publintCommand).command(knipCommand).command(packageLintCommand).command(sonarCommand);
+  return args.command(cycleCommand).command(lintCommand).command(lintlintCommand).command(deplintCommand).command(fixCommand).command(relintCommand).command(publintCommand).command(knipCommand).command(packageLintCommand).command(sonarCommand);
 };
 export {
   xyLintCommands