@weasel-js/diagram 1.9.3 → 1.10.0

package/dist/index.js

@@ -1,9 +1,10 @@
-import { insetOf, layered, portOf, outlinePath, diagramNodeOf, expandGroupEdges, forceRelaxation, center, force, tree, DIAGRAM_TRAIT_KEY, portsOf, DEFAULT_GROUP_INSET, sizeToBody, measureBody, buildBody } from './chunk-ERT3XWBS.js';
-export { COMPASS, DEFAULT_GROUP_INSET, DEFAULT_NODE_GAP, DEFAULT_PORTS, DEFAULT_RANK_GAP, DIAGRAM_TRAIT_KEY, axesFor, backEdges, bodyOutline, bodyTrait, boxForContent, buildBody, canvasMeasure, contentBox, createDiagramNodes, dataKeyReader, diagramNodeOf, expandGroupEdges, force, forceRelaxation, forestOf, graphOrder, insetOf, isPinned, layered, layoutBody, layoutRowPorts, measureBody, outlinePath, outlinePolyline, packAcross, packClusters, pinnedSet, portOf, portsOf, portsOnOutline, rankGaps, ranksOf, rayHit, seededOrder, settle, sizeToBody, translated, tree } from './chunk-ERT3XWBS.js';
-import { dragPanContribution, WeaselProvider, useScene, useSelection, useLatest, reconcileSpecs, SceneCanvas, fitViewToBounds, AUTO_POSE_DESCRIPTOR, translatePoseViaDescriptor, pointAlongPath, polylineFromPoints, registerNodeShape, effectivePose, usePoseRun, RECT_POSE_DESCRIPTOR, composeAffordanceLayer } from '@weasel-js/core';
+import { insetOf, layered, portsOf, portOf, outlinePath, diagramNodeOf, expandGroupEdges, forceRelaxation, center, force, tree, DIAGRAM_TRAIT_KEY, DEFAULT_GROUP_INSET, sizeToBody, measureBody, buildBody } from './chunk-BWQJYEA3.js';
+export { COMPASS, DEFAULT_GROUP_INSET, DEFAULT_NODE_GAP, DEFAULT_PORTS, DEFAULT_RANK_GAP, DIAGRAM_TRAIT_KEY, axesFor, backEdges, bodyOutline, bodyTrait, boxForContent, buildBody, canvasMeasure, contentBox, createDiagramNodes, dataKeyReader, diagramNodeOf, expandGroupEdges, force, forceRelaxation, forestOf, graphOrder, insetOf, isPinned, layered, layoutBody, layoutRowPorts, measureBody, outlinePath, outlinePolyline, packAcross, packClusters, pinnedSet, portOf, portsOf, portsOnOutline, rankGaps, ranksOf, rayHit, seededOrder, settle, sizeToBody, translated, tree, untilSettled } from './chunk-BWQJYEA3.js';
+import { dragPanContribution, WeaselProvider, useScene, useSelection, useLatest, reconcileSpecs, SceneCanvas, fitViewToBounds, AUTO_POSE_DESCRIPTOR, translatePoseViaDescriptor, pointAlongPath, polylineFromPoints, registerNodeShape, effectivePose, usePoseRun, RECT_POSE_DESCRIPTOR, commandFill, commandStroke, composeAffordanceLayer } from '@weasel-js/core';
 import { portCurvePoints } from '@weasel-js/geom';
 import { AUTO_POSE_DESCRIPTOR as AUTO_POSE_DESCRIPTOR$1 } from '@weasel-js/core/math';
 import { forwardRef, useEffect, useMemo, useRef, useState, useImperativeHandle, useCallback } from 'react';
+import '@weasel-js/animator';
 import { jsx } from 'react/jsx-runtime';
 
 function traitOf(node) {
@@ -103,6 +104,23 @@ function labelDerivePose(opts = {}) {
 var DIAGRAM_LABEL = "diagram:label";
 var LABEL_DERIVE_POSE = labelDerivePose();
 
+// src/selfLoop.ts
+var dot = (a, b) => a.x * b.x + a.y * b.y;
+function selfLoop(ports, standoff) {
+  const facing = ports.filter((p) => p.normal !== null);
+  const most = (dir, among) => among.reduce(
+    (best, p) => best === void 0 || dot(p.normal, dir) > dot(best.normal, dir) ? p : best,
+    void 0
+  );
+  const from = most({ x: 1, y: 0 }, facing);
+  if (from === void 0) return null;
+  const to = most({ x: 0, y: -1 }, facing.filter((p) => Math.abs(dot(p.normal, from.normal)) < 0.5));
+  if (to === void 0) return null;
+  const out = { x: from.point.x + from.normal.x * standoff, y: from.point.y + from.normal.y * standoff };
+  const reach = dot({ x: to.point.x - out.x, y: to.point.y - out.y }, to.normal) + standoff;
+  return { from, to, via: { x: out.x + to.normal.x * reach, y: out.y + to.normal.y * reach } };
+}
+
 // src/edge.ts
 var straight = (req) => [req.from.point, ...req.waypoints, req.to.point];
 var orthogonal = (req) => {
@@ -123,12 +141,15 @@ var orthogonal = (req) => {
       out.push(b);
       continue;
     }
+    const prev = out.length > 1 ? out[out.length - 2] : null;
     if (leaveHorizontal) {
       const mid = (a.x + b.x) / 2;
-      out.push({ x: mid, y: a.y }, { x: mid, y: b.y }, b);
+      if (prev !== null && (mid - a.x) * (a.x - prev.x) < 0) out.push({ x: a.x, y: b.y }, b);
+      else out.push({ x: mid, y: a.y }, { x: mid, y: b.y }, b);
     } else {
       const mid = (a.y + b.y) / 2;
-      out.push({ x: a.x, y: mid }, { x: b.x, y: mid }, b);
+      if (prev !== null && (mid - a.y) * (a.y - prev.y) < 0) out.push({ x: b.x, y: a.y }, b);
+      else out.push({ x: a.x, y: mid }, { x: b.x, y: mid }, b);
     }
   }
   return out;
@@ -198,17 +219,24 @@ function edgeDerivePath(opts = {}) {
     const b = geometry.getBounds(d.pose);
     return { x: b.x + b.width / 2, y: b.y + b.height / 2 };
   };
+  const standoffOf = (d) => {
+    const b = geometry.getBounds(d.pose);
+    return Math.min(b.width, b.height) / 2;
+  };
   return (node, deps) => {
     const edge = diagramEdgeOf(node);
     if (edge === null) return null;
     const [fromDep, toDep] = deps;
     if (fromDep === void 0 || toDep === void 0) return null;
-    const from = resolveEnd(edge.from, fromDep, centerOf(toDep), portOpts, allPorts);
-    const to = resolveEnd(edge.to, toDep, centerOf(fromDep), portOpts, allPorts);
+    const loop = fromDep.node.id === toDep.node.id && edge.from.port === void 0 && edge.to.port === void 0 ? selfLoop(allPorts(fromDep), opts.selfLoopStandoff ?? standoffOf(fromDep)) : null;
+    const from = loop?.from ?? resolveEnd(edge.from, fromDep, centerOf(toDep), portOpts, allPorts);
+    const to = loop?.to ?? resolveEnd(edge.to, toDep, centerOf(fromDep), portOpts, allPorts);
     if (from === void 0 || to === void 0) return null;
+    const authored = edge.waypoints ?? [];
+    const waypoints = loop !== null && authored.length === 0 ? [loop.via] : authored;
     const routers = opts.routers ?? ROUTERS;
     const router = edge.router !== void 0 && routers[edge.router] || straight;
-    const points = router({ from, to, waypoints: edge.waypoints ?? [] });
+    const points = router({ from, to, waypoints });
     return points.length < 2 ? null : polylineFromPoints(points);
   };
 }
@@ -337,9 +365,6 @@ function commitEdgeToScene(edge, ctx) {
     kind: "leaf",
     layer: source?.layer ?? scene.layers[0].id,
     pose: { x: 0, y: 0, width: 0, height: 0 },
-    // An edge runs *from* one node *to* another, and a plain line does not say
-    // so. The arrowhead is an ordinary stroke marker, which is why nothing in
-    // this package draws one.
     data: { diagram: trait, stroke: DEFAULT_EDGE_STROKE },
     dependsOn: [edge.from.nodeId, edge.to.nodeId],
     // Without this the edge re-resolves on every dependency move and paints
@@ -462,6 +487,58 @@ function diagramPorts(opts) {
     contribution: createDiagramContribution(opts)
   };
 }
+
+// src/groupTree.ts
+function nestGroups(declared, isNode) {
+  const groupIds = new Set(declared.map((g) => g.id));
+  const parentOf = /* @__PURE__ */ new Map();
+  const claimedNodes = /* @__PURE__ */ new Set();
+  const direct = /* @__PURE__ */ new Map();
+  const isAncestorOrSelf = (candidate, of) => {
+    for (let at = of; at !== void 0; at = parentOf.get(at)) {
+      if (at === candidate) return true;
+    }
+    return false;
+  };
+  for (const group of declared) {
+    const own = [];
+    for (const id of group.members) {
+      if (isNode(id)) {
+        if (claimedNodes.has(id)) continue;
+        claimedNodes.add(id);
+        own.push(id);
+      } else if (groupIds.has(id) && !parentOf.has(id) && !isAncestorOrSelf(id, group.id)) {
+        parentOf.set(id, group.id);
+        own.push(id);
+      }
+    }
+    direct.set(group.id, own);
+  }
+  const flat = /* @__PURE__ */ new Map();
+  const flatten = (id) => {
+    const known = flat.get(id);
+    if (known !== void 0) return known;
+    const out = [];
+    for (const member of direct.get(id)) {
+      if (groupIds.has(member)) out.push(...flatten(member));
+      else out.push(member);
+    }
+    flat.set(id, out);
+    return out;
+  };
+  const live = new Set(declared.filter((g) => flatten(g.id).length > 0).map((g) => g.id));
+  return declared.filter((g) => live.has(g.id)).map((g) => {
+    const parent = parentOf.get(g.id);
+    return {
+      id: g.id,
+      direct: direct.get(g.id).filter((id) => !groupIds.has(id) || live.has(id)),
+      members: flat.get(g.id),
+      ...parent !== void 0 ? { parent } : {}
+    };
+  });
+}
+
+// src/graph.ts
 function buildGraph(source, opts = {}) {
   const geometry = opts.geometry ?? AUTO_POSE_DESCRIPTOR$1;
   const nodes = [];
@@ -495,17 +572,19 @@ function buildGraph(source, opts = {}) {
     nodes.push(entry);
     byId.set(entry.id, entry);
   }
-  const groups = [];
-  const claimed = /* @__PURE__ */ new Set();
-  for (const g of groupNodes) {
-    const members = g.members.filter((id) => byId.has(id) && !claimed.has(id));
-    for (const id of members) {
-      claimed.add(id);
-      byId.get(id).group = g.id;
+  const insets = new Map(groupNodes.map((g) => [g.id, g.inset]));
+  const live = nestGroups(groupNodes, (id) => byId.has(id)).map((g) => {
+    for (const id of g.direct) {
+      const node = byId.get(id);
+      if (node !== void 0) node.group = g.id;
     }
-    groups.push({ ...g, members });
-  }
-  const live = groups.filter((g) => g.members.length > 0);
+    return {
+      id: g.id,
+      members: g.members,
+      inset: insets.get(g.id),
+      ...g.parent !== void 0 ? { parent: g.parent } : {}
+    };
+  });
   const known = (id) => byId.has(id) || live.some((g) => g.id === id);
   const edges = expandGroupEdges(candidates.filter((e) => known(e.from) && known(e.to)), live);
   const out = /* @__PURE__ */ new Map();
@@ -532,49 +611,74 @@ function push(index, key, edge) {
 
 // src/dataGroups.ts
 function resolveGroups(groups, ids, nodeIds, opts) {
-  const claimed = /* @__PURE__ */ new Set();
-  const out = [];
   for (const group of groups) {
     if (ids.has(group.id)) throw new Error(`diagramScene: group id "${group.id}" is already a node or group id`);
     ids.add(group.id);
-    const members = group.members.filter((m) => nodeIds.has(m) && !claimed.has(m));
-    for (const m of members) claimed.add(m);
-    if (members.length === 0) continue;
+  }
+  const declared = new Map(groups.map((g) => [g.id, g]));
+  const nested = nestGroups(groups, (id) => nodeIds.has(id));
+  const depthOf = /* @__PURE__ */ new Map();
+  const byId = new Map(nested.map((g) => [g.id, g]));
+  const depth = (id) => {
+    const parent = byId.get(id).parent;
+    let d = depthOf.get(id);
+    if (d === void 0) depthOf.set(id, d = parent === void 0 ? 0 : depth(parent) + 1);
+    return d;
+  };
+  return nested.map((g, i) => ({ g, i })).sort((a, b) => depth(a.g.id) - depth(b.g.id) || a.i - b.i).map(({ g }) => {
+    const group = declared.get(g.id);
     const pad = group.padding ?? opts.padding;
     const title = group.label ? opts.title(group.label) : null;
     const inset = { top: pad + (title ? title.height + pad / 2 : 0), right: pad, bottom: pad, left: pad };
-    out.push({ group, members, inset, pad, title });
-  }
-  return out;
+    return {
+      group,
+      direct: g.direct,
+      members: g.members,
+      inset,
+      pad,
+      title,
+      ...g.parent !== void 0 ? { parent: g.parent } : {}
+    };
+  });
 }
 function groupSpecs(groups, placedAt, styleOf) {
+  const byId = new Map(groups.map((g) => [g.group.id, g]));
+  const boxes = /* @__PURE__ */ new Map();
+  const boxOf = (id) => {
+    const known = boxes.get(id);
+    if (known !== void 0) return known;
+    const g = byId.get(id);
+    const rs = g.direct.map((m) => byId.has(m) ? boxOf(m) : placedAt.get(m));
+    const x = Math.min(...rs.map((r) => r.x)) - g.inset.left;
+    const y = Math.min(...rs.map((r) => r.y)) - g.inset.top;
+    const box = {
+      x,
+      y,
+      width: Math.max(...rs.map((r) => r.x + r.width)) + g.inset.right - x,
+      height: Math.max(...rs.map((r) => r.y + r.height)) + g.inset.bottom - y
+    };
+    boxes.set(id, box);
+    return box;
+  };
   const specs = [];
   for (const g of groups) {
     const { style, text } = styleOf(g.group);
-    const rs = g.members.map((m) => placedAt.get(m));
-    const x = Math.min(...rs.map((r) => r.x)) - g.inset.left;
-    const y = Math.min(...rs.map((r) => r.y)) - g.inset.top;
+    const { x, y, width, height } = boxOf(g.group.id);
     specs.push({
       id: g.group.id,
       kind: "leaf",
       layer: "main",
-      pickable: false,
-      pose: {
-        x,
-        y,
-        width: Math.max(...rs.map((r) => r.x + r.width)) + g.inset.right - x,
-        height: Math.max(...rs.map((r) => r.y + r.height)) + g.inset.bottom - y
-      },
+      pose: { x, y, width, height },
       data: {
         diagram: { outline: "rect", group: { inset: g.inset } },
-        fill: { color: style.fill },
+        fill: { paint: { color: style.fill } },
         stroke: {
           paint: { color: style.stroke },
           width: style.strokeWidth ?? 1,
           ...style.dash ? { dash: style.dash } : {}
         }
       },
-      dependsOn: g.members,
+      dependsOn: g.direct,
       derivePose: GROUP_DERIVE_POSE
     });
     if (g.title === null || !g.group.label) continue;
@@ -585,7 +689,7 @@ function groupSpecs(groups, placedAt, styleOf) {
       layer: "main",
       pickable: false,
       pose: { x: x + g.pad, y: y + g.pad, width: g.title.width, height: g.title.height },
-      data: { diagram: { anchor }, text: g.group.label, style: text, fill: { color: style.text } },
+      data: { diagram: { anchor }, text: g.group.label, style: text, fill: { paint: { color: style.text } } },
       dependsOn: [g.group.id],
       derivePose: ANCHOR_DERIVE_POSE
     });
@@ -665,9 +769,19 @@ function diagramScene(data, opts = {}) {
     );
     return { id: n.id, bounds: pose, pinned: n.pinned === true };
   });
-  const graphGroups = groups.map((g) => ({ id: g.group.id, members: g.members, inset: g.inset }));
+  const graphGroups = groups.map((g) => ({
+    id: g.group.id,
+    members: g.members,
+    inset: g.inset,
+    ...g.parent !== void 0 ? { parent: g.parent } : {}
+  }));
   const seedOf = new Map(seeds.map((n) => [n.id, n]));
-  for (const g of groups) for (const m of g.members) seedOf.get(m).group = g.group.id;
+  for (const g of groups) {
+    for (const m of g.direct) {
+      const seed = seedOf.get(m);
+      if (seed !== void 0) seed.group = g.group.id;
+    }
+  }
   const graph = graphOf(
     seeds,
     expandGroupEdges(edges.map((e) => ({ id: edgeIdOf(e), from: e.from, to: e.to })), graphGroups),
@@ -689,7 +803,7 @@ function diagramScene(data, opts = {}) {
     const seed = seeds[i].bounds;
     const at = placedAt.get(n.id);
     const style = opts.nodeStyle?.(n) ?? NODE;
-    const textData = (text, s) => ({ text, style: styleOf(s), fill: { color: style.text } });
+    const textData = (text, s) => ({ text, style: styleOf(s), fill: { paint: { color: style.text } } });
     const built = buildBody(
       bodies[i],
       { x: at.x, y: at.y, width: seed.width, height: seed.height },
@@ -699,7 +813,7 @@ function diagramScene(data, opts = {}) {
         measure,
         body: (trait) => ({
           diagram: n.pinned === true ? { ...trait, pinned: true } : trait,
-          fill: { color: style.fill },
+          fill: { paint: { color: style.fill } },
           stroke: {
             paint: { color: style.stroke },
             width: style.strokeWidth ?? 2,
@@ -755,7 +869,7 @@ function diagramScene(data, opts = {}) {
           diagram: { label: e.labelPlacement ?? opts.labelPlacement ?? LABEL_PLACEMENT },
           text: e.label,
           style: labelStyle,
-          fill: { color: style.label ?? style.stroke }
+          fill: { paint: { color: style.label ?? style.stroke } }
         },
         dependsOn: [id],
         derivePose: LABEL_DERIVE_POSE
@@ -1003,11 +1117,14 @@ function diagramShape(opts = {}) {
       const outline = outlineOf(node);
       if (outline === void 0) return [];
       const d = node.data;
-      const fill = d.fill === void 0 ? opts.defaultFill : d.fill;
-      const stroke = d.stroke === void 0 ? opts.defaultStroke : d.stroke;
+      const box = geometry.getBounds(pose);
+      const declaredFill = d.fill === void 0 ? opts.defaultFill : d.fill;
+      const declaredStroke = d.stroke === void 0 ? opts.defaultStroke : d.stroke;
+      const fill = declaredFill && commandFill(declaredFill, box);
+      const stroke = declaredStroke && commandStroke(declaredStroke, box);
       return [{
         kind: "path",
-        path: outlinePath(outline, geometry.getBounds(pose)),
+        path: outlinePath(outline, box),
         ...fill ? { fill } : {},
         ...stroke ? { stroke } : {}
       }];
@@ -1179,6 +1296,6 @@ function fitDiagram(specs, size, fit = {}) {
   });
 }
 
-export { ANCHOR_DERIVE_POSE, CONNECT_ACTION_ID, DEFAULT_EDGE_STROKE, DIAGRAM_ANCHOR, DIAGRAM_EDGE, DIAGRAM_GROUP, DIAGRAM_LABEL, DiagramView, EASED_LAYOUTS, EDGE_DERIVE_PATH, GRAB_PORT_ACTION_ID, GROUP_DERIVE_POSE, LABEL_DERIVE_POSE, LAYOUTS2 as LAYOUTS, LAYOUT_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, ROUTERS, anchorDerivePose, applyLayout, bezier, buildGraph, commitEdgeToScene, connectBinding, createConnectAction, createDiagramContribution, createLayoutAction, createPortAffordance, defaultCanConnect, diagramAnchorOf, diagramEdgeOf, diagramGroupOf, diagramLabelOf, diagramPorts, diagramScene, diagramShape, easedProducer, edgeDerivePath, edgeIdOf, forceProducer, grabPortAction, grabPortBindings, groupDerivePose, labelDerivePose, layoutPoses, orthogonal, portLayer, portScratchOf, registerDiagramShape, resolveEnd, sceneParticipants, straight, useLiveLayout, useMirroredSelection, withDiagramRegistry };
+export { ANCHOR_DERIVE_POSE, CONNECT_ACTION_ID, DEFAULT_EDGE_STROKE, DIAGRAM_ANCHOR, DIAGRAM_EDGE, DIAGRAM_GROUP, DIAGRAM_LABEL, DiagramView, EASED_LAYOUTS, EDGE_DERIVE_PATH, GRAB_PORT_ACTION_ID, GROUP_DERIVE_POSE, LABEL_DERIVE_POSE, LAYOUTS2 as LAYOUTS, LAYOUT_ACTION_ID, PORT_AFFORDANCE_KIND, PORT_LAYER_ID, ROUTERS, anchorDerivePose, applyLayout, bezier, buildGraph, commitEdgeToScene, connectBinding, createConnectAction, createDiagramContribution, createLayoutAction, createPortAffordance, defaultCanConnect, diagramAnchorOf, diagramEdgeOf, diagramGroupOf, diagramLabelOf, diagramPorts, diagramScene, diagramShape, easedProducer, edgeDerivePath, edgeIdOf, forceProducer, grabPortAction, grabPortBindings, groupDerivePose, labelDerivePose, layoutPoses, orthogonal, portLayer, portScratchOf, registerDiagramShape, resolveEnd, sceneParticipants, selfLoop, straight, useLiveLayout, useMirroredSelection, withDiagramRegistry };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map