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

package/dist/esm/components/Details.js

@@ -12,7 +12,7 @@ export const ArchivistDetails = ({ archivist: archivistProp, ...props }) => {
     const [refresh, setRefresh] = useState(0);
     const [wrapper, setWrapper] = useState();
     useEffect(() => {
-        setWrapper(archivist ? new XyoArchivistWrapper(archivist) : undefined);
+        setWrapper(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined);
     }, [archivist]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/esm/components/Details.js.map

@@ -1 +1 @@
-{"version":3,"file":"Details.js","sourceRoot":"","sources":["../../../src/components/Details.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAgB,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAgB,4BAA4B,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEvI,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM1C,MAAM,CAAC,MAAM,gBAAgB,GAA+B,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACrG,MAAM,EAAE,SAAS,GAAG,aAAa,EAAE,GAAG,YAAY,EAAE,CAAA;IACpD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAyB,CAAA;IACjE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAuB,CAAA;IAE7D,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACxE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;QAC7C,IAAI,OAAO,EAAE,EAAE;YACb,WAAW,CAAC,QAAQ,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,CAAC,CACnB,CAAA;IAED,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,UAAU,cAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,GAAc,EAC1E,MAAC,WAAW,eACV,KAAC,QAAQ,IAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,uBAE/F,EACX,KAAC,QAAQ,IAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,4BAA4B,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,sBAE5F,EACX,KAAC,QAAQ,IACP,OAAO,EAAE,GAAG,EAAE;4BACZ,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;wBACzB,CAAC,wBAGQ,IACC,IACN,CACX,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Details.js","sourceRoot":"","sources":["../../../src/components/Details.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAgB,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAgB,4BAA4B,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEvI,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM1C,MAAM,CAAC,MAAM,gBAAgB,GAA+B,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACrG,MAAM,EAAE,SAAS,GAAG,aAAa,EAAE,GAAG,YAAY,EAAE,CAAA;IACpD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAyB,CAAA;IACjE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAuB,CAAA;IAE7D,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACpF,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAA;QAC7C,IAAI,OAAO,EAAE,EAAE;YACb,WAAW,CAAC,QAAQ,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,CAAC,CACnB,CAAA;IAED,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,UAAU,cAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,GAAc,EAC1E,MAAC,WAAW,eACV,KAAC,QAAQ,IAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,uBAE/F,EACX,KAAC,QAAQ,IAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,4BAA4B,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,sBAE5F,EACX,KAAC,QAAQ,IACP,OAAO,EAAE,GAAG,EAAE;4BACZ,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;wBACzB,CAAC,wBAGQ,IACC,IACN,CACX,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/contexts/Provider/CookieArchivistProvider.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { XyoCookieArchivistConfig } from '@xyo-network/archivist';
-import { XyoModuleResolverFunc } from '@xyo-network/module';
+import { XyoModuleResolver } from '@xyo-network/module';
 import { ContextExProviderProps } from '@xyo-network/react-shared';
 export declare type CookieArchivistProviderProps = ContextExProviderProps<{
     config: XyoCookieArchivistConfig;
-    resolver?: XyoModuleResolverFunc;
+    resolver?: XyoModuleResolver;
 }>;
 export declare const CookieArchivistProvider: React.FC<CookieArchivistProviderProps>;
 //# sourceMappingURL=CookieArchivistProvider.d.ts.map

package/dist/esm/contexts/Provider/CookieArchivistProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CookieArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/CookieArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA2C,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;IAChC,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAgC1E,CAAA"}
+{"version":3,"file":"CookieArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/CookieArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA2C,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;IAChC,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CA8B1E,CAAA"}

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

@@ -1,24 +1,27 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { XyoArchivistWrapper, XyoCookieArchivist } from '@xyo-network/archivist';
+import { XyoModuleResolver } from '@xyo-network/module';
 import merge from 'lodash/merge';
 import { useArchivist } from '../use';
 import { ArchivistProvider } from './Provider';
 export const CookieArchivistProvider = ({ config, resolver, ...props }) => {
     const { archivist } = useArchivist();
-    const activeResolver = (address) => {
-        if (archivist && address === archivist?.address) {
-            return new XyoArchivistWrapper(archivist);
-        }
-        return resolver?.(address) ?? null;
-    };
-    return (_jsx(ArchivistProvider, { archivist: new XyoCookieArchivist(merge({}, config, archivist
-            ? {
-                parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                },
-            }
-            : undefined), undefined, activeResolver), ...props }));
+    const wrapper = archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined;
+    const activeResolver = resolver ?? wrapper ? new XyoModuleResolver() : undefined;
+    if (archivist) {
+        activeResolver?.add(new XyoArchivistWrapper({ module: archivist }));
+    }
+    return (_jsx(ArchivistProvider, { archivist: new XyoCookieArchivist({
+            config: merge({}, config, archivist
+                ? {
+                    parents: {
+                        commit: [archivist.address],
+                        read: [archivist.address],
+                        write: [archivist.address],
+                    },
+                }
+                : undefined),
+            resolver: activeResolver,
+        }), ...props }));
 };
 //# sourceMappingURL=CookieArchivistProvider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"CookieArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/CookieArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAG1G,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,cAAc,GAA0B,CAAC,OAAe,EAAE,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,OAAO,EAAE;YAC/C,OAAO,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SAC1C;QACD,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC,CAAA;IACD,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CACpB,KAAK,CACH,EAAE,EACF,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC3B;aACF;YACH,CAAC,CAAC,SAAS,CACd,EACD,SAAS,EACT,cAAc,CACf,KAEC,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"CookieArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/CookieArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAC1G,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACtF,MAAM,cAAc,GAAkC,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/G,IAAI,SAAS,EAAE;QACb,cAAc,EAAE,GAAG,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACpE;IACD,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CAAC;YACrB,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"}

package/dist/esm/contexts/Provider/MemoryArchivistProvider.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { XyoMemoryArchivistConfig } from '@xyo-network/archivist';
-import { XyoModuleResolverFunc } from '@xyo-network/module';
+import { XyoModuleResolver } from '@xyo-network/module';
 import { ContextExProviderProps } from '@xyo-network/react-shared';
 export declare type MemoryArchivistProviderProps = ContextExProviderProps<{
     config?: XyoMemoryArchivistConfig;
-    resolver?: XyoModuleResolverFunc;
+    resolver?: XyoModuleResolver;
 }>;
 export declare const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps>;
 //# sourceMappingURL=MemoryArchivistProvider.d.ts.map

package/dist/esm/contexts/Provider/MemoryArchivistProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/MemoryArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA2C,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,CAAC,EAAE,wBAAwB,CAAA;IACjC,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAgC1E,CAAA"}
+{"version":3,"file":"MemoryArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/MemoryArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA2C,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,CAAC,EAAE,wBAAwB,CAAA;IACjC,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CA0B1E,CAAA"}

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

@@ -1,24 +1,23 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { XyoArchivistWrapper, XyoMemoryArchivist } from '@xyo-network/archivist';
+import { XyoModuleResolver } from '@xyo-network/module';
 import merge from 'lodash/merge';
 import { useArchivist } from '../use';
 import { ArchivistProvider } from './Provider';
 export const MemoryArchivistProvider = ({ config, resolver, ...props }) => {
     const { archivist } = useArchivist();
-    const activeResolver = (address) => {
-        if (archivist && address === archivist?.address) {
-            return new XyoArchivistWrapper(archivist);
-        }
-        return resolver?.(address) ?? null;
-    };
-    return (_jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist(merge({}, config, archivist
-            ? {
-                parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                },
-            }
-            : undefined), undefined, activeResolver), ...props }));
+    const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined);
+    return (_jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist({
+            config: merge({}, config, archivist
+                ? {
+                    parents: {
+                        commit: [archivist.address],
+                        read: [archivist.address],
+                        write: [archivist.address],
+                    },
+                }
+                : undefined),
+            resolver: activeResolver,
+        }), ...props }));
 };
 //# sourceMappingURL=MemoryArchivistProvider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"MemoryArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/MemoryArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAG1G,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,cAAc,GAA0B,CAAC,OAAe,EAAE,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,OAAO,EAAE;YAC/C,OAAO,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SAC1C;QACD,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC,CAAA;IACD,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CACpB,KAAK,CACH,EAAE,EACF,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC3B;aACF;YACH,CAAC,CAAC,SAAS,CACd,EACD,SAAS,EACT,cAAc,CACf,KAEC,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"MemoryArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/MemoryArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAC1G,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,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;IACtI,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CAAC;YACrB,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"}

package/dist/esm/contexts/Provider/RemoteArchivistProvider.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { XyoRemoteArchivistConfig } from '@xyo-network/api';
-import { XyoModuleResolverFunc } from '@xyo-network/module';
+import { XyoModuleResolver } from '@xyo-network/module';
 import { ContextExProviderProps } from '@xyo-network/react-shared';
 export declare type RemoteArchivistProviderProps = ContextExProviderProps<{
     config: XyoRemoteArchivistConfig;
-    resolver?: XyoModuleResolverFunc;
+    resolver?: XyoModuleResolver;
 }>;
 export declare const RemoteArchivistProvider: React.FC<RemoteArchivistProviderProps>;
 //# sourceMappingURL=RemoteArchivistProvider.d.ts.map

package/dist/esm/contexts/Provider/RemoteArchivistProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RemoteArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/RemoteArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAE/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;IAChC,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAgC1E,CAAA"}
+{"version":3,"file":"RemoteArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/RemoteArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;IAChC,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CA0B1E,CAAA"}

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

@@ -1,25 +1,24 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { XyoRemoteArchivist } from '@xyo-network/api';
 import { XyoArchivistWrapper } from '@xyo-network/archivist';
+import { XyoModuleResolver } from '@xyo-network/module';
 import merge from 'lodash/merge';
 import { useArchivist } from '../use';
 import { ArchivistProvider } from './Provider';
 export const RemoteArchivistProvider = ({ config, resolver, ...props }) => {
     const { archivist } = useArchivist();
-    const activeResolver = (address) => {
-        if (archivist && address === archivist?.address) {
-            return new XyoArchivistWrapper(archivist);
-        }
-        return resolver?.(address) ?? null;
-    };
-    return (_jsx(ArchivistProvider, { archivist: new XyoRemoteArchivist(merge({}, config, archivist
-            ? {
-                parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                },
-            }
-            : undefined), undefined, activeResolver), ...props }));
+    const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined);
+    return (_jsx(ArchivistProvider, { archivist: new XyoRemoteArchivist({
+            config: merge({}, config, archivist
+                ? {
+                    parents: {
+                        commit: [archivist.address],
+                        read: [archivist.address],
+                        write: [archivist.address],
+                    },
+                }
+                : undefined),
+            resolver: activeResolver,
+        }), ...props }));
 };
 //# sourceMappingURL=RemoteArchivistProvider.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RemoteArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/RemoteArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAG5D,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,cAAc,GAA0B,CAAC,OAAe,EAAE,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,OAAO,EAAE;YAC/C,OAAO,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SAC1C;QACD,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC,CAAA;IACD,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CACpB,KAAK,CACH,EAAE,EACF,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC3B;aACF;YACH,CAAC,CAAC,SAAS,CACd,EACD,SAAS,EACT,cAAc,CACf,KAEC,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"RemoteArchivistProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/RemoteArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,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,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,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;IACtI,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CAAC;YACrB,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"}

package/dist/esm/contexts/Provider/StorageArchivistProvider.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { XyoStorageArchivistConfig } from '@xyo-network/archivist';
-import { XyoModuleResolverFunc } from '@xyo-network/module';
+import { XyoModuleResolver } from '@xyo-network/module';
 import { ContextExProviderProps } from '@xyo-network/react-shared';
 export declare type StorageArchivistProviderProps = ContextExProviderProps<{
     config: XyoStorageArchivistConfig;
-    resolver?: XyoModuleResolverFunc;
+    resolver?: XyoModuleResolver;
 }>;
 export declare const StorageArchivistProvider: React.FC<StorageArchivistProviderProps>;
 //# sourceMappingURL=StorageArchivistProvider.d.ts.map

package/dist/esm/contexts/Provider/StorageArchivistProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/StorageArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA4C,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,6BAA6B,GAAG,sBAAsB,CAAC;IACjE,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,6BAA6B,CAiC5E,CAAA"}
+{"version":3,"file":"StorageArchivistProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Provider/StorageArchivistProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA4C,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAC5G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,6BAA6B,GAAG,sBAAsB,CAAC;IACjE,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,CAAC,EAAE,iBAAiB,CAAA;CAC7B,CAAC,CAAA;AAEF,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,6BAA6B,CA2B5E,CAAA"}

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

@@ -1,24 +1,23 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { XyoArchivistWrapper, XyoStorageArchivist } from '@xyo-network/archivist';
+import { XyoModuleResolver } from '@xyo-network/module';
 import merge from 'lodash/merge';
 import { useArchivist } from '../use';
 import { ArchivistProvider } from './Provider';
 export const StorageArchivistProvider = ({ config, resolver, ...props }) => {
     const { archivist } = useArchivist();
-    const activeResolver = (address) => {
-        if (archivist && address === archivist?.address) {
-            return new XyoArchivistWrapper(archivist);
-        }
-        return resolver?.(address) ?? null;
-    };
-    return (_jsx(ArchivistProvider, { archivist: new XyoStorageArchivist(merge({}, config, archivist
-            ? {
-                parents: {
-                    commit: [archivist.address],
-                    read: [archivist.address],
-                    write: [archivist.address],
-                },
-            }
-            : undefined), undefined, activeResolver), ...props }));
+    const activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined);
+    return (_jsx(ArchivistProvider, { archivist: new XyoStorageArchivist({
+            config: merge({}, config, archivist
+                ? {
+                    parents: {
+                        commit: [archivist.address],
+                        read: [archivist.address],
+                        write: [archivist.address],
+                    },
+                }
+                : undefined),
+            resolver: activeResolver,
+        }), ...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;AAG5G,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,GAA0B,CAAC,OAAe,EAAE,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,OAAO,EAAE;YAC/C,OAAO,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SAC1C;QACD,OAAO,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC,CAAA;IAED,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,mBAAmB,CACrB,KAAK,CACH,EAAE,EACF,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC3B,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;oBACzB,KAAK,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC3B;aACF;YACH,CAAC,CAAC,SAAS,CACd,EACD,SAAS,EACT,cAAc,CACf,KAEC,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,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"}

package/dist/esm/contexts/use.d.ts

@@ -1,5 +1,4 @@
-import { XyoPayloadFindFilter } from '@xyo-network/archivist';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload';
 export declare const useArchivist: (required?: boolean) => Omit<import("./State").ArchivistState & import("@xyo-network/react-shared").ContextExState, "provided">;
 export declare const useArchivistGet: (ids?: string[], required?: boolean) => [(XyoPayload | null)[]?, Error?];
 export declare const useArchivistFind: <TFilter extends XyoPayloadFindFilter>(filter: TFilter, required?: boolean) => [(XyoPayload | null)[]?, Error?];

package/dist/esm/contexts/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/contexts/use.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,EAAE,UAAU,EAAe,MAAM,sBAAsB,CAAA;AAM9D,eAAO,MAAM,YAAY,iIAExB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,MAAM,EAAE,yBAAqB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAqBjG,CAAA;AAED,eAAO,MAAM,gBAAgB,iFAA8E,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAqBzI,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/contexts/use.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAe,MAAM,sBAAsB,CAAA;AAMpF,eAAO,MAAM,YAAY,iIAExB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,MAAM,EAAE,yBAAqB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAqBjG,CAAA;AAED,eAAO,MAAM,gBAAgB,iFAA8E,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAqBzI,CAAA"}

package/dist/esm/contexts/use.js

@@ -14,7 +14,7 @@ export const useArchivistGet = (ids, required = false) => {
     // 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);
@@ -35,7 +35,7 @@ export const useArchivistFind = (filter, required = false) => {
     // 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);

package/dist/esm/contexts/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../src/contexts/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAwB,MAAM,wBAAwB,CAAA;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC/C,OAAO,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IACpG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC1E,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;YACpD,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,GAAG,CAAC,CACjB,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAuC,MAAe,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IAC5I,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC1E,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC1C,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,MAAM,CAAC,CACpB,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../src/contexts/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC/C,OAAO,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IACpG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtF,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;YACpD,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,GAAG,CAAC,CACjB,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAuC,MAAe,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IAC5I,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtF,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC1C,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,MAAM,CAAC,CACpB,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,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.37.6",
-    "@xyo-network/react-shared": "^2.37.29",
+    "@xyo-network/module": "^2.38.0-rc.2",
+    "@xyo-network/react-shared": "^2.38.0-rc.1",
     "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.37.6",
-    "@xyo-network/archivist": "^2.37.6",
-    "@xyo-network/payload": "^2.37.6"
+    "@xyo-network/api": "^2.38.0-rc.2",
+    "@xyo-network/archivist": "^2.38.0-rc.2",
+    "@xyo-network/payload": "^2.38.0-rc.2"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -75,5 +75,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.37.29"
+  "version": "2.38.0-rc.1",
+  "stableVersion": "2.37.29"
 }

package/src/components/Details.tsx

@@ -19,7 +19,7 @@ export const ArchivistDetails: React.FC<ArchivistDetails> = ({ archivist: archiv
   const [wrapper, setWrapper] = useState<XyoArchivistWrapper>()
 
   useEffect(() => {
-    setWrapper(archivist ? new XyoArchivistWrapper(archivist) : undefined)
+    setWrapper(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
   }, [archivist])
 
   useAsyncEffect(

package/src/contexts/Provider/CookieArchivistProvider.tsx

@@ -1,5 +1,5 @@
 import { XyoArchivistWrapper, XyoCookieArchivist, XyoCookieArchivistConfig } 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,22 +8,21 @@ import { ArchivistProvider } from './Provider'
 
 export type CookieArchivistProviderProps = ContextExProviderProps<{
   config: XyoCookieArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  resolver?: XyoModuleResolver
 }>
 
 export const CookieArchivistProvider: React.FC<CookieArchivistProviderProps> = ({ 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 = archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined
+  const activeResolver: XyoModuleResolver | undefined = resolver ?? wrapper ? new XyoModuleResolver() : undefined
+  if (archivist) {
+    activeResolver?.add(new XyoArchivistWrapper({ module: archivist }))
   }
   return (
     <ArchivistProvider
       archivist={
-        new XyoCookieArchivist(
-          merge(
+        new XyoCookieArchivist({
+          config: merge(
             {},
             config,
             archivist
@@ -36,9 +35,8 @@ export const CookieArchivistProvider: React.FC<CookieArchivistProviderProps> = (
                 }
               : undefined,
           ),
-          undefined,
-          activeResolver,
-        )
+          resolver: activeResolver,
+        })
       }
       {...props}
     />

package/src/contexts/Provider/MemoryArchivistProvider.tsx

@@ -1,5 +1,5 @@
 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'
 
@@ -8,22 +8,17 @@ 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 activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
   return (
     <ArchivistProvider
       archivist={
-        new XyoMemoryArchivist(
-          merge(
+        new XyoMemoryArchivist({
+          config: merge(
             {},
             config,
             archivist
@@ -36,9 +31,8 @@ export const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps> = (
                 }
               : undefined,
           ),
-          undefined,
-          activeResolver,
-        )
+          resolver: activeResolver,
+        })
       }
       {...props}
     />

package/src/contexts/Provider/RemoteArchivistProvider.tsx

@@ -1,6 +1,6 @@
 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'
 
@@ -9,22 +9,17 @@ import { ArchivistProvider } from './Provider'
 
 export type RemoteArchivistProviderProps = ContextExProviderProps<{
   config: XyoRemoteArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  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 activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
   return (
     <ArchivistProvider
       archivist={
-        new XyoRemoteArchivist(
-          merge(
+        new XyoRemoteArchivist({
+          config: merge(
             {},
             config,
             archivist
@@ -37,9 +32,8 @@ export const RemoteArchivistProvider: React.FC<RemoteArchivistProviderProps> = (
                 }
               : undefined,
           ),
-          undefined,
-          activeResolver,
-        )
+          resolver: activeResolver,
+        })
       }
       {...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,23 +8,18 @@ import { ArchivistProvider } from './Provider'
 
 export type StorageArchivistProviderProps = ContextExProviderProps<{
   config: XyoStorageArchivistConfig
-  resolver?: XyoModuleResolverFunc
+  resolver?: XyoModuleResolver
 }>
 
 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 activeResolver = resolver ?? new XyoModuleResolver().add(archivist ? new XyoArchivistWrapper({ module: archivist }) : undefined)
 
   return (
     <ArchivistProvider
       archivist={
-        new XyoStorageArchivist(
-          merge(
+        new XyoStorageArchivist({
+          config: merge(
             {},
             config,
             archivist
@@ -37,9 +32,8 @@ export const StorageArchivistProvider: React.FC<StorageArchivistProviderProps> =
                 }
               : undefined,
           ),
-          undefined,
-          activeResolver,
-        )
+          resolver: activeResolver,
+        })
       }
       {...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)