@emeryld/rrroutes-export 1.0.19 → 1.0.21

package/package.json

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

package/tools/finalized-leaves-viewer.html

@@ -378,6 +378,22 @@
         gap: 4px;
       }
 
+      .changelog-commit-separator {
+        margin-top: 12px;
+        padding-top: 10px;
+        border-top: 1px solid var(--accent);
+      }
+
+      .changelog-commit-separator:first-child {
+        margin-top: 0;
+      }
+
+      .changelog-commit-label {
+        color: var(--accent);
+        font-weight: 700;
+        font-size: 12px;
+      }
+
       .changelog-diff-line {
         display: flex;
         flex-wrap: wrap;
@@ -403,6 +419,45 @@
         color: var(--schema-accent);
       }
 
+      .event-title-row {
+        display: inline-flex;
+        flex-wrap: wrap;
+        gap: 8px;
+        align-items: center;
+      }
+
+      .event-action-added {
+        color: var(--ok);
+        font-weight: 700;
+      }
+
+      .event-action-removed {
+        color: var(--danger);
+      }
+
+      .event-action-modified {
+        color: var(--accent);
+        font-weight: 700;
+      }
+
+      .event-icon {
+        display: inline-flex;
+        width: 14px;
+        height: 14px;
+        color: var(--muted);
+      }
+
+      .event-icon svg {
+        width: 14px;
+        height: 14px;
+        display: block;
+      }
+
+      .event-name {
+        font-weight: 700;
+        color: var(--text);
+      }
+
       .schema-block {
         border-top: 1px solid var(--border);
         padding: 8px 0 2px;
@@ -1652,7 +1707,12 @@
 
           const routeChangelogBody = el('div', 'leaf-content')
           routeHistoryNewestFirst.forEach((event) => {
-            routeChangelogBody.appendChild(renderEventCard(event, commitBySha))
+            routeChangelogBody.appendChild(
+              renderEventCard(event, commitBySha, {
+                showTitle: true,
+                item: { eventKind: 'route', routeKey: leaf.key, event },
+              }),
+            )
           })
           routeChangelogDetails.appendChild(routeChangelogBody)
           routeChangelogSection.appendChild(routeChangelogDetails)
@@ -1714,21 +1774,96 @@
         return `${type}${schemaFlags(Boolean(entry.nullable), Boolean(entry.optional))}`
       }
 
-      function formatPathLabel(path, entry) {
+      function splitTypeOptions(type) {
+        if (typeof type !== 'string' || !type.includes('|')) return []
+        return type
+          .split('|')
+          .map((item) => item.trim())
+          .filter(Boolean)
+      }
+
+      function hasDefinedLiteral(entry) {
+        return (
+          entry &&
+          typeof entry === 'object' &&
+          Object.prototype.hasOwnProperty.call(entry, 'literal') &&
+          entry.literal !== undefined
+        )
+      }
+
+      function reduceEnumTypeDiff(beforeEntry, afterEntry) {
+        if (!beforeEntry || !afterEntry) return null
+        if (hasDefinedLiteral(beforeEntry) || hasDefinedLiteral(afterEntry)) {
+          return null
+        }
+
+        const beforeOptions = splitTypeOptions(beforeEntry.type)
+        const afterOptions = splitTypeOptions(afterEntry.type)
+        if (beforeOptions.length === 0 || afterOptions.length === 0) return null
+
+        const afterSet = new Set(afterOptions)
+        const beforeSet = new Set(beforeOptions)
+        const beforeOnly = beforeOptions.filter((option) => !afterSet.has(option))
+        const afterOnly = afterOptions.filter((option) => !beforeSet.has(option))
+        if (beforeOnly.length === 0 && afterOnly.length === 0) return null
+
+        const beforeType = `${beforeOnly.join('|') || 'none'}${schemaFlags(
+          Boolean(beforeEntry.nullable),
+          Boolean(beforeEntry.optional),
+        )}`
+        const afterType = `${afterOnly.join('|') || 'none'}${schemaFlags(
+          Boolean(afterEntry.nullable),
+          Boolean(afterEntry.optional),
+        )}`
+        return { beforeType, afterType }
+      }
+
+      function formatPathLabel(path) {
         const basePath = typeof path === 'string' ? path : ''
-        return `${basePath}${schemaFlags(Boolean(entry?.nullable), Boolean(entry?.optional))}`
+        return basePath
       }
 
-      function parseSignatureTypeLabel(signature) {
+      function parseSignatureEntry(signature) {
         if (typeof signature !== 'string') return null
         const typeMatch = signature.match(/(?:^|,\s*)type=([^,]+)/)
-        const nullableMatch = signature.match(/(?:^|,\s*)nullable=(true|false)/)
-        const optionalMatch = signature.match(/(?:^|,\s*)optional=(true|false)/)
-        if (!typeMatch) return null
-        const type = typeMatch[1]
-        const nullable = nullableMatch?.[1] === 'true'
-        const optional = optionalMatch?.[1] === 'true'
-        return `${type}${schemaFlags(nullable, optional)}`
+        if (typeMatch) {
+          const nullableMatch = signature.match(
+            /(?:^|,\s*)nullable=(true|false)/,
+          )
+          const optionalMatch = signature.match(
+            /(?:^|,\s*)optional=(true|false)/,
+          )
+          return {
+            type: typeMatch[1],
+            nullable: nullableMatch?.[1] === 'true',
+            optional: optionalMatch?.[1] === 'true',
+            literal: undefined,
+          }
+        }
+        try {
+          const parsed = JSON.parse(signature)
+          if (!parsed || typeof parsed !== 'object') return null
+          if (typeof parsed.type !== 'string') return null
+          return {
+            type: parsed.type,
+            nullable: Boolean(parsed.nullable),
+            optional: Boolean(parsed.optional),
+            literal: Object.prototype.hasOwnProperty.call(parsed, 'literal')
+              ? parsed.literal
+              : undefined,
+          }
+        } catch {
+          return null
+        }
+      }
+
+      function parseSignatureTypeLabel(signature) {
+        const entry = parseSignatureEntry(signature)
+        if (!entry) return null
+        return `${entry.type}${schemaFlags(
+          Boolean(entry.nullable),
+          Boolean(entry.optional),
+        )}`
       }
 
       function formatSourceTypeLabel(signatures) {
@@ -1740,6 +1875,18 @@
         return labels.join(' | ')
       }
 
+      function formatSourceChangedTypes(beforeSignatures, afterSignatures) {
+        if (!Array.isArray(beforeSignatures) || !Array.isArray(afterSignatures)) {
+          return null
+        }
+        if (beforeSignatures.length !== 1 || afterSignatures.length !== 1) {
+          return null
+        }
+        const beforeEntry = parseSignatureEntry(beforeSignatures[0])
+        const afterEntry = parseSignatureEntry(afterSignatures[0])
+        return reduceEnumTypeDiff(beforeEntry, afterEntry)
+      }
+
       function schemaDiffOperation(op) {
         if (op === 'added') {
           return { symbol: '+', word: 'added', className: 'added' }
@@ -1795,8 +1942,9 @@
               `removed ${location}: ${JSON.stringify(delta.before || [])}`,
             )
           }
-          const beforeType = formatSourceTypeLabel(delta.before)
-          const afterType = formatSourceTypeLabel(delta.after)
+          const reducedTypes = formatSourceChangedTypes(delta.before, delta.after)
+          const beforeType = reducedTypes?.beforeType || formatSourceTypeLabel(delta.before)
+          const afterType = reducedTypes?.afterType || formatSourceTypeLabel(delta.after)
           if (beforeType || afterType) {
             return buildSchemaDiffLine(
               delta.op,
@@ -1812,7 +1960,7 @@
         if ('path' in delta) {
           if (delta.op === 'added') {
             const afterType = formatEntryTypeLabel(delta.after)
-            const pathLabel = formatPathLabel(delta.path, delta.after)
+            const pathLabel = formatPathLabel(delta.path)
             if (afterType) return buildSchemaDiffLine(delta.op, afterType, pathLabel)
             return buildLegacySchemaDiffLine(
               `added ${delta.path}: ${formatRouteSchemaEntry(delta.after)}`,
@@ -1820,17 +1968,20 @@
           }
           if (delta.op === 'removed') {
             const beforeType = formatEntryTypeLabel(delta.before)
-            const pathLabel = formatPathLabel(delta.path, delta.before)
+            const pathLabel = formatPathLabel(delta.path)
             if (beforeType)
               return buildSchemaDiffLine(delta.op, beforeType, pathLabel)
             return buildLegacySchemaDiffLine(
               `removed ${delta.path}: ${formatRouteSchemaEntry(delta.before)}`,
             )
           }
-          const beforeType = formatEntryTypeLabel(delta.before) || 'unknown'
-          const afterType = formatEntryTypeLabel(delta.after) || 'unknown'
+          const reducedTypes = reduceEnumTypeDiff(delta.before, delta.after)
+          const beforeType =
+            reducedTypes?.beforeType || formatEntryTypeLabel(delta.before) || 'unknown'
+          const afterType =
+            reducedTypes?.afterType || formatEntryTypeLabel(delta.after) || 'unknown'
           const pathLabel =
-            formatPathLabel(delta.path, delta.after || delta.before) || delta.path
+            formatPathLabel(delta.path) || delta.path
           return buildSchemaDiffLine(delta.op, beforeType, pathLabel, afterType)
         }
         return null
@@ -1841,7 +1992,100 @@
         return `${diff.field}: ${JSON.stringify(diff.before)} -> ${JSON.stringify(diff.after)}`
       }
 
-      function renderEventCard(event, commitBySha) {
+      const EVENT_ICON_SVGS = {
+        route:
+          '<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"><path d="M2.5 13V3.5h11V13"/><path d="M8 3.5v9.5"/><path d="M5.5 6h.01M10.5 10h.01"/></svg>',
+        source:
+          '<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"><ellipse cx="8" cy="3.5" rx="4.8" ry="2.2"/><path d="M3.2 3.5v7c0 1.2 2.1 2.2 4.8 2.2s4.8-1 4.8-2.2v-7"/><path d="M3.2 7c0 1.2 2.1 2.2 4.8 2.2s4.8-1 4.8-2.2"/></svg>',
+        schema:
+          '<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"><path d="M2.5 4.2L8 1.8l5.5 2.4L8 6.6 2.5 4.2Z"/><path d="M2.5 8L8 5.6 13.5 8 8 10.4 2.5 8Z"/><path d="M2.5 11.8 8 9.4l5.5 2.4L8 14.2l-5.5-2.4Z"/></svg>',
+        config:
+          '<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"><path d="M2 4h12"/><path d="M2 8h12"/><path d="M2 12h12"/><circle cx="6" cy="4" r="1.6" fill="currentColor" stroke="none"/><circle cx="10.5" cy="8" r="1.6" fill="currentColor" stroke="none"/><circle cx="4.5" cy="12" r="1.6" fill="currentColor" stroke="none"/></svg>',
+      }
+
+      function eventVisualByType(type) {
+        switch (type) {
+          case 'route_added':
+            return {
+              actionText: 'added route',
+              actionClass: 'event-action-added',
+              icon: 'route',
+            }
+          case 'route_removed':
+            return {
+              actionText: 'removed route',
+              actionClass: 'event-action-removed',
+              icon: 'route',
+            }
+          case 'schema_changed':
+            return {
+              actionText: 'modified schema',
+              actionClass: 'event-action-modified',
+              icon: 'schema',
+            }
+          case 'cfg_changed':
+            return {
+              actionText: 'modified config',
+              actionClass: 'event-action-modified',
+              icon: 'config',
+            }
+          case 'source_object_added':
+            return {
+              actionText: 'added source object',
+              actionClass: 'event-action-added',
+              icon: 'source',
+            }
+          case 'source_object_removed':
+            return {
+              actionText: 'removed source object',
+              actionClass: 'event-action-removed',
+              icon: 'source',
+            }
+          case 'source_schema_changed':
+            return {
+              actionText: 'modified schema',
+              actionClass: 'event-action-modified',
+              icon: 'schema',
+            }
+          default:
+            return {
+              actionText: 'modified',
+              actionClass: 'event-action-modified',
+              icon: 'schema',
+            }
+        }
+      }
+
+      function resolveEventName(item) {
+        if (!item || item.eventKind === 'source') {
+          return item?.displayName || item?.sourceObjectId || 'source object'
+        }
+        const method =
+          typeof item?.event?.method === 'string' ? item.event.method.trim() : ''
+        const path =
+          typeof item?.event?.path === 'string' ? item.event.path.trim() : ''
+        if (method && path) return `${method.toUpperCase()} ${path}`
+        if (path) return path
+        return item?.routeKey || 'route'
+      }
+
+      function renderEventIcon(iconType) {
+        const icon = el('span', `event-icon event-icon-${iconType}`)
+        icon.setAttribute('aria-hidden', 'true')
+        icon.innerHTML = EVENT_ICON_SVGS[iconType] || EVENT_ICON_SVGS.schema
+        return icon
+      }
+
+      function renderEventTitle(item) {
+        const row = el('div', 'event-title-row mono')
+        const visual = eventVisualByType(item?.event?.type)
+        row.appendChild(el('span', visual.actionClass, visual.actionText))
+        row.appendChild(renderEventIcon(visual.icon))
+        row.appendChild(el('span', 'event-name', `[${resolveEventName(item)}]`))
+        return row
+      }
+
+      function renderEventCard(event, commitBySha, options = {}) {
         const card = el('div', 'leaf-content')
         const commit = commitBySha.get(event.commitSha)
         const commitDateTime = formatCommitDateTime(commit?.authorDate)
@@ -1854,7 +2098,9 @@
           .filter(Boolean)
           .join(' - ')
         card.appendChild(el('div', 'meta', commitMeta))
-        card.appendChild(el('div', 'mono', event.type))
+        if (options.showTitle && options.item) {
+          card.appendChild(renderEventTitle(options.item))
+        }
         if (Array.isArray(event.schemaDiff) && event.schemaDiff.length > 0) {
           card.appendChild(
             el('div', 'meta', `schema changes: ${event.schemaDiff.length}`),
@@ -1907,12 +2153,41 @@
           .join(' - ')
       }
 
-      function renderChangelogEventLines(event, commitBySha, contextLabel) {
+      function renderCommitSeparator(commitSha, commitBySha) {
+        const box = el('div', 'changelog-commit-separator')
+        const commit = commitBySha.get(commitSha)
+        const commitDateTime = formatCommitDateTime(commit?.authorDate)
+        const label = `commit ${String(commitSha || '').slice(0, 12)}`
+        const meta = [commitDateTime, commit?.authorName || null, commit?.subject || null]
+          .filter(Boolean)
+          .join(' - ')
+        box.appendChild(el('div', 'changelog-commit-label mono', label))
+        if (meta) {
+          box.appendChild(el('div', 'meta', meta))
+        }
+        return box
+      }
+
+      function renderChangelogWithCommitSeparators(items, commitBySha, renderItem) {
+        if (!Array.isArray(items) || items.length === 0) return
+        let previousCommitSha = null
+        items.forEach((item) => {
+          const currentCommitSha = item?.event?.commitSha || null
+          if (currentCommitSha !== previousCommitSha) {
+            resultsEl.appendChild(renderCommitSeparator(currentCommitSha, commitBySha))
+            previousCommitSha = currentCommitSha
+          }
+          resultsEl.appendChild(renderItem(item))
+        })
+      }
+
+      function renderChangelogEventLines(item, commitBySha) {
+        const event = item.event
         const row = el('div', 'changelog-line-item')
         row.appendChild(
           el('div', 'meta', buildCommitMetaLine(event, commitBySha)),
         )
-        row.appendChild(el('div', 'mono', `${contextLabel} (${event.type})`))
+        row.appendChild(renderEventTitle(item))
 
         if (Array.isArray(event.schemaDiff) && event.schemaDiff.length > 0) {
           event.schemaDiff.forEach((delta) => {
@@ -2115,34 +2390,26 @@
               commit,
             ]),
           )
-          if (state.viewerMode === VIEWER_MODE.changelog) {
-            renderCollection(
-              filtered,
-              (item) => {
-                const contextLabel =
-                  item.eventKind === 'route'
-                    ? `Route: ${item.routeKey}`
-                    : `Source: ${item.displayName || item.sourceObjectId}`
-                return renderChangelogEventLines(
-                  item.event,
-                  commitBySha,
-                  contextLabel,
-                )
-              },
-              'No matches.',
+          if (filtered.length === 0) {
+            resultsEl.appendChild(el('div', 'empty', 'No matches.'))
+          } else if (state.viewerMode === VIEWER_MODE.changelog) {
+            renderChangelogWithCommitSeparators(filtered, commitBySha, (item) =>
+              renderChangelogEventLines(item, commitBySha),
             )
           } else {
-            renderCollection(
-              filtered,
-              (item) => {
-                const details = el('details', 'leaf')
-                const title = `${item.eventKind === 'route' ? `Route: ${item.routeKey}` : `Source: ${item.displayName || item.sourceObjectId}`} (${item.event.type})`
-                details.appendChild(el('summary', '', title))
-                details.appendChild(renderEventCard(item.event, commitBySha))
-                return details
-              },
-              'No matches.',
-            )
+            renderChangelogWithCommitSeparators(filtered, commitBySha, (item) => {
+              const details = el('details', 'leaf')
+              const summary = el('summary')
+              summary.appendChild(renderEventTitle(item))
+              details.appendChild(summary)
+              details.appendChild(
+                renderEventCard(item.event, commitBySha, {
+                  showTitle: false,
+                  item,
+                }),
+              )
+              return details
+            })
           }
         }
         syncFilterStateToUrl()