@xyo-network/react-payload 2.26.9 → 2.26.12

package/dist/cjs/components/Details/DataDetails.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PropertyProps } from '@xyo-network/react-property';
 import { SizeProp } from '@xyo-network/react-shared';
 export declare type PayloadDataDetailsProps = PropertyProps & {

package/dist/cjs/components/Details/DataDetails.js

@@ -7,14 +7,14 @@ const ContentCopy_1 = tslib_1.__importDefault(require("@mui/icons-material/Conte
 const Visibility_1 = tslib_1.__importDefault(require("@mui/icons-material/Visibility"));
 const material_1 = require("@mui/material");
 const react_button_1 = require("@xylabs/react-button");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const react_property_1 = require("@xyo-network/react-property");
 const react_1 = require("react");
 const HashSourceDetails_1 = require("./HashSourceDetails");
 const PayloadDataDetails = (_a) => {
     var _b;
     var { size, badge, payload } = _a, props = tslib_1.__rest(_a, ["size", "badge", "payload"]);
-    const wrapper = payload ? new payload_1.XyoPayloadWrapper(payload) : undefined;
+    const wrapper = payload ? new core_1.XyoPayloadWrapper(payload) : undefined;
     const [viewSourceOpen, setViewSourceOpen] = (0, react_1.useState)(false);
     const hash = wrapper === null || wrapper === void 0 ? void 0 : wrapper.hash;
     let elevation = 2;

package/dist/cjs/components/Details/DataDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/DataDetails.tsx"],"names":[],"mappings":";;;;;AAAA,0FAA6D;AAC7D,wFAA2D;AAC3D,4CAAiF;AACjF,uDAA+C;AAC/C,kDAAoE;AACpE,gEAAqF;AAErF,iCAAgC;AAEhC,2DAA8D;AAQvD,MAAM,kBAAkB,GAAsC,CAAC,EAAkC,EAAE,EAAE;;QAAtC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,OAAY,EAAP,KAAK,sBAAhC,4BAAkC,CAAF;IACpG,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEpE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC3D,MAAM,IAAI,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA;IAE1B,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,SAAS,IAAI,MAAA,KAAK,CAAC,SAAS,mCAAI,CAAC,CAAA;KAClC;IAED,MAAM,OAAO,GAAqB;QAChC;YACE,IAAI,EAAE,uBAAC,oBAAc,KAAG;YACxB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;SACvC;QACD;YACE,IAAI,EAAE,uBAAC,qBAAe,KAAG;YACzB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAS,EAAE,kEAAC,OAAA,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAA,GAAA;SAC9E;KACF,CAAA;IAED,MAAM,MAAM,GAAG,GAAS,EAAE;;QACxB,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,EAAE,CAAC,CAAA;IACjE,CAAC,CAAA,CAAA;IAED,OAAO,CACL,6DACE,uBAAC,yBAAQ,kBAAC,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAC,cAAc,EAAC,KAAK,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,GAAG,EAAC,0BAA0B,IAAK,KAAK,EAAI,EAC9K,wBAAC,iBAAM,kBAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBACnE,uBAAC,sBAAW,8BAA0B,EACtC,uBAAC,wBAAa,cACZ,uBAAC,4CAAwB,IAAC,OAAO,QAAC,OAAO,EAAE,OAAO,GAAI,GACxC,EAChB,wBAAC,wBAAa,eACZ,uBAAC,uBAAQ,kBAAC,KAAK,EAAC,WAAW,EAAC,OAAO,EAAE,MAAM,0BAEhC,EACX,uBAAC,uBAAQ,kBAAC,KAAK,EAAC,WAAW,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,2BAExD,IACG,KACT,IACR,CACJ,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,kBAAkB,sBA+C9B"}
+{"version":3,"file":"DataDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/DataDetails.tsx"],"names":[],"mappings":";;;;;AAAA,0FAA6D;AAC7D,wFAA2D;AAC3D,4CAAiF;AACjF,uDAA+C;AAC/C,4CAAiE;AACjE,gEAAqF;AAErF,iCAAgC;AAEhC,2DAA8D;AAQvD,MAAM,kBAAkB,GAAsC,CAAC,EAAkC,EAAE,EAAE;;QAAtC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,OAAY,EAAP,KAAK,sBAAhC,4BAAkC,CAAF;IACpG,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,wBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEpE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC3D,MAAM,IAAI,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA;IAE1B,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,SAAS,IAAI,MAAA,KAAK,CAAC,SAAS,mCAAI,CAAC,CAAA;KAClC;IAED,MAAM,OAAO,GAAqB;QAChC;YACE,IAAI,EAAE,uBAAC,oBAAc,KAAG;YACxB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;SACvC;QACD;YACE,IAAI,EAAE,uBAAC,qBAAe,KAAG;YACzB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,GAAS,EAAE,kEAAC,OAAA,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAA,GAAA;SAC9E;KACF,CAAA;IAED,MAAM,MAAM,GAAG,GAAS,EAAE;;QACxB,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,EAAE,CAAC,CAAA;IACjE,CAAC,CAAA,CAAA;IAED,OAAO,CACL,6DACE,uBAAC,yBAAQ,kBAAC,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAC,cAAc,EAAC,KAAK,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,GAAG,EAAC,0BAA0B,IAAK,KAAK,EAAI,EAC9K,wBAAC,iBAAM,kBAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBACnE,uBAAC,sBAAW,8BAA0B,EACtC,uBAAC,wBAAa,cACZ,uBAAC,4CAAwB,IAAC,OAAO,QAAC,OAAO,EAAE,OAAO,GAAI,GACxC,EAChB,wBAAC,wBAAa,eACZ,uBAAC,uBAAQ,kBAAC,KAAK,EAAC,WAAW,EAAC,OAAO,EAAE,MAAM,0BAEhC,EACX,uBAAC,uBAAQ,kBAAC,KAAK,EAAC,WAAW,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,2BAExD,IACG,KACT,IACR,CACJ,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,kBAAkB,sBA+C9B"}

package/dist/cjs/components/Details/Details.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { FlexBoxProps } from '@xylabs/react-flexbox';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 export declare type WithPaper<T> = T & {
     paper: true;
 };

package/dist/cjs/components/Details/HashSourceDetails.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { FlexBoxProps } from '@xylabs/react-flexbox';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 export interface PayloadHashSourceDetailsProps extends FlexBoxProps {
     noTitle?: boolean;
     payload?: XyoPayload;

package/dist/cjs/components/Details/HashSourceDetails.js

@@ -5,15 +5,15 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const ContentCopy_1 = tslib_1.__importDefault(require("@mui/icons-material/ContentCopy"));
 const material_1 = require("@mui/material");
+const react_common_1 = require("@xylabs/react-common");
 const react_flexbox_1 = require("@xylabs/react-flexbox");
-const react_quick_tip_button_1 = require("@xylabs/react-quick-tip-button");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const PayloadHashSourceDetails = (_a) => {
     var _b;
     var { noTitle = false, payload } = _a, props = tslib_1.__rest(_a, ["noTitle", "payload"]);
     const theme = (0, material_1.useTheme)();
-    const payloadWrapper = payload ? new payload_1.XyoPayloadWrapper(payload) : null;
-    return ((0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexCol, Object.assign({ alignItems: "stretch" }, props, { children: [noTitle ? null : ((0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexRow, Object.assign({ margin: 1, justifyContent: "flex-start" }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { children: "Hash Source" }), (0, jsx_runtime_1.jsx)(react_quick_tip_button_1.QuickTipButton, Object.assign({ title: "Hash Source" }, { children: "The actual string used to generate the hash (SHA256)" }))] }))), (0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexRow, { children: [(0, jsx_runtime_1.jsx)(react_flexbox_1.FlexGrowRow, Object.assign({ background: true, border: 1, borderColor: theme.palette.divider, justifyContent: "start" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ padding: 2, fontFamily: "monospace", variant: "body1", sx: { overflowWrap: 'break-word', wordBreak: 'break-all' } }, { children: (_b = payloadWrapper === null || payloadWrapper === void 0 ? void 0 : payloadWrapper.stringified) !== null && _b !== void 0 ? _b : '' })) })), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: (0, jsx_runtime_1.jsx)(ContentCopy_1.default, {}) })] }), noTitle ? ((0, jsx_runtime_1.jsx)(react_flexbox_1.FlexRow, Object.assign({ margin: 1, justifyContent: "flex-start" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ variant: "body2" }, { children: "The actual string used to generate the hash (SHA256). This can be used to validate the hash manually." })) }))) : null] })));
+    const payloadWrapper = payload ? new core_1.XyoPayloadWrapper(payload) : null;
+    return ((0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexCol, Object.assign({ alignItems: "stretch" }, props, { children: [noTitle ? null : ((0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexRow, Object.assign({ margin: 1, justifyContent: "flex-start" }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { children: "Hash Source" }), (0, jsx_runtime_1.jsx)(react_common_1.QuickTipButton, Object.assign({ title: "Hash Source" }, { children: "The actual string used to generate the hash (SHA256)" }))] }))), (0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexRow, { children: [(0, jsx_runtime_1.jsx)(react_flexbox_1.FlexGrowRow, Object.assign({ background: true, border: 1, borderColor: theme.palette.divider, justifyContent: "start" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ padding: 2, fontFamily: "monospace", variant: "body1", sx: { overflowWrap: 'break-word', wordBreak: 'break-all' } }, { children: (_b = payloadWrapper === null || payloadWrapper === void 0 ? void 0 : payloadWrapper.stringified) !== null && _b !== void 0 ? _b : '' })) })), (0, jsx_runtime_1.jsx)(material_1.IconButton, { children: (0, jsx_runtime_1.jsx)(ContentCopy_1.default, {}) })] }), noTitle ? ((0, jsx_runtime_1.jsx)(react_flexbox_1.FlexRow, Object.assign({ margin: 1, justifyContent: "flex-start" }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ variant: "body2" }, { children: "The actual string used to generate the hash (SHA256). This can be used to validate the hash manually." })) }))) : null] })));
 };
 exports.PayloadHashSourceDetails = PayloadHashSourceDetails;
 //# sourceMappingURL=HashSourceDetails.js.map

package/dist/cjs/components/Details/HashSourceDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"HashSourceDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/HashSourceDetails.tsx"],"names":[],"mappings":";;;;;AAAA,0FAA6D;AAC7D,4CAAgE;AAChE,yDAAmF;AACnF,2EAA+D;AAC/D,kDAAoE;AAO7D,MAAM,wBAAwB,GAA4C,CAAC,EAAsC,EAAE,EAAE;;QAA1C,EAAE,OAAO,GAAG,KAAK,EAAE,OAAO,OAAY,EAAP,KAAK,sBAApC,sBAAsC,CAAF;IACpH,MAAM,KAAK,GAAG,IAAA,mBAAQ,GAAE,CAAA;IACxB,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtE,OAAO,CACL,wBAAC,uBAAO,kBAAC,UAAU,EAAC,SAAS,IAAK,KAAK,eACpC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChB,wBAAC,uBAAO,kBAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,iBAC7C,uBAAC,qBAAU,8BAAyB,EACpC,uBAAC,uCAAc,kBAAC,KAAK,EAAC,aAAa,0EAAsE,KACjG,CACX,EACD,wBAAC,uBAAO,eACN,uBAAC,2BAAW,kBAAC,UAAU,QAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAC,OAAO,gBAC3F,uBAAC,qBAAU,kBAAC,OAAO,EAAE,CAAC,EAAE,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,gBACtH,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,EAAE,IACvB,IACD,EACd,uBAAC,qBAAU,cACT,uBAAC,qBAAe,KAAG,GACR,IACL,EACT,OAAO,CAAC,CAAC,CAAC,CACT,uBAAC,uBAAO,kBAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,gBAC7C,uBAAC,qBAAU,kBAAC,OAAO,EAAC,OAAO,2HAAmH,IACtI,CACX,CAAC,CAAC,CAAC,IAAI,KACA,CACX,CAAA;AACH,CAAC,CAAA;AA7BY,QAAA,wBAAwB,4BA6BpC"}
+{"version":3,"file":"HashSourceDetails.js","sourceRoot":"","sources":["../../../../src/components/Details/HashSourceDetails.tsx"],"names":[],"mappings":";;;;;AAAA,0FAA6D;AAC7D,4CAAgE;AAChE,uDAAqD;AACrD,yDAAmF;AACnF,4CAAiE;AAO1D,MAAM,wBAAwB,GAA4C,CAAC,EAAsC,EAAE,EAAE;;QAA1C,EAAE,OAAO,GAAG,KAAK,EAAE,OAAO,OAAY,EAAP,KAAK,sBAApC,sBAAsC,CAAF;IACpH,MAAM,KAAK,GAAG,IAAA,mBAAQ,GAAE,CAAA;IACxB,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,wBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtE,OAAO,CACL,wBAAC,uBAAO,kBAAC,UAAU,EAAC,SAAS,IAAK,KAAK,eACpC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChB,wBAAC,uBAAO,kBAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,iBAC7C,uBAAC,qBAAU,8BAAyB,EACpC,uBAAC,6BAAc,kBAAC,KAAK,EAAC,aAAa,0EAAsE,KACjG,CACX,EACD,wBAAC,uBAAO,eACN,uBAAC,2BAAW,kBAAC,UAAU,QAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAC,OAAO,gBAC3F,uBAAC,qBAAU,kBAAC,OAAO,EAAE,CAAC,EAAE,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,gBACtH,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,EAAE,IACvB,IACD,EACd,uBAAC,qBAAU,cACT,uBAAC,qBAAe,KAAG,GACR,IACL,EACT,OAAO,CAAC,CAAC,CAAC,CACT,uBAAC,uBAAO,kBAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAC,YAAY,gBAC7C,uBAAC,qBAAU,kBAAC,OAAO,EAAC,OAAO,2HAAmH,IACtI,CACX,CAAC,CAAC,CAAC,IAAI,KACA,CACX,CAAA;AACH,CAAC,CAAA;AA7BY,QAAA,wBAAwB,4BA6BpC"}

package/dist/cjs/components/Details/JsonDetails.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PropertyGroupProps } from '@xyo-network/react-property';
 import { ReactJsonViewProps } from 'react-json-view';
 export declare type PayloadJsonDetailsProps = PropertyGroupProps & {

package/dist/cjs/components/Details/MetaDetails.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { XyoPayloadWithPartialMeta } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PropertyGroupProps } from '@xyo-network/react-property';
 export declare type PayloadMetaDetailsProps = PropertyGroupProps & {
-    value?: XyoPayloadWithPartialMeta;
+    value?: XyoPayload;
     archivePath?: string;
 };
 export declare const PayloadMetaDetails: React.FC<PayloadMetaDetailsProps>;

package/dist/cjs/components/Details/ValidationDetails/ValidationDetails.js

@@ -5,15 +5,15 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const material_1 = require("@mui/material");
 const react_flexbox_1 = require("@xylabs/react-flexbox");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const react_property_1 = require("@xyo-network/react-property");
 const react_schema_1 = require("@xyo-network/react-schema");
 const PayloadValidationDetails = (_a) => {
     var _b, _c, _d;
     var { viewSchemaUrl, skipMeta = false, skipBody = false, value } = _a, props = tslib_1.__rest(_a, ["viewSchemaUrl", "skipMeta", "skipBody", "value"]);
-    const validator = value ? new payload_1.XyoPayloadValidator(value) : undefined;
-    const bodyErrors = skipBody ? [] : (_b = validator === null || validator === void 0 ? void 0 : validator.body.validate()) !== null && _b !== void 0 ? _b : [];
-    const metaErrors = skipMeta ? [] : (_c = validator === null || validator === void 0 ? void 0 : validator.meta.validate()) !== null && _c !== void 0 ? _c : [];
+    const validator = value ? new core_1.XyoPayloadValidator(value) : undefined;
+    const bodyErrors = skipBody ? [] : (_b = validator === null || validator === void 0 ? void 0 : validator.body.all()) !== null && _b !== void 0 ? _b : [];
+    const metaErrors = skipMeta ? [] : (_c = validator === null || validator === void 0 ? void 0 : validator.meta.all()) !== null && _c !== void 0 ? _c : [];
     const errors = [...bodyErrors, ...metaErrors];
     let elevation = 2;
     if (props.paper) {

package/dist/cjs/components/Details/ValidationDetails/ValidationDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationDetails.js","sourceRoot":"","sources":["../../../../../src/components/Details/ValidationDetails/ValidationDetails.tsx"],"names":[],"mappings":";;;;;AAAA,4CAA0C;AAC1C,yDAA+C;AAC/C,kDAA8E;AAC9E,gEAAqE;AACrE,4DAA0D;AAInD,MAAM,wBAAwB,GAA4C,CAAC,EAAsE,EAAE,EAAE;;QAA1E,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,KAAK,OAAY,EAAP,KAAK,sBAApE,kDAAsE,CAAF;IACpJ,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,6BAAmB,CAAC,KAA2B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE1F,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAA;IACnE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAA;IACnE,MAAM,MAAM,GAAY,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAA;IAEtD,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,SAAS,IAAI,MAAA,KAAK,CAAC,SAAS,mCAAI,CAAC,CAAA;KAClC;IAED,OAAO,CACL,wBAAC,8BAAa,kBAAC,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAC,YAAY,EAAC,GAAG,EAAC,yCAAyC,IAAK,KAAK,eAClH,uBAAC,yBAAQ,IACP,UAAU,EAAE,EAAE,SAAS,EAAE,EACzB,QAAQ,EAAE,CAAC,EACX,KAAK,EAAC,OAAO,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAC7C,GAAG,EACD,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAClB,uBAAC,uBAAO,cACL,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;wBAC3B,OAAO,uBAAC,qBAAU,cAAc,KAAK,CAAC,QAAQ,EAAE,IAAxB,KAAK,CAAiC,CAAA;oBAChE,CAAC,CAAC,GACM,CACX,CAAC,CAAC,CAAC,CACF,uBAAC,qBAAU,4BAAuB,CACnC,GAEH,EACD,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,KAAI,uBAAC,6BAAc,IAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,GAAI,KACjH,CACjB,CAAA;AACH,CAAC,CAAA;AAlCY,QAAA,wBAAwB,4BAkCpC"}
+{"version":3,"file":"ValidationDetails.js","sourceRoot":"","sources":["../../../../../src/components/Details/ValidationDetails/ValidationDetails.tsx"],"names":[],"mappings":";;;;;AAAA,4CAA0C;AAC1C,yDAA+C;AAC/C,4CAAuD;AACvD,gEAAqE;AACrE,4DAA0D;AAInD,MAAM,wBAAwB,GAA4C,CAAC,EAAsE,EAAE,EAAE;;QAA1E,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,KAAK,OAAY,EAAP,KAAK,sBAApE,kDAAsE,CAAF;IACpJ,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,0BAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEpE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAA;IAC9D,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAA;IAC9D,MAAM,MAAM,GAAY,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAC,CAAA;IAEtD,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,SAAS,IAAI,MAAA,KAAK,CAAC,SAAS,mCAAI,CAAC,CAAA;KAClC;IAED,OAAO,CACL,wBAAC,8BAAa,kBAAC,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAC,YAAY,EAAC,GAAG,EAAC,yCAAyC,IAAK,KAAK,eAClH,uBAAC,yBAAQ,IACP,UAAU,EAAE,EAAE,SAAS,EAAE,EACzB,QAAQ,EAAE,CAAC,EACX,KAAK,EAAC,OAAO,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAC7C,GAAG,EACD,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAClB,uBAAC,uBAAO,cACL,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;wBAC3B,OAAO,uBAAC,qBAAU,cAAc,KAAK,CAAC,QAAQ,EAAE,IAAxB,KAAK,CAAiC,CAAA;oBAChE,CAAC,CAAC,GACM,CACX,CAAC,CAAC,CAAC,CACF,uBAAC,qBAAU,4BAAuB,CACnC,GAEH,EACD,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,KAAI,uBAAC,6BAAc,IAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,GAAI,KACjH,CACjB,CAAA;AACH,CAAC,CAAA;AAlCY,QAAA,wBAAwB,4BAkCpC"}

package/dist/cjs/components/Details/ValidationDetails/ValidationDetailsProps.d.ts

@@ -1,8 +1,8 @@
-import { XyoPayloadWithPartialMeta } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PropertyGroupProps } from '@xyo-network/react-property';
 export declare type PayloadValidationDetailsProps = PropertyGroupProps & {
     skipBody?: boolean;
     skipMeta?: boolean;
-    value?: XyoPayloadWithPartialMeta;
+    value?: XyoPayload;
     viewSchemaUrl?: string;
 };

package/dist/cjs/components/Table/Table.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import { TableProps } from '@mui/material';
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PayloadTableColumnConfig } from './PayloadTableColumnConfig';
 export interface PayloadTableProps extends TableProps {
     exploreDomain?: string;
     onRowClick?: (value: XyoPayload) => void;
-    payloads?: XyoPayloadWithPartialMeta[] | null;
+    payloads?: XyoPayload[] | null;
     columns?: PayloadTableColumnConfig;
 }
 export declare const PayloadTable: React.FC<PayloadTableProps>;

package/dist/cjs/components/Table/TableRow.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { TableRowProps } from '@mui/material';
-import { XyoPayloadWithPartialMeta } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { PayloadTableColumnConfig } from './PayloadTableColumnConfig';
 export interface PayloadTableRowProps extends TableRowProps {
-    payload?: XyoPayloadWithPartialMeta;
+    payload?: XyoPayload;
     exploreDomain?: string;
     columns?: PayloadTableColumnConfig;
     network?: string;

package/dist/cjs/components/Table/TableRow.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const material_1 = require("@mui/material");
 const react_shared_1 = require("@xylabs/react-shared");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const react_network_1 = require("@xyo-network/react-network");
 const react_shared_2 = require("@xyo-network/react-shared");
 const luxon_1 = require("luxon");
@@ -16,7 +16,7 @@ const PayloadTableRow = (_a) => {
     var { exploreDomain, network: networkProp, payload, columns = (0, PayloadTableColumnConfig_1.payloadTableColumnConfigDefaults)() } = _a, props = tslib_1.__rest(_a, ["exploreDomain", "network", "payload", "columns"]);
     const breakPoint = (0, react_shared_1.useBreakpoint)();
     const timeStamp = (payload === null || payload === void 0 ? void 0 : payload._timestamp) ? luxon_1.DateTime.fromMillis(payload === null || payload === void 0 ? void 0 : payload._timestamp) : undefined;
-    const wrapper = payload ? new payload_1.XyoPayloadWrapper(payload) : undefined;
+    const wrapper = payload ? new core_1.XyoPayloadWrapper(payload) : undefined;
     const { network } = (0, react_network_1.useNetwork)();
     const archive = (props) => ((0, jsx_runtime_1.jsx)(material_1.TableCell, Object.assign({ align: "center" }, props, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ fontFamily: "monospace", variant: "body2", noWrap: true }, { children: payload === null || payload === void 0 ? void 0 : payload._archive })) }), "archive"));
     const client = (props) => ((0, jsx_runtime_1.jsx)(material_1.TableCell, Object.assign({ align: "center" }, props, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ fontFamily: "monospace", variant: "body2", noWrap: true }, { children: payload === null || payload === void 0 ? void 0 : payload._client })) }), "client"));
@@ -24,7 +24,7 @@ const PayloadTableRow = (_a) => {
     const hash = (props) => ((0, jsx_runtime_1.jsx)(react_shared_2.HashTableCell, Object.assign({ width: "100%", value: payload === null || payload === void 0 ? void 0 : payload._hash, archive: payload === null || payload === void 0 ? void 0 : payload._archive, dataType: "payload", exploreDomain: exploreDomain, network: networkProp !== null && networkProp !== void 0 ? networkProp : network === null || network === void 0 ? void 0 : network.slug }, props), "hash"));
     const schema = (props) => ((0, jsx_runtime_1.jsx)(material_1.TableCell, Object.assign({ align: "center" }, props, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ fontFamily: "monospace", variant: "body2", noWrap: true }, { children: payload === null || payload === void 0 ? void 0 : payload.schema })) }), "payloads"));
     const time = (props) => ((0, jsx_runtime_1.jsx)(material_1.TableCell, Object.assign({ align: "center" }, props, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ fontFamily: "monospace", variant: "body2", noWrap: true }, { children: timeStamp === null || timeStamp === void 0 ? void 0 : timeStamp.toLocaleString(luxon_1.DateTime.TIME_SIMPLE) })) }), "time"));
-    const isValid = wrapper ? new payload_1.XyoPayloadWrapperValidator(wrapper).validate().length === 0 : undefined;
+    const isValid = wrapper ? new core_1.XyoPayloadWrapperValidator(wrapper).all().length === 0 : undefined;
     const valid = (props) => ((0, jsx_runtime_1.jsx)(material_1.TableCell, Object.assign({ align: "center" }, props, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, Object.assign({ fontFamily: "monospace", variant: "body2", noWrap: true }, { children: isValid === undefined ? (0, jsx_runtime_1.jsx)(md_1.MdDone, { fontSize: 18, color: "yellow" }) : isValid ? (0, jsx_runtime_1.jsx)(md_1.MdDone, { fontSize: 18, color: "green" }) : (0, jsx_runtime_1.jsx)(md_1.MdClear, { color: "red", fontSize: 18 }) })) }), "valid"));
     const tableCells = {
         archive,

package/dist/cjs/components/Table/TableRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableRow.js","sourceRoot":"","sources":["../../../../src/components/Table/TableRow.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TableRow.js","sourceRoot":"","sources":["../../../../src/components/Table/TableRow.tsx"],"names":[],"mappings":";;;;;AAAA,4CAA8F;AAC9F,uDAAoD;AACpD,4CAA6F;AAC7F,8DAAuD;AACvD,4DAAyD;AACzD,iCAAgC;AAChC,uCAAgD;AAEhD,yEAA+H;AASxH,MAAM,eAAe,GAAmC,CAAC,EAAwG,EAAE,EAAE;;QAA5G,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,IAAA,2DAAgC,GAAE,OAAY,EAAP,KAAK,sBAAtG,kDAAwG,CAAF;IACpK,MAAM,UAAU,GAAG,IAAA,4BAAa,GAAE,CAAA;IAClC,MAAM,SAAS,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,gBAAQ,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5F,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,wBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACpE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IAEhC,MAAM,OAAO,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CACnD,uBAAC,oBAAS,kBAAe,KAAK,EAAC,QAAQ,IAAK,KAAK,cAC/C,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,IACP,KAHA,SAAS,CAIZ,CACb,CAAA;IAED,MAAM,MAAM,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CAClD,uBAAC,oBAAS,kBAAc,KAAK,EAAC,QAAQ,IAAK,KAAK,cAC9C,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,IACN,KAHA,QAAQ,CAIX,CACb,CAAA;IAED,MAAM,IAAI,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CAChD,uBAAC,oBAAS,kBAAY,KAAK,EAAC,QAAQ,IAAK,KAAK,cAC5C,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,CAAC,gBAAQ,CAAC,UAAU,CAAC,IACpC,KAHA,MAAM,CAIT,CACb,CAAA;IAED,MAAM,IAAI,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CAChD,uBAAC,4BAAa,kBAEZ,KAAK,EAAC,MAAM,EACZ,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EACrB,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAC1B,QAAQ,EAAC,SAAS,EAClB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,IACjC,KAAK,GAPL,MAAM,CAQV,CACH,CAAA;IAED,MAAM,MAAM,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CAClD,uBAAC,oBAAS,kBAAgB,KAAK,EAAC,QAAQ,IAAK,KAAK,cAChD,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,IACL,KAHA,UAAU,CAIb,CACb,CAAA;IAED,MAAM,IAAI,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CAChD,uBAAC,oBAAS,kBAAY,KAAK,EAAC,QAAQ,IAAK,KAAK,cAC5C,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,CAAC,gBAAQ,CAAC,WAAW,CAAC,IACrC,KAHA,MAAM,CAIT,CACb,CAAA;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,iCAA0B,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEhG,MAAM,KAAK,GAA6B,CAAC,KAAK,EAAE,EAAE,CAAC,CACjD,uBAAC,oBAAS,kBAAa,KAAK,EAAC,QAAQ,IAAK,KAAK,cAC7C,uBAAC,qBAAU,kBAAC,UAAU,EAAC,WAAW,EAAC,OAAO,EAAC,OAAO,EAAC,MAAM,sBACtD,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAC,WAAM,IAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAC,WAAM,IAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,uBAAC,YAAO,IAAC,KAAK,EAAC,KAAK,EAAC,QAAQ,EAAE,EAAE,GAAI,IAChJ,KAHA,OAAO,CAIV,CACb,CAAA;IAED,MAAM,UAAU,GAA6D;QAC3E,OAAO;QACP,MAAM;QACN,IAAI;QACJ,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,KAAK;KACN,CAAA;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,CAClB,uBAAC,mBAAQ,kBAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAM,KAAK,cAC9C,MAAA,OAAO,CAAC,UAAU,CAAC,0CAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAA;QAC/B,CAAC,CAAC,IACO,CACZ,CAAC,CAAC,CAAC,IAAI,CAAA;AACV,CAAC,CAAA;AAtFY,QAAA,eAAe,mBAsF3B"}

package/dist/cjs/hooks/lib/findHuriNetwork.d.ts

@@ -1,3 +1,3 @@
+import { Huri } from '@xyo-network/core';
 import { XyoNetworkPayload } from '@xyo-network/network';
-import { Huri } from '@xyo-network/payload';
 export declare const findHuriNetwork: (huriInstance: Huri, networks?: XyoNetworkPayload[]) => XyoNetworkPayload | undefined;

package/dist/cjs/hooks/useGetSchema.d.ts

@@ -1,12 +1,11 @@
 import { XyoApiError } from '@xyo-network/api';
-import { XyoSchemaPayload } from '@xyo-network/payload';
 /**
  * Gets a Huri and schema payload from a schema string
  */
 declare const useGetSchemaPayload: (schema?: string) => {
     apiError: XyoApiError<any, any> | undefined;
     notFound: boolean;
-    schemaHuri: import("@xyo-network/payload").Huri | undefined;
-    schemaPayload: XyoSchemaPayload | null | undefined;
+    schemaHuri: import("@xyo-network/core").Huri | undefined;
+    schemaPayload: import("@xyo-network/core").XyoPayloadFull | null | undefined;
 };
 export { useGetSchemaPayload };

package/dist/cjs/hooks/useGetSchema.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useGetSchemaPayload = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const utils_1 = require("@xyo-network/utils");
 const react_1 = require("react");
 /**
@@ -42,7 +42,7 @@ const useGetSchemaPayload = (schema) => {
         apiError,
         notFound,
         schemaHuri: schemaCacheEntry === null || schemaCacheEntry === void 0 ? void 0 : schemaCacheEntry.huri,
-        schemaPayload: schemaCacheEntry ? new payload_1.XyoPayloadBuilder(schemaCacheEntry === null || schemaCacheEntry === void 0 ? void 0 : schemaCacheEntry.payload).fields(schemaCacheEntry.payload).build() : schemaCacheEntry,
+        schemaPayload: schemaCacheEntry ? new core_1.XyoPayloadBuilder(schemaCacheEntry === null || schemaCacheEntry === void 0 ? void 0 : schemaCacheEntry.payload).fields(schemaCacheEntry.payload).build() : schemaCacheEntry,
     };
 };
 exports.useGetSchemaPayload = useGetSchemaPayload;

package/dist/cjs/hooks/useGetSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetSchema.js","sourceRoot":"","sources":["../../../src/hooks/useGetSchema.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,kDAA0E;AAC1E,8CAAwE;AACxE,iCAAgC;AAEhC;;GAEG;AACH,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAE,EAAE;IAC9C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACvD,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,IAAA,gBAAQ,GAA0C,CAAA;IAClG,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAU,CAAA;IAExD,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,YAAY,GAAG,CAAC,QAAQ,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,CAAA;QAChE,MAAM,aAAa,GAAG,MAAM,KAAK,WAAW,CAAA;QAE5C,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,EAAE;YACzD,IAAI;gBACF,MAAM,gBAAgB,GAAG,MAAM,sBAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAClE,IAAI,OAAO,EAAE,EAAE;oBACb,mBAAmB,CAAC,gBAAgB,CAAC,CAAA;oBACrC,WAAW,CAAC,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,SAAS,CAAC,CAAA;iBACzE;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAChB,IAAI,OAAO,EAAE,EAAE;oBACb,WAAW,CAAC,CAAgB,CAAC,CAAA;iBAC9B;aACF;SACF;QACD,IAAI,aAAa,EAAE;YACjB,cAAc,CAAC,MAAM,CAAC,CAAA;SACvB;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAC5D,CAAA;IAED,OAAO;QACL,QAAQ;QACR,QAAQ;QACR,UAAU,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI;QAClC,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,2BAAiB,CAAmB,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,gBAAgB;KACjK,CAAA;AACH,CAAC,CAAA;AAEQ,kDAAmB"}
+{"version":3,"file":"useGetSchema.js","sourceRoot":"","sources":["../../../src/hooks/useGetSchema.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4CAAqD;AACrD,8CAAwE;AACxE,iCAAgC;AAEhC;;GAEG;AACH,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAE,EAAE;IAC9C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACvD,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,IAAA,gBAAQ,GAA0C,CAAA;IAClG,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAU,CAAA;IAExD,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,YAAY,GAAG,CAAC,QAAQ,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,CAAA;QAChE,MAAM,aAAa,GAAG,MAAM,KAAK,WAAW,CAAA;QAE5C,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,EAAE;YACzD,IAAI;gBACF,MAAM,gBAAgB,GAAG,MAAM,sBAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAClE,IAAI,OAAO,EAAE,EAAE;oBACb,mBAAmB,CAAC,gBAAgB,CAAC,CAAA;oBACrC,WAAW,CAAC,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,SAAS,CAAC,CAAA;iBACzE;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAChB,IAAI,OAAO,EAAE,EAAE;oBACb,WAAW,CAAC,CAAgB,CAAC,CAAA;iBAC9B;aACF;SACF;QACD,IAAI,aAAa,EAAE;YACjB,cAAc,CAAC,MAAM,CAAC,CAAA;SACvB;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAC5D,CAAA;IAED,OAAO;QACL,QAAQ;QACR,QAAQ;QACR,UAAU,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI;QAClC,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,wBAAiB,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,gBAAgB;KAC/I,CAAA;AACH,CAAC,CAAA;AAEQ,kDAAmB"}

package/dist/cjs/hooks/useHuriHash.d.ts

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
-import { Huri, XyoPayload } from '@xyo-network/payload';
+import { Huri, XyoPayload } from '@xyo-network/core';
 import { FetchHuriHashOptions } from './lib';
 declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
 export { useHuriHash };

package/dist/cjs/hooks/useHuriHash.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useHuriHash = void 0;
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const react_1 = require("react");
 const usePayload_1 = require("./usePayload");
 const useResolveHuri_1 = require("./useResolveHuri");
@@ -11,7 +11,7 @@ const useHuriHash = (huriOrHash, huriUri, options) => {
             if (typeof huriOrHash === 'string') {
                 return huriOrHash;
             }
-            if (huriOrHash instanceof payload_1.Huri) {
+            if (huriOrHash instanceof core_1.Huri) {
                 return huriOrHash.hash;
             }
         }

package/dist/cjs/hooks/useHuriHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":";;;AACA,kDAAuD;AACvD,iCAAmC;AAGnC,6CAAyC;AACzC,qDAAiD;AAEjD,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAA8D,EAAE;IAC/J,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,cAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,GAAG,IAAA,+BAAc,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEnG,OAAO,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,YAAY,CAAC,CAAA;AAChF,CAAC,CAAA;AAEQ,kCAAW"}
+{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":";;;AACA,4CAAoD;AACpD,iCAAmC;AAGnC,6CAAyC;AACzC,qDAAiD;AAEjD,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAA8D,EAAE;IAC/J,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,WAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,GAAG,IAAA,+BAAc,EAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEnG,OAAO,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,YAAY,CAAC,CAAA;AAChF,CAAC,CAAA;AAEQ,kCAAW"}

package/dist/cjs/hooks/usePayload.d.ts

@@ -1,3 +1,3 @@
 import { XyoApiError } from '@xyo-network/api';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 export declare const usePayload: (hash?: string) => [XyoPayload | undefined, boolean, XyoApiError | undefined];

package/dist/cjs/hooks/usePayload.js

@@ -12,19 +12,14 @@ const usePayload = (hash) => {
     const [notFound, setNotFound] = (0, react_1.useState)(false);
     const [apiError, setApiError] = (0, react_1.useState)();
     const [payload, setPayload] = (0, react_1.useState)();
-    const reset = () => {
-        setPayload(undefined);
-        setApiError(undefined);
-        setNotFound(false);
-    };
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        if (api && hash && hash.length > 0) {
+        if (hash && hash.length > 0) {
             try {
                 const result = yield (api === null || api === void 0 ? void 0 : api.archive(archive).payload.hash(hash).get());
                 if (mounted()) {
-                    reset();
+                    setApiError(undefined);
                     if (result === null || result === void 0 ? void 0 : result.length) {
                         setPayload(result[0]);
                     }
@@ -35,8 +30,8 @@ const usePayload = (hash) => {
                 }
             }
             catch (e) {
-                reset();
                 setApiError(e);
+                setPayload(undefined);
                 console.error(e);
             }
         }

package/dist/cjs/hooks/usePayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,8DAAuD;AACvD,0EAAkE;AAClE,iCAAgC;AAEzB,MAAM,UAAU,GAAG,CAAC,IAAa,EAA8D,EAAE;IACtG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,qCAAe,GAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC,CAAA;IAED,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAA,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,KAAK,EAAE,CAAA;oBACP,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,CAAA,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA;AAtCY,QAAA,UAAU,cAsCtB"}
+{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,8DAAuD;AACvD,0EAAkE;AAClE,iCAAgC;AAEzB,MAAM,UAAU,GAAG,CAAC,IAAa,EAA8D,EAAE;IACtG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,qCAAe,GAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAc,CAAA;IACpD,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAA,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,WAAW,CAAC,SAAS,CAAC,CAAA;oBACtB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,CAAA,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA;AA/BY,QAAA,UAAU,cA+BtB"}

package/dist/cjs/hooks/useResolveHuri.d.ts

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/core';
 import { FetchHuriHashOptions } from './lib';
 declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
 export { useResolveHuri };

package/dist/cjs/hooks/useResolveHuri.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useResolveHuri = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
-const payload_1 = require("@xyo-network/payload");
+const core_1 = require("@xyo-network/core");
 const react_network_1 = require("@xyo-network/react-network");
 const react_1 = require("react");
 const lib_1 = require("./lib");
@@ -18,7 +18,7 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         if ((dependentNotFound === undefined || dependentNotFound) && huriUri && network !== huriNetwork) {
-            const huriInstance = new payload_1.Huri(huriUri);
+            const huriInstance = new core_1.Huri(huriUri);
             const foundHuriNetwork = (0, lib_1.findHuriNetwork)(huriInstance, networks);
             // Update when we found a huri network and it doesn't match the current one
             if (foundHuriNetwork && mounted()) {

package/dist/cjs/hooks/useResolveHuri.js.map

@@ -1 +1 @@
-{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,kDAAuD;AACvD,8DAAuD;AACvD,iCAAgC;AAEhC,+BAA6D;AAE7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAA8D,EAAE;IACnK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAqB,CAAA;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IACrE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAA;IAE7C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,EAAE;YAChG,MAAM,YAAY,GAAG,IAAI,cAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,IAAA,qBAAe,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,2EAA2E;YAC3E,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,wDAAwD;gBACxD,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;yBAC5B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC,CAAA,EACD,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAC9F,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAA;AACzD,CAAC,CAAA;AAEQ,wCAAc"}
+{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4CAAoD;AAEpD,8DAAuD;AACvD,iCAAgC;AAEhC,+BAA6D;AAE7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAA8D,EAAE;IACnK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAU,GAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAqB,CAAA;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IACrE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAA;IAE7C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,EAAE;YAChG,MAAM,YAAY,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,IAAA,qBAAe,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,2EAA2E;YAC3E,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,wDAAwD;gBACxD,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;yBAC5B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC,CAAA,EACD,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAC9F,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAA;AACzD,CAAC,CAAA;AAEQ,wCAAc"}

package/dist/esm/hooks/ResolvePayloadArgs.d.ts

@@ -0,0 +1,4 @@
+import { XyoApiError } from '@xyo-network/api';
+import { XyoPayload } from '@xyo-network/payload';
+export declare type UsePayloadArgs = [XyoPayload?, boolean?, XyoApiError?];
+export declare type UseHuriOrHashArgs = [...UsePayloadArgs, boolean?];

package/dist/esm/hooks/ResolvePayloadArgs.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ResolvePayloadArgs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ResolvePayloadArgs.js","sourceRoot":"","sources":["../../../src/hooks/ResolvePayloadArgs.ts"],"names":[],"mappings":""}

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

@@ -1,4 +1,5 @@
 export * from './lib';
+export * from './ResolvePayloadArgs';
 export * from './useGetSchema';
 export * from './useHuriHash';
 export * from './usePayload';

package/dist/esm/hooks/index.js

@@ -1,4 +1,5 @@
 export * from './lib';
+export * from './ResolvePayloadArgs';
 export * from './useGetSchema';
 export * from './useHuriHash';
 export * from './usePayload';

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA"}

package/dist/esm/hooks/useHuriHash.d.ts

@@ -1,5 +1,7 @@
-import { XyoApiError } from '@xyo-network/api';
-import { Huri, XyoPayload } from '@xyo-network/payload';
+import { Huri } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+/**
+ * Resolve a hash or a huri regardless of network
+ */
+declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [(import("@xyo-network/payload").XyoPayload<object> | undefined)?, (boolean | undefined)?, (import("@xyo-network/api").XyoApiError<any, any> | undefined)?, (boolean | undefined)?];
 export { useHuriHash };

package/dist/esm/hooks/useHuriHash.js

@@ -2,6 +2,9 @@ import { Huri } from '@xyo-network/payload';
 import { useCallback } from 'react';
 import { usePayload } from './usePayload';
 import { useResolveHuri } from './useResolveHuri';
+/**
+ * Resolve a hash or a huri regardless of network
+ */
 const useHuriHash = (huriOrHash, huriUri, options) => {
     const hash = useCallback((huriOrHash) => {
         if (huriOrHash) {
@@ -13,9 +16,12 @@ const useHuriHash = (huriOrHash, huriUri, options) => {
             }
         }
     }, []);
-    const [payload, notFound, apiError] = usePayload(hash(huriOrHash));
-    const [huriPayload, huriPayloadNotFound, huriApiError] = useResolveHuri(huriUri, notFound, options);
-    return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError];
+    const foundHash = hash(huriOrHash);
+    // Optimistically try to grab the has from the current network and archive
+    const [payload, notFound, apiError] = usePayload(foundHash);
+    // If payload isn't found, fallback to the huriUri
+    const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options);
+    return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound];
 };
 export { useHuriHash };
 //# sourceMappingURL=useHuriHash.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAA8D,EAAE;IAC/J,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEnG,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,CAAC,CAAA;AAChF,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAInC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAAqB,EAAE;IACtH,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAElC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAE3D,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEpH,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/dist/esm/hooks/usePayload.d.ts

@@ -1,3 +1,2 @@
-import { XyoApiError } from '@xyo-network/api';
-import { XyoPayload } from '@xyo-network/payload';
-export declare const usePayload: (hash?: string) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+import { UsePayloadArgs } from './ResolvePayloadArgs';
+export declare const usePayload: (hash?: string) => UsePayloadArgs;

package/dist/esm/hooks/usePayload.js

@@ -5,22 +5,22 @@ import { useState } from 'react';
 export const usePayload = (hash) => {
     const { api } = useArchivistApi();
     const { archive } = useArchive();
-    const [notFound, setNotFound] = useState(false);
+    const [notFound, setNotFound] = useState();
     const [apiError, setApiError] = useState();
     const [payload, setPayload] = useState();
     const reset = () => {
         setPayload(undefined);
         setApiError(undefined);
-        setNotFound(false);
+        setNotFound(undefined);
     };
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         if (api && hash && hash.length > 0) {
             try {
+                reset();
                 const result = await api?.archive(archive).payload.hash(hash).get();
                 if (mounted()) {
-                    reset();
                     if (result?.length) {
                         setPayload(result[0]);
                     }

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

@@ -1 +1 @@
-{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAA8D,EAAE;IACtG,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC,CAAA;IAED,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,KAAK,EAAE,CAAA;oBACP,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}
+{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAIhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAkB,EAAE;IAC1D,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAW,CAAA;IACnD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC,CAAA;IAED,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,KAAK,EAAE,CAAA;gBACP,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}

package/dist/esm/hooks/useResolveHuri.d.ts

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
 import { XyoPayload } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean, XyoApiError | undefined];
+declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [(XyoPayload<object> | undefined)?, (boolean | undefined)?, (XyoApiError<any, any> | undefined)?, (boolean | undefined)?];
 export { useResolveHuri };

package/dist/esm/hooks/useResolveHuri.js

@@ -1,34 +1,37 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { Huri } from '@xyo-network/payload';
 import { useNetwork } from '@xyo-network/react-network';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { findHuriNetwork } from './lib';
 const useResolveHuri = (huriUri, dependentNotFound, options) => {
     const { network, networks, setNetwork } = useNetwork();
-    const [huriNetwork, setHuriNetwork] = useState();
     const [huriPayload, setHuriPayload] = useState();
-    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false);
+    const [huriPayloadNotFound, setHuriPayloadNotFound] = useState();
+    const [huriNetworkNotFound, setHuriNetworkNotFound] = useState();
     const [huriApiError, setHuriApiError] = useState();
     const { changeActiveNetwork } = options ?? {};
+    useEffect(() => {
+        // Initially, sync local not found with dependent's status
+        setHuriPayloadNotFound(dependentNotFound);
+    }, [dependentNotFound]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        if ((dependentNotFound === undefined || dependentNotFound) && huriUri && network !== huriNetwork) {
+        // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
+        if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
             const huriInstance = new Huri(huriUri);
             const foundHuriNetwork = findHuriNetwork(huriInstance, networks);
-            // Update when we found a huri network and it doesn't match the current one
             if (foundHuriNetwork && mounted()) {
-                setHuriNetwork(huriNetwork);
                 if (network !== foundHuriNetwork && changeActiveNetwork) {
                     setNetwork?.(foundHuriNetwork);
                     return;
                 }
-                // If no matching network try to resolve the huri itself
                 try {
                     const huriPayload = await huriInstance.fetch();
                     if (mounted()) {
                         if (huriPayload) {
                             setHuriPayload(huriPayload);
+                            setHuriPayloadNotFound(false);
                         }
                         else {
                             setHuriPayloadNotFound(true);
@@ -41,9 +44,12 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
                     }
                 }
             }
+            else {
+                setHuriNetworkNotFound(true);
+            }
         }
-    }, [huriNetwork, huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]);
-    return [huriPayload, huriPayloadNotFound, huriApiError];
+    }, [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]);
+    return [huriPayload, huriPayloadNotFound, huriApiError, huriNetworkNotFound];
 };
 export { useResolveHuri };
 //# sourceMappingURL=useResolveHuri.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAA8D,EAAE;IACnK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAqB,CAAA;IACnE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,EAAE;YAChG,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,2EAA2E;YAC3E,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,wDAAwD;gBACxD,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;yBAC5B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;IACH,CAAC,EACD,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAC9F,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAG7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAAqB,EAAE;IAC1H,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,0DAA0D;QAC1D,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC3C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,EAAE;YACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/package.json

@@ -21,13 +21,13 @@
     "@xyo-network/api": "^2.21.14",
     "@xyo-network/network": "^2.21.14",
     "@xyo-network/payload": "^2.21.14",
-    "@xyo-network/react-archive": "^2.26.9",
-    "@xyo-network/react-archivist-api": "^2.26.9",
-    "@xyo-network/react-auth-service": "^2.26.9",
-    "@xyo-network/react-network": "^2.26.9",
-    "@xyo-network/react-property": "^2.26.9",
-    "@xyo-network/react-schema": "^2.26.9",
-    "@xyo-network/react-shared": "^2.26.9",
+    "@xyo-network/react-archive": "^2.26.12",
+    "@xyo-network/react-archivist-api": "^2.26.12",
+    "@xyo-network/react-auth-service": "^2.26.12",
+    "@xyo-network/react-network": "^2.26.12",
+    "@xyo-network/react-property": "^2.26.12",
+    "@xyo-network/react-schema": "^2.26.12",
+    "@xyo-network/react-shared": "^2.26.12",
     "@xyo-network/utils": "^2.21.14",
     "luxon": "^2.4.0",
     "react": "^18.2.0",
@@ -94,6 +94,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.9",
+  "version": "2.26.12",
   "packageManager": "yarn@3.1.1"
 }

package/src/hooks/ResolvePayloadArgs.ts

@@ -0,0 +1,6 @@
+import { XyoApiError } from '@xyo-network/api'
+import { XyoPayload } from '@xyo-network/payload'
+
+export type UsePayloadArgs = [XyoPayload?, boolean?, XyoApiError?]
+
+export type UseHuriOrHashArgs = [...UsePayloadArgs, boolean?]

package/src/hooks/index.ts

@@ -1,4 +1,5 @@
 export * from './lib'
+export * from './ResolvePayloadArgs'
 export * from './useGetSchema'
 export * from './useHuriHash'
 export * from './usePayload'

package/src/hooks/useHuriHash.stories.tsx

@@ -1,39 +1,63 @@
 /* eslint-disable import/no-internal-modules */
-import { Typography } from '@mui/material'
+import { Alert, Typography } from '@mui/material'
 import { ComponentStory, Meta } from '@storybook/react'
-import { FlexCol } from '@xylabs/react-flexbox'
+import { ButtonEx } from '@xylabs/react-button'
+import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
 import { Huri } from '@xyo-network/payload'
+import { ArchivistApiProvider } from '@xyo-network/react-archivist-api'
+import { NetworkMemoryProvider } from '@xyo-network/react-network'
 import { XyoSchemaCache } from '@xyo-network/utils'
-import { lazy, Suspense } from 'react'
+import { lazy, Suspense, useState } from 'react'
 
-import { ArchivistApiProvider } from '../../../archivist-api/src'
+import { FetchHuriHashOptions } from './lib'
 import { useHuriHash } from './useHuriHash'
 
 const JsonView = lazy(() => import(/* webpackChunkName: "jsonView" */ 'react-json-view'))
 
 interface UseHuriHashComponentProps {
   huriOrHash: string | Huri
+  huriUri?: string
+  options?: FetchHuriHashOptions
+  reTestable?: boolean
 }
 
 const apiDomain = 'https://beta.api.archivist.xyo.network'
 const hash = '5605fabad11b10bb5fb86b309ca0970894eda8f22362dda1a489817723bca992'
 XyoSchemaCache.instance.proxy = `${apiDomain}/domain`
 
-const Wrapper: React.FC<UseHuriHashComponentProps> = ({ huriOrHash }) => (
-  <ArchivistApiProvider apiDomain={apiDomain}>
-    <UseHuriHashComponent huriOrHash={huriOrHash} />
-  </ArchivistApiProvider>
+const mainApiDomain = 'https://api.archivist.xyo.network'
+const mainHash = 'd3a3936e31ba1d835c528784ab77c1eaaeedd6e16b7aad68a88241ce539853cb'
+
+const Wrapper: React.FC<UseHuriHashComponentProps> = (props) => (
+  <NetworkMemoryProvider>
+    <ArchivistApiProvider apiDomain={apiDomain}>
+      <UseHuriHashComponent {...props} />
+    </ArchivistApiProvider>
+  </NetworkMemoryProvider>
 )
 
-const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash }) => {
-  const [payload] = useHuriHash(huriOrHash)
+const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash, huriUri, options, reTestable }) => {
+  const [trigger, setTrigger] = useState<string | Huri>(huriOrHash)
+  const [payload, notFound, , networkNotFound] = useHuriHash(trigger, huriUri, options)
 
   return (
     <>
       <Typography variant="body1" fontWeight="bold">
         Fetches the payload for a huriOrHash.
       </Typography>
+      {reTestable ? (
+        <FlexRow columnGap={2}>
+          <ButtonEx variant="contained" onClick={() => setTrigger(hash)}>
+            Fetch Valid Hash
+          </ButtonEx>
+          <ButtonEx variant="contained" onClick={() => setTrigger('foo')}>
+            Hash Not Found
+          </ButtonEx>
+        </FlexRow>
+      ) : null}
       <FlexCol my={3}>
+        {notFound ? <Alert severity="warning">Not Found</Alert> : null}
+        {networkNotFound ? <Alert severity="warning">Network Not Found</Alert> : null}
         <Suspense fallback={<FlexCol busy />}>
           <JsonView src={payload || {}} />
         </Suspense>
@@ -53,17 +77,31 @@ const StorybookEntry: Meta = {
   title: 'payload/useHuriHash',
 }
 
-const Template: ComponentStory<typeof UseHuriHashComponent> = ({ huriOrHash }) => {
-  return <Wrapper huriOrHash={huriOrHash} />
+const Template: ComponentStory<typeof UseHuriHashComponent> = (props) => {
+  return <Wrapper {...props} />
 }
 
 const Default = Template.bind({})
 Default.args = { huriOrHash: hash }
 
+const NotFound = Template.bind({})
+NotFound.args = { huriOrHash: 'foo', reTestable: true }
+
 const WithHuri = Template.bind({})
 WithHuri.args = { huriOrHash: new Huri(`${apiDomain}/${hash}`) }
 
-export { Default, WithHuri }
+const WithHuriUri = Template.bind({})
+WithHuriUri.args = { huriUri: `${mainApiDomain}/${mainHash}` }
+
+const WithHuriUriNetworkNotFound = Template.bind({})
+WithHuriUriNetworkNotFound.args = { huriUri: `http://badarchivisturl.com/${mainHash}` }
+
+// Note - story will work correctly once main net return 200 instead of 404 when payloads aren't found
+// Resolve huriUri when network is different from the current network
+const WithHuriUriNotFound = Template.bind({})
+WithHuriUriNotFound.args = { huriUri: `${mainApiDomain}/foo` }
+
+export { Default, NotFound, WithHuri, WithHuriUri, WithHuriUriNetworkNotFound, WithHuriUriNotFound }
 
 // eslint-disable-next-line import/no-default-export
 export default StorybookEntry

package/src/hooks/useHuriHash.tsx

@@ -1,12 +1,15 @@
-import { XyoApiError } from '@xyo-network/api'
-import { Huri, XyoPayload } from '@xyo-network/payload'
+import { Huri } from '@xyo-network/payload'
 import { useCallback } from 'react'
 
 import { FetchHuriHashOptions } from './lib'
+import { UseHuriOrHashArgs } from './ResolvePayloadArgs'
 import { usePayload } from './usePayload'
 import { useResolveHuri } from './useResolveHuri'
 
-const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+/**
+ * Resolve a hash or a huri regardless of network
+ */
+const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions): UseHuriOrHashArgs => {
   const hash = useCallback((huriOrHash?: string | Huri) => {
     if (huriOrHash) {
       if (typeof huriOrHash === 'string') {
@@ -18,10 +21,15 @@ const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: Fet
     }
   }, [])
 
-  const [payload, notFound, apiError] = usePayload(hash(huriOrHash))
-  const [huriPayload, huriPayloadNotFound, huriApiError] = useResolveHuri(huriUri, notFound, options)
+  const foundHash = hash(huriOrHash)
 
-  return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError]
+  // Optimistically try to grab the has from the current network and archive
+  const [payload, notFound, apiError] = usePayload(foundHash)
+
+  // If payload isn't found, fallback to the huriUri
+  const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options)
+
+  return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound]
 }
 
 export { useHuriHash }

package/src/hooks/usePayload.tsx

@@ -5,17 +5,19 @@ import { useArchive } from '@xyo-network/react-archive'
 import { useArchivistApi } from '@xyo-network/react-archivist-api'
 import { useState } from 'react'
 
-export const usePayload = (hash?: string): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+import { UsePayloadArgs } from './ResolvePayloadArgs'
+
+export const usePayload = (hash?: string): UsePayloadArgs => {
   const { api } = useArchivistApi()
   const { archive } = useArchive()
-  const [notFound, setNotFound] = useState(false)
+  const [notFound, setNotFound] = useState<boolean>()
   const [apiError, setApiError] = useState<XyoApiError>()
   const [payload, setPayload] = useState<XyoPayload>()
 
   const reset = () => {
     setPayload(undefined)
     setApiError(undefined)
-    setNotFound(false)
+    setNotFound(undefined)
   }
 
   useAsyncEffect(
@@ -23,9 +25,9 @@ export const usePayload = (hash?: string): [XyoPayload | undefined, boolean, Xyo
     async (mounted) => {
       if (api && hash && hash.length > 0) {
         try {
+          reset()
           const result = await api?.archive(archive).payload.hash(hash).get()
           if (mounted()) {
-            reset()
             if (result?.length) {
               setPayload(result[0])
             } else if (result) {

package/src/hooks/useResolveHuri.tsx

@@ -1,43 +1,47 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { XyoApiError } from '@xyo-network/api'
-import { XyoNetworkPayload } from '@xyo-network/network'
 import { Huri, XyoPayload } from '@xyo-network/payload'
 import { useNetwork } from '@xyo-network/react-network'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { FetchHuriHashOptions, findHuriNetwork } from './lib'
+import { UseHuriOrHashArgs } from './ResolvePayloadArgs'
 
-const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions): [XyoPayload | undefined, boolean, XyoApiError | undefined] => {
+const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions): UseHuriOrHashArgs => {
   const { network, networks, setNetwork } = useNetwork()
-  const [huriNetwork, setHuriNetwork] = useState<XyoNetworkPayload>()
   const [huriPayload, setHuriPayload] = useState<XyoPayload>()
-  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState(false)
+  const [huriPayloadNotFound, setHuriPayloadNotFound] = useState<boolean>()
+  const [huriNetworkNotFound, setHuriNetworkNotFound] = useState<boolean>()
   const [huriApiError, setHuriApiError] = useState<XyoApiError>()
 
   const { changeActiveNetwork } = options ?? {}
 
+  useEffect(() => {
+    // Initially, sync local not found with dependent's status
+    setHuriPayloadNotFound(dependentNotFound)
+  }, [dependentNotFound])
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if ((dependentNotFound === undefined || dependentNotFound) && huriUri && network !== huriNetwork) {
+      // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
+      if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
         const huriInstance = new Huri(huriUri)
 
         const foundHuriNetwork = findHuriNetwork(huriInstance, networks)
 
-        // Update when we found a huri network and it doesn't match the current one
         if (foundHuriNetwork && mounted()) {
-          setHuriNetwork(huriNetwork)
           if (network !== foundHuriNetwork && changeActiveNetwork) {
             setNetwork?.(foundHuriNetwork)
             return
           }
 
-          // If no matching network try to resolve the huri itself
           try {
             const huriPayload = await huriInstance.fetch()
             if (mounted()) {
               if (huriPayload) {
                 setHuriPayload(huriPayload)
+                setHuriPayloadNotFound(false)
               } else {
                 setHuriPayloadNotFound(true)
               }
@@ -47,13 +51,15 @@ const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?:
               setHuriApiError(e as XyoApiError)
             }
           }
+        } else {
+          setHuriNetworkNotFound(true)
         }
       }
     },
-    [huriNetwork, huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]
+    [huriUri, network, networks, dependentNotFound, setNetwork, changeActiveNetwork]
   )
 
-  return [huriPayload, huriPayloadNotFound, huriApiError]
+  return [huriPayload, huriPayloadNotFound, huriApiError, huriNetworkNotFound]
 }
 
 export { useResolveHuri }