cleanwind 0.3.0 → 0.3.2

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
+import path4 from "path";
 import { Command } from "commander";
 
 // ../core/dist/index.js
@@ -522,6 +523,7 @@ var displayClasses = /* @__PURE__ */ new Set([
   "hidden"
 ]);
 var positionClasses = /* @__PURE__ */ new Set(["static", "fixed", "absolute", "relative", "sticky"]);
+var borderStyleClasses = /* @__PURE__ */ new Set(["solid", "dashed", "dotted", "double", "hidden", "none"]);
 var variantOrder = [
   "sm",
   "md",
@@ -614,8 +616,9 @@ function conflictKey(className) {
   if (utility.startsWith("rounded")) {
     return `${variantPrefix}${roundedConflictKey(utility)}`;
   }
-  if (/^border(?:-[trblxy])?-/u.test(utility) || utility === "border") {
-    return `${variantPrefix}${borderConflictKey(utility)}`;
+  const border = borderConflictKey(utility);
+  if (border) {
+    return `${variantPrefix}${border}`;
   }
   if (/^flex-(row|row-reverse|col|col-reverse)$/u.test(utility)) {
     return `${variantPrefix}flex-direction`;
@@ -702,8 +705,26 @@ function roundedConflictKey(utility) {
   return match?.groups?.side ? `border-radius-${match.groups.side}` : "border-radius";
 }
 function borderConflictKey(utility) {
-  const match = /^border(?:-(?<side>[trblxy]))?(?:-|$)/u.exec(utility);
-  return match?.groups?.side ? `border-${match.groups.side}` : "border";
+  if (utility === "border-collapse" || utility === "border-separate") {
+    return "border-collapse";
+  }
+  const match = /^border(?:-(?<side>[trblxy]))?(?:-(?<value>.+))?$/u.exec(utility);
+  if (!match?.groups) {
+    return void 0;
+  }
+  const side = match.groups.side;
+  const value = match.groups.value;
+  const sideSuffix = side ? `-${side}` : "";
+  if (!value || isBorderWidthValue(value)) {
+    return `border-width${sideSuffix}`;
+  }
+  if (!side && borderStyleClasses.has(value)) {
+    return "border-style";
+  }
+  return `border-color${sideSuffix}`;
+}
+function isBorderWidthValue(value) {
+  return /^(0|2|4|8|\d+|\[.+\])$/u.test(value);
 }
 function rankUtility(utility) {
   if (utility.startsWith("container")) return 0;
@@ -1069,30 +1090,47 @@ function hasParseIssue(issues) {
 }
 
 // src/index.ts
+var defaultListLimit = 12;
+var tree = {
+  branch: "\u251C\u2500",
+  last: "\u2514\u2500",
+  pipe: "\u2502",
+  tee: "\u2502  \u251C",
+  elbow: "\u2502  \u2514",
+  spacer: "\u2502    ",
+  step: "*",
+  primary: "\u25C6",
+  secondary: "\u25CF"
+};
 var program = new Command();
-program.name("cleanwind").description("Clean imports and Tailwind CSS class names.").version("0.3.0");
+program.name("cleanwind").description("Clean imports and Tailwind CSS class names.").version("0.3.2");
 program.command("check").description("Check files without writing changes.").option("--cwd <path>", "Working directory").option("--config <path>", "Path to cleanwind config").option("--write", "Write fixes while running check").option("--check", "Force check mode", true).option("--verbose", "Print detailed diagnostics").option("--format", "Format output with Prettier after cleanup").action(async (options) => {
   const runOptions = toRunOptions(options);
   if (options.write) {
-    const result2 = await fix({ ...runOptions, write: true });
-    printFixResult(result2, options.verbose ?? false);
+    const result2 = await runWithProgress(
+      "Fixing project",
+      () => fix({ ...runOptions, write: true })
+    );
+    printFixResult(result2, options.verbose ?? false, runOptions.cwd ?? process.cwd());
     process.exitCode = result2.conflicts.length > 0 ? 1 : 0;
     return;
   }
-  const result = await check(runOptions);
-  printCheckResult(result, options.verbose ?? false);
+  const result = await runWithProgress("Checking project", () => check(runOptions));
+  printCheckResult(result, options.verbose ?? false, runOptions.cwd ?? process.cwd());
   process.exitCode = result.ok ? 0 : 1;
 });
 program.command("fix").description("Fix files in place.").option("--cwd <path>", "Working directory").option("--config <path>", "Path to cleanwind config").option("--write", "Write fixes", true).option("--check", "Preview fixes without writing").option("--verbose", "Print detailed diagnostics").option("--staged", "Only fix staged files").option("--format", "Format output with Prettier after cleanup").action(async (options) => {
-  const result = await fix({
-    ...toRunOptions(options),
-    write: options.check ? false : options.write ?? true,
-    staged: options.staged ?? false
-  });
-  printFixResult(result, options.verbose ?? false);
+  const result = await runWithProgress(
+    options.check ? "Previewing cleanup" : "Fixing project",
+    () => fix({
+      ...toRunOptions(options),
+      write: options.check ? false : options.write ?? true,
+      staged: options.staged ?? false
+    })
+  );
+  printFixResult(result, options.verbose ?? false, options.cwd ?? process.cwd());
   process.exitCode = result.conflicts.length > 0 ? 1 : 0;
 });
-await program.parseAsync();
 function toRunOptions(options) {
   const runOptions = {};
   if (options.cwd !== void 0) runOptions.cwd = options.cwd;
@@ -1104,31 +1142,218 @@ function toRunOptions(options) {
   if (options.format !== void 0) runOptions.format = options.format;
   return runOptions;
 }
-function printCheckResult(result, verbose) {
+async function runWithProgress(label, task) {
+  if (!shouldRenderProgress()) {
+    return task();
+  }
+  let progress = 0;
+  const timer = setInterval(() => {
+    progress = nextProgress(progress);
+    renderProgress(label, progress);
+  }, 90);
+  renderProgress(label, progress);
+  try {
+    const result = await task();
+    progress = 100;
+    renderProgress(label, progress);
+    await wait(120);
+    return result;
+  } finally {
+    clearInterval(timer);
+    clearProgress();
+  }
+}
+function nextProgress(progress) {
+  if (progress < 55) {
+    return progress + 7;
+  }
+  if (progress < 85) {
+    return progress + 3;
+  }
+  return Math.min(progress + 1, 95);
+}
+function renderProgress(label, progress) {
+  const width = 24;
+  const filled = Math.round(progress / 100 * width);
+  const bar = `${"\u2588".repeat(filled)}${"\u2591".repeat(width - filled)}`;
+  process.stdout.write(
+    `\r${color.cyan("cleanwind")} ${label} ${color.green(bar)} ${String(progress).padStart(3, " ")}%`
+  );
+}
+function clearProgress() {
+  process.stdout.write("\r\x1B[2K");
+}
+function shouldRenderProgress() {
+  return process.stdout.isTTY === true && process.env.CI === void 0;
+}
+function wait(milliseconds) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, milliseconds);
+  });
+}
+function printCheckResult(result, verbose, cwd) {
   if (result.ok) {
-    console.log("cleanwind: all files are clean.");
+    printHeader("check");
+    printStep("Loaded config", "done");
+    printStep("Checked project", "done");
+    printStep("Built report", "done");
+    printSpacer();
+    console.log(`${color.green(tree.primary)} ${color.bold("All files are clean")}`);
     return;
   }
-  console.log(`cleanwind: ${result.changedFiles.length} file(s) need cleanup.`);
-  printDiagnostics(result, verbose);
-}
-function printFixResult(result, verbose) {
+  printHeader("check");
+  printStep("Loaded config", "done");
+  printStep("Checked project", "done");
+  printStep("Built report", "done");
+  printSpacer();
+  printMetrics(
+    result.changedFiles.length,
+    result.changedFiles.length === 1 ? "file needs cleanup" : "files need cleanup",
+    result.conflicts.length
+  );
+  printFileList("Files", result.changedFiles, cwd, verbose);
+  printDiagnostics(result, verbose, cwd);
+  printNextStep(result);
+}
+function printFixResult(result, verbose, cwd) {
   const written = result.writtenFiles.length;
   const changed = result.changedFiles.length;
   const mode = written > 0 ? "fixed" : "would change";
-  console.log(`cleanwind: ${mode} ${written > 0 ? written : changed} file(s).`);
-  printDiagnostics(result, verbose);
+  printHeader("fix");
+  printStep("Loaded config", "done");
+  printStep(written > 0 ? "Applied cleanup" : "Previewed cleanup", "done");
+  printStep("Built report", "done");
+  printSpacer();
+  printMetrics(
+    written > 0 ? written : changed,
+    mode === "fixed" ? written === 1 ? "file fixed" : "files fixed" : changed === 1 ? "file would change" : "files would change",
+    result.conflicts.length
+  );
+  printFileList(written > 0 ? "Written" : "Would change", written > 0 ? result.writtenFiles : result.changedFiles, cwd, verbose);
+  printDiagnostics(result, verbose, cwd);
+  printNextStep(result);
+}
+function printHeader(command) {
+  console.log(`${color.cyan("cleanwind")} ${color.bold(command)}`);
+  console.log(tree.pipe);
+}
+function printStep(label, status) {
+  console.log(`${tree.branch} ${color.green(tree.step)} ${label} - ${color.bold(status)}`);
+}
+function printSpacer() {
+  console.log(tree.pipe);
+}
+function printMetrics(fileCount, fileLabel, conflictCount) {
+  console.log(`${color.green(tree.primary)} ${color.bold(`${fileCount} ${fileLabel}`)}`);
+  if (conflictCount > 0) {
+    console.log(
+      `${color.yellow(tree.secondary)} ${color.bold(`${conflictCount} conflict${conflictCount === 1 ? "" : "s"}`)} need review`
+    );
+    return;
+  }
+  console.log(`${color.green(tree.secondary)} ${color.bold("0 conflicts")} found`);
+}
+function printFileList(title, files, cwd, verbose) {
+  if (files.length === 0) {
+    return;
+  }
+  const shown = verbose ? files : files.slice(0, defaultListLimit);
+  printSpacer();
+  console.log(`${tree.branch} ${color.bold(title)}`);
+  for (const [index, file] of shown.entries()) {
+    const prefix = index === shown.length - 1 && (verbose || files.length === shown.length) ? tree.elbow : tree.tee;
+    console.log(`${prefix} ${formatPath(file, cwd)}`);
+  }
+  if (!verbose && files.length > shown.length) {
+    console.log(
+      `${tree.elbow} ${color.dim(`${files.length - shown.length} more. Run with --verbose to show all.`)}`
+    );
+  }
+}
+function printDiagnostics(result, verbose, cwd) {
+  printConflicts(result, verbose, cwd);
+  printIssues(result, verbose, cwd);
 }
-function printDiagnostics(result, verbose) {
-  for (const conflict of result.conflicts) {
-    console.error(
-      `${conflict.file}:${conflict.line} ${conflict.suggestion} (${conflict.conflictingClasses.join(" ")})`
+function printConflicts(result, verbose, cwd) {
+  if (result.conflicts.length === 0) {
+    return;
+  }
+  const conflicts = verbose ? result.conflicts : result.conflicts.slice(0, defaultListLimit);
+  const groups = groupConflictsByFile(conflicts, cwd);
+  printSpacer();
+  console.log(`${tree.branch} ${color.bold("Conflicts")}`);
+  for (const [groupIndex, group] of groups.entries()) {
+    const isLastGroup = groupIndex === groups.length - 1 && (verbose || result.conflicts.length === conflicts.length);
+    console.log(`${isLastGroup ? tree.elbow : tree.tee} ${color.cyan(group.file)}`);
+    for (const [conflictIndex, conflict] of group.conflicts.entries()) {
+      const isLastConflict = conflictIndex === group.conflicts.length - 1;
+      console.log(
+        `${tree.spacer}${isLastConflict ? "\u2514" : "\u251C"} L${conflict.line} ${conflict.conflictingClasses.join(" + ")}`
+      );
+    }
+  }
+  if (!verbose && result.conflicts.length > conflicts.length) {
+    console.log(
+      `${tree.elbow} ${color.dim(`${result.conflicts.length - conflicts.length} more conflict(s). Run with --verbose to show all.`)}`
     );
   }
+}
+function printIssues(result, verbose, cwd) {
   if (!verbose) {
     return;
   }
-  for (const issue of result.issues) {
-    console.error(`${issue.file}:${issue.line} [${issue.kind}] ${issue.message}`);
+  const issues = result.issues.filter((issue) => issue.kind !== "conflict");
+  if (issues.length === 0) {
+    return;
+  }
+  printSpacer();
+  console.log(`${tree.branch} ${color.bold("Diagnostics")}`);
+  for (const [index, issue] of issues.entries()) {
+    const prefix = index === issues.length - 1 ? tree.elbow : tree.tee;
+    console.log(
+      `${prefix} ${color.cyan(formatPath(issue.file, cwd))}:${issue.line} ${color.dim(`[${issue.kind}]`)} ${issue.message}`
+    );
   }
 }
+function printNextStep(result) {
+  if (result.conflicts.length > 0) {
+    printSpacer();
+    console.log(`${tree.last} ${color.bold("Next:")} Resolve conflicts, then run ${color.cyan("npx cleanwind fix --format")}`);
+    return;
+  }
+  if (result.changedFiles.length > 0) {
+    printSpacer();
+    console.log(`${tree.last} ${color.bold("Next:")} Apply cleanup with ${color.cyan("npx cleanwind fix --format")}`);
+  }
+}
+function formatPath(file, cwd) {
+  const relative = path4.relative(path4.resolve(cwd), file);
+  return (relative && !relative.startsWith("..") ? relative : file).replaceAll("\\", "/");
+}
+function groupConflictsByFile(conflicts, cwd) {
+  const groups = [];
+  for (const conflict of conflicts) {
+    const file = formatPath(conflict.file, cwd);
+    const current = groups.at(-1);
+    if (current?.file === file) {
+      current.conflicts.push(conflict);
+    } else {
+      groups.push({ file, conflicts: [conflict] });
+    }
+  }
+  return groups;
+}
+function supportsColor() {
+  return process.env.NO_COLOR === void 0 && process.stdout.isTTY === true;
+}
+function paint(code, value) {
+  return supportsColor() ? `\x1B[${code}m${value}\x1B[0m` : value;
+}
+var color = {
+  bold: (value) => paint("1", value),
+  cyan: (value) => paint("36", value),
+  dim: (value) => paint("2", value),
+  green: (value) => paint("32", value),
+  yellow: (value) => paint("33", value)
+};
+await program.parseAsync();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cleanwind",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Clean imports and Tailwind CSS class names from the command line.",
   "type": "module",
   "license": "MIT",