@xyo-network/react-archivist 2.45.0-rc.8 → 2.45.0

package/dist/esm/hooks/useArchivist.js

@@ -1,4 +1,4 @@
 import { ArchivistWrapper } from '@xyo-network/archivist';
-import { createUseModuleHook, useNode } from '@xyo-network/react-node';
-export const useArchivist = createUseModuleHook((module) => ArchivistWrapper.wrap(module), useNode);
+import { WrappedModuleHookFactory } from '@xyo-network/react-node';
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper, 'useArchivist');
 //# sourceMappingURL=useArchivist.js.map

package/dist/esm/hooks/useArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAmB,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAEtE,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAoC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA"}
+{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAwB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA"}

package/dist/esm/hooks/useArchivistGet.js

@@ -1,16 +1,24 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useDataState } from '@xyo-network/react-shared';
-import { useArchivistStates } from './useArchivistStates';
-export const useArchivistGet = (hashes) => {
-    const [savedHashes, setSavedHashes] = useDataState(hashes);
-    setSavedHashes(hashes);
-    const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates();
+import { useCallback, useState } from 'react';
+import { useArchivist } from './useArchivist';
+export const useArchivistGet = (hashes, archivist) => {
+    const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
+    const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
+    const [payloads, setPayloads] = useState();
+    const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress);
+    const [error, setError] = useState();
+    const [refresh, setRefresh] = useState(0);
+    const onRefresh = useCallback(() => {
+        setRefresh(refresh + 1);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivist && savedHashes) {
-                const result = (await archivist.get(savedHashes ?? [])) ?? [];
+            const archivistToUse = passedArchivist ?? foundArchivist;
+            if (archivistToUse && hashes) {
+                const result = (await archivistToUse.get(hashes ?? [])) ?? [];
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -20,7 +28,7 @@ export const useArchivistGet = (hashes) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivist, savedHashes, refreshCount, setError, setPayloads]);
-    return [payloads, error, refresh];
+    }, [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads]);
+    return [payloads, error ?? foundArchivistError, onRefresh];
 };
 //# sourceMappingURL=useArchivistGet.js.map

package/dist/esm/hooks/useArchivistGet.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAmB,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAK,CAAA;IAE5G,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7D,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,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QACvB,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,cAAc,GAAG,eAAe,IAAI,cAAc,CAAA;YACxD,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAI,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAS,IAAI,EAAE,CAAA;gBACtE,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,eAAe,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC1E,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA"}

package/dist/types/hooks/useArchivist.d.ts

@@ -1,9 +1,3 @@
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist';
-export declare const useArchivist: {
-    (name?: string | undefined): [ArchivistModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | import("@xyo-network/account").Account): [ArchivistWrapper | undefined, Error | undefined];
-    (wrap: true | import("@xyo-network/account").Account): [ArchivistWrapper | undefined, Error | undefined];
-    (address: string): [ArchivistModule | undefined, Error | undefined];
-    (address: string, wrap: true | import("@xyo-network/account").Account): [ArchivistWrapper | undefined, Error | undefined];
-};
+import { ArchivistWrapper } from '@xyo-network/archivist';
+export declare const useArchivist: (nameOrAddress?: string | undefined, account?: import("@xyo-network/account-model").AccountInstance | undefined, spinCheck?: boolean | undefined) => [ArchivistWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useArchivist.d.ts.map

package/dist/types/hooks/useArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG1E,eAAO,MAAM,YAAY;;;;;;CAA6G,CAAA"}
+{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,eAAO,MAAM,YAAY,wMAA6D,CAAA"}

package/dist/types/hooks/useArchivistGet.d.ts

@@ -1,7 +1,8 @@
+import { Archivist } from '@xyo-network/archivist';
 import { RefreshCallback } from './useArchivistStates';
 export declare const useArchivistGet: <T extends import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
 } = import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
-}>(hashes?: string[]) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
+}>(hashes?: string[], archivist?: Archivist | string) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
 //# sourceMappingURL=useArchivistGet.d.ts.map

package/dist/types/hooks/useArchivistGet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAsB,MAAM,sBAAsB,CAAA;AAE1E,eAAO,MAAM,eAAe;;;;YAAgD,MAAM,EAAE,+EAwBnF,CAAA"}
+{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,eAAO,MAAM,eAAe;;;;YACjB,MAAM,EAAE,cACL,SAAS,GAAG,MAAM,+EAiC/B,CAAA"}

package/package.json

@@ -10,14 +10,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/react-button": "^2.16.8",
-    "@xylabs/react-flexbox": "^2.16.8",
-    "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/node": "^2.51.1",
-    "@xyo-network/react-module": "^2.45.0-rc.8",
-    "@xyo-network/react-node": "^2.45.0-rc.8",
-    "@xyo-network/react-shared": "^2.45.0-rc.8",
-    "lodash": "^4.17.21"
+    "@xylabs/eth-address": "^2.7.4",
+    "@xylabs/react-button": "^2.16.11",
+    "@xylabs/react-crypto": "^2.16.11",
+    "@xylabs/react-flexbox": "^2.16.11",
+    "@xylabs/react-shared": "^2.16.11",
+    "@xyo-network/react-module": "^2.45.0",
+    "@xyo-network/react-node": "^2.45.0",
+    "@xyo-network/react-shared": "^2.45.0"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -32,14 +32,13 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@types/lodash": "^4.14.191",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
-    "@xyo-network/archivist": "^2.51.1",
-    "@xyo-network/archivist-wrapper": "^2.51.1",
-    "@xyo-network/module": "^2.51.1",
-    "@xyo-network/payload-model": "^2.51.1",
-    "@xyo-network/react-storybook": "^2.45.0-rc.8",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
+    "@xyo-network/archivist": "^2.51.7",
+    "@xyo-network/archivist-wrapper": "^2.51.7",
+    "@xyo-network/module": "^2.51.7",
+    "@xyo-network/payload-model": "^2.51.7",
+    "@xyo-network/react-storybook": "^2.45.0",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -85,6 +84,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.8",
-  "stableVersion": "2.44.1"
+  "version": "2.45.0"
 }

package/src/hooks/useArchivist.tsx

@@ -1,4 +1,4 @@
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist'
-import { createUseModuleHook, useNode } from '@xyo-network/react-node'
+import { ArchivistWrapper } from '@xyo-network/archivist'
+import { WrappedModuleHookFactory } from '@xyo-network/react-node'
 
-export const useArchivist = createUseModuleHook<ArchivistModule, ArchivistWrapper>((module) => ArchivistWrapper.wrap(module), useNode)
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper, 'useArchivist')

package/src/hooks/useArchivistGet.tsx

@@ -1,21 +1,34 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
+import { Archivist } from '@xyo-network/archivist'
 import { XyoPayload } from '@xyo-network/payload-model'
-import { useDataState } from '@xyo-network/react-shared'
+import { useCallback, useState } from 'react'
 
-import { RefreshCallback, useArchivistStates } from './useArchivistStates'
+import { useArchivist } from './useArchivist'
+import { RefreshCallback } from './useArchivistStates'
 
-export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: string[]): [T[]?, Error?, RefreshCallback?] => {
-  const [savedHashes, setSavedHashes] = useDataState(hashes)
-  setSavedHashes(hashes)
+export const useArchivistGet = <T extends XyoPayload = XyoPayload>(
+  hashes?: string[],
+  archivist?: Archivist | string,
+): [T[]?, Error?, RefreshCallback?] => {
+  const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined
+  const passedArchivist = typeof archivist === 'object' ? archivist : undefined
+  const [payloads, setPayloads] = useState<T[]>()
+  const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress)
+  const [error, setError] = useState<Error>()
+  const [refresh, setRefresh] = useState(0)
 
-  const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates<T>()
+  const onRefresh = useCallback(() => {
+    setRefresh(refresh + 1)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivist && savedHashes) {
-          const result = (await archivist.get(savedHashes ?? [])) ?? []
+        const archivistToUse = passedArchivist ?? foundArchivist
+        if (archivistToUse && hashes) {
+          const result = ((await archivistToUse.get(hashes ?? [])) as T[]) ?? []
           if (mounted()) {
             setError(undefined)
             setPayloads(result as T[])
@@ -25,7 +38,7 @@ export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: stri
         setError(ex as Error)
       }
     },
-    [archivist, savedHashes, refreshCount, setError, setPayloads],
+    [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads],
   )
-  return [payloads, error, refresh]
+  return [payloads, error ?? foundArchivistError, onRefresh]
 }