@xyo-network/react-archivist 2.38.15 → 2.38.17

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

@@ -1,3 +1,4 @@
-import { XyoPayload } from '@xyo-network/payload';
-export declare const useArchivistAll: (required?: boolean) => [(XyoPayload | null)[]?, Error?];
+export declare const useArchivistAll: (required?: boolean) => (Error | (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    schema: string;
+})[] | (() => void) | undefined)[];
 //# sourceMappingURL=useArchivistAll.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistAll.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistAll.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAe,MAAM,sBAAsB,CAAA;AAK9D,eAAO,MAAM,eAAe,0BAAuB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAqBjF,CAAA"}
+{"version":3,"file":"useArchivistAll.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistAll.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe;;kCAoB3B,CAAA"}

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

@@ -1,11 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { XyoArchivistWrapper } from '@xyo-network/archivist';
-import { useState } from 'react';
-import { useArchivist } from './use';
+import { useArchivistStates } from './useArchivistStates';
 export const useArchivistAll = (required = false) => {
-    const { archivist } = useArchivist(required);
-    const [payloads, setPayloads] = useState();
-    const [error, setError] = useState();
+    const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
@@ -20,7 +17,7 @@ export const useArchivistAll = (required = false) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivist]);
-    return [payloads, error];
+    }, [archivist, refreshCount, setError, setPayloads]);
+    return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistAll.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistAll.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistAll.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAoC,EAAE;IACpF,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,EAAgB,CAAA;IAClD,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,GAAG,EAAE,CAAA;YACnC,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,EAAkB,CAAC,CAAA;SAC7B;IACH,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
+{"version":3,"file":"useArchivistAll.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistAll.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAClD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjH,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,GAAG,EAAE,CAAA;YACnC,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,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CACjD,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

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

@@ -1,4 +1,4 @@
-import { WrapperError } from '@xyo-network/module';
-import { XyoPayload } from '@xyo-network/payload';
-export declare const useArchivistClear: (required?: boolean) => [(XyoPayload | null)[]?, WrapperError?];
+export declare const useArchivistClear: (required?: boolean) => (Error | (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    schema: string;
+})[] | (() => void) | undefined)[];
 //# sourceMappingURL=useArchivistClear.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistClear.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistClear.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAe,MAAM,sBAAsB,CAAA;AAK9D,eAAO,MAAM,iBAAiB,0BAAuB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAqB1F,CAAA"}
+{"version":3,"file":"useArchivistClear.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistClear.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB;;kCAoB7B,CAAA"}

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

@@ -1,11 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { XyoArchivistWrapper } from '@xyo-network/archivist';
-import { useState } from 'react';
-import { useArchivist } from './use';
+import { useArchivistStates } from './useArchivistStates';
 export const useArchivistClear = (required = false) => {
-    const { archivist } = useArchivist(required);
-    const [payloads, setPayloads] = useState();
-    const [error, setError] = useState();
+    const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
@@ -20,7 +17,7 @@ export const useArchivistClear = (required = false) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivist]);
-    return [payloads, error];
+    }, [archivist, refreshCount, setError, setPayloads]);
+    return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistClear.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistClear.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistClear.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAQ,GAAG,KAAK,EAA2C,EAAE;IAC7F,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,EAAgB,CAAA;IAClD,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,OAAO,EAAE,KAAK,EAAE,CAAA;YACtB,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,EAAE,CAAC,CAAA;aAChB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAkB,CAAC,CAAA;SAC7B;IACH,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}
+{"version":3,"file":"useArchivistClear.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistClear.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjH,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,OAAO,EAAE,KAAK,EAAE,CAAA;YACtB,IAAI,OAAO,EAAE,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,WAAW,CAAC,EAAE,CAAC,CAAA;aAChB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CACjD,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

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

@@ -1,5 +1,4 @@
-import { WrapperError } from '@xyo-network/module';
 import { XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload';
 import { RefreshCallback } from './lib';
-export declare const useArchivistFind: <TFilter extends XyoPayloadFindFilter>(filter: TFilter, required?: boolean) => [XyoPayload[]?, WrapperError?, RefreshCallback?];
+export declare const useArchivistFind: <TFilter extends XyoPayloadFindFilter>(filter: TFilter, required?: boolean) => [XyoPayload[]?, Error?, RefreshCallback?];
 //# sourceMappingURL=useArchivistFind.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistFind.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistFind.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAIvE,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAGvC,eAAO,MAAM,gBAAgB,iFAG1B,CAAC,UAAU,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,eAAe,CAAC,CAuBjD,CAAA"}
+{"version":3,"file":"useArchivistFind.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistFind.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAGvC,eAAO,MAAM,gBAAgB,iFAG1B,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,eAAe,CAAC,CAwB1C,CAAA"}

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

@@ -1,17 +1,16 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { useDataState } from '@xyo-network/react-shared';
-import { useState } from 'react';
 import { useArchivistStates } from './useArchivistStates';
 export const useArchivistFind = (filter, required = false) => {
-    const [savedFilter] = useDataState(filter);
-    const [payloads, setPayloads] = useState();
-    const { archivistWrapper, error, refresh, setError, refreshPayloads } = useArchivistStates(required);
+    const [savedFilter, setSavedFilter] = useDataState(filter);
+    const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required);
+    setSavedFilter(filter);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivistWrapper) {
-                const result = await archivistWrapper.find(savedFilter);
+            if (archivist) {
+                const result = await archivist.find(savedFilter);
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -21,7 +20,7 @@ export const useArchivistFind = (filter, required = false) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivistWrapper, refresh, savedFilter, setError]);
-    return [payloads, error, refreshPayloads];
+    }, [archivist, savedFilter, setError, setPayloads, refreshCount]);
+    return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistFind.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistFind.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistFind.tsx"],"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;AAGhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAe,EACf,QAAQ,GAAG,KAAK,EACkC,EAAE;IACpD,MAAM,CAAC,WAAW,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAgB,CAAA;IACxD,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEpG,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,gBAAgB,EAAE;gBACpB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBACvD,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;iBACpB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAkB,CAAC,CAAA;SAC7B;IACH,CAAC,EACD,CAAC,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CACnD,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAA;AAC3C,CAAC,CAAA"}
+{"version":3,"file":"useArchivistFind.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistFind.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAe,EACf,QAAQ,GAAG,KAAK,EAC2B,EAAE;IAC7C,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1D,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjH,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAChD,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;iBACpB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

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

@@ -1,9 +1,7 @@
-import { WrapperError } from '@xyo-network/module';
-import { XyoPayloads } from '@xyo-network/payload';
 import { RefreshCallback } from './lib';
-export declare const useArchivistGet: <T extends XyoPayloads<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+export declare const useArchivistGet: <T extends import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     schema: string;
-}> = XyoPayloads<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+} = import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     schema: string;
-}>>(ids?: string[], required?: boolean) => [(T | undefined)?, (WrapperError | undefined)?, (RefreshCallback | undefined)?];
+}>(ids?: string[], required?: boolean) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
 //# sourceMappingURL=useArchivistGet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAGvC,eAAO,MAAM,eAAe;;;;UAA+C,MAAM,EAAE,wGAsBlF,CAAA"}
+{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistGet.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAGvC,eAAO,MAAM,eAAe;;;;SAA6C,MAAM,EAAE,mGAwBhF,CAAA"}

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

@@ -2,14 +2,15 @@ import { useAsyncEffect } from '@xylabs/react-shared';
 import { useDataState } from '@xyo-network/react-shared';
 import { useArchivistStates } from './useArchivistStates';
 export const useArchivistGet = (ids, required = false) => {
-    const [savedIds] = useDataState(ids);
-    const { archivistWrapper, error, payloads, refresh, setError, setPayloads, refreshPayloads } = useArchivistStates(required);
+    const [savedIds, setSavedIds] = useDataState(ids);
+    setSavedIds(ids);
+    const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates(required);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivistWrapper && savedIds) {
-                const result = (await archivistWrapper.get(savedIds ?? [])) ?? [];
+            if (archivist && savedIds) {
+                const result = (await archivist.get(savedIds ?? [])) ?? [];
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -19,7 +20,7 @@ export const useArchivistGet = (ids, required = false) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivistWrapper, savedIds, refresh, setError, setPayloads]);
-    return [payloads, error, refreshPayloads];
+    }, [archivist, savedIds, refreshCount, setError, setPayloads]);
+    return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistGet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAsC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAyC,EAAE;IAC9I,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IACpC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,kBAAkB,CAAI,QAAQ,CAAC,CAAA;IAE9H,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,gBAAgB,IAAI,QAAQ,EAAE;gBAChC,MAAM,MAAM,GAAI,CAAC,MAAM,gBAAgB,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAO,IAAI,EAAE,CAAA;gBACxE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAM,CAAC,CAAA;iBACpB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAkB,CAAC,CAAA;SAC7B;IACH,CAAC,EACD,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC7D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAA;AAC3C,CAAC,CAAA"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAoC,GAAc,EAAE,QAAQ,GAAG,KAAK,EAAoC,EAAE;IACvI,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IACjD,WAAW,CAAC,GAAG,CAAC,CAAA;IAEhB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAI,QAAQ,CAAC,CAAA;IAEpH,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,QAAQ,EAAE;gBACzB,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC1D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC3D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

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

@@ -1,4 +1,5 @@
-import { WrapperError } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
-export declare const useArchivistInsert: (payloads: XyoPayload[], required?: boolean) => [(XyoPayload | null)[]?, WrapperError?];
+export declare const useArchivistInsert: (payloads: XyoPayload[], required?: boolean) => (Error | (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    schema: string;
+})[] | (() => void) | undefined)[];
 //# sourceMappingURL=useArchivistInsert.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistInsert.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistInsert.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKjD,eAAO,MAAM,kBAAkB,aAAc,UAAU,EAAE,yBAAqB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAsBnH,CAAA"}
+{"version":3,"file":"useArchivistInsert.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistInsert.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKjD,eAAO,MAAM,kBAAkB,aAAc,UAAU,EAAE;;kCAsBxD,CAAA"}

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

@@ -3,13 +3,13 @@ import { useDataState } from '@xyo-network/react-shared';
 import { useArchivistStates } from './useArchivistStates';
 export const useArchivistInsert = (payloads, required = false) => {
     const [savedPayloads] = useDataState(payloads);
-    const { archivistWrapper, error, payloads: resultPayloads, refresh, setError, setPayloads: setResultPayloads } = useArchivistStates(required);
+    const { archivist, error, payloads: resultPayloads, refresh, setError, setPayloads: setResultPayloads, refreshCount } = useArchivistStates(required);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivistWrapper && savedPayloads) {
-                const result = await archivistWrapper.insert(savedPayloads);
+            if (archivist && savedPayloads) {
+                const result = await archivist.insert(savedPayloads);
                 if (mounted()) {
                     setError(undefined);
                     setResultPayloads(result);
@@ -19,7 +19,7 @@ export const useArchivistInsert = (payloads, required = false) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivistWrapper, refresh, savedPayloads, setError, setResultPayloads]);
-    return [resultPayloads, error];
+    }, [archivist, refresh, savedPayloads, setError, setResultPayloads, refreshCount]);
+    return [resultPayloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistInsert.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistInsert.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistInsert.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,QAAQ,GAAG,KAAK,EAA2C,EAAE;IACtH,MAAM,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAE7I,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,gBAAgB,IAAI,aAAa,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;gBAC3D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,iBAAiB,CAAC,MAAM,CAAC,CAAA;iBAC1B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAkB,CAAC,CAAA;SAC7B;IACH,CAAC,EACD,CAAC,gBAAgB,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CACxE,CAAA;IACD,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;AAChC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistInsert.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistInsert.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC7E,MAAM,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEpJ,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,aAAa,EAAE;gBAC9B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;gBACpD,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,iBAAiB,CAAC,MAAM,CAAC,CAAA;iBAC1B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,iBAAiB,EAAE,YAAY,CAAC,CAC/E,CAAA;IACD,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC,CAAA"}

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

@@ -1,18 +1,16 @@
 /// <reference types="react" />
 import { XyoArchivistWrapper } from '@xyo-network/archivist';
-import { WrapperError } from '@xyo-network/module';
-import { XyoPayloads } from '@xyo-network/payload';
-export declare const useArchivistStates: <T extends XyoPayloads<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+export declare const useArchivistStates: <T extends import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     schema: string;
-}> = XyoPayloads<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+} = import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     schema: string;
-}>>(required: boolean) => {
-    archivistWrapper: XyoArchivistWrapper | undefined;
-    error: WrapperError | undefined;
-    payloads: T | undefined;
-    refresh: number;
-    refreshPayloads: () => void;
-    setError: import("react").Dispatch<import("react").SetStateAction<WrapperError | undefined>>;
-    setPayloads: import("react").Dispatch<import("react").SetStateAction<T | undefined>>;
+}>(required: boolean) => {
+    archivist: XyoArchivistWrapper | undefined;
+    error: Error | undefined;
+    payloads: T[] | undefined;
+    refresh: () => void;
+    refreshCount: number;
+    setError: import("react").Dispatch<import("react").SetStateAction<Error | undefined>>;
+    setPayloads: import("react").Dispatch<import("react").SetStateAction<T[] | undefined>>;
 };
 //# sourceMappingURL=useArchivistStates.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistStates.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistStates.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKlD,eAAO,MAAM,kBAAkB;;;;cAAmD,OAAO;;;;;;;;CAgBxF,CAAA"}
+{"version":3,"file":"useArchivistStates.d.ts","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistStates.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAM5D,eAAO,MAAM,kBAAkB;;;;aAAiD,OAAO;;;;;;;;CAgBtF,CAAA"}

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

@@ -2,17 +2,17 @@ import { XyoArchivistWrapper } from '@xyo-network/archivist';
 import { useEffect, useState } from 'react';
 import { useArchivist } from './use';
 export const useArchivistStates = (required) => {
+    const { archivist: archivistFromHook } = useArchivist(required);
     const [payloads, setPayloads] = useState();
-    const { archivist } = useArchivist(required);
     const [error, setError] = useState();
-    const [refresh, setRefresh] = useState(1);
-    const refreshPayloads = () => setRefresh((previous) => previous + 1);
-    const [archivistWrapper, setArchivistWrapper] = useState();
+    const [refreshCount, setRefreshCount] = useState(1);
+    const refreshPayloads = () => setRefreshCount((previous) => previous + 1);
+    const [archivist, setArchivist] = useState();
     useEffect(() => {
-        if (archivist) {
-            setArchivistWrapper(new XyoArchivistWrapper(archivist));
+        if (archivistFromHook) {
+            setArchivist(new XyoArchivistWrapper(archivistFromHook));
         }
-    }, [archivist]);
-    return { archivistWrapper, error, payloads, refresh, refreshPayloads, setError, setPayloads };
+    }, [archivistFromHook]);
+    return { archivist, error, payloads, refresh: refreshPayloads, refreshCount, setError, setPayloads };
 };
 //# sourceMappingURL=useArchivistStates.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistStates.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistStates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAG5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAsC,QAAiB,EAAE,EAAE;IAC3F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAK,CAAA;IAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAgB,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACzC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;IAEpE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,EAAuB,CAAA;IAE/E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,EAAE;YACb,mBAAmB,CAAC,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAA;SACxD;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEf,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;AAC/F,CAAC,CAAA"}
+{"version":3,"file":"useArchivistStates.js","sourceRoot":"","sources":["../../../../src/contexts/use/useArchivistStates.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAoC,QAAiB,EAAE,EAAE;IACzF,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;IAEzE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAuB,CAAA;IAEjE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,EAAE;YACrB,YAAY,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAA;SACzD;IACH,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;AACtG,CAAC,CAAA"}

package/package.json

@@ -13,7 +13,7 @@
     "@xylabs/react-button": "^2.15.1",
     "@xylabs/react-flexbox": "^2.15.1",
     "@xylabs/react-shared": "^2.15.1",
-    "@xyo-network/react-shared": "^2.38.15",
+    "@xyo-network/react-shared": "^2.38.17",
     "lodash": "^4.17.21",
     "tslib": "^2.4.0"
   },
@@ -31,9 +31,9 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@types/lodash": "^4.14.186",
-    "@xyo-network/api": "^2.38.18",
-    "@xyo-network/archivist": "^2.38.18",
-    "@xyo-network/payload": "^2.38.18"
+    "@xyo-network/api": "^2.38.23",
+    "@xyo-network/archivist": "^2.38.23",
+    "@xyo-network/payload": "^2.38.23"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -77,5 +77,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.38.15"
+  "version": "2.38.17"
 }

package/src/contexts/use/useArchivistAll.tsx

@@ -1,15 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
-import { WrapperError } from '@xyo-network/module'
-import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
-import { useState } from 'react'
 
-import { useArchivist } from './use'
+import { useArchivistStates } from './useArchivistStates'
+
+export const useArchivistAll = (required = false) => {
+  const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required)
 
-export const useArchivistAll = (required = false): [(XyoPayload | null)[]?, Error?] => {
-  const { archivist } = useArchivist(required)
-  const [payloads, setPayloads] = useState<XyoPayloads>()
-  const [error, setError] = useState<WrapperError>()
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
@@ -21,10 +17,10 @@ export const useArchivistAll = (required = false): [(XyoPayload | null)[]?, Erro
           setPayloads(result)
         }
       } catch (ex) {
-        setError(ex as WrapperError)
+        setError(ex as Error)
       }
     },
-    [archivist],
+    [archivist, refreshCount, setError, setPayloads],
   )
-  return [payloads, error]
+  return [payloads, error, refresh]
 }

package/src/contexts/use/useArchivistClear.tsx

@@ -1,15 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
-import { WrapperError } from '@xyo-network/module'
-import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
-import { useState } from 'react'
 
-import { useArchivist } from './use'
+import { useArchivistStates } from './useArchivistStates'
+
+export const useArchivistClear = (required = false) => {
+  const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required)
 
-export const useArchivistClear = (required = false): [(XyoPayload | null)[]?, WrapperError?] => {
-  const { archivist } = useArchivist(required)
-  const [payloads, setPayloads] = useState<XyoPayloads>()
-  const [error, setError] = useState<WrapperError>()
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
@@ -21,10 +17,10 @@ export const useArchivistClear = (required = false): [(XyoPayload | null)[]?, Wr
           setPayloads([])
         }
       } catch (ex) {
-        setError(ex as WrapperError)
+        setError(ex as Error)
       }
     },
-    [archivist],
+    [archivist, refreshCount, setError, setPayloads],
   )
-  return [payloads, error]
+  return [payloads, error, refresh]
 }

package/src/contexts/use/useArchivistFind.tsx

@@ -1,8 +1,6 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { WrapperError } from '@xyo-network/module'
 import { XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload'
 import { useDataState } from '@xyo-network/react-shared'
-import { useState } from 'react'
 
 import { RefreshCallback } from './lib'
 import { useArchivistStates } from './useArchivistStates'
@@ -10,27 +8,28 @@ import { useArchivistStates } from './useArchivistStates'
 export const useArchivistFind = <TFilter extends XyoPayloadFindFilter>(
   filter: TFilter,
   required = false,
-): [XyoPayload[]?, WrapperError?, RefreshCallback?] => {
-  const [savedFilter] = useDataState(filter)
-  const [payloads, setPayloads] = useState<XyoPayload[]>()
-  const { archivistWrapper, error, refresh, setError, refreshPayloads } = useArchivistStates(required)
+): [XyoPayload[]?, Error?, RefreshCallback?] => {
+  const [savedFilter, setSavedFilter] = useDataState(filter)
+  const { archivist, error, payloads, setPayloads, refresh, setError, refreshCount } = useArchivistStates(required)
+
+  setSavedFilter(filter)
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivistWrapper) {
-          const result = await archivistWrapper.find(savedFilter)
+        if (archivist) {
+          const result = await archivist.find(savedFilter)
           if (mounted()) {
             setError(undefined)
             setPayloads(result)
           }
         }
       } catch (ex) {
-        setError(ex as WrapperError)
+        setError(ex as Error)
       }
     },
-    [archivistWrapper, refresh, savedFilter, setError],
+    [archivist, savedFilter, setError, setPayloads, refreshCount],
   )
-  return [payloads, error, refreshPayloads]
+  return [payloads, error, refresh]
 }

package/src/contexts/use/useArchivistGet.tsx

@@ -1,31 +1,32 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { WrapperError } from '@xyo-network/module'
-import { XyoPayloads } from '@xyo-network/payload'
+import { XyoPayload } from '@xyo-network/payload'
 import { useDataState } from '@xyo-network/react-shared'
 
 import { RefreshCallback } from './lib'
 import { useArchivistStates } from './useArchivistStates'
 
-export const useArchivistGet = <T extends XyoPayloads = XyoPayloads>(ids?: string[], required = false): [T?, WrapperError?, RefreshCallback?] => {
-  const [savedIds] = useDataState(ids)
-  const { archivistWrapper, error, payloads, refresh, setError, setPayloads, refreshPayloads } = useArchivistStates<T>(required)
+export const useArchivistGet = <T extends XyoPayload = XyoPayload>(ids?: string[], required = false): [T[]?, Error?, RefreshCallback?] => {
+  const [savedIds, setSavedIds] = useDataState(ids)
+  setSavedIds(ids)
+
+  const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates<T>(required)
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivistWrapper && savedIds) {
-          const result = ((await archivistWrapper.get(savedIds ?? [])) as T) ?? []
+        if (archivist && savedIds) {
+          const result = (await archivist.get(savedIds ?? [])) ?? []
           if (mounted()) {
             setError(undefined)
-            setPayloads(result)
+            setPayloads(result as T[])
           }
         }
       } catch (ex) {
-        setError(ex as WrapperError)
+        setError(ex as Error)
       }
     },
-    [archivistWrapper, savedIds, refresh, setError, setPayloads],
+    [archivist, savedIds, refreshCount, setError, setPayloads],
   )
-  return [payloads, error, refreshPayloads]
+  return [payloads, error, refresh]
 }

package/src/contexts/use/useArchivistInsert.tsx

@@ -1,30 +1,29 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
-import { WrapperError } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { useDataState } from '@xyo-network/react-shared'
 
 import { useArchivistStates } from './useArchivistStates'
 
-export const useArchivistInsert = (payloads: XyoPayload[], required = false): [(XyoPayload | null)[]?, WrapperError?] => {
+export const useArchivistInsert = (payloads: XyoPayload[], required = false) => {
   const [savedPayloads] = useDataState(payloads)
-  const { archivistWrapper, error, payloads: resultPayloads, refresh, setError, setPayloads: setResultPayloads } = useArchivistStates(required)
+  const { archivist, error, payloads: resultPayloads, refresh, setError, setPayloads: setResultPayloads, refreshCount } = useArchivistStates(required)
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivistWrapper && savedPayloads) {
-          const result = await archivistWrapper.insert(savedPayloads)
+        if (archivist && savedPayloads) {
+          const result = await archivist.insert(savedPayloads)
           if (mounted()) {
             setError(undefined)
             setResultPayloads(result)
           }
         }
       } catch (ex) {
-        setError(ex as WrapperError)
+        setError(ex as Error)
       }
     },
-    [archivistWrapper, refresh, savedPayloads, setError, setResultPayloads],
+    [archivist, refresh, savedPayloads, setError, setResultPayloads, refreshCount],
   )
-  return [resultPayloads, error]
+  return [resultPayloads, error, refresh]
 }

package/src/contexts/use/useArchivistStates.tsx

@@ -1,24 +1,23 @@
 import { XyoArchivistWrapper } from '@xyo-network/archivist'
-import { WrapperError } from '@xyo-network/module'
-import { XyoPayloads } from '@xyo-network/payload'
+import { XyoPayload } from '@xyo-network/payload'
 import { useEffect, useState } from 'react'
 
 import { useArchivist } from './use'
 
-export const useArchivistStates = <T extends XyoPayloads = XyoPayloads>(required: boolean) => {
-  const [payloads, setPayloads] = useState<T>()
-  const { archivist } = useArchivist(required)
-  const [error, setError] = useState<WrapperError>()
-  const [refresh, setRefresh] = useState(1)
-  const refreshPayloads = () => setRefresh((previous) => previous + 1)
+export const useArchivistStates = <T extends XyoPayload = XyoPayload>(required: boolean) => {
+  const { archivist: archivistFromHook } = useArchivist(required)
+  const [payloads, setPayloads] = useState<T[]>()
+  const [error, setError] = useState<Error>()
+  const [refreshCount, setRefreshCount] = useState(1)
+  const refreshPayloads = () => setRefreshCount((previous) => previous + 1)
 
-  const [archivistWrapper, setArchivistWrapper] = useState<XyoArchivistWrapper>()
+  const [archivist, setArchivist] = useState<XyoArchivistWrapper>()
 
   useEffect(() => {
-    if (archivist) {
-      setArchivistWrapper(new XyoArchivistWrapper(archivist))
+    if (archivistFromHook) {
+      setArchivist(new XyoArchivistWrapper(archivistFromHook))
     }
-  }, [archivist])
+  }, [archivistFromHook])
 
-  return { archivistWrapper, error, payloads, refresh, refreshPayloads, setError, setPayloads }
+  return { archivist, error, payloads, refresh: refreshPayloads, refreshCount, setError, setPayloads }
 }