@xyo-network/diviner 2.67.0-rc.1 → 2.67.0-rc.3

package/dist/cjs/IdentityDiviner.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const abstract_diviner_1 = require("@xyo-network/abstract-diviner");
 const module_1 = require("@xyo-network/module");
-let IdentityDiviner = exports.IdentityDiviner = class IdentityDiviner extends abstract_diviner_1.AbstractDirectDiviner {
+let IdentityDiviner = exports.IdentityDiviner = class IdentityDiviner extends abstract_diviner_1.AbstractDiviner {
     divineHandler(payloads) {
         return (0, assert_1.assertEx)(payloads, 'IdentityDiviner requires passed payload');
     }

package/dist/cjs/IdentityDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityDiviner.js","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,oEAAqE;AAGrE,gDAAqD;AAQ9C,IAAM,eAAe,6BAArB,MAAM,eAA+E,SAAQ,wCAA8B;IAG7G,aAAa,CAAC,QAAoB;QACnD,OAAO,IAAA,iBAAQ,EAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IACtE,CAAC;;AAJe,4BAAY,GAAG,kBAAkB,AAArB,CAAqB;0BADtC,eAAe;IAD3B,IAAA,wBAAe,GAAE;GACL,eAAe,CAM3B"}
+{"version":3,"file":"IdentityDiviner.js","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,oEAA+D;AAG/D,gDAAqD;AAQ9C,IAAM,eAAe,6BAArB,MAAM,eAA+E,SAAQ,kCAAwB;IAGvG,aAAa,CAAC,QAAoB;QACnD,OAAO,IAAA,iBAAQ,EAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IACtE,CAAC;;AAJe,4BAAY,GAAG,kBAAkB,AAArB,CAAqB;0BADtC,eAAe;IAD3B,IAAA,wBAAe,GAAE;GACL,eAAe,CAM3B"}

package/dist/cjs/Payload/AbstractPayloadDiviner.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractPayloadDiviner = void 0;
 const abstract_diviner_1 = require("@xyo-network/abstract-diviner");
-class AbstractPayloadDiviner extends abstract_diviner_1.AbstractDirectDiviner {
+class AbstractPayloadDiviner extends abstract_diviner_1.AbstractDiviner {
 }
 exports.AbstractPayloadDiviner = AbstractPayloadDiviner;
 //# sourceMappingURL=AbstractPayloadDiviner.js.map

package/dist/cjs/Payload/AbstractPayloadDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":";;;AAAA,oEAAqE;AAGrE,MAAsB,sBAAgE,SAAQ,wCAAwB;CAAG;AAAzH,wDAAyH"}
+{"version":3,"file":"AbstractPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":";;;AAAA,oEAA+D;AAG/D,MAAsB,sBAAgE,SAAQ,kCAAkB;CAAG;AAAnH,wDAAmH"}

package/dist/cjs/Payload/ArchivistDiviner/Diviner.js

@@ -4,39 +4,25 @@ exports.ArchivistPayloadDiviner = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const archivist_model_1 = require("@xyo-network/archivist-model");
-const archivist_wrapper_1 = require("@xyo-network/archivist-wrapper");
 const huri_1 = require("@xyo-network/huri");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
 const AbstractPayloadDiviner_1 = require("../AbstractPayloadDiviner");
 const HuriPayload_1 = require("../HuriPayload");
 const Config_1 = require("./Config");
 class ArchivistPayloadDiviner extends AbstractPayloadDiviner_1.AbstractPayloadDiviner {
     archivist() {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const configArchivistAddress = (_a = this.config) === null || _a === void 0 ? void 0 : _a.archivist;
-            if (configArchivistAddress) {
-                const resolvedArchivist = configArchivistAddress
-                    ? (_b = (yield this.resolve({ address: [configArchivistAddress] })).shift()) !== null && _b !== void 0 ? _b : null
-                    : null;
-                if (resolvedArchivist) {
-                    return resolvedArchivist ? new archivist_wrapper_1.ArchivistWrapper({ account: this.account, module: resolvedArchivist }) : null;
-                }
-            }
-            return null;
+            return configArchivistAddress ? (0, archivist_model_1.asArchivistInstance)(yield this.resolve(configArchivistAddress), 'Failed to cast resolved archivist') : undefined;
         });
     }
     divineHandler(payloads) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const huriPayloads = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === HuriPayload_1.HuriSchema), () => `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
             const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new huri_1.Huri(huri).hash)).flat();
             const activeArchivist = yield this.archivist();
-            if (activeArchivist) {
-                const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ hashes, schema: archivist_model_1.ArchivistGetQuerySchema });
-                const query = yield this.bindQuery(queryPayload);
-                return (yield activeArchivist.query(query[0], query[1]))[1];
-            }
-            return [];
+            return (_a = (yield (activeArchivist === null || activeArchivist === void 0 ? void 0 : activeArchivist.get(hashes)))) !== null && _a !== void 0 ? _a : [];
         });
     }
 }

package/dist/cjs/Payload/ArchivistDiviner/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kEAA0G;AAC1G,sEAAiE;AAEjE,4CAAwC;AAGxC,kEAA6D;AAE7D,sEAAkE;AAClE,gDAAwD;AACxD,qCAA6F;AAM7F,MAAa,uBAAuE,SAAQ,+CAA+B;IAGzG,SAAS;;;YACvB,MAAM,sBAAsB,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA;YACrD,IAAI,sBAAsB,EAAE;gBAC1B,MAAM,iBAAiB,GAA2B,sBAAsB;oBACtE,CAAC,CAAC,MAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAkC,CAAC,KAAK,EAAE,mCAAI,IAAI;oBAC/G,CAAC,CAAC,IAAI,CAAA;gBACR,IAAI,iBAAiB,EAAE;oBACrB,OAAO,iBAAiB,CAAC,CAAC,CAAC,IAAI,oCAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;iBAC7G;aACF;YACD,OAAO,IAAI,CAAA;;KACZ;IAEe,aAAa,CAAC,QAAoB;;YAChD,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA0B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,wBAAU,CAAC,EACrF,GAAG,EAAE,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;YACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,WAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YAC9C,IAAI,eAAe,EAAE;gBACnB,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,yCAAuB,EAAE,CAAC,CAAA;gBACxG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;gBAChD,OAAO,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;aAC5D;YACD,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;;AA7BH,0DA8BC;AA7BiB,qCAAa,GAAG,CAAC,4CAAmC,CAAC,CAAA"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kEAAqF;AAErF,4CAAwC;AAIxC,sEAAkE;AAClE,gDAAwD;AACxD,qCAA6F;AAM7F,MAAa,uBAAuE,SAAQ,+CAA+B;IAGzG,SAAS;;;YACvB,MAAM,sBAAsB,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA;YACrD,OAAO,sBAAsB,CAAC,CAAC,CAAC,IAAA,qCAAmB,EAAC,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,mCAAmC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;;KACjJ;IAEe,aAAa,CAAC,QAAoB;;;YAChD,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA0B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,wBAAU,CAAC,EACrF,GAAG,EAAE,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;YACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,WAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YAC9C,OAAO,MAAA,CAAC,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,MAAM,CAAC,CAAA,CAAC,mCAAI,EAAE,CAAA;;KAClD;;AAhBH,0DAiBC;AAhBiB,qCAAa,GAAG,CAAC,4CAAmC,CAAC,CAAA"}

package/dist/esm/IdentityDiviner.js

@@ -1,8 +1,8 @@
 import { __decorate } from "tslib";
 import { assertEx } from '@xylabs/assert';
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/abstract-diviner';
 import { creatableModule } from '@xyo-network/module';
-export let IdentityDiviner = class IdentityDiviner extends AbstractDirectDiviner {
+export let IdentityDiviner = class IdentityDiviner extends AbstractDiviner {
     static targetSchema = 'network.xyo.test';
     divineHandler(payloads) {
         return assertEx(payloads, 'IdentityDiviner requires passed payload');

package/dist/esm/IdentityDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityDiviner.js","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAGrE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAQ9C,WAAM,eAAe,GAArB,MAAM,eAA+E,SAAQ,qBAA8B;IAChI,MAAM,CAAU,YAAY,GAAG,kBAAkB,CAAA;IAE9B,aAAa,CAAC,QAAoB;QACnD,OAAO,QAAQ,CAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IACtE,CAAC;;AALU,eAAe;IAD3B,eAAe,EAAE;GACL,eAAe,CAM3B"}
+{"version":3,"file":"IdentityDiviner.js","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAQ9C,WAAM,eAAe,GAArB,MAAM,eAA+E,SAAQ,eAAwB;IAC1H,MAAM,CAAU,YAAY,GAAG,kBAAkB,CAAA;IAE9B,aAAa,CAAC,QAAoB;QACnD,OAAO,QAAQ,CAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IACtE,CAAC;;AALU,eAAe;IAD3B,eAAe,EAAE;GACL,eAAe,CAM3B"}

package/dist/esm/Payload/AbstractPayloadDiviner.js

@@ -1,4 +1,4 @@
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner';
-export class AbstractPayloadDiviner extends AbstractDirectDiviner {
+import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+export class AbstractPayloadDiviner extends AbstractDiviner {
 }
 //# sourceMappingURL=AbstractPayloadDiviner.js.map

package/dist/esm/Payload/AbstractPayloadDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAGrE,MAAM,OAAgB,sBAAgE,SAAQ,qBAAwB;CAAG"}
+{"version":3,"file":"AbstractPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAG/D,MAAM,OAAgB,sBAAgE,SAAQ,eAAkB;CAAG"}

package/dist/esm/Payload/ArchivistDiviner/Diviner.js

@@ -1,8 +1,6 @@
 import { assertEx } from '@xylabs/assert';
-import { ArchivistGetQuerySchema } from '@xyo-network/archivist-model';
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
+import { asArchivistInstance } from '@xyo-network/archivist-model';
 import { Huri } from '@xyo-network/huri';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner';
 import { HuriSchema } from '../HuriPayload';
 import { ArchivistPayloadDivinerConfigSchema } from './Config';
@@ -10,26 +8,13 @@ export class ArchivistPayloadDiviner extends AbstractPayloadDiviner {
     static configSchemas = [ArchivistPayloadDivinerConfigSchema];
     async archivist() {
         const configArchivistAddress = this.config?.archivist;
-        if (configArchivistAddress) {
-            const resolvedArchivist = configArchivistAddress
-                ? (await this.resolve({ address: [configArchivistAddress] })).shift() ?? null
-                : null;
-            if (resolvedArchivist) {
-                return resolvedArchivist ? new ArchivistWrapper({ account: this.account, module: resolvedArchivist }) : null;
-            }
-        }
-        return null;
+        return configArchivistAddress ? asArchivistInstance(await this.resolve(configArchivistAddress), 'Failed to cast resolved archivist') : undefined;
     }
     async divineHandler(payloads) {
         const huriPayloads = assertEx(payloads?.filter((payload) => payload?.schema === HuriSchema), () => `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
         const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri).hash)).flat();
         const activeArchivist = await this.archivist();
-        if (activeArchivist) {
-            const queryPayload = PayloadWrapper.wrap({ hashes, schema: ArchivistGetQuerySchema });
-            const query = await this.bindQuery(queryPayload);
-            return (await activeArchivist.query(query[0], query[1]))[1];
-        }
-        return [];
+        return (await activeArchivist?.get(hashes)) ?? [];
     }
 }
 //# sourceMappingURL=Diviner.js.map

package/dist/esm/Payload/ArchivistDiviner/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAqB,uBAAuB,EAAmB,MAAM,8BAA8B,CAAA;AAC1G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAe,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAiC,mCAAmC,EAAE,MAAM,UAAU,CAAA;AAM7F,MAAM,OAAO,uBAAuE,SAAQ,sBAA+B;IACzH,MAAM,CAAU,aAAa,GAAG,CAAC,mCAAmC,CAAC,CAAA;IAE3D,KAAK,CAAC,SAAS;QACvB,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;QACrD,IAAI,sBAAsB,EAAE;YAC1B,MAAM,iBAAiB,GAA2B,sBAAsB;gBACtE,CAAC,CAAE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAkC,CAAC,KAAK,EAAE,IAAI,IAAI;gBAC/G,CAAC,CAAC,IAAI,CAAA;YACR,IAAI,iBAAiB,EAAE;gBACrB,OAAO,iBAAiB,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;aAC7G;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,QAAoB;QAChD,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA0B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,UAAU,CAAC,EACrF,GAAG,EAAE,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC5G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAC9C,IAAI,eAAe,EAAE;YACnB,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAA;YACxG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;YAChD,OAAO,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QACD,OAAO,EAAE,CAAA;IACX,CAAC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAqB,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAErF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAIxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAe,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAiC,mCAAmC,EAAE,MAAM,UAAU,CAAA;AAM7F,MAAM,OAAO,uBAAuE,SAAQ,sBAA+B;IACzH,MAAM,CAAU,aAAa,GAAG,CAAC,mCAAmC,CAAC,CAAA;IAE3D,KAAK,CAAC,SAAS;QACvB,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;QACrD,OAAO,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,mCAAmC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAClJ,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,QAAoB;QAChD,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA0B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,UAAU,CAAC,EACrF,GAAG,EAAE,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACxE,CAAA;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC5G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAC9C,OAAO,CAAC,MAAM,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;IACnD,CAAC"}

package/dist/types/IdentityDiviner.d.ts

@@ -1,11 +1,11 @@
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/abstract-diviner';
 import { ArchivistParams } from '@xyo-network/archivist-model';
 import { DivinerConfig } from '@xyo-network/diviner-model';
 import { AnyConfigSchema } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 export type IdentityDivinerParams<TConfig extends AnyConfigSchema<DivinerConfig> = AnyConfigSchema<DivinerConfig>> = ArchivistParams<TConfig>;
-export declare class IdentityDiviner<TParams extends IdentityDivinerParams = IdentityDivinerParams> extends AbstractDirectDiviner<TParams> {
+export declare class IdentityDiviner<TParams extends IdentityDivinerParams = IdentityDivinerParams> extends AbstractDiviner<TParams> {
     static targetSchema: string;
     protected divineHandler(payloads?: Payload[]): Promisable<Payload[]>;
 }

package/dist/types/IdentityDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityDiviner.d.ts","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE7I,qBACa,eAAe,CAAC,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,CAAE,SAAQ,qBAAqB,CAAC,OAAO,CAAC;IAChI,OAAgB,YAAY,SAAqB;cAE9B,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAG9E"}
+{"version":3,"file":"IdentityDiviner.d.ts","sourceRoot":"","sources":["../../src/IdentityDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE7I,qBACa,eAAe,CAAC,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC1H,OAAgB,YAAY,SAAqB;cAE9B,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAG9E"}

package/dist/types/Payload/AbstractPayloadDiviner.d.ts

@@ -1,5 +1,5 @@
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/abstract-diviner';
 import { DivinerParams } from '@xyo-network/diviner-model';
-export declare abstract class AbstractPayloadDiviner<P extends DivinerParams = DivinerParams> extends AbstractDirectDiviner<P> {
+export declare abstract class AbstractPayloadDiviner<P extends DivinerParams = DivinerParams> extends AbstractDiviner<P> {
 }
 //# sourceMappingURL=AbstractPayloadDiviner.d.ts.map

package/dist/types/Payload/AbstractPayloadDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,8BAAsB,sBAAsB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,qBAAqB,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"AbstractPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/AbstractPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,8BAAsB,sBAAsB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;CAAG"}

package/dist/types/Payload/ArchivistDiviner/Diviner.d.ts

@@ -1,4 +1,4 @@
-import { ArchivistModule } from '@xyo-network/archivist-model';
+import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { DivinerParams } from '@xyo-network/diviner-model';
 import { AnyConfigSchema } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
@@ -7,7 +7,7 @@ import { ArchivistPayloadDivinerConfig } from './Config';
 export type ArchivistPayloadDivinerParams<TConfig extends AnyConfigSchema<ArchivistPayloadDivinerConfig> = AnyConfigSchema<ArchivistPayloadDivinerConfig>> = DivinerParams<TConfig>;
 export declare class ArchivistPayloadDiviner<TParams extends ArchivistPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
     static configSchemas: "network.xyo.diviner.payload.archivist.config"[];
-    protected archivist(): Promise<ArchivistModule | null>;
+    protected archivist(): Promise<ArchivistInstance | undefined>;
     protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/types/Payload/ArchivistDiviner/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAA8C,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE1G,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,6BAA6B,EAAuC,MAAM,UAAU,CAAA;AAE7F,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,eAAe,CAAC,6BAA6B,CAAC,GAAG,eAAe,CAAC,6BAA6B,CAAC,IAC7G,aAAa,CAAC,OAAO,CAAC,CAAA;AAE1B,qBAAa,uBAAuB,CAAC,OAAO,SAAS,6BAA6B,CAAE,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACzH,OAAgB,aAAa,mDAAwC;cAErD,SAAS,IAAI,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;cAa5C,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAcxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/ArchivistDiviner/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,6BAA6B,EAAuC,MAAM,UAAU,CAAA;AAE7F,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,eAAe,CAAC,6BAA6B,CAAC,GAAG,eAAe,CAAC,6BAA6B,CAAC,IAC7G,aAAa,CAAC,OAAO,CAAC,CAAA;AAE1B,qBAAa,uBAAuB,CAAC,OAAO,SAAS,6BAA6B,CAAE,SAAQ,sBAAsB,CAAC,OAAO,CAAC;IACzH,OAAgB,aAAa,mDAAwC;cAErD,SAAS,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;cAKnD,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CASxE"}

package/package.json

@@ -12,17 +12,15 @@
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
     "@xylabs/promise": "^2.9.3",
-    "@xyo-network/abstract-diviner": "~2.67.0-rc.1",
-    "@xyo-network/archivist-model": "~2.67.0-rc.1",
-    "@xyo-network/archivist-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/diviner-model": "~2.67.0-rc.1",
-    "@xyo-network/diviner-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/huri": "~2.67.0-rc.1",
-    "@xyo-network/module": "~2.67.0-rc.1",
-    "@xyo-network/module-model": "~2.67.0-rc.1",
-    "@xyo-network/payload-model": "~2.67.0-rc.1",
-    "@xyo-network/payload-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/promise": "~2.67.0-rc.1",
+    "@xyo-network/abstract-diviner": "~2.67.0-rc.3",
+    "@xyo-network/archivist-model": "~2.67.0-rc.3",
+    "@xyo-network/diviner-model": "~2.67.0-rc.3",
+    "@xyo-network/diviner-wrapper": "~2.67.0-rc.3",
+    "@xyo-network/huri": "~2.67.0-rc.3",
+    "@xyo-network/module": "~2.67.0-rc.3",
+    "@xyo-network/module-model": "~2.67.0-rc.3",
+    "@xyo-network/payload-model": "~2.67.0-rc.3",
+    "@xyo-network/promise": "~2.67.0-rc.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -64,6 +62,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.67.0-rc.1",
+  "version": "2.67.0-rc.3",
   "stableVersion": "2.66.9"
 }

package/src/IdentityDiviner.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/assert'
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner'
+import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { ArchivistParams } from '@xyo-network/archivist-model'
 import { DivinerConfig } from '@xyo-network/diviner-model'
 import { creatableModule } from '@xyo-network/module'
@@ -10,7 +10,7 @@ import { Promisable } from '@xyo-network/promise'
 export type IdentityDivinerParams<TConfig extends AnyConfigSchema<DivinerConfig> = AnyConfigSchema<DivinerConfig>> = ArchivistParams<TConfig>
 
 @creatableModule()
-export class IdentityDiviner<TParams extends IdentityDivinerParams = IdentityDivinerParams> extends AbstractDirectDiviner<TParams> {
+export class IdentityDiviner<TParams extends IdentityDivinerParams = IdentityDivinerParams> extends AbstractDiviner<TParams> {
   static override targetSchema = 'network.xyo.test'
 
   protected override divineHandler(payloads?: Payload[]): Promisable<Payload[]> {

package/src/Payload/AbstractPayloadDiviner.ts

@@ -1,4 +1,4 @@
-import { AbstractDirectDiviner } from '@xyo-network/abstract-diviner'
+import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { DivinerParams } from '@xyo-network/diviner-model'
 
-export abstract class AbstractPayloadDiviner<P extends DivinerParams = DivinerParams> extends AbstractDirectDiviner<P> {}
+export abstract class AbstractPayloadDiviner<P extends DivinerParams = DivinerParams> extends AbstractDiviner<P> {}

package/src/Payload/ArchivistDiviner/Diviner.ts

@@ -1,11 +1,9 @@
 import { assertEx } from '@xylabs/assert'
-import { ArchivistGetQuery, ArchivistGetQuerySchema, ArchivistModule } from '@xyo-network/archivist-model'
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
+import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
 import { DivinerParams } from '@xyo-network/diviner-model'
 import { Huri } from '@xyo-network/huri'
 import { AnyConfigSchema } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner'
 import { HuriPayload, HuriSchema } from '../HuriPayload'
@@ -18,17 +16,9 @@ export type ArchivistPayloadDivinerParams<
 export class ArchivistPayloadDiviner<TParams extends ArchivistPayloadDivinerParams> extends AbstractPayloadDiviner<TParams> {
   static override configSchemas = [ArchivistPayloadDivinerConfigSchema]
 
-  protected async archivist(): Promise<ArchivistModule | null> {
+  protected async archivist(): Promise<ArchivistInstance | undefined> {
     const configArchivistAddress = this.config?.archivist
-    if (configArchivistAddress) {
-      const resolvedArchivist: ArchivistModule | null = configArchivistAddress
-        ? ((await this.resolve({ address: [configArchivistAddress] })) as unknown as ArchivistModule[]).shift() ?? null
-        : null
-      if (resolvedArchivist) {
-        return resolvedArchivist ? new ArchivistWrapper({ account: this.account, module: resolvedArchivist }) : null
-      }
-    }
-    return null
+    return configArchivistAddress ? asArchivistInstance(await this.resolve(configArchivistAddress), 'Failed to cast resolved archivist') : undefined
   }
 
   protected async divineHandler(payloads?: Payload[]): Promise<Payload[]> {
@@ -38,11 +28,6 @@ export class ArchivistPayloadDiviner<TParams extends ArchivistPayloadDivinerPara
     )
     const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri).hash)).flat()
     const activeArchivist = await this.archivist()
-    if (activeArchivist) {
-      const queryPayload = PayloadWrapper.wrap<ArchivistGetQuery>({ hashes, schema: ArchivistGetQuerySchema })
-      const query = await this.bindQuery(queryPayload)
-      return (await activeArchivist.query(query[0], query[1]))[1]
-    }
-    return []
+    return (await activeArchivist?.get(hashes)) ?? []
   }
 }