@emeryld/rrroutes-export 1.0.16 → 1.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@emeryld/rrroutes-export",
   "description": "Finalized leaves export helpers and CLI for RRRoutes",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "private": false,
   "type": "module",
   "main": "dist/index.cjs",

package/tools/finalized-leaves-viewer.html

@@ -1669,7 +1669,7 @@
               routeKey,
               event,
               commit: commitBySha.get(event.commitSha),
-              commitIndex: commitOrder.get(event.commitSha) ?? Number.MAX_SAFE_INTEGER,
+              commitIndex: commitOrder.get(event.commitSha) ?? -1,
               eventIndex: sequence++,
             })
           })
@@ -1683,15 +1683,15 @@
               displayName: event.displayName || sourceObjectId,
               event,
               commit: commitBySha.get(event.commitSha),
-              commitIndex: commitOrder.get(event.commitSha) ?? Number.MAX_SAFE_INTEGER,
+              commitIndex: commitOrder.get(event.commitSha) ?? -1,
               eventIndex: sequence++,
             })
           })
         })
 
         rows.sort((a, b) => {
-          if (a.commitIndex !== b.commitIndex) return a.commitIndex - b.commitIndex
-          return a.eventIndex - b.eventIndex
+          if (a.commitIndex !== b.commitIndex) return b.commitIndex - a.commitIndex
+          return b.eventIndex - a.eventIndex
         })
 
         return rows
@@ -1704,13 +1704,34 @@
           return buildChronologicalEvents(payload)
         }
         if (tabId === VIEW_IDS.changelogSource) {
+          const commitOrder = new Map((payload.commits || []).map((commit, index) => [commit.sha, index]))
+          const sortEventsNewestFirst = (events) =>
+            [...(events || [])].sort((a, b) => {
+              const aIndex = commitOrder.get(a?.commitSha) ?? -1
+              const bIndex = commitOrder.get(b?.commitSha) ?? -1
+              if (aIndex !== bIndex) return bIndex - aIndex
+              return String(b?.commitSha || '').localeCompare(String(a?.commitSha || ''))
+            })
+
           return Object.entries(payload.bySourceObject || {})
-            .sort(([a], [b]) => a.localeCompare(b))
-            .map(([sourceId, events]) => ({
+            .map(([sourceId, events]) => {
+              const sortedEvents = sortEventsNewestFirst(events)
+              const latestCommitIndex = sortedEvents.length
+                ? commitOrder.get(sortedEvents[0]?.commitSha) ?? -1
+                : -1
+              return {
               sourceId,
-              events,
-              displayName: events[0]?.displayName || sourceId,
-            }))
+              events: sortedEvents,
+              displayName: sortedEvents[0]?.displayName || sourceId,
+              latestCommitIndex,
+              }
+            })
+            .sort((a, b) => {
+              if (a.latestCommitIndex !== b.latestCommitIndex) {
+                return b.latestCommitIndex - a.latestCommitIndex
+              }
+              return a.displayName.localeCompare(b.displayName)
+            })
         }
         return []
       }
@@ -2075,7 +2096,6 @@
       function applyLoadedPayload(payload) {
         state.viewerMode = resolveViewerMode(payload)
         applyViewerModeMeta()
-        state.payload = payload
         state.availableTabs = new Set()
         state.leavesPayload = null
         state.changelogPayload = null
@@ -2090,6 +2110,8 @@
           state.leavesPayload = payload
         }
 
+        state.payload = state.leavesPayload || payload
+
         if (state.leavesPayload) {
           state.availableTabs.add(VIEW_IDS.leaves)
           state.leaves = state.leavesPayload.leaves || []