@graphty/cytoscape-extensions 0.0.27 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphty/cytoscape-extensions",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Graphty layouts, algorithms, graph generators, sample datasets and file import/export as Cytoscape.js extensions",
   "author": "Adam Powers <apowers@ato.ms>",
   "type": "module",
@@ -71,9 +71,9 @@
   },
   "homepage": "https://graphty.app/docs/cytoscape-extensions/",
   "dependencies": {
-    "@graphty/graph-samples": "^0.1.38",
-    "@graphty/graph-io": "^0.3.47",
-    "@graphty/webgpu-graph-algorithms": "^0.6.60"
+    "@graphty/graph-io": "^0.3.48",
+    "@graphty/webgpu-graph-algorithms": "^0.6.61",
+    "@graphty/graph-samples": "^0.1.39"
   },
   "peerDependencies": {
     "@graphty/algorithms": "^3.0.0",
@@ -103,9 +103,9 @@
     "typescript": "^5.9.3",
     "vite": "^7.0.5",
     "vitest": "4.1.11",
-    "@graphty/algorithms": "^3.4.13",
-    "@graphty/graph-format": "^1.4.6",
-    "@graphty/layout": "^2.5.9"
+    "@graphty/graph-format": "^1.4.7",
+    "@graphty/algorithms": "^3.4.14",
+    "@graphty/layout": "^2.5.10"
   },
   "scripts": {
     "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json && vite build --config vite.bundle.config.ts --mode cdn --logLevel warn && vite build --config vite.bundle.config.ts --logLevel warn",

package/src/graph-data.ts

@@ -164,6 +164,32 @@ function freeImportId(cy: Core): string {
     return String(k);
 }
 
+/**
+ * Sets each added element's style bypass. Cytoscape skips a definition whose id an earlier one took, so the added
+ * collection is walked beside the definitions and a definition gets its bypass only when it is the next element.
+ * @param added - what cy.add returned, in definition order
+ * @param defs - the definitions, whose `data.id` cy.add filled in
+ * @param bypass - one bypass or null per definition
+ */
+function applyBypass(
+    added: CollectionReturnValue,
+    defs: ElementDefinition[],
+    bypass: readonly (Readonly<Record<string, string | number>> | null)[],
+): void {
+    let j = 0;
+    defs.forEach((def, i) => {
+        const ele = added[j];
+        if (ele?.id() !== def.data.id) {
+            return;
+        }
+        j++;
+        const b = bypass[i];
+        if (b !== null && b !== undefined) {
+            ele.style(b as never);
+        }
+    });
+}
+
 /**
  * Registers graphtyGenerate, graphtyDataset, graphtyImport and graphtyExport.
  * @param cytoscape - the cytoscape function
@@ -191,14 +217,12 @@ export function registerGraphData(cytoscape: Register): void {
                 ...(styled && options.importId === undefined ? { importId: freeImportId(this) } : {}),
             });
             const apply = options?.applyStyles === true && r.stylesheet !== undefined;
-            if (apply) {
-                r.bypass?.forEach((b, i) => {
-                    if (b !== null) {
-                        r.elements[i].style = b;
-                    }
-                });
-            }
             const elements = addTo(this, r.elements);
+            if (apply && r.bypass !== undefined) {
+                // Set after the add, not as the definition's `style`: Cytoscape 3.31 applies a creation-time
+                // bypass before the edge has its endpoints, and a `curve-style` there throws in parallelEdges().
+                applyBypass(elements, r.elements, r.bypass);
+            }
             const style = this.style() as unknown as AppendableStyle | undefined;
             if (apply && r.stylesheet !== undefined && style !== undefined) {
                 // appended rule by rule: a round trip through style.json() turns the core's own function-valued