@polycode-projects/seonix 0.3.0 → 0.4.0

package/src/browser.mjs

@@ -14,7 +14,7 @@ import { execFile } from "node:child_process";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
-import { deriveNodeInterval, deriveEdgeInterval } from "./temporal.mjs";
+import { deriveNodeInterval, deriveEdgeInterval, repoOfId, assignRepo, isMultiRepo } from "./temporal.mjs";
 
 const here = dirname(fileURLToPath(import.meta.url));
 const execFileP = promisify(execFile);
@@ -79,8 +79,22 @@ const attr = (ind, key) => {
   return a ? String(a.value) : "";
 };
 
-/** Ordered (oldest → newest) shas for the graph's Commit individuals via git log. */
-export async function gitCommitOrder(repo, graphCommitIds) {
+/**
+ * Ordered (oldest → newest) shas for the graph's Commit individuals via git log.
+ *
+ * A MERGED multi-repo graph (extract.mjs indexRepositories) has no single git repo to
+ * shell — `repo` is the common-ancestor out_root, which is usually not itself a git
+ * checkout — so `git log` there returns nothing that matches. In that case, if the
+ * caller supplies `datesBySha` (commit sha → ISO commit date), fall back to a global
+ * chronological order across all repos. Single-repo callers pass no dates and keep the
+ * existing git path unchanged. (buildTemporalGraph independently re-derives the
+ * date-order when it detects a merge, so a viz caller that passes only cwd is still
+ * correct; this fallback makes gitCommitOrder itself repo-set-agnostic and testable.)
+ * @param {string} repo
+ * @param {Iterable<string>} graphCommitIds
+ * @param {{datesBySha?: Map<string,string>|null}} [opts]
+ */
+export async function gitCommitOrder(repo, graphCommitIds, { datesBySha = null } = {}) {
   const shas = new Set([...graphCommitIds].map((id) => String(id).replace(/^commit:/, "")));
   let ordered = [];
   try {
@@ -89,7 +103,18 @@ export async function gitCommitOrder(repo, graphCommitIds) {
     });
     ordered = stdout.trim().split("\n").reverse().filter((s) => shas.has(s));
   } catch {
-    /* fall through to graph order */
+    /* fall through to graph/date order */
+  }
+  if (!ordered.length && datesBySha) {
+    // Merged-graph fallback: one commit date axis across every repo (tie-break by sha
+    // so equal timestamps stay deterministic).
+    ordered = [...shas].sort((a, b) => {
+      const da = datesBySha.get(a) || "";
+      const db = datesBySha.get(b) || "";
+      if (da < db) return -1;
+      if (da > db) return 1;
+      return a < b ? -1 : a > b ? 1 : 0;
+    });
   }
   if (!ordered.length) ordered = [...shas];
   return ordered;
@@ -137,9 +162,40 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
 
   const commitInds = individuals.filter((i) => i.class === "Commit");
   const commitById = new Map(commitInds.map((c) => [c.id, c]));
-  const order = (orderShas && orderShas.length)
-    ? orderShas
-    : commitInds.map((c) => String(c.id).replace(/^commit:/, ""));
+
+  // P4 cross-repo: a commit's repo is inferred from the id-prefixes of the modules it
+  // touches (touchesSymbol edges) — commits themselves are unprefixed (one per sha).
+  // This is order-independent, so we can detect a merge BEFORE choosing the time axis.
+  const prefixByCommit = new Map(); // commit id -> Map<repoPrefix, touch count>
+  for (const g of groups) {
+    if (kindOf(g) !== "touchesSymbol") continue;
+    for (const e of g.examples || []) {
+      const prefix = repoOfId(e.object);
+      if (!prefix || !commitById.has(e.subject)) continue;
+      let m = prefixByCommit.get(e.subject);
+      if (!m) { m = new Map(); prefixByCommit.set(e.subject, m); }
+      m.set(prefix, (m.get(prefix) || 0) + 1);
+    }
+  }
+  const multi = isMultiRepo(commitInds.map((c) => prefixByCommit.get(c.id) || new Map()));
+  const repoOfCommitId = (id) => (multi ? assignRepo(prefixByCommit.get(id) || new Map()) : null);
+
+  // Single-repo: git-log order (or the given order) exactly as before. Merged graph:
+  // there is no single repo to shell, so order by the stored commit date across ALL
+  // repos — one global time axis, tie-broken by sha for determinism.
+  const order = multi
+    ? [...commitInds]
+        .sort((a, b) => {
+          const da = attr(a, "date");
+          const db = attr(b, "date");
+          if (da < db) return -1;
+          if (da > db) return 1;
+          return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
+        })
+        .map((c) => String(c.id).replace(/^commit:/, ""))
+    : (orderShas && orderShas.length)
+      ? orderShas
+      : commitInds.map((c) => String(c.id).replace(/^commit:/, ""));
   const ordinalOf = new Map(order.map((sha, i) => [`commit:${sha}`, i]));
   const headIdx = Math.max(0, order.length - 1);
   const commits = order.map((sha, i) => {
@@ -155,7 +211,7 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
       if (pi != null) parentIdx.push(pi);
       else ghostParents += 1;
     }
-    return {
+    const commit = {
       idx: i,
       sha,
       shortSha: sha.slice(0, 12),
@@ -166,6 +222,12 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
       ghostParents,
       merge: parentIdx.length + ghostParents > 1,
     };
+    // P4: tag with the owning repo ONLY on a merged graph (single-repo stays identical).
+    if (multi) {
+      const r = repoOfCommitId(`commit:${sha}`);
+      if (r) commit.repo = r;
+    }
+    return commit;
   });
 
   const symInds = individuals.filter((i) => i.class !== "Commit" && inScope(i.id));
@@ -232,7 +294,7 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
     const touches = [...(touchesByNode.get(ind.id) || [])].sort((a, b) => a - b);
     const [born, died] = deriveNodeInterval(touches, headIdx, fallbackBorn(ind.id));
     bornOf.set(ind.id, born);
-    nodes.push({
+    const node = {
       id: ind.id,
       type: ind.class,
       label: ind.label || ind.id,
@@ -241,13 +303,19 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
       died,
       touches,
       churn: touches.length,
-    });
+    };
+    // P4: a symbol's repo is right in its id prefix on a merged graph — carry it so the
+    // browser can badge by repo without re-parsing. Guarded → single-repo unchanged.
+    if (multi) { const r = repoOfId(ind.id); if (r) node.repo = r; }
+    nodes.push(node);
   }
   for (const c of commits) {
-    nodes.push({
+    const node = {
       id: `commit:${c.sha}`, type: "Commit", label: c.shortSha, site: "",
       born: c.idx, died: headIdx, touches: [], churn: 0, commitIdx: c.idx,
-    });
+    };
+    if (multi && c.repo) node.repo = c.repo;
+    nodes.push(node);
     bornOf.set(`commit:${c.sha}`, c.idx);
   }
 
@@ -289,9 +357,13 @@ export function buildTemporalGraph(raw, orderShas, { scope = "product", parentsB
   return {
     meta: {
       scope,
-      commit_order: "oldest-first (ordinal 0 = oldest, N-1 = HEAD)",
+      commit_order: multi
+        ? "oldest-first by commit date across all repos (merged multi-repo graph)"
+        : "oldest-first (ordinal 0 = oldest, N-1 = HEAD)",
       note: "died = HEAD for every node: a HEAD-only index cannot observe deletions.",
       counts: { commits: commits.length, nodes: nodes.length, edges: edges.length, touchesSymbol_edges: tsEdges.length },
+      // P4: present ONLY on a merged graph, so single-repo meta is byte-identical.
+      ...(multi ? { multi_repo: true, repos: [...new Set(commits.map((c) => c.repo).filter(Boolean))].sort() } : {}),
     },
     commits,
     nodes,
@@ -701,6 +773,7 @@ function drawTimeline(){
   const mergeNote=c&&c.merge?' <span style="color:#565f89">· ⑂ merge ('+(c.parentIdx.length+c.ghostParents)+' parent'+((c.parentIdx.length+c.ghostParents)===1?'':'s')+')</span>':'';
   $('tlmeta').innerHTML=(c?('<b>'+esc(c.shortSha)+'</b> · '+(c.date||'').slice(0,10)+' · '+esc(c.author)+' — '+esc(c.subject)):'')
     +mergeNote
+    +(c&&c.repo?' <span style="color:#7aa2f7">· ⛃ '+esc(c.repo)+'</span>':'')
     +(S.cursorB!=null?' <span style="color:#e0af68">· B: '+esc(shortAt(S.cursorB))+'</span>':'')
     +' <span style="color:#565f89">('+(S.cursor+1)+' / '+S.tg.commits.length+')</span>';
 }
@@ -735,6 +808,7 @@ function showBiography(id){
       :'';
     $('detail').innerHTML='<h3>'+esc(c.shortSha)+'</h3>'
       +'<span class="badge"><i style="background:'+COLORS.Commit+'"></i>Commit '+(c.idx+1)+' of '+S.tg.commits.length+'</span>'
+      +(c.repo?' <span class="badge">repo '+esc(c.repo)+'</span>':'')
       +'<div class="row">'+esc(c.author)+' · '+(c.date||'').slice(0,10)+'</div><div class="row"><em>'+esc(c.subject)+'</em></div>'
       +'<div class="row">'+(url?'<a class="btn" href="'+url+'" target="_blank" rel="noopener">open in GitLab ↗</a>':'')
       +'<button class="btn" id="gocommit">scrub here</button></div>'