@markuplint/cli-utils 5.0.0-alpha.1 → 5.0.0-alpha.3

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.3](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.2...v5.0.0-alpha.3) (2026-02-26)
+
+### Bug Fixes
+
+- **cli-utils:** return empty string from unifiedDiff for identical inputs ([a738284](https://github.com/markuplint/markuplint/commit/a738284e439724da17d3444ac176ccc3d9bd2008))
+
+### Features
+
+- **cli-utils:** add specConformance to messageToString ([fda8660](https://github.com/markuplint/markuplint/commit/fda866061dbd8a989ca3c393487ea95be89b5a67))
+
+# [5.0.0-alpha.2](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.1...v5.0.0-alpha.2) (2026-02-23)
+
+**Note:** Version bump only for package @markuplint/cli-utils
+
 # [5.0.0-alpha.1](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.0...v5.0.0-alpha.1) (2026-02-22)
 
 **Note:** Version bump only for package @markuplint/cli-utils

package/lib/index.d.ts

@@ -17,3 +17,4 @@ export { messageToString } from './message-to-string.js';
 export { name } from './name.js';
 export { pad } from './pad.js';
 export { space } from './space.js';
+export { unifiedDiff } from './unified-diff.js';

package/lib/index.js

@@ -16,3 +16,4 @@ export { messageToString } from './message-to-string.js';
 export { name } from './name.js';
 export { pad } from './pad.js';
 export { space } from './space.js';
+export { unifiedDiff } from './unified-diff.js';

package/lib/message-to-string.d.ts

@@ -1,9 +1,10 @@
 /**
- * Combines a lint violation message with an optional reason string.
- * When a reason is provided, it is appended after a " / " separator.
+ * Combines a lint violation message with an optional specConformance tag
+ * and reason string.
  *
  * @param message - The primary violation message
+ * @param specConformance - An optional conformance level (e.g. "normative")
  * @param reason - An optional supplementary reason or detail to append
  * @returns The combined message string
  */
-export declare function messageToString(message: string, reason?: string): string;
+export declare function messageToString(message: string, specConformance?: string, reason?: string): string;

package/lib/message-to-string.js

@@ -1,14 +1,19 @@
 /**
- * Combines a lint violation message with an optional reason string.
- * When a reason is provided, it is appended after a " / " separator.
+ * Combines a lint violation message with an optional specConformance tag
+ * and reason string.
  *
  * @param message - The primary violation message
+ * @param specConformance - An optional conformance level (e.g. "normative")
  * @param reason - An optional supplementary reason or detail to append
  * @returns The combined message string
  */
-export function messageToString(message, reason) {
-    if (!reason) {
-        return message;
+export function messageToString(message, specConformance, reason) {
+    let result = message;
+    if (specConformance) {
+        result += ` [${specConformance}]`;
     }
-    return `${message} / ${reason}`;
+    if (reason) {
+        result += ` / ${reason}`;
+    }
+    return result;
 }

package/lib/unified-diff.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Generates a unified-style diff string between two texts.
+ * Uses ANSI colors via picocolors when color output is supported.
+ *
+ * @param filePath - File path for the diff header
+ * @param original - Original text
+ * @param fixed - Fixed text
+ * @returns Formatted unified diff string
+ */
+export declare function unifiedDiff(filePath: string, original: string, fixed: string): string;

package/lib/unified-diff.js

@@ -0,0 +1,144 @@
+import c from 'picocolors';
+/**
+ * Generates a unified-style diff string between two texts.
+ * Uses ANSI colors via picocolors when color output is supported.
+ *
+ * @param filePath - File path for the diff header
+ * @param original - Original text
+ * @param fixed - Fixed text
+ * @returns Formatted unified diff string
+ */
+export function unifiedDiff(filePath, original, fixed) {
+    const originalLines = original.split('\n');
+    const fixedLines = fixed.split('\n');
+    const edits = computeLineEdits(originalLines, fixedLines);
+    const CONTEXT = 3;
+    const hunks = groupIntoHunks(edits, CONTEXT);
+    if (hunks.length === 0) {
+        return '';
+    }
+    const lines = [c.red(`--- a/${filePath}`), c.green(`+++ b/${filePath}`)];
+    for (const hunk of hunks) {
+        let origCount = 0;
+        let fixCount = 0;
+        const hunkLines = [];
+        for (const edit of hunk.edits) {
+            switch (edit.type) {
+                case 'equal': {
+                    hunkLines.push(` ${edit.line}`);
+                    origCount++;
+                    fixCount++;
+                    break;
+                }
+                case 'delete': {
+                    hunkLines.push(c.red(`-${edit.line}`));
+                    origCount++;
+                    break;
+                }
+                case 'insert': {
+                    hunkLines.push(c.green(`+${edit.line}`));
+                    fixCount++;
+                    break;
+                }
+            }
+        }
+        lines.push(c.cyan(`@@ -${hunk.origStart + 1},${origCount} +${hunk.fixStart + 1},${fixCount} @@`), ...hunkLines);
+    }
+    return lines.join('\n');
+}
+// O(n*m) LCS — acceptable for typical HTML files; consider Myers' algorithm if performance issues arise.
+function computeLineEdits(a, b) {
+    const n = a.length;
+    const m = b.length;
+    // Build LCS table — dp[i][j] = LCS length of a[0..i-1] and b[0..j-1]
+    const dp = [];
+    for (let i = 0; i <= n; i++) {
+        const row = [];
+        for (let j = 0; j <= m; j++) {
+            row.push(0);
+        }
+        dp.push(row);
+    }
+    for (let i = 1; i <= n; i++) {
+        for (let j = 1; j <= m; j++) {
+            if (a[i - 1] === b[j - 1]) {
+                dp[i][j] = dp[i - 1][j - 1] + 1;
+            }
+            else {
+                dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
+            }
+        }
+    }
+    // Backtrack to produce edit script
+    const edits = [];
+    let i = n;
+    let j = m;
+    while (i > 0 || j > 0) {
+        if (i > 0 && j > 0 && a[i - 1] === b[j - 1]) {
+            edits.push({ type: 'equal', line: a[i - 1] });
+            i--;
+            j--;
+        }
+        else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+            edits.push({ type: 'insert', line: b[j - 1] });
+            j--;
+        }
+        else {
+            edits.push({ type: 'delete', line: a[i - 1] });
+            i--;
+        }
+    }
+    edits.reverse();
+    return edits;
+}
+function groupIntoHunks(edits, context) {
+    const changedIndices = [];
+    for (const [i, edit] of edits.entries()) {
+        if (edit.type !== 'equal') {
+            changedIndices.push(i);
+        }
+    }
+    if (changedIndices.length === 0) {
+        return [];
+    }
+    const firstIdx = changedIndices[0];
+    const hunks = [];
+    let rangeStart = Math.max(0, firstIdx - context);
+    let rangeEnd = Math.min(edits.length - 1, firstIdx + context);
+    for (let k = 1; k < changedIndices.length; k++) {
+        const idx = changedIndices[k];
+        const newStart = Math.max(0, idx - context);
+        const newEnd = Math.min(edits.length - 1, idx + context);
+        if (newStart <= rangeEnd + 1) {
+            rangeEnd = newEnd;
+        }
+        else {
+            hunks.push(buildHunk(edits, rangeStart, rangeEnd));
+            rangeStart = newStart;
+            rangeEnd = newEnd;
+        }
+    }
+    hunks.push(buildHunk(edits, rangeStart, rangeEnd));
+    return hunks;
+}
+function buildHunk(edits, start, end) {
+    let origLine = 0;
+    let fixLine = 0;
+    for (let i = 0; i < start; i++) {
+        const edit = edits[i];
+        if (!edit) {
+            continue;
+        }
+        if (edit.type === 'equal' || edit.type === 'delete') {
+            origLine++;
+        }
+        if (edit.type === 'equal' || edit.type === 'insert') {
+            fixLine++;
+        }
+    }
+    return {
+        origStart: origLine,
+        fixStart: fixLine,
+        edits: edits.slice(start, end + 1),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/cli-utils",
-	"version": "5.0.0-alpha.1",
+	"version": "5.0.0-alpha.3",
 	"description": "Utilities for CLI of Markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -31,5 +31,5 @@
 		"picocolors": "1.1.1",
 		"strip-ansi": "7.1.2"
 	},
-	"gitHead": "78a295e73a097a1ce09c777c06fa21ab68136387"
+	"gitHead": "2fbdf26daa3d021ac628ccc2f59f0eeae6ddd53d"
 }