@xyo-network/react-archivist 2.26.57 → 2.26.60

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

@@ -1,20 +1,17 @@
 /// <reference types="react" />
-import { WithChildren } from '@xylabs/react-shared';
 import { XyoRemoteArchivistConfig } from '@xyo-network/api';
 import { XyoArchivist, XyoArchivistConfig } from '@xyo-network/archivist';
-export interface ArchivistProviderProps {
-    required?: boolean;
+import { ContextExProviderProps } from '@xyo-network/react-shared';
+export declare type ArchivistProviderProps = ContextExProviderProps<{
     archivist?: XyoArchivist;
-}
-export declare const ArchivistProvider: React.FC<WithChildren<ArchivistProviderProps>>;
-export interface MemoryArchivistProviderProps {
-    required?: boolean;
+}>;
+export declare const ArchivistProvider: React.FC<ArchivistProviderProps>;
+export declare type MemoryArchivistProviderProps = ContextExProviderProps<{
     config?: XyoArchivistConfig;
-}
-export declare const MemoryArchivistProvider: React.FC<WithChildren<MemoryArchivistProviderProps>>;
-export interface ApiArchivistProviderProps {
-    required?: boolean;
+}>;
+export declare const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps>;
+export declare type ApiArchivistProviderProps = ContextExProviderProps<{
     config?: XyoRemoteArchivistConfig;
-}
-export declare const RemoteArchivistProvider: React.FC<WithChildren<ApiArchivistProviderProps>>;
+}>;
+export declare const RemoteArchivistProvider: React.FC<ApiArchivistProviderProps>;
 //# sourceMappingURL=Provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAsB,MAAM,wBAAwB,CAAA;AAM7F,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAc5E,CAAA;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAC5B;AAED,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAQxF,CAAA;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,wBAAwB,CAAA;CAClC;AAED,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAIrF,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAsB,MAAM,wBAAwB,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,sBAAsB,GAAG,sBAAsB,CAAC;IAC1D,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,CAAC,CAAA;AAEF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAc9D,CAAA;AAED,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAC5B,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAI1E,CAAA;AAED,oBAAY,yBAAyB,GAAG,sBAAsB,CAAC;IAC7D,MAAM,CAAC,EAAE,wBAAwB,CAAA;CAClC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAIvE,CAAA"}

package/dist/esm/contexts/Provider.js

@@ -12,10 +12,10 @@ export const ArchivistProvider = ({ archivist: archivistProp, required = false,
             setArchivist,
         }, children: archivist ? children : required ? null : children }));
 };
-export const MemoryArchivistProvider = ({ config = {}, children, ...props }) => {
+export const MemoryArchivistProvider = ({ config = {}, ...props }) => {
     const { archivist } = useArchivist();
     config.parent = config.parent ?? archivist;
-    return (_jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist(config), ...props, children: children }));
+    return _jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist(config), ...props });
 };
 export const RemoteArchivistProvider = ({ config = {}, ...props }) => {
     const { archivist } = useArchivist();

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

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAoC,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAOpC,MAAM,CAAC,MAAM,iBAAiB,GAAmD,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5I,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA2B,aAAa,CAAC,CAAA;IAEnF,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IACxB,KAAK,EAAE;YACL,SAAS;YACT,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,YAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,uBAAuB,GAAyD,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACnI,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAA;IAC1C,OAAO,CACL,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,YACpE,QAAQ,GACS,CACrB,CAAA;AACH,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,uBAAuB,GAAsD,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtH,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAA;IAC1C,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,GAAI,CAAA;AACpF,CAAC,CAAA"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAoC,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAE7F,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAMpC,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9H,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA2B,aAAa,CAAC,CAAA;IAEnF,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IACxB,KAAK,EAAE;YACL,SAAS;YACT,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,YAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAA2C,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC3G,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAA;IAC1C,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,GAAI,CAAA;AACpF,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAAwC,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAA;IAC1C,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,GAAI,CAAA;AACpF,CAAC,CAAA"}

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

@@ -1,15 +1,6 @@
 import { XyoPayloadFindQuery } from '@xyo-network/archivist';
+import { XyoPayload } 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) => (Error | ({
-    schema: string;
-    previousHash?: string | undefined;
-    sources?: string[] | undefined;
-    timestamp?: number | undefined;
-} | null)[] | undefined)[];
-export declare const useArchivistFind: <TQuery extends XyoPayloadFindQuery>(query?: TQuery | undefined, required?: boolean) => (Error | ({
-    schema: string;
-    previousHash?: string | undefined;
-    sources?: string[] | undefined;
-    timestamp?: number | undefined;
-} | null)[] | undefined)[];
+export declare const useArchivistGet: (ids?: string[], required?: boolean) => [(XyoPayload | null)[]?, Error?];
+export declare const useArchivistFind: <TQuery extends XyoPayloadFindQuery>(query?: TQuery | undefined, required?: boolean) => [(XyoPayload | null)[]?, Error?];
 //# sourceMappingURL=use.d.ts.map

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,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAO5D,eAAO,MAAM,YAAY,iIAExB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,MAAM,EAAE;;;;;0BAoB7C,CAAA;AAED,eAAO,MAAM,gBAAgB;;;;;0BAoB5B,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../src/contexts/use.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAMjD,eAAO,MAAM,YAAY,iIAExB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,MAAM,EAAE,yBAAqB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAoBjG,CAAA;AAED,eAAO,MAAM,gBAAgB,0FAA2E,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAoBtI,CAAA"}

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;AAGrD,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,EAAE,EAAE;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAyB,CAAA;IACjE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACrE,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,CAAqC,KAAc,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE;IACvG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAyB,CAAA;IACjE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,MAAM,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC3E,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,KAAK,CAAC,CACnB,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;AAGrD,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,EAAyB,CAAA;IACjE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACrE,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,CAAqC,KAAc,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IACzI,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAyB,CAAA;IACjE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,MAAM,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC3E,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,KAAK,CAAC,CACnB,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}

package/package.json

@@ -17,10 +17,10 @@
     "@xylabs/react-flexbox": "^2.14.10",
     "@xylabs/react-shared": "^2.14.10",
     "@xylabs/sdk-js": "2.6.2",
-    "@xyo-network/api": "^2.22.26",
-    "@xyo-network/archivist": "^2.22.26",
-    "@xyo-network/payload": "^2.22.26",
-    "@xyo-network/react-shared": "^2.26.57",
+    "@xyo-network/api": "^2.23.0",
+    "@xyo-network/archivist": "^2.23.0",
+    "@xyo-network/payload": "^2.23.0",
+    "@xyo-network/react-shared": "^2.26.60",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@storybook/react": "^6.5.9",
     "@xylabs/tsconfig-dom": "^2.5.11",
-    "@xyo-network/react-storybook": "^2.26.57"
+    "@xyo-network/react-storybook": "^2.26.60"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -79,5 +79,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.57"
+  "version": "2.26.60"
 }

package/src/contexts/Provider.tsx

@@ -1,17 +1,16 @@
-import { WithChildren } from '@xylabs/react-shared'
 import { XyoRemoteArchivist, XyoRemoteArchivistConfig } from '@xyo-network/api'
 import { XyoArchivist, XyoArchivistConfig, XyoMemoryArchivist } from '@xyo-network/archivist'
+import { ContextExProviderProps } from '@xyo-network/react-shared'
 import { useState } from 'react'
 
 import { ArchivistContext } from './Context'
 import { useArchivist } from './use'
 
-export interface ArchivistProviderProps {
-  required?: boolean
+export type ArchivistProviderProps = ContextExProviderProps<{
   archivist?: XyoArchivist
-}
+}>
 
-export const ArchivistProvider: React.FC<WithChildren<ArchivistProviderProps>> = ({ archivist: archivistProp, required = false, children }) => {
+export const ArchivistProvider: React.FC<ArchivistProviderProps> = ({ archivist: archivistProp, required = false, children }) => {
   const [archivist, setArchivist] = useState<XyoArchivist | undefined>(archivistProp)
 
   return (
@@ -27,27 +26,21 @@ export const ArchivistProvider: React.FC<WithChildren<ArchivistProviderProps>> =
   )
 }
 
-export interface MemoryArchivistProviderProps {
-  required?: boolean
+export type MemoryArchivistProviderProps = ContextExProviderProps<{
   config?: XyoArchivistConfig
-}
+}>
 
-export const MemoryArchivistProvider: React.FC<WithChildren<MemoryArchivistProviderProps>> = ({ config = {}, children, ...props }) => {
+export const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps> = ({ config = {}, ...props }) => {
   const { archivist } = useArchivist()
   config.parent = config.parent ?? archivist
-  return (
-    <ArchivistProvider archivist={new XyoMemoryArchivist(config)} {...props}>
-      {children}
-    </ArchivistProvider>
-  )
+  return <ArchivistProvider archivist={new XyoMemoryArchivist(config)} {...props} />
 }
 
-export interface ApiArchivistProviderProps {
-  required?: boolean
+export type ApiArchivistProviderProps = ContextExProviderProps<{
   config?: XyoRemoteArchivistConfig
-}
+}>
 
-export const RemoteArchivistProvider: React.FC<WithChildren<ApiArchivistProviderProps>> = ({ config = {}, ...props }) => {
+export const RemoteArchivistProvider: React.FC<ApiArchivistProviderProps> = ({ config = {}, ...props }) => {
   const { archivist } = useArchivist()
   config.parent = config.parent ?? archivist
   return <ArchivistProvider archivist={new XyoRemoteArchivist(config)} {...props} />

package/src/contexts/use.ts

@@ -10,7 +10,7 @@ export const useArchivist = (required = false) => {
   return useContextEx(ArchivistContext, 'Archivist', required)
 }
 
-export const useArchivistGet = (ids?: string[], required = false) => {
+export const useArchivistGet = (ids?: string[], required = false): [(XyoPayload | null)[]?, Error?] => {
   const { archivist } = useArchivist(required)
   const [payloads, setPayloads] = useState<(XyoPayload | null)[]>()
   const [error, setError] = useState<Error>()
@@ -32,7 +32,7 @@ export const useArchivistGet = (ids?: string[], required = false) => {
   return [payloads, error]
 }
 
-export const useArchivistFind = <TQuery extends XyoPayloadFindQuery>(query?: TQuery, required = false) => {
+export const useArchivistFind = <TQuery extends XyoPayloadFindQuery>(query?: TQuery, required = false): [(XyoPayload | null)[]?, Error?] => {
   const { archivist } = useArchivist(required)
   const [payloads, setPayloads] = useState<(XyoPayload | null)[]>()
   const [error, setError] = useState<Error>()