@statelyai/layout 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statelyai/layout",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Extensible, graph-native layout algorithms for @statelyai/graph",
   "license": "EPL-2.0 OR GPL-3.0-or-later",
   "repository": {
@@ -27,6 +27,10 @@
       "types": "./src/elkjs/index.ts",
       "default": "./dist/elkjs/index.mjs"
     },
+    "./lib/elk.bundled.js": {
+      "types": "./src/elkjs/index.ts",
+      "default": "./dist/elkjs/index.mjs"
+    },
     "./layered": {
       "types": "./src/layered/index.ts",
       "default": "./dist/layered/index.mjs"

package/src/elkjs/index.ts

@@ -14,6 +14,7 @@ import type {
   ElkConstructorArguments,
   ElkLayoutAlgorithmDescription,
   ElkEdge,
+  ElkLabel,
   ElkLayoutArguments,
   ElkLayoutCategoryDescription,
   ElkLayoutOptionDescription,
@@ -25,6 +26,13 @@ import type {
   LaidOutElkNode,
 } from "./types";
 
+function isLayoutEdgeLabel(label: ElkLabel): boolean {
+  return (
+    getBooleanOption(label.layoutOptions ?? {}, "noLayout") !== true &&
+    (Boolean(label.text) || label.width !== undefined || label.height !== undefined)
+  );
+}
+
 export type {
   ElkConstructorArguments,
   ElkCommonDescription,
@@ -824,8 +832,11 @@ function applyNodeMicroLayout(
       constraints.includes("PORT_LABELS") &&
       !constraints.includes("NODE_LABELS") &&
       !constraints.includes("MINIMUM_SIZE");
-    let width = effectivelyFixedPortLabelSize ? (node.width ?? 0) : 0;
-    let height = effectivelyFixedPortLabelSize ? (node.height ?? 0) : 0;
+    const preserveComputedCompoundSize = (node.children?.length ?? 0) > 0;
+    let width =
+      effectivelyFixedPortLabelSize || preserveComputedCompoundSize ? (node.width ?? 0) : 0;
+    let height =
+      effectivelyFixedPortLabelSize || preserveComputedCompoundSize ? (node.height ?? 0) : 0;
     let insideHorizontalInset = 0;
     let insideVerticalInset = 0;
     const insideLabelCells = new Map<string, { width: number; height: number }>();
@@ -845,8 +856,12 @@ function applyNodeMicroLayout(
       }
       width = Math.max(width, (Math.max(sideCounts.NORTH, sideCounts.SOUTH) + 1) * spacing);
       height = Math.max(height, (Math.max(sideCounts.EAST, sideCounts.WEST) + 1) * spacing);
-      if (sideCounts.NORTH === 0 && sideCounts.SOUTH === 0) width = 0;
-      if (sideCounts.EAST === 0 && sideCounts.WEST === 0) height = 0;
+      if (!preserveComputedCompoundSize && sideCounts.NORTH === 0 && sideCounts.SOUTH === 0) {
+        width = 0;
+      }
+      if (!preserveComputedCompoundSize && sideCounts.EAST === 0 && sideCounts.WEST === 0) {
+        height = 0;
+      }
     }
     if (constraints.includes("NODE_LABELS")) {
       for (const label of node.labels ?? []) {
@@ -1257,10 +1272,7 @@ function toGraph(root: ElkNode, globalOptions: Readonly<Record<string, unknown>>
       if (isInsideSelfLoop(root, edge)) return [];
       const source = endpoint(edge.sources?.[0] ?? edge.source, portOwnerById);
       const target = endpoint(edge.targets?.[0] ?? edge.target, portOwnerById);
-      const labels = (edge.labels ?? []).filter(
-        (label) =>
-          Boolean(label.text) && getBooleanOption(label.layoutOptions ?? {}, "noLayout") !== true,
-      );
+      const labels = (edge.labels ?? []).filter(isLayoutEdgeLabel);
       const labelLabelSpacing = getNumberOption(globalOptions, "spacing.labelLabel") ?? 0;
       const labelWidth = Math.max(0, ...labels.map((label) => label.width ?? 0));
       const labelHeight =
@@ -1380,7 +1392,7 @@ function applyLayout(
         label.y ??= 0;
         continue;
       }
-      if (!label.text) {
+      if (!isLayoutEdgeLabel(label)) {
         label.x ??= 0;
         label.y ??= 0;
         continue;
@@ -1436,10 +1448,7 @@ function normalizeElkGraphBounds(
     );
   }
   for (const edge of root.edges ?? []) {
-    const laidOutLabels = (edge.labels ?? []).filter(
-      (label) =>
-        Boolean(label.text) && getBooleanOption(label.layoutOptions ?? {}, "noLayout") !== true,
-    );
+    const laidOutLabels = (edge.labels ?? []).filter(isLayoutEdgeLabel);
     minimumX = Math.min(minimumX, ...laidOutLabels.map((label) => label.x ?? 0));
     minimumY = Math.min(minimumY, ...laidOutLabels.map((label) => label.y ?? 0));
     if (getBooleanOption(edge.layoutOptions ?? {}, "noLayout") !== true) {
@@ -1466,7 +1475,7 @@ function normalizeElkGraphBounds(
           point.y += shiftY;
         }
       }
-      for (const label of (edge.labels ?? []).filter((candidate) => Boolean(candidate.text))) {
+      for (const label of (edge.labels ?? []).filter(isLayoutEdgeLabel)) {
         label.x = (label.x ?? 0) + shiftX;
         label.y = (label.y ?? 0) + shiftY;
       }
@@ -1571,11 +1580,7 @@ function normalizeElkGraphBounds(
       ]),
       ...(root.edges ?? []).flatMap((edge) =>
         (edge.labels ?? [])
-          .filter(
-            (label) =>
-              Boolean(label.text) &&
-              getBooleanOption(label.layoutOptions ?? {}, "noLayout") !== true,
-          )
+          .filter(isLayoutEdgeLabel)
           .map((label) => (label.x ?? 0) + (label.width ?? 0)),
       ),
       ...(root.edges ?? []).flatMap((edge) =>
@@ -1610,11 +1615,7 @@ function normalizeElkGraphBounds(
       ]),
       ...(root.edges ?? []).flatMap((edge) =>
         (edge.labels ?? [])
-          .filter(
-            (label) =>
-              Boolean(label.text) &&
-              getBooleanOption(label.layoutOptions ?? {}, "noLayout") !== true,
-          )
+          .filter(isLayoutEdgeLabel)
           .map(
             (label) =>
               (label.y ?? 0) +