@xyo-network/react-node 2.45.0-rc.20 → 2.45.0-rc.22

package/dist/esm/hooks/useModule.js

@@ -1,7 +1,9 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useProvidedWrappedNode } from './useProvidedNode';
-export const useModule = (nameOrAddress) => {
+export const useModule = (nameOrAddressOrFilter) => {
+    const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
+    const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
     const [node, nodeError] = useProvidedWrappedNode();
     const [module, setModule] = useState();
     const [error, setError] = useState();
@@ -9,13 +11,6 @@ export const useModule = (nameOrAddress) => {
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        const detachHandler = (args) => {
-            const eventModule = args.module;
-            if (eventModule.address === address && mounted()) {
-                setModule(undefined);
-                setError(undefined);
-            }
-        };
         try {
             if (nodeError) {
                 setError(nodeError);
@@ -23,16 +18,39 @@ export const useModule = (nameOrAddress) => {
             }
             else {
                 if (node) {
-                    const emitter = node.module;
-                    const module = nameOrAddress ? await node.resolve(nameOrAddress) : (await node.resolve()).pop();
+                    const attachEmitter = node.module;
+                    const detachEmitter = node.module;
+                    const attachHandler = (args) => {
+                        const eventModule = args.module;
+                        if (eventModule.address === nameOrAddress || (module?.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
+                        ? await node.resolve(nameOrAddress)
+                        : (await node.resolve(filter)).pop();
                     if (mounted()) {
-                        emitter.on('moduleDetached', detachHandler);
+                        if (module) {
+                            detachEmitter.on('moduleDetached', detachHandler);
+                        }
+                        else {
+                            attachEmitter.on('moduleAttached', attachHandler);
+                        }
                         setModule(module);
                         setError(undefined);
                     }
                     return () => {
                         //remove the event handler on unmount
-                        emitter.on('moduleDetached', detachHandler, true);
+                        attachEmitter.on('moduleAttached', attachHandler, true);
+                        detachEmitter.on('moduleDetached', detachHandler, true);
                     };
                 }
                 else {
@@ -50,7 +68,7 @@ export const useModule = (nameOrAddress) => {
                 setModule(undefined);
             }
         }
-    }, [nameOrAddress, node, nodeError, address]);
+    }, [nameOrAddress, node, nodeError, address, filter]);
     return [module, error];
 };
 //# sourceMappingURL=useModule.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAA;IAC/B,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;YAC/B,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,EAAE,EAAE;gBAChD,SAAS,CAAC,SAAS,CAAC,CAAA;gBACpB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;QACH,CAAC,CAAA;QACD,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAAG,IAAI,CAAC,MAAoC,CAAA;oBACzD,MAAM,MAAM,GAAwB,aAAa,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAU,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBACtI,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;wBAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBACD,OAAO,GAAG,EAAE;wBACV,qCAAqC;wBACrC,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAC1C,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,qBAA6C,EACH,EAAE;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,qBAAqB,KAAK,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAA;IAC7I,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,qBAAqB,KAAK,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAA;IACtI,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAA;IAE/B,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,aAAa,GAAG,IAAI,CAAC,MAAoC,CAAA;oBAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,MAAoC,CAAA;oBAC/D,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;wBACtD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;wBAC/B,IAAI,WAAW,CAAC,OAAO,KAAK,aAAa,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,aAAa,IAAI,OAAO,EAAE,CAAC,EAAE;4BACjG,SAAS,CAAC,WAAsB,CAAC,CAAA;4BACjC,QAAQ,CAAC,SAAS,CAAC,CAAA;yBACpB;oBACH,CAAC,CAAA;oBACD,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;wBACtD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;wBAC/B,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,EAAE,EAAE;4BAChD,SAAS,CAAC,SAAS,CAAC,CAAA;4BACpB,QAAQ,CAAC,SAAS,CAAC,CAAA;yBACpB;oBACH,CAAC,CAAA;oBACD,MAAM,MAAM,GAAwB,aAAa;wBAC/C,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAU,aAAa,CAAC;wBAC5C,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;oBAC/C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,MAAM,EAAE;4BACV,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;yBAClD;6BAAM;4BACL,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;yBAClD;wBACD,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBACD,OAAO,GAAG,EAAE;wBACV,qCAAqC;wBACrC,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;wBACvD,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;oBACzD,CAAC,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAClD,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/esm/hooks/useProvidedNode.js

@@ -1,17 +1,25 @@
 import { NodeWrapper } from '@xyo-network/node';
-import { useContext, useEffect, useState } from 'react';
+import { useAccount } from '@xyo-network/react-wallet';
+import { useContext, useEffect, useMemo, useState } from 'react';
 import { NodeContext } from '../contexts';
 export const useProvidedNode = () => {
     const { node } = useContext(NodeContext);
     return [node];
 };
 export const useProvidedWrappedNode = (account) => {
+    const [providedAccount] = useAccount();
     const [node] = useProvidedNode();
     const [wrappedNode, setWrappedNode] = useState();
     const [error, setError] = useState();
+    const accountToUse = useMemo(() => account ?? providedAccount, [account, providedAccount]);
+    if (!accountToUse) {
+        const error = Error('useProvidedWrappedNode requires either an Account context or account parameter');
+        console.error(error.message);
+        setError(error);
+    }
     useEffect(() => {
         try {
-            if (node) {
+            if (node && accountToUse) {
                 setWrappedNode(NodeWrapper.wrap(node, account));
                 setError(undefined);
             }
@@ -20,7 +28,7 @@ export const useProvidedWrappedNode = (account) => {
             setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, account]);
+    }, [node, account, accountToUse]);
     return [wrappedNode, error];
 };
 //# sourceMappingURL=useProvidedNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,EAAE;gBACR,cAAc,CAAC,WAAW,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,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,EAAE,CAAA;IACtC,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,IAAI,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,SAAS,CAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,YAAY,EAAE;gBACxB,cAAc,CAAC,WAAW,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"}

package/dist/esm/hooks/useWrappedModule.js

@@ -1,15 +1,25 @@
 import { ModuleWrapper } from '@xyo-network/module';
-import { useEffect, useState } from 'react';
+import { useAccount } from '@xyo-network/react-wallet';
+import { useEffect, useMemo, useState } from 'react';
 import { useModule } from './useModule';
 export const WrappedModuleHookFactory = (wrapperObject) => {
     return (nameOrAddress, account) => {
-        const [module, moduleError] = useModule(nameOrAddress);
+        const [providedAccount] = useAccount();
+        const [module, moduleError] = useModule(nameOrAddress ?? {
+            query: [wrapperObject.requiredQueries],
+        });
         const [wrapper, setWrapper] = useState();
         const [error, setError] = useState();
+        const accountToUse = useMemo(() => 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);
+        }
         useEffect(() => {
-            if (module) {
+            if (module && accountToUse) {
                 try {
-                    const wrapper = wrapperObject.wrap(module, account);
+                    const wrapper = wrapperObject.wrap(module, accountToUse);
                     setWrapper(wrapper);
                 }
                 catch (ex) {
@@ -21,7 +31,7 @@ export const WrappedModuleHookFactory = (wrapperObject) => {
                 setWrapper(undefined);
                 setError(moduleError);
             }
-        }, [module, account, moduleError]);
+        }, [module, account, moduleError, accountToUse]);
         return [wrapper, error];
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAMvC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAuD,aAA4C,EAAE,EAAE;IAC7I,OAAO,CAAC,aAAsB,EAAE,OAAyB,EAAmD,EAAE;QAC5G,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CAA2B,aAAa,CAAC,CAAA;QAEhF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;QAC3C,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,MAAM,EAAE;gBACV,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAmB,CAAA;oBACrE,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,CAAC,CAAC,CAAA;QAElC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAA"}
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAOvC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAuD,aAA4C,EAAE,EAAE;IAC7I,OAAO,CAAC,aAAsB,EAAE,OAAyB,EAAmD,EAAE;QAC5G,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,EAAE,CAAA;QACtC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,SAAS,CACrC,aAAa,IAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,CACF,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;QAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,IAAI,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,SAAS,CAAC,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;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAA"}

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

@@ -1,4 +1,4 @@
-import { Module } from '@xyo-network/module-model';
+import { Module, ModuleFilter } from '@xyo-network/module-model';
 export declare const useModule: <TModule extends Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     name?: string | undefined;
     security?: {
@@ -19,5 +19,5 @@ export declare const useModule: <TModule extends Module<import("@xyo-network/pay
     storeQueries?: boolean | undefined;
 } & {
     schema: string;
-}>>(nameOrAddress?: string) => [TModule | undefined, Error | undefined];
+}>>(nameOrAddressOrFilter?: string | ModuleFilter) => [TModule | undefined, Error | undefined];
 //# sourceMappingURL=useModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;oBAAqD,MAAM,6CAmDhF,CAAA"}
+{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAMhE,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;4BACI,MAAM,GAAG,YAAY,6CAuE9C,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,SAAS,CAIzD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,eAAe,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAkB7G,CAAA"}
+{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAM3D,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,SAAS,CAIzD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,eAAe,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA2B7G,CAAA"}

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

@@ -1,6 +1,7 @@
 import { AccountInstance } from '@xyo-network/account-model';
 import { ModuleWrapper } from '@xyo-network/module';
 export interface WrapperStatic<TModuleWrapper extends ModuleWrapper = ModuleWrapper> {
+    requiredQueries: string[];
     wrap: (module?: TModuleWrapper['module'], account?: AccountInstance) => TModuleWrapper;
 }
 export declare const WrappedModuleHookFactory: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {

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

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAKnD,MAAM,WAAW,aAAa,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa;IACjF,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,cAAc,CAAA;CACvF;AAED,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;uEACX,MAAM,YAAY,eAAe,oDAsB1D,CAAA;AAED,eAAO,MAAM,gBAAgB,mBAxBH,MAAM,YAAY,eAAe;;;;;;;;;;mCAwBY,CAAA"}
+{"version":3,"file":"useWrappedModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAMnD,MAAM,WAAW,aAAa,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa;IACjF,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,cAAc,CAAA;CACvF;AAED,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;uEACX,MAAM,YAAY,eAAe,oDAoC1D,CAAA;AAED,eAAO,MAAM,gBAAgB,mBAtCH,MAAM,YAAY,eAAe;;;;;;;;;;mCAsCY,CAAA"}

package/package.json

@@ -10,14 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@mui/lab": "^5.0.0-alpha.121",
-    "@xylabs/react-flexbox": "^2.16.8",
-    "@xylabs/react-shared": "^2.16.8",
+    "@mui/lab": "^5.0.0-alpha.122",
+    "@xylabs/react-flexbox": "^2.16.9",
+    "@xylabs/react-shared": "^2.16.9",
     "@xyo-network/account-model": "^2.51.4",
     "@xyo-network/module": "^2.51.4",
     "@xyo-network/module-model": "^2.51.4",
     "@xyo-network/node": "^2.51.4",
-    "@xyo-network/react-shared": "^2.45.0-rc.20"
+    "@xyo-network/react-shared": "^2.45.0-rc.22",
+    "@xyo-network/react-wallet": "^2.45.0-rc.22"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
@@ -78,6 +79,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.20",
+  "version": "2.45.0-rc.22",
   "stableVersion": "2.44.1"
 }

package/src/hooks/useModule.tsx

@@ -1,41 +1,62 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { Module } from '@xyo-network/module-model'
-import { ModuleDetachedEventArgs, ModuleDetachedEventEmitter } from '@xyo-network/node'
-import { useState } from 'react'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
+import { ModuleAttachedEventArgs, ModuleAttachedEventEmitter, ModuleDetachedEventArgs, ModuleDetachedEventEmitter } from '@xyo-network/node'
+import { useMemo, useState } from 'react'
 
 import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModule = <TModule extends Module = Module>(nameOrAddress?: string): [TModule | undefined, Error | undefined] => {
+export const useModule = <TModule extends Module = Module>(
+  nameOrAddressOrFilter?: string | ModuleFilter,
+): [TModule | undefined, Error | undefined] => {
+  const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
+  const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
   const [node, nodeError] = useProvidedWrappedNode()
   const [module, setModule] = useState<TModule>()
   const [error, setError] = useState<Error>()
+
   const address = module?.address
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      const detachHandler = (args: ModuleDetachedEventArgs) => {
-        const eventModule = args.module
-        if (eventModule.address === address && mounted()) {
-          setModule(undefined)
-          setError(undefined)
-        }
-      }
       try {
         if (nodeError) {
           setError(nodeError)
           setModule(undefined)
         } else {
           if (node) {
-            const emitter = node.module as ModuleDetachedEventEmitter
-            const module: TModule | undefined = nameOrAddress ? await node.resolve<TModule>(nameOrAddress) : (await node.resolve<TModule>()).pop()
+            const attachEmitter = node.module as ModuleAttachedEventEmitter
+            const detachEmitter = node.module as ModuleDetachedEventEmitter
+            const attachHandler = (args: ModuleAttachedEventArgs) => {
+              const eventModule = args.module
+              if (eventModule.address === nameOrAddress || (module?.config.name === nameOrAddress && mounted())) {
+                setModule(eventModule as TModule)
+                setError(undefined)
+              }
+            }
+            const detachHandler = (args: ModuleDetachedEventArgs) => {
+              const eventModule = args.module
+              if (eventModule.address === address && mounted()) {
+                setModule(undefined)
+                setError(undefined)
+              }
+            }
+            const module: TModule | undefined = nameOrAddress
+              ? await node.resolve<TModule>(nameOrAddress)
+              : (await node.resolve<TModule>(filter)).pop()
             if (mounted()) {
-              emitter.on('moduleDetached', detachHandler)
+              if (module) {
+                detachEmitter.on('moduleDetached', detachHandler)
+              } else {
+                attachEmitter.on('moduleAttached', attachHandler)
+              }
               setModule(module)
               setError(undefined)
             }
             return () => {
               //remove the event handler on unmount
-              emitter.on('moduleDetached', detachHandler, true)
+              attachEmitter.on('moduleAttached', attachHandler, true)
+              detachEmitter.on('moduleDetached', detachHandler, true)
             }
           } else {
             console.log('Setting All to undefined')
@@ -52,7 +73,7 @@ export const useModule = <TModule extends Module = Module>(nameOrAddress?: strin
         }
       }
     },
-    [nameOrAddress, node, nodeError, address],
+    [nameOrAddress, node, nodeError, address, filter],
   )
 
   return [module, error]

package/src/hooks/useProvidedNode.tsx

@@ -1,6 +1,7 @@
 import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
-import { useContext, useEffect, useState } from 'react'
+import { useAccount } from '@xyo-network/react-wallet'
+import { useContext, useEffect, useMemo, useState } from 'react'
 
 import { NodeContext } from '../contexts'
 
@@ -11,13 +12,22 @@ export const useProvidedNode = (): [NodeModule | undefined] => {
 }
 
 export const useProvidedWrappedNode = (account?: AccountInstance): [NodeWrapper | undefined, Error | undefined] => {
+  const [providedAccount] = useAccount()
   const [node] = useProvidedNode()
   const [wrappedNode, setWrappedNode] = useState<NodeWrapper>()
   const [error, setError] = useState<Error>()
 
+  const accountToUse = useMemo(() => account ?? providedAccount, [account, providedAccount])
+
+  if (!accountToUse) {
+    const error = Error('useProvidedWrappedNode requires either an Account context or account parameter')
+    console.error(error.message)
+    setError(error)
+  }
+
   useEffect(() => {
     try {
-      if (node) {
+      if (node && accountToUse) {
         setWrappedNode(NodeWrapper.wrap(node, account))
         setError(undefined)
       }
@@ -25,7 +35,7 @@ export const useProvidedWrappedNode = (account?: AccountInstance): [NodeWrapper
       setWrappedNode(undefined)
       setError(ex as Error)
     }
-  }, [node, account])
+  }, [node, account, accountToUse])
 
   return [wrappedNode, error]
 }

package/src/hooks/useWrappedModule.tsx

@@ -1,24 +1,40 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 import { AccountInstance } from '@xyo-network/account-model'
 import { ModuleWrapper } from '@xyo-network/module'
-import { useEffect, useState } from 'react'
+import { useAccount } from '@xyo-network/react-wallet'
+import { useEffect, useMemo, useState } from 'react'
 
 import { useModule } from './useModule'
 
 export interface WrapperStatic<TModuleWrapper extends ModuleWrapper = ModuleWrapper> {
+  requiredQueries: string[]
   wrap: (module?: TModuleWrapper['module'], account?: AccountInstance) => TModuleWrapper
 }
 
 export const WrappedModuleHookFactory = <TModuleWrapper extends ModuleWrapper = ModuleWrapper>(wrapperObject: WrapperStatic<TModuleWrapper>) => {
   return (nameOrAddress?: string, account?: AccountInstance): [TModuleWrapper | undefined, Error | undefined] => {
-    const [module, moduleError] = useModule<TModuleWrapper['module']>(nameOrAddress)
+    const [providedAccount] = useAccount()
+    const [module, moduleError] = useModule<TModuleWrapper['module']>(
+      nameOrAddress ?? {
+        query: [wrapperObject.requiredQueries],
+      },
+    )
 
     const [wrapper, setWrapper] = useState<TModuleWrapper>()
     const [error, setError] = useState<Error>()
+
+    const accountToUse = useMemo(() => 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)
+    }
+
     useEffect(() => {
-      if (module) {
+      if (module && accountToUse) {
         try {
-          const wrapper = wrapperObject.wrap(module, account) as TModuleWrapper
+          const wrapper = wrapperObject.wrap(module, accountToUse) as TModuleWrapper
           setWrapper(wrapper)
         } catch (ex) {
           setWrapper(undefined)
@@ -28,7 +44,7 @@ export const WrappedModuleHookFactory = <TModuleWrapper extends ModuleWrapper =
         setWrapper(undefined)
         setError(moduleError)
       }
-    }, [module, account, moduleError])
+    }, [module, account, moduleError, accountToUse])
 
     return [wrapper, error]
   }