@graphty/graph-io 0.3.40 → 0.3.41

package/src/formats/graphml/tree.ts

@@ -270,18 +270,7 @@ function writeElements(name: string, value: unknown, indent: string, out: string
         return;
     }
     const object = value as XmlTreeObject;
-    let attrs = "";
-    let text: string | null = null;
-    let hasChildren = false;
-    for (const [key, child] of Object.entries(object)) {
-        if (key === TEXT_KEY) {
-            text = scalarText(child);
-        } else if (key.startsWith(ATTRIBUTE_PREFIX)) {
-            attrs += ` ${key.slice(ATTRIBUTE_PREFIX.length)}="${escapeXmlAttribute(scalarText(child))}"`;
-        } else {
-            hasChildren = true;
-        }
-    }
+    const { attrs, text, hasChildren } = scanElement(object);
     if (!hasChildren) {
         out.push(
             text === null || text.length === 0
@@ -303,6 +292,27 @@ function writeElements(name: string, value: unknown, indent: string, out: string
     out.push(`\n${indent}</${name}>`);
 }
 
+/**
+ * Split an element object into its attribute text, its text content and whether it has children.
+ * @param object - the element object
+ * @returns the attribute text, the text content (null when absent) and the children flag
+ */
+function scanElement(object: XmlTreeObject): { attrs: string; text: string | null; hasChildren: boolean } {
+    let attrs = "";
+    let text: string | null = null;
+    let hasChildren = false;
+    for (const [key, child] of Object.entries(object)) {
+        if (key === TEXT_KEY) {
+            text = scalarText(child);
+        } else if (key.startsWith(ATTRIBUTE_PREFIX)) {
+            attrs += ` ${key.slice(ATTRIBUTE_PREFIX.length)}="${escapeXmlAttribute(scalarText(child))}"`;
+        } else {
+            hasChildren = true;
+        }
+    }
+    return { attrs, text, hasChildren };
+}
+
 /**
  * The text of a scalar tree value.
  * @param value - a string, number, boolean or null

package/src/formats/graphml/yfiles.ts

@@ -109,16 +109,7 @@ export function staleGraphicsRows(column: Column, table: Iterable<Column>, domai
     }
     let stale = 0;
     for (let r = 0; r < column.length; r++) {
-        const wants = new Set<string>();
-        for (const tree of trees) {
-            const want = graphicsValues(domain, tree.values[r]).find(([f]) => f === field);
-            if (want !== undefined) {
-                wants.add(JSON.stringify(want[1]));
-            }
-        }
-        if (wants.size === 0) {
-            wants.add(JSON.stringify(undefined));
-        }
+        const wants = wantedGraphics(trees, domain, field, r);
         const value = column.value(r);
         const have = column.meta.components > 1 && value !== undefined ? Array.from(value as ArrayLike<number>) : value;
         if (!wants.has(JSON.stringify(have))) {
@@ -128,6 +119,28 @@ export function staleGraphicsRows(column: Column, table: Iterable<Column>, domai
     return stale;
 }
 
+/**
+ * The serialized values the trees want for one row of a mapped column.
+ * @param trees - the yFiles tree columns of the table
+ * @param domain - node or edge
+ * @param field - the mapped field name
+ * @param r - the row
+ * @returns the wanted values as JSON text; just `undefined`'s when no tree wants one
+ */
+function wantedGraphics(trees: JsonColumn[], domain: "node" | "edge", field: string, r: number): Set<string> {
+    const wants = new Set<string>();
+    for (const tree of trees) {
+        const want = graphicsValues(domain, tree.values[r]).find(([f]) => f === field);
+        if (want !== undefined) {
+            wants.add(JSON.stringify(want[1]));
+        }
+    }
+    if (wants.size === 0) {
+        wants.add(JSON.stringify(undefined));
+    }
+    return wants;
+}
+
 /**
  * The mapped values of one `<data>` tree of a yFiles key: a ShapeNode's for a node, a
  * PolyLineEdge's for an edge; nothing for any other graphics (GenericNode, BezierEdge, ...).

package/src/formats/json/exporter.ts

@@ -1609,7 +1609,6 @@ function* writeCytoscape(snapshot: GraphSnapshot, p: Plan): Generator<string, vo
     const c: Cursor = { w: new JsonWriter(resolved.indent), ids: snapshot.ids, nonfinite: { count: 0 } };
     const { w } = c;
     const parentSlots: ReadonlySet<Slot> = new Set(["parent"]);
-    const positionSlots: ReadonlySet<Slot> = new Set(["cytoscapePosition"]);
     w.open("{");
     w.key("elements");
     w.open("{");
@@ -1625,18 +1624,7 @@ function* writeCytoscape(snapshot: GraphSnapshot, p: Plan): Generator<string, vo
         writeSlots(c, p.nodes, i, parentSlots);
         writeSlots(c, p.nodes, i, ATTRIBUTE_SLOTS);
         w.close("}");
-        for (const item of p.nodes) {
-            if (positionSlots.has(item.slot) && item.column.isSet(i)) {
-                const value = item.column.value(i) as ArrayLike<number>;
-                const f32 = item.column.dtype === "f32";
-                w.key("position");
-                w.open("{");
-                w.member("x", numberText(value[0], f32, c.nonfinite));
-                // stored y-up; Cytoscape's y grows downward
-                w.member("y", numberText(flipY(value[1]), f32, c.nonfinite));
-                w.close("}");
-            }
-        }
+        writeCytoscapePosition(c, p.nodes, i);
         writeSlots(c, p.nodes, i, ELEMENT_SLOTS);
         w.close("}");
         yield w.take();
@@ -1673,18 +1661,49 @@ function* writeCytoscape(snapshot: GraphSnapshot, p: Plan): Generator<string, vo
         w.key("data");
         writeGraphObject(c, p);
     }
-    const extra = resolved.shape.cytoscape;
-    if (extra !== undefined) {
-        for (const key of Object.keys(extra)) {
-            if (key !== "elements" && key !== "data") {
-                w.member(key, valueText(extra[key], false, c.nonfinite));
-            }
-        }
-    }
+    writeCytoscapeExtra(c, resolved.shape.cytoscape);
     w.close("}");
     yield w.take();
 }
 
+/**
+ * Write a node's `position` member (Cytoscape.js), when its position is set.
+ * @param c - the cursor
+ * @param items - the node plan items
+ * @param i - the node index
+ */
+function writeCytoscapePosition(c: Cursor, items: readonly ColumnPlan[], i: number): void {
+    const { w } = c;
+    for (const item of items) {
+        if (item.slot === "cytoscapePosition" && item.column.isSet(i)) {
+            const value = item.column.value(i) as ArrayLike<number>;
+            const f32 = item.column.dtype === "f32";
+            w.key("position");
+            w.open("{");
+            w.member("x", numberText(value[0], f32, c.nonfinite));
+            // stored y-up; Cytoscape's y grows downward
+            w.member("y", numberText(flipY(value[1]), f32, c.nonfinite));
+            w.close("}");
+        }
+    }
+}
+
+/**
+ * Write the extra top-level members of a Cytoscape.js document, beyond `elements` and `data`.
+ * @param c - the cursor
+ * @param extra - the extra members, when any
+ */
+function writeCytoscapeExtra(c: Cursor, extra: Readonly<Record<string, unknown>> | undefined): void {
+    if (extra === undefined) {
+        return;
+    }
+    for (const key of Object.keys(extra)) {
+        if (key !== "elements" && key !== "data") {
+            c.w.member(key, valueText(extra[key], false, c.nonfinite));
+        }
+    }
+}
+
 /**
  * A generator of canonical `e<index>` edge ids for the edges without one (design section 4.6),
  * skipping any text a node id or an explicit edge id already uses (Cytoscape ids share one