@xyo-network/react-node-renderer 2.56.2 → 2.56.4

package/dist/esm/Cytoscape/CytoscapeElements.js

@@ -1,10 +1,12 @@
 import { ModuleWrapper } from '@xyo-network/module';
+import { NodeWrapper } from '@xyo-network/node';
 import { parseModuleType } from './lib';
 export class CytoscapeElements {
     static MaxNameLength = 20;
-    static async buildChild(wrapper, address) {
-        const [result] = await wrapper.resolveWrapped(ModuleWrapper, { address: [address] });
-        const description = await result.describe();
+    static async buildChild(node, address) {
+        const [result] = await node.downResolver.resolve({ address: [address] });
+        const wrapper = ModuleWrapper.wrap(result);
+        const description = await wrapper.describe();
         return CytoscapeElements.buildNode(description);
     }
     static buildEdge(rootNode, newNode) {
@@ -16,14 +18,14 @@ export class CytoscapeElements {
             },
         };
     }
-    static async buildElements(wrapper) {
+    static async buildElements(node) {
         try {
-            const [description, newRootNode] = await CytoscapeElements.buildRootNode(wrapper);
+            const [description, newRootNode] = await CytoscapeElements.buildRootNode(node);
             const newElements = [newRootNode];
             const children = description.children;
             await Promise.allSettled((children ?? [])?.map(async (address) => {
                 try {
-                    const newNode = await CytoscapeElements.buildChild(wrapper, address);
+                    const newNode = await CytoscapeElements.buildChild(node, address);
                     newElements.push(newNode);
                     const newEdge = CytoscapeElements.buildEdge(newRootNode, newNode);
                     newElements.push(newEdge);
@@ -48,8 +50,9 @@ export class CytoscapeElements {
             },
         };
     }
-    static buildRootNode = async (wrapper) => {
-        const description = await wrapper?.describe();
+    static buildRootNode = async (node) => {
+        const nodeWrapper = NodeWrapper.wrap(node);
+        const description = await nodeWrapper?.describe();
         return [description, CytoscapeElements.buildNode(description)];
     };
     static normalizeName(name) {

package/dist/esm/Cytoscape/CytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CytoscapeElements.js","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"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"}

package/dist/esm/components/ProvidedNodeRenderer.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useProvidedWrappedNode } from '@xyo-network/react-node';
+import { useWrappedProvidedNode } from '@xyo-network/react-node';
 import { useCytoscapeElements, useCytoscapeOptions } from '../hooks';
 import { NodeRelationalGraph } from './RelationalGraph';
 export const ProvidedNodeRenderer = ({ node, ...props }) => {
-    const [providedNode] = useProvidedWrappedNode();
+    const [providedNode] = useWrappedProvidedNode();
     const elements = useCytoscapeElements(node ?? providedNode);
     const options = useCytoscapeOptions(elements);
     return _jsx(NodeRelationalGraph, { alignItems: "stretch", flexGrow: 1, height: "100%", options: options, ...props });

package/dist/esm/hooks/cytoscape/useCytoscapeElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAI3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAAwB,EAAE,EAAE;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAA;IAEjE,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,IAAI,UAAU,EAAE;YACd,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,EAAE;YACd,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,EAAE,CAAA;YACpB,gBAAgB,EAAE,EAAE,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"useCytoscapeElements.js","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAI3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAA8B,EAAE,EAAE;IACrE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAsB,EAAE,CAAC,CAAA;IAEjE,cAAc;IACZ,uDAAuD;IACvD,KAAK,IAAI,EAAE;QACT,IAAI,UAAU,EAAE;YACd,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;YAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,UAAU,CAAC,CACb,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QACtE,IAAI,gBAAgB,GAAyC,SAAS,CAAA;QAEtE,IAAI,UAAU,EAAE;YACd,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YACF,gBAAgB,GAAG,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7E,WAAW,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;SACH;QAED,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,EAAE,CAAA;YACpB,gBAAgB,EAAE,EAAE,CAAA;QACtB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}

package/dist/types/Cytoscape/CytoscapeElements.d.ts

@@ -1,9 +1,9 @@
 import { ModuleDescription } from '@xyo-network/module';
-import { NodeWrapper } from '@xyo-network/node';
+import { NodeModule } from '@xyo-network/node';
 import { ElementDefinition } from 'cytoscape';
 export declare class CytoscapeElements {
     static MaxNameLength: number;
-    static buildChild(wrapper: NodeWrapper, address: string): Promise<ElementDefinition>;
+    static buildChild(node: NodeModule, address: string): Promise<ElementDefinition>;
     static buildEdge(rootNode: ElementDefinition, newNode: ElementDefinition): {
         data: {
             id: string;
@@ -11,9 +11,9 @@ export declare class CytoscapeElements {
             target: string | undefined;
         };
     };
-    static buildElements(wrapper: NodeWrapper): Promise<ElementDefinition[] | undefined>;
+    static buildElements(node: NodeModule): Promise<ElementDefinition[] | undefined>;
     static buildNode(description: ModuleDescription): ElementDefinition;
-    static buildRootNode: (wrapper: NodeWrapper) => Promise<[ModuleDescription, ElementDefinition]>;
+    static buildRootNode: (node: NodeModule) => Promise<[ModuleDescription, ElementDefinition]>;
     static normalizeName(name?: string): string | undefined;
 }
 //# sourceMappingURL=CytoscapeElements.d.ts.map

package/dist/types/Cytoscape/CytoscapeElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CytoscapeElements.d.ts","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,aAAa,SAAK;WAEZ,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM;IAM7D,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;;;;;;;WAU3D,aAAa,CAAC,OAAO,EAAE,WAAW;IAyB/C,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,iBAAiB,GAAG,iBAAiB;IAWnE,MAAM,CAAC,aAAa,YAAmB,WAAW,KAAG,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAGnG;IAED,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM;CAKnC"}
+{"version":3,"file":"CytoscapeElements.d.ts","sourceRoot":"","sources":["../../../src/Cytoscape/CytoscapeElements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,UAAU,EAAe,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAI7C,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,aAAa,SAAK;WAEZ,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAOzD,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;;;;;;;WAU3D,aAAa,CAAC,IAAI,EAAE,UAAU;IAyB3C,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,iBAAiB,GAAG,iBAAiB;IAWnE,MAAM,CAAC,aAAa,SAAgB,UAAU,KAAG,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAI/F;IAED,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM;CAKnC"}

package/dist/types/components/ProvidedNodeRenderer.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { NodeWrapper } from '@xyo-network/node';
+import { NodeModule } from '@xyo-network/node';
 import { NodeRelationalGraphProps } from './lib';
 export interface ProvidedNodeRendererProps extends NodeRelationalGraphProps {
-    node?: NodeWrapper;
+    node?: NodeModule;
 }
 export declare const ProvidedNodeRenderer: React.FC<ProvidedNodeRendererProps>;
 //# sourceMappingURL=ProvidedNodeRenderer.d.ts.map

package/dist/types/components/ProvidedNodeRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProvidedNodeRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAI/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAA;AAGhD,MAAM,WAAW,yBAA0B,SAAQ,wBAAwB;IACzE,IAAI,CAAC,EAAE,WAAW,CAAA;CACnB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAMpE,CAAA"}
+{"version":3,"file":"ProvidedNodeRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/ProvidedNodeRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAA;AAGhD,MAAM,WAAW,yBAA0B,SAAQ,wBAAwB;IACzE,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAMpE,CAAA"}

package/dist/types/hooks/cytoscape/useCytoscapeElements.d.ts

@@ -1,8 +1,8 @@
-import { NodeWrapper } from '@xyo-network/node';
+import { NodeModule } from '@xyo-network/node';
 import { ElementDefinition } from 'cytoscape';
 /**
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-export declare const useCytoscapeElements: (targetNode?: NodeWrapper) => ElementDefinition[];
+export declare const useCytoscapeElements: (targetNode?: NodeModule | null) => ElementDefinition[];
 //# sourceMappingURL=useCytoscapeElements.d.ts.map

package/dist/types/hooks/cytoscape/useCytoscapeElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,wBAoC5D,CAAA"}
+{"version":3,"file":"useCytoscapeElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/cytoscape/useCytoscapeElements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAK7C;;;GAGG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,UAAU,GAAG,IAAI,wBAoClE,CAAA"}

package/package.json

@@ -13,14 +13,14 @@
     "@xylabs/react-async-effect": "^2.17.6",
     "@xylabs/react-flexbox": "^2.17.6",
     "@xylabs/react-shared": "^2.17.6",
-    "@xyo-network/archivist-model": "^2.64.1",
-    "@xyo-network/diviner-model": "^2.64.1",
-    "@xyo-network/module": "^2.64.1",
-    "@xyo-network/node": "^2.64.1",
-    "@xyo-network/react-archivist": "^2.56.2",
-    "@xyo-network/react-module": "^2.56.2",
-    "@xyo-network/react-node": "^2.56.2",
-    "@xyo-network/react-shared": "^2.56.2",
+    "@xyo-network/archivist-model": "^2.64.3",
+    "@xyo-network/diviner-model": "^2.64.3",
+    "@xyo-network/module": "^2.64.3",
+    "@xyo-network/node": "^2.64.3",
+    "@xyo-network/react-archivist": "^2.56.4",
+    "@xyo-network/react-module": "^2.56.4",
+    "@xyo-network/react-node": "^2.56.4",
+    "@xyo-network/react-shared": "^2.56.4",
     "cytoscape": "^3.25.0"
   },
   "peerDependencies": {
@@ -33,20 +33,20 @@
     "react-router-dom": "^6"
   },
   "devDependencies": {
-    "@storybook/react": "^7.0.24",
+    "@storybook/react": "^7.0.25",
     "@types/cytoscape": "^3.19.10",
     "@types/react-dom": "^18.2.6",
-    "@xylabs/ts-scripts-yarn3": "^2.18.2",
-    "@xylabs/tsconfig-react": "^2.18.2",
-    "@xyo-network/archivist": "^2.64.1",
-    "@xyo-network/bridge": "^2.64.1",
-    "@xyo-network/id-plugin": "^2.64.1",
-    "@xyo-network/module": "^2.64.1",
-    "@xyo-network/node": "^2.64.1",
-    "@xyo-network/react-node": "^2.56.2",
-    "@xyo-network/react-storybook": "^2.56.2",
-    "@xyo-network/react-wallet": "^2.56.2",
-    "@xyo-network/sentinel": "^2.64.1",
+    "@xylabs/ts-scripts-yarn3": "^2.18.7",
+    "@xylabs/tsconfig-react": "^2.18.7",
+    "@xyo-network/archivist": "^2.64.3",
+    "@xyo-network/bridge": "^2.64.3",
+    "@xyo-network/id-plugin": "^2.64.3",
+    "@xyo-network/module": "^2.64.3",
+    "@xyo-network/node": "^2.64.3",
+    "@xyo-network/react-node": "^2.56.4",
+    "@xyo-network/react-storybook": "^2.56.4",
+    "@xyo-network/react-wallet": "^2.56.4",
+    "@xyo-network/sentinel": "^2.64.3",
     "typescript": "^5.1.6"
   },
   "description": "Common React library for all XYO projects that use React",
@@ -92,5 +92,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.56.2"
+  "version": "2.56.4"
 }

package/src/Cytoscape/CytoscapeElements.ts

@@ -1,5 +1,5 @@
 import { ModuleDescription, ModuleWrapper } from '@xyo-network/module'
-import { NodeWrapper } from '@xyo-network/node'
+import { NodeModule, NodeWrapper } from '@xyo-network/node'
 import { ElementDefinition } from 'cytoscape'
 
 import { parseModuleType } from './lib'
@@ -7,9 +7,10 @@ import { parseModuleType } from './lib'
 export class CytoscapeElements {
   static MaxNameLength = 20
 
-  static async buildChild(wrapper: NodeWrapper, address: string) {
-    const [result] = await wrapper.resolveWrapped(ModuleWrapper, { address: [address] })
-    const description = await result.describe()
+  static async buildChild(node: NodeModule, address: string) {
+    const [result] = await node.downResolver.resolve({ address: [address] })
+    const wrapper = ModuleWrapper.wrap(result)
+    const description = await wrapper.describe()
     return CytoscapeElements.buildNode(description)
   }
 
@@ -23,16 +24,16 @@ export class CytoscapeElements {
     }
   }
 
-  static async buildElements(wrapper: NodeWrapper) {
+  static async buildElements(node: NodeModule) {
     try {
-      const [description, newRootNode] = await CytoscapeElements.buildRootNode(wrapper)
+      const [description, newRootNode] = await CytoscapeElements.buildRootNode(node)
       const newElements: ElementDefinition[] = [newRootNode]
 
       const children = description.children
       await Promise.allSettled(
         (children ?? [])?.map(async (address) => {
           try {
-            const newNode = await CytoscapeElements.buildChild(wrapper, address)
+            const newNode = await CytoscapeElements.buildChild(node, address)
             newElements.push(newNode)
 
             const newEdge = CytoscapeElements.buildEdge(newRootNode, newNode)
@@ -59,8 +60,9 @@ export class CytoscapeElements {
     }
   }
 
-  static buildRootNode = async (wrapper: NodeWrapper): Promise<[ModuleDescription, ElementDefinition]> => {
-    const description = await wrapper?.describe()
+  static buildRootNode = async (node: NodeModule): Promise<[ModuleDescription, ElementDefinition]> => {
+    const nodeWrapper = NodeWrapper.wrap(node)
+    const description = await nodeWrapper?.describe()
     return [description, CytoscapeElements.buildNode(description)]
   }
 

package/src/components/ProvidedNodeRenderer.tsx

@@ -1,16 +1,16 @@
-import { NodeWrapper } from '@xyo-network/node'
-import { useProvidedWrappedNode } from '@xyo-network/react-node'
+import { NodeModule } from '@xyo-network/node'
+import { useWrappedProvidedNode } from '@xyo-network/react-node'
 
 import { useCytoscapeElements, useCytoscapeOptions } from '../hooks'
 import { NodeRelationalGraphProps } from './lib'
 import { NodeRelationalGraph } from './RelationalGraph'
 
 export interface ProvidedNodeRendererProps extends NodeRelationalGraphProps {
-  node?: NodeWrapper
+  node?: NodeModule
 }
 
 export const ProvidedNodeRenderer: React.FC<ProvidedNodeRendererProps> = ({ node, ...props }) => {
-  const [providedNode] = useProvidedWrappedNode()
+  const [providedNode] = useWrappedProvidedNode()
   const elements = useCytoscapeElements(node ?? providedNode)
   const options = useCytoscapeOptions(elements)
 

package/src/components/RelationalGraph.stories.tsx

@@ -4,12 +4,12 @@ import { useAsyncEffect } from '@xylabs/react-async-effect'
 import { MemoryArchivist, MemoryArchivistConfigSchema } from '@xyo-network/archivist'
 import { HttpBridge, HttpBridgeConfigSchema } from '@xyo-network/bridge'
 import { IdWitness, IdWitnessConfigSchema } from '@xyo-network/id-plugin'
-import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
-import { NodeProvider, useModule, useProvidedWrappedNode } from '@xyo-network/react-node'
+import { MemoryNode, NodeConfigSchema } from '@xyo-network/node'
+import { NodeProvider, useNodeFromNode, useWrappedProvidedNode } from '@xyo-network/react-node'
 import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 import { useWallet, WalletProvider } from '@xyo-network/react-wallet'
 import { MemorySentinel, SentinelConfigSchema } from '@xyo-network/sentinel'
-import { useMemo, useState } from 'react'
+import { useState } from 'react'
 
 import { useCytoscapeElements, useCytoscapeOptions } from '../hooks'
 import { ProvidedNodeRenderer } from './ProvidedNodeRenderer'
@@ -76,16 +76,15 @@ export default {
 const Template: StoryFn<typeof NodeRelationalGraph> = (props) => <NodeRelationalGraph {...props} />
 
 const TemplateDescribe: StoryFn<typeof NodeRelationalGraph> = (props) => {
-  const [node] = useProvidedWrappedNode()
+  const [node] = useWrappedProvidedNode()
   const elements = useCytoscapeElements(node)
   const options = useCytoscapeOptions(elements)
   return <NodeRelationalGraph options={options} {...props} />
 }
 
 const TemplateCustomAddress: StoryFn<typeof NodeRelationalGraph> = (props) => {
-  const [node] = useModule('ChildNode')
-  const wrappedNode = useMemo(() => (node ? NodeWrapper.wrap(node) : undefined), [node])
-  const elements = useCytoscapeElements(wrappedNode)
+  const [node] = useNodeFromNode('ChildNode')
+  const elements = useCytoscapeElements(node)
   const options = useCytoscapeOptions(elements)
   return <NodeRelationalGraph options={options} {...props} />
 }
@@ -93,9 +92,8 @@ const TemplateCustomAddress: StoryFn<typeof NodeRelationalGraph> = (props) => {
 const TemplateProvidedNodeRenderer: StoryFn<typeof ProvidedNodeRenderer> = (props) => <ProvidedNodeRenderer {...props} />
 
 const TemplateAttachDetach: StoryFn<typeof NodeRelationalGraph> = (props) => {
-  const [node] = useModule('ChildNode')
-  const wrappedNode = useMemo(() => (node ? NodeWrapper.wrap(node) : undefined), [node])
-  const elements = useCytoscapeElements(wrappedNode)
+  const [node] = useNodeFromNode('ChildNode')
+  const elements = useCytoscapeElements(node)
   const options = useCytoscapeOptions(elements)
   const [idWitness, setIdWitness] = useState<IdWitness>()
 
@@ -109,18 +107,18 @@ const TemplateAttachDetach: StoryFn<typeof NodeRelationalGraph> = (props) => {
   )
 
   const handleAddWitness = async () => {
-    if (wrappedNode && idWitness) {
-      const memoryNode = wrappedNode as NodeWrapper<MemoryNode>
-      await memoryNode.module.register(idWitness)
+    if (node && idWitness) {
+      const memoryNode = node as MemoryNode
+      await memoryNode.register(idWitness)
       await memoryNode.attach(idWitness.address, true)
     }
   }
 
   const handleRemoveWitness = async () => {
-    if (wrappedNode && idWitness) {
-      const memoryNode = wrappedNode as NodeWrapper<MemoryNode>
-      if (await (await memoryNode.registered()).includes(idWitness.address)) {
-        await memoryNode.module.unregister(idWitness)
+    if (node && idWitness) {
+      const memoryNode = node as MemoryNode
+      if (memoryNode.registered().includes(idWitness.address)) {
+        await memoryNode.unregister(idWitness)
       }
     }
   }

package/src/components/RelationalGraphEvents.stories.tsx

@@ -2,7 +2,7 @@ import { Decorator, Meta, StoryFn } from '@storybook/react'
 import { useAsyncEffect } from '@xylabs/react-async-effect'
 import { ArchivistConfigSchema, MemoryArchivist } from '@xyo-network/archivist'
 import { MemoryNode, NodeConfigSchema } from '@xyo-network/node'
-import { NodeProvider, useProvidedWrappedNode } from '@xyo-network/react-node'
+import { NodeProvider, useWrappedProvidedNode } from '@xyo-network/react-node'
 import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 import { useWallet, WalletProvider } from '@xyo-network/react-wallet'
 import { EventObject } from 'cytoscape'
@@ -49,7 +49,7 @@ export default {
 } as Meta
 
 const Template: StoryFn<typeof NodeRelationalGraph> = (props) => {
-  const [node] = useProvidedWrappedNode()
+  const [node] = useWrappedProvidedNode()
   const elements = useCytoscapeElements(node)
   const options = useCytoscapeOptions(elements)
 

package/src/hooks/cytoscape/useCytoscapeElements.ts

@@ -1,6 +1,6 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect'
 import { EventUnsubscribeFunction } from '@xyo-network/module'
-import { NodeWrapper } from '@xyo-network/node'
+import { NodeModule } from '@xyo-network/node'
 import { ElementDefinition } from 'cytoscape'
 import { useEffect, useState } from 'react'
 
@@ -10,7 +10,7 @@ import { CytoscapeElements } from '../../Cytoscape'
  * Note: Relies on describe but could eventually be converted to a discover call
  * Logic would be similar to what the bridge does
  */
-export const useCytoscapeElements = (targetNode?: NodeWrapper) => {
+export const useCytoscapeElements = (targetNode?: NodeModule | null) => {
   const [elements, setElements] = useState<ElementDefinition[]>([])
 
   useAsyncEffect(