@neoloopy/cld-canvas 0.1.4 → 0.1.8

package/dist/view/sceneCache.js

@@ -13,7 +13,7 @@
  * Pure of canvas-view state: it owns only its measure context and memo, and is
  * handed the graph + interaction caches to build from.
  */
-import { buildEdgeGeoms, buildNodeBoxes, collectEdges, computeBadges, nodeBounds, } from "./geometry";
+import { buildEdgeGeoms, buildNodeBoxes, buildSfdPipeGeoms, collectCldMaterialProjectionEdges, collectInfoEdges, computeBadges, loopsForMode, sceneBounds, sfdRenderPositions, } from "./geometry";
 import { LABEL_FONT, LABEL_TRACKING } from "./painter";
 /**
  * A canvas-backed label measurer matching the painter font (and the app's
@@ -64,24 +64,32 @@ export class SceneCache {
      * reference when no geometric input moved; otherwise recomputes boxes, edges,
      * and badges. Returns `null` for a null graph.
      */
-    build(graph, bowSigns, badgeOverrides) {
+    build(graph, bowSigns, badgeOverrides, mode = "cld") {
         if (!graph) {
             this.scene = null;
             this.lastGraph = null;
             this.lastSig = null;
             return null;
         }
-        const sig = this.signature(graph, bowSigns, badgeOverrides);
+        const sig = this.signature(graph, bowSigns, badgeOverrides, mode);
         if (this.scene && graph === this.lastGraph && sig === this.lastSig)
             return this.scene;
-        const boxes = buildNodeBoxes(graph.nodes, (s) => this.measure(s));
-        const edges = buildEdgeGeoms(collectEdges(graph.nodes), boxes, bowSigns);
-        const badges = computeBadges(graph.loops, boxes, badgeOverrides);
+        const boxes = buildNodeBoxes(graph.nodes, (s) => this.measure(s), mode === "sfd" ? sfdRenderPositions(graph.nodes) : undefined);
+        const edgeRefs = collectInfoEdges(graph.nodes, mode);
+        if (mode === "cld") {
+            edgeRefs.push(...collectCldMaterialProjectionEdges(graph.nodes, graph.loops));
+        }
+        const edges = buildEdgeGeoms(edgeRefs, boxes, bowSigns);
+        const pipes = mode === "sfd" ? buildSfdPipeGeoms(graph.nodes, boxes) : [];
+        const loops = loopsForMode(graph.loops, mode);
+        const badges = computeBadges(loops, boxes, badgeOverrides);
         this.scene = {
+            mode,
             nodes: graph.nodes,
             boxes,
             edges,
-            loops: graph.loops,
+            pipes,
+            loops,
             labels: graph.labels,
             badges,
         };
@@ -90,7 +98,7 @@ export class SceneCache {
         // `bowSigns`, which feeds the signature — so the pre-build `sig` is already
         // stale. Record the post-build signature instead, or the next unchanged call
         // would needlessly rebuild once before the cache settles.
-        this.lastSig = this.signature(graph, bowSigns, badgeOverrides);
+        this.lastSig = this.signature(graph, bowSigns, badgeOverrides, mode);
         return this.scene;
     }
     /**
@@ -103,7 +111,7 @@ export class SceneCache {
             return false;
         if (width === 0 || height === 0)
             return false;
-        camera.fit(nodeBounds(this.scene.boxes), width, height);
+        camera.fit(sceneBounds(this.scene.boxes, this.scene.pipes), width, height);
         return true;
     }
     /**
@@ -113,10 +121,18 @@ export class SceneCache {
      * session-only badge overrides. Link polarity/flags don't affect geometry and
      * arrive via a fresh graph (caught by the identity check), so they're omitted.
      */
-    signature(graph, bowSigns, badgeOverrides) {
-        const parts = [];
+    signature(graph, bowSigns, badgeOverrides, mode) {
+        const parts = [mode];
         for (const n of graph.nodes) {
-            parts.push(`${n.id}:${n.x}:${n.y}:${n.type}:${n.label}`);
+            const sfd = n.extra["sfd"];
+            const sfdSig = sfd && typeof sfd === "object" && !Array.isArray(sfd)
+                ? `${String(sfd["x"] ?? "")},${String(sfd["y"] ?? "")}`
+                : "";
+            const flow = n.extra["flow"];
+            const flowSig = flow && typeof flow === "object" && !Array.isArray(flow)
+                ? `${String(flow["from"] ?? "")}->${String(flow["to"] ?? "")}`
+                : "";
+            parts.push(`${n.id}:${n.x}:${n.y}:${sfdSig}:${n.type}:${n.label}:${flowSig}`);
             for (const l of n.links)
                 parts.push(`>${l.to}:${l.curvature ?? ""}`);
         }
@@ -127,8 +143,14 @@ export class SceneCache {
         for (const [k, p] of badgeOverrides)
             parts.push(`${k}=${p.x},${p.y}`);
         parts.push("|");
-        for (const l of graph.loops)
+        for (const l of graph.loops) {
             parts.push(l.key);
+            for (const leg of l.canvasPath?.legs ?? []) {
+                parts.push(leg.kind === "causal"
+                    ? `c:${leg.edgeId}`
+                    : `m:${leg.flowId}>${leg.stockId}:${leg.cldEdgeId}:${leg.polarity}`);
+            }
+        }
         return parts.join(";");
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neoloopy/cld-canvas",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "author": "neoloopy",
   "license": "MIT",
   "description": "Framework-agnostic CLD canvas renderer + in-memory edit engine (shared by the neoloopy Obsidian plugin and neoloopy.com).",
@@ -40,5 +40,5 @@
   },
   "homepage": "https://github.com/frozenabe/neoloopy-obsidian/tree/main/packages/cld-canvas#readme",
   "bugs": { "url": "https://github.com/frozenabe/neoloopy-obsidian/issues" },
-  "scripts": { "build": "tsc -p tsconfig.json" }
+  "scripts": { "build": "tsc -p tsconfig.json", "prepack": "npm run build" }
 }