@xyo-network/diviner-abstract 2.90.1 → 2.90.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/AbstractDiviner.d.cts +2 -2
- package/dist/browser/AbstractDiviner.d.cts.map +1 -1
- package/dist/browser/AbstractDiviner.d.mts +2 -2
- package/dist/browser/AbstractDiviner.d.mts.map +1 -1
- package/dist/browser/AbstractDiviner.d.ts +2 -2
- package/dist/browser/AbstractDiviner.d.ts.map +1 -1
- package/dist/browser/index.cjs +3 -3
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +2 -2
- package/dist/browser/index.js.map +1 -1
- package/dist/node/AbstractDiviner.d.cts +2 -2
- package/dist/node/AbstractDiviner.d.cts.map +1 -1
- package/dist/node/AbstractDiviner.d.mts +2 -2
- package/dist/node/AbstractDiviner.d.mts.map +1 -1
- package/dist/node/AbstractDiviner.d.ts +2 -2
- package/dist/node/AbstractDiviner.d.ts.map +1 -1
- package/dist/node/index.cjs +3 -3
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +2 -2
- package/dist/node/index.js.map +1 -1
- package/package.json +11 -11
- package/src/AbstractDiviner.ts +4 -4
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -28,7 +28,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
28
28
|
// src/AbstractDiviner.ts
|
|
29
29
|
var import_assert = require("@xylabs/assert");
|
|
30
30
|
var import_retry = require("@xylabs/retry");
|
|
31
|
-
var
|
|
31
|
+
var import_boundwitness_wrapper = require("@xyo-network/boundwitness-wrapper");
|
|
32
32
|
var import_diviner_model = require("@xyo-network/diviner-model");
|
|
33
33
|
var import_module_abstract = require("@xyo-network/module-abstract");
|
|
34
34
|
var import_payload_builder = require("@xyo-network/payload-builder");
|
|
@@ -67,12 +67,12 @@ var AbstractDiviner = class extends import_module_abstract.AbstractModuleInstanc
|
|
|
67
67
|
module: this,
|
|
68
68
|
outPayloads: resultPayloads
|
|
69
69
|
});
|
|
70
|
-
return resultPayloads;
|
|
70
|
+
return await Promise.all(resultPayloads.map((payload) => import_payload_builder.PayloadBuilder.build(payload)));
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
74
74
|
async queryHandler(query, payloads, queryConfig) {
|
|
75
|
-
const wrapper = await
|
|
75
|
+
const wrapper = await import_boundwitness_wrapper.QueryBoundWitnessWrapper.parseQuery(query, payloads);
|
|
76
76
|
const cleanPayloads = await import_payload_builder.PayloadBuilder.filterExclude(payloads, query.query);
|
|
77
77
|
const queryPayload = await wrapper.getQuery();
|
|
78
78
|
(0, import_assert.assertEx)(await this.queryable(query, payloads, queryConfig));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\n TIn extends Payload = Payload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)))\n })\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = await QueryBoundWitnessWrapper.parseQuery<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: Payload[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return resultPayloads\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,mBAA+C;AAE/C,kCAAyC;AACzC,2BASO;AACP,6BAAuC;AAEvC,6BAA+B;AAGxB,IAAeA,kBAAf,cAMGC,8CAAAA;EA1BV,OA0BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAOC;EAEP,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAAoE;AAC3F,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,UAAME,oBAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,aAAa;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AAC/F,aAAO,MAAMG,QAAQC,IAAIJ,eAAeK,IAAI,CAACC,YAAYC,sCAAeC,MAAMF,OAAAA,CAAAA,CAAAA;IAChF,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACArB,UACAsB,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAAyBJ,OAAOrB,QAAAA;AAE/E,UAAM0B,gBAAgB,MAAMR,sCAAeS,cAAc3B,UAAUqB,MAAMA,KAAK;AAC9E,UAAMO,eAAe,MAAML,QAAQM,SAAQ;AAC3CC,gCAAS,MAAM,KAAKC,UAAUV,OAAOrB,UAAUsB,WAAAA,CAAAA;AAC/C,UAAMX,iBAA4B,CAAA;AAClC,YAAQiB,aAAaI,QAAM;MACzB,KAAKnC,+CAA0B;AAC7Bc,uBAAesB,KAAI,GAAK,MAAM,KAAKlC,OAAO2B,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOrB,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["AbstractDiviner","AbstractModuleInstance","configSchemas","DivinerConfigSchema","targetSchema","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","Promise","all","map","payload","PayloadBuilder","build","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -4,7 +4,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
4
4
|
// src/AbstractDiviner.ts
|
|
5
5
|
import { assertEx } from "@xylabs/assert";
|
|
6
6
|
import { retry } from "@xylabs/retry";
|
|
7
|
-
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-
|
|
7
|
+
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
|
|
8
8
|
import { DivinerConfigSchema, DivinerDivineQuerySchema } from "@xyo-network/diviner-model";
|
|
9
9
|
import { AbstractModuleInstance } from "@xyo-network/module-abstract";
|
|
10
10
|
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
@@ -43,7 +43,7 @@ var AbstractDiviner = class extends AbstractModuleInstance {
|
|
|
43
43
|
module: this,
|
|
44
44
|
outPayloads: resultPayloads
|
|
45
45
|
});
|
|
46
|
-
return resultPayloads;
|
|
46
|
+
return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)));
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\n TIn extends Payload = Payload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)))\n })\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = await QueryBoundWitnessWrapper.parseQuery<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: Payload[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return resultPayloads\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,aAAsC;AAE/C,SAASC,gCAAgC;AACzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,8BAA8B;AAEvC,SAASC,sBAAsB;AAGxB,IAAeC,kBAAf,cAMGC,uBAAAA;EA1BV,OA0BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAOC;EAEP,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAAoE;AAC3F,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,MAAME,MAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,aAAa;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AAC/F,aAAO,MAAMG,QAAQC,IAAIJ,eAAeK,IAAI,CAACC,YAAYC,eAAeC,MAAMF,OAAAA,CAAAA,CAAAA;IAChF,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACArB,UACAsB,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAAyBJ,OAAOrB,QAAAA;AAE/E,UAAM0B,gBAAgB,MAAMR,eAAeS,cAAc3B,UAAUqB,MAAMA,KAAK;AAC9E,UAAMO,eAAe,MAAML,QAAQM,SAAQ;AAC3CC,aAAS,MAAM,KAAKC,UAAUV,OAAOrB,UAAUsB,WAAAA,CAAAA;AAC/C,UAAMX,iBAA4B,CAAA;AAClC,YAAQiB,aAAaI,QAAM;MACzB,KAAKnC,0BAA0B;AAC7Bc,uBAAesB,KAAI,GAAK,MAAM,KAAKlC,OAAO2B,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOrB,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["assertEx","retry","QueryBoundWitnessWrapper","DivinerConfigSchema","DivinerDivineQuerySchema","AbstractModuleInstance","PayloadBuilder","AbstractDiviner","AbstractModuleInstance","configSchemas","DivinerConfigSchema","targetSchema","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","Promise","all","map","payload","PayloadBuilder","build","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push"]}
|
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -4,14 +4,14 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
4
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
5
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
6
6
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
7
|
-
import { Payload } from '@xyo-network/payload-model';
|
|
7
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model';
|
|
8
8
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomDivinerModule<TParams, TIn, TOut, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
static targetSchema: string;
|
|
11
11
|
get queries(): string[];
|
|
12
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
13
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
14
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]>;
|
|
15
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
16
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
17
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAElF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE9D,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAY5F,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -33,7 +33,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
33
33
|
// src/AbstractDiviner.ts
|
|
34
34
|
var import_assert = require("@xylabs/assert");
|
|
35
35
|
var import_retry = require("@xylabs/retry");
|
|
36
|
-
var
|
|
36
|
+
var import_boundwitness_wrapper = require("@xyo-network/boundwitness-wrapper");
|
|
37
37
|
var import_diviner_model = require("@xyo-network/diviner-model");
|
|
38
38
|
var import_module_abstract = require("@xyo-network/module-abstract");
|
|
39
39
|
var import_payload_builder = require("@xyo-network/payload-builder");
|
|
@@ -65,12 +65,12 @@ var _AbstractDiviner = class _AbstractDiviner extends import_module_abstract.Abs
|
|
|
65
65
|
module: this,
|
|
66
66
|
outPayloads: resultPayloads
|
|
67
67
|
});
|
|
68
|
-
return resultPayloads;
|
|
68
|
+
return await Promise.all(resultPayloads.map((payload) => import_payload_builder.PayloadBuilder.build(payload)));
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
72
72
|
async queryHandler(query, payloads, queryConfig) {
|
|
73
|
-
const wrapper = await
|
|
73
|
+
const wrapper = await import_boundwitness_wrapper.QueryBoundWitnessWrapper.parseQuery(query, payloads);
|
|
74
74
|
const cleanPayloads = await import_payload_builder.PayloadBuilder.filterExclude(payloads, query.query);
|
|
75
75
|
const queryPayload = await wrapper.getQuery();
|
|
76
76
|
(0, import_assert.assertEx)(await this.queryable(query, payloads, queryConfig));
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\n TIn extends Payload = Payload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)))\n })\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = await QueryBoundWitnessWrapper.parseQuery<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: Payload[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return resultPayloads\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,mBAA+C;AAE/C,kCAAyC;AACzC,2BASO;AACP,6BAAuC;AAEvC,6BAA+B;AAGxB,IAAeA,mBAAf,MAAeA,yBAMZC,8CAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAAoE;AAC3F,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,UAAME,oBAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,aAAa;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AAC/F,aAAO,MAAMG,QAAQC,IAAIJ,eAAeK,IAAI,CAACC,YAAYC,sCAAeC,MAAMF,OAAAA,CAAAA,CAAAA;IAChF,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACArB,UACAsB,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAAyBJ,OAAOrB,QAAAA;AAE/E,UAAM0B,gBAAgB,MAAMR,sCAAeS,cAAc3B,UAAUqB,MAAMA,KAAK;AAC9E,UAAMO,eAAe,MAAML,QAAQM,SAAQ;AAC3CC,gCAAS,MAAM,KAAKC,UAAUV,OAAOrB,UAAUsB,WAAAA,CAAAA;AAC/C,UAAMX,iBAA4B,CAAA;AAClC,YAAQiB,aAAaI,QAAM;MACzB,KAAKnC,+CAA0B;AAC7Bc,uBAAesB,KAAI,GAAK,MAAM,KAAKlC,OAAO2B,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOrB,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AAvDUhB;AAGR,cAToBD,kBASKwC,iBAA0B;EAACC;;AACpD,cAVoBzC,kBAUb0C;AAVF,IAAe1C,kBAAf;","names":["AbstractDiviner","AbstractModuleInstance","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","Promise","all","map","payload","PayloadBuilder","build","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push","configSchemas","DivinerConfigSchema","targetSchema"]}
|
package/dist/node/index.js
CHANGED
|
@@ -9,7 +9,7 @@ var __publicField = (obj, key, value) => {
|
|
|
9
9
|
// src/AbstractDiviner.ts
|
|
10
10
|
import { assertEx } from "@xylabs/assert";
|
|
11
11
|
import { retry } from "@xylabs/retry";
|
|
12
|
-
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-
|
|
12
|
+
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
|
|
13
13
|
import { DivinerConfigSchema, DivinerDivineQuerySchema } from "@xyo-network/diviner-model";
|
|
14
14
|
import { AbstractModuleInstance } from "@xyo-network/module-abstract";
|
|
15
15
|
import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
@@ -41,7 +41,7 @@ var _AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
|
|
|
41
41
|
module: this,
|
|
42
42
|
outPayloads: resultPayloads
|
|
43
43
|
});
|
|
44
|
-
return resultPayloads;
|
|
44
|
+
return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)));
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\n TIn extends Payload = Payload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)))\n })\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = await QueryBoundWitnessWrapper.parseQuery<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: Payload[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return resultPayloads\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,aAAsC;AAE/C,SAASC,gCAAgC;AACzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,8BAA8B;AAEvC,SAASC,sBAAsB;AAGxB,IAAeC,mBAAf,MAAeA,yBAMZC,uBAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAAoE;AAC3F,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,MAAME,MAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,aAAa;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AAC/F,aAAO,MAAMG,QAAQC,IAAIJ,eAAeK,IAAI,CAACC,YAAYC,eAAeC,MAAMF,OAAAA,CAAAA,CAAAA;IAChF,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACArB,UACAsB,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAAyBJ,OAAOrB,QAAAA;AAE/E,UAAM0B,gBAAgB,MAAMR,eAAeS,cAAc3B,UAAUqB,MAAMA,KAAK;AAC9E,UAAMO,eAAe,MAAML,QAAQM,SAAQ;AAC3CC,aAAS,MAAM,KAAKC,UAAUV,OAAOrB,UAAUsB,WAAAA,CAAAA;AAC/C,UAAMX,iBAA4B,CAAA;AAClC,YAAQiB,aAAaI,QAAM;MACzB,KAAKnC,0BAA0B;AAC7Bc,uBAAesB,KAAI,GAAK,MAAM,KAAKlC,OAAO2B,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOrB,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AAvDUhB;AAGR,cAToBD,kBASKwC,iBAA0B;EAACC;;AACpD,cAVoBzC,kBAUb0C;AAVF,IAAe1C,kBAAf;","names":["assertEx","retry","QueryBoundWitnessWrapper","DivinerConfigSchema","DivinerDivineQuerySchema","AbstractModuleInstance","PayloadBuilder","AbstractDiviner","AbstractModuleInstance","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","Promise","all","map","payload","PayloadBuilder","build","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push","configSchemas","DivinerConfigSchema","targetSchema"]}
|
package/package.json
CHANGED
|
@@ -10,16 +10,16 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^2.14.
|
|
14
|
-
"@xylabs/promise": "^2.14.
|
|
15
|
-
"@xylabs/retry": "^2.14.
|
|
16
|
-
"@xyo-network/boundwitness-
|
|
17
|
-
"@xyo-network/boundwitness-
|
|
18
|
-
"@xyo-network/diviner-model": "~2.90.
|
|
19
|
-
"@xyo-network/module-abstract": "~2.90.
|
|
20
|
-
"@xyo-network/module-model": "~2.90.
|
|
21
|
-
"@xyo-network/payload-builder": "~2.90.
|
|
22
|
-
"@xyo-network/payload-model": "~2.90.
|
|
13
|
+
"@xylabs/assert": "^2.14.1",
|
|
14
|
+
"@xylabs/promise": "^2.14.1",
|
|
15
|
+
"@xylabs/retry": "^2.14.1",
|
|
16
|
+
"@xyo-network/boundwitness-model": "~2.90.3",
|
|
17
|
+
"@xyo-network/boundwitness-wrapper": "~2.90.3",
|
|
18
|
+
"@xyo-network/diviner-model": "~2.90.3",
|
|
19
|
+
"@xyo-network/module-abstract": "~2.90.3",
|
|
20
|
+
"@xyo-network/module-model": "~2.90.3",
|
|
21
|
+
"@xyo-network/payload-builder": "~2.90.3",
|
|
22
|
+
"@xyo-network/payload-model": "~2.90.3"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@xylabs/ts-scripts-yarn3": "^3.2.42",
|
|
@@ -65,6 +65,6 @@
|
|
|
65
65
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
66
66
|
},
|
|
67
67
|
"sideEffects": false,
|
|
68
|
-
"version": "2.90.
|
|
68
|
+
"version": "2.90.3",
|
|
69
69
|
"type": "module"
|
|
70
70
|
}
|
package/src/AbstractDiviner.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { Promisable } from '@xylabs/promise'
|
|
3
3
|
import { retry, RetryConfigWithComplete } from '@xylabs/retry'
|
|
4
|
-
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
|
|
5
4
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model'
|
|
5
|
+
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
|
|
6
6
|
import {
|
|
7
7
|
CustomDivinerModule,
|
|
8
8
|
DivinerConfigSchema,
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract'
|
|
17
17
|
import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'
|
|
18
18
|
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
19
|
-
import { Payload } from '@xyo-network/payload-model'
|
|
19
|
+
import { Payload, WithMeta } from '@xyo-network/payload-model'
|
|
20
20
|
|
|
21
21
|
export abstract class AbstractDiviner<
|
|
22
22
|
TParams extends DivinerParams = DivinerParams,
|
|
@@ -41,7 +41,7 @@ export abstract class AbstractDiviner<
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
44
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {
|
|
44
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithMeta<TOut>[]> {
|
|
45
45
|
this._noOverride('divine')
|
|
46
46
|
return this.busy(async () => {
|
|
47
47
|
const retryConfig = retryConfigIn ?? this.config.retry
|
|
@@ -49,7 +49,7 @@ export abstract class AbstractDiviner<
|
|
|
49
49
|
await this.emit('divineStart', { inPayloads: payloads, module: this })
|
|
50
50
|
const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []
|
|
51
51
|
await this.emit('divineEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
|
|
52
|
-
return resultPayloads
|
|
52
|
+
return await Promise.all(resultPayloads.map((payload) => PayloadBuilder.build(payload)))
|
|
53
53
|
})
|
|
54
54
|
}
|
|
55
55
|
|