@xyo-network/react-archivist 2.37.29 → 2.38.0-rc.2

package/src/contexts/Provider/MemoryArchivistProvider.tsx

@@ -1,46 +1,56 @@
+import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchivistWrapper, XyoMemoryArchivist, XyoMemoryArchivistConfig } from '@xyo-network/archivist'
-import { XyoModuleResolverFunc } from '@xyo-network/module'
+import { XyoModuleResolver } from '@xyo-network/module'
 import { ContextExProviderProps } from '@xyo-network/react-shared'
 import merge from 'lodash/merge'
+import { useMemo, useState } from 'react'
 
 import { useArchivist } from '../use'
 import { ArchivistProvider } from './Provider'
 
 export type MemoryArchivistProviderProps = ContextExProviderProps<{
   config?: XyoMemoryArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  resolver?: XyoModuleResolver
 }>
 
 export const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const activeResolver: XyoModuleResolverFunc = (address: string) => {
-    if (archivist && address === archivist?.address) {
-      return new XyoArchivistWrapper(archivist)
-    }
-    return resolver?.(address) ?? null
+  const wrapper = useMemo(() => (archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined), [archivist])
+  const activeResolver: XyoModuleResolver | undefined = useMemo(
+    () => (resolver ?? wrapper ? new XyoModuleResolver() : undefined),
+    [resolver, wrapper],
+  )
+  if (archivist) {
+    activeResolver?.add(new XyoArchivistWrapper({ module: archivist }))
   }
-  return (
-    <ArchivistProvider
-      archivist={
-        new XyoMemoryArchivist(
-          merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          undefined,
-          activeResolver,
-        )
+
+  const [activeArchivist, setActiveArchivist] = useState<XyoMemoryArchivist>()
+
+  useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+      const activeArchivist = await new XyoMemoryArchivist({
+        config: merge(
+          {},
+          config,
+          archivist
+            ? {
+                parents: {
+                  commit: [archivist.address],
+                  read: [archivist.address],
+                  write: [archivist.address],
+                },
+              }
+            : undefined,
+        ),
+        resolver: activeResolver,
+      }).start()
+      if (mounted()) {
+        setActiveArchivist(activeArchivist)
       }
-      {...props}
-    />
+    },
+    [activeResolver, archivist, config],
   )
+
+  return <ArchivistProvider archivist={activeArchivist} {...props} />
 }

package/src/contexts/Provider/RemoteArchivistProvider.tsx

@@ -1,47 +1,57 @@
+import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoRemoteArchivist, XyoRemoteArchivistConfig } from '@xyo-network/api'
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
-import { XyoModuleResolverFunc } from '@xyo-network/module'
+import { XyoModuleResolver } from '@xyo-network/module'
 import { ContextExProviderProps } from '@xyo-network/react-shared'
 import merge from 'lodash/merge'
+import { useMemo, useState } from 'react'
 
 import { useArchivist } from '../use'
 import { ArchivistProvider } from './Provider'
 
 export type RemoteArchivistProviderProps = ContextExProviderProps<{
-  config: XyoRemoteArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  config?: XyoRemoteArchivistConfig
+  resolver?: XyoModuleResolver
 }>
 
 export const RemoteArchivistProvider: React.FC<RemoteArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const activeResolver: XyoModuleResolverFunc = (address: string) => {
-    if (archivist && address === archivist?.address) {
-      return new XyoArchivistWrapper(archivist)
-    }
-    return resolver?.(address) ?? null
+  const wrapper = useMemo(() => (archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined), [archivist])
+  const activeResolver: XyoModuleResolver | undefined = useMemo(
+    () => (resolver ?? wrapper ? new XyoModuleResolver() : undefined),
+    [resolver, wrapper],
+  )
+  if (archivist) {
+    activeResolver?.add(new XyoArchivistWrapper({ module: archivist }))
   }
-  return (
-    <ArchivistProvider
-      archivist={
-        new XyoRemoteArchivist(
-          merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          undefined,
-          activeResolver,
-        )
+
+  const [activeArchivist, setActiveArchivist] = useState<XyoRemoteArchivist>()
+
+  useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+      const activeArchivist = await new XyoRemoteArchivist({
+        config: merge(
+          {},
+          config,
+          archivist
+            ? {
+                parents: {
+                  commit: [archivist.address],
+                  read: [archivist.address],
+                  write: [archivist.address],
+                },
+              }
+            : undefined,
+        ),
+        resolver: activeResolver,
+      }).start()
+      if (mounted()) {
+        setActiveArchivist(activeArchivist)
       }
-      {...props}
-    />
+    },
+    [activeResolver, archivist, config],
   )
+
+  return <ArchivistProvider archivist={activeArchivist} {...props} />
 }

package/src/contexts/Provider/StorageArchivistProvider.tsx

@@ -1,5 +1,5 @@
 import { XyoArchivistWrapper, XyoStorageArchivist, XyoStorageArchivistConfig } from '@xyo-network/archivist'
-import { XyoModuleResolverFunc } from '@xyo-network/module'
+import { XyoModuleResolver } from '@xyo-network/module'
 import { ContextExProviderProps } from '@xyo-network/react-shared'
 import merge from 'lodash/merge'
 
@@ -8,40 +8,50 @@ import { ArchivistProvider } from './Provider'
 
 export type StorageArchivistProviderProps = ContextExProviderProps<{
   config: XyoStorageArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  resolver?: XyoModuleResolver
 }>
 
+import { useAsyncEffect } from '@xylabs/react-shared'
+import { useMemo, useState } from 'react'
+
 export const StorageArchivistProvider: React.FC<StorageArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const activeResolver: XyoModuleResolverFunc = (address: string) => {
-    if (archivist && address === archivist?.address) {
-      return new XyoArchivistWrapper(archivist)
-    }
-    return resolver?.(address) ?? null
+  const wrapper = useMemo(() => (archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined), [archivist])
+  const activeResolver: XyoModuleResolver | undefined = useMemo(
+    () => (resolver ?? wrapper ? new XyoModuleResolver() : undefined),
+    [resolver, wrapper],
+  )
+  if (archivist) {
+    activeResolver?.add(new XyoArchivistWrapper({ module: archivist }))
   }
 
-  return (
-    <ArchivistProvider
-      archivist={
-        new XyoStorageArchivist(
-          merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          undefined,
-          activeResolver,
-        )
+  const [activeArchivist, setActiveArchivist] = useState<XyoStorageArchivist>()
+
+  useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+      const activeArchivist = await new XyoStorageArchivist({
+        config: merge(
+          {},
+          config,
+          archivist
+            ? {
+                parents: {
+                  commit: [archivist.address],
+                  read: [archivist.address],
+                  write: [archivist.address],
+                },
+              }
+            : undefined,
+        ),
+        resolver: activeResolver,
+      }).start()
+      if (mounted()) {
+        setActiveArchivist(activeArchivist)
       }
-      {...props}
-    />
+    },
+    [activeResolver, archivist, config],
   )
+
+  return <ArchivistProvider archivist={activeArchivist} {...props} />
 }

package/src/contexts/use.ts

@@ -1,6 +1,6 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { XyoArchivistWrapper, XyoPayloadFindFilter } from '@xyo-network/archivist'
-import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
+import { XyoArchivistWrapper } from '@xyo-network/archivist'
+import { XyoPayload, XyoPayloadFindFilter, XyoPayloads } from '@xyo-network/payload'
 import { useContextEx } from '@xyo-network/react-shared'
 import { useState } from 'react'
 
@@ -18,7 +18,7 @@ export const useArchivistGet = (ids?: string[], required = false): [(XyoPayload
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        const wrapper = archivist ? new XyoArchivistWrapper(archivist) : undefined
+        const wrapper = archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined
         const result = (await wrapper?.get(ids ?? [])) ?? []
         if (mounted()) {
           setError(undefined)
@@ -41,7 +41,7 @@ export const useArchivistFind = <TFilter extends XyoPayloadFindFilter>(filter: T
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        const wrapper = archivist ? new XyoArchivistWrapper(archivist) : undefined
+        const wrapper = archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined
         const result = await wrapper?.find(filter)
         if (mounted()) {
           setError(undefined)