@emeryld/manager 1.4.4 → 1.4.5

package/dist/format-checker/report.js

@@ -23,18 +23,12 @@ export function reportViolations(violations, reportingMode) {
         return false;
     }
     console.log(colors.bold('Format checker violations:'));
-    console.log('');
     if (reportingMode === 'group') {
-        let hasPrintedGroupBlock = false;
         for (const type of TYPE_ORDER) {
             const entries = violations.filter((violation) => violation.type === type);
             if (!entries.length)
                 continue;
             entries.sort((a, b) => b.severity - a.severity);
-            if (hasPrintedGroupBlock) {
-                console.log('');
-            }
-            hasPrintedGroupBlock = true;
             console.log(colors.bold(`- ${TYPE_LABELS[type]} (${entries.length})`));
             for (const entry of entries) {
                 const relativePath = path.relative(rootDir, entry.file) || entry.file;
@@ -59,10 +53,10 @@ export function reportViolations(violations, reportingMode) {
                     });
                 }
             }
+            console.log('');
         }
     }
     else {
-        let hasPrintedFileBlock = false;
         const violationsByFile = new Map();
         for (const entry of violations) {
             const bucket = violationsByFile.get(entry.file);
@@ -76,10 +70,6 @@ export function reportViolations(violations, reportingMode) {
         const sortedFiles = [...violationsByFile.entries()].sort(([a], [b]) => a.localeCompare(b));
         for (const [file, entries] of sortedFiles) {
             const relativePath = path.relative(rootDir, file) || file;
-            if (hasPrintedFileBlock) {
-                console.log('');
-            }
-            hasPrintedFileBlock = true;
             console.log(colors.bold(relativePath));
             const sortedEntries = [...entries].sort((a, b) => (a.line ?? 0) - (b.line ?? 0));
             for (const entry of sortedEntries) {
@@ -107,6 +97,7 @@ export function reportViolations(violations, reportingMode) {
                 }
                 logViolationEntry(entry, '  ', locationDescriptor);
             }
+            console.log('');
         }
     }
     return true;
@@ -124,4 +115,5 @@ function logViolationEntry(entry, messagePrefix, locationDescriptor) {
     if (locationDescriptor) {
         console.log(`    ${colors.dim(locationDescriptor)}`);
     }
+    console.log('');
 }

package/dist/format-checker/scan/duplicates.js

@@ -103,13 +103,13 @@ function ensureFileSnapshot(fileSnapshots, filePath, normalizedLines, lines, sou
     });
 }
 function fingerprintLine(entry) {
+    if (entry.isImport)
+        return undefined;
     if (entry.normalized)
         return entry.normalized;
     const collapsed = entry.trimmed.replace(/\s+/g, ' ');
     if (!collapsed)
         return undefined;
-    if (!/[A-Za-z0-9]/.test(collapsed))
-        return undefined;
     return collapsed.toLowerCase();
 }
 function buildOccurrenceInfo(occurrence, fileSnapshots) {
@@ -136,7 +136,17 @@ function expandDuplicateTracker(tracker, fileSnapshots) {
     if (infos.length < 2)
         return undefined;
     expandRangeAcrossOccurrences(infos);
-    const primary = infos[0];
+    const primary = infos.reduce((current, info) => {
+        if (!current)
+            return info;
+        const pathComparison = current.file.localeCompare(info.file);
+        if (pathComparison > 0)
+            return info;
+        if (pathComparison === 0 && info.startIndex < current.startIndex) {
+            return info;
+        }
+        return current;
+    }, infos[0]);
     const lines = primary.snapshot.normalizedLines
         .slice(primary.startIndex, primary.endIndex + 1)
         .map((entry) => entry.trimmed)
@@ -154,9 +164,16 @@ function expandDuplicateTracker(tracker, fileSnapshots) {
         endLine,
         endColumn,
     });
+    const detailInfos = [...infos].sort((a, b) => {
+        const pathComparison = a.file.localeCompare(b.file);
+        if (pathComparison !== 0)
+            return pathComparison;
+        return a.startIndex - b.startIndex;
+    });
+    const detail = detailInfos.map(formatOccurrenceDetail).join('\n');
     return {
         snippet,
-        detail: infos.map(formatOccurrenceDetail).join('\n'),
+        detail,
         requiredVariables,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emeryld/manager",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "Interactive manager for pnpm monorepos (update/test/build/publish).",
   "license": "MIT",
   "type": "module",