cleanwind 0.3.0 → 0.3.1

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,18 +1090,19 @@ function hasParseIssue(issues) {
 }
 
 // src/index.ts
+var defaultListLimit = 12;
 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.1");
 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);
+    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);
+  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) => {
@@ -1089,10 +1111,9 @@ program.command("fix").description("Fix files in place.").option("--cwd <path>",
     write: options.check ? false : options.write ?? true,
     staged: options.staged ?? false
   });
-  printFixResult(result, options.verbose ?? 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 +1125,125 @@ function toRunOptions(options) {
   if (options.format !== void 0) runOptions.format = options.format;
   return runOptions;
 }
-function printCheckResult(result, verbose) {
+function printCheckResult(result, verbose, cwd) {
   if (result.ok) {
-    console.log("cleanwind: all files are clean.");
+    console.log(`${color.green("cleanwind")} all files are clean.`);
     return;
   }
-  console.log(`cleanwind: ${result.changedFiles.length} file(s) need cleanup.`);
-  printDiagnostics(result, verbose);
-}
-function printFixResult(result, verbose) {
+  console.log(`${color.bold("cleanwind check")}`);
+  console.log(
+    summaryLine(
+      result.changedFiles.length,
+      result.conflicts.length,
+      result.changedFiles.length === 1 ? "needs cleanup" : "need cleanup"
+    )
+  );
+  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);
+  console.log(`${color.bold("cleanwind fix")}`);
+  console.log(summaryLine(written > 0 ? written : changed, result.conflicts.length, mode));
+  printFileList(written > 0 ? "Written" : "Would change", written > 0 ? result.writtenFiles : result.changedFiles, cwd, verbose);
+  printDiagnostics(result, verbose, cwd);
+  printNextStep(result);
+}
+function summaryLine(fileCount, conflictCount, mode) {
+  const files = `${fileCount} file${fileCount === 1 ? "" : "s"}`;
+  const filePhrase = mode === "would change" ? `${mode} ${files}` : `${files} ${mode}`;
+  const conflicts = conflictCount > 0 ? `, ${color.yellow(`${conflictCount} conflict${conflictCount === 1 ? "" : "s"}`)}` : "";
+  return `${color.cyan(filePhrase)}${conflicts}.`;
+}
+function printFileList(title, files, cwd, verbose) {
+  if (files.length === 0) {
+    return;
+  }
+  const shown = verbose ? files : files.slice(0, defaultListLimit);
+  console.log("");
+  console.log(color.bold(title));
+  for (const file of shown) {
+    console.log(`  ${formatPath(file, cwd)}`);
+  }
+  if (!verbose && files.length > shown.length) {
+    console.log(color.dim(`  ... ${files.length - shown.length} more. Run with --verbose to show all.`));
+  }
 }
-function printDiagnostics(result, verbose) {
-  for (const conflict of result.conflicts) {
+function printDiagnostics(result, verbose, cwd) {
+  printConflicts(result, verbose, cwd);
+  printIssues(result, verbose, cwd);
+}
+function printConflicts(result, verbose, cwd) {
+  if (result.conflicts.length === 0) {
+    return;
+  }
+  const conflicts = verbose ? result.conflicts : result.conflicts.slice(0, defaultListLimit);
+  let currentFile = "";
+  console.error("");
+  console.error(color.bold("Conflicts"));
+  for (const conflict of conflicts) {
+    const file = formatPath(conflict.file, cwd);
+    if (file !== currentFile) {
+      currentFile = file;
+      console.error(`  ${color.cyan(file)}`);
+    }
     console.error(
-      `${conflict.file}:${conflict.line} ${conflict.suggestion} (${conflict.conflictingClasses.join(" ")})`
+      `    ${color.dim(String(conflict.line).padStart(4, " "))}  ${conflict.conflictingClasses.join(" + ")}`
     );
   }
+  if (!verbose && result.conflicts.length > conflicts.length) {
+    console.error(
+      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;
+  }
+  console.error("");
+  console.error(color.bold("Diagnostics"));
+  for (const issue of issues) {
+    console.error(
+      `  ${color.cyan(formatPath(issue.file, cwd))}:${issue.line} ${color.dim(`[${issue.kind}]`)} ${issue.message}`
+    );
   }
 }
+function printNextStep(result) {
+  if (result.conflicts.length > 0) {
+    console.log("");
+    console.log(color.dim("Resolve conflicts manually, then run: npx cleanwind fix --format"));
+    return;
+  }
+  if (result.changedFiles.length > 0) {
+    console.log("");
+    console.log(color.dim("Apply cleanup with: npx cleanwind fix --format"));
+  }
+}
+function formatPath(file, cwd) {
+  const relative = path4.relative(path4.resolve(cwd), file);
+  return (relative && !relative.startsWith("..") ? relative : file).replaceAll("\\", "/");
+}
+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.1",
   "description": "Clean imports and Tailwind CSS class names from the command line.",
   "type": "module",
   "license": "MIT",