@xyo-network/archivist-wrapper 2.66.8 → 2.67.0-rc.1

package/dist/cjs/ArchivistWrapper.js

@@ -1,12 +1,70 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArchivistWrapper = void 0;
+const tslib_1 = require("tslib");
 const archivist_model_1 = require("@xyo-network/archivist-model");
-const IndirectArchivistWrapper_1 = require("./IndirectArchivistWrapper");
-/** @deprecated use DirectArchivistWrapper or IndirectArchivistWrapper instead */
-class ArchivistWrapper extends IndirectArchivistWrapper_1.IndirectArchivistWrapper {
+const boundwitness_model_1 = require("@xyo-network/boundwitness-model");
+const core_1 = require("@xyo-network/core");
+const module_wrapper_1 = require("@xyo-network/module-wrapper");
+const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
+const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
+(0, module_wrapper_1.constructableModuleWrapper)();
+class ArchivistWrapper extends (_b = module_wrapper_1.ModuleWrapper) {
+    all() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistAllQuerySchema });
+            const result = yield this.sendQuery(queryPayload);
+            return (0, compact_1.default)(result);
+        });
+    }
+    clear() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistClearQuerySchema });
+            yield this.sendQuery(queryPayload);
+        });
+    }
+    commit() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistCommitQuerySchema });
+            const result = yield this.sendQuery(queryPayload);
+            return result.filter(boundwitness_model_1.isBoundWitnessPayload);
+        });
+    }
+    delete(hashes) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ hashes, schema: archivist_model_1.ArchivistDeleteQuerySchema });
+            const query = yield this.bindQuery(queryPayload);
+            const result = yield this.module.query(query[0], query[1]);
+            yield this.throwErrors(query, result);
+            return result[0].payload_hashes.map(() => true);
+        });
+    }
+    get(hashes) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ hashes, schema: archivist_model_1.ArchivistGetQuerySchema });
+            const result = yield this.sendQuery(queryPayload);
+            return result;
+        });
+    }
+    insert(payloads) {
+        var _c, _d;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({
+                payloads: yield core_1.PayloadHasher.hashes(payloads),
+                schema: archivist_model_1.ArchivistInsertQuerySchema,
+            });
+            const query = yield this.bindQuery(queryPayload, payloads);
+            const result = yield this.module.query(query[0], [queryPayload.payload(), ...payloads]);
+            const innerBoundWitnesses = (_d = (_c = result[1]) === null || _c === void 0 ? void 0 : _c.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === boundwitness_model_1.BoundWitnessSchema)) !== null && _d !== void 0 ? _d : [];
+            yield this.throwErrors(query, result);
+            return [result[0], ...innerBoundWitnesses];
+        });
+    }
 }
 exports.ArchivistWrapper = ArchivistWrapper;
+_a = ArchivistWrapper;
 ArchivistWrapper.instanceIdentityCheck = archivist_model_1.isArchivistInstance;
 ArchivistWrapper.moduleIdentityCheck = archivist_model_1.isArchivistModule;
+ArchivistWrapper.requiredQueries = [archivist_model_1.ArchivistGetQuerySchema, ...Reflect.get(_b, "requiredQueries", _a)];
 //# sourceMappingURL=ArchivistWrapper.js.map

package/dist/cjs/ArchivistWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArchivistWrapper.js","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":";;;AAAA,kEAAsG;AAEtG,yEAAqE;AACrE,iFAAiF;AACjF,MAAa,gBACX,SAAQ,mDAAwC;;AADlD,4CAMC;AAFiB,sCAAqB,GAAG,qCAAmB,CAAA;AAC3C,oCAAmB,GAAG,mCAAiB,CAAA"}
+{"version":3,"file":"ArchivistWrapper.js","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":"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"}

package/dist/cjs/index.js

@@ -2,6 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./ArchivistWrapper"), exports);
-tslib_1.__exportStar(require("./DirectArchivistWrapper"), exports);
-tslib_1.__exportStar(require("./IndirectArchivistWrapper"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,mEAAwC;AACxC,qEAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC"}

package/dist/esm/ArchivistWrapper.js

@@ -1,8 +1,50 @@
-import { isArchivistInstance, isArchivistModule } from '@xyo-network/archivist-model';
-import { IndirectArchivistWrapper } from './IndirectArchivistWrapper';
-/** @deprecated use DirectArchivistWrapper or IndirectArchivistWrapper instead */
-export class ArchivistWrapper extends IndirectArchivistWrapper {
+import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistGetQuerySchema, ArchivistInsertQuerySchema, isArchivistInstance, isArchivistModule, } from '@xyo-network/archivist-model';
+import { BoundWitnessSchema, isBoundWitnessPayload } from '@xyo-network/boundwitness-model';
+import { PayloadHasher } from '@xyo-network/core';
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper';
+import { PayloadWrapper } from '@xyo-network/payload-wrapper';
+import compact from 'lodash/compact';
+constructableModuleWrapper();
+export class ArchivistWrapper extends ModuleWrapper {
     static instanceIdentityCheck = isArchivistInstance;
     static moduleIdentityCheck = isArchivistModule;
+    static requiredQueries = [ArchivistGetQuerySchema, ...super.requiredQueries];
+    async all() {
+        const queryPayload = PayloadWrapper.wrap({ schema: ArchivistAllQuerySchema });
+        const result = await this.sendQuery(queryPayload);
+        return compact(result);
+    }
+    async clear() {
+        const queryPayload = PayloadWrapper.wrap({ schema: ArchivistClearQuerySchema });
+        await this.sendQuery(queryPayload);
+    }
+    async commit() {
+        const queryPayload = PayloadWrapper.wrap({ schema: ArchivistCommitQuerySchema });
+        const result = await this.sendQuery(queryPayload);
+        return result.filter(isBoundWitnessPayload);
+    }
+    async delete(hashes) {
+        const queryPayload = PayloadWrapper.wrap({ hashes, schema: ArchivistDeleteQuerySchema });
+        const query = await this.bindQuery(queryPayload);
+        const result = await this.module.query(query[0], query[1]);
+        await this.throwErrors(query, result);
+        return result[0].payload_hashes.map(() => true);
+    }
+    async get(hashes) {
+        const queryPayload = PayloadWrapper.wrap({ hashes, schema: ArchivistGetQuerySchema });
+        const result = await this.sendQuery(queryPayload);
+        return result;
+    }
+    async insert(payloads) {
+        const queryPayload = PayloadWrapper.wrap({
+            payloads: await PayloadHasher.hashes(payloads),
+            schema: ArchivistInsertQuerySchema,
+        });
+        const query = await this.bindQuery(queryPayload, payloads);
+        const result = await this.module.query(query[0], [queryPayload.payload(), ...payloads]);
+        const innerBoundWitnesses = result[1]?.filter((payload) => payload?.schema === BoundWitnessSchema) ?? [];
+        await this.throwErrors(query, result);
+        return [result[0], ...innerBoundWitnesses];
+    }
 }
 //# sourceMappingURL=ArchivistWrapper.js.map

package/dist/esm/ArchivistWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArchivistWrapper.js","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAEtG,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,iFAAiF;AACjF,MAAM,OAAO,gBACX,SAAQ,wBAAwC;IAGhD,MAAM,CAAU,qBAAqB,GAAG,mBAAmB,CAAA;IAC3D,MAAM,CAAU,mBAAmB,GAAG,iBAAiB,CAAA"}
+{"version":3,"file":"ArchivistWrapper.js","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -1,4 +1,2 @@
 export * from './ArchivistWrapper';
-export * from './DirectArchivistWrapper';
-export * from './IndirectArchivistWrapper';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}

package/dist/types/ArchivistWrapper.d.ts

@@ -1,8 +1,16 @@
-import { ArchivistModule } from '@xyo-network/archivist-model';
-import { IndirectArchivistWrapper } from './IndirectArchivistWrapper';
-/** @deprecated use DirectArchivistWrapper or IndirectArchivistWrapper instead */
-export declare class ArchivistWrapper<TWrappedModule extends ArchivistModule = ArchivistModule> extends IndirectArchivistWrapper<TWrappedModule> implements ArchivistModule<TWrappedModule['params']> {
-    static instanceIdentityCheck: import("@xyo-network/module-model").InstanceTypeCheck<import("@xyo-network/archivist-model").ArchivistInstance>;
+import { ArchivistInstance, ArchivistModule } from '@xyo-network/archivist-model';
+import { BoundWitness } from '@xyo-network/boundwitness-model';
+import { ModuleWrapper } from '@xyo-network/module-wrapper';
+import { Payload } from '@xyo-network/payload-model';
+export declare class ArchivistWrapper<TWrappedModule extends ArchivistModule = ArchivistModule> extends ModuleWrapper<TWrappedModule> implements ArchivistInstance<TWrappedModule['params']> {
+    static instanceIdentityCheck: import("@xyo-network/module-model").ObjectTypeCheck<ArchivistInstance>;
     static moduleIdentityCheck: import("@xyo-network/module-model").ModuleTypeCheck<ArchivistModule>;
+    static requiredQueries: string[];
+    all(): Promise<Payload[]>;
+    clear(): Promise<void>;
+    commit(): Promise<BoundWitness[]>;
+    delete(hashes: string[]): Promise<boolean[]>;
+    get(hashes: string[]): Promise<Payload[]>;
+    insert(payloads: Payload[]): Promise<BoundWitness[]>;
 }
 //# sourceMappingURL=ArchivistWrapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArchivistWrapper.d.ts","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0C,MAAM,8BAA8B,CAAA;AAEtG,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,iFAAiF;AACjF,qBAAa,gBAAgB,CAAC,cAAc,SAAS,eAAe,GAAG,eAAe,CACpF,SAAQ,wBAAwB,CAAC,cAAc,CAC/C,YAAW,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEpD,OAAgB,qBAAqB,kHAAsB;IAC3D,OAAgB,mBAAmB,uEAAoB;CACxD"}
+{"version":3,"file":"ArchivistWrapper.d.ts","sourceRoot":"","sources":["../../src/ArchivistWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAaL,iBAAiB,EACjB,eAAe,EAGhB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAA6C,MAAM,iCAAiC,CAAA;AAEzG,OAAO,EAA8B,aAAa,EAAE,MAAM,6BAA6B,CAAA;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAKpD,qBAAa,gBAAgB,CAAC,cAAc,SAAS,eAAe,GAAG,eAAe,CACpF,SAAQ,aAAa,CAAC,cAAc,CACpC,YAAW,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEtD,OAAgB,qBAAqB,yEAAsB;IAC3D,OAAgB,mBAAmB,uEAAoB;IACvD,OAAgB,eAAe,WAAsD;IAE/E,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAMzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,MAAM,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAMjC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;IAQvB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAMzC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAW3D"}

package/dist/types/index.d.ts

@@ -1,4 +1,2 @@
 export * from './ArchivistWrapper';
-export * from './DirectArchivistWrapper';
-export * from './IndirectArchivistWrapper';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}

package/package.json

@@ -9,20 +9,19 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.9.3",
-    "@xyo-network/archivist-model": "~2.66.8",
-    "@xyo-network/boundwitness-model": "~2.66.8",
-    "@xyo-network/core": "~2.66.8",
-    "@xyo-network/module-wrapper": "~2.66.8",
-    "@xyo-network/payload-model": "~2.66.8",
-    "@xyo-network/payload-wrapper": "~2.66.8",
+    "@xyo-network/archivist-model": "~2.67.0-rc.1",
+    "@xyo-network/boundwitness-model": "~2.67.0-rc.1",
+    "@xyo-network/core": "~2.67.0-rc.1",
+    "@xyo-network/module-wrapper": "~2.67.0-rc.1",
+    "@xyo-network/payload-model": "~2.67.0-rc.1",
+    "@xyo-network/payload-wrapper": "~2.67.0-rc.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.195",
-    "@xylabs/ts-scripts-yarn3": "^2.18.11",
-    "@xylabs/tsconfig": "^2.18.11",
-    "@xyo-network/memory-archivist": "~2.66.8",
+    "@xylabs/ts-scripts-yarn3": "^2.19.0",
+    "@xylabs/tsconfig": "^2.19.0",
+    "@xyo-network/memory-archivist": "~2.67.0-rc.1",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -59,5 +58,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.66.8"
+  "version": "2.67.0-rc.1",
+  "stableVersion": "2.66.9"
 }

package/src/ArchivistWrapper.ts

@@ -1,11 +1,77 @@
-import { ArchivistModule, isArchivistInstance, isArchivistModule } from '@xyo-network/archivist-model'
+import {
+  ArchivistAllQuery,
+  ArchivistAllQuerySchema,
+  ArchivistClearQuery,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuery,
+  ArchivistCommitQuerySchema,
+  ArchivistDeleteQuery,
+  ArchivistDeleteQuerySchema,
+  ArchivistGetQuery,
+  ArchivistGetQuerySchema,
+  ArchivistInsertQuery,
+  ArchivistInsertQuerySchema,
+  ArchivistInstance,
+  ArchivistModule,
+  isArchivistInstance,
+  isArchivistModule,
+} from '@xyo-network/archivist-model'
+import { BoundWitness, BoundWitnessSchema, isBoundWitnessPayload } from '@xyo-network/boundwitness-model'
+import { PayloadHasher } from '@xyo-network/core'
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'
+import { Payload } from '@xyo-network/payload-model'
+import { PayloadWrapper } from '@xyo-network/payload-wrapper'
+import compact from 'lodash/compact'
 
-import { IndirectArchivistWrapper } from './IndirectArchivistWrapper'
-/** @deprecated use DirectArchivistWrapper or IndirectArchivistWrapper instead */
+constructableModuleWrapper()
 export class ArchivistWrapper<TWrappedModule extends ArchivistModule = ArchivistModule>
-  extends IndirectArchivistWrapper<TWrappedModule>
-  implements ArchivistModule<TWrappedModule['params']>
+  extends ModuleWrapper<TWrappedModule>
+  implements ArchivistInstance<TWrappedModule['params']>
 {
   static override instanceIdentityCheck = isArchivistInstance
   static override moduleIdentityCheck = isArchivistModule
+  static override requiredQueries = [ArchivistGetQuerySchema, ...super.requiredQueries]
+
+  async all(): Promise<Payload[]> {
+    const queryPayload = PayloadWrapper.wrap<ArchivistAllQuery>({ schema: ArchivistAllQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return compact(result)
+  }
+
+  async clear(): Promise<void> {
+    const queryPayload = PayloadWrapper.wrap<ArchivistClearQuery>({ schema: ArchivistClearQuerySchema })
+    await this.sendQuery(queryPayload)
+  }
+
+  async commit(): Promise<BoundWitness[]> {
+    const queryPayload = PayloadWrapper.wrap<ArchivistCommitQuery>({ schema: ArchivistCommitQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return result.filter(isBoundWitnessPayload)
+  }
+
+  async delete(hashes: string[]) {
+    const queryPayload = PayloadWrapper.wrap<ArchivistDeleteQuery>({ hashes, schema: ArchivistDeleteQuerySchema })
+    const query = await this.bindQuery(queryPayload)
+    const result = await this.module.query(query[0], query[1])
+    await this.throwErrors(query, result)
+    return result[0].payload_hashes.map(() => true)
+  }
+
+  async get(hashes: string[]): Promise<Payload[]> {
+    const queryPayload = PayloadWrapper.wrap<ArchivistGetQuery>({ hashes, schema: ArchivistGetQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return result
+  }
+
+  async insert(payloads: Payload[]): Promise<BoundWitness[]> {
+    const queryPayload = PayloadWrapper.wrap<ArchivistInsertQuery>({
+      payloads: await PayloadHasher.hashes(payloads),
+      schema: ArchivistInsertQuerySchema,
+    })
+    const query = await this.bindQuery(queryPayload, payloads)
+    const result = await this.module.query(query[0], [queryPayload.payload(), ...payloads])
+    const innerBoundWitnesses = result[1]?.filter<BoundWitness>((payload): payload is BoundWitness => payload?.schema === BoundWitnessSchema) ?? []
+    await this.throwErrors(query, result)
+    return [result[0], ...innerBoundWitnesses]
+  }
 }

package/src/index.ts

@@ -1,3 +1 @@
 export * from './ArchivistWrapper'
-export * from './DirectArchivistWrapper'
-export * from './IndirectArchivistWrapper'

package/dist/cjs/DirectArchivistWrapper.js

@@ -1,91 +0,0 @@
-"use strict";
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DirectArchivistWrapper = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = require("@xylabs/assert");
-const archivist_model_1 = require("@xyo-network/archivist-model");
-const module_wrapper_1 = require("@xyo-network/module-wrapper");
-const IndirectArchivistWrapper_1 = require("./IndirectArchivistWrapper");
-(0, module_wrapper_1.constructableModuleWrapper)();
-class DirectArchivistWrapper extends (_b = IndirectArchivistWrapper_1.IndirectArchivistWrapper) {
-    all() {
-        const _super = Object.create(null, {
-            all: { get: () => super.all }
-        });
-        var _c, _d, _e;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                (0, assert_1.assertEx)(this.module.all, 'Archivist does not support all');
-                return (_e = (yield ((_d = (_c = this.module).all) === null || _d === void 0 ? void 0 : _d.call(_c)))) !== null && _e !== void 0 ? _e : [];
-            }
-            return yield _super.all.call(this);
-        });
-    }
-    clear() {
-        const _super = Object.create(null, {
-            clear: { get: () => super.clear }
-        });
-        var _c, _d;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                (0, assert_1.assertEx)(this.module.clear, 'Archivist does not support clear');
-                return yield ((_d = (_c = this.module).clear) === null || _d === void 0 ? void 0 : _d.call(_c));
-            }
-            return yield _super.clear.call(this);
-        });
-    }
-    commit() {
-        const _super = Object.create(null, {
-            commit: { get: () => super.commit }
-        });
-        var _c, _d, _e;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                (0, assert_1.assertEx)(this.module.commit, 'Archivist does not support commit');
-                return (_e = (yield ((_d = (_c = this.module).commit) === null || _d === void 0 ? void 0 : _d.call(_c)))) !== null && _e !== void 0 ? _e : [];
-            }
-            return yield _super.commit.call(this);
-        });
-    }
-    delete(hashes) {
-        const _super = Object.create(null, {
-            delete: { get: () => super.delete }
-        });
-        var _c, _d, _e;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                (0, assert_1.assertEx)(this.module.delete, 'Archivist does not support delete');
-                return (_e = (yield ((_d = (_c = this.module).delete) === null || _d === void 0 ? void 0 : _d.call(_c, hashes)))) !== null && _e !== void 0 ? _e : [];
-            }
-            return yield _super.delete.call(this, hashes);
-        });
-    }
-    get(hashes) {
-        const _super = Object.create(null, {
-            get: { get: () => super.get }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                return yield this.module.get(hashes);
-            }
-            return yield _super.get.call(this, hashes);
-        });
-    }
-    insert(payloads) {
-        const _super = Object.create(null, {
-            insert: { get: () => super.insert }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if ((0, archivist_model_1.isArchivistInstance)(this.module)) {
-                (0, assert_1.assertEx)(this.module.insert, 'Archivist does not support insert');
-                return yield this.module.insert(payloads);
-            }
-            return yield _super.insert.call(this, payloads);
-        });
-    }
-}
-exports.DirectArchivistWrapper = DirectArchivistWrapper;
-_a = DirectArchivistWrapper;
-DirectArchivistWrapper.requiredQueries = [archivist_model_1.ArchivistGetQuerySchema, ...Reflect.get(_b, "requiredQueries", _a)];
-//# sourceMappingURL=DirectArchivistWrapper.js.map

package/dist/cjs/DirectArchivistWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DirectArchivistWrapper.js","sourceRoot":"","sources":["../../src/DirectArchivistWrapper.ts"],"names":[],"mappings":";;;;;AAAA,2CAAyC;AACzC,kEAA+H;AAE/H,gEAAwE;AAGxE,yEAAqE;AAErE,IAAA,2CAA0B,GAAE,CAAA;AAC5B,MAAa,sBACX,SAAQ,MAAA,mDAAwB,CAAgB;IAKjC,GAAG;;;;;;YAChB,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,gCAAgC,CAAC,CAAA;gBAC3D,OAAO,MAAA,CAAC,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,EAAC,GAAG,kDAAI,CAAA,CAAC,mCAAI,EAAE,CAAA;aACzC;YACD,OAAO,MAAM,OAAM,GAAG,WAAE,CAAA;;KACzB;IAEc,KAAK;;;;;;YAClB,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,kCAAkC,CAAC,CAAA;gBAC/D,OAAO,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,EAAC,KAAK,kDAAI,CAAA,CAAA;aACnC;YACD,OAAO,MAAM,OAAM,KAAK,WAAE,CAAA;;KAC3B;IAEc,MAAM;;;;;;YACnB,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAA;gBACjE,OAAO,MAAA,CAAC,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,EAAC,MAAM,kDAAI,CAAA,CAAC,mCAAI,EAAE,CAAA;aAC5C;YACD,OAAO,MAAM,OAAM,MAAM,WAAE,CAAA;;KAC5B;IAEc,MAAM,CAAC,MAAgB;;;;;;YACpC,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAA;gBACjE,OAAO,MAAA,CAAC,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,EAAC,MAAM,mDAAG,MAAM,CAAC,CAAA,CAAC,mCAAI,EAAE,CAAA;aAClD;YACD,OAAO,MAAM,OAAM,MAAM,YAAC,MAAM,CAAC,CAAA;;KAClC;IAEc,GAAG,CAAC,MAAgB;;;;;YACjC,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;aACrC;YACD,OAAO,MAAM,OAAM,GAAG,YAAC,MAAM,CAAC,CAAA;QAChC,CAAC;KAAA;IAEc,MAAM,CAAC,QAAmB;;;;;YACvC,IAAI,IAAA,qCAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACpC,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAA;gBACjE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;aAC1C;YACD,OAAO,MAAM,OAAM,MAAM,YAAC,QAAQ,CAAC,CAAA;QACrC,CAAC;KAAA;;AAnDH,wDAoDC;;AAhDiB,sCAAe,GAAG,CAAC,yCAAuB,EAAE,GAAG,sCAAqB,CAAC,AAAtD,CAAsD"}

package/dist/cjs/IndirectArchivistWrapper.js

@@ -1,68 +0,0 @@
-"use strict";
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndirectArchivistWrapper = void 0;
-const tslib_1 = require("tslib");
-const archivist_model_1 = require("@xyo-network/archivist-model");
-const boundwitness_model_1 = require("@xyo-network/boundwitness-model");
-const core_1 = require("@xyo-network/core");
-const module_wrapper_1 = require("@xyo-network/module-wrapper");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
-const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
-(0, module_wrapper_1.constructableModuleWrapper)();
-class IndirectArchivistWrapper extends (_b = module_wrapper_1.ModuleWrapper) {
-    all() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistAllQuerySchema });
-            const result = yield this.sendQuery(queryPayload);
-            return (0, compact_1.default)(result);
-        });
-    }
-    clear() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistClearQuerySchema });
-            yield this.sendQuery(queryPayload);
-        });
-    }
-    commit() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: archivist_model_1.ArchivistCommitQuerySchema });
-            const result = yield this.sendQuery(queryPayload);
-            return result.filter(boundwitness_model_1.isBoundWitnessPayload);
-        });
-    }
-    delete(hashes) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ hashes, schema: archivist_model_1.ArchivistDeleteQuerySchema });
-            const query = yield this.bindQuery(queryPayload);
-            const result = yield this.module.query(query[0], query[1]);
-            yield this.throwErrors(query, result);
-            return result[0].payload_hashes.map(() => true);
-        });
-    }
-    get(hashes) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ hashes, schema: archivist_model_1.ArchivistGetQuerySchema });
-            const result = yield this.sendQuery(queryPayload);
-            return result;
-        });
-    }
-    insert(payloads) {
-        var _c, _d;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({
-                payloads: yield core_1.PayloadHasher.hashes(payloads),
-                schema: archivist_model_1.ArchivistInsertQuerySchema,
-            });
-            const query = yield this.bindQuery(queryPayload, payloads);
-            const result = yield this.module.query(query[0], [queryPayload.payload(), ...payloads]);
-            const innerBoundWitnesses = (_d = (_c = result[1]) === null || _c === void 0 ? void 0 : _c.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === boundwitness_model_1.BoundWitnessSchema)) !== null && _d !== void 0 ? _d : [];
-            yield this.throwErrors(query, result);
-            return [result[0], ...innerBoundWitnesses];
-        });
-    }
-}
-exports.IndirectArchivistWrapper = IndirectArchivistWrapper;
-_a = IndirectArchivistWrapper;
-IndirectArchivistWrapper.requiredQueries = [archivist_model_1.ArchivistGetQuerySchema, ...Reflect.get(_b, "requiredQueries", _a)];
-//# sourceMappingURL=IndirectArchivistWrapper.js.map

package/dist/cjs/IndirectArchivistWrapper.js.map

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