@xyo-network/react-archivist 2.57.0 → 2.57.2

package/dist/esm/components/Card/CardActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardActions.js","sourceRoot":"","sources":["../../../../src/components/Card/CardActions.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAA;AAEhF,MAAM,CAAC,MAAM,oBAAoB,GAAoE,CAAC,KAAK,EAAE,EAAE;IAC7G,OAAO,KAAC,iBAAiB,OAAK,KAAK,GAAI,CAAA;AACzC,CAAC,CAAA"}
+{"version":3,"file":"CardActions.js","sourceRoot":"","sources":["../../../../src/components/Card/CardActions.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAA;AAEhF,MAAM,CAAC,MAAM,oBAAoB,GAAsE,CAAC,KAAK,EAAE,EAAE;IAC/G,OAAO,KAAC,iBAAiB,OAAK,KAAK,GAAI,CAAA;AACzC,CAAC,CAAA"}

package/dist/esm/components/Card/CardContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardContent.js","sourceRoot":"","sources":["../../../../src/components/Card/CardContent.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAoE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAmB,CAAA;IACvD,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,EAAE,CAAA;IAE5B,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,MAAM,IAAI,MAAM,EAAE;YACpB,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAClD,MAAM,QAAQ,GAAG,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAA;YAC1C,IAAI,OAAO,EAAE,EAAE;gBACb,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAoB,CAAC,CAAA;aAC5C;SACF;aAAM;YACL,SAAS,CAAC,SAAS,CAAC,CAAA;SACrB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,MAAM,CAAC,CACjB,CAAA;IAED,OAAO,CACL,KAAC,iBAAiB,IAAC,MAAM,EAAE,MAAM,KAAM,KAAK,YAC1C,MAAC,WAAW,IAAC,QAAQ,EAAC,MAAM,EAAC,cAAc,EAAC,OAAO,EAAC,GAAG,EAAE,CAAC,aACvD,QAAQ,EACT,KAAC,gBAAgB,IAAC,MAAM,EAAE,MAAM,GAAI,IACxB,GACI,CACrB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"CardContent.js","sourceRoot":"","sources":["../../../../src/components/Card/CardContent.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAqB,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAsE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxI,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAmB,CAAA;IACvD,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,EAAE,CAAA;IAE5B,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,MAAM,IAAI,MAAM,EAAE;YACpB,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAClD,MAAM,QAAQ,GAAG,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAA;YAC1C,IAAI,OAAO,EAAE,EAAE;gBACb,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAoB,CAAC,CAAA;aAC5C;SACF;aAAM;YACL,SAAS,CAAC,SAAS,CAAC,CAAA;SACrB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,MAAM,CAAC,CACjB,CAAA;IAED,OAAO,CACL,KAAC,iBAAiB,IAAC,MAAM,EAAE,MAAM,KAAM,KAAK,YAC1C,MAAC,WAAW,IAAC,QAAQ,EAAC,MAAM,EAAC,cAAc,EAAC,OAAO,EAAC,GAAG,EAAE,CAAC,aACvD,QAAQ,EACT,KAAC,gBAAgB,IAAC,MAAM,EAAE,MAAM,GAAI,IACxB,GACI,CACrB,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/index.js

@@ -1,5 +1,3 @@
 export * from './node';
 export * from './queries';
-export * from './useWrappedArchivist';
-export * from './useWrappedArchivists';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA"}

package/dist/esm/hooks/node/index.js

@@ -1,5 +1,3 @@
 export * from './useArchivistFromNode';
 export * from './useArchivistsFromNode';
-export * from './useWrappedArchivistFromNode';
-export * from './useWrappedArchivistsFromNode';
 //# sourceMappingURL=index.js.map

package/dist/esm/hooks/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/node/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/node/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA"}

package/dist/esm/hooks/node/useArchivistFromNode.js

@@ -1,3 +1,11 @@
+import { asArchivistInstance } from '@xyo-network/archivist-model';
 import { useModuleFromNode } from '@xyo-network/react-node';
-export const useArchivistFromNode = (nameOrAddress, up, logger) => useModuleFromNode(nameOrAddress, up, logger);
+export const useArchivistFromNode = (nameOrAddress, config) => {
+    const [module, error] = useModuleFromNode(nameOrAddress, config);
+    const instance = asArchivistInstance(module);
+    if (module && !instance) {
+        return [null, Error('Resolved module is not an ArchivistInstance')];
+    }
+    return [instance, error];
+};
 //# sourceMappingURL=useArchivistFromNode.js.map

package/dist/esm/hooks/node/useArchivistFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistFromNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAsB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAC5F,iBAAiB,CAAoB,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"useArchivistFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACrF,OAAO,EAAwB,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAEjF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,aAAsB,EACtB,MAA6B,EAC8B,EAAE;IAC7D,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC5C,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,6CAA6C,CAAC,CAAC,CAAA;KACpE;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}

package/dist/esm/hooks/node/useArchivistsFromNode.js

@@ -1,3 +1,23 @@
+import { isArchivistInstance } from '@xyo-network/archivist';
 import { useModulesFromNode } from '@xyo-network/react-node';
-export const useArchivistsFromNode = (filter, up, logger) => useModulesFromNode(filter, up, logger);
+export const useArchivistsFromNode = (filter, config) => {
+    const [modules, error] = useModulesFromNode(filter, config);
+    if (error) {
+        return [null, error];
+    }
+    if (modules) {
+        return [
+            modules.reduce((prev, module) => {
+                if (isArchivistInstance(module)) {
+                    prev.push(module);
+                }
+                return prev;
+            }, []),
+            undefined,
+        ];
+    }
+    else {
+        return [modules, error];
+    }
+};
 //# sourceMappingURL=useArchivistsFromNode.js.map

package/dist/esm/hooks/node/useArchivistsFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistsFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistsFromNode.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAqB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAAC,kBAAkB,CAAkB,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"useArchivistsFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistsFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqB,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,EAAwB,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAElF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,MAAqB,EACrB,MAA6B,EACgC,EAAE;IAC/D,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;KACrB;IACD,IAAI,OAAO,EAAE;QACX,OAAO;YACL,OAAO,CAAC,MAAM,CAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACnD,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE;oBAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;iBAClB;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,EAAE,EAAE,CAAC;YACN,SAAS;SACV,CAAA;KACF;SAAM;QACL,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;KACxB;AACH,CAAC,CAAA"}

package/dist/esm/hooks/queries/useArchivistAll.js

@@ -1,22 +1,20 @@
 import { usePromise } from '@xylabs/react-promise';
 import { useRefresh } from '@xyo-network/react-module';
 import { useState } from 'react';
-import { useWrappedArchivist } from '../useWrappedArchivist';
-export const useArchivistAll = (archivist, account) => {
-    const [wrappedArchivist] = useWrappedArchivist(archivist, account);
+export const useArchivistAll = (archivist) => {
     const [error, setError] = useState();
     const [enabled, refresh] = useRefresh();
     const payloads = usePromise(async () => {
         try {
             if (enabled) {
-                return await wrappedArchivist?.all();
+                return await archivist?.all?.();
             }
         }
         catch (ex) {
             const error = ex;
             setError(error);
         }
-    }, [wrappedArchivist, enabled]);
+    }, [archivist, enabled]);
     return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistAll.js.map

package/dist/esm/hooks/queries/useArchivistAll.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistAll.js","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistAll.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAA0B,EAAE,OAAyB,EAAE,EAAE;IACvF,MAAM,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAClE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,CAAA;IAEvC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACrC,IAAI;YACF,IAAI,OAAO,EAAE;gBACX,OAAO,MAAM,gBAAgB,EAAE,GAAG,EAAE,CAAA;aACrC;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,QAAQ,CAAC,KAAK,CAAC,CAAA;SAChB;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAA;IAE/B,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistAll.js","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistAll.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAA4B,EAAE,EAAE;IAC9D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,CAAA;IAEvC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACrC,IAAI;YACF,IAAI,OAAO,EAAE;gBACX,OAAO,MAAM,SAAS,EAAE,GAAG,EAAE,EAAE,CAAA;aAChC;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,QAAQ,CAAC,KAAK,CAAC,CAAA;SAChB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IAExB,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

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

@@ -1,14 +1,12 @@
 import { usePromise } from '@xylabs/react-promise';
 import { useRefresh } from '@xyo-network/react-module';
-import { useWrappedArchivist } from '../useWrappedArchivist';
-export const useArchivistGet = (archivist, hashes, account) => {
-    const [wrappedArchivist] = useWrappedArchivist(archivist, account);
+export const useArchivistGet = (archivist, hashes) => {
     const [enabled, refresh] = useRefresh();
     const [payloads, error] = usePromise(async () => {
-        if (enabled && wrappedArchivist && hashes) {
-            return (await wrappedArchivist?.get(hashes));
+        if (enabled && archivist && hashes) {
+            return (await archivist.get(hashes));
         }
-    }, [wrappedArchivist, hashes, enabled]);
+    }, [archivist, hashes, enabled]);
     return [payloads, error, refresh];
 };
 //# sourceMappingURL=useArchivistGet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAmB,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAkC,EAClC,MAAiB,EACjB,OAAyB,EAC8B,EAAE;IACzD,MAAM,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAClE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,CAAA;IAEvC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC9C,IAAI,OAAO,IAAI,gBAAgB,IAAI,MAAM,EAAE;YACzC,OAAO,CAAC,MAAM,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAQ,CAAA;SACpD;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAEvC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAmB,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEvE,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAoC,EACpC,MAAiB,EACsC,EAAE;IACzD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,CAAA;IAEvC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC9C,IAAI,OAAO,IAAI,SAAS,IAAI,MAAM,EAAE;YAClC,OAAO,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAQ,CAAA;SAC5C;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAEhC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}

package/dist/types/components/Card/CardActions.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CardActionsProps } from '@mui/material';
-import { ArchivistModule } from '@xyo-network/archivist';
+import { ArchivistInstance } from '@xyo-network/archivist';
 import { ModuleRenderProps } from '@xyo-network/react-module';
-export declare const ArchivistCardActions: React.FC<ModuleRenderProps<ArchivistModule> & CardActionsProps>;
+export declare const ArchivistCardActions: React.FC<ModuleRenderProps<ArchivistInstance> & CardActionsProps>;
 //# sourceMappingURL=CardActions.d.ts.map

package/dist/types/components/Card/CardActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CardActions.d.ts","sourceRoot":"","sources":["../../../../src/components/Card/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAqB,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEhF,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CAEhG,CAAA"}
+{"version":3,"file":"CardActions.d.ts","sourceRoot":"","sources":["../../../../src/components/Card/CardActions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAqB,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEhF,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAElG,CAAA"}

package/dist/types/components/Card/CardContent.d.ts

@@ -1,6 +1,6 @@
 import { CardContentProps } from '@mui/material';
-import { ArchivistModule } from '@xyo-network/archivist';
+import { ArchivistInstance } from '@xyo-network/archivist';
 import { ModuleRenderProps } from '@xyo-network/react-module';
 import React from 'react';
-export declare const ArchivistCardContent: React.FC<ModuleRenderProps<ArchivistModule> & CardContentProps>;
+export declare const ArchivistCardContent: React.FC<ModuleRenderProps<ArchivistInstance> & CardContentProps>;
 //# sourceMappingURL=CardContent.d.ts.map

package/dist/types/components/Card/CardContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CardContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Card/CardContent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EAAmB,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAEzE,OAAO,EAAqB,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEhF,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CA4BhG,CAAA"}
+{"version":3,"file":"CardContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Card/CardContent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EAAmB,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE3E,OAAO,EAAqB,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEhF,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CA4BlG,CAAA"}

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

@@ -1,5 +1,3 @@
 export * from './node';
 export * from './queries';
-export * from './useWrappedArchivist';
-export * from './useWrappedArchivists';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA"}

package/dist/types/hooks/node/index.d.ts

@@ -1,5 +1,3 @@
 export * from './useArchivistFromNode';
 export * from './useArchivistsFromNode';
-export * from './useWrappedArchivistFromNode';
-export * from './useWrappedArchivistsFromNode';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/hooks/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA"}

package/dist/types/hooks/node/useArchivistFromNode.d.ts

@@ -1,41 +1,4 @@
-import { ArchivistInstance } from '@xyo-network/archivist';
-import { Logger } from '@xyo-network/core';
-export declare const useArchivistFromNode: (nameOrAddress?: string, up?: boolean, logger?: Logger) => [ArchivistInstance<import("@xyo-network/archivist").ArchivistParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.archivist.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<{
-    parents?: import("@xyo-network/archivist").ArchivistParents | undefined;
-    requireAllParents?: boolean | undefined;
-    schema: "network.xyo.archivist.config";
-    storeParentReads?: boolean | undefined;
-} & Omit<undefined, "schema">, "schema"> & {
-    schema: "network.xyo.archivist.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/archivist").ArchivistModuleEventData> | null | undefined, Error | undefined];
+import { ArchivistInstance } from '@xyo-network/archivist-model';
+import { ModuleFromNodeConfig } from '@xyo-network/react-node';
+export declare const useArchivistFromNode: (nameOrAddress?: string, config?: ModuleFromNodeConfig) => [ArchivistInstance | null | undefined, Error | undefined];
 //# sourceMappingURL=useArchivistFromNode.d.ts.map

package/dist/types/hooks/node/useArchivistFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistFromNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,eAAO,MAAM,oBAAoB,mBAAoB,MAAM,OAAO,OAAO,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gHACzB,CAAA"}
+{"version":3,"file":"useArchivistFromNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AACrF,OAAO,EAAE,oBAAoB,EAAqB,MAAM,yBAAyB,CAAA;AAEjF,eAAO,MAAM,oBAAoB,mBACf,MAAM,WACb,oBAAoB,KAC5B,CAAC,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAO1D,CAAA"}

package/dist/types/hooks/node/useArchivistsFromNode.d.ts

@@ -1,42 +1,5 @@
-import { ArchivistModule } from '@xyo-network/archivist';
-import { Logger } from '@xyo-network/core';
-import { ModuleFilter } from '@xyo-network/module';
-export declare const useArchivistsFromNode: (filter?: ModuleFilter, up?: boolean, logger?: Logger) => [ArchivistModule<import("@xyo-network/archivist").ArchivistParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.archivist.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<{
-    parents?: import("@xyo-network/archivist").ArchivistParents | undefined;
-    requireAllParents?: boolean | undefined;
-    schema: "network.xyo.archivist.config";
-    storeParentReads?: boolean | undefined;
-} & Omit<undefined, "schema">, "schema"> & {
-    schema: "network.xyo.archivist.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/archivist").ArchivistModuleEventData>[] | null | undefined, Error | undefined];
+import { ArchivistInstance } from '@xyo-network/archivist';
+import { ModuleFilter } from '@xyo-network/module-model';
+import { ModuleFromNodeConfig } from '@xyo-network/react-node';
+export declare const useArchivistsFromNode: (filter?: ModuleFilter, config?: ModuleFromNodeConfig) => [ArchivistInstance[] | null | undefined, Error | undefined];
 //# sourceMappingURL=useArchivistsFromNode.d.ts.map

package/dist/types/hooks/node/useArchivistsFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistsFromNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistsFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAGlD,eAAO,MAAM,qBAAqB,YAAa,YAAY,OAAO,OAAO,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kHAA4D,CAAA"}
+{"version":3,"file":"useArchivistsFromNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/node/useArchivistsFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,wBAAwB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAA;AAElF,eAAO,MAAM,qBAAqB,YACvB,YAAY,WACZ,oBAAoB,KAC5B,CAAC,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAkB5D,CAAA"}

package/dist/types/hooks/queries/useArchivistAll.d.ts

@@ -1,6 +1,5 @@
-import { AccountInstance } from '@xyo-network/account-model';
-import { ArchivistModule } from '@xyo-network/archivist';
-export declare const useArchivistAll: (archivist: ArchivistModule, account?: AccountInstance) => (Error | import("@xyo-network/react-module").RefreshCallback | [(import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+import { ArchivistInstance } from '@xyo-network/archivist';
+export declare const useArchivistAll: (archivist: ArchivistInstance) => (Error | import("@xyo-network/react-module").RefreshCallback | [(import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
 })[] | undefined, Error | undefined, import("@xylabs/react-promise").State | undefined] | undefined)[];
 //# sourceMappingURL=useArchivistAll.d.ts.map

package/dist/types/hooks/queries/useArchivistAll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArchivistAll.d.ts","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistAll.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAMxD,eAAO,MAAM,eAAe,cAAe,eAAe,YAAY,eAAe;;sGAiBpF,CAAA"}
+{"version":3,"file":"useArchivistAll.d.ts","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistAll.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAI1D,eAAO,MAAM,eAAe,cAAe,iBAAiB;;sGAgB3D,CAAA"}

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

@@ -1,9 +1,8 @@
-import { AccountInstance } from '@xyo-network/account-model';
-import { ArchivistModule } from '@xyo-network/archivist';
+import { ArchivistInstance } from '@xyo-network/archivist';
 import { RefreshCallback } from '@xyo-network/react-module';
 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;
-}>(archivist?: ArchivistModule | null, hashes?: string[], account?: AccountInstance) => [T[] | undefined, Error | undefined, RefreshCallback];
+}>(archivist?: ArchivistInstance | null, hashes?: string[]) => [T[] | undefined, Error | undefined, RefreshCallback];
 //# sourceMappingURL=useArchivistGet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,OAAO,EAAE,eAAe,EAAc,MAAM,2BAA2B,CAAA;AAIvE,eAAO,MAAM,eAAe;;;;eACd,eAAe,GAAG,IAAI,WACzB,MAAM,EAAE,YACP,eAAe,0DAY1B,CAAA"}
+{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../../src/hooks/queries/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAc,MAAM,2BAA2B,CAAA;AAEvE,eAAO,MAAM,eAAe;;;;eACd,iBAAiB,GAAG,IAAI,WAC3B,MAAM,EAAE,0DAWlB,CAAA"}

package/package.json

@@ -10,16 +10,16 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/react-button": "^2.17.6",
-    "@xylabs/react-flexbox": "^2.17.6",
-    "@xylabs/react-promise": "^2.17.6",
-    "@xyo-network/account-model": "^2.65.0",
-    "@xyo-network/boundwitness-model": "^2.65.0",
-    "@xyo-network/boundwitness-wrapper": "^2.65.0",
-    "@xyo-network/core": "^2.65.0",
-    "@xyo-network/react-module": "^2.57.0",
-    "@xyo-network/react-node": "^2.57.0",
-    "@xyo-network/react-wallet": "^2.57.0",
+    "@xylabs/react-button": "~2.17.6",
+    "@xylabs/react-flexbox": "~2.17.6",
+    "@xylabs/react-promise": "~2.17.6",
+    "@xyo-network/archivist-model": "~2.66.5",
+    "@xyo-network/boundwitness-model": "~2.66.5",
+    "@xyo-network/boundwitness-wrapper": "~2.66.5",
+    "@xyo-network/module-model": "~2.66.5",
+    "@xyo-network/react-module": "~2.57.2",
+    "@xyo-network/react-node": "~2.57.2",
+    "@xyo-network/react-wallet": "~2.57.2",
     "react-icons": "^4.10.1"
   },
   "peerDependencies": {
@@ -33,17 +33,16 @@
   },
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
-    "@storybook/react": "^7.0.27",
-    "@xylabs/react-async-effect": "^2.17.6",
-    "@xylabs/ts-scripts-yarn3": "^2.18.10",
-    "@xylabs/tsconfig-react": "^2.18.10",
-    "@xyo-network/account": "^2.65.0",
-    "@xyo-network/archivist": "^2.65.0",
-    "@xyo-network/archivist-wrapper": "^2.65.0",
-    "@xyo-network/boundwitness-builder": "^2.65.0",
-    "@xyo-network/module": "^2.65.0",
-    "@xyo-network/payload-model": "^2.65.0",
-    "@xyo-network/react-storybook": "^2.57.0",
+    "@storybook/react": "^7.1.0",
+    "@xylabs/react-async-effect": "~2.17.6",
+    "@xylabs/ts-scripts-yarn3": "^2.18.11",
+    "@xylabs/tsconfig-react": "^2.18.11",
+    "@xyo-network/account": "~2.66.5",
+    "@xyo-network/archivist": "~2.66.5",
+    "@xyo-network/boundwitness-builder": "~2.66.5",
+    "@xyo-network/module": "~2.66.5",
+    "@xyo-network/payload-model": "~2.66.5",
+    "@xyo-network/react-storybook": "~2.57.2",
     "typescript": "^5.1.6"
   },
   "browser": "dist/esm/index.js",
@@ -88,5 +87,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.57.0"
+  "version": "2.57.2"
 }

package/src/components/Card/CardActions.tsx

@@ -1,7 +1,7 @@
 import { CardActionsProps } from '@mui/material'
-import { ArchivistModule } from '@xyo-network/archivist'
+import { ArchivistInstance } from '@xyo-network/archivist'
 import { ModuleCardActions, ModuleRenderProps } from '@xyo-network/react-module'
 
-export const ArchivistCardActions: React.FC<ModuleRenderProps<ArchivistModule> & CardActionsProps> = (props) => {
+export const ArchivistCardActions: React.FC<ModuleRenderProps<ArchivistInstance> & CardActionsProps> = (props) => {
   return <ModuleCardActions {...props} />
 }

package/src/components/Card/CardContent.tsx

@@ -1,7 +1,7 @@
 import { CardContentProps } from '@mui/material'
 import { useAsyncEffect } from '@xylabs/react-async-effect'
 import { FlexGrowRow } from '@xylabs/react-flexbox'
-import { ArchivistConfig, ArchivistModule } from '@xyo-network/archivist'
+import { ArchivistConfig, ArchivistInstance } from '@xyo-network/archivist'
 import { ModuleWrapper } from '@xyo-network/module'
 import { ModuleCardContent, ModuleRenderProps } from '@xyo-network/react-module'
 import { useWallet } from '@xyo-network/react-wallet'
@@ -9,7 +9,7 @@ import React, { useState } from 'react'
 
 import { ArchivistParents } from './components'
 
-export const ArchivistCardContent: React.FC<ModuleRenderProps<ArchivistModule> & CardContentProps> = ({ children, module, ...props }) => {
+export const ArchivistCardContent: React.FC<ModuleRenderProps<ArchivistInstance> & CardContentProps> = ({ children, module, ...props }) => {
   const [config, setConfig] = useState<ArchivistConfig>()
   const [wallet] = useWallet()
 

package/src/hooks/index.ts

@@ -1,4 +1,2 @@
 export * from './node'
 export * from './queries'
-export * from './useWrappedArchivist'
-export * from './useWrappedArchivists'

package/src/hooks/node/index.ts

@@ -1,4 +1,2 @@
 export * from './useArchivistFromNode'
 export * from './useArchivistsFromNode'
-export * from './useWrappedArchivistFromNode'
-export * from './useWrappedArchivistsFromNode'

package/src/hooks/node/useArchivistFromNode.tsx

@@ -1,6 +1,14 @@
-import { ArchivistInstance } from '@xyo-network/archivist'
-import { Logger } from '@xyo-network/core'
-import { useModuleFromNode } from '@xyo-network/react-node'
+import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
+import { ModuleFromNodeConfig, useModuleFromNode } from '@xyo-network/react-node'
 
-export const useArchivistFromNode = (nameOrAddress?: string, up?: boolean, logger?: Logger) =>
-  useModuleFromNode<ArchivistInstance>(nameOrAddress, up, logger)
+export const useArchivistFromNode = (
+  nameOrAddress?: string,
+  config?: ModuleFromNodeConfig,
+): [ArchivistInstance | null | undefined, Error | undefined] => {
+  const [module, error] = useModuleFromNode(nameOrAddress, config)
+  const instance = asArchivistInstance(module)
+  if (module && !instance) {
+    return [null, Error('Resolved module is not an ArchivistInstance')]
+  }
+  return [instance, error]
+}

package/src/hooks/node/useArchivistsFromNode.tsx

@@ -1,6 +1,26 @@
-import { ArchivistModule } from '@xyo-network/archivist'
-import { Logger } from '@xyo-network/core'
-import { ModuleFilter } from '@xyo-network/module'
-import { useModulesFromNode } from '@xyo-network/react-node'
+import { ArchivistInstance, isArchivistInstance } from '@xyo-network/archivist'
+import { ModuleFilter } from '@xyo-network/module-model'
+import { ModuleFromNodeConfig, useModulesFromNode } from '@xyo-network/react-node'
 
-export const useArchivistsFromNode = (filter?: ModuleFilter, up?: boolean, logger?: Logger) => useModulesFromNode<ArchivistModule>(filter, up, logger)
+export const useArchivistsFromNode = (
+  filter?: ModuleFilter,
+  config?: ModuleFromNodeConfig,
+): [ArchivistInstance[] | null | undefined, Error | undefined] => {
+  const [modules, error] = useModulesFromNode(filter, config)
+  if (error) {
+    return [null, error]
+  }
+  if (modules) {
+    return [
+      modules.reduce<ArchivistInstance[]>((prev, module) => {
+        if (isArchivistInstance(module)) {
+          prev.push(module)
+        }
+        return prev
+      }, []),
+      undefined,
+    ]
+  } else {
+    return [modules, error]
+  }
+}

package/src/hooks/queries/useArchivistAll.tsx

@@ -1,26 +1,22 @@
 import { usePromise } from '@xylabs/react-promise'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistModule } from '@xyo-network/archivist'
+import { ArchivistInstance } from '@xyo-network/archivist'
 import { useRefresh } from '@xyo-network/react-module'
 import { useState } from 'react'
 
-import { useWrappedArchivist } from '../useWrappedArchivist'
-
-export const useArchivistAll = (archivist: ArchivistModule, account?: AccountInstance) => {
-  const [wrappedArchivist] = useWrappedArchivist(archivist, account)
+export const useArchivistAll = (archivist: ArchivistInstance) => {
   const [error, setError] = useState<Error>()
   const [enabled, refresh] = useRefresh()
 
   const payloads = usePromise(async () => {
     try {
       if (enabled) {
-        return await wrappedArchivist?.all()
+        return await archivist?.all?.()
       }
     } catch (ex) {
       const error = ex as Error
       setError(error)
     }
-  }, [wrappedArchivist, enabled])
+  }, [archivist, enabled])
 
   return [payloads, error, refresh]
 }

package/src/hooks/queries/useArchivistGet.tsx

@@ -1,24 +1,19 @@
 import { usePromise } from '@xylabs/react-promise'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistModule } from '@xyo-network/archivist'
+import { ArchivistInstance } from '@xyo-network/archivist'
 import { Payload } from '@xyo-network/payload-model'
 import { RefreshCallback, useRefresh } from '@xyo-network/react-module'
 
-import { useWrappedArchivist } from '../useWrappedArchivist'
-
 export const useArchivistGet = <T extends Payload = Payload>(
-  archivist?: ArchivistModule | null,
+  archivist?: ArchivistInstance | null,
   hashes?: string[],
-  account?: AccountInstance,
 ): [T[] | undefined, Error | undefined, RefreshCallback] => {
-  const [wrappedArchivist] = useWrappedArchivist(archivist, account)
   const [enabled, refresh] = useRefresh()
 
   const [payloads, error] = usePromise(async () => {
-    if (enabled && wrappedArchivist && hashes) {
-      return (await wrappedArchivist?.get(hashes)) as T[]
+    if (enabled && archivist && hashes) {
+      return (await archivist.get(hashes)) as T[]
     }
-  }, [wrappedArchivist, hashes, enabled])
+  }, [archivist, hashes, enabled])
 
   return [payloads, error, refresh]
 }

package/dist/cjs/hooks/node/useWrappedArchivistFromNode.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useWrappedArchivistFromNode = void 0;
-const archivist_1 = require("@xyo-network/archivist");
-const react_node_1 = require("@xyo-network/react-node");
-exports.useWrappedArchivistFromNode = react_node_1.WrappedModuleFromNodeHookFactory.create(archivist_1.ArchivistWrapper, 'useWrappedArchivistFromNode');
-//# sourceMappingURL=useWrappedArchivistFromNode.js.map

package/dist/cjs/hooks/node/useWrappedArchivistFromNode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useWrappedArchivistFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useWrappedArchivistFromNode.tsx"],"names":[],"mappings":";;;AAAA,sDAAyD;AACzD,wDAA0E;AAE7D,QAAA,2BAA2B,GAAG,6CAAgC,CAAC,MAAM,CAAC,4BAAgB,EAAE,6BAA6B,CAAC,CAAA"}

package/dist/cjs/hooks/node/useWrappedArchivistsFromNode.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useWrappedArchivistsFromNode = void 0;
-const archivist_1 = require("@xyo-network/archivist");
-const react_node_1 = require("@xyo-network/react-node");
-exports.useWrappedArchivistsFromNode = react_node_1.WrappedModulesFromNodeHookFactory.create(archivist_1.ArchivistWrapper, 'useWrappedArchivistsFromNode');
-//# sourceMappingURL=useWrappedArchivistsFromNode.js.map

package/dist/cjs/hooks/node/useWrappedArchivistsFromNode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useWrappedArchivistsFromNode.js","sourceRoot":"","sources":["../../../../src/hooks/node/useWrappedArchivistsFromNode.tsx"],"names":[],"mappings":";;;AAAA,sDAAyD;AACzD,wDAA2E;AAE9D,QAAA,4BAA4B,GAAG,8CAAiC,CAAC,MAAM,CAAC,4BAAgB,EAAE,8BAA8B,CAAC,CAAA"}