@xyo-network/payload 2.38.8 → 2.38.10

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

@@ -6,8 +6,8 @@ export declare class XyoPayloadBuilder<T extends XyoPayload = XyoPayload<Record<
     private _fields;
     private _schema;
     constructor({ schema }: XyoPayloadBuilderOptions);
+    build(): T;
     fields(fields?: Partial<T>): this;
     hashableFields(): T;
-    build(): T;
 }
 //# sourceMappingURL=Builder.d.ts.map

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

@@ -1 +1 @@
-{"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,OAAO,CAAQ;gBAEX,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAIzC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAO1B,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,OAAO,CAAQ;gBAEX,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAIzC,KAAK,IAAI,CAAC;IAOV,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAO1B,cAAc;CAMtB"}

package/dist/cjs/Builder/Builder.js

@@ -7,6 +7,12 @@ class XyoPayloadBuilder {
         this._fields = {};
         this._schema = schema;
     }
+    build() {
+        const hashableFields = this.hashableFields();
+        const _hash = new core_1.Hasher(hashableFields).hash;
+        const _timestamp = Date.now();
+        return Object.assign(Object.assign({}, hashableFields), { _client: 'js', _hash, _timestamp, schema: this._schema });
+    }
     fields(fields) {
         if (fields) {
             this._fields = Object.assign(Object.assign({}, this._fields), (0, core_1.removeEmptyFields)(fields));
@@ -16,12 +22,6 @@ class XyoPayloadBuilder {
     hashableFields() {
         return Object.assign(Object.assign({}, (0, core_1.removeEmptyFields)((0, core_1.deepOmitUnderscoreFields)(this._fields))), { schema: this._schema });
     }
-    build() {
-        const hashableFields = this.hashableFields();
-        const _hash = new core_1.Hasher(hashableFields).hash;
-        const _timestamp = Date.now();
-        return Object.assign(Object.assign({}, hashableFields), { _client: 'js', _hash, _timestamp, schema: this._schema });
-    }
 }
 exports.XyoPayloadBuilder = XyoPayloadBuilder;
 //# sourceMappingURL=Builder.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":";;;AAAA,4CAAuF;AAQvF,MAAa,iBAAiB;IAI5B,YAAY,EAAE,MAAM,EAA4B;QAHxC,YAAO,GAAe,EAAE,CAAA;QAI9B,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,cAAc;QACnB,OAAO,gCACF,IAAA,wBAAiB,EAAC,IAAA,+BAAwB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAC5D,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,aAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAC7C,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;AA5BD,8CA4BC"}
+{"version":3,"file":"Builder.js","sourceRoot":"","sources":["../../../src/Builder/Builder.ts"],"names":[],"mappings":";;;AAAA,4CAAuF;AAQvF,MAAa,iBAAiB;IAI5B,YAAY,EAAE,MAAM,EAA4B;QAHxC,YAAO,GAAe,EAAE,CAAA;QAI9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACvB,CAAC;IAEM,KAAK;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,KAAK,GAAG,IAAI,aAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAA;QAC7C,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;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,cAAc;QACnB,OAAO,gCACF,IAAA,wBAAiB,EAAC,IAAA,+BAAwB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAC5D,MAAM,EAAE,IAAI,CAAC,OAAO,GAChB,CAAA;IACR,CAAC;CACF;AA5BD,8CA4BC"}

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

@@ -6,27 +6,27 @@ export interface HuriOptions {
     archivistUri?: string;
 }
 export interface XyoFetchedPayload<T extends XyoPayload = XyoPayload> {
-    payload: T;
     huri?: Huri;
+    payload: T;
 }
 export declare class Huri<T extends XyoPayload = XyoPayload> {
-    originalHref: string;
-    protocol?: string;
-    archivist?: string;
     archive?: string;
+    archivist?: string;
     hash: string;
+    originalHref: string;
+    protocol?: string;
     private isHuri;
     constructor(huri: XyoDataLike | Huri, { archivistUri }?: HuriOptions);
-    private parsePath;
-    private validateParse;
     get href(): string;
-    toString(): string;
-    fetch(): Promise<T | undefined>;
     static fetch<T extends XyoPayload = XyoPayload>(huri: Huri): Promise<T | undefined>;
-    private static parseProtocol;
-    private static parsePath;
     static isHuri(value: unknown): Huri<import("../models").SchemaFields & import("../models").PayloadFields & {
         schema: string;
     }> | undefined;
+    private static parsePath;
+    private static parseProtocol;
+    fetch(): Promise<T | undefined>;
+    toString(): string;
+    private parsePath;
+    private validateParse;
 }
 //# sourceMappingURL=Huri.d.ts.map

package/dist/cjs/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,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IAExB,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,YAAY,EAAE,GAAE,WAAgB;IAuBxE,IAAW,IAAI,WAad;WAEY,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;WAI3E,MAAM,CAAC,KAAK,EAAE,OAAO;;;IAOnC,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYf,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIf,OAAO,CAAC,SAAS;IAwBjB,OAAO,CAAC,aAAa;CAUtB"}

package/dist/cjs/Huri/Huri.js

@@ -23,32 +23,6 @@ class Huri {
         }
         this.validateParse();
     }
-    parsePath(path, hasProtocol) {
-        var _a;
-        const pathParts = path.split('/');
-        //if the protocol was found, then there is not allowed to be a leading /
-        (0, assert_1.assertEx)(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator');
-        //remove leading '/' if needed
-        pathParts[0].length === 0 ? pathParts.shift() : null;
-        //hash is assumed to be the last part
-        const hash = (0, assert_1.assertEx)(pathParts.pop(), 'No hash specified');
-        //archivist is assumed to be the first part
-        this.archivist = (_a = pathParts.shift()) !== null && _a !== void 0 ? _a : 'api.archivist.xyo.network';
-        //the archive is whatever is left
-        this.archive = pathParts.pop();
-        //after we pull off all the path parts, there should be nothing left
-        (0, assert_1.assertEx)(pathParts.length === 0, 'Too many path parts');
-        return hash;
-    }
-    validateParse() {
-        var _a, _b;
-        //the archivist should not be zero length
-        (0, assert_1.assertEx)(((_a = this.archivist) === null || _a === void 0 ? void 0 : _a.length) !== 0, 'Invalid archivist length');
-        //the archivist should not be zero length (can be undefined)
-        (0, assert_1.assertEx)(((_b = this.archive) === null || _b === void 0 ? void 0 : _b.length) !== 0, 'Invalid archive length');
-        //the archive should not be set if the archivist is not set
-        (0, assert_1.assertEx)(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required');
-    }
     /*
     The full href or the hash
     */
@@ -66,29 +40,16 @@ class Huri {
         parts.push(this.hash);
         return parts.join('/');
     }
-    toString() {
-        return this.href;
-    }
-    fetch() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield Huri.fetch(this);
-        });
-    }
     static fetch(huri) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return (yield axios_1.default.get(huri.href)).data;
         });
     }
-    static parseProtocol(huri) {
-        const protocolSplit = huri.split('//');
-        (0, assert_1.assertEx)(protocolSplit.length <= 2, `Invalid second protocol [${protocolSplit[2]}]`);
-        const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined;
-        if (rawProtocol) {
-            const protocolParts = rawProtocol === null || rawProtocol === void 0 ? void 0 : rawProtocol.split(':');
-            (0, assert_1.assertEx)(protocolParts.length === 2, `Invalid protocol format [${rawProtocol}]`);
-            (0, assert_1.assertEx)(protocolParts[1].length === 0, `Invalid protocol format (post :) [${rawProtocol}]`);
-            return protocolParts.shift();
+    static isHuri(value) {
+        if (typeof value === 'object') {
+            return value.isHuri ? value : undefined;
         }
+        return undefined;
     }
     static parsePath(huri) {
         const protocolSplit = huri.split('//');
@@ -100,11 +61,50 @@ class Huri {
             return protocolSplit[1];
         }
     }
-    static isHuri(value) {
-        if (typeof value === 'object') {
-            return value.isHuri ? value : undefined;
+    static parseProtocol(huri) {
+        const protocolSplit = huri.split('//');
+        (0, assert_1.assertEx)(protocolSplit.length <= 2, `Invalid second protocol [${protocolSplit[2]}]`);
+        const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined;
+        if (rawProtocol) {
+            const protocolParts = rawProtocol === null || rawProtocol === void 0 ? void 0 : rawProtocol.split(':');
+            (0, assert_1.assertEx)(protocolParts.length === 2, `Invalid protocol format [${rawProtocol}]`);
+            (0, assert_1.assertEx)(protocolParts[1].length === 0, `Invalid protocol format (post :) [${rawProtocol}]`);
+            return protocolParts.shift();
         }
-        return undefined;
+    }
+    fetch() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return yield Huri.fetch(this);
+        });
+    }
+    toString() {
+        return this.href;
+    }
+    parsePath(path, hasProtocol) {
+        var _a;
+        const pathParts = path.split('/');
+        //if the protocol was found, then there is not allowed to be a leading /
+        (0, assert_1.assertEx)(!(hasProtocol && pathParts[0].length === 0), 'Invalid protocol separator');
+        //remove leading '/' if needed
+        pathParts[0].length === 0 ? pathParts.shift() : null;
+        //hash is assumed to be the last part
+        const hash = (0, assert_1.assertEx)(pathParts.pop(), 'No hash specified');
+        //archivist is assumed to be the first part
+        this.archivist = (_a = pathParts.shift()) !== null && _a !== void 0 ? _a : 'api.archivist.xyo.network';
+        //the archive is whatever is left
+        this.archive = pathParts.pop();
+        //after we pull off all the path parts, there should be nothing left
+        (0, assert_1.assertEx)(pathParts.length === 0, 'Too many path parts');
+        return hash;
+    }
+    validateParse() {
+        var _a, _b;
+        //the archivist should not be zero length
+        (0, assert_1.assertEx)(((_a = this.archivist) === null || _a === void 0 ? void 0 : _a.length) !== 0, 'Invalid archivist length');
+        //the archivist should not be zero length (can be undefined)
+        (0, assert_1.assertEx)(((_b = this.archive) === null || _b === void 0 ? void 0 : _b.length) !== 0, 'Invalid archive length');
+        //the archive should not be set if the archivist is not set
+        (0, assert_1.assertEx)(!(this.archive && !this.archivist), 'If specifying archive, archivist is also required');
     }
 }
 exports.Huri = Huri;

package/dist/cjs/Huri/Huri.js.map

@@ -1 +1 @@
-{"version":3,"file":"Huri.js","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Huri.js","sourceRoot":"","sources":["../../../src/Huri/Huri.ts"],"names":[],"mappings":"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"}

package/dist/cjs/SchemaNameValidator.d.ts

@@ -3,14 +3,15 @@
  */
 export declare class XyoSchemaNameValidator {
     schema?: string;
-    constructor(schema?: string);
     private _parts?;
+    private _rootDomain?;
+    constructor(schema?: string);
     /**
-     * The schema converted into a string array split on '.'
+     * Checks whether the schema is all lowercase
      *
-     * @returns string[]
+     * @returns boolean
      */
-    get parts(): string[] | undefined;
+    get isLowercase(): boolean;
     /**
      * Levels in the schema
      *
@@ -18,20 +19,11 @@ export declare class XyoSchemaNameValidator {
      */
     get levels(): number | undefined;
     /**
-     * Checks whether the schema is all lowercase
-     *
-     * @returns boolean
-     */
-    get isLowercase(): boolean;
-    /**
-     *
-     * Get a domain for the schema at a certain level
+     * The schema converted into a string array split on '.'
      *
-     * @param level - Zero based level to check
-     * @returns string
+     * @returns string[]
      */
-    private domainLevel;
-    private _rootDomain?;
+    get parts(): string[] | undefined;
     /**
      * The rootDomain is the first two levels of the schema, in reverse order
      * This can be used to determine who 'owns' that schema, based on domain
@@ -41,34 +33,42 @@ export declare class XyoSchemaNameValidator {
      */
     get rootDomain(): string | undefined;
     /**
-     * Checks if the root domain validates via DNS resolution
-     *
-     * @returns boolean
+     * Run all static validations
+     * @returns Error[]
      */
-    rootDomainExists(): Promise<boolean>;
+    all(): Error[];
+    /**
+     * Run all the validations
+     * @param checkExistance - boolean
+     * @returns Error[]
+     */
+    allDynamic(): Promise<Error[]>;
     /**
      * Determines how many levels of the schema's reverse domain
      * pass DNS resolution
      *
      * @returns number (0 if none exist)
      */
-    domainExistanceDepth(): Promise<number>;
+    domainExistenceDepth(): Promise<number>;
     /**
-     * Run all the validations
-     * @param checkExistance - boolean
-     * @returns Error[]
+     * Checks if the root domain validates via DNS resolution
+     *
+     * @returns boolean
      */
-    allDynamic(): Promise<Error[]>;
+    rootDomainExists(): Promise<boolean>;
     /**
-     * Run all static validations
-     * @returns Error[]
+     *
+     * Get a domain for the schema at a certain level
+     *
+     * @param level - Zero based level to check
+     * @returns string
      */
-    all(): Error[];
+    private domainLevel;
 }
-/** @deprectated use XyoSchemaNameValidator instead */
+/** @deprecated use XyoSchemaNameValidator instead */
 export declare class SchemaValidator extends XyoSchemaNameValidator {
 }
-/** @deprectated use XyoSchemaNameValidator instead */
+/** @deprecated use XyoSchemaNameValidator instead */
 export declare class XyoSchemaValidator extends XyoSchemaNameValidator {
 }
 //# sourceMappingURL=SchemaNameValidator.d.ts.map

package/dist/cjs/SchemaNameValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaNameValidator.d.ts","sourceRoot":"","sources":["../../src/SchemaNameValidator.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBAAa,sBAAsB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;gBACV,MAAM,CAAC,EAAE,MAAM;IAI3B,OAAO,CAAC,MAAM,CAAC,CAAU;IAEzB;;;;OAIG;IACH,IAAI,KAAK,yBAGR;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IAED;;;;OAIG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,WAAW,CAAC,CAAQ;IAE5B;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAGnC;IAED;;;;OAIG;IACU,gBAAgB;IAI7B;;;;;OAKG;IACU,oBAAoB;IAYjC;;;;OAIG;IAEU,UAAU;IAOvB;;;OAGG;IAEI,GAAG;CAOX;AAED,sDAAsD;AACtD,qBAAa,eAAgB,SAAQ,sBAAsB;CAAG;AAE9D,sDAAsD;AACtD,qBAAa,kBAAmB,SAAQ,sBAAsB;CAAG"}
+{"version":3,"file":"SchemaNameValidator.d.ts","sourceRoot":"","sources":["../../src/SchemaNameValidator.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBAAa,sBAAsB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAQ;gBAChB,MAAM,CAAC,EAAE,MAAM;IAI3B;;;;OAIG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;;;OAIG;IACH,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IAED;;;;OAIG;IACH,IAAI,KAAK,yBAGR;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAGnC;IAED;;;OAGG;IAEI,GAAG;IAQV;;;;OAIG;IAEU,UAAU;IAOvB;;;;;OAKG;IACU,oBAAoB;IAYjC;;;;OAIG;IACU,gBAAgB;IAI7B;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;CAMpB;AAED,qDAAqD;AACrD,qBAAa,eAAgB,SAAQ,sBAAsB;CAAG;AAE9D,qDAAqD;AACrD,qBAAa,kBAAmB,SAAQ,sBAAsB;CAAG"}

package/dist/cjs/SchemaNameValidator.js

@@ -11,14 +11,13 @@ class XyoSchemaNameValidator {
         this.schema = schema;
     }
     /**
-     * The schema converted into a string array split on '.'
+     * Checks whether the schema is all lowercase
      *
-     * @returns string[]
+     * @returns boolean
      */
-    get parts() {
-        var _a, _b;
-        this._parts = (_a = this._parts) !== null && _a !== void 0 ? _a : (_b = this.schema) === null || _b === void 0 ? void 0 : _b.split('.');
-        return this._parts;
+    get isLowercase() {
+        var _a;
+        return this.schema === ((_a = this.schema) === null || _a === void 0 ? void 0 : _a.toLowerCase());
     }
     /**
      * Levels in the schema
@@ -30,24 +29,14 @@ class XyoSchemaNameValidator {
         return (_a = this.parts) === null || _a === void 0 ? void 0 : _a.length;
     }
     /**
-     * Checks whether the schema is all lowercase
-     *
-     * @returns boolean
-     */
-    get isLowercase() {
-        var _a;
-        return this.schema === ((_a = this.schema) === null || _a === void 0 ? void 0 : _a.toLowerCase());
-    }
-    /**
-     *
-     * Get a domain for the schema at a certain level
+     * The schema converted into a string array split on '.'
      *
-     * @param level - Zero based level to check
-     * @returns string
+     * @returns string[]
      */
-    domainLevel(level) {
-        var _a;
-        return (_a = this.parts) === null || _a === void 0 ? void 0 : _a.slice(0, level + 1).reverse().join('.');
+    get parts() {
+        var _a, _b;
+        this._parts = (_a = this._parts) !== null && _a !== void 0 ? _a : (_b = this.schema) === null || _b === void 0 ? void 0 : _b.split('.');
+        return this._parts;
     }
     /**
      * The rootDomain is the first two levels of the schema, in reverse order
@@ -62,13 +51,34 @@ class XyoSchemaNameValidator {
         return this._rootDomain;
     }
     /**
-     * Checks if the root domain validates via DNS resolution
-     *
-     * @returns boolean
+     * Run all static validations
+     * @returns Error[]
      */
-    rootDomainExists() {
+    all() {
+        var _a, _b, _c;
+        const errors = [];
+        if (((_b = (_a = this.schema) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0)
+            errors.push(Error('schema missing'));
+        else if (((_c = this.levels) !== null && _c !== void 0 ? _c : 0) < 3)
+            errors.push(Error(`schema levels < 3 [${this.levels}, ${this.schema}]`));
+        else if (!this.isLowercase)
+            errors.push(Error(`schema not lowercase [${this.schema}]`));
+        return errors;
+    }
+    /**
+     * Run all the validations
+     * @param checkExistance - boolean
+     * @returns Error[]
+     */
+    allDynamic() {
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield (0, core_1.domainExists)(this.rootDomain);
+            const errors = [];
+            if (((_b = (_a = this.schema) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0)
+                errors.push(Error('schema missing'));
+            else if (!(yield this.rootDomainExists()))
+                errors.push(Error(`schema root domain must exist [${this.rootDomain}]`));
+            return errors;
         });
     }
     /**
@@ -77,7 +87,7 @@ class XyoSchemaNameValidator {
      *
      * @returns number (0 if none exist)
      */
-    domainExistanceDepth() {
+    domainExistenceDepth() {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const levels = (_a = this.levels) !== null && _a !== void 0 ? _a : 0;
@@ -92,43 +102,33 @@ class XyoSchemaNameValidator {
         });
     }
     /**
-     * Run all the validations
-     * @param checkExistance - boolean
-     * @returns Error[]
+     * Checks if the root domain validates via DNS resolution
+     *
+     * @returns boolean
      */
-    allDynamic() {
-        var _a, _b;
+    rootDomainExists() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const errors = [];
-            if (((_b = (_a = this.schema) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0)
-                errors.push(Error('schema missing'));
-            else if (!(yield this.rootDomainExists()))
-                errors.push(Error(`schema root domain must exist [${this.rootDomain}]`));
-            return errors;
+            return yield (0, core_1.domainExists)(this.rootDomain);
         });
     }
     /**
-     * Run all static validations
-     * @returns Error[]
+     *
+     * Get a domain for the schema at a certain level
+     *
+     * @param level - Zero based level to check
+     * @returns string
      */
-    all() {
-        var _a, _b, _c;
-        const errors = [];
-        if (((_b = (_a = this.schema) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0)
-            errors.push(Error('schema missing'));
-        else if (((_c = this.levels) !== null && _c !== void 0 ? _c : 0) < 3)
-            errors.push(Error(`schema levels < 3 [${this.levels}, ${this.schema}]`));
-        else if (!this.isLowercase)
-            errors.push(Error(`schema not lowercase [${this.schema}]`));
-        return errors;
+    domainLevel(level) {
+        var _a;
+        return (_a = this.parts) === null || _a === void 0 ? void 0 : _a.slice(0, level + 1).reverse().join('.');
     }
 }
 exports.XyoSchemaNameValidator = XyoSchemaNameValidator;
-/** @deprectated use XyoSchemaNameValidator instead */
+/** @deprecated use XyoSchemaNameValidator instead */
 class SchemaValidator extends XyoSchemaNameValidator {
 }
 exports.SchemaValidator = SchemaValidator;
-/** @deprectated use XyoSchemaNameValidator instead */
+/** @deprecated use XyoSchemaNameValidator instead */
 class XyoSchemaValidator extends XyoSchemaNameValidator {
 }
 exports.XyoSchemaValidator = XyoSchemaValidator;

package/dist/cjs/SchemaNameValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaNameValidator.js","sourceRoot":"","sources":["../../src/SchemaNameValidator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaNameValidator.js","sourceRoot":"","sources":["../../src/SchemaNameValidator.ts"],"names":[],"mappings":"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"}

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

@@ -2,8 +2,8 @@ import { XyoValidator, XyoValidatorBase } from '@xyo-network/core';
 import { XyoPayload } from '../models';
 import { XyoSchemaNameValidator } from '../SchemaNameValidator';
 export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements XyoValidator<T> {
-    constructor(payload: T);
     private _schemaValidator?;
+    constructor(payload: T);
     get schemaValidator(): XyoSchemaNameValidator;
     schemaName(): Error[];
     validate(): Error[];

package/dist/cjs/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,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"}
+{"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;IACrH,OAAO,CAAC,gBAAgB,CAAC,CAAwB;gBAErC,OAAO,EAAE,CAAC;IAItB,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/cjs/Validator/Validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":";;;AAAA,4CAAkE;AAGlE,gEAA+D;AAE/D,MAAa,gBAAoD,SAAQ,uBAAmB;IAC1F,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAGD,IAAI,eAAe;;QACjB,IAAI,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,4CAAsB,CAAC,MAAA,IAAI,CAAC,GAAG,CAAC,MAAM,mCAAI,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;AA1BD,4CA0BC;AAED,8CAA8C;AAC9C,MAAa,mBAAuD,SAAQ,gBAAmB;CAAG;AAAlG,kDAAkG"}
+{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validator/Validator.ts"],"names":[],"mappings":";;;AAAA,4CAAkE;AAGlE,gEAA+D;AAE/D,MAAa,gBAAoD,SAAQ,uBAAmB;IAG1F,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,eAAe;;QACjB,IAAI,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,IAAI,4CAAsB,CAAC,MAAA,IAAI,CAAC,GAAG,CAAC,MAAM,mCAAI,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;AA3BD,4CA2BC;AAED,8CAA8C;AAC9C,MAAa,mBAAuD,SAAQ,gBAAmB;CAAG;AAAlG,kDAAkG"}

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

@@ -3,11 +3,13 @@ import { Promisable } from '@xyo-network/promise';
 import { Huri } from '../Huri';
 import { XyoPayload } from '../models';
 export declare abstract class PayloadWrapperBase<TPayload extends XyoPayload = XyoPayload> extends Hasher<TPayload> {
+    get body(): TPayload;
+    get errors(): Error[];
     get payload(): TPayload;
+    get previousHash(): null;
+    get schema(): string;
     get schemaName(): string;
-    get body(): TPayload;
     get valid(): boolean;
-    get errors(): Error[];
     static load(_address: XyoDataLike | Huri): Promisable<PayloadWrapperBase | null>;
     static parse(_obj: unknown): PayloadWrapperBase;
 }
@@ -16,8 +18,6 @@ export declare class PayloadWrapper<TPayload extends XyoPayload = XyoPayload> ex
     static load(address: XyoDataLike | Huri): Promise<PayloadWrapper<import("../models").SchemaFields & import("../models").PayloadFields & {
         schema: string;
     }> | null>;
-    get previousHash(): null;
-    get schema(): string;
     static parse<T extends XyoPayload = XyoPayload>(obj: unknown): PayloadWrapper<T>;
 }
 /** @deprecated use PayloadWrapper instead */

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

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAGtC,8BAAsB,kBAAkB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACzG,IAAW,OAAO,aAEjB;IAGD,IAAW,UAAU,WAEpB;IAED,IAAW,IAAI,aAEd;IAED,IAAI,KAAK,YAER;IAED,IAAI,MAAM,YAET;WAEa,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC;WAIzE,KAAK,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB;CAGvD;AAED,qBAAa,cAAc,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IACxG,OAAO,CAAC,gBAAgB,CAAO;WAEF,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;IAK7D,IAAW,YAAY,SAEtB;IAED,IAAW,MAAM,WAEhB;WAEsB,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC;CAajG;AAED,6CAA6C;AAC7C,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/Wrapper/Wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAGtC,8BAAsB,kBAAkB,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACzG,IAAW,IAAI,aAEd;IAED,IAAI,MAAM,YAET;IAED,IAAW,OAAO,aAEjB;IAED,IAAW,YAAY,SAEtB;IAED,IAAW,MAAM,WAEhB;IAGD,IAAW,UAAU,WAEpB;IAED,IAAI,KAAK,YAER;WAEa,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC;WAIzE,KAAK,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB;CAGvD;AAED,qBAAa,cAAc,CAAC,QAAQ,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IACxG,OAAO,CAAC,gBAAgB,CAAO;WAEF,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;;;WAKtC,KAAK,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,GAAG,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC;CAajG;AAED,6CAA6C;AAC7C,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}