@xyo-network/react-node 2.60.8 → 2.60.10

package/dist/esm/hooks/useModuleFromNode.js

@@ -1,40 +1,46 @@
 import { usePromise } from '@xylabs/react-promise';
 import { asModuleInstance } from '@xyo-network/module';
+import { isModuleInstance } from '@xyo-network/module-model';
 import { useState } from 'react';
 import { useModuleFilterOptions } from './useModuleFilterOptions';
 import { useNode } from './useNode';
 export const useModuleFromNodeConfigLogger = (config) => {
     return config?.logger;
 };
-export const useModuleFromNode = (nameOrAddress, config) => {
+export const useModuleFromNode = (nameOrAddressOrInstance, config) => {
     const [node, nodeError] = useNode(config);
     const logger = useModuleFromNodeConfigLogger(config);
     const filterOptions = useModuleFilterOptions(config);
     const [result, setResult] = useState();
     const [, error] = usePromise(async () => {
         logger?.debug('useModuleFromNode: resolving');
-        if (node && nameOrAddress) {
+        if (node && nameOrAddressOrInstance) {
             node.on('moduleAttached', ({ module }) => {
                 logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`);
-                if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+                if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
                     setResult(asModuleInstance(module));
                 }
             });
             node.on('moduleDetached', ({ module }) => {
                 logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`);
-                if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+                if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
                     setResult(undefined);
                 }
             });
-            const result = await node.resolve(nameOrAddress, filterOptions);
-            logger?.debug(`Result: ${result?.address}`);
-            setResult(result);
+            if (isModuleInstance(nameOrAddressOrInstance)) {
+                setResult(nameOrAddressOrInstance);
+            }
+            else {
+                const result = await node.resolve(nameOrAddressOrInstance, filterOptions);
+                logger?.debug(`Result: ${result?.address}`);
+                setResult(result);
+            }
             return result;
         }
         logger?.debug('Result: No Node');
         return undefined;
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [node, nameOrAddress]);
+    }, [node, nameOrAddressOrInstance]);
     return [result, nodeError ?? error];
 };
 //# sourceMappingURL=useModuleFromNode.js.map

package/dist/esm/hooks/useModuleFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAOnC,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAA6B,EAAE,EAAE;IAC7E,OAAO,MAAM,EAAE,MAAM,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAmD,EAAE;IAC1I,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAA8B,CAAA;IAClE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACtC,MAAM,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,IAAI,IAAI,IAAI,aAAa,EAAE;YACzB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACvC,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;iBACpC;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACvC,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;YACH,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;YAC/D,MAAM,EAAE,KAAK,CAAC,WAAW,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;YAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;SACd;QACD,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;QAChB,uDAAuD;IACzD,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAA;IACzB,OAAO,CAAC,MAAM,EAAE,SAAS,IAAI,KAAK,CAAC,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAuC,MAAM,2BAA2B,CAAA;AAEjG,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAOnC,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAA6B,EAAE,EAAE;IAC7E,OAAO,MAAM,EAAE,MAAM,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,uBAAiD,EACjD,MAA6B,EACoB,EAAE;IACnD,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACpD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAA8B,CAAA;IAClE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACtC,MAAM,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,IAAI,IAAI,IAAI,uBAAuB,EAAE;YACnC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACvC,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,uBAAuB,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,uBAAuB,EAAE;oBACjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;iBACpC;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACvC,MAAM,EAAE,KAAK,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,uBAAuB,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,uBAAuB,EAAE;oBACjG,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;YACH,CAAC,CAAC,CAAA;YACF,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,EAAE;gBAC7C,SAAS,CAAC,uBAAuB,CAAC,CAAA;aACnC;iBAAM;gBACL,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAA;gBACzE,MAAM,EAAE,KAAK,CAAC,WAAW,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;gBAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;YACD,OAAO,MAAM,CAAA;SACd;QACD,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;QAChB,uDAAuD;IACzD,CAAC,EAAE,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAA;IACnC,OAAO,CAAC,MAAM,EAAE,SAAS,IAAI,KAAK,CAAC,CAAA;AACrC,CAAC,CAAA"}

package/dist/esm/hooks/useNodeFromNode.js

@@ -1,7 +1,7 @@
 import { asNodeInstance } from '@xyo-network/node-model';
 import { useModuleFromNode } from './useModuleFromNode';
-export const useNodeFromNode = (nameOrAddress, config) => {
-    const [module, error] = useModuleFromNode(nameOrAddress, config);
+export const useNodeFromNode = (nameOrAddressOrInstance, config) => {
+    const [module, error] = useModuleFromNode(nameOrAddressOrInstance, config);
     const instance = asNodeInstance(module);
     if (module && !instance) {
         const error = Error(`Resolved module is not a NodeInstance [${module.config?.schema}:${module.config?.name}:${module.address}]`);

package/dist/esm/hooks/useNodeFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAwB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAiD,EAAE;IACtI,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,0CAA0C,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;QAChI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
+{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAwB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,uBAA+C,EAC/C,MAA6B,EACkB,EAAE;IACjD,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAA;IAC1E,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,0CAA0C,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;QAChI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}

package/dist/types/hooks/useModuleFromNode.d.ts

@@ -6,5 +6,5 @@ export type ModuleFromNodeConfig = ModuleFilterOptions & {
     node?: NodeInstance | string;
 };
 export declare const useModuleFromNodeConfigLogger: (config?: ModuleFromNodeConfig) => Logger | undefined;
-export declare const useModuleFromNode: (nameOrAddress?: string, config?: ModuleFromNodeConfig) => [ModuleInstance | undefined, Error | undefined];
+export declare const useModuleFromNode: (nameOrAddressOrInstance?: string | ModuleInstance, config?: ModuleFromNodeConfig) => [ModuleInstance | undefined, Error | undefined];
 //# sourceMappingURL=useModuleFromNode.d.ts.map

package/dist/types/hooks/useModuleFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAMtD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,6BAA6B,YAAa,oBAAoB,uBAE1E,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA8BvI,CAAA"}
+{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAMtD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,6BAA6B,YAAa,oBAAoB,uBAE1E,CAAA;AAED,eAAO,MAAM,iBAAiB,6BACF,MAAM,GAAG,cAAc,WACxC,oBAAoB,KAC5B,CAAC,cAAc,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAkChD,CAAA"}

package/dist/types/hooks/useNodeFromNode.d.ts

@@ -1,4 +1,4 @@
 import { NodeInstance } from '@xyo-network/node-model';
 import { ModuleFromNodeConfig } from './useModuleFromNode';
-export declare const useNodeFromNode: (nameOrAddress?: string, config?: ModuleFromNodeConfig) => [NodeInstance | undefined, Error | undefined];
+export declare const useNodeFromNode: (nameOrAddressOrInstance?: string | NodeInstance, config?: ModuleFromNodeConfig) => [NodeInstance | undefined, Error | undefined];
 //# sourceMappingURL=useNodeFromNode.d.ts.map

package/dist/types/hooks/useNodeFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNodeFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,oBAAoB,EAAqB,MAAM,qBAAqB,CAAA;AAE7E,eAAO,MAAM,eAAe,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,YAAY,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CASnI,CAAA"}
+{"version":3,"file":"useNodeFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,oBAAoB,EAAqB,MAAM,qBAAqB,CAAA;AAE7E,eAAO,MAAM,eAAe,6BACA,MAAM,GAAG,YAAY,WACtC,oBAAoB,KAC5B,CAAC,YAAY,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAS9C,CAAA"}

package/package.json

@@ -15,21 +15,21 @@
     "@xylabs/react-flexbox": "~2.17.15",
     "@xylabs/react-promise": "~2.17.15",
     "@xylabs/react-shared": "~2.17.15",
-    "@xyo-network/logger": "^2.72.5",
-    "@xyo-network/module": "^2.72.5",
-    "@xyo-network/module-model": "^2.72.5",
-    "@xyo-network/node-model": "^2.72.5",
-    "@xyo-network/react-node-context": "~2.60.8",
-    "@xyo-network/react-node-provider": "~2.60.8"
+    "@xyo-network/logger": "^2.72.7",
+    "@xyo-network/module": "^2.72.7",
+    "@xyo-network/module-model": "^2.72.7",
+    "@xyo-network/node-model": "^2.72.7",
+    "@xyo-network/react-node-context": "~2.60.10",
+    "@xyo-network/react-node-provider": "~2.60.10"
   },
   "devDependencies": {
     "@storybook/react": "^7.4.0",
     "@xylabs/ts-scripts-yarn3": "^2.19.3",
     "@xylabs/tsconfig-react": "^2.19.3",
-    "@xyo-network/node-memory": "^2.72.5",
-    "@xyo-network/payload-model": "^2.72.5",
-    "@xyo-network/react-storybook": "~2.60.8",
-    "@xyo-network/react-wallet": "~2.60.8",
+    "@xyo-network/node-memory": "^2.72.7",
+    "@xyo-network/payload-model": "^2.72.7",
+    "@xyo-network/react-storybook": "~2.60.10",
+    "@xyo-network/react-wallet": "~2.60.10",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
@@ -84,5 +84,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.60.8"
+  "version": "2.60.10"
 }

package/src/hooks/useModuleFromNode.ts

@@ -1,7 +1,7 @@
 import { usePromise } from '@xylabs/react-promise'
 import { Logger } from '@xyo-network/logger'
 import { asModuleInstance } from '@xyo-network/module'
-import { ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model'
+import { isModuleInstance, ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model'
 import { NodeInstance } from '@xyo-network/node-model'
 import { useState } from 'react'
 
@@ -17,34 +17,41 @@ export const useModuleFromNodeConfigLogger = (config?: ModuleFromNodeConfig) =>
   return config?.logger
 }
 
-export const useModuleFromNode = (nameOrAddress?: string, config?: ModuleFromNodeConfig): [ModuleInstance | undefined, Error | undefined] => {
+export const useModuleFromNode = (
+  nameOrAddressOrInstance?: string | ModuleInstance,
+  config?: ModuleFromNodeConfig,
+): [ModuleInstance | undefined, Error | undefined] => {
   const [node, nodeError] = useNode(config)
   const logger = useModuleFromNodeConfigLogger(config)
   const filterOptions = useModuleFilterOptions(config)
   const [result, setResult] = useState<ModuleInstance | undefined>()
   const [, error] = usePromise(async () => {
     logger?.debug('useModuleFromNode: resolving')
-    if (node && nameOrAddress) {
+    if (node && nameOrAddressOrInstance) {
       node.on('moduleAttached', ({ module }) => {
         logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`)
-        if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+        if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
           setResult(asModuleInstance(module))
         }
       })
       node.on('moduleDetached', ({ module }) => {
         logger?.debug(`useModuleFromNode: moduleDetached [${module.config.name ?? module.address}]`)
-        if (module.address === nameOrAddress || module.config?.name === nameOrAddress) {
+        if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
           setResult(undefined)
         }
       })
-      const result = await node.resolve(nameOrAddress, filterOptions)
-      logger?.debug(`Result: ${result?.address}`)
-      setResult(result)
+      if (isModuleInstance(nameOrAddressOrInstance)) {
+        setResult(nameOrAddressOrInstance)
+      } else {
+        const result = await node.resolve(nameOrAddressOrInstance, filterOptions)
+        logger?.debug(`Result: ${result?.address}`)
+        setResult(result)
+      }
       return result
     }
     logger?.debug('Result: No Node')
     return undefined
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [node, nameOrAddress])
+  }, [node, nameOrAddressOrInstance])
   return [result, nodeError ?? error]
 }

package/src/hooks/useNodeFromNode.tsx

@@ -2,8 +2,11 @@ import { asNodeInstance, NodeInstance } from '@xyo-network/node-model'
 
 import { ModuleFromNodeConfig, useModuleFromNode } from './useModuleFromNode'
 
-export const useNodeFromNode = (nameOrAddress?: string, config?: ModuleFromNodeConfig): [NodeInstance | undefined, Error | undefined] => {
-  const [module, error] = useModuleFromNode(nameOrAddress, config)
+export const useNodeFromNode = (
+  nameOrAddressOrInstance?: string | NodeInstance,
+  config?: ModuleFromNodeConfig,
+): [NodeInstance | undefined, Error | undefined] => {
+  const [module, error] = useModuleFromNode(nameOrAddressOrInstance, config)
   const instance = asNodeInstance(module)
   if (module && !instance) {
     const error = Error(`Resolved module is not a NodeInstance [${module.config?.schema}:${module.config?.name}:${module.address}]`)