@xyo-network/react-node 2.45.0-rc.16 → 2.45.0-rc.18

package/dist/esm/hooks/index.js

@@ -12,4 +12,5 @@ export * from './useNodeQueryDiviner';
 export * from './useProvidedNode';
 export * from './useWitnessModule';
 export * from './useWitnessModules';
+export * from './useWrappedModule';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}

package/dist/esm/hooks/useArchiveArchivists.js

@@ -2,9 +2,9 @@ import { ArchivistWrapper } from '@xyo-network/archivist';
 import { usePromise } from '@xyo-network/react-shared';
 import { useCallback, useMemo } from 'react';
 import { useMemoryNodeUpdates } from './useMemoryNodeUpdates';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useArchiveArchivistsRaw = (archiveName, refresher) => {
-    const [node] = useProvidedNode(true);
+    const [node] = useProvidedWrappedNode();
     const buildReq = useCallback((type) => (archiveName && node) || refresher
         ? node?.resolveWrapped(ArchivistWrapper, { name: [encodeURIComponent(`${archiveName}[${type}]`)] })
         : undefined, [archiveName, node, refresher]);

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

@@ -1 +1 @@
-{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/hooks/useArchiveArchivists.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAOnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IAEpC,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,IAAgC,EAAE,EAAE,CACnC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS;QAChC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC,SAAS,EACf,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,CAC/B,CAAA;IAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1E,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpF,MAAM,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACtF,MAAM,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,wBAAwB,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAErG,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE;YACjE,OAAO;gBACL,0BAA0B,EAAE,0BAA0B,CAAC,CAAC,CAAqB;gBAC7E,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAqB;aACpE,CAAA;SACF;aAAM;YACL,OAAM;SACP;IACH,CAAC,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAEvD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAE,gBAA2B,EAAE,EAAE;IAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,uBAAuB,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAC,CAAA;IAE5E,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/hooks/useArchiveArchivists.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAO1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,CAAC,IAAI,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAEvC,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,IAAgC,EAAE,EAAE,CACnC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS;QAChC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC,SAAS,EACf,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,CAC/B,CAAA;IAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1E,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpF,MAAM,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACtF,MAAM,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,wBAAwB,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAErG,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE;YACjE,OAAO;gBACL,0BAA0B,EAAE,0BAA0B,CAAC,CAAC,CAAqB;gBAC7E,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAqB;aACpE,CAAA;SACF;aAAM;YACL,OAAM;SACP;IACH,CAAC,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAEvD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAE,gBAA2B,EAAE,EAAE;IAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,uBAAuB,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAC,CAAA;IAE5E,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/dist/esm/hooks/useModule.js

@@ -1,4 +1,44 @@
-import { ModuleWrapper } from '@xyo-network/module';
-import { createUseModuleHook } from './useNode';
-export const useModule = createUseModuleHook((module) => ModuleWrapper.tryWrap(module));
+import { useAsyncEffect } from '@xylabs/react-shared';
+import { useState } from 'react';
+import { useProvidedWrappedNode } from './useProvidedNode';
+export const useModule = (nameOrAddress) => {
+    const [node, nodeError] = useProvidedWrappedNode();
+    const [module, setModule] = useState();
+    const [error, setError] = useState();
+    useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+        try {
+            if (nodeError) {
+                console.log(`Setting NodeError [${nodeError.message}]`);
+                setError(nodeError);
+                setModule(undefined);
+            }
+            else {
+                if (node) {
+                    const module = nameOrAddress ? await node.resolve(nameOrAddress) : (await node.resolve()).pop();
+                    if (mounted()) {
+                        console.log(`Setting Module [${module?.address}]`);
+                        setModule(module);
+                        setError(undefined);
+                    }
+                }
+                else {
+                    console.log('Setting All to undefined');
+                    setError(undefined);
+                    setModule(undefined);
+                }
+            }
+        }
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                console.log(`Setting Error [${error.message}]`);
+                setError(error);
+                setModule(undefined);
+            }
+        }
+    }, [nameOrAddress, node, nodeError]);
+    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,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE/C,MAAM,CAAC,MAAM,SAAS,GAAG,mBAAmB,CAAwB,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,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,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,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,SAAS,CAAC,OAAO,GAAG,CAAC,CAAA;gBACvD,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,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,GAAG,CAAC,mBAAmB,MAAM,EAAE,OAAO,GAAG,CAAC,CAAA;wBAClD,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;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,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/esm/hooks/useModules.js

@@ -1,8 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModules = (filter) => {
-    const [node] = useProvidedNode(true);
+    const [node] = useProvidedWrappedNode();
     const [modules, setModules] = useState();
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps

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,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAO,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,EAAE,OAAO,CAAI,MAAM,CAAC,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"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,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,sBAAsB,EAAE,CAAA;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAO,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,EAAE,OAAO,CAAI,MAAM,CAAC,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/dist/esm/hooks/useNode.js

@@ -1,57 +1,18 @@
-/* eslint-disable react-hooks/rules-of-hooks */
-import { useAsyncEffect } from '@xylabs/react-shared';
-import { NodeWrapper } from '@xyo-network/node';
-import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
-export const createUseModuleHook = (wrapFunc) => {
-    function use(nameOrAddressOrWrapOrAccount, wrap = false) {
-        const [node, nodeError] = useProvidedNode();
-        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] = useState();
-        const [error, setError] = useState();
-        useAsyncEffect(
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        async (mounted) => {
-            try {
-                if (nodeError) {
-                    console.log(`Setting NodeError [${nodeError.message}]`);
-                    setError(nodeError);
-                    setModule(undefined);
-                }
-                else {
-                    const wrappedNode = NodeWrapper.tryWrap(node);
-                    if (wrappedNode) {
-                        const module = nameOrAddress
-                            ? await wrappedNode?.resolve(nameOrAddress)
-                            : (await wrappedNode.resolve()).pop();
-                        const finalModule = shouldWrap ? wrapFunc(module, account) : module;
-                        if (mounted()) {
-                            console.log(`Setting Module [${finalModule?.address}]`);
-                            setModule(finalModule);
-                            setError(undefined);
-                        }
-                    }
-                    else {
-                        console.log('Setting All to undefined');
-                        setError(undefined);
-                        setModule(undefined);
-                    }
-                }
-            }
-            catch (ex) {
-                if (mounted()) {
-                    const error = ex;
-                    console.log(`Setting Error [${error.message}]`);
-                    setError(error);
-                    setModule(undefined);
-                }
-            }
-        }, [wrap, node, nameOrAddress, nodeError, shouldWrap, account]);
-        return [module, error];
+import { useModule } from './useModule';
+import { useProvidedWrappedNode } from './useProvidedNode';
+export const useNode = (nameOrAddress) => {
+    const [providedNode, providedNodeError] = useProvidedWrappedNode();
+    const [node, nodeError] = useModule(nameOrAddress);
+    if (nameOrAddress) {
+        if (providedNode) {
+            return [node, nodeError];
+        }
+        else {
+            return [providedNode, providedNodeError];
+        }
+    }
+    else {
+        return [providedNode, providedNodeError];
     }
-    return use;
 };
-export const useNode = createUseModuleHook((module) => NodeWrapper.tryWrap(module));
 //# sourceMappingURL=useNode.js.map

package/dist/esm/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":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,SAAS,CAAa,aAAa,CAAC,CAAA;IAE9D,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;SACzB;aAAM;YACL,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;SACzC;KACF;SAAM;QACL,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;KACzC;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useProvidedNode.js

@@ -1,24 +1,26 @@
 import { NodeWrapper } from '@xyo-network/node';
 import { useContext, useEffect, useState } from 'react';
 import { NodeContext } from '../contexts';
-function useProvidedNodeFunc(wrap) {
+export const useProvidedNode = () => {
     const { node } = useContext(NodeContext);
+    return [node];
+};
+export const useProvidedWrappedNode = (account) => {
+    const [node] = useProvidedNode();
     const [wrappedNode, setWrappedNode] = useState();
     const [error, setError] = useState();
     useEffect(() => {
         try {
             if (node) {
-                const account = typeof wrap === 'boolean' ? undefined : wrap;
-                const wrappedNode = wrap ? NodeWrapper.wrap(node, account) : undefined;
-                setWrappedNode(wrappedNode);
+                setWrappedNode(NodeWrapper.wrap(node, account));
                 setError(undefined);
             }
         }
         catch (ex) {
+            setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, wrap]);
-    return [wrap ? wrappedNode : wrappedNode?.module, error];
-}
-export const useProvidedNode = useProvidedNodeFunc;
+    }, [node, account]);
+    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;AAKzC,SAAS,mBAAmB,CAAC,IAAmC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,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,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBACtE,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAEhB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,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,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"}

package/dist/esm/hooks/useWrappedModule.js

@@ -0,0 +1,29 @@
+import { ModuleWrapper } from '@xyo-network/module';
+import { useEffect, useState } from 'react';
+import { useModule } from './useModule';
+export const WrappedModuleHookFactory = (wrapperObject) => {
+    return (nameOrAddress, account) => {
+        const [module, moduleError] = useModule(nameOrAddress);
+        const [wrapper, setWrapper] = useState();
+        const [error, setError] = useState();
+        useEffect(() => {
+            if (module) {
+                try {
+                    const wrapper = wrapperObject.wrap(module, account);
+                    setWrapper(wrapper);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
+                }
+            }
+            else {
+                setWrapper(undefined);
+                setError(moduleError);
+            }
+        }, [module, account, moduleError]);
+        return [wrapper, error];
+    };
+};
+export const useWrappedModule = WrappedModuleHookFactory(ModuleWrapper);
+//# sourceMappingURL=useWrappedModule.js.map

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

@@ -0,0 +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"}

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

@@ -12,4 +12,5 @@ export * from './useNodeQueryDiviner';
 export * from './useProvidedNode';
 export * from './useWitnessModule';
 export * from './useWitnessModules';
+export * from './useWrappedModule';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}

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

@@ -1,59 +1,23 @@
-import { Module, ModuleWrapper } from '@xyo-network/module';
-export declare const useModule: {
-    (name?: string | undefined): [Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }> | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | import("@xyo-network/account").Account): [ModuleWrapper<Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }>> | undefined, Error | undefined];
-    (wrap: true | import("@xyo-network/account").Account): [ModuleWrapper<Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }>> | undefined, Error | undefined];
-    (address: string): [Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }> | undefined, Error | undefined];
-    (address: string, wrap: true | import("@xyo-network/account").Account): [ModuleWrapper<Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }>> | undefined, Error | undefined];
-};
+import { Module } 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?: {
+        allowAnonymous?: boolean | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}> = Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    name?: string | undefined;
+    security?: {
+        allowAnonymous?: boolean | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>>(nameOrAddress?: string) => [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":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI3D,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAwF,CAAA"}
+{"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,6CAuChF,CAAA"}

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

@@ -1,60 +1,3 @@
-import { Account } from '@xyo-network/account';
-import { Module, ModuleWrapper } from '@xyo-network/module';
-import { NodeModule, NodeWrapper } from '@xyo-network/node';
-export type WrapFunc<TModule extends Module = Module, TWrapper extends ModuleWrapper = ModuleWrapper> = (module?: TModule, account?: Account) => TWrapper | undefined;
-export type NodeFunc = () => [NodeModule | undefined, Error | undefined];
-export declare const createUseModuleHook: <TModule extends Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}> = Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>, TWrapper extends ModuleWrapper<Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>> = ModuleWrapper<Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    schema: string;
-}>>, TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>>(wrapFunc: TWrapFunc) => {
-    (name?: string): [TModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined];
-    (wrap: true | Account): [TWrapper | undefined, Error | undefined];
-    (address: string): [TModule | undefined, Error | undefined];
-    (address: string, wrap: true | Account): [TWrapper | undefined, Error | undefined];
-};
-export declare const useNode: {
-    (name?: string): [NodeModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-    (wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-    (address: string): [NodeModule | undefined, Error | undefined];
-    (address: string, wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-};
+import { NodeModule } from '@xyo-network/node';
+export declare const useNode: (nameOrAddress?: string) => [NodeModule | undefined, Error | undefined];
 //# sourceMappingURL=useNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,QAAQ,SAAS,aAAa,GAAG,aAAa,IAAI,CACtG,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,OAAO,KACd,QAAQ,GAAG,SAAS,CAAA;AAEzB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAOV,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAoDnD,CAAA;AAED,eAAO,MAAM,OAAO;YA1DE,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAsDwD,CAAA"}
+{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAK9C,eAAO,MAAM,OAAO,mBAAoB,MAAM,KAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAa1F,CAAA"}

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

@@ -1,8 +1,5 @@
-import { Account } from '@xyo-network/account';
+import { AccountInstance } from '@xyo-network/account-model';
 import { NodeModule, NodeWrapper } from '@xyo-network/node';
-declare function useProvidedNodeFunc(wrap?: undefined): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: false): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-export declare const useProvidedNode: typeof useProvidedNodeFunc;
-export {};
+export declare const useProvidedNode: () => [NodeModule | undefined];
+export declare const useProvidedWrappedNode: (account?: AccountInstance) => [NodeWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useProvidedNode.d.ts.map

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,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,iBAAS,mBAAmB,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAC3F,iBAAS,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AACtF,iBAAS,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAsBhG,eAAO,MAAM,eAAe,4BAAsB,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;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"}

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

@@ -0,0 +1,38 @@
+import { AccountInstance } from '@xyo-network/account-model';
+import { ModuleWrapper } from '@xyo-network/module';
+export interface WrapperStatic<TModuleWrapper extends ModuleWrapper = ModuleWrapper> {
+    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 & {
+    name?: string | undefined;
+    security?: {
+        allowAnonymous?: boolean | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>> = ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    name?: string | undefined;
+    security?: {
+        allowAnonymous?: boolean | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>>>(wrapperObject: WrapperStatic<TModuleWrapper>) => (nameOrAddress?: string, account?: AccountInstance) => [TModuleWrapper | undefined, Error | undefined];
+export declare const useWrappedModule: (nameOrAddress?: string, account?: AccountInstance) => [ModuleWrapper<import("@xyo-network/module").Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    name?: string | undefined;
+    security?: {
+        allowAnonymous?: boolean | undefined;
+        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+        disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    storeQueries?: boolean | undefined;
+} & {
+    schema: string;
+}>> | undefined, Error | undefined];
+//# sourceMappingURL=useWrappedModule.d.ts.map

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

@@ -0,0 +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"}

package/package.json

@@ -21,13 +21,13 @@
     "@xyo-network/module-model": "^2.51.2",
     "@xyo-network/node": "^2.51.2",
     "@xyo-network/payload-model": "^2.51.2",
-    "@xyo-network/react-shared": "^2.45.0-rc.16",
+    "@xyo-network/react-shared": "^2.45.0-rc.18",
     "@xyo-network/witness": "^2.51.2"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -83,6 +83,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.16",
+  "version": "2.45.0-rc.18",
   "stableVersion": "2.44.1"
 }

package/src/components/Node.stories.tsx

@@ -23,7 +23,7 @@ export default {
 } as Meta
 
 const Template: ComponentStory<React.FC> = (props) => {
-  const [node] = useProvidedNode() as [MemoryNode, Error]
+  const [node] = useProvidedNode() as [MemoryNode]
   const [description, setDescription] = useState<string>()
 
   useAsyncEffect(

package/src/hooks/index.ts

@@ -12,3 +12,4 @@ export * from './useNodeQueryDiviner'
 export * from './useProvidedNode'
 export * from './useWitnessModule'
 export * from './useWitnessModules'
+export * from './useWrappedModule'

package/src/hooks/useArchiveArchivists.tsx

@@ -3,7 +3,7 @@ import { usePromise } from '@xyo-network/react-shared'
 import { useCallback, useMemo } from 'react'
 
 import { useMemoryNodeUpdates } from './useMemoryNodeUpdates'
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 interface UseArchiveArchivists {
   archiveBoundWitnessWrapper: ArchivistWrapper
@@ -11,7 +11,7 @@ interface UseArchiveArchivists {
 }
 
 export const useArchiveArchivistsRaw = (archiveName?: string, refresher?: unknown): UseArchiveArchivists | undefined => {
-  const [node] = useProvidedNode(true)
+  const [node] = useProvidedWrappedNode()
 
   const buildReq = useCallback(
     (type: 'payload' | 'boundwitness') =>