@xyo-network/react-node 2.45.0-rc.9 → 2.45.0

package/dist/cjs/hooks/index.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./useArchiveArchivists"), exports);
-tslib_1.__exportStar(require("./useArchivistModule"), exports);
-tslib_1.__exportStar(require("./useArchivistModules"), exports);
-tslib_1.__exportStar(require("./useDivinerModule"), exports);
-tslib_1.__exportStar(require("./useDivinerModules"), exports);
 tslib_1.__exportStar(require("./useMemoryNodeUpdates"), exports);
 tslib_1.__exportStar(require("./useModule"), exports);
-tslib_1.__exportStar(require("./useModuleAddresses"), exports);
 tslib_1.__exportStar(require("./useModules"), exports);
 tslib_1.__exportStar(require("./useNode"), exports);
-tslib_1.__exportStar(require("./useNodeQueryDiviner"), exports);
+tslib_1.__exportStar(require("./useNodeAttachedAddresses"), exports);
 tslib_1.__exportStar(require("./useProvidedNode"), exports);
-tslib_1.__exportStar(require("./useWitnessModule"), exports);
-tslib_1.__exportStar(require("./useWitnessModules"), exports);
+tslib_1.__exportStar(require("./useWrappedModule"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,+DAAoC;AACpC,gEAAqC;AACrC,6DAAkC;AAClC,8DAAmC;AACnC,iEAAsC;AACtC,sDAA2B;AAC3B,+DAAoC;AACpC,uDAA4B;AAC5B,oDAAyB;AACzB,gEAAqC;AACrC,4DAAiC;AACjC,6DAAkC;AAClC,8DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,sDAA2B;AAC3B,uDAA4B;AAC5B,oDAAyB;AACzB,qEAA0C;AAC1C,4DAAiC;AACjC,6DAAkC"}

package/dist/cjs/hooks/useMemoryNodeUpdates.js

@@ -8,7 +8,7 @@ const useMemoryNodeUpdates = (refreshAddresses) => {
     const [module, setModule] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         if (node) {
-            const onFunc = node.on;
+            const onFunc = node.module.on;
             onFunc('moduleAttached', (args) => {
                 if (refreshAddresses) {
                     if (refreshAddresses.some((address) => address === (args === null || args === void 0 ? void 0 : args.module.address)))

package/dist/cjs/hooks/useMemoryNodeUpdates.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":";;;AAEA,iCAA2C;AAE3C,uCAAmC;AAQ5B,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA2B,CAAA;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,EAAsC,CAAA;YAC1D,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,OAAO,CAAA,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,oBAAoB,wBAoBhC"}
+{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":";;;AAEA,iCAA2C;AAE3C,uCAAmC;AAQ5B,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA2B,CAAA;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAsC,CAAA;YACjE,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,OAAO,CAAA,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,oBAAoB,wBAoBhC"}

package/dist/cjs/hooks/useModule.js

@@ -1,7 +1,75 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModule = void 0;
-const module_1 = require("@xyo-network/module");
-const useNode_1 = require("./useNode");
-exports.useModule = (0, useNode_1.createUseModuleHook)((module) => module_1.ModuleWrapper.wrap(module), useNode_1.useNode);
+const tslib_1 = require("tslib");
+const react_shared_1 = require("@xylabs/react-shared");
+const react_1 = require("react");
+const useProvidedNode_1 = require("./useProvidedNode");
+const useModule = (nameOrAddressOrFilter, account) => {
+    const nameOrAddress = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
+    const filter = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)(account);
+    const [module, setModule] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
+    const address = module === null || module === void 0 ? void 0 : module.address;
+    (0, react_shared_1.useAsyncEffect)(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        try {
+            if (nodeError) {
+                setError(nodeError);
+                setModule(undefined);
+            }
+            else {
+                if (node) {
+                    const attachEmitter = node.module;
+                    const detachEmitter = node.module;
+                    const attachHandler = (args) => {
+                        const eventModule = args.module;
+                        if (nameOrAddress && (eventModule.address === nameOrAddress || (eventModule === null || eventModule === void 0 ? void 0 : eventModule.config.name) === nameOrAddress) && mounted()) {
+                            setModule(eventModule);
+                            setError(undefined);
+                        }
+                    };
+                    const detachHandler = (args) => {
+                        const eventModule = args.module;
+                        if (eventModule.address === address && mounted()) {
+                            setModule(undefined);
+                            setError(undefined);
+                        }
+                    };
+                    const module = nameOrAddress
+                        ? yield node.resolve(nameOrAddress)
+                        : (yield node.resolve(filter)).pop();
+                    if (mounted()) {
+                        attachEmitter.on('moduleAttached', attachHandler, true);
+                        detachEmitter.on('moduleDetached', detachHandler, true);
+                        detachEmitter.on('moduleDetached', detachHandler);
+                        attachEmitter.on('moduleAttached', attachHandler);
+                        setModule(module);
+                        setError(undefined);
+                    }
+                    return () => {
+                        //remove the event handler on unmount
+                        attachEmitter.on('moduleAttached', attachHandler, true);
+                        detachEmitter.on('moduleDetached', detachHandler, true);
+                    };
+                }
+                else {
+                    setError(undefined);
+                    setModule(undefined);
+                }
+            }
+        }
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                setError(error);
+                setModule(undefined);
+            }
+        }
+    }), [nameOrAddress, node, nodeError, address, filter]);
+    return [module, error];
+};
+exports.useModule = useModule;
 //# sourceMappingURL=useModule.js.map

package/dist/cjs/hooks/useModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":";;;AAAA,gDAA2D;AAE3D,uCAAwD;AAE3C,QAAA,SAAS,GAAG,IAAA,6BAAmB,EAAwB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,iBAAO,CAAC,CAAA"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/hooks/useModules.js

@@ -6,17 +6,40 @@ const react_shared_1 = require("@xylabs/react-shared");
 const react_1 = require("react");
 const useProvidedNode_1 = require("./useProvidedNode");
 const useModules = (filter) => {
-    const [node] = (0, useProvidedNode_1.useProvidedNode)(true);
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)();
     const [modules, setModules] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const modules = yield (node === null || node === void 0 ? void 0 : node.resolve(filter));
-        if (mounted()) {
-            setModules(modules);
+        try {
+            if (nodeError) {
+                setError(nodeError);
+                setModules(undefined);
+            }
+            else {
+                if (node) {
+                    const modules = yield node.resolve(filter);
+                    if (mounted()) {
+                        setModules(modules);
+                        setError(undefined);
+                    }
+                }
+                else {
+                    setError(undefined);
+                    setModules(undefined);
+                }
+            }
         }
-    }), [filter, node]);
-    return modules;
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                setError(error);
+                setModules(undefined);
+            }
+        }
+    }), [filter, node, nodeError]);
+    return [modules, error];
 };
 exports.useModules = useModules;
 //# sourceMappingURL=useModules.js.map

package/dist/cjs/hooks/useModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iCAAgC;AAEhC,uDAAmD;AAE5C,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,CAAA;IACpC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAO,CAAA;IAE7C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAI,MAAM,CAAC,CAAA,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,CAAA,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAhBY,QAAA,UAAU,cAgBtB"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iCAAgC;AAEhC,uDAA0D;AAEnD,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAA8C,EAAE;IAC/H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,wCAAsB,GAAE,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAa,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;oBAC1E,IAAI,OAAO,EAAE,EAAE;wBACb,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;SACF;IACH,CAAC,CAAA,EACD,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAC1B,CAAA;IAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA;AApCY,QAAA,UAAU,cAoCtB"}

package/dist/cjs/hooks/useNode.js

@@ -1,62 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useNode = exports.createUseModuleHook = void 0;
-const tslib_1 = require("tslib");
-/* eslint-disable react-hooks/rules-of-hooks */
-const react_shared_1 = require("@xylabs/react-shared");
+exports.useNode = void 0;
 const node_1 = require("@xyo-network/node");
 const react_1 = require("react");
+const useModule_1 = require("./useModule");
 const useProvidedNode_1 = require("./useProvidedNode");
-const createUseModuleHook = (wrapFunc, nodeFunc) => {
-    function use(nameOrAddressOrWrapOrAccount, wrap = false) {
-        const [node, nodeError] = nodeFunc();
-        const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap;
-        const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap;
-        const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined;
-        const [module, setModule] = (0, react_1.useState)();
-        const [error, setError] = (0, react_1.useState)();
-        (0, react_shared_1.useAsyncEffect)(
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        (mounted) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                if (nodeError) {
-                    console.log(`Setting NodeError [${nodeError.message}]`);
-                    setError(nodeError);
-                    setModule(undefined);
-                }
-                else {
-                    const wrappedNode = node_1.NodeWrapper.wrap(node);
-                    if (wrappedNode) {
-                        const module = nameOrAddress
-                            ? yield (wrappedNode === null || wrappedNode === void 0 ? void 0 : wrappedNode.resolve(nameOrAddress))
-                            : (yield wrappedNode.resolve()).pop();
-                        const finalModule = shouldWrap ? wrapFunc(module, account) : module;
-                        if (mounted()) {
-                            console.log(`Setting Module [${finalModule === null || finalModule === void 0 ? void 0 : finalModule.address}]`);
-                            setModule(finalModule);
-                            setError(undefined);
-                        }
-                    }
-                    else {
-                        console.log('Setting All to undefined');
-                        setError(undefined);
-                        setModule(undefined);
-                    }
-                }
+//AT: intentionally not exported
+const useNodeModule = (nameOrAddress) => {
+    const [providedNode] = (0, useProvidedNode_1.useProvidedNode)();
+    const [node, nodeError] = (0, useModule_1.useModule)(nameOrAddress);
+    if (nameOrAddress) {
+        if (providedNode) {
+            return [node, nodeError];
+        }
+        else {
+            return [providedNode, undefined];
+        }
+    }
+    else {
+        return [providedNode, undefined];
+    }
+};
+const useNode = (nameOrAddress, account) => {
+    const [node, nodeError] = useNodeModule(nameOrAddress);
+    const [wrapper, setWrapper] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
+    (0, react_1.useEffect)(() => {
+        if (node) {
+            if (nodeError) {
+                setError(nodeError);
+                setWrapper(undefined);
             }
-            catch (ex) {
-                if (mounted()) {
-                    const error = ex;
-                    console.log(`Setting Error [${error.message}]`);
-                    setError(error);
-                    setModule(undefined);
+            else {
+                try {
+                    const wrapper = node_1.NodeWrapper.wrap(node, account);
+                    setWrapper(wrapper);
+                    setError(undefined);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
                 }
             }
-        }), [wrap, node, nameOrAddress, nodeError, shouldWrap, account]);
-        return [module, error];
-    }
-    return use;
+        }
+        else {
+            setWrapper(undefined);
+            setError(undefined);
+        }
+    }, [node, account, nodeError]);
+    return [wrapper, error];
 };
-exports.createUseModuleHook = createUseModuleHook;
-exports.useNode = (0, exports.createUseModuleHook)((module) => node_1.NodeWrapper.wrap(module), useProvidedNode_1.useProvidedNode);
+exports.useNode = useNode;
 //# sourceMappingURL=useNode.js.map

package/dist/cjs/hooks/useNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,iCAA2C;AAE3C,2CAAuC;AACvC,uDAAmD;AAEnD,gCAAgC;AAChC,MAAM,aAAa,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC5F,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,iCAAe,GAAE,CAAA;IACxC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,qBAAS,EAAC,aAAa,CAAC,CAAA;IAElD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,IAAkB,EAAE,SAAS,CAAC,CAAA;SACvC;aAAM;YACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;SACjC;KACF;SAAM;QACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;KACjC;AACH,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAgD,EAAE;IACzH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,aAAa,CAAC,aAAa,CAAC,CAAA;IACtD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACrD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI;oBACF,MAAM,OAAO,GAAG,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBAC/C,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;SACF;aAAM;YACL,UAAU,CAAC,SAAS,CAAC,CAAA;YACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;SACpB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;IAE9B,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA;AA3BY,QAAA,OAAO,WA2BnB"}

package/dist/cjs/hooks/{useModuleAddresses.js → useNodeAttachedAddresses.js}

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useModuleAddresses = void 0;
+exports.useNodeAttachedAddresses = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
 const react_1 = require("react");
-const useProvidedNode_1 = require("./useProvidedNode");
-const useModuleAddresses = () => {
-    const [node] = (0, useProvidedNode_1.useProvidedNode)();
-    const [attachedAddresses, setAttachedAddresses] = (0, react_1.useState)();
+const useNode_1 = require("./useNode");
+const useNodeAttachedAddresses = () => {
+    const [node] = (0, useNode_1.useNode)();
+    const [addresses, setAddresses] = (0, react_1.useState)();
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const attached = yield (node === null || node === void 0 ? void 0 : node.attached());
         if (mounted()) {
-            setAttachedAddresses(attached);
+            setAddresses(attached);
         }
     }), [node]);
-    return [attachedAddresses, node === null || node === void 0 ? void 0 : node.registered()];
+    return [addresses, node === null || node === void 0 ? void 0 : node.registered()];
 };
-exports.useModuleAddresses = useModuleAddresses;
-//# sourceMappingURL=useModuleAddresses.js.map
+exports.useNodeAttachedAddresses = useNodeAttachedAddresses;
+//# sourceMappingURL=useNodeAttachedAddresses.js.map

package/dist/cjs/hooks/useNodeAttachedAddresses.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNodeAttachedAddresses.js","sourceRoot":"","sources":["../../../src/hooks/useNodeAttachedAddresses.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AACrD,iCAAgC;AAEhC,uCAAmC;AAE5B,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IAEtD,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,CAAA,CAAA;QACvC,IAAI,OAAO,EAAE,EAAE;YACb,YAAY,CAAC,QAAQ,CAAC,CAAA;SACvB;IACH,CAAC,CAAA,EACD,CAAC,IAAI,CAAC,CACP,CAAA;IAED,OAAO,CAAC,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE,CAAC,CAAA;AACxC,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}

package/dist/cjs/hooks/useProvidedNode.js

@@ -1,25 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useProvidedNode = void 0;
+exports.useProvidedWrappedNode = exports.useProvidedNode = void 0;
 const node_1 = require("@xyo-network/node");
+const react_wallet_1 = require("@xyo-network/react-wallet");
 const react_1 = require("react");
 const contexts_1 = require("../contexts");
-function useProvidedNodeFunc(wrap) {
+const useProvidedNode = () => {
     const { node } = (0, react_1.useContext)(contexts_1.NodeContext);
+    return [node];
+};
+exports.useProvidedNode = useProvidedNode;
+const useProvidedWrappedNode = (account) => {
+    const [providedAccount] = (0, react_wallet_1.useAccount)();
+    const [node] = (0, exports.useProvidedNode)();
     const [wrappedNode, setWrappedNode] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
-    try {
-        if (wrap) {
-            const account = typeof wrap === 'boolean' ? undefined : wrap;
-            const wrappedNode = wrap ? node_1.NodeWrapper.wrap(node, account) : undefined;
-            setWrappedNode(wrappedNode);
-            setError(undefined);
-        }
-    }
-    catch (ex) {
-        setError(ex);
+    const accountToUse = (0, react_1.useMemo)(() => account !== null && account !== void 0 ? account : providedAccount, [account, providedAccount]);
+    if (!accountToUse) {
+        const error = Error('useProvidedWrappedNode requires either an Account context or account parameter');
+        console.error(error.message);
+        setError(error);
     }
-    return [wrap ? wrappedNode : node, error];
-}
-exports.useProvidedNode = useProvidedNodeFunc;
+    (0, react_1.useEffect)(() => {
+        try {
+            if (node && accountToUse) {
+                setWrappedNode(node_1.NodeWrapper.wrap(node, account));
+                setError(undefined);
+            }
+        }
+        catch (ex) {
+            setWrappedNode(undefined);
+            setError(ex);
+        }
+    }, [node, account, accountToUse]);
+    return [wrappedNode, error];
+};
+exports.useProvidedWrappedNode = useProvidedWrappedNode;
 //# sourceMappingURL=useProvidedNode.js.map

package/dist/cjs/hooks/useProvidedNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,iCAA4C;AAE5C,0CAAyC;AAKzC,SAAS,mBAAmB,CAAC,IAAmC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,sBAAW,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAI;QACF,IAAI,IAAI,EAAE;YACR,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;YAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtE,cAAc,CAAC,WAAW,CAAC,CAAA;YAC3B,QAAQ,CAAC,SAAS,CAAC,CAAA;SACpB;KACF;IAAC,OAAO,EAAE,EAAE;QACX,QAAQ,CAAC,EAAW,CAAC,CAAA;KACtB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAC3C,CAAC;AAEY,QAAA,eAAe,GAAG,mBAAmB,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,4DAAsD;AACtD,iCAAgE;AAEhE,0CAAyC;AAElC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,sBAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAEM,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,eAAe,CAAC,GAAG,IAAA,yBAAU,GAAE,CAAA;IACtC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,uBAAe,GAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAA;IAE1F,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,KAAK,GAAG,KAAK,CAAC,gFAAgF,CAAC,CAAA;QACrG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,QAAQ,CAAC,KAAK,CAAC,CAAA;KAChB;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,YAAY,EAAE;gBACxB,cAAc,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC/C,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,cAAc,CAAC,SAAS,CAAC,CAAA;YACzB,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;IAEjC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AA3BY,QAAA,sBAAsB,0BA2BlC"}

package/dist/cjs/hooks/useWrappedModule.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useWrappedModule = exports.WrappedModuleHookFactory = void 0;
+const react_render_spin_check_1 = require("@xylabs/react-render-spin-check");
+const module_1 = require("@xyo-network/module");
+const react_wallet_1 = require("@xyo-network/react-wallet");
+const react_1 = require("react");
+const useModule_1 = require("./useModule");
+const WrappedModuleHookFactory = (wrapperObject, name) => {
+    const useHook = (nameOrAddress, account, spinCheck) => {
+        const spinCheckBounceNoCheck = (0, react_1.useMemo)(() => {
+            return { name: name !== null && name !== void 0 ? name : 'WrappedModuleHookFactory-NoCheck' };
+        }, []);
+        (0, react_render_spin_check_1.useRenderSpinCheck)(spinCheck ? { name: name !== null && name !== void 0 ? name : 'WrappedModuleHookFactory' } : spinCheckBounceNoCheck);
+        const [providedAccount] = (0, react_wallet_1.useAccount)();
+        const [module, moduleError] = (0, useModule_1.useModule)(nameOrAddress !== null && nameOrAddress !== void 0 ? nameOrAddress : {
+            query: [wrapperObject.requiredQueries],
+        });
+        const [wrapper, setWrapper] = (0, react_1.useState)();
+        const [error, setError] = (0, react_1.useState)();
+        const accountToUse = (0, react_1.useMemo)(() => account !== null && account !== void 0 ? account : providedAccount, [account, providedAccount]);
+        if (!accountToUse) {
+            const error = Error('Module hooks require either an Account context or account parameter');
+            console.error(error.message);
+            setError(error);
+        }
+        (0, react_1.useEffect)(() => {
+            if (module && accountToUse) {
+                try {
+                    const wrapper = wrapperObject.wrap(module, accountToUse);
+                    setWrapper(wrapper);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
+                }
+            }
+            else {
+                setWrapper(undefined);
+                setError(moduleError);
+            }
+        }, [module, account, moduleError, accountToUse]);
+        return [wrapper, error];
+    };
+    return useHook;
+};
+exports.WrappedModuleHookFactory = WrappedModuleHookFactory;
+exports.useWrappedModule = (0, exports.WrappedModuleHookFactory)(module_1.ModuleWrapper);
+//# sourceMappingURL=useWrappedModule.js.map

package/dist/cjs/hooks/useWrappedModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":";;;AAAA,6EAAoE;AAEpE,gDAAmD;AACnD,4DAAsD;AACtD,iCAAoD;AAEpD,2CAAuC;AAOhC,MAAM,wBAAwB,GAAG,CACtC,aAA4C,EAC5C,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAE,SAAmB,EAAmD,EAAE;QAC1I,MAAM,sBAAsB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;YAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,kCAAkC,EAAE,CAAA;QAC7D,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,IAAA,4CAAkB,EAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAA;QACrG,MAAM,CAAC,eAAe,CAAC,GAAG,IAAA,yBAAU,GAAE,CAAA;QACtC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qBAAS,EACrC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,CACF,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAE3C,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAA;QAE1F,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,KAAK,GAAG,KAAK,CAAC,qEAAqE,CAAC,CAAA;YAC1F,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC5B,QAAQ,CAAC,KAAK,CAAC,CAAA;SAChB;QAED,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,MAAM,IAAI,YAAY,EAAE;gBAC1B,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAmB,CAAA;oBAC1E,UAAU,CAAC,OAAO,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;QAEhD,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AA7CY,QAAA,wBAAwB,4BA6CpC;AAEY,QAAA,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,sBAAa,CAAC,CAAA"}