@xyo-network/core 2.20.47 → 2.21.2

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

@@ -1,6 +1,6 @@
-import { XyoPayload } from '../../Payload';
+import { XyoPayloadWithPartialMeta } from '../../models';
 import { XyoAccount } from '../../Wallet';
-import { XyoBoundWitness } from '../models';
+import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models';
 export interface XyoBoundWitnessBuilderConfig {
     /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
     readonly inlinePayloads?: boolean;
@@ -13,10 +13,10 @@ export declare class XyoBoundWitnessBuilder {
     constructor(config?: XyoBoundWitnessBuilderConfig);
     private get _payload_hashes();
     witness(account: XyoAccount): this;
-    payloads(payloads: (XyoPayload | null)[]): this;
-    payload(payload?: XyoPayload): this;
+    payloads(payloads: (XyoPayloadWithPartialMeta | null)[]): this;
+    payload(payload?: XyoPayloadWithPartialMeta): this;
     hashableFields(): XyoBoundWitness;
     private signatures;
     private inlinePayloads;
-    build(): XyoBoundWitness;
+    build(): XyoBoundWitnessWithMeta;
 }

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

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

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

@@ -1,9 +1,9 @@
-import { XyoPayload } from '../../Payload';
-import { XyoBoundWitnessBody } from '../models';
-declare class XyoBoundWitnessBodyValidator {
-    private body;
+import { XyoValidator } from '../../lib';
+import { XyoPayload } from '../../models';
+import { XyoBoundWitness } from '../models';
+export declare class XyoBoundWitnessBodyValidator<T extends XyoBoundWitness = XyoBoundWitness> extends XyoValidator<T> {
     private payloads?;
-    constructor(body: XyoBoundWitnessBody, payloads?: XyoPayload[]);
+    constructor(boundWitness: T, payloads?: XyoPayload[]);
     addressesUniqueness(): Error[];
     addresses(): Error[];
     private validateArrayLength;
@@ -12,7 +12,6 @@ declare class XyoBoundWitnessBodyValidator {
     payloadHashes(): Error[];
     payloadSchemas(): Error[];
     previousHashes(): Error[];
-    schmea(): Error[];
-    all(): Error[];
+    schema(): Error[];
+    validate(): Error[];
 }
-export { XyoBoundWitnessBodyValidator };

package/dist/cjs/BoundWitness/Validator/BodyValidator.js

@@ -6,14 +6,14 @@ const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
 const Hasher_1 = require("../../Hasher");
 const lib_1 = require("../../lib");
 const SchemaNameValidator_1 = require("../../SchemaNameValidator");
-class XyoBoundWitnessBodyValidator {
-    constructor(body, payloads) {
-        this.body = body;
+class XyoBoundWitnessBodyValidator extends lib_1.XyoValidator {
+    constructor(boundWitness, payloads) {
+        super(boundWitness);
         this.payloads = payloads;
     }
     addressesUniqueness() {
         const errors = [];
-        const { addresses } = this.body;
+        const { addresses } = this.obj;
         const uniqAddresses = (0, uniq_1.default)(addresses);
         if ((addresses === null || addresses === void 0 ? void 0 : addresses.length) !== (uniqAddresses === null || uniqAddresses === void 0 ? void 0 : uniqAddresses.length))
             errors.push(new Error('addresses must be unique'));
@@ -21,7 +21,7 @@ class XyoBoundWitnessBodyValidator {
     }
     addresses() {
         const errors = [];
-        const { addresses } = this.body;
+        const { addresses } = this.obj;
         if (!(addresses === null || addresses === void 0 ? void 0 : addresses.length))
             errors.push(new Error('addresses missing [at least one address required]'));
         errors.push(...this.addressesUniqueness());
@@ -29,8 +29,8 @@ class XyoBoundWitnessBodyValidator {
     }
     validateArrayLength(fieldName, compareArrayName) {
         const errors = [];
-        const [array, arrayErrors] = (0, lib_1.validateType)('array', this.body[fieldName], true);
-        const [compareArray, compareArrayErrors] = (0, lib_1.validateType)('array', this.body[compareArrayName], true);
+        const [array, arrayErrors] = (0, lib_1.validateType)('array', this.stringKeyObj[fieldName], true);
+        const [compareArray, compareArrayErrors] = (0, lib_1.validateType)('array', this.stringKeyObj[compareArrayName], true);
         if ((array === null || array === void 0 ? void 0 : array.length) !== (compareArray === null || compareArray === void 0 ? void 0 : compareArray.length)) {
             errors.push(new Error(`${fieldName}/${compareArrayName} count mismatch [${array === null || array === void 0 ? void 0 : array.length} !== ${compareArray === null || compareArray === void 0 ? void 0 : compareArray.length}]`));
         }
@@ -49,10 +49,10 @@ class XyoBoundWitnessBodyValidator {
     payloadHashes() {
         var _a;
         const errors = [];
-        const passedHashes = this.body.payload_hashes;
+        const passedHashes = this.obj.payload_hashes;
         (_a = this.payloads) === null || _a === void 0 ? void 0 : _a.forEach((payload, index) => {
             const calcHash = new Hasher_1.XyoHasher(payload).hash;
-            const passedHash = passedHashes[index];
+            const passedHash = passedHashes === null || passedHashes === void 0 ? void 0 : passedHashes[index];
             if (calcHash !== passedHash) {
                 errors.push(new Error(`hash mismatch [${calcHash} !== ${passedHash}]`));
             }
@@ -61,29 +61,32 @@ class XyoBoundWitnessBodyValidator {
     }
     payloadSchemas() {
         const errors = [];
-        const schemaValidators = this.body.payload_schemas.map((schema) => {
-            return new SchemaNameValidator_1.XyoSchemaNameValidator(schema);
-        });
-        schemaValidators.forEach((validator) => {
-            errors.push(...validator.all());
-        });
+        const payloadSchemas = this.obj.payload_schemas;
+        if (payloadSchemas) {
+            const schemaValidators = payloadSchemas.map((schema) => {
+                return new SchemaNameValidator_1.XyoSchemaNameValidator(schema);
+            });
+            schemaValidators.forEach((validator) => {
+                errors.push(...validator.all());
+            });
+        }
         return errors;
     }
     previousHashes() {
         const errors = [];
         return errors;
     }
-    schmea() {
+    schema() {
         const errors = [];
         const expectedSchema = 'network.xyo.boundwitness';
-        if (this.body.schema !== expectedSchema) {
-            errors.push(new Error(`invalid schema [${expectedSchema} !== ${this.body.schema}]`));
+        if (this.obj.schema !== expectedSchema) {
+            errors.push(new Error(`invalid schema [${expectedSchema} !== ${this.obj.schema}]`));
         }
         return errors;
     }
-    all() {
+    validate() {
         const errors = [];
-        errors.push(...this.addresses(), ...this.validateArrayLengths(), ...this.payloadHashes(), ...this.payloadSchemas(), ...this.previousHashes(), ...this.schmea());
+        errors.push(...this.addresses(), ...this.validateArrayLengths(), ...this.payloadHashes(), ...this.payloadSchemas(), ...this.previousHashes(), ...this.schema());
         return errors;
     }
 }

package/dist/cjs/BoundWitness/Validator/BodyValidator.js.map

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

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

@@ -1,7 +1,6 @@
-import { XyoBoundWitness } from '../models';
-export declare class XyoBoundWitnessMetaValidator {
-    private bw;
-    constructor(bw: XyoBoundWitness);
+import { XyoValidator } from '../../lib';
+import { XyoBoundWitnessMeta } from '../models';
+export declare class XyoBoundWitnessMetaValidator<T extends XyoBoundWitnessMeta = XyoBoundWitnessMeta> extends XyoValidator<T> {
     client(): Error[];
     hash(): Error[];
     payloads(): Error[];
@@ -9,6 +8,6 @@ export declare class XyoBoundWitnessMetaValidator {
     timestamp(): Error[];
     sourceIp(): Error[];
     userAgent(): Error[];
-    all(): Error[];
+    validate(): Error[];
     meta(): Error[];
 }

package/dist/cjs/BoundWitness/Validator/MetaValidator.js

@@ -2,23 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoBoundWitnessMetaValidator = void 0;
 const Hasher_1 = require("../../Hasher");
+const lib_1 = require("../../lib");
 const is_ip_1 = require("./is-ip");
 const MIN_ALLOWED_TIMESTAMP = 1609459200000;
 const MAX_ALLOWED_TIMESTAMP = 4102444800000;
-class XyoBoundWitnessMetaValidator {
-    constructor(bw) {
-        this.bw = bw;
-    }
+class XyoBoundWitnessMetaValidator extends lib_1.XyoValidator {
     client() {
         const errors = [];
         return errors;
     }
     hash() {
         const errors = [];
-        const hasher = new Hasher_1.XyoHasher(this.bw);
+        const hasher = new Hasher_1.XyoHasher(this.obj);
         const bodyHash = hasher.hash;
-        if (bodyHash !== this.bw._hash)
-            errors.push(new Error(`Body hash mismatch: [calculated: ${bodyHash}] [found: ${this.bw._hash}] [sortedStringify: ${hasher.stringified}]`));
+        if (bodyHash !== this.obj._hash)
+            errors.push(new Error(`Body hash mismatch: [calculated: ${bodyHash}] [found: ${this.obj._hash}] [sortedStringify: ${hasher.stringified}]`));
         return errors;
     }
     payloads() {
@@ -31,7 +29,7 @@ class XyoBoundWitnessMetaValidator {
     }
     timestamp() {
         const errors = [];
-        const { _timestamp } = this.bw;
+        const { _timestamp } = this.obj;
         if (_timestamp === undefined)
             errors.push(new Error('Missing _timestamp'));
         else if (_timestamp < MIN_ALLOWED_TIMESTAMP)
@@ -42,7 +40,7 @@ class XyoBoundWitnessMetaValidator {
     }
     sourceIp() {
         const errors = [];
-        const { _source_ip } = this.bw;
+        const { _source_ip } = this.obj;
         if (_source_ip && !(0, is_ip_1.isIP)(_source_ip)) {
             errors.push(new Error(`_source_ip invalid format [${_source_ip}]`));
         }
@@ -50,12 +48,12 @@ class XyoBoundWitnessMetaValidator {
     }
     userAgent() {
         const errors = [];
-        const { _user_agent } = this.bw;
+        const { _user_agent } = this.obj;
         if (!_user_agent)
             errors.push(new Error('_user_agent missing'));
         return errors;
     }
-    all() {
+    validate() {
         const errors = [];
         errors.push(...this.client(), ...this.hash(), ...this.payloads(), ...this.signatures());
         return errors;

package/dist/cjs/BoundWitness/Validator/MetaValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetaValidator.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Validator/MetaValidator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MetaValidator.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Validator/MetaValidator.ts"],"names":[],"mappings":";;;AAAA,yCAAwC;AACxC,mCAAwC;AAExC,mCAA8B;AAE9B,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAC3C,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAE3C,MAAa,4BAAkF,SAAQ,kBAAe;IAC7G,MAAM;QACX,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI;QACT,MAAM,MAAM,GAAY,EAAE,CAAA;QAE1B,MAAM,MAAM,GAAG,IAAI,kBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEtC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;QAC5B,IAAI,QAAQ,KAAK,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,oCAAoC,QAAQ,aAAa,IAAI,CAAC,GAAG,CAAC,KAAK,uBAAuB,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC,CAAA;QAC5K,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,UAAU;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,CAAA;QAC/B,IAAI,UAAU,KAAK,SAAS;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;aACrE,IAAI,UAAU,GAAG,qBAAqB;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAA;aAChG,IAAI,UAAU,GAAG,qBAAqB;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAA;QACpG,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,CAAA;QAC/B,IAAI,UAAU,IAAI,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,8BAA8B,UAAU,GAAG,CAAC,CAAC,CAAA;SACpE;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,GAAG,CAAA;QAChC,IAAI,CAAC,WAAW;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;QAC/D,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACvF,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI;QACT,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;QACzE,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA9DD,oEA8DC"}

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

@@ -1,12 +1,12 @@
-import { XyoBoundWitness } from '../models';
+import { XyoValidator } from '../../lib';
+import { XyoBoundWitnessWithMeta } from '../models';
 import { XyoBoundWitnessBodyValidator } from './BodyValidator';
 import { XyoBoundWitnessMetaValidator } from './MetaValidator';
-declare class XyoBoundWitnessValidator {
-    private bw;
+declare class XyoBoundWitnessValidator<T extends XyoBoundWitnessWithMeta = XyoBoundWitnessWithMeta> extends XyoValidator<T> {
     body: XyoBoundWitnessBodyValidator;
     meta: XyoBoundWitnessMetaValidator;
-    constructor(bw: XyoBoundWitness);
+    constructor(bw: T);
     signatures(): Error[];
-    all(): Error[];
+    validate(): Error[];
 }
 export { XyoBoundWitnessValidator };

package/dist/cjs/BoundWitness/Validator/Validator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoBoundWitnessValidator = void 0;
 const sdk_js_1 = require("@xylabs/sdk-js");
+const lib_1 = require("../../lib");
 const Wallet_1 = require("../../Wallet");
 const BodyValidator_1 = require("./BodyValidator");
 const MetaValidator_1 = require("./MetaValidator");
@@ -17,27 +18,27 @@ const validateSignature = (hash, address, signature) => {
     }
     return [];
 };
-class XyoBoundWitnessValidator {
+class XyoBoundWitnessValidator extends lib_1.XyoValidator {
     constructor(bw) {
-        this.bw = bw;
+        super(bw);
         this.body = new BodyValidator_1.XyoBoundWitnessBodyValidator(bw, bw._payloads);
         this.meta = new MetaValidator_1.XyoBoundWitnessMetaValidator(bw);
     }
     signatures() {
         var _a;
-        const hash = (0, sdk_js_1.assertEx)(this.bw._hash, 'Missing _hash');
+        const hash = (0, sdk_js_1.assertEx)(this.obj._hash, 'Missing _hash');
         return [
-            ...validateArraysSameLength((_a = this.bw._signatures) !== null && _a !== void 0 ? _a : [], this.bw.addresses, 'Length mismatch: address/_signature'),
-            ...this.bw.addresses.reduce((errors, address, index) => {
+            ...validateArraysSameLength((_a = this.obj._signatures) !== null && _a !== void 0 ? _a : [], this.obj.addresses, 'Length mismatch: address/_signature'),
+            ...this.obj.addresses.reduce((errors, address, index) => {
                 var _a;
-                errors.push(...validateSignature(hash, address, (_a = this.bw._signatures) === null || _a === void 0 ? void 0 : _a[index]));
+                errors.push(...validateSignature(hash, address, (_a = this.obj._signatures) === null || _a === void 0 ? void 0 : _a[index]));
                 return errors;
             }, []),
         ];
     }
-    all() {
+    validate() {
         const errors = [];
-        errors.push(...this.meta.all(), ...this.body.all());
+        errors.push(...this.meta.validate(), ...this.body.validate());
         errors.push(...this.signatures());
         return errors;
     }

package/dist/cjs/BoundWitness/Validator/Validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Validator/Validator.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AAEzC,yCAA8C;AAE9C,mDAA8D;AAC9D,mDAA8D;AAE9D,MAAM,wBAAwB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,OAAO,GAAG,uBAAuB,EAAE,EAAE;IACjG,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC9E,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,CAAC,CAAC,CAAA;KACjD;IACD,IAAI,CAAC,IAAI,wBAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;QACzD,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,MAAM,SAAS,GAAG,CAAC,CAAC,CAAA;KAChE;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,wBAAwB;IAI5B,YAAY,EAAmB;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,IAAI,GAAG,IAAI,4CAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,4CAA4B,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,UAAU;;QACf,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACrD,OAAO;YACL,GAAG,wBAAwB,CAAC,MAAA,IAAI,CAAC,EAAE,CAAC,WAAW,mCAAI,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,qCAAqC,CAAC;YAChH,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAU,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;;gBAC9D,MAAM,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,EAAE,CAAC,WAAW,0CAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC9E,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC;SACP,CAAA;IACH,CAAC;IAEM,GAAG;QACR,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QACnD,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAEQ,4DAAwB"}
+{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Validator/Validator.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AAEzC,mCAAwC;AACxC,yCAA8C;AAE9C,mDAA8D;AAC9D,mDAA8D;AAE9D,MAAM,wBAAwB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,OAAO,GAAG,uBAAuB,EAAE,EAAE;IACjG,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,EAAE;IAC9E,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,CAAC,CAAC,CAAA;KACjD;IACD,IAAI,CAAC,IAAI,wBAAe,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;QACzD,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,MAAM,SAAS,GAAG,CAAC,CAAC,CAAA;KAChE;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,wBAAsF,SAAQ,kBAAe;IAGjH,YAAY,EAAK;QACf,KAAK,CAAC,EAAE,CAAC,CAAA;QACT,IAAI,CAAC,IAAI,GAAG,IAAI,4CAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,4CAA4B,CAAC,EAAE,CAAC,CAAA;IAClD,CAAC;IAEM,UAAU;;QACf,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACtD,OAAO;YACL,GAAG,wBAAwB,CAAC,MAAA,IAAI,CAAC,GAAG,CAAC,WAAW,mCAAI,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,qCAAqC,CAAC;YAClH,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAU,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;;gBAC/D,MAAM,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,GAAG,CAAC,WAAW,0CAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC/E,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC;SACP,CAAA;IACH,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7D,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAEQ,4DAAwB"}

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

@@ -1,13 +1,11 @@
 import { XyoHasher } from '../../Hasher';
-import { XyoBoundWitness } from '../models';
-import { XyoBoundWitnessValidator } from '../Validator';
-declare class XyoBoundWitnessWrapper<T extends XyoBoundWitness> extends XyoHasher<T> {
+import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '../models';
+export declare class XyoBoundWitnessWrapper<T extends XyoBoundWitness> extends XyoHasher<T> {
     readonly bw: T;
     constructor(bw: T);
-    get scrubbedFields(): Pick<T, string>;
-    private _validator?;
-    get validator(): XyoBoundWitnessValidator;
+    get scrubbedFields(): Partial<T>;
+}
+export declare class XyoBoundWitnessWithMetaWrapper<T extends XyoBoundWitnessWithMeta> extends XyoBoundWitnessWrapper<T> {
     private _userAgent?;
     get userAgent(): import("ua-parser-js").UAParserInstance;
 }
-export { XyoBoundWitnessWrapper };

package/dist/cjs/BoundWitness/Wrapper/Wrapper.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoBoundWitnessWrapper = void 0;
+exports.XyoBoundWitnessWithMetaWrapper = exports.XyoBoundWitnessWrapper = void 0;
 const tslib_1 = require("tslib");
 const pick_1 = tslib_1.__importDefault(require("lodash/pick"));
 const ua_parser_js_1 = require("ua-parser-js");
 const Hasher_1 = require("../../Hasher");
-const Validator_1 = require("../Validator");
 const scrubbedFields = ['_archive', '_client', '_hash', '_signatures', '_timestamp', '_user_agent', 'addresses', 'payload_schemas', 'previous_hashes', 'payload_hashes', 'schema'];
 class XyoBoundWitnessWrapper extends Hasher_1.XyoHasher {
     constructor(bw) {
@@ -15,16 +14,14 @@ class XyoBoundWitnessWrapper extends Hasher_1.XyoHasher {
     get scrubbedFields() {
         return (0, pick_1.default)(this.bw, scrubbedFields);
     }
-    get validator() {
-        var _a;
-        this._validator = (_a = this._validator) !== null && _a !== void 0 ? _a : new Validator_1.XyoBoundWitnessValidator(this.bw);
-        return this._validator;
-    }
+}
+exports.XyoBoundWitnessWrapper = XyoBoundWitnessWrapper;
+class XyoBoundWitnessWithMetaWrapper extends XyoBoundWitnessWrapper {
     get userAgent() {
         var _a;
         this._userAgent = (_a = this._userAgent) !== null && _a !== void 0 ? _a : new ua_parser_js_1.UAParser(this.bw._user_agent);
         return this._userAgent;
     }
 }
-exports.XyoBoundWitnessWrapper = XyoBoundWitnessWrapper;
+exports.XyoBoundWitnessWithMetaWrapper = XyoBoundWitnessWithMetaWrapper;
 //# sourceMappingURL=Wrapper.js.map

package/dist/cjs/BoundWitness/Wrapper/Wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Wrapper/Wrapper.ts"],"names":[],"mappings":";;;;AAAA,+DAA8B;AAC9B,+CAAuC;AAEvC,yCAAwC;AAExC,4CAAuD;AAEvD,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAA;AAElL,MAAM,sBAAkD,SAAQ,kBAAY;IAE1E,YAAY,EAAK;QACf,KAAK,CAAC,EAAE,CAAC,CAAA;QACT,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACd,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAA,cAAI,EAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;IACtC,CAAC;IAGD,IAAI,SAAS;;QACX,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,oCAAwB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAGD,IAAI,SAAS;;QACX,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,uBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACtE,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;CACF;AAEQ,wDAAsB"}
+{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../../src/BoundWitness/Wrapper/Wrapper.ts"],"names":[],"mappings":";;;;AAAA,+DAA8B;AAC9B,+CAAuC;AAEvC,yCAAwC;AAGxC,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAA;AAElL,MAAa,sBAAkD,SAAQ,kBAAY;IAEjF,YAAY,EAAK;QACf,KAAK,CAAC,EAAE,CAAC,CAAA;QACT,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACd,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAA,cAAI,EAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;IACtC,CAAC;CACF;AAVD,wDAUC;AAED,MAAa,8BAAkE,SAAQ,sBAAyB;IAE9G,IAAI,SAAS;;QACX,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,uBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QACtE,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;CACF;AAND,wEAMC"}

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBase.d.ts

@@ -0,0 +1,9 @@
+import { XyoPayload } from '../../../models';
+export declare type XyoBoundWitnessBase = XyoPayload<{
+    addresses: string[];
+    previous_hash?: string;
+    payload_hashes: string[];
+    payload_schemas: string[];
+    previous_hashes: (string | null)[];
+    schema: string;
+}>;

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBase.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=XyoBoundWitnessBase.js.map

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBase.js.map

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

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBaseSchema.d.ts

@@ -0,0 +1,36 @@
+export declare const XyoBoundWitnessBaseSchema: {
+    $id: string;
+    additionalProperties: boolean;
+    properties: {
+        addresses: {
+            items: {
+                type: string;
+            };
+            type: string;
+        };
+        payload_hashes: {
+            items: {
+                type: string;
+            };
+            type: string;
+        };
+        payload_schemas: {
+            items: {
+                type: string;
+            };
+            type: string;
+        };
+        previous_hashes: {
+            items: {
+                nullable: boolean;
+                type: string;
+            };
+            type: string;
+        };
+        schema: {
+            type: string;
+        };
+    };
+    required: string[];
+    type: string;
+};

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBaseSchema.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XyoBoundWitnessBaseSchema = void 0;
+//Should type as JSONSchemaType<XyoBoundWitnessBody> once ajv/eslint issue is fixed
+//https://github.com/microsoft/TypeScript/issues/44851
+exports.XyoBoundWitnessBaseSchema = {
+    $id: 'https://schemas.xyo.network/2.0/boundwitness/body',
+    additionalProperties: false,
+    properties: {
+        addresses: { items: { type: 'string' }, type: 'array' },
+        payload_hashes: { items: { type: 'string' }, type: 'array' },
+        payload_schemas: { items: { type: 'string' }, type: 'array' },
+        previous_hashes: { items: { nullable: true, type: 'string' }, type: 'array' },
+        schema: { type: 'string' },
+    },
+    required: ['addresses', 'payload_hashes', 'payload_schemas', 'previous_hashes', 'schema'],
+    type: 'object',
+};
+//# sourceMappingURL=XyoBoundWitnessBaseSchema.js.map

package/dist/cjs/BoundWitness/models/Base/XyoBoundWitnessBaseSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoBoundWitnessBaseSchema.js","sourceRoot":"","sources":["../../../../../src/BoundWitness/models/Base/XyoBoundWitnessBaseSchema.ts"],"names":[],"mappings":";;;AAAA,mFAAmF;AACnF,sDAAsD;AACzC,QAAA,yBAAyB,GAAG;IACvC,GAAG,EAAE,mDAAmD;IACxD,oBAAoB,EAAE,KAAK;IAC3B,UAAU,EAAE;QACV,SAAS,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QACvD,cAAc,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QAC5D,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QAC7D,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QAC7E,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC3B;IACD,QAAQ,EAAE,CAAC,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,CAAC;IACzF,IAAI,EAAE,QAAQ;CACf,CAAA"}

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

@@ -0,0 +1,2 @@
+export * from './XyoBoundWitnessBase';
+export * from './XyoBoundWitnessBaseSchema';

package/dist/cjs/BoundWitness/models/Base/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./XyoBoundWitnessBase"), exports);
+tslib_1.__exportStar(require("./XyoBoundWitnessBaseSchema"), exports);
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/BoundWitness/models/Base/index.ts"],"names":[],"mappings":";;;AAAA,gEAAqC;AACrC,sEAA2C"}

package/dist/cjs/BoundWitness/models/Body/XyoBoundWitnessBody.d.ts

@@ -1,11 +1,9 @@
-import { XyoPayloadBody } from '../../../Payload';
-interface XyoBoundWitnessBody extends XyoPayloadBody {
-    [key: string]: unknown;
+import { XyoPayload } from '../../../Payload';
+export declare type XyoBoundWitnessBody = XyoPayload<{
     addresses: string[];
     previous_hash?: string;
     payload_hashes: string[];
     payload_schemas: string[];
     previous_hashes: (string | null)[];
     schema: string;
-}
-export type { XyoBoundWitnessBody };
+}>;

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

@@ -1,13 +1,10 @@
-import { XyoPayloadBody } from '../../../Payload';
-interface XyoBoundWitnessMeta {
-    [key: string]: unknown;
-    _client?: string;
-    _hash?: string;
-    _archive?: string;
-    _payloads?: XyoPayloadBody[];
+import { XyoPayload, XyoPayloadMeta } from '../../../models';
+import { XyoBoundWitness } from '../XyoBoundWitness';
+export declare type XyoBoundWitnessMeta = XyoPayloadMeta<{
+    _payloads?: XyoPayload[];
     _signatures?: string[];
-    _timestamp?: number;
     _source_ip?: string;
     _user_agent?: string;
-}
-export type { XyoBoundWitnessMeta };
+}>;
+export declare type XyoBoundWitnessWithMeta<T = unknown> = T & XyoBoundWitnessMeta & XyoBoundWitness;
+export declare type XyoBoundWitnessWithPartialMeta<T = unknown> = T & Partial<XyoBoundWitnessMeta> & XyoBoundWitness;

package/dist/cjs/BoundWitness/models/WithXyoBoundWitnessMeta.d.ts

@@ -1,4 +1,4 @@
-import { XyoBoundWitnessBody } from './Body';
 import { XyoBoundWitnessMeta } from './Meta';
-declare type WithXyoBoundWitnessMeta<T extends XyoBoundWitnessBody> = T & XyoBoundWitnessMeta;
+import { XyoBoundWitness } from './XyoBoundWitness';
+declare type WithXyoBoundWitnessMeta<T extends XyoBoundWitness> = T & XyoBoundWitnessMeta;
 export type { WithXyoBoundWitnessMeta };

package/dist/cjs/BoundWitness/models/XyoBoundWitness.d.ts

@@ -1,5 +1,2 @@
-import { XyoPayload } from '../../Payload';
-import { XyoBoundWitnessBody } from './Body';
-import { WithXyoBoundWitnessMeta } from './WithXyoBoundWitnessMeta';
-declare type XyoBoundWitness = WithXyoBoundWitnessMeta<XyoBoundWitnessBody & XyoPayload>;
-export type { XyoBoundWitness };
+import { XyoBoundWitnessBase } from './Base';
+export declare type XyoBoundWitness<T extends object = XyoBoundWitnessBase> = T & XyoBoundWitnessBase;

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

@@ -1,4 +1,4 @@
-export * from './Body';
+export * from './Base';
 export * from './Meta';
 export * from './WithXyoBoundWitnessMeta';
 export * from './XyoBoundWitness';

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./Body"), exports);
+tslib_1.__exportStar(require("./Base"), exports);
 tslib_1.__exportStar(require("./Meta"), exports);
 tslib_1.__exportStar(require("./WithXyoBoundWitnessMeta"), exports);
 tslib_1.__exportStar(require("./XyoBoundWitness"), exports);

package/dist/cjs/Hasher/XyoAbstractHasher.d.ts

@@ -1,5 +1,5 @@
-export declare abstract class XyoAbstractHasher<T extends Record<string, unknown>> {
-    protected abstract get obj(): T;
+import { XyoObject } from '../Payload';
+export declare abstract class XyoAbstractHasher<T extends object> extends XyoObject<T> {
     get hashFields(): Record<string, unknown>;
     /** @deprecated use stringified instead */
     sortedStringify(): string;

package/dist/cjs/Hasher/XyoAbstractHasher.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoAbstractHasher = void 0;
 const tslib_1 = require("tslib");
 const sha_js_1 = tslib_1.__importDefault(require("sha.js"));
+const Payload_1 = require("../Payload");
 const removeEmptyFields_1 = require("./removeEmptyFields");
 const removeFields_1 = require("./removeFields");
 const sortFields_1 = require("./sortFields");
-class XyoAbstractHasher {
+class XyoAbstractHasher extends Payload_1.XyoObject {
     get hashFields() {
-        return (0, removeEmptyFields_1.removeEmptyFields)((0, removeFields_1.deepOmitUnderscoreFields)(this.obj));
+        return (0, removeEmptyFields_1.removeEmptyFields)((0, removeFields_1.deepOmitUnderscoreFields)(this.stringKeyObj));
     }
     /** @deprecated use stringified instead */
     sortedStringify() {

package/dist/cjs/Hasher/XyoAbstractHasher.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoAbstractHasher.js","sourceRoot":"","sources":["../../../src/Hasher/XyoAbstractHasher.ts"],"names":[],"mappings":";;;;AAAA,4DAA0B;AAE1B,2DAAuD;AACvD,iDAAyD;AACzD,6CAAyC;AAEzC,MAAsB,iBAAiB;IAGrC,IAAI,UAAU;QACZ,OAAO,IAAA,qCAAiB,EAAC,IAAA,uCAAwB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,0CAA0C;IACnC,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,IAAW,WAAW;QACpB,MAAM,WAAW,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACpC,CAAC;IAED,mCAAmC;IAC5B,UAAU;QACf,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IAEO,cAAc;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAA;QACrC,OAAO,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAA;IACtD,CAAC;CACF;AA9BD,8CA8BC"}
+{"version":3,"file":"XyoAbstractHasher.js","sourceRoot":"","sources":["../../../src/Hasher/XyoAbstractHasher.ts"],"names":[],"mappings":";;;;AAAA,4DAA0B;AAE1B,wCAAsC;AACtC,2DAAuD;AACvD,iDAAyD;AACzD,6CAAyC;AAEzC,MAAsB,iBAAoC,SAAQ,mBAAY;IAC5E,IAAI,UAAU;QACZ,OAAO,IAAA,qCAAiB,EAAC,IAAA,uCAAwB,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,0CAA0C;IACnC,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAED,IAAW,WAAW;QACpB,MAAM,WAAW,GAAG,IAAA,uBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACpC,CAAC;IAED,mCAAmC;IAC5B,UAAU;QACf,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IAEO,cAAc;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAA;QACrC,OAAO,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAA;IACtD,CAAC;CACF;AA5BD,8CA4BC"}