@xyo-network/react-node 2.47.23 → 2.47.25

package/dist/esm/hooks/useModules.js

@@ -1,40 +1,46 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useProvidedWrappedNode } from './useProvidedNode';
-export const useModules = (filter) => {
+export const useModules = (filter, logger) => {
     const [node, nodeError] = useProvidedWrappedNode();
     const [modules, setModules] = useState();
     const [error, setError] = useState();
+    useEffect(() => {
+        logger?.debug('useModules: useAsyncEffect');
+        if (nodeError) {
+            setError(nodeError);
+            setModules(undefined);
+        }
+    }, [nodeError, logger]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+        logger?.debug('useModules: useAsyncEffect');
         try {
-            if (nodeError) {
-                setError(nodeError);
-                setModules(undefined);
-            }
-            else {
-                if (node) {
-                    const modules = await node.resolve(filter);
-                    if (mounted()) {
-                        setModules(modules);
-                        setError(undefined);
-                    }
-                }
-                else {
+            if (node) {
+                const modules = await node.resolve(filter);
+                if (mounted()) {
+                    setModules(modules);
                     setError(undefined);
-                    setModules(undefined);
                 }
             }
+            else {
+                setError(undefined);
+                setModules(undefined);
+            }
         }
         catch (ex) {
             if (mounted()) {
                 const error = ex;
+                logger?.error(`useModules: useAsyncEffect [${error.message}]`);
                 setError(error);
                 setModules(undefined);
             }
         }
-    }, [filter, node, nodeError]);
+        return () => {
+            logger?.debug('useModules: unmount');
+        };
+    }, [filter, node, logger]);
     return [modules, error];
 };
 //# sourceMappingURL=useModules.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAA8C,EAAE;IAC/H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAa,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,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,EACD,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAC1B,CAAA;IAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAAE,MAAe,EAA8C,EAAE;IAChJ,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAa,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,SAAS,CAAC,CAAA;YACnB,UAAU,CAAC,SAAS,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,IAAI;YACF,IAAI,IAAI,EAAE;gBACR,MAAM,OAAO,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;gBAC1E,IAAI,OAAO,EAAE,EAAE;oBACb,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;aACF;iBAAM;gBACL,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,MAAM,EAAE,KAAK,CAAC,+BAA+B,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC9D,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;SACF;QACD,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACtC,CAAC,CAAA;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CACvB,CAAA;IAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA"}

package/dist/esm/hooks/useWrappedModules.js

@@ -5,15 +5,16 @@ import compact from 'lodash/compact';
 import { useEffect, useMemo, useState } from 'react';
 import { useModules } from './useModules';
 export const WrappedModulesHookFactory = (wrapperObject, name) => {
-    const useHook = (account, spinCheck) => {
+    const filter = {
+        query: [wrapperObject.requiredQueries],
+    };
+    const useHook = (account, spinCheck, logger) => {
         const spinCheckBounceNoCheck = useMemo(() => {
             return { name: name ?? 'WrappedModulesHookFactory-NoCheck' };
         }, []);
         useRenderSpinCheck(spinCheck ? { name: name ?? 'WrappedModuleHookFactory' } : spinCheckBounceNoCheck);
         const [providedAccount] = useAccount();
-        const [modules, moduleError] = useModules({
-            query: [wrapperObject.requiredQueries],
-        });
+        const [modules, moduleError] = useModules(filter, logger);
         const [wrappers, setWrappers] = useState();
         const [error, setError] = useState();
         const accountToUse = useMemo(() => account ?? providedAccount, [account, providedAccount]);

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

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModules.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAEpE,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,OAAyB,EAAE,SAAmB,EAAqD,EAAE;QACpH,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE;YAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,mCAAmC,EAAE,CAAA;QAC9D,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAA;QACrG,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,EAAE,CAAA;QACtC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,UAAU,CAA2B;YAClE,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAoB,CAAA;QAC5D,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,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,KAAK,GAAG,KAAK,CAAC,qEAAqE,CAAC,CAAA;gBAC1F,8BAA8B;gBAC9B,QAAQ,CAAC,KAAK,CAAC,CAAA;aAChB;QACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;QAElB,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,OAAO,IAAI,YAAY,EAAE;gBAC3B,IAAI;oBACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;oBAC/F,WAAW,CAAC,QAAQ,CAAC,CAAA;oBACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,WAAW,CAAC,SAAS,CAAC,CAAA;oBACtB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,WAAW,CAAC,SAAS,CAAC,CAAA;gBACtB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;QAEjD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC1B,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAA"}
+{"version":3,"file":"useWrappedModules.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAGpE,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;KACvC,CAAA;IACD,MAAM,OAAO,GAAG,CAAC,OAAyB,EAAE,SAAmB,EAAE,MAAe,EAAqD,EAAE;QACrI,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE;YAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,mCAAmC,EAAE,CAAA;QAC9D,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAA;QACrG,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,EAAE,CAAA;QACtC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,UAAU,CAA2B,MAAM,EAAE,MAAM,CAAC,CAAA;QAEnF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAoB,CAAA;QAC5D,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,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,KAAK,GAAG,KAAK,CAAC,qEAAqE,CAAC,CAAA;gBAC1F,8BAA8B;gBAC9B,QAAQ,CAAC,KAAK,CAAC,CAAA;aAChB;QACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;QAElB,SAAS,CAAC,GAAG,EAAE;YACb,IAAI,OAAO,IAAI,YAAY,EAAE;gBAC3B,IAAI;oBACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;oBAC/F,WAAW,CAAC,QAAQ,CAAC,CAAA;oBACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,WAAW,CAAC,SAAS,CAAC,CAAA;oBACtB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,WAAW,CAAC,SAAS,CAAC,CAAA;gBACtB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;QAEjD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC1B,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAA"}

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

@@ -1,3 +1,4 @@
+import { Logger } from '@xyo-network/core';
 import { Module, ModuleFilter } from '@xyo-network/module-model';
 export declare const useModules: <TModule extends Module<import("@xyo-network/module-model").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     name?: string | undefined;
@@ -51,5 +52,5 @@ export declare const useModules: <TModule extends Module<import("@xyo-network/mo
     storeQueries?: boolean | undefined;
 } & Omit<undefined, "schema">, "schema"> & {
     schema: string;
-}, "schema">, undefined>, import("@xyo-network/module-model").ModuleEventData>>(filter?: ModuleFilter) => [TModule[] | undefined, Error | undefined];
+}, "schema">, undefined>, import("@xyo-network/module-model").ModuleEventData>>(filter?: ModuleFilter, logger?: Logger) => [TModule[] | undefined, Error | undefined];
 //# sourceMappingURL=useModules.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKhE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yFAA8C,YAAY,+CAoChF,CAAA"}
+{"version":3,"file":"useModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKhE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yFAA8C,YAAY,WAAW,MAAM,+CA4CjG,CAAA"}

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

@@ -1,4 +1,5 @@
 import { AccountInstance } from '@xyo-network/account-model';
+import { Logger } from '@xyo-network/core';
 import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
 export declare const WrappedModulesHookFactory: <TModuleWrapper extends ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     name?: string | undefined;
@@ -26,8 +27,8 @@ export declare const WrappedModulesHookFactory: <TModuleWrapper extends ModuleWr
     storeQueries?: boolean | undefined;
 } & Omit<undefined, "schema">, "schema"> & {
     schema: string;
-}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (account?: AccountInstance, spinCheck?: boolean) => [TModuleWrapper[] | undefined, Error | undefined];
-export declare const useWrappedModules: (account?: AccountInstance, spinCheck?: boolean) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+}, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => (account?: AccountInstance, spinCheck?: boolean, logger?: Logger) => [TModuleWrapper[] | undefined, Error | undefined];
+export declare const useWrappedModules: (account?: AccountInstance, spinCheck?: boolean, logger?: Logger) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     name?: string | undefined;
     paging?: Record<string, {
         size?: number | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAO/E,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;6IAE7B,MAAM,gBAEc,eAAe,cAAc,OAAO,sDA0ChE,CAAA;AAED,eAAO,MAAM,iBAAiB,aA5CD,eAAe,cAAc,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;2GA4C6B,CAAA"}
+{"version":3,"file":"useWrappedModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrappedModules.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAO/E,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;6IAE7B,MAAM,gBAKc,eAAe,cAAc,OAAO,WAAW,MAAM,sDAwCjF,CAAA;AAED,eAAO,MAAM,iBAAiB,aA1CD,eAAe,cAAc,OAAO,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;2GA0CY,CAAA"}

package/package.json

@@ -18,16 +18,16 @@
     "@xyo-network/module": "^2.53.26",
     "@xyo-network/module-model": "^2.53.26",
     "@xyo-network/node": "^2.53.26",
-    "@xyo-network/react-shared": "^2.47.23",
-    "@xyo-network/react-wallet": "^2.47.23"
+    "@xyo-network/react-shared": "^2.47.25",
+    "@xyo-network/react-wallet": "^2.47.25"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
     "@xylabs/tsconfig-react": "^2.16.1",
     "@xyo-network/account": "^2.53.26",
-    "@xyo-network/react-storybook": "^2.47.23",
-    "@xyo-network/react-wallet": "^2.47.23",
+    "@xyo-network/react-storybook": "^2.47.25",
+    "@xyo-network/react-wallet": "^2.47.25",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -83,5 +83,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.47.23"
+  "version": "2.47.25"
 }

package/src/hooks/useModules.ts

@@ -1,42 +1,51 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
+import { Logger } from '@xyo-network/core'
 import { Module, ModuleFilter } from '@xyo-network/module-model'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModules = <TModule extends Module = Module>(filter?: ModuleFilter): [TModule[] | undefined, Error | undefined] => {
+export const useModules = <TModule extends Module = Module>(filter?: ModuleFilter, logger?: Logger): [TModule[] | undefined, Error | undefined] => {
   const [node, nodeError] = useProvidedWrappedNode()
   const [modules, setModules] = useState<TModule[]>()
   const [error, setError] = useState<Error>()
 
+  useEffect(() => {
+    logger?.debug('useModules: useAsyncEffect')
+    if (nodeError) {
+      setError(nodeError)
+      setModules(undefined)
+    }
+  }, [nodeError, logger])
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+      logger?.debug('useModules: useAsyncEffect')
       try {
-        if (nodeError) {
-          setError(nodeError)
-          setModules(undefined)
-        } else {
-          if (node) {
-            const modules: TModule[] | undefined = await node.resolve<TModule>(filter)
-            if (mounted()) {
-              setModules(modules)
-              setError(undefined)
-            }
-          } else {
+        if (node) {
+          const modules: TModule[] | undefined = await node.resolve<TModule>(filter)
+          if (mounted()) {
+            setModules(modules)
             setError(undefined)
-            setModules(undefined)
           }
+        } else {
+          setError(undefined)
+          setModules(undefined)
         }
       } catch (ex) {
         if (mounted()) {
           const error = ex as Error
+          logger?.error(`useModules: useAsyncEffect [${error.message}]`)
           setError(error)
           setModules(undefined)
         }
       }
+      return () => {
+        logger?.debug('useModules: unmount')
+      }
     },
-    [filter, node, nodeError],
+    [filter, node, logger],
   )
 
   return [modules, error]

package/src/hooks/useWrappedModules.tsx

@@ -1,5 +1,6 @@
 import { useRenderSpinCheck } from '@xylabs/react-render-spin-check'
 import { AccountInstance } from '@xyo-network/account-model'
+import { Logger } from '@xyo-network/core'
 import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
 import { useAccount } from '@xyo-network/react-wallet'
 import compact from 'lodash/compact'
@@ -11,15 +12,16 @@ export const WrappedModulesHookFactory = <TModuleWrapper extends ModuleWrapper>(
   wrapperObject: ConstructableModuleWrapper<TModuleWrapper>,
   name?: string,
 ) => {
-  const useHook = (account?: AccountInstance, spinCheck?: boolean): [TModuleWrapper[] | undefined, Error | undefined] => {
+  const filter = {
+    query: [wrapperObject.requiredQueries],
+  }
+  const useHook = (account?: AccountInstance, spinCheck?: boolean, logger?: Logger): [TModuleWrapper[] | undefined, Error | undefined] => {
     const spinCheckBounceNoCheck = useMemo(() => {
       return { name: name ?? 'WrappedModulesHookFactory-NoCheck' }
     }, [])
     useRenderSpinCheck(spinCheck ? { name: name ?? 'WrappedModuleHookFactory' } : spinCheckBounceNoCheck)
     const [providedAccount] = useAccount()
-    const [modules, moduleError] = useModules<TModuleWrapper['module']>({
-      query: [wrapperObject.requiredQueries],
-    })
+    const [modules, moduleError] = useModules<TModuleWrapper['module']>(filter, logger)
 
     const [wrappers, setWrappers] = useState<TModuleWrapper[]>()
     const [error, setError] = useState<Error>()