@emeryld/rrroutes-export 1.0.17 → 1.0.18

package/package.json

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

package/tools/finalized-leaves-viewer.html

@@ -555,9 +555,6 @@
               <button id="tabChangelog" class="field-chip" type="button" aria-pressed="false">
                 Changelog
               </button>
-              <button id="tabChangelogSource" class="field-chip" type="button" aria-pressed="false">
-                Changelog / By Source
-              </button>
             </div>
           </div>
         </div>
@@ -694,35 +691,6 @@
         },
       ]
 
-      const CHANGELOG_SOURCE_FIELDS = [
-        {
-          id: 'sourceObject',
-          label: 'source object',
-          get: (item) => [item.sourceId, item.displayName],
-        },
-        {
-          id: 'eventType',
-          label: 'event type',
-          get: (item) => item.events.map((event) => event.type),
-        },
-        {
-          id: 'impactedRoutes',
-          label: 'impacted routes',
-          get: (item) =>
-            item.events.flatMap((event) => (Array.isArray(event.impactedRoutes) ? event.impactedRoutes : [])),
-        },
-        {
-          id: 'schemaDiff',
-          label: 'schema diff',
-          get: (item) =>
-            item.events.flatMap((event) =>
-              Array.isArray(event.schemaDiff)
-                ? event.schemaDiff.map((delta) => JSON.stringify(delta))
-                : [],
-            ),
-        },
-      ]
-
       const SCHEMA_SECTIONS = ['params', 'query', 'body', 'output']
       const SCHEMA_FIELD_IDS = new Set(SCHEMA_SECTIONS)
       const SOURCE_FIELD_IDS = new Set(['sourceDefinition', 'sourceSchemas'])
@@ -759,7 +727,6 @@
       const VIEW_IDS = {
         leaves: 'leaves',
         changelog: 'changelog',
-        changelogSource: 'changelogSource',
       }
 
       const VIEWER_MODE = {
@@ -792,10 +759,6 @@
           fieldDefs: CHANGELOG_TIMELINE_FIELDS,
           defaultSelected: new Set(CHANGELOG_TIMELINE_FIELDS.map((field) => field.id)),
         },
-        [VIEW_IDS.changelogSource]: {
-          fieldDefs: CHANGELOG_SOURCE_FIELDS,
-          defaultSelected: new Set(CHANGELOG_SOURCE_FIELDS.map((field) => field.id)),
-        },
       }
 
       const state = {
@@ -809,7 +772,6 @@
         selectedFieldIdsByTab: {
           [VIEW_IDS.leaves]: new Set(TAB_CONFIG[VIEW_IDS.leaves].defaultSelected),
           [VIEW_IDS.changelog]: new Set(TAB_CONFIG[VIEW_IDS.changelog].defaultSelected),
-          [VIEW_IDS.changelogSource]: new Set(TAB_CONFIG[VIEW_IDS.changelogSource].defaultSelected),
         },
       }
 
@@ -833,7 +795,6 @@
       const controlsEl = document.querySelector('.controls')
       const tabLeavesBtn = document.getElementById('tabLeaves')
       const tabChangelogBtn = document.getElementById('tabChangelog')
-      const tabChangelogSourceBtn = document.getElementById('tabChangelogSource')
 
       const URL_PARAM_KEY = 'filters'
       let isHydratingFromUrl = false
@@ -1456,6 +1417,13 @@
         }
         content.appendChild(overview)
 
+        const fullConfig = el('div', 'section')
+        fullConfig.appendChild(el('h3', '', 'Configuration (full)'))
+        const cfgJson = el('pre', 'mono')
+        cfgJson.textContent = JSON.stringify(cfg, null, 2)
+        fullConfig.appendChild(cfgJson)
+        content.appendChild(fullConfig)
+
         const files = el('div', 'section')
         if (Array.isArray(cfg.bodyFiles) && cfg.bodyFiles.length > 0) {
           files.appendChild(el('h3', '', 'Body Files'))
@@ -1487,6 +1455,10 @@
           const commitBySha = new Map(
             (state.changelogPayload?.commits || []).map((commit) => [commit.sha, commit]),
           )
+          const commitOrder = new Map(
+            (state.changelogPayload?.commits || []).map((commit, index) => [commit.sha, index]),
+          )
+          const routeHistoryNewestFirst = sortEventsNewestFirst(routeHistory, commitBySha, commitOrder)
           const routeChangelogSection = el('div', 'section')
           const routeChangelogDetails = el('details')
           const routeChangelogSummary = el(
@@ -1500,7 +1472,7 @@
           routeChangelogDetails.appendChild(routeChangelogSummary)
 
           const routeChangelogBody = el('div', 'leaf-content')
-          routeHistory.forEach((event) => {
+          routeHistoryNewestFirst.forEach((event) => {
             routeChangelogBody.appendChild(renderEventCard(event, commitBySha))
           })
           routeChangelogDetails.appendChild(routeChangelogBody)
@@ -1655,6 +1627,31 @@
         return row
       }
 
+      function commitTimestamp(commit) {
+        if (!commit?.authorDate) return Number.NEGATIVE_INFINITY
+        const parsed = Date.parse(commit.authorDate)
+        return Number.isNaN(parsed) ? Number.NEGATIVE_INFINITY : parsed
+      }
+
+      function compareEventsNewestFirst(a, b, commitBySha, commitOrder) {
+        const commitA = commitBySha.get(a?.commitSha)
+        const commitB = commitBySha.get(b?.commitSha)
+        const timeDelta = commitTimestamp(commitB) - commitTimestamp(commitA)
+        if (timeDelta !== 0) return timeDelta
+
+        const indexA = commitOrder.get(a?.commitSha) ?? -1
+        const indexB = commitOrder.get(b?.commitSha) ?? -1
+        if (indexA !== indexB) return indexB - indexA
+
+        return String(b?.commitSha || '').localeCompare(String(a?.commitSha || ''))
+      }
+
+      function sortEventsNewestFirst(events, commitBySha, commitOrder) {
+        return [...(events || [])].sort((a, b) =>
+          compareEventsNewestFirst(a, b, commitBySha, commitOrder),
+        )
+      }
+
       function buildChronologicalEvents(payload) {
         if (!payload) return []
         const commitBySha = new Map((payload.commits || []).map((commit) => [commit.sha, commit]))
@@ -1669,6 +1666,7 @@
               routeKey,
               event,
               commit: commitBySha.get(event.commitSha),
+              commitSort: commitTimestamp(commitBySha.get(event.commitSha)),
               commitIndex: commitOrder.get(event.commitSha) ?? -1,
               eventIndex: sequence++,
             })
@@ -1683,6 +1681,7 @@
               displayName: event.displayName || sourceObjectId,
               event,
               commit: commitBySha.get(event.commitSha),
+              commitSort: commitTimestamp(commitBySha.get(event.commitSha)),
               commitIndex: commitOrder.get(event.commitSha) ?? -1,
               eventIndex: sequence++,
             })
@@ -1690,6 +1689,7 @@
         })
 
         rows.sort((a, b) => {
+          if (a.commitSort !== b.commitSort) return b.commitSort - a.commitSort
           if (a.commitIndex !== b.commitIndex) return b.commitIndex - a.commitIndex
           return b.eventIndex - a.eventIndex
         })
@@ -1703,36 +1703,6 @@
         if (tabId === VIEW_IDS.changelog) {
           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 || {})
-            .map(([sourceId, events]) => {
-              const sortedEvents = sortEventsNewestFirst(events)
-              const latestCommitIndex = sortedEvents.length
-                ? commitOrder.get(sortedEvents[0]?.commitSha) ?? -1
-                : -1
-              return {
-              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 []
       }
 
@@ -1758,10 +1728,8 @@
       function renderTabButtons() {
         setPressed(tabLeavesBtn, state.activeTab === VIEW_IDS.leaves)
         setPressed(tabChangelogBtn, state.activeTab === VIEW_IDS.changelog)
-        setPressed(tabChangelogSourceBtn, state.activeTab === VIEW_IDS.changelogSource)
         tabLeavesBtn.style.display = state.availableTabs.has(VIEW_IDS.leaves) ? '' : 'none'
         tabChangelogBtn.style.display = state.availableTabs.has(VIEW_IDS.changelog) ? '' : 'none'
-        tabChangelogSourceBtn.style.display = state.availableTabs.has(VIEW_IDS.changelogSource) ? '' : 'none'
         const isLeavesTab = state.activeTab === VIEW_IDS.leaves
         coreFieldsBtn.style.display = isLeavesTab ? '' : 'none'
         schemasOnlyFieldsBtn.style.display = isLeavesTab ? '' : 'none'
@@ -1797,10 +1765,7 @@
           const fieldDefs = currentFieldDefs()
           const items = changelogItemsByTab(state.activeTab)
           const filtered = items.filter((item) => matchesGenericItem(item, fieldDefs, engine, selectedIds))
-          statusEl.textContent =
-            state.activeTab === VIEW_IDS.changelog
-              ? `${filtered.length} / ${items.length} changelog events matched.`
-              : `${filtered.length} / ${items.length} source changelog groups matched.`
+          statusEl.textContent = `${filtered.length} / ${items.length} changelog events matched.`
           const commitBySha = new Map(
             (state.changelogPayload?.commits || []).map((commit) => [commit.sha, commit]),
           )
@@ -1808,25 +1773,11 @@
             renderCollection(
               filtered,
               (item) => {
-                if (state.activeTab === VIEW_IDS.changelog) {
-                  const contextLabel =
-                    item.eventKind === 'route'
-                      ? `Route: ${item.routeKey}`
-                      : `Source: ${item.displayName || item.sourceObjectId}`
-                  return renderChangelogEventLines(item.event, commitBySha, contextLabel)
-                }
-
-                const lines = el('div', 'changelog-lines')
-                ;(item.events || []).forEach((event) => {
-                  lines.appendChild(
-                    renderChangelogEventLines(
-                      event,
-                      commitBySha,
-                      `Source: ${item.displayName || item.sourceId}`,
-                    ),
-                  )
-                })
-                return lines
+                const contextLabel =
+                  item.eventKind === 'route'
+                    ? `Route: ${item.routeKey}`
+                    : `Source: ${item.displayName || item.sourceObjectId}`
+                return renderChangelogEventLines(item.event, commitBySha, contextLabel)
               },
               'No matches.',
             )
@@ -1835,16 +1786,9 @@
               filtered,
               (item) => {
                 const details = el('details', 'leaf')
-                const title =
-                  state.activeTab === VIEW_IDS.changelog
-                    ? `${item.eventKind === 'route' ? `Route: ${item.routeKey}` : `Source: ${item.displayName || item.sourceObjectId}`} (${item.event.type})`
-                    : `${item.displayName} (${item.events.length})`
+                const title = `${item.eventKind === 'route' ? `Route: ${item.routeKey}` : `Source: ${item.displayName || item.sourceObjectId}`} (${item.event.type})`
                 details.appendChild(el('summary', '', title))
-                if (state.activeTab === VIEW_IDS.changelog) {
-                  details.appendChild(renderEventCard(item.event, commitBySha))
-                } else {
-                  item.events.forEach((event) => details.appendChild(renderEventCard(event, commitBySha)))
-                }
+                details.appendChild(renderEventCard(item.event, commitBySha))
                 return details
               },
               'No matches.',
@@ -2040,8 +1984,7 @@
           isHydratingFromUrl = true
           if (
             parsed.activeTab === VIEW_IDS.leaves ||
-            parsed.activeTab === VIEW_IDS.changelog ||
-            parsed.activeTab === VIEW_IDS.changelogSource
+            parsed.activeTab === VIEW_IDS.changelog
           ) {
             state.activeTab = parsed.activeTab
           }
@@ -2118,15 +2061,12 @@
         }
         if (state.changelogPayload) {
           state.availableTabs.add(VIEW_IDS.changelog)
-          state.availableTabs.add(VIEW_IDS.changelogSource)
         }
 
         if (!state.availableTabs.has(state.activeTab)) {
           state.activeTab = state.availableTabs.has(VIEW_IDS.leaves)
             ? VIEW_IDS.leaves
-            : state.availableTabs.has(VIEW_IDS.changelog)
-              ? VIEW_IDS.changelog
-              : VIEW_IDS.changelogSource
+            : VIEW_IDS.changelog
         }
 
         if (state.leavesPayload && state.changelogPayload) {
@@ -2186,7 +2126,6 @@
 
       tabLeavesBtn.addEventListener('click', () => setActiveTab(VIEW_IDS.leaves))
       tabChangelogBtn.addEventListener('click', () => setActiveTab(VIEW_IDS.changelog))
-      tabChangelogSourceBtn.addEventListener('click', () => setActiveTab(VIEW_IDS.changelogSource))
 
       selectAllFieldsBtn.addEventListener('click', () =>
         setFieldSelection(new Set(currentFieldDefs().map((field) => field.id))),