docs-coderef 0.2.0 → 0.4.0

package/dist/cli/fix.mjs

@@ -1,8 +1,9 @@
 #!/usr/bin/env tsx
 import {
+  COLOR_SCHEMES,
   displayCodeDiff,
-  displayLineRangeDiff
-} from "../chunk-NTTV47AI.mjs";
+  msg
+} from "../chunk-U3LM2QL7.mjs";
 import {
   __require,
   expandMatchToScope,
@@ -177,7 +178,22 @@ ${message}`);
     if (selection >= 1 && selection <= options.length) {
       return selection - 1;
     }
-    console.log("\u274C Invalid selection. Please try again.");
+    console.log(msg.error("Invalid selection. Please try again."));
+  }
+}
+function displayColoredCodeBlock(preview) {
+  const codeBlockMatch = /```(\w*)\n([\s\S]*?)\n```/.exec(preview);
+  if (codeBlockMatch) {
+    const language = codeBlockMatch[1] || "";
+    const code = codeBlockMatch[2];
+    console.log(COLOR_SCHEMES.dim(`\`\`\`${language}`));
+    const lines = code.split("\n");
+    lines.forEach((line) => {
+      console.log(COLOR_SCHEMES.success(`+ ${line}`));
+    });
+    console.log(COLOR_SCHEMES.dim("```"));
+  } else {
+    console.log(preview);
   }
 }
 function displayFixPreview(action, projectRoot) {
@@ -185,51 +201,18 @@ function displayFixPreview(action, projectRoot) {
 Changes: ${action.description}`);
   const { error } = action;
   const absolutePath = path.resolve(projectRoot, error.ref.refPath);
-  switch (error.type) {
-    case "CODE_LOCATION_MISMATCH": {
-      if (error.ref.codeBlock && action.newStartLine && action.newEndLine) {
-        const actualCode = extractLinesFromFile(
-          absolutePath,
-          action.newStartLine,
-          action.newEndLine
-        );
-        const diff = displayLineRangeDiff(
-          actualCode,
-          {
-            start: error.ref.startLine,
-            end: error.ref.endLine
-          },
-          {
-            start: action.newStartLine,
-            end: action.newEndLine
-          }
-        );
-        console.log(diff);
-      } else {
-        console.log(action.preview);
-      }
-      break;
-    }
-    case "CODE_CONTENT_MISMATCH": {
-      if (error.expectedCode && action.newCodeBlock) {
-        const diff = displayCodeDiff(error.expectedCode, action.newCodeBlock);
-        console.log(diff);
-      } else {
-        console.log(action.preview);
-      }
-      break;
-    }
+  switch (action.type) {
     case "INSERT_CODE_BLOCK": {
       if (action.newCodeBlock) {
-        console.log("\x1B[32m+ Insert code block:\x1B[0m");
-        console.log("\x1B[2m\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\x1B[0m");
+        console.log(COLOR_SCHEMES.success("+ Insert code block:"));
+        console.log(COLOR_SCHEMES.dim("\u2501".repeat(64)));
         const lines = action.newCodeBlock.split("\n");
         lines.forEach((line) => {
-          console.log(`\x1B[32m+ ${line}\x1B[0m`);
+          console.log(COLOR_SCHEMES.success(`+ ${line}`));
         });
-        console.log("\x1B[2m\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\x1B[0m");
+        console.log(COLOR_SCHEMES.dim("\u2501".repeat(64)));
       } else {
-        console.log(action.preview);
+        displayColoredCodeBlock(action.preview);
       }
       break;
     }
@@ -244,13 +227,23 @@ Changes: ${action.description}`);
     }
     case "UPDATE_LINE_NUMBERS":
     case "UPDATE_END_LINE": {
+      if (error.type === "CODE_LOCATION_MISMATCH" && !error.ref.codeBlock) {
+        console.log(action.preview);
+        break;
+      }
       const oldComment = error.ref.fullMatch;
       const newComment = `<!-- CODE_REF: ${error.ref.refPath}:${action.newStartLine}-${action.newEndLine} -->`;
-      console.log("\x1B[2m\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\x1B[0m");
-      console.log(`\x1B[31m- ${oldComment}\x1B[0m`);
-      console.log(`\x1B[32m+ ${newComment}\x1B[0m`);
-      console.log("\x1B[2m\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\x1B[0m");
-      if (action.newCodeBlock && fs2.existsSync(absolutePath)) {
+      console.log(COLOR_SCHEMES.dim("\u2501".repeat(64)));
+      console.log(COLOR_SCHEMES.error(`- ${oldComment}`));
+      console.log(COLOR_SCHEMES.success(`+ ${newComment}`));
+      console.log(COLOR_SCHEMES.dim("\u2501".repeat(64)));
+      if (error.type === "CODE_CONTENT_MISMATCH") {
+        console.log(
+          COLOR_SCHEMES.warning(
+            "\n\u26A0\uFE0F  Note: Code block will remain unchanged. Please manually adjust if needed."
+          )
+        );
+      } else if (action.newCodeBlock && fs2.existsSync(absolutePath)) {
         console.log("\nCode block content:");
         const lines = action.newCodeBlock.split("\n").slice(0, 10);
         lines.forEach((line) => {
@@ -264,7 +257,7 @@ Changes: ${action.description}`);
     }
     default: {
       if (action.preview) {
-        console.log(action.preview);
+        displayColoredCodeBlock(action.preview);
       }
       break;
     }
@@ -453,7 +446,9 @@ ${symbolCode}
     const expandedCode = extractLinesFromFile(absolutePath, expanded.start, expanded.end);
     const scopeInfo = expanded.scopeType ? ` (${expanded.scopeType})` : "";
     console.log(
-      `   \u2139\uFE0F  Expanded ${ref.startLine}-${ref.endLine} to ${expanded.start}-${expanded.end} using AST analysis${scopeInfo}`
+      msg.debug(
+        `   Expanded ${ref.startLine}-${ref.endLine} to ${expanded.start}-${expanded.end} using AST analysis${scopeInfo}`
+      )
     );
     const oldComment = ref.fullMatch;
     const newComment = `<!-- CODE_REF: ${ref.refPath}:${expanded.start}-${expanded.end} -->`;
@@ -657,7 +652,7 @@ async function handleMultipleMatches(error, rl, config) {
     const confidenceInfo = match.confidence === "high" && match.scopeType ? ` (${match.scopeType})` : match.confidence === "low" ? " (low confidence)" : "";
     console.log(
       `
-\u2713 Detected single match in ${ref.refPath}: lines ${match.start}-${match.end}${confidenceInfo}`
+${msg.success(`Detected single match in ${ref.refPath}: lines ${match.start}-${match.end}${confidenceInfo}`)}`
     );
     return {
       type: "UPDATE_LINE_NUMBERS",
@@ -679,7 +674,7 @@ async function handleMultipleMatches(error, rl, config) {
     const scopeInfo = bestMatch.scopeType ? ` (${bestMatch.scopeType})` : "";
     console.log(
       `
-\u2713 Auto-selected most appropriate match in ${ref.refPath}: lines ${bestMatch.start}-${bestMatch.end}${scopeInfo}`
+${msg.success(`Auto-selected most appropriate match in ${ref.refPath}: lines ${bestMatch.start}-${bestMatch.end}${scopeInfo}`)}`
     );
     return {
       type: "UPDATE_LINE_NUMBERS",
@@ -692,7 +687,7 @@ async function handleMultipleMatches(error, rl, config) {
     };
   }
   console.log(`
-\u26A0\uFE0F  Code found in ${matches.length} locations in ${ref.refPath}:`);
+${msg.warning(`Code found in ${matches.length} locations in ${ref.refPath}:`)}`);
   const options = sortedMatches.map((m) => {
     const confidenceLabel = m.confidence === "high" ? "high" : m.confidence === "medium" ? "medium" : "low";
     const scopeInfo = m.scopeType && m.scopeType !== "unknown" ? `, ${m.scopeType}` : "";
@@ -701,10 +696,10 @@ async function handleMultipleMatches(error, rl, config) {
   const selection = await askSelectOption(rl, options, "Which position should be used?");
   const selectedMatch = sortedMatches[selection];
   if (selectedMatch.confidence === "low") {
-    console.warn("\u26A0\uFE0F  Scope detection confidence is low, please verify the result.");
+    console.warn(msg.warning("Scope detection confidence is low, please verify the result."));
   }
   if (selectedMatch.expansionType === "none") {
-    console.warn("\u26A0\uFE0F  Structural analysis failed, using simple string matching.");
+    console.warn(msg.warning("Structural analysis failed, using simple string matching."));
   }
   return {
     type: "UPDATE_LINE_NUMBERS",
@@ -720,16 +715,16 @@ async function handleMultipleMatches(error, rl, config) {
 // src/utils/styles.ts
 import chalk from "chalk";
 var colors = {
-  // Existing colors from diff-display.ts
-  success: chalk.green,
-  error: chalk.red,
-  dim: chalk.dim,
-  // New colors for fix options
-  primary: chalk.cyan.bold,
+  // Core colors from message-formatter
+  success: COLOR_SCHEMES.success,
+  error: COLOR_SCHEMES.error,
+  dim: COLOR_SCHEMES.dim,
+  // Accent colors for fix options
+  primary: COLOR_SCHEMES.highlight,
   // Option numbers
-  muted: chalk.gray,
+  muted: COLOR_SCHEMES.debug,
   // Supplementary info
-  code: chalk.yellow
+  code: COLOR_SCHEMES.code
   // Code blocks
 };
 var box = {
@@ -785,19 +780,27 @@ function extractLineInfo(preview) {
   return null;
 }
 function formatPreview(preview) {
-  const lines = preview.split("\n");
+  const processedPreview = preview.replace(/\n(→\s*)/g, " $1");
+  const lines = processedPreview.split("\n");
   const output = [];
+  const processLine = (line) => {
+    if (line.includes("\u2192") && line.includes("<!-- CODE_REF:")) {
+      const parts = line.split("\u2192");
+      if (parts.length === 2) {
+        output.push(colors.error(`- ${parts[0].trim()}`));
+        output.push(colors.success(`+ ${parts[1].trim()}`));
+        return;
+      }
+    }
+    output.push(formatCodeLine(line));
+  };
   if (lines.length > MAX_PREVIEW_LINES) {
     const truncatedLines = lines.slice(0, TRUNCATE_SHOW_LINES);
     const remainingCount = lines.length - TRUNCATE_SHOW_LINES;
-    truncatedLines.forEach((line) => {
-      output.push(formatCodeLine(line));
-    });
+    truncatedLines.forEach(processLine);
     output.push(colors.muted(`... (${remainingCount} more lines)`));
   } else {
-    lines.forEach((line) => {
-      output.push(formatCodeLine(line));
-    });
+    lines.forEach(processLine);
   }
   return output;
 }
@@ -805,6 +808,9 @@ function formatCodeLine(line) {
   if (line.trim().startsWith("```")) {
     return colors.dim(line);
   }
+  if (line.includes("<!-- CODE_REF:")) {
+    return line.replace(/<!--/g, colors.dim("<!--")).replace(/-->/g, colors.dim("-->")).replace(/(CODE_REF:)/g, chalk.cyan.bold("$1"));
+  }
   const keywords = [
     "function",
     "const",
@@ -874,26 +880,31 @@ async function main() {
     backup: !options.noBackup,
     verbose: options.verbose
   });
-  console.log("\u{1F527} Starting CODE_REF error fixes...\n");
+  msg.setVerbose(options.verbose);
+  console.log(`${msg.startFix("Starting CODE_REF error fixes...")}
+`);
   if (options.dryRun) {
-    console.log("\u26A0\uFE0F  DRY RUN mode: No actual changes will be made\n");
+    console.log(`${msg.warning("DRY RUN mode: No actual changes will be made")}
+`);
   }
   const errorGroups = collectErrors(config);
   if (errorGroups.length === 0) {
-    console.log("\u2705 No fixable errors found");
+    console.log(msg.success("No fixable errors found"));
     process.exit(0);
   }
   const totalErrors = errorGroups.reduce((sum, g) => sum + g.errors.length, 0);
-  console.log(`\u{1F4CA} Detected ${totalErrors} fixable error(s) in ${errorGroups.length} file(s)
-`);
+  console.log(
+    `${msg.info(`Detected ${totalErrors} fixable error(s) in ${errorGroups.length} file(s)`)}
+`
+  );
   const rl = createPromptInterface();
   const fixResults = [];
   const backupFiles = /* @__PURE__ */ new Set();
   try {
     for (const group of errorGroups) {
       console.log(`
-\u{1F4C4} ${path3.relative(config.projectRoot, group.docFile)}`);
-      console.log(`   ${group.errors.length} error(s)
+${msg.file(path3.relative(config.projectRoot, group.docFile))}`);
+      console.log(`${msg.context(`${group.errors.length} error(s)`)}
 `);
       const sortedErrors = group.errors.sort((a, b) => {
         const lineA = a.ref.docLineNumber ?? Infinity;
@@ -902,21 +913,22 @@ async function main() {
       });
       let _lineOffset = 0;
       for (const error of sortedErrors) {
+        const location = `${path3.relative(config.projectRoot, error.ref.docFile)}${error.ref.docLineNumber ? `:${error.ref.docLineNumber}` : ""}`;
         console.log(`
-\u274C ${error.type}: ${error.message}`);
-        console.log(
-          `   Reference: ${path3.relative(config.projectRoot, error.ref.docFile)}${error.ref.docLineNumber ? `:${error.ref.docLineNumber}` : ""}`
-        );
+${msg.errorDetail(error.type, error.message, location)}`);
         let action;
         if (error.type === "CODE_LOCATION_MISMATCH") {
           action = await handleMultipleMatches(error, rl, config);
         } else {
           const fixActionResult = await createFixAction(error, config, rl);
           if (Array.isArray(fixActionResult)) {
-            console.log("\n\u{1F6E0}\uFE0F Please select a fix method:\n");
+            console.log(`
+${msg.info("Please select a fix method:")}
+`);
             console.log(formatFixOptions(fixActionResult));
             if (options.auto) {
-              console.log("   \u2139\uFE0F  Auto-selecting option 1 in auto mode\n");
+              console.log(`${msg.context("Auto-selecting option 1 in auto mode")}
+`);
               action = fixActionResult[0];
             } else {
               const selection = await new Promise((resolve3) => {
@@ -925,13 +937,13 @@ async function main() {
                   if (num >= 1 && num <= fixActionResult.length) {
                     resolve3(num - 1);
                   } else {
-                    console.log("   \u26A0\uFE0F  Invalid selection. Skipping.");
+                    console.log(msg.context("Invalid selection. Skipping."));
                     resolve3(-1);
                   }
                 });
               });
               if (selection === -1) {
-                console.log("   \u23ED\uFE0F  Skipped");
+                console.log(msg.context("Skipped"));
                 continue;
               }
               action = fixActionResult[selection];
@@ -941,7 +953,7 @@ async function main() {
           }
         }
         if (!action) {
-          console.log("   \u26A0\uFE0F  This error cannot be fixed");
+          console.log(msg.context("This error cannot be fixed"));
           continue;
         }
         if (!Array.isArray(action)) {
@@ -952,11 +964,11 @@ async function main() {
           shouldFix = await askYesNo(rl, "\nApply this fix?", false);
         }
         if (!shouldFix) {
-          console.log("   \u23ED\uFE0F  Skipped");
+          console.log(msg.context("Skipped"));
           continue;
         }
         if (options.dryRun) {
-          console.log("   \u2705 [DRY RUN] Simulated fix");
+          console.log(msg.context("[DRY RUN] Simulated fix"));
           fixResults.push({ success: true, action });
           continue;
         }
@@ -964,19 +976,19 @@ async function main() {
         if (!options.noBackup && !backupFiles.has(group.docFile)) {
           backupPath = createBackup(group.docFile);
           backupFiles.add(group.docFile);
-          console.log(`   \u{1F4BE} Backup created: ${path3.basename(backupPath)}`);
+          console.log(msg.context(`Backup created: ${path3.basename(backupPath)}`));
         }
         try {
           const lineDelta = applyFix(action);
           _lineOffset += lineDelta;
-          if (lineDelta !== 0) {
-            console.log(`   \u{1F4CA} Line delta: ${lineDelta > 0 ? "+" : ""}${lineDelta}`);
+          if (lineDelta !== 0 && options.verbose) {
+            console.log(msg.debug(`   Line delta: ${lineDelta > 0 ? "+" : ""}${lineDelta}`));
           }
-          console.log("   \u2705 Fix applied");
+          console.log(msg.context("Fix applied"));
           fixResults.push({ success: true, action, backupPath });
         } catch (err) {
           const errorMsg = err instanceof Error ? err.message : String(err);
-          console.log(`   \u274C Fix failed: ${errorMsg}`);
+          console.log(msg.context(`Fix failed: ${errorMsg}`));
           fixResults.push({ success: false, action, error: errorMsg, backupPath });
         }
       }
@@ -984,26 +996,16 @@ async function main() {
   } finally {
     rl.close();
   }
-  console.log(`
-${"=".repeat(60)}`);
-  console.log("\u{1F4CA} Fix Results Summary\n");
   const successful = fixResults.filter((r) => r.success).length;
   const failed = fixResults.filter((r) => !r.success).length;
-  console.log(`\u2705 Successful: ${successful}`);
-  console.log(`\u274C Failed: ${failed}`);
-  if (backupFiles.size > 0 && !options.noBackup) {
-    console.log(`
-\u{1F4BE} Backup files: ${backupFiles.size}`);
-    for (const file of backupFiles) {
-      const backupPath = `${file}.backup`;
-      console.log(`   ${path3.relative(config.projectRoot, backupPath)}`);
-    }
-  }
+  const backupPaths = !options.noBackup && backupFiles.size > 0 ? Array.from(backupFiles).map((file) => path3.relative(config.projectRoot, `${file}.backup`)) : [];
+  console.log(msg.summary(successful, failed, backupPaths));
   process.exit(failed > 0 ? 1 : 0);
 }
 if (__require.main === module) {
   main().catch((error) => {
-    console.error("\n\u274C An error occurred:", error);
+    console.error(`
+${msg.error(`An error occurred: ${error}`)}`);
     process.exit(1);
   });
 }