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

package/dist/esm/contexts/Provider/StorageArchivistProvider.js

@@ -4,10 +4,20 @@ import { XyoModuleResolver } from '@xyo-network/module';
 import merge from 'lodash/merge';
 import { useArchivist } from '../use';
 import { ArchivistProvider } from './Provider';
+import { useAsyncEffect } from '@xylabs/react-shared';
+import { useMemo, useState } from 'react';
 export const StorageArchivistProvider = ({ config, resolver, ...props }) => {
     const { archivist } = useArchivist();
-    const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined);
-    return (_jsx(ArchivistProvider, { archivist: new XyoStorageArchivist({
+    const wrapper = useMemo(() => (archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined), [archivist]);
+    const activeResolver = useMemo(() => (resolver ?? wrapper ? new XyoModuleResolver() : undefined), [resolver, wrapper]);
+    if (archivist) {
+        activeResolver?.add(new XyoArchivistWrapper({ module: archivist }));
+    }
+    const [activeArchivist, setActiveArchivist] = useState();
+    useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+        const activeArchivist = await new XyoStorageArchivist({
             config: merge({}, config, archivist
                 ? {
                     parents: {
@@ -18,6 +28,11 @@ export const StorageArchivistProvider = ({ config, resolver, ...props }) => {
                 }
                 : undefined),
             resolver: activeResolver,
-        }), ...props }));
+        }).start();
+        if (mounted()) {
+            setActiveArchivist(activeArchivist);
+        }
+    }, [activeResolver, archivist, config]);
+    return _jsx(ArchivistProvider, { archivist: activeArchivist, ...props });
 };
 //# sourceMappingURL=StorageArchivistProvider.js.map

package/dist/esm/contexts/Provider/StorageArchivistProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/StorageArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAA6B,MAAM,wBAAwB,CAAA;AAC5G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,KAAK,MAAM,cAAc,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAO9C,MAAM,CAAC,MAAM,wBAAwB,GAA4C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,cAAc,GAAG,QAAQ,IAAI,IAAI,iBAAiB,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAEtI,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,mBAAmB,CAAC;YACtB,MAAM,EAAE,KAAK,CACX,EAAE,EACF,MAAM,EACN,SAAS;gBACP,CAAC,CAAC;oBACE,OAAO,EAAE;wBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;wBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;wBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;qBAC3B;iBACF;gBACH,CAAC,CAAC,SAAS,CACd;YACD,QAAQ,EAAE,cAAc;SACzB,CAAC,KAEA,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"StorageArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/StorageArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAA6B,MAAM,wBAAwB,CAAA;AAC5G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,KAAK,MAAM,cAAc,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAO9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEzC,MAAM,CAAC,MAAM,wBAAwB,GAA4C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IACpH,MAAM,cAAc,GAAkC,OAAO,CAC3D,GAAG,EAAE,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EACjE,CAAC,QAAQ,EAAE,OAAO,CAAC,CACpB,CAAA;IACD,IAAI,SAAS,EAAE;QACb,cAAc,EAAE,GAAG,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACpE;IAED,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,EAAuB,CAAA;IAE7E,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,eAAe,GAAG,MAAM,IAAI,mBAAmB,CAAC;YACpD,MAAM,EAAE,KAAK,CACX,EAAE,EACF,MAAM,EACN,SAAS;gBACP,CAAC,CAAC;oBACE,OAAO,EAAE;wBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;wBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;wBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;qBAC3B;iBACF;gBACH,CAAC,CAAC,SAAS,CACd;YACD,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC,KAAK,EAAE,CAAA;QACV,IAAI,OAAO,EAAE,EAAE;YACb,kBAAkB,CAAC,eAAe,CAAC,CAAA;SACpC;IACH,CAAC,EACD,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CACpC,CAAA;IAED,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,eAAe,KAAM,KAAK,GAAI,CAAA;AACrE,CAAC,CAAA"}

package/package.json

@@ -13,8 +13,8 @@
     "@xylabs/react-button": "^2.15.1",
     "@xylabs/react-flexbox": "^2.15.1",
     "@xylabs/react-shared": "^2.15.1",
-    "@xyo-network/module": "^2.38.0-rc.2",
-    "@xyo-network/react-shared": "^2.38.0-rc.1",
+    "@xyo-network/module": "^2.38.0-rc.4",
+    "@xyo-network/react-shared": "^2.38.0-rc.2",
     "lodash": "^4.17.21",
     "tslib": "^2.4.0"
   },
@@ -29,9 +29,9 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@types/lodash": "^4.14.186",
-    "@xyo-network/api": "^2.38.0-rc.2",
-    "@xyo-network/archivist": "^2.38.0-rc.2",
-    "@xyo-network/payload": "^2.38.0-rc.2"
+    "@xyo-network/api": "^2.38.0-rc.4",
+    "@xyo-network/archivist": "^2.38.0-rc.4",
+    "@xyo-network/payload": "^2.38.0-rc.4"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -75,6 +75,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.38.0-rc.1",
+  "version": "2.38.0-rc.2",
   "stableVersion": "2.37.29"
 }

package/src/contexts/Provider/CookieArchivistProvider.tsx

@@ -1,7 +1,9 @@
+import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchivistWrapper, XyoCookieArchivist, XyoCookieArchivistConfig } from '@xyo-network/archivist'
 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'
@@ -13,32 +15,42 @@ export type CookieArchivistProviderProps = ContextExProviderProps<{
 
 export const CookieArchivistProvider: React.FC<CookieArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const wrapper = archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined
-  const activeResolver: XyoModuleResolver | undefined = resolver ?? wrapper ? new XyoModuleResolver() : undefined
+  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 XyoCookieArchivist({
-          config: merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          resolver: activeResolver,
-        })
+
+  const [activeArchivist, setActiveArchivist] = useState<XyoCookieArchivist>()
+
+  useAsyncEffect(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    async (mounted) => {
+      const activeArchivist = await new XyoCookieArchivist({
+        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/MemoryArchivistProvider.tsx

@@ -1,7 +1,9 @@
+import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchivistWrapper, XyoMemoryArchivist, XyoMemoryArchivistConfig } from '@xyo-network/archivist'
 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'
@@ -13,28 +15,42 @@ export type MemoryArchivistProviderProps = ContextExProviderProps<{
 
 export const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
-  return (
-    <ArchivistProvider
-      archivist={
-        new XyoMemoryArchivist({
-          config: merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          resolver: activeResolver,
-        })
+  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 }))
+  }
+
+  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,41 +1,57 @@
+import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoRemoteArchivist, XyoRemoteArchivistConfig } from '@xyo-network/api'
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
 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
+  config?: XyoRemoteArchivistConfig
   resolver?: XyoModuleResolver
 }>
 
 export const RemoteArchivistProvider: React.FC<RemoteArchivistProviderProps> = ({ config, resolver, ...props }) => {
   const { archivist } = useArchivist()
-  const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
-  return (
-    <ArchivistProvider
-      archivist={
-        new XyoRemoteArchivist({
-          config: merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          resolver: activeResolver,
-        })
+  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 }))
+  }
+
+  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

@@ -11,31 +11,47 @@ export type StorageArchivistProviderProps = ContextExProviderProps<{
   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 = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
+  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({
-          config: merge(
-            {},
-            config,
-            archivist
-              ? {
-                  parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                  },
-                }
-              : undefined,
-          ),
-          resolver: 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} />
 }