@xyo-network/react-node-renderer 2.71.8 → 2.71.10

package/package.json

@@ -23,10 +23,10 @@
     "@xyo-network/module-events": "^2.94.9",
     "@xyo-network/module-model": "^2.94.9",
     "@xyo-network/node-model": "^2.94.9",
-    "@xyo-network/react-archivist": "~2.71.8",
-    "@xyo-network/react-module": "~2.71.8",
-    "@xyo-network/react-node": "~2.71.8",
-    "@xyo-network/react-shared": "~2.71.8",
+    "@xyo-network/react-archivist": "~2.71.10",
+    "@xyo-network/react-module": "~2.71.10",
+    "@xyo-network/react-node": "~2.71.10",
+    "@xyo-network/react-shared": "~2.71.10",
     "@xyo-network/sentinel-model": "^2.94.9",
     "@xyo-network/witness-model": "^2.94.9",
     "cytoscape": "^3.28.1",
@@ -52,8 +52,8 @@
     "@xyo-network/http-bridge": "^2.94.9",
     "@xyo-network/id-plugin": "^2.91.4",
     "@xyo-network/node-memory": "^2.94.9",
-    "@xyo-network/react-storybook": "~2.71.8",
-    "@xyo-network/react-wallet": "~2.71.8",
+    "@xyo-network/react-storybook": "~2.71.10",
+    "@xyo-network/react-wallet": "~2.71.10",
     "@xyo-network/sentinel": "^2.94.9",
     "typescript": "^5.4.3"
   },
@@ -108,6 +108,6 @@
   },
   "sideEffects": false,
   "types": "dist/browser/index.d.ts",
-  "version": "2.71.8",
+  "version": "2.71.10",
   "type": "module"
 }

package/src/Cytoscape/CytoscapeElements.ts

@@ -6,37 +6,34 @@ import { parseModuleType } from './lib'
 
 interface ModuleInfo {
   children: ModuleInfo[]
+  depth: number
   module: ModuleInstance
 }
 
 export const CytoscapeElements = {
   MaxNameLength: 20,
 
-  buildEdge(rootNode: ElementDefinition, newNode: ElementDefinition) {
+  buildEdge(rootNode: ElementDefinition, newNode: ElementDefinition, properties?: { [key: string]: unknown }) {
     return {
       data: {
         id: `${rootNode.data.id}/${newNode.data.id}`,
         source: rootNode.data.id,
         target: newNode.data.id,
+        ...properties,
       },
     }
   },
 
   async buildElements(module: ModuleInstance): Promise<ElementDefinition[]> {
     const info = await CytoscapeElements.recurseNodes(module)
-    const newElements: ElementDefinition[] = await this.buildElementsFromInfo(info, undefined, undefined, ['activeNode'])
+    const newElements: ElementDefinition[] = await this.buildElementsFromInfo(info, undefined, ['activeNode'])
 
     return newElements
   },
 
-  async buildElementsFromInfo(
-    info: ModuleInfo,
-    root?: ElementDefinition,
-    properties: { [key: string]: unknown } = {},
-    classes: string[] = [],
-  ): Promise<ElementDefinition[]> {
-    const newNode = CytoscapeElements.buildNode(info.module, properties, classes)
-    const newEdge = root ? CytoscapeElements.buildEdge(root, newNode) : undefined
+  async buildElementsFromInfo(info: ModuleInfo, root?: ElementDefinition, classes: string[] = []): Promise<ElementDefinition[]> {
+    const newNode = CytoscapeElements.buildNode(info.module, { childCount: info.children.length, depth: info.depth }, classes)
+    const newEdge = root ? CytoscapeElements.buildEdge(root, newNode, { depth: info.depth, siblingCount: info.children.length }) : undefined
     const newElements: ElementDefinition[] = [newNode]
     if (newEdge) {
       newElements.push(newEdge)
@@ -73,8 +70,8 @@ export const CytoscapeElements = {
     return name
   },
 
-  async recurseNodes(root: ModuleInstance, maxDepth = 10): Promise<ModuleInfo> {
-    const info: ModuleInfo = { children: [], module: root }
+  async recurseNodes(root: ModuleInstance, maxDepth = 10, depth = 1): Promise<ModuleInfo> {
+    const info: ModuleInfo = { children: [], depth, module: root }
 
     if (maxDepth > 0) {
       const children = await root.resolve('*', { direction: 'down', maxDepth: 1 })
@@ -82,7 +79,7 @@ export const CytoscapeElements = {
         await Promise.all(
           children.map(async (child) => {
             if (child.address !== root.address) {
-              return await this.recurseNodes(child, maxDepth - 1)
+              return await this.recurseNodes(child, maxDepth - 1, depth + 1)
               // don't re add the root module that was passed in
             }
           }),