@xyo-network/payload 2.33.0-rc.9 → 2.33.0

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,eAAe,EAAa,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;IAC/E,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAC,CAAQ;IAC9B,OAAO,CAAC,OAAO,CAAQ;gBAEX,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAIzC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAO1B,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAK1B,cAAc;IAOd,KAAK,IAAI,CAAC;CAMlB"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvF,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,aAAa,CAAC,CAAQ;IAC9B,OAAO,CAAC,OAAO,CAAQ;gBAEX,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAIzC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAO1B,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAK1B,cAAc;IAOd,KAAK,IAAI,CAAC;CAMlB"}

package/dist/esm/Builder/Builder.js

@@ -1,4 +1,4 @@
-import { deepOmitUnderscoreFields, removeEmptyFields, XyoHasher } from '@xyo-network/core';
+import { deepOmitUnderscoreFields, Hasher, removeEmptyFields } from '@xyo-network/core';
 export class XyoPayloadBuilder {
     _fields = {};
     _previousHash;
@@ -24,7 +24,7 @@ export class XyoPayloadBuilder {
     }
     build() {
         const hashableFields = this.hashableFields();
-        const _hash = new XyoHasher(hashableFields).hash;
+        const _hash = new Hasher(hashableFields).hash;
         const _timestamp = Date.now();
         return { ...hashableFields, _client: 'js', _hash, _timestamp, schema: this._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;IACpB,OAAO,GAAe,EAAE,CAAA;IACxB,aAAa,CAAS;IACtB,OAAO,CAAQ;IAEvB,YAAY,EAAE,MAAM,EAA4B;QAC9C,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,MAAM,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAQvF,MAAM,OAAO,iBAAiB;IACpB,OAAO,GAAe,EAAE,CAAA;IACxB,aAAa,CAAS;IACtB,OAAO,CAAQ;IAEvB,YAAY,EAAE,MAAM,EAA4B;QAC9C,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,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAC7C,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

@@ -27,9 +27,12 @@ export declare class Huri<T extends XyoPayload = XyoPayload> {
     private static parsePath;
     static isHuri(value: unknown): Huri<{
         schema: string;
+    } & {
         previousHash?: string | undefined;
         sources?: string[] | undefined;
         timestamp?: number | undefined;
+    } & {
+        schema: string;
     }> | undefined;
 }
 //# sourceMappingURL=Huri.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,oBAAY,iBAAiB,GAAG,OAAO,GAAG,SAAS,CAAA;AAEnD,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;AAY/E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAClE,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC1C,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IAEnB,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,YAAY,EAAE,GAAE,WAAgB;IAoBxE,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;IAerB,IAAW,IAAI,WAad;IAEM,QAAQ;IAIF,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAI/B,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzF,OAAO,CAAC,MAAM,CAAC,aAAa;IAY5B,OAAO,CAAC,MAAM,CAAC,SAAS;WAWV,MAAM,CAAC,KAAK,EAAE,OAAO;;;;;;CAMpC"}
+{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,oBAAY,iBAAiB,GAAG,OAAO,GAAG,SAAS,CAAA;AAEnD,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;AAY/E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAClE,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC1C,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IAEnB,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,YAAY,EAAE,GAAE,WAAgB;IAoBxE,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;IAerB,IAAW,IAAI,WAad;IAEM,QAAQ;IAIF,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAI/B,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzF,OAAO,CAAC,MAAM,CAAC,aAAa;IAY5B,OAAO,CAAC,MAAM,CAAC,SAAS;WAWV,MAAM,CAAC,KAAK,EAAE,OAAO;;;;;;;;;CAMpC"}

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

@@ -1,6 +1,6 @@
 import { StringKeyObject } from '@xyo-network/core';
-import { XyoPayloadWithMeta } from '../models';
+import { XyoPayload } from '../models';
 declare const testSchema = "network.xyo.test";
-declare const testPayload: XyoPayloadWithMeta<StringKeyObject>;
+declare const testPayload: XyoPayload<StringKeyObject>;
 export { testPayload, testSchema };
 //# sourceMappingURL=testPayload.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"testPayload.d.ts","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE9C,QAAA,MAAM,UAAU,qBAAqB,CAAA;AACrC,QAAA,MAAM,WAAW,EAAE,kBAAkB,CAAC,eAAe,CAWpD,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"testPayload.d.ts","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,QAAA,MAAM,UAAU,qBAAqB,CAAA;AACrC,QAAA,MAAM,WAAW,EAAE,UAAU,CAAC,eAAe,CAQ5C,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA"}

package/dist/esm/Test/testPayload.js

@@ -1,8 +1,5 @@
 const testSchema = 'network.xyo.test';
 const testPayload = {
-    _archive: 'test',
-    _hash: '20e14207f952a09f767ff614a648546c037fe524ace0bfe55db31f818aff1f1c',
-    _timestamp: 1609459255555,
     numberField: 1,
     objectField: {
         numberField: 1,

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,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"}
+{"version":3,"file":"testPayload.js","sourceRoot":"","sources":["../../../src/Test/testPayload.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,GAAG,kBAAkB,CAAA;AACrC,MAAM,WAAW,GAAgC;IAC/C,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/Validator/Validator.d.ts

@@ -1,9 +1,14 @@
 import { XyoValidator, XyoValidatorBase } from '@xyo-network/core';
 import { XyoPayload } from '../models';
-import { XyoPayloadBodyValidator } from './BodyValidator';
-export declare class XyoPayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements XyoValidator<T> {
-    body: XyoPayloadBodyValidator;
+import { XyoSchemaNameValidator } from '../SchemaNameValidator';
+export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements XyoValidator<T> {
     constructor(payload: T);
+    private _schemaValidator?;
+    get schemaValidator(): XyoSchemaNameValidator;
+    schemaName(): Error[];
     validate(): Error[];
 }
+/** @deprecated use PayloadValidator instead*/
+export declare class XyoPayloadValidator<T extends XyoPayload = XyoPayload> extends PayloadValidator<T> {
+}
 //# sourceMappingURL=Validator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAEzD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IACjH,IAAI,EAAE,uBAAuB,CAAA;gBACxB,OAAO,EAAE,CAAC;IAKf,QAAQ;CAKhB"}
+{"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,qBAAa,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;gBACzG,OAAO,EAAE,CAAC;IAItB,OAAO,CAAC,gBAAgB,CAAC,CAAwB;IACjD,IAAI,eAAe,2BAGlB;IAEM,UAAU;IAUV,QAAQ;CAKhB;AAED,8CAA8C;AAC9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;CAAG"}

package/dist/esm/Validator/Validator.js

@@ -1,15 +1,31 @@
 import { XyoValidatorBase } from '@xyo-network/core';
-import { XyoPayloadBodyValidator } from './BodyValidator';
-export class XyoPayloadValidator extends XyoValidatorBase {
-    body;
+import { XyoSchemaNameValidator } from '../SchemaNameValidator';
+export class PayloadValidator extends XyoValidatorBase {
     constructor(payload) {
         super(payload);
-        this.body = new XyoPayloadBodyValidator(payload);
+    }
+    _schemaValidator;
+    get schemaValidator() {
+        this._schemaValidator = this._schemaValidator ?? new XyoSchemaNameValidator(this.obj.schema ?? '');
+        return this._schemaValidator;
+    }
+    schemaName() {
+        const errors = [];
+        if (this.obj.schema === undefined) {
+            errors.push(Error('schema missing'));
+        }
+        else {
+            errors.push(...this.schemaValidator.all());
+        }
+        return errors;
     }
     validate() {
         const errors = [];
-        errors.push(...this.body.validate());
+        errors.push(...this.schemaName());
         return errors;
     }
 }
+/** @deprecated use PayloadValidator instead*/
+export class XyoPayloadValidator extends PayloadValidator {
+}
 //# sourceMappingURL=Validator.js.map

package/dist/esm/Validator/Validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAGlE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAEzD,MAAM,OAAO,mBAAuD,SAAQ,gBAAmB;IACtF,IAAI,CAAyB;IACpC,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,uBAAuB,CAAC,OAAO,CAAC,CAAA;IAClD,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QACpC,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,MAAM,OAAO,gBAAoD,SAAQ,gBAAmB;IAC1F,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAEO,gBAAgB,CAAyB;IACjD,IAAI,eAAe;QACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;QAClG,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAC9B,CAAC;IAEM,UAAU;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAA;SAC3C;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAED,8CAA8C;AAC9C,MAAM,OAAO,mBAAuD,SAAQ,gBAAmB;CAAG"}

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

@@ -1,4 +1,2 @@
-export * from './BodyValidator';
-export * from './MetaValidator';
 export * from './Validator';
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Validator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}

package/dist/esm/Validator/index.js

@@ -1,4 +1,2 @@
-export * from './BodyValidator';
-export * from './MetaValidator';
 export * from './Validator';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}

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

@@ -1,15 +1,24 @@
-import { XyoDataLike, XyoHasher } from '@xyo-network/core';
+import { Hasher, XyoDataLike } from '@xyo-network/core';
 import { Huri } from '../Huri';
 import { XyoPayload } from '../models';
-export declare class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends XyoHasher<T> {
+export declare class PayloadWrapper<T extends XyoPayload = XyoPayload> extends Hasher<T> {
     get payload(): T;
     get body(): T;
+    get valid(): boolean;
+    get errors(): Error[];
+    /** @deprecated - meta fields not supported by client anymore */
     get meta(): T;
-    static load(address: XyoDataLike | Huri): Promise<XyoPayloadWrapper<{
+    static load(address: XyoDataLike | Huri): Promise<PayloadWrapper<{
         schema: string;
+    } & {
         previousHash?: string | undefined;
         sources?: string[] | undefined;
         timestamp?: number | undefined;
+    } & {
+        schema: string;
     }> | undefined>;
 }
+/** @deprecated use PayloadWrapper instead */
+export declare class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends PayloadWrapper<T> {
+}
 //# sourceMappingURL=Wrapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE9G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IACpF,IAAW,OAAO,MAEjB;IAED,IAAW,IAAI,MAEd;IAED,IAAW,IAAI,MAEd;WAEmB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;;;;CAMrD"}
+{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAGtC,qBAAa,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAC9E,IAAW,OAAO,MAEjB;IAED,IAAW,IAAI,MAEd;IAED,IAAI,KAAK,YAER;IAED,IAAI,MAAM,YAET;IAED,gEAAgE;IAChE,IAAW,IAAI,MAEd;WAEmB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;;;;;;;CAMrD;AAED,6CAA6C;AAC7C,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;CAAG"}

package/dist/esm/Wrapper/Wrapper.js

@@ -1,20 +1,31 @@
-import { deepOmitUnderscoreFields, deepPickUnderscoreFields, XyoHasher } from '@xyo-network/core';
+import { deepOmitUnderscoreFields, deepPickUnderscoreFields, Hasher } from '@xyo-network/core';
 import { Huri } from '../Huri';
-export class XyoPayloadWrapper extends XyoHasher {
+import { PayloadValidator } from '../Validator';
+export class PayloadWrapper extends Hasher {
     get payload() {
         return this.obj;
     }
     get body() {
         return deepOmitUnderscoreFields(this.obj);
     }
+    get valid() {
+        return this.errors.length === 0;
+    }
+    get errors() {
+        return new PayloadValidator(this.payload).validate();
+    }
+    /** @deprecated - meta fields not supported by client anymore */
     get meta() {
         return deepPickUnderscoreFields(this.obj);
     }
     static async load(address) {
         const payload = await new Huri(address).fetch();
         if (payload) {
-            return new XyoPayloadWrapper(payload);
+            return new PayloadWrapper(payload);
         }
     }
 }
+/** @deprecated use PayloadWrapper instead */
+export class XyoPayloadWrapper extends PayloadWrapper {
+}
 //# sourceMappingURL=Wrapper.js.map

package/dist/esm/Wrapper/Wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAe,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE9G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAG9B,MAAM,OAAO,iBAAqD,SAAQ,SAAY;IACpF,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,GAAG,CAAA;IACjB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,wBAAwB,CAAI,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,IAAW,IAAI;QACb,OAAO,wBAAwB,CAAI,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAA2B;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;QAC/C,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAA;SACtC;IACH,CAAC;CACF"}
+{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,EAAe,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,MAAM,OAAO,cAAkD,SAAQ,MAAS;IAC9E,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,GAAG,CAAA;IACjB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,wBAAwB,CAAI,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;IACtD,CAAC;IAED,gEAAgE;IAChE,IAAW,IAAI;QACb,OAAO,wBAAwB,CAAI,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAA2B;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;QAC/C,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC,CAAA;SACnC;IACH,CAAC;CACF;AAED,6CAA6C;AAC7C,MAAM,OAAO,iBAAqD,SAAQ,cAAiB;CAAG"}

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

@@ -1,3 +1,2 @@
-export * from './Validator';
 export * from './Wrapper';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA"}

package/dist/esm/Wrapper/index.js

@@ -1,3 +1,2 @@
-export * from './Validator';
 export * from './Wrapper';
 //# sourceMappingURL=index.js.map

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

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

package/dist/esm/isXyoPayloadOfSchemaType.d.ts

@@ -1,8 +1,11 @@
 import { XyoPayload } from './models';
 export declare const isXyoPayloadOfSchemaType: <T extends {
     schema: string;
+} & {
     previousHash?: string | undefined;
     sources?: string[] | undefined;
     timestamp?: number | undefined;
+} & {
+    schema: string;
 }>(schema: string) => (x: XyoPayload) => x is T;
 //# sourceMappingURL=isXyoPayloadOfSchemaType.d.ts.map

package/dist/esm/isXyoPayloadOfSchemaType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isXyoPayloadOfSchemaType.d.ts","sourceRoot":"","sources":["../../src/isXyoPayloadOfSchemaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,eAAO,MAAM,wBAAwB;;;;;WAAkC,MAAM,SAChE,UAAU,WACtB,CAAA"}
+{"version":3,"file":"isXyoPayloadOfSchemaType.d.ts","sourceRoot":"","sources":["../../src/isXyoPayloadOfSchemaType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,eAAO,MAAM,wBAAwB;;;;;;;;WAAkC,MAAM,SAChE,UAAU,WACtB,CAAA"}

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

@@ -4,10 +4,18 @@ export declare type WithTimestamp<T extends EmptyObject = EmptyObject> = T & {
 };
 export declare type XyoPayloadSchema = 'network.xyo.payload';
 export declare const XyoPayloadSchema: XyoPayloadSchema;
-export declare type XyoPayload<T extends EmptyObject = EmptyObject, TSchema extends string = string> = T & {
-    schema: TSchema;
+declare type XyoPayloadBaseWithSchema<T extends EmptyObject = EmptyObject> = {
+    schema: string;
+} & T;
+declare type XyoPayloadBase<T extends EmptyObject = EmptyObject> = XyoPayloadBaseWithSchema<{
     previousHash?: string;
     sources?: string[];
     timestamp?: number;
+} & T>;
+export declare type XyoPayload<T extends void | EmptyObject | XyoPayloadBaseWithSchema = void, S extends string = T extends XyoPayloadBaseWithSchema ? T['schema'] : string> = T extends XyoPayloadBaseWithSchema ? XyoPayloadBase<T> : T extends EmptyObject ? /* Type sent is an Object */ XyoPayloadBase & T & {
+    schema: S;
+} : /* Type sent is void */ XyoPayloadBase & {
+    schema: S;
 };
+export {};
 //# sourceMappingURL=Base.d.ts.map

package/dist/esm/models/Base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/models/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,oBAAY,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,oBAAY,gBAAgB,GAAG,qBAAqB,CAAA;AACpD,eAAO,MAAM,gBAAgB,EAAE,gBAAwC,CAAA;AAGvE,oBAAY,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,EAAE,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG;IACjG,MAAM,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA"}
+{"version":3,"file":"Base.d.ts","sourceRoot":"","sources":["../../../src/models/Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,oBAAY,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1F,oBAAY,gBAAgB,GAAG,qBAAqB,CAAA;AACpD,eAAO,MAAM,gBAAgB,EAAE,gBAAwC,CAAA;AAEvE,aAAK,wBAAwB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;IACnE,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,CAAC,CAAA;AAEL,aAAK,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,wBAAwB,CACjF;IACE,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,CAAC,CACN,CAAA;AAED,oBAAY,UAAU,CACpB,CAAC,SAAS,IAAI,GAAG,WAAW,GAAG,wBAAwB,GAAG,IAAI,EAC9D,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,wBAAwB,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,IAC1E,CAAC,SAAS,wBAAwB,GAElC,cAAc,CAAC,CAAC,CAAC,GACjB,CAAC,SAAS,WAAW,GAErB,AADA,4BAA4B,CAC5B,cAAc,GAAG,CAAC,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,GAElC,AADA,uBAAuB,CACvB,cAAc,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAA"}

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

@@ -1,5 +1,6 @@
 import { EmptyObject } from '@xyo-network/core';
 import { XyoPayload } from './Base';
+/** @deprecated - meta fields not supported by client anymore */
 export interface XyoPayloadMetaBase {
     _hash: string;
     _observeDuration?: number;
@@ -11,8 +12,13 @@ export interface XyoPayloadMetaBase {
     _user_agent?: string;
     _schemaValid?: boolean;
 }
+/** @deprecated - meta fields not supported by client anymore */
 export declare type XyoPayloadMeta<T extends EmptyObject = EmptyObject> = T & XyoPayloadMetaBase;
+/** @deprecated - meta fields not supported by client anymore */
 export declare type XyoPartialPayloadMeta<T extends EmptyObject = EmptyObject> = T & Partial<XyoPayloadMetaBase>;
+/** @deprecated - meta fields not supported by client anymore */
 export declare type XyoPayloadWithMeta<T extends EmptyObject = EmptyObject> = XyoPayload<T & XyoPayloadMetaBase>;
+/** @deprecated - meta fields not supported by client anymore */
 export declare type XyoPayloadWithPartialMeta<T extends EmptyObject = EmptyObject> = XyoPayload<T & Partial<XyoPayloadMetaBase>>;
+/** @deprecated - meta fields not supported by client anymore */
 //# sourceMappingURL=Meta.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Meta.d.ts","sourceRoot":"","sources":["../../../src/models/Meta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,oBAAY,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG,kBAAkB,CAAA;AACxF,oBAAY,qBAAqB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AACxG,oBAAY,kBAAkB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,UAAU,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAA;AACxG,oBAAY,yBAAyB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Meta.d.ts","sourceRoot":"","sources":["../../../src/models/Meta.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,gEAAgE;AAChE,oBAAY,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG,kBAAkB,CAAA;AACxF,gEAAgE;AAChE,oBAAY,qBAAqB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AACxG,gEAAgE;AAChE,oBAAY,kBAAkB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,UAAU,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAA;AACxG,gEAAgE;AAChE,oBAAY,yBAAyB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAA;AACxH,gEAAgE"}

package/dist/esm/models/Meta.js

@@ -1,2 +1,3 @@
 export {};
+/** @deprecated - meta fields not supported by client anymore */
 //# sourceMappingURL=Meta.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../src/models/Meta.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../src/models/Meta.ts"],"names":[],"mappings":";AA0BA,gEAAgE"}

package/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.7",
-    "@xyo-network/account": "^2.33.0-rc.9",
-    "@xyo-network/core": "^2.33.0-rc.9",
+    "@xyo-network/account": "^2.33.0",
+    "@xyo-network/core": "^2.33.0",
     "axios": "^0.27.2",
     "tslib": "^2.4.0"
   },
@@ -49,6 +49,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.0-rc.9",
-  "stableVersion": "2.32.1"
+  "version": "2.33.0"
 }

package/src/Builder/Builder.spec.ts

@@ -1,3 +1,4 @@
+import { XyoPayload } from '../models'
 import { XyoPayloadBuilder } from './Builder'
 
 const schema = 'network.xyo.temp'
@@ -8,7 +9,7 @@ const ADDITIONAL_FIELD_COUNT = 4
 
 describe('XyoBoundWitnessBuilder', () => {
   test('build', () => {
-    let builder = new XyoPayloadBuilder({ schema })
+    let builder = new XyoPayloadBuilder<XyoPayload<Record<string, unknown>>>({ schema })
     expect(builder).toBeDefined()
     builder = builder.fields({
       testArray: [1, 2, 3],

package/src/Builder/Builder.ts

@@ -1,4 +1,4 @@
-import { deepOmitUnderscoreFields, removeEmptyFields, StringKeyObject, XyoHasher } from '@xyo-network/core'
+import { deepOmitUnderscoreFields, Hasher, removeEmptyFields } 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
@@ -36,7 +36,7 @@ export class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<StringKeyObject
 
   public build(): T {
     const hashableFields = this.hashableFields()
-    const _hash = new XyoHasher(hashableFields).hash
+    const _hash = new Hasher(hashableFields).hash
     const _timestamp = Date.now()
     return { ...hashableFields, _client: 'js', _hash, _timestamp, schema: this._schema }
   }

package/src/Test/testPayload.ts

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

package/src/Validator/Validator.spec.ts

@@ -1,60 +1,49 @@
 import { dumpErrors } from '@xyo-network/core'
 
-import { XyoPayloadWithMeta } from '../models'
-import { XyoPayloadValidator } from './Validator'
-
-const testPayloadNoSchema: XyoPayloadWithMeta = {
-  _hash: '44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a',
-  _timestamp: 1609459255555,
-} as XyoPayloadWithMeta
-const testPayloadMixedCase: XyoPayloadWithMeta = {
-  _hash: '9a67116e05c33135f6ba23768f9a3fbbba155297ee1bb0a7e21d91fdc3835769',
-  _timestamp: 1609459255555,
+import { XyoPayload } from '../models'
+import { PayloadValidator } from './Validator'
+
+const testPayloadNoSchema: XyoPayload = {} as XyoPayload
+const testPayloadMixedCase: XyoPayload = {
   schema: 'network.xyo.testMixedCaseSchema',
-} as XyoPayloadWithMeta
-const testPayloadTooFewLevels: XyoPayloadWithMeta = {
-  _hash: '95206b26e3173deaac5e3f5d4510d50112b6348d3a2128b1eb6fe3ca66957628',
-  _timestamp: 1609459255555,
+} as XyoPayload
+const testPayloadTooFewLevels: XyoPayload = {
   schema: 'network.xyo',
-} as XyoPayloadWithMeta
-const testPayloadDoesNotExist: XyoPayloadWithMeta = {
-  _hash: '360b4ce36862ef2a20dd572d69283a86d351b2b4a9cd4f61ae6f7a320be81dbf',
-  _timestamp: 1609459255555,
+} as XyoPayload
+const testPayloadDoesNotExist: XyoPayload = {
   schema: 'network.dfd-sf-sf-s.blahblah',
-} as XyoPayloadWithMeta
-const testPayloadValid: XyoPayloadWithMeta = {
-  _hash: '4b5958c6d16b26d6790e33f5be45578728b0ea36e40a0d1b9c9164822341cac1',
-  _timestamp: 1609459255555,
+} as XyoPayload
+const testPayloadValid: XyoPayload = {
   schema: 'network.xyo.test',
-} as XyoPayloadWithMeta
+} as XyoPayload
 
 test('all [missing schema]', () => {
-  const validator = new XyoPayloadValidator(testPayloadNoSchema)
+  const validator = new PayloadValidator(testPayloadNoSchema)
   const errors = validator.validate()
   expect(errors.length).toBe(1)
 })
 
 test('all [mixed case]', () => {
-  const validator = new XyoPayloadValidator(testPayloadMixedCase)
+  const validator = new PayloadValidator(testPayloadMixedCase)
   const errors = validator.validate()
   expect(errors.length).toBe(1)
 })
 
 test('all [too few levels]', () => {
-  const validator = new XyoPayloadValidator(testPayloadTooFewLevels)
+  const validator = new PayloadValidator(testPayloadTooFewLevels)
   const errors = validator.validate()
   expect(errors.length).toBe(1)
 })
 
 test('all [does not exist]', () => {
-  const validator = new XyoPayloadValidator(testPayloadDoesNotExist)
+  const validator = new PayloadValidator(testPayloadDoesNotExist)
   const errors = validator.validate()
   dumpErrors(errors)
   expect(errors.length).toBe(0)
 })
 
 test('all [valid]', () => {
-  const validator = new XyoPayloadValidator(testPayloadValid)
+  const validator = new PayloadValidator(testPayloadValid)
 
   let errors: Error[] = []
   errors = validator.validate()

package/src/Validator/Validator.ts

@@ -1,18 +1,35 @@
 import { XyoValidator, XyoValidatorBase } from '@xyo-network/core'
 
 import { XyoPayload } from '../models'
-import { XyoPayloadBodyValidator } from './BodyValidator'
+import { XyoSchemaNameValidator } from '../SchemaNameValidator'
 
-export class XyoPayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements XyoValidator<T> {
-  public body: XyoPayloadBodyValidator
+export class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements XyoValidator<T> {
   constructor(payload: T) {
     super(payload)
-    this.body = new XyoPayloadBodyValidator(payload)
+  }
+
+  private _schemaValidator?: XyoSchemaNameValidator
+  get schemaValidator() {
+    this._schemaValidator = this._schemaValidator ?? new XyoSchemaNameValidator(this.obj.schema ?? '')
+    return this._schemaValidator
+  }
+
+  public schemaName() {
+    const errors: Error[] = []
+    if (this.obj.schema === undefined) {
+      errors.push(Error('schema missing'))
+    } else {
+      errors.push(...this.schemaValidator.all())
+    }
+    return errors
   }
 
   public validate() {
     const errors: Error[] = []
-    errors.push(...this.body.validate())
+    errors.push(...this.schemaName())
     return errors
   }
 }
+
+/** @deprecated use PayloadValidator instead*/
+export class XyoPayloadValidator<T extends XyoPayload = XyoPayload> extends PayloadValidator<T> {}

package/src/Validator/index.ts

@@ -1,3 +1 @@
-export * from './BodyValidator'
-export * from './MetaValidator'
 export * from './Validator'

package/src/Wrapper/Wrapper.ts

@@ -1,9 +1,10 @@
-import { deepOmitUnderscoreFields, deepPickUnderscoreFields, XyoDataLike, XyoHasher } from '@xyo-network/core'
+import { deepOmitUnderscoreFields, deepPickUnderscoreFields, Hasher, XyoDataLike } from '@xyo-network/core'
 
 import { Huri } from '../Huri'
 import { XyoPayload } from '../models'
+import { PayloadValidator } from '../Validator'
 
-export class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends XyoHasher<T> {
+export class PayloadWrapper<T extends XyoPayload = XyoPayload> extends Hasher<T> {
   public get payload() {
     return this.obj
   }
@@ -12,6 +13,15 @@ export class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends XyoHas
     return deepOmitUnderscoreFields<T>(this.obj)
   }
 
+  get valid() {
+    return this.errors.length === 0
+  }
+
+  get errors() {
+    return new PayloadValidator(this.payload).validate()
+  }
+
+  /** @deprecated - meta fields not supported by client anymore */
   public get meta() {
     return deepPickUnderscoreFields<T>(this.obj)
   }
@@ -19,7 +29,10 @@ export class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends XyoHas
   public static async load(address: XyoDataLike | Huri) {
     const payload = await new Huri(address).fetch()
     if (payload) {
-      return new XyoPayloadWrapper(payload)
+      return new PayloadWrapper(payload)
     }
   }
 }
+
+/** @deprecated use PayloadWrapper instead */
+export class XyoPayloadWrapper<T extends XyoPayload = XyoPayload> extends PayloadWrapper<T> {}

package/src/Wrapper/index.ts

@@ -1,2 +1 @@
-export * from './Validator'
 export * from './Wrapper'