@xyo-network/react-node 2.44.1 → 2.45.0-rc.10

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

@@ -0,0 +1,60 @@
+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, nodeFunc: NodeFunc) => {
+    (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];
+};
+//# sourceMappingURL=useNode.d.ts.map

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

@@ -0,0 +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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAMpB,QAAQ;YAEE,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;CAsDyE,CAAA"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNodeQueryDiviner.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeQueryDiviner.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAOpE,eAAO,MAAM,sBAAsB,sBACd,MAAM,UACjB,UAAU,cACN,OAAO,KAClB,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA4B7C,CAAA;AAED,eAAO,MAAM,mBAAmB,sBACX,MAAM,UACjB,UAAU,cACN,OAAO,qBACA,MAAM,EAAE;;kCAM5B,CAAA"}

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

@@ -0,0 +1,8 @@
+import { Account } from '@xyo-network/account';
+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 {};
+//# sourceMappingURL=useProvidedNode.d.ts.map

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

@@ -0,0 +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;AAmBhG,eAAO,MAAM,eAAe,4BAAsB,CAAA"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWitnessModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWitnessModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAIrD,eAAO,MAAM,gBAAgB,YAAa,YAAY,+BAIrD,CAAA"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWitnessModules.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWitnessModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgC,MAAM,sBAAsB,CAAA;AAInF,eAAO,MAAM,iBAAiB,oCAG7B,CAAA"}

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
 export * from './components';
 export * from './contexts';
+export * from './hooks';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}

package/package.json

@@ -13,20 +13,21 @@
     "@mui/lab": "^5.0.0-alpha.121",
     "@xylabs/react-flexbox": "^2.16.8",
     "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/archivist": "^2.50.2",
-    "@xyo-network/diviner-model": "^2.50.2",
-    "@xyo-network/diviner-wrapper": "^2.50.2",
-    "@xyo-network/module": "^2.50.2",
-    "@xyo-network/module-model": "^2.50.2",
-    "@xyo-network/node": "^2.50.2",
-    "@xyo-network/payload-model": "^2.50.2",
-    "@xyo-network/react-shared": "^2.44.1",
-    "@xyo-network/witness": "^2.50.2"
+    "@xyo-network/account": "^2.51.2",
+    "@xyo-network/archivist": "^2.51.2",
+    "@xyo-network/diviner-model": "^2.51.2",
+    "@xyo-network/diviner-wrapper": "^2.51.2",
+    "@xyo-network/module": "^2.51.2",
+    "@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.10",
+    "@xyo-network/witness": "^2.51.2"
   },
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@xylabs/ts-scripts-yarn3": "^2.15.0",
-    "@xylabs/tsconfig-react": "^2.15.0",
+    "@xylabs/ts-scripts-yarn3": "^2.16.0",
+    "@xylabs/tsconfig-react": "^2.16.0",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -82,5 +83,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.44.1"
+  "version": "2.45.0-rc.10",
+  "stableVersion": "2.44.1"
 }

package/src/components/Node.stories.tsx

@@ -4,7 +4,8 @@ import { AbstractModule } from '@xyo-network/module'
 import { MemoryNode, NodeConfigSchema, NodeWrapper } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { MemoryNodeProvider, useNode } from '../contexts'
+import { MemoryNodeProvider } from '../contexts'
+import { useProvidedNode } from '../hooks'
 
 class TestModule extends AbstractModule {}
 
@@ -18,11 +19,11 @@ const MemoryNodeDecorator: DecoratorFn = (Story, args) => {
 
 // eslint-disable-next-line import/no-default-export
 export default {
-  title: 'node/NodeBox',
+  title: 'modules/node/NodeBox',
 } as Meta
 
 const Template: ComponentStory<React.FC> = (props) => {
-  const node = useNode<MemoryNode>()
+  const [node] = useProvidedNode() as [MemoryNode, Error]
   const [description, setDescription] = useState<string>()
 
   useAsyncEffect(

package/src/components/Node.tsx

@@ -3,10 +3,10 @@ import { useAsyncEffect } from '@xylabs/react-shared'
 import { NodeWrapper } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { useNode } from '../contexts'
+import { useProvidedNode } from '../hooks'
 
 export const NodeBox: React.FC<FlexBoxProps> = (props) => {
-  const node = useNode()
+  const [node] = useProvidedNode()
   const [description, setDescription] = useState<string>()
 
   useAsyncEffect(

package/src/components/NodeDrawer.stories.tsx

@@ -17,7 +17,7 @@ const ProviderDecorator: DecoratorFn = (Story, args) => (
 const StorybookEntry = {
   component: NodeDrawer,
   decorators: [ProviderDecorator],
-  title: 'node/NodeDrawer',
+  title: 'modules/node/NodeDrawer',
 } as ComponentMeta<typeof NodeDrawer>
 
 const Template: ComponentStory<typeof NodeDrawer> = (args) => {

package/src/components/NodeDrawer.tsx

@@ -3,14 +3,15 @@ import { ClickAwayListener, Drawer, DrawerProps, IconButton } from '@mui/materia
 import { FlexGrowCol, FlexRow } from '@xylabs/react-flexbox'
 import { WithChildren } from '@xylabs/react-shared'
 
-import { useNode, useNodeDrawer } from '../contexts'
+import { useNodeDrawer } from '../contexts'
+import { useProvidedNode } from '../hooks'
 import { ModuleDescriptionBox } from './render'
 
 export interface NodeDrawerProps extends WithChildren, Omit<DrawerProps, 'open'> {}
 
 export const NodeDrawer: React.FC<NodeDrawerProps> = ({ children, ...props }) => {
   const { open, setOpen } = useNodeDrawer()
-  const node = useNode()
+  const [node] = useProvidedNode()
 
   return (
     <Drawer open={open ?? false} anchor="right" {...props}>

package/src/contexts/MemoryProvider.tsx

@@ -3,7 +3,7 @@ import { ModuleParams } from '@xyo-network/module'
 import { MemoryNode, NodeConfig } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { NodeProvider } from './Provider'
+import { NodeProvider } from './Node'
 
 export type MemoryNodeProviderProps = WithChildren<{
   moduleParams?: ModuleParams<NodeConfig>
@@ -11,7 +11,7 @@ export type MemoryNodeProviderProps = WithChildren<{
 }> &
   ModuleParams<NodeConfig>
 
-export const MemoryNodeProvider: React.FC<MemoryNodeProviderProps> = ({ children, moduleParams, required = false }) => {
+export const MemoryNodeProvider: React.FC<MemoryNodeProviderProps> = ({ children, moduleParams }) => {
   const [node, setNode] = useState<MemoryNode>()
 
   useAsyncEffect(
@@ -25,9 +25,5 @@ export const MemoryNodeProvider: React.FC<MemoryNodeProviderProps> = ({ children
     [moduleParams],
   )
 
-  return (
-    <NodeProvider node={node} required={required}>
-      {children}
-    </NodeProvider>
-  )
+  return <NodeProvider node={node}>{children}</NodeProvider>
 }

package/src/contexts/Node/Provider.tsx

@@ -0,0 +1,16 @@
+import { WithChildren } from '@xylabs/react-shared'
+import { NodeModule } from '@xyo-network/node'
+import { useMemo } from 'react'
+
+import { NodeContext } from './Context'
+
+export interface NodeProviderProps {
+  node?: NodeModule
+}
+
+export const NodeProvider: React.FC<WithChildren<NodeProviderProps>> = ({ node, children }) => {
+  //save a reference to it
+  const memoNode = useMemo(() => node, [node])
+
+  return <NodeContext.Provider value={{ node: memoNode, provided: true }}>{children}</NodeContext.Provider>
+}

package/src/contexts/{State.ts → Node/State.ts}

@@ -1,7 +1,5 @@
 import { NodeModule } from '@xyo-network/node'
-import { Dispatch } from 'react'
 
 export interface NodeContextState {
   node?: NodeModule
-  setNode?: Dispatch<NodeModule>
 }

package/src/contexts/Node/index.ts

@@ -0,0 +1,3 @@
+export * from './Context'
+export * from './Provider'
+export * from './State'

package/src/contexts/index.ts

@@ -1,19 +1,4 @@
-export * from './Context'
 export * from './MemoryProvider'
 export * from './ModuleRepository'
+export * from './Node'
 export * from './NodeDrawerContext'
-export * from './Provider'
-export * from './State'
-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 './useWitnessModule'
-export * from './useWitnessModules'

package/src/hooks/index.ts

@@ -0,0 +1,14 @@
+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 './useProvidedNode'
+export * from './useWitnessModule'
+export * from './useWitnessModules'

package/src/{contexts → hooks}/useArchiveArchivists.tsx

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

package/src/{contexts → hooks}/useMemoryNodeUpdates.tsx

@@ -1,5 +1,5 @@
 import { ModuleResolver } from '@xyo-network/module-model'
-import { MemoryNode, ModuleAttachedEventArgs } from '@xyo-network/node'
+import { ModuleAttachedEventArgs, ModuleAttachedEventEmitter } from '@xyo-network/node'
 import { useEffect, useState } from 'react'
 
 import { useNode } from './useNode'
@@ -11,12 +11,13 @@ interface UseMemoryNodeUpdates {
 }
 
 export const useMemoryNodeUpdates = (refreshAddresses?: string[]): UseMemoryNodeUpdates => {
-  const node = useNode<MemoryNode>()
+  const [node] = useNode()
   const [module, setModule] = useState<ModuleAttachedEventArgs>()
 
   useEffect(() => {
     if (node) {
-      node.on('moduleAttached', (args) => {
+      const onFunc = node.on as ModuleAttachedEventEmitter['on']
+      onFunc('moduleAttached', (args) => {
         if (refreshAddresses) {
           if (refreshAddresses.some((address) => address === args?.module.address)) setModule(args)
         } else {

package/src/hooks/useModule.tsx

@@ -0,0 +1,5 @@
+import { Module, ModuleWrapper } from '@xyo-network/module'
+
+import { createUseModuleHook, useNode } from './useNode'
+
+export const useModule = createUseModuleHook<Module, ModuleWrapper>((module) => ModuleWrapper.tryWrap(module), useNode)

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

@@ -1,10 +1,10 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { useState } from 'react'
 
-import { useNode } from './useNode'
+import { useProvidedNode } from './useProvidedNode'
 
 export const useModuleAddresses = () => {
-  const node = useNode()
+  const [node] = useProvidedNode()
   const [attachedAddresses, setAttachedAddresses] = useState<string[]>()
 
   useAsyncEffect(

package/src/{contexts → hooks}/useModules.ts

@@ -1,12 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { Module, ModuleFilter } from '@xyo-network/module'
-import { NodeModule } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { useWrappedNode } from './useNode'
+import { useProvidedNode } from './useProvidedNode'
 
 export const useModules = <T extends Module = Module>(filter?: ModuleFilter) => {
-  const node = useWrappedNode<NodeModule>()
+  const [node] = useProvidedNode(true)
   const [modules, setModules] = useState<T[]>()
 
   useAsyncEffect(

package/src/hooks/useNode.tsx

@@ -0,0 +1,83 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+import { useAsyncEffect } from '@xylabs/react-shared'
+import { Account } from '@xyo-network/account'
+import { Module, ModuleWrapper } from '@xyo-network/module'
+import { NodeModule, NodeWrapper } from '@xyo-network/node'
+import { useState } from 'react'
+
+import { useProvidedNode } from './useProvidedNode'
+
+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 const createUseModuleHook = <
+  TModule extends Module = Module,
+  TWrapper extends ModuleWrapper = ModuleWrapper,
+  TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>,
+>(
+  wrapFunc: TWrapFunc,
+  nodeFunc: NodeFunc,
+) => {
+  function use(name?: string): [TModule | undefined, Error | undefined]
+  function use(name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined]
+  function use(wrap: true | Account): [TWrapper | undefined, Error | undefined]
+  function use(address: string): [TModule | undefined, Error | undefined]
+  function use(address: string, wrap: true | Account): [TWrapper | undefined, Error | undefined]
+  function use(
+    nameOrAddressOrWrapOrAccount?: string | boolean | Account,
+    wrap: boolean | Account = false,
+  ): [TWrapper | TModule | undefined, Error | undefined] {
+    const [node, nodeError] = nodeFunc()
+    const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap
+    const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap
+    const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined
+    const [module, setModule] = useState<TModule | TWrapper>()
+    const [error, setError] = useState<Error>()
+    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.wrap(node)
+            if (wrappedNode) {
+              const module: TModule | undefined = nameOrAddress
+                ? await wrappedNode?.resolve<TModule>(nameOrAddress)
+                : (await wrappedNode.resolve<TModule>()).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 as Error
+            console.log(`Setting Error [${error.message}]`)
+            setError(error)
+            setModule(undefined)
+          }
+        }
+      },
+      [wrap, node, nameOrAddress, nodeError, shouldWrap, account],
+    )
+
+    return [module, error]
+  }
+  return use
+}
+
+export const useNode = createUseModuleHook<NodeModule, NodeWrapper>((module) => NodeWrapper.tryWrap(module), useProvidedNode)

package/src/{contexts → hooks}/useNodeQueryDiviner.tsx

@@ -1,12 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { DivinerWrapper } from '@xyo-network/diviner-wrapper'
-import { MemoryNode } from '@xyo-network/node'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload-model'
 import { assertDefinedEx } from '@xyo-network/react-shared'
 import { useState } from 'react'
 
 import { useMemoryNodeUpdates } from './useMemoryNodeUpdates'
-import { useNode } from './useNode'
+import { useProvidedNode } from './useProvidedNode'
 
 export const useNodeQueryDivinerRaw = (
   moduleIdentifier?: string,
@@ -15,7 +14,7 @@ export const useNodeQueryDivinerRaw = (
 ): [XyoPayloads | undefined, Error | undefined] => {
   const [result, setResult] = useState<XyoPayloads>()
   const [error, setError] = useState<Error>()
-  const node = useNode<MemoryNode>()
+  const [node] = useProvidedNode()
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/hooks/useProvidedNode.tsx

@@ -0,0 +1,28 @@
+import { Account } from '@xyo-network/account'
+import { NodeModule, NodeWrapper } from '@xyo-network/node'
+import { useContext, useState } from 'react'
+
+import { NodeContext } from '../contexts'
+
+function useProvidedNodeFunc(wrap?: undefined): [NodeModule | undefined, Error | undefined]
+function useProvidedNodeFunc(wrap: false): [NodeModule | undefined, Error | undefined]
+function useProvidedNodeFunc(wrap: true | Account): [NodeWrapper | undefined, Error | undefined]
+function useProvidedNodeFunc(wrap: boolean | Account | undefined): [NodeModule | NodeWrapper | undefined, Error | undefined] {
+  const { node } = useContext(NodeContext)
+  const [wrappedNode, setWrappedNode] = useState<NodeWrapper>()
+  const [error, setError] = useState<Error>()
+
+  try {
+    if (wrap) {
+      const account = typeof wrap === 'boolean' ? undefined : wrap
+      const wrappedNode = wrap ? NodeWrapper.wrap(node, account) : undefined
+      setWrappedNode(wrappedNode)
+      setError(undefined)
+    }
+  } catch (ex) {
+    setError(ex as Error)
+  }
+  return [wrap ? wrappedNode : node, error]
+}
+
+export const useProvidedNode = useProvidedNodeFunc

package/src/index.ts

@@ -1,2 +1,3 @@
 export * from './components'
 export * from './contexts'
+export * from './hooks'

package/dist/cjs/contexts/Context.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Context.js","sourceRoot":"","sources":["../../../src/contexts/Context.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAI9C,QAAA,WAAW,GAAG,IAAA,8BAAe,GAAoB,CAAA"}

package/dist/cjs/contexts/Provider.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoNodeProvider = exports.NodeProvider = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const Context_1 = require("./Context");
-const NodeProvider = ({ node: nodeProp, required = false, children }) => {
-    const [node, setNode] = (0, react_1.useState)();
-    (0, react_1.useEffect)(() => {
-        setNode(nodeProp);
-    }, [nodeProp]);
-    return !required || node ? (0, jsx_runtime_1.jsx)(Context_1.NodeContext.Provider, Object.assign({ value: { node, provided: true, setNode } }, { children: children })) : null;
-};
-exports.NodeProvider = NodeProvider;
-/** @deprecated use NodeProvider instead */
-exports.XyoNodeProvider = exports.NodeProvider;
-//# sourceMappingURL=Provider.js.map

package/dist/cjs/contexts/Provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";;;;AAEA,iCAA2C;AAE3C,uCAAuC;AAUhC,MAAM,YAAY,GAA8C,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IACxH,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,GAAc,CAAA;IAE9C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,uBAAC,qBAAW,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAG,QAAQ,IAAwB,CAAC,CAAC,CAAC,IAAI,CAAA;AACrI,CAAC,CAAA;AARY,QAAA,YAAY,gBAQxB;AAED,2CAA2C;AAC9B,QAAA,eAAe,GAAG,oBAAY,CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/contexts/useArchiveArchivists.tsx"],"names":[],"mappings":";;;AAAA,sDAAyD;AAEzD,4DAAsD;AACtD,iCAA4C;AAE5C,iEAA6D;AAC7D,uCAA0C;AAOnC,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,IAAI,GAAG,IAAA,wBAAc,GAAc,CAAA;IAEzC,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/contexts/useArchivistModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useArchivistModule.js","sourceRoot":"","sources":["../../../src/contexts/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/contexts/useArchivistModules.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useArchivistModules.js","sourceRoot":"","sources":["../../../src/contexts/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/contexts/useDivinerModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useDivinerModule.js","sourceRoot":"","sources":["../../../src/contexts/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/contexts/useDivinerModules.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useDivinerModules.js","sourceRoot":"","sources":["../../../src/contexts/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"}

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

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

package/dist/cjs/contexts/useModule.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useModule = void 0;
-const tslib_1 = require("tslib");
-const react_shared_1 = require("@xylabs/react-shared");
-const module_1 = require("@xyo-network/module");
-const react_1 = require("react");
-const useNode_1 = require("./useNode");
-const useModule = (addressOrName, query = [[module_1.ModuleDiscoverQuerySchema]]) => {
-    const node = (0, useNode_1.useWrappedNode)();
-    const [module, setModule] = (0, react_1.useState)();
-    (0, react_shared_1.useAsyncEffect)(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        if (addressOrName) {
-            const module = yield (node === null || node === void 0 ? void 0 : node.resolve(addressOrName));
-            if (mounted()) {
-                setModule(module);
-            }
-        }
-        else {
-            const module = (_a = (yield (node === null || node === void 0 ? void 0 : node.resolve({ query })))) === null || _a === void 0 ? void 0 : _a.pop();
-            if (mounted()) {
-                setModule(module);
-            }
-        }
-    }), [node, addressOrName, query]);
-    return module;
-};
-exports.useModule = useModule;
-//# sourceMappingURL=useModule.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/contexts/useModule.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AACrD,gDAAuE;AACvE,iCAAgC;AAEhC,uCAA0C;AAEnC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAAE,QAAoB,CAAC,CAAC,kCAAyB,CAAC,CAAC,EAAE,EAAE;IACtI,MAAM,IAAI,GAAG,IAAA,wBAAc,GAAE,CAAA;IAC7B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAW,CAAA;IAE/C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI,aAAa,EAAE;YACjB,MAAM,MAAM,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAU,aAAa,CAAC,CAAA,CAAA;YAC1D,IAAI,OAAO,EAAE,EAAE;gBACb,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;SACF;aAAM;YACL,MAAM,MAAM,GAAG,MAAA,CAAC,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAU,EAAE,KAAK,EAAE,CAAC,CAAA,CAAC,0CAAE,GAAG,EAAE,CAAA;YAC/D,IAAI,OAAO,EAAE,EAAE;gBACb,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;SACF;IACH,CAAC,CAAA,EACD,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,CAC7B,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAvBY,QAAA,SAAS,aAuBrB"}

package/dist/cjs/contexts/useModuleAddresses.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useModuleAddresses.js","sourceRoot":"","sources":["../../../src/contexts/useModuleAddresses.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AACrD,iCAAgC;AAEhC,uCAAmC;AAE5B,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAA;IACtB,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IAEtE,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,CAAA,CAAA;QACvC,IAAI,OAAO,EAAE,EAAE;YACb,oBAAoB,CAAC,QAAQ,CAAC,CAAA;SAC/B;IACH,CAAC,CAAA,EACD,CAAC,IAAI,CAAC,CACP,CAAA;IAED,OAAO,CAAC,iBAAiB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE,CAAC,CAAA;AAChD,CAAC,CAAA;AAhBY,QAAA,kBAAkB,sBAgB9B"}