@xyo-network/payload 2.21.21 → 2.22.0

package/dist/cjs/Builder/Builder.d.ts

@@ -1,9 +1,8 @@
-import { StringKeyObject } from '@xyo-network/core';
 import { XyoPayload } from '../models';
 export interface XyoPayloadBuilderOptions {
     schema: string;
 }
-export declare class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<StringKeyObject>> {
+export declare class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<Record<string, unknown>>> {
     private _fields;
     private _previousHash?;
     private _schema;

package/dist/cjs/Builder/Builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":";;;AAAA,4CAA2G;AAQ3G,MAAa,iBAAiB;IAK5B,YAAY,EAAE,MAAM,EAA4B;QAJxC,YAAO,GAAe,EAAE,CAAA;QAK9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,MAAmB;QAC/B,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,mCAAQ,IAAI,CAAC,OAAO,GAAK,IAAA,wBAAiB,EAAC,MAAM,CAAC,CAAE,CAAA;SACjE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,YAAY,CAAC,IAAa;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc;QACnB,OAAO,gCACF,IAAA,wBAAiB,EAAC,IAAA,+BAAwB,kCAAM,IAAI,CAAC,OAAO,KAAE,YAAY,EAAE,IAAI,CAAC,aAAa,IAAG,CAAC,KACrG,MAAM,EAAE,IAAI,CAAC,OAAO,GAChB,CAAA;IACR,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,gBAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,uCAAY,cAAc,KAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,IAAE;IACtF,CAAC;CACF;AAlCD,8CAkCC"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":";;;AAAA,4CAA0F;AAQ1F,MAAa,iBAAiB;IAK5B,YAAY,EAAE,MAAM,EAA4B;QAJxC,YAAO,GAAe,EAAE,CAAA;QAK9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,MAAmB;QAC/B,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,mCAAQ,IAAI,CAAC,OAAO,GAAK,IAAA,wBAAiB,EAAC,MAAM,CAAC,CAAE,CAAA;SACjE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,YAAY,CAAC,IAAa;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc;QACnB,OAAO,gCACF,IAAA,wBAAiB,EAAC,IAAA,+BAAwB,kCAAM,IAAI,CAAC,OAAO,KAAE,YAAY,EAAE,IAAI,CAAC,aAAa,IAAG,CAAC,KACrG,MAAM,EAAE,IAAI,CAAC,OAAO,GAChB,CAAA;IACR,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,gBAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,uCAAY,cAAc,KAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,IAAE;IACtF,CAAC;CACF;AAlCD,8CAkCC"}

package/dist/cjs/Huri/Huri.d.ts

@@ -21,7 +21,7 @@ export declare class Huri {
     private validateParse;
     get href(): string;
     toString(): string;
-    fetch(): Promise<XyoPayload<object> | undefined>;
+    fetch(): Promise<import("../models").XyoPayloadBase | undefined>;
     static fetch(huri: Huri): Promise<XyoPayload | undefined>;
     private static parseProtocol;
     private static parsePath;

package/dist/cjs/Test/testPayload.d.ts

@@ -1,5 +1,5 @@
-import { WithAdditional } from '@xyo-network/core';
+import { StringKeyObject } from '@xyo-network/core';
 import { XyoPayloadWithMeta } from '../models';
 declare const testSchema = "network.xyo.test";
-declare const testPayload: WithAdditional<XyoPayloadWithMeta>;
+declare const testPayload: XyoPayloadWithMeta<StringKeyObject>;
 export { testPayload, testSchema };

package/dist/cjs/Test/testPayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"testPayload.js","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":";;;AAIA,MAAM,UAAU,GAAG,kBAAkB,CAAA;AAcf,gCAAU;AAbhC,MAAM,WAAW,GAAuC;IACtD,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,kEAAkE;IACzE,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE;QACX,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,aAAa;KAC3B;IACD,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,aAAa;CAC3B,CAAA;AAEQ,kCAAW"}
+{"version":3,"file":"testPayload.js","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":";;;AAIA,MAAM,UAAU,GAAG,kBAAkB,CAAA;AAcf,gCAAU;AAbhC,MAAM,WAAW,GAAwC;IACvD,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,kEAAkE;IACzE,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE;QACX,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,aAAa;KAC3B;IACD,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,aAAa;CAC3B,CAAA;AAEQ,kCAAW"}

package/dist/cjs/Wrapper/Validator.d.ts

@@ -3,6 +3,6 @@ import { XyoPayloadWithMeta } from '../models';
 import { XyoPayloadValidator } from '../Validator';
 import { XyoPayloadWrapper } from './Wrapper';
 export declare class XyoPayloadWrapperValidator<T extends XyoPayloadWrapper<XyoPayloadWithMeta> = XyoPayloadWrapper<XyoPayloadWithMeta>> extends XyoValidator<T> {
-    get payload(): XyoPayloadValidator<XyoPayloadWithMeta<unknown>>;
+    get payload(): XyoPayloadValidator<XyoPayloadWithMeta<import("@xyo-network/core").EmptyObject>>;
     validate(): Error[];
 }

package/dist/cjs/Wrapper/Wrapper.d.ts

@@ -5,5 +5,5 @@ export declare class XyoPayloadWrapper<T extends XyoPayload> extends XyoHasher<T
     get payload(): T;
     get body(): T;
     get meta(): T;
-    static load(address: XyoDataLike | Huri): Promise<XyoPayloadWrapper<XyoPayload<object>> | undefined>;
+    static load(address: XyoDataLike | Huri): Promise<XyoPayloadWrapper<import("../models").XyoPayloadBase> | undefined>;
 }

package/dist/cjs/isXyoPayloadOfSchemaType.d.ts

@@ -1,4 +1,4 @@
 import { XyoPayload } from './models';
 import { XyoSchemaPayload } from './Schema';
-export declare const isXyoPayloadOfSchemaType: <T extends XyoPayload<object>>(schema: string) => (x: XyoPayload) => x is T;
+export declare const isXyoPayloadOfSchemaType: <T extends import("./models").XyoPayloadBase>(schema: string) => (x: XyoPayload) => x is T;
 export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;

package/dist/cjs/models/Meta.d.ts

@@ -1,9 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayloadBase } from './Base';
-import { XyoPayload } from './XyoPayload';
 export interface XyoPayloadMetaBase {
     _hash: string;
     _observeDuration?: number;
-    _archive: string;
+    _archive?: string;
     _client?: string;
     _reportedHash?: string;
     _timestamp: number;
@@ -14,11 +14,12 @@ export interface XyoPayloadMetaBase {
 export interface XyoQueryPayloadMetaBase extends XyoPayloadMetaBase {
     _queryId: string;
 }
-export declare type XyoPayloadMeta<T = unknown> = T & XyoPayloadMetaBase;
-export declare type XyoPartialPayloadMeta<T = unknown> = T & Partial<XyoPayloadMetaBase>;
-export declare type XyoPayloadWithMeta<T = unknown> = T & XyoPayloadMetaBase & XyoPayloadBase;
-export declare type XyoPayloadWithPartialMeta<T = unknown> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase;
-export declare type XyoQueryPayloadMeta<T = unknown> = T & XyoQueryPayloadMetaBase;
-export declare type XyoQueryPartialPayloadMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase>;
-export declare type XyoQueryPayloadWithMeta<T = unknown> = T & XyoQueryPayloadMetaBase & XyoPayloadBase;
-export declare type XyoQueryPayloadWithPartialMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase;
+export declare type XyoPayload<T extends EmptyObject = EmptyObject> = T & XyoPayloadBase;
+export declare type XyoPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase;
+export declare type XyoPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase>;
+export declare type XyoPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase & XyoPayloadBase;
+export declare type XyoPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase;
+export declare type XyoQueryPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase;
+export declare type XyoQueryPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase>;
+export declare type XyoQueryPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase & XyoPayloadBase;
+export declare type XyoQueryPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase;

package/dist/cjs/models/XyoPayload.d.ts

@@ -1,2 +1,2 @@
 import { XyoPayloadBase } from './Base';
-export declare type XyoPayload<T extends object = object> = T & XyoPayloadBase;
+export declare type XyoPayload<T extends object = {}> = T & XyoPayloadBase;

package/dist/cjs/models/index.d.ts

@@ -1,3 +1,2 @@
 export * from './Base';
 export * from './Meta';
-export * from './XyoPayload';

package/dist/cjs/models/index.js

@@ -3,5 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./Base"), exports);
 tslib_1.__exportStar(require("./Meta"), exports);
-tslib_1.__exportStar(require("./XyoPayload"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,iDAAsB;AACtB,iDAAsB;AACtB,uDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;AAAA,iDAAsB;AACtB,iDAAsB"}

package/dist/esm/Builder/Builder.d.ts

@@ -1,9 +1,8 @@
-import { StringKeyObject } from '@xyo-network/core';
 import { XyoPayload } from '../models';
 export interface XyoPayloadBuilderOptions {
     schema: string;
 }
-export declare class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<StringKeyObject>> {
+export declare class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<Record<string, unknown>>> {
     private _fields;
     private _previousHash?;
     private _schema;

package/dist/esm/Builder/Builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAmB,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAQ3G,MAAM,OAAO,iBAAiB;IAK5B,YAAY,EAAE,MAAM,EAA4B;QAJxC,YAAO,GAAe,EAAE,CAAA;QAK9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,MAAmB;QAC/B,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAA;SACjE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,YAAY,CAAC,IAAa;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,GAAG,iBAAiB,CAAC,wBAAwB,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;YACrG,MAAM,EAAE,IAAI,CAAC,OAAO;SAChB,CAAA;IACR,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,OAAO,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAA;IACtF,CAAC;CACF"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAQ1F,MAAM,OAAO,iBAAiB;IAK5B,YAAY,EAAE,MAAM,EAA4B;QAJxC,YAAO,GAAe,EAAE,CAAA;QAK9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,MAAM,CAAC,MAAmB;QAC/B,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAA;SACjE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,YAAY,CAAC,IAAa;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,GAAG,iBAAiB,CAAC,wBAAwB,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;YACrG,MAAM,EAAE,IAAI,CAAC,OAAO;SAChB,CAAA;IACR,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,OAAO,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAA;IACtF,CAAC;CACF"}

package/dist/esm/Huri/Huri.d.ts

@@ -21,7 +21,7 @@ export declare class Huri {
     private validateParse;
     get href(): string;
     toString(): string;
-    fetch(): Promise<XyoPayload<object> | undefined>;
+    fetch(): Promise<import("../models").XyoPayloadBase | undefined>;
     static fetch(huri: Huri): Promise<XyoPayload | undefined>;
     private static parseProtocol;
     private static parsePath;

package/dist/esm/Test/testPayload.d.ts

@@ -1,5 +1,5 @@
-import { WithAdditional } from '@xyo-network/core';
+import { StringKeyObject } from '@xyo-network/core';
 import { XyoPayloadWithMeta } from '../models';
 declare const testSchema = "network.xyo.test";
-declare const testPayload: WithAdditional<XyoPayloadWithMeta>;
+declare const testPayload: XyoPayloadWithMeta<StringKeyObject>;
 export { testPayload, testSchema };

package/dist/esm/Test/testPayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"testPayload.js","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,GAAG,kBAAkB,CAAA;AACrC,MAAM,WAAW,GAAuC;IACtD,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,kEAAkE;IACzE,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE;QACX,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,aAAa;KAC3B;IACD,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,aAAa;CAC3B,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"testPayload.js","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,GAAG,kBAAkB,CAAA;AACrC,MAAM,WAAW,GAAwC;IACvD,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,kEAAkE;IACzE,UAAU,EAAE,aAAa;IACzB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE;QACX,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,aAAa;KAC3B;IACD,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,aAAa;CAC3B,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA"}

package/dist/esm/Wrapper/Validator.d.ts

@@ -3,6 +3,6 @@ import { XyoPayloadWithMeta } from '../models';
 import { XyoPayloadValidator } from '../Validator';
 import { XyoPayloadWrapper } from './Wrapper';
 export declare class XyoPayloadWrapperValidator<T extends XyoPayloadWrapper<XyoPayloadWithMeta> = XyoPayloadWrapper<XyoPayloadWithMeta>> extends XyoValidator<T> {
-    get payload(): XyoPayloadValidator<XyoPayloadWithMeta<unknown>>;
+    get payload(): XyoPayloadValidator<XyoPayloadWithMeta<import("@xyo-network/core").EmptyObject>>;
     validate(): Error[];
 }

package/dist/esm/Wrapper/Wrapper.d.ts

@@ -5,5 +5,5 @@ export declare class XyoPayloadWrapper<T extends XyoPayload> extends XyoHasher<T
     get payload(): T;
     get body(): T;
     get meta(): T;
-    static load(address: XyoDataLike | Huri): Promise<XyoPayloadWrapper<XyoPayload<object>> | undefined>;
+    static load(address: XyoDataLike | Huri): Promise<XyoPayloadWrapper<import("../models").XyoPayloadBase> | undefined>;
 }

package/dist/esm/isXyoPayloadOfSchemaType.d.ts

@@ -1,4 +1,4 @@
 import { XyoPayload } from './models';
 import { XyoSchemaPayload } from './Schema';
-export declare const isXyoPayloadOfSchemaType: <T extends XyoPayload<object>>(schema: string) => (x: XyoPayload) => x is T;
+export declare const isXyoPayloadOfSchemaType: <T extends import("./models").XyoPayloadBase>(schema: string) => (x: XyoPayload) => x is T;
 export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;

package/dist/esm/models/Meta.d.ts

@@ -1,9 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayloadBase } from './Base';
-import { XyoPayload } from './XyoPayload';
 export interface XyoPayloadMetaBase {
     _hash: string;
     _observeDuration?: number;
-    _archive: string;
+    _archive?: string;
     _client?: string;
     _reportedHash?: string;
     _timestamp: number;
@@ -14,11 +14,12 @@ export interface XyoPayloadMetaBase {
 export interface XyoQueryPayloadMetaBase extends XyoPayloadMetaBase {
     _queryId: string;
 }
-export declare type XyoPayloadMeta<T = unknown> = T & XyoPayloadMetaBase;
-export declare type XyoPartialPayloadMeta<T = unknown> = T & Partial<XyoPayloadMetaBase>;
-export declare type XyoPayloadWithMeta<T = unknown> = T & XyoPayloadMetaBase & XyoPayloadBase;
-export declare type XyoPayloadWithPartialMeta<T = unknown> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase;
-export declare type XyoQueryPayloadMeta<T = unknown> = T & XyoQueryPayloadMetaBase;
-export declare type XyoQueryPartialPayloadMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase>;
-export declare type XyoQueryPayloadWithMeta<T = unknown> = T & XyoQueryPayloadMetaBase & XyoPayloadBase;
-export declare type XyoQueryPayloadWithPartialMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase;
+export declare type XyoPayload<T extends EmptyObject = EmptyObject> = T & XyoPayloadBase;
+export declare type XyoPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase;
+export declare type XyoPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase>;
+export declare type XyoPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase & XyoPayloadBase;
+export declare type XyoPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase;
+export declare type XyoQueryPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase;
+export declare type XyoQueryPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase>;
+export declare type XyoQueryPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase & XyoPayloadBase;
+export declare type XyoQueryPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase;

package/dist/esm/models/XyoPayload.d.ts

@@ -1,2 +1,2 @@
 import { XyoPayloadBase } from './Base';
-export declare type XyoPayload<T extends object = object> = T & XyoPayloadBase;
+export declare type XyoPayload<T extends object = {}> = T & XyoPayloadBase;

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

@@ -1,3 +1,2 @@
 export * from './Base';
 export * from './Meta';
-export * from './XyoPayload';

package/dist/esm/models/index.js

@@ -1,4 +1,3 @@
 export * from './Base';
 export * from './Meta';
-export * from './XyoPayload';
 //# sourceMappingURL=index.js.map

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

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

package/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.2",
-    "@xyo-network/account": "^2.21.21",
-    "@xyo-network/core": "^2.21.21",
+    "@xyo-network/account": "^2.22.0",
+    "@xyo-network/core": "^2.22.0",
     "axios": "^0.27.2"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -51,6 +51,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.21.21",
+  "version": "2.22.0",
   "packageManager": "yarn@3.1.1"
 }

package/src/Builder/Builder.ts

@@ -1,4 +1,4 @@
-import { deepOmitUnderscoreFields, removeEmptyFields, StringKeyObject, XyoHasher } from '@xyo-network/core'
+import { deepOmitUnderscoreFields, removeEmptyFields, XyoHasher } from '@xyo-network/core'
 
 import { XyoPayload } from '../models'
 
@@ -6,7 +6,7 @@ export interface XyoPayloadBuilderOptions {
   schema: string
 }
 
-export class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<StringKeyObject>> {
+export class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<Record<string, unknown>>> {
   private _fields: Partial<T> = {}
   private _previousHash?: string
   private _schema: string

package/src/Test/testPayload.ts

@@ -1,9 +1,9 @@
-import { WithAdditional } from '@xyo-network/core'
+import { StringKeyObject } from '@xyo-network/core'
 
 import { XyoPayloadWithMeta } from '../models'
 
 const testSchema = 'network.xyo.test'
-const testPayload: WithAdditional<XyoPayloadWithMeta> = {
+const testPayload: XyoPayloadWithMeta<StringKeyObject> = {
   _archive: 'test',
   _hash: '20e14207f952a09f767ff614a648546c037fe524ace0bfe55db31f818aff1f1c',
   _timestamp: 1609459255555,

package/src/models/Meta.ts

@@ -1,10 +1,11 @@
+import { EmptyObject } from '@xyo-network/core'
+
 import { XyoPayloadBase } from './Base'
-import { XyoPayload } from './XyoPayload'
 
 export interface XyoPayloadMetaBase {
   _hash: string
   _observeDuration?: number
-  _archive: string
+  _archive?: string
   _client?: string
   _reportedHash?: string
   _timestamp: number
@@ -16,13 +17,14 @@ export interface XyoPayloadMetaBase {
 export interface XyoQueryPayloadMetaBase extends XyoPayloadMetaBase {
   _queryId: string
 }
+export type XyoPayload<T extends EmptyObject = EmptyObject> = T & XyoPayloadBase
 
-export type XyoPayloadMeta<T = unknown> = T & XyoPayloadMetaBase
-export type XyoPartialPayloadMeta<T = unknown> = T & Partial<XyoPayloadMetaBase>
-export type XyoPayloadWithMeta<T = unknown> = T & XyoPayloadMetaBase & XyoPayloadBase
-export type XyoPayloadWithPartialMeta<T = unknown> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase
+export type XyoPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase
+export type XyoPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase>
+export type XyoPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase & XyoPayloadBase
+export type XyoPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase
 
-export type XyoQueryPayloadMeta<T = unknown> = T & XyoQueryPayloadMetaBase
-export type XyoQueryPartialPayloadMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase>
-export type XyoQueryPayloadWithMeta<T = unknown> = T & XyoQueryPayloadMetaBase & XyoPayloadBase
-export type XyoQueryPayloadWithPartialMeta<T = unknown> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase
+export type XyoQueryPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase
+export type XyoQueryPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase>
+export type XyoQueryPayloadWithMeta<T extends EmptyObject = EmptyObject> = T & XyoQueryPayloadMetaBase & XyoPayloadBase
+export type XyoQueryPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoQueryPayloadMetaBase> & XyoPayloadBase

package/src/models/index.ts

@@ -1,3 +1,2 @@
 export * from './Base'
 export * from './Meta'
-export * from './XyoPayload'

package/src/models/XyoPayload.ts

@@ -1,3 +0,0 @@
-import { XyoPayloadBase } from './Base'
-
-export type XyoPayload<T extends object = object> = T & XyoPayloadBase