@xyo-network/react-node 2.45.0-rc.3 → 2.45.0-rc.30

package/package.json

@@ -10,24 +10,24 @@
     "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",
-    "@xyo-network/account": "^2.51.1",
-    "@xyo-network/archivist": "^2.51.1",
-    "@xyo-network/diviner-model": "^2.51.1",
-    "@xyo-network/diviner-wrapper": "^2.51.1",
-    "@xyo-network/module": "^2.51.1",
-    "@xyo-network/module-model": "^2.51.1",
-    "@xyo-network/node": "^2.51.1",
-    "@xyo-network/payload-model": "^2.51.1",
-    "@xyo-network/react-shared": "^2.45.0-rc.3",
-    "@xyo-network/witness": "^2.51.1"
+    "@mui/lab": "^5.0.0-alpha.122",
+    "@xylabs/react-flexbox": "^2.16.11",
+    "@xylabs/react-render-spin-check": "^2.16.11",
+    "@xylabs/react-shared": "^2.16.11",
+    "@xyo-network/account-model": "^2.51.7",
+    "@xyo-network/module": "^2.51.7",
+    "@xyo-network/module-model": "^2.51.7",
+    "@xyo-network/node": "^2.51.7",
+    "@xyo-network/react-shared": "^2.45.0-rc.30",
+    "@xyo-network/react-wallet": "^2.45.0-rc.30"
   },
   "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",
+    "@xyo-network/account": "^2.51.7",
+    "@xyo-network/react-storybook": "^2.45.0-rc.30",
+    "@xyo-network/react-wallet": "^2.45.0-rc.30",
     "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.3",
+  "version": "2.45.0-rc.30",
   "stableVersion": "2.44.1"
 }

package/src/components/Node.stories.tsx

@@ -1,22 +1,46 @@
 import { ComponentStory, DecoratorFn, Meta } from '@storybook/react'
-import { useAsyncEffect } from '@xylabs/react-shared'
+import { useAsyncEffect, WithChildren } from '@xylabs/react-shared'
+import { HDWallet } from '@xyo-network/account'
 import { AbstractModule } from '@xyo-network/module'
 import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
-import { useState } from 'react'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
+import { WalletProvider } from '@xyo-network/react-wallet'
+import { useEffect, useState } from 'react'
 
 import { MemoryNodeProvider } from '../contexts'
-import { useProvidedNode } from '../hooks'
+import { useModule, useProvidedNode } from '../hooks'
+
+const randomWallet = HDWallet.fromMnemonic(DefaultSeedPhrase)
 
 class TestModule extends AbstractModule {}
+const TestModuleName = 'TestModule'
+const TestModuleAccount = randomWallet.deriveAccount('0')
+
+const account = randomWallet.deriveAccount('0')
 
 const MemoryNodeDecorator: DecoratorFn = (Story, args) => {
   return (
-    <MemoryNodeProvider config={{ schema: NodeConfigSchema }}>
-      <Story {...args} />
-    </MemoryNodeProvider>
+    <WalletProvider defaultWallet={randomWallet}>
+      <MemoryNodeProvider config={{ schema: NodeConfigSchema }}>
+        <Story {...args} />
+      </MemoryNodeProvider>
+    </WalletProvider>
   )
 }
 
+const UseModuleTest: React.FC<WithChildren> = ({ children }) => {
+  const [testModule] = useModule(TestModuleName, account)
+
+  useEffect(() => {
+    if (testModule) {
+      // Should be called but isn't
+      console.log('*****test module*****', testModule)
+    }
+  }, [testModule])
+
+  return <>{children}</>
+}
+
 // eslint-disable-next-line import/no-default-export
 export default {
   title: 'modules/node/NodeBox',
@@ -31,9 +55,9 @@ const Template: ComponentStory<React.FC> = (props) => {
     async (mounted) => {
       if (node) {
         try {
-          const mod = await TestModule.create({ config: { schema: 'network.xyo.test.module' } })
+          const mod = await TestModule.create({ account: TestModuleAccount, config: { name: TestModuleName, schema: 'network.xyo.test.module' } })
           node?.register(mod)
-          await node?.attach(mod.address)
+          await node?.attach(mod.address, true)
           const wrapper = NodeWrapper.wrap(node)
           const description = await wrapper?.describe()
           if (mounted()) {
@@ -49,7 +73,9 @@ const Template: ComponentStory<React.FC> = (props) => {
 
   return (
     <div {...props}>
-      <pre>{description}</pre>
+      <UseModuleTest>
+        <pre>{description}</pre>
+      </UseModuleTest>
     </div>
   )
 }

package/src/hooks/index.ts

@@ -1,15 +1,7 @@
-export * from './createUseModuleHook'
-export * from './useArchiveArchivists'
-export * from './useArchivistModule'
-export * from './useArchivistModules'
-export * from './useDivinerModule'
-export * from './useDivinerModules'
 export * from './useMemoryNodeUpdates'
 export * from './useModule'
-export * from './useModuleAddresses'
 export * from './useModules'
 export * from './useNode'
-export * from './useNodeQueryDiviner'
+export * from './useNodeAttachedAddresses'
 export * from './useProvidedNode'
-export * from './useWitnessModule'
-export * from './useWitnessModules'
+export * from './useWrappedModule'

package/src/hooks/useMemoryNodeUpdates.tsx

@@ -16,7 +16,7 @@ export const useMemoryNodeUpdates = (refreshAddresses?: string[]): UseMemoryNode
 
   useEffect(() => {
     if (node) {
-      const onFunc = node.on as ModuleAttachedEventEmitter['on']
+      const onFunc = node.module.on as ModuleAttachedEventEmitter['on']
       onFunc('moduleAttached', (args) => {
         if (refreshAddresses) {
           if (refreshAddresses.some((address) => address === args?.module.address)) setModule(args)

package/src/hooks/useModule.tsx

@@ -1,6 +1,79 @@
-import { Module, ModuleWrapper } from '@xyo-network/module'
+import { useAsyncEffect } from '@xylabs/react-shared'
+import { AccountInstance } from '@xyo-network/account-model'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
+import { ModuleAttachedEventArgs, ModuleAttachedEventEmitter, ModuleDetachedEventArgs, ModuleDetachedEventEmitter } from '@xyo-network/node'
+import { useMemo, useState } from 'react'
 
-import { createUseModuleHook } from './createUseModuleHook'
-import { useNode } from './useNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModule = createUseModuleHook<Module, ModuleWrapper>(ModuleWrapper.wrap, useNode)
+export const useModule = <TModule extends Module = Module>(
+  nameOrAddressOrFilter?: string | ModuleFilter,
+  account?: AccountInstance,
+): [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(account)
+  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) => {
+      try {
+        if (nodeError) {
+          setError(nodeError)
+          setModule(undefined)
+        } else {
+          if (node) {
+            const attachEmitter = node.module as ModuleAttachedEventEmitter
+            const detachEmitter = node.module as ModuleDetachedEventEmitter
+            const attachHandler = (args: ModuleAttachedEventArgs) => {
+              const eventModule = args.module
+              if ((eventModule.address === nameOrAddress || eventModule?.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()) {
+              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 as Error
+          setError(error)
+          setModule(undefined)
+        }
+      }
+    },
+    [nameOrAddress, node, nodeError, address, filter],
+  )
+
+  return [module, error]
+}

package/src/hooks/useModules.ts

@@ -1,23 +1,43 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { Module, ModuleFilter } from '@xyo-network/module'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
-export const useModules = <T extends Module = Module>(filter?: ModuleFilter) => {
-  const [node] = useProvidedNode(true)
-  const [modules, setModules] = useState<T[]>()
+export const useModules = <TModule extends Module = Module>(filter?: ModuleFilter): [TModule[] | undefined, Error | undefined] => {
+  const [node, nodeError] = useProvidedWrappedNode()
+  const [modules, setModules] = useState<TModule[]>()
+  const [error, setError] = useState<Error>()
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      const modules = await node?.resolve<T>(filter)
-      if (mounted()) {
-        setModules(modules)
+      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 {
+            setError(undefined)
+            setModules(undefined)
+          }
+        }
+      } catch (ex) {
+        if (mounted()) {
+          const error = ex as Error
+          setError(error)
+          setModules(undefined)
+        }
       }
     },
-    [filter, node],
+    [filter, node, nodeError],
   )
 
-  return modules
+  return [modules, error]
 }

package/src/hooks/useNode.tsx

@@ -1,9 +1,51 @@
+import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
+import { useEffect, useState } from 'react'
 
-import { createUseModuleHook } from './createUseModuleHook'
+import { useModule } from './useModule'
 import { useProvidedNode } from './useProvidedNode'
 
-export const useNode = createUseModuleHook<NodeModule, NodeWrapper>(NodeWrapper.wrap, (_nameOrAddress?: string, _wrap?: true) => [
-  useProvidedNode(true).pop(),
-  undefined,
-])
+//AT: intentionally not exported
+const useNodeModule = (nameOrAddress?: string): [NodeModule | undefined, Error | undefined] => {
+  const [providedNode] = useProvidedNode()
+  const [node, nodeError] = useModule(nameOrAddress)
+
+  if (nameOrAddress) {
+    if (providedNode) {
+      return [node as NodeModule, nodeError]
+    } else {
+      return [providedNode, undefined]
+    }
+  } else {
+    return [providedNode, undefined]
+  }
+}
+
+export const useNode = (nameOrAddress?: string, account?: AccountInstance): [NodeWrapper | undefined, Error | undefined] => {
+  const [node, nodeError] = useNodeModule(nameOrAddress)
+  const [wrapper, setWrapper] = useState<NodeWrapper>()
+  const [error, setError] = useState<Error>()
+
+  useEffect(() => {
+    if (node) {
+      if (nodeError) {
+        setError(nodeError)
+        setWrapper(undefined)
+      } else {
+        try {
+          const wrapper = NodeWrapper.wrap(node, account)
+          setWrapper(wrapper)
+          setError(undefined)
+        } catch (ex) {
+          setWrapper(undefined)
+          setError(ex as Error)
+        }
+      }
+    } else {
+      setWrapper(undefined)
+      setError(undefined)
+    }
+  }, [node, account, nodeError])
+
+  return [wrapper, error]
+}

package/src/hooks/{useModuleAddresses.ts → useNodeAttachedAddresses.ts}

@@ -1,22 +1,22 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useNode } from './useNode'
 
-export const useModuleAddresses = () => {
-  const [node] = useProvidedNode()
-  const [attachedAddresses, setAttachedAddresses] = useState<string[]>()
+export const useNodeAttachedAddresses = () => {
+  const [node] = useNode()
+  const [addresses, setAddresses] = useState<string[]>()
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       const attached = await node?.attached()
       if (mounted()) {
-        setAttachedAddresses(attached)
+        setAddresses(attached)
       }
     },
     [node],
   )
 
-  return [attachedAddresses, node?.registered()]
+  return [addresses, node?.registered()]
 }

package/src/hooks/useProvidedNode.tsx

@@ -1,14 +1,41 @@
+import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
-import { useContext } from 'react'
+import { useAccount } from '@xyo-network/react-wallet'
+import { useContext, useEffect, useMemo, useState } from 'react'
 
 import { NodeContext } from '../contexts'
 
-function useProvidedNodeFunc(wrap?: false): [NodeModule | undefined]
-function useProvidedNodeFunc(wrap: true): [NodeWrapper | undefined]
-function useProvidedNodeFunc(wrap?: boolean): [NodeModule | undefined] {
+export const useProvidedNode = (): [NodeModule | undefined] => {
   const { node } = useContext(NodeContext)
 
-  return [wrap ? NodeWrapper.wrap(node) : node]
+  return [node]
 }
 
-export const useProvidedNode = useProvidedNodeFunc
+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 && accountToUse) {
+        setWrappedNode(NodeWrapper.wrap(node, account))
+        setError(undefined)
+      }
+    } catch (ex) {
+      setWrappedNode(undefined)
+      setError(ex as Error)
+    }
+  }, [node, account, accountToUse])
+
+  return [wrappedNode, error]
+}

package/src/hooks/useWrappedModule.tsx

@@ -0,0 +1,61 @@
+import { useRenderSpinCheck } from '@xylabs/react-render-spin-check'
+import { AccountInstance } from '@xyo-network/account-model'
+import { ModuleWrapper } from '@xyo-network/module'
+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>,
+  name?: string,
+) => {
+  const useHook = (nameOrAddress?: string, account?: AccountInstance, spinCheck?: boolean): [TModuleWrapper | undefined, Error | undefined] => {
+    const spinCheckBounceNoCheck = useMemo(() => {
+      return { name: name ?? 'WrappedModuleHookFactory-NoCheck' }
+    }, [])
+    useRenderSpinCheck(spinCheck ? { name: name ?? 'WrappedModuleHookFactory' } : spinCheckBounceNoCheck)
+    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 && accountToUse) {
+        try {
+          const wrapper = wrapperObject.wrap(module, accountToUse) as TModuleWrapper
+          setWrapper(wrapper)
+        } catch (ex) {
+          setWrapper(undefined)
+          setError(ex as Error)
+        }
+      } else {
+        setWrapper(undefined)
+        setError(moduleError)
+      }
+    }, [module, account, moduleError, accountToUse])
+
+    return [wrapper, error]
+  }
+  return useHook
+}
+
+export const useWrappedModule = WrappedModuleHookFactory(ModuleWrapper)

package/dist/cjs/hooks/createUseModuleHook.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUseModuleHook = void 0;
-const tslib_1 = require("tslib");
-/* eslint-disable react-hooks/rules-of-hooks */
-const react_shared_1 = require("@xylabs/react-shared");
-const react_1 = require("react");
-const createUseModuleHook = (wrapFunc, useNodeHook) => {
-    function use(nameOrAddress, wrap = false) {
-        const [node, nodeError] = useNodeHook(nameOrAddress, true);
-        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) {
-                    setError(nodeError);
-                    setModule(undefined);
-                }
-                else {
-                    const module = yield (node === null || node === void 0 ? void 0 : node.resolve(nameOrAddress));
-                    const finalModule = wrap ? wrapFunc(module, typeof wrap === 'boolean' ? undefined : wrap) : module;
-                    if (mounted()) {
-                        setModule(finalModule);
-                    }
-                }
-            }
-            catch (ex) {
-                if (mounted()) {
-                    setError(ex);
-                    setModule(undefined);
-                }
-            }
-        }), [wrap, node, nameOrAddress, nodeError]);
-        return [module, error];
-    }
-    return use;
-};
-exports.createUseModuleHook = createUseModuleHook;
-//# sourceMappingURL=createUseModuleHook.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createUseModuleHook.js","sourceRoot":"","sources":["../../../src/hooks/createUseModuleHook.tsx"],"names":[],"mappings":";;;;AAAA,+CAA+C;AAC/C,uDAAqD;AAIrD,iCAAgC;AAOzB,MAAM,mBAAmB,GAAG,CAKjC,QAAmB,EACnB,WAA4G,EAC5G,EAAE;IAKF,SAAS,GAAG,CAAC,aAAsB,EAAE,OAA0B,KAAK;QAClE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;QAC1D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAsB,CAAA;QAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAC3C,IAAA,6BAAc;QACZ,uDAAuD;QACvD,CAAO,OAAO,EAAE,EAAE;YAChB,IAAI;gBACF,IAAI,SAAS,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;qBAAM;oBACL,MAAM,MAAM,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAU,aAAa,CAAC,CAAA,CAAA;oBAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;oBAClG,IAAI,OAAO,EAAE,EAAE;wBACb,SAAS,CAAC,WAAW,CAAC,CAAA;qBACvB;iBACF;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,EAAW,CAAC,CAAA;oBACrB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;QACH,CAAC,CAAA,EACD,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,CAAC,CACvC,CAAA;QAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACxB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AA3CY,QAAA,mBAAmB,uBA2C/B"}

package/dist/cjs/hooks/useArchiveArchivists.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useArchiveArchivists = exports.useArchiveArchivistsRaw = void 0;
-const archivist_1 = require("@xyo-network/archivist");
-const react_shared_1 = require("@xyo-network/react-shared");
-const react_1 = require("react");
-const useMemoryNodeUpdates_1 = require("./useMemoryNodeUpdates");
-const useProvidedNode_1 = require("./useProvidedNode");
-const useArchiveArchivistsRaw = (archiveName, refresher) => {
-    const [node] = (0, useProvidedNode_1.useProvidedNode)(true);
-    const buildReq = (0, react_1.useCallback)((type) => (archiveName && node) || refresher
-        ? node === null || node === void 0 ? void 0 : node.resolveWrapped(archivist_1.ArchivistWrapper, { name: [encodeURIComponent(`${archiveName}[${type}]`)] })
-        : undefined, [archiveName, node, refresher]);
-    const payloadArchivistReq = (0, react_1.useMemo)(() => buildReq('payload'), [buildReq]);
-    const boundWitnessArchivistReq = (0, react_1.useMemo)(() => buildReq('boundwitness'), [buildReq]);
-    const [archivePayloadWrapper] = (0, react_shared_1.usePromise)(payloadArchivistReq, [payloadArchivistReq]);
-    const [archiveBoundWitnessWrapper] = (0, react_shared_1.usePromise)(boundWitnessArchivistReq, [boundWitnessArchivistReq]);
-    const archivists = (0, react_1.useMemo)(() => {
-        if ((archiveBoundWitnessWrapper === null || archiveBoundWitnessWrapper === void 0 ? void 0 : archiveBoundWitnessWrapper[0]) && (archivePayloadWrapper === null || archivePayloadWrapper === void 0 ? void 0 : archivePayloadWrapper[0])) {
-            return {
-                archiveBoundWitnessWrapper: archiveBoundWitnessWrapper[0],
-                archivePayloadWrapper: archivePayloadWrapper[0],
-            };
-        }
-        else {
-            return;
-        }
-    }, [archiveBoundWitnessWrapper, archivePayloadWrapper]);
-    return archivists;
-};
-exports.useArchiveArchivistsRaw = useArchiveArchivistsRaw;
-const useArchiveArchivists = (archiveName, refresher, refreshAddresses) => {
-    const { module } = (0, useMemoryNodeUpdates_1.useMemoryNodeUpdates)(refreshAddresses);
-    const archivists = (0, exports.useArchiveArchivistsRaw)(archiveName, refresher !== null && refresher !== void 0 ? refresher : module);
-    return archivists;
-};
-exports.useArchiveArchivists = useArchiveArchivists;
-//# sourceMappingURL=useArchiveArchivists.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/hooks/useArchiveArchivists.tsx"],"names":[],"mappings":";;;AAAA,sDAAyD;AACzD,4DAAsD;AACtD,iCAA4C;AAE5C,iEAA6D;AAC7D,uDAAmD;AAO5C,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,CAAA;IAEpC,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAC1B,CAAC,IAAgC,EAAE,EAAE,CACnC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS;QAChC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,CAAC,4BAAgB,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,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1E,MAAM,wBAAwB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpF,MAAM,CAAC,qBAAqB,CAAC,GAAG,IAAA,yBAAU,EAAC,mBAAmB,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACtF,MAAM,CAAC,0BAA0B,CAAC,GAAG,IAAA,yBAAU,EAAC,wBAAwB,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAErG,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC9B,IAAI,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAG,CAAC,CAAC,MAAI,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,CAAC,CAAC,CAAA,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;AA7BY,QAAA,uBAAuB,2BA6BnC;AAEM,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAE,gBAA2B,EAAE,EAAE;IAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,2CAAoB,EAAC,gBAAgB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,IAAA,+BAAuB,EAAC,WAAW,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,MAAM,CAAC,CAAA;IAE5E,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AALY,QAAA,oBAAoB,wBAKhC"}

package/dist/cjs/hooks/useArchivistModule.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useArchivistModule = void 0;
-const archivist_1 = require("@xyo-network/archivist");
-const useModules_1 = require("./useModules");
-const useArchivistModule = (filter) => {
-    const modules = (0, useModules_1.useModules)(filter);
-    const foundModule = modules === null || modules === void 0 ? void 0 : modules.shift();
-    return foundModule ? new archivist_1.ArchivistWrapper(foundModule) : undefined;
-};
-exports.useArchivistModule = useArchivistModule;
-//# sourceMappingURL=useArchivistModule.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useArchivistModule.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistModule.ts"],"names":[],"mappings":";;;AAAA,sDAAyD;AAGzD,6CAAyC;AAElC,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAE,EAAE;IAC1D,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE,CAAA;IACpC,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,4BAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACpE,CAAC,CAAA;AAJY,QAAA,kBAAkB,sBAI9B"}

package/dist/cjs/hooks/useArchivistModules.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useArchivistModules = void 0;
-const archivist_1 = require("@xyo-network/archivist");
-const useModules_1 = require("./useModules");
-const useArchivistModules = () => {
-    const modules = (0, useModules_1.useModules)({ query: [[archivist_1.ArchivistGetQuerySchema]] });
-    return modules === null || modules === void 0 ? void 0 : modules.map((module) => new archivist_1.ArchivistWrapper(module));
-};
-exports.useArchivistModules = useArchivistModules;
-//# sourceMappingURL=useArchivistModules.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useArchivistModules.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistModules.ts"],"names":[],"mappings":";;;AAAA,sDAAkF;AAElF,6CAAyC;AAElC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,mCAAuB,CAAC,CAAC,EAAE,CAAC,CAAA;IAClE,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,4BAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;AAC/D,CAAC,CAAA;AAHY,QAAA,mBAAmB,uBAG/B"}

package/dist/cjs/hooks/useDivinerModule.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDivinerModule = void 0;
-const diviner_wrapper_1 = require("@xyo-network/diviner-wrapper");
-const useModules_1 = require("./useModules");
-const useDivinerModule = (filter) => {
-    const modules = (0, useModules_1.useModules)(filter);
-    const foundModule = modules === null || modules === void 0 ? void 0 : modules.shift();
-    return foundModule ? new diviner_wrapper_1.DivinerWrapper(foundModule) : undefined;
-};
-exports.useDivinerModule = useDivinerModule;
-//# sourceMappingURL=useDivinerModule.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useDivinerModule.js","sourceRoot":"","sources":["../../../src/hooks/useDivinerModule.ts"],"names":[],"mappings":";;;AAAA,kEAA6D;AAG7D,6CAAyC;AAElC,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAE,EAAE;IACxD,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAA;IAClC,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE,CAAA;IACpC,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,gCAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAClE,CAAC,CAAA;AAJY,QAAA,gBAAgB,oBAI5B"}

package/dist/cjs/hooks/useDivinerModules.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDivinerModules = void 0;
-const diviner_model_1 = require("@xyo-network/diviner-model");
-const diviner_wrapper_1 = require("@xyo-network/diviner-wrapper");
-const useModules_1 = require("./useModules");
-const useDivinerModules = () => {
-    const modules = (0, useModules_1.useModules)({ query: [[diviner_model_1.XyoDivinerDivineQuerySchema]] });
-    return modules === null || modules === void 0 ? void 0 : modules.map((module) => new diviner_wrapper_1.DivinerWrapper(module));
-};
-exports.useDivinerModules = useDivinerModules;
-//# sourceMappingURL=useDivinerModules.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useDivinerModules.js","sourceRoot":"","sources":["../../../src/hooks/useDivinerModules.ts"],"names":[],"mappings":";;;AAAA,8DAAwE;AACxE,kEAA6D;AAE7D,6CAAyC;AAElC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,2CAA2B,CAAC,CAAC,EAAE,CAAC,CAAA;IACtE,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,gCAAc,CAAC,MAAM,CAAC,CAAC,CAAA;AAC7D,CAAC,CAAA;AAHY,QAAA,iBAAiB,qBAG7B"}