@xyo-network/diviner-abstract 3.5.2 → 3.6.0-rc.2
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.
|
@@ -5,7 +5,7 @@ import type { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
|
5
5
|
import type { AttachableDivinerInstance, DivinerInstance, DivinerModuleEventData, DivinerParams } from '@xyo-network/diviner-model';
|
|
6
6
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
7
7
|
import type { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
|
|
8
|
-
import type { Payload, Schema,
|
|
8
|
+
import type { Payload, Schema, WithSources } from '@xyo-network/payload-model';
|
|
9
9
|
export declare abstract class AbstractDiviner<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements AttachableDivinerInstance<TParams, TIn, TOut, TEventData> {
|
|
10
10
|
static readonly configSchemas: Schema[];
|
|
11
11
|
static readonly defaultConfigSchema: Schema;
|
|
@@ -13,7 +13,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
13
13
|
static readonly uniqueName: string;
|
|
14
14
|
get queries(): string[];
|
|
15
15
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
16
|
-
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithSources<
|
|
16
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<WithSources<TOut>[]>;
|
|
17
17
|
divineQuery(payloads?: TIn[], account?: AccountInstance, _retry?: RetryConfig): Promise<ModuleQueryResult<TOut>>;
|
|
18
18
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
19
19
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAExE,OAAO,KAAK,EACV,yBAAyB,EAEzB,eAAe,EACf,sBAAsB,EACtB,aAAa,EAEd,MAAM,4BAA4B,CAAA;AAKnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EACV,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAC1D,MAAM,2BAA2B,CAAA;AAElC,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAExE,OAAO,KAAK,EACV,yBAAyB,EAEzB,eAAe,EACf,sBAAsB,EACtB,aAAa,EAEd,MAAM,4BAA4B,CAAA;AAKnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EACV,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAC1D,MAAM,2BAA2B,CAAA;AAElC,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAAE,WAAW,EAC7B,MAAM,4BAA4B,CAAA;AAEnC,8BAAsB,eAAe,CACnC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAED,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACpE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgD;IAChG,gBAAyB,mBAAmB,EAAE,MAAM,CAAsB;IAC1E,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAC3B,gBAAyB,UAAU,SAA4D;IAE/F,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,GAAE,GAAG,EAAO,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;IAe7F,WAAW,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKtH,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,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;CACpF"}
|
package/dist/neutral/index.mjs
CHANGED
|
@@ -43,7 +43,7 @@ var AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
|
|
|
43
43
|
mod: this,
|
|
44
44
|
outPayloads: resultPayloads
|
|
45
45
|
});
|
|
46
|
-
return
|
|
46
|
+
return resultPayloads.map((payload) => PayloadBuilder.omitStorageMeta(payload));
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
async divineQuery(payloads, account, _retry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport type { RetryConfig, RetryConfigWithComplete } from '@xylabs/retry'\nimport { retry } from '@xylabs/retry'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type {\n AttachableDivinerInstance,\n DivinerDivineQuery,\n DivinerInstance,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQueries,\n} from '@xyo-network/diviner-model'\nimport {\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type {\n ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n Payload, Schema,
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport type { RetryConfig, RetryConfigWithComplete } from '@xylabs/retry'\nimport { retry } from '@xylabs/retry'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type {\n AttachableDivinerInstance,\n DivinerDivineQuery,\n DivinerInstance,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQueries,\n} from '@xyo-network/diviner-model'\nimport {\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type {\n ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n Payload, Schema, WithSources,\n} 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<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n DivinerInstance<TParams, TIn, TOut>,\n TIn,\n TOut\n >,\n>\n extends AbstractModuleInstance<TParams, TEventData>\n implements AttachableDivinerInstance<TParams, TIn, TOut, TEventData> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, DivinerConfigSchema]\n static override readonly defaultConfigSchema: Schema = DivinerConfigSchema\n static targetSchema: string\n static override readonly uniqueName = globallyUnique('AbstractDiviner', AbstractDiviner, 'xyo')\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\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<WithSources<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, mod: this })\n const resultPayloads: TOut[]\n = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', {\n errors: [], inPayloads: payloads, mod: this, outPayloads: resultPayloads,\n })\n return resultPayloads.map(payload => PayloadBuilder.omitStorageMeta(payload))\n })\n }\n\n async divineQuery(payloads?: TIn[], account?: AccountInstance, _retry?: RetryConfig): Promise<ModuleQueryResult<TOut>> {\n const queryPayload: DivinerDivineQuery = { schema: DivinerDivineQuerySchema }\n return await this.sendQueryRaw(queryPayload, payloads, account)\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<DivinerQueries>(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<WithSources<TOut>[]>\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AACzB,SAASC,sBAAsB;AAG/B,SAASC,aAAa;AAGtB,SAASC,gCAAgC;AASzC,SACEC,qBACAC,gCACK;AACP,SAASC,8BAA8B;AAIvC,SAASC,sBAAsB;AAKxB,IAAeC,kBAAf,MAAeA,yBAUZC,uBAAAA;EAvCV,OAuCUA;;;EAER,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeC;;EAC5E,OAAyBC,sBAA8BD;EACvD,OAAOE;EACP,OAAyBC,aAAaC,eAAe,mBAAmBP,kBAAiB,KAAA;EAEzF,IAAaQ,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;;EAGAE,OAAOC,WAAkB,CAAA,GAAIC,eAAuE;AAClG,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,KAAK;MAAK,CAAA;AACjE,YAAMC,kBACDP,cAAc,MAAME,MAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AACzH,YAAM,KAAKQ,KAAK,aAAa;QAC3BK,QAAQ,CAAA;QAAIJ,YAAYT;QAAUU,KAAK;QAAMI,aAAaH;MAC5D,CAAA;AACA,aAAOA,eAAeI,IAAIC,CAAAA,YAAWC,eAAeC,gBAAgBF,OAAAA,CAAAA;IACtE,CAAA;EACF;EAEA,MAAMG,YAAYnB,UAAkBoB,SAA2BC,QAAwD;AACrH,UAAMC,eAAmC;MAAEC,QAAQzB;IAAyB;AAC5E,WAAO,MAAM,KAAK0B,aAAaF,cAActB,UAAUoB,OAAAA;EACzD;;EAGA,MAAyBK,aACvBC,OACA1B,UACA2B,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAA2BJ,OAAO1B,QAAAA;AAEjF,UAAM+B,gBAAgB,MAAMd,eAAee,cAAchC,UAAU0B,MAAMA,KAAK;AAC9E,UAAMJ,eAAe,MAAMM,QAAQK,SAAQ;AAC3CC,aAAS,MAAM,KAAKC,UAAUT,OAAO1B,UAAU2B,WAAAA,CAAAA;AAC/C,UAAMhB,iBAA4B,CAAA;AAClC,YAAQW,aAAaC,QAAM;MACzB,KAAKzB,0BAA0B;AAC7Ba,uBAAeyB,KAAI,GAAK,MAAM,KAAKrC,OAAOgC,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAO1B,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["assertEx","globallyUnique","retry","QueryBoundWitnessWrapper","DivinerConfigSchema","DivinerDivineQuerySchema","AbstractModuleInstance","PayloadBuilder","AbstractDiviner","AbstractModuleInstance","configSchemas","DivinerConfigSchema","defaultConfigSchema","targetSchema","uniqueName","globallyUnique","queries","DivinerDivineQuerySchema","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","mod","resultPayloads","divineHandler","errors","outPayloads","map","payload","PayloadBuilder","omitStorageMeta","divineQuery","account","_retry","queryPayload","schema","sendQueryRaw","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","filterExclude","getQuery","assertEx","queryable","push"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyo-network/diviner-abstract",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0-rc.2",
|
|
4
4
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -29,18 +29,18 @@
|
|
|
29
29
|
"module": "dist/neutral/index.mjs",
|
|
30
30
|
"types": "dist/neutral/index.d.ts",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@xylabs/assert": "^4.4.
|
|
33
|
-
"@xylabs/object": "^4.4.
|
|
34
|
-
"@xylabs/promise": "^4.4.
|
|
35
|
-
"@xylabs/retry": "^4.4.
|
|
36
|
-
"@xyo-network/account-model": "^3.
|
|
37
|
-
"@xyo-network/boundwitness-model": "^3.
|
|
38
|
-
"@xyo-network/boundwitness-wrapper": "^3.
|
|
39
|
-
"@xyo-network/diviner-model": "^3.
|
|
40
|
-
"@xyo-network/module-abstract": "^3.
|
|
41
|
-
"@xyo-network/module-model": "^3.
|
|
42
|
-
"@xyo-network/payload-builder": "^3.
|
|
43
|
-
"@xyo-network/payload-model": "^3.
|
|
32
|
+
"@xylabs/assert": "^4.4.12",
|
|
33
|
+
"@xylabs/object": "^4.4.12",
|
|
34
|
+
"@xylabs/promise": "^4.4.12",
|
|
35
|
+
"@xylabs/retry": "^4.4.12",
|
|
36
|
+
"@xyo-network/account-model": "^3.6.0-rc.2",
|
|
37
|
+
"@xyo-network/boundwitness-model": "^3.6.0-rc.2",
|
|
38
|
+
"@xyo-network/boundwitness-wrapper": "^3.6.0-rc.2",
|
|
39
|
+
"@xyo-network/diviner-model": "^3.6.0-rc.2",
|
|
40
|
+
"@xyo-network/module-abstract": "^3.6.0-rc.2",
|
|
41
|
+
"@xyo-network/module-model": "^3.6.0-rc.2",
|
|
42
|
+
"@xyo-network/payload-builder": "^3.6.0-rc.2",
|
|
43
|
+
"@xyo-network/payload-model": "^3.6.0-rc.2"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@xylabs/ts-scripts-yarn3": "^4.2.4",
|
|
@@ -49,5 +49,6 @@
|
|
|
49
49
|
},
|
|
50
50
|
"publishConfig": {
|
|
51
51
|
"access": "public"
|
|
52
|
-
}
|
|
52
|
+
},
|
|
53
|
+
"stableVersion": "3.5.2"
|
|
53
54
|
}
|
package/src/AbstractDiviner.ts
CHANGED
|
@@ -24,7 +24,7 @@ import type {
|
|
|
24
24
|
} from '@xyo-network/module-model'
|
|
25
25
|
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
26
26
|
import type {
|
|
27
|
-
Payload, Schema,
|
|
27
|
+
Payload, Schema, WithSources,
|
|
28
28
|
} from '@xyo-network/payload-model'
|
|
29
29
|
|
|
30
30
|
export abstract class AbstractDiviner<
|
|
@@ -49,7 +49,7 @@ export abstract class AbstractDiviner<
|
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
52
|
-
divine(payloads: TIn[] = [], retryConfigIn?: RetryConfigWithComplete): Promise<WithSources<
|
|
52
|
+
divine(payloads: TIn[] = [], retryConfigIn?: RetryConfigWithComplete): Promise<WithSources<TOut>[]> {
|
|
53
53
|
this._noOverride('divine')
|
|
54
54
|
return this.busy(async () => {
|
|
55
55
|
const retryConfig = retryConfigIn ?? this.config.retry
|
|
@@ -60,7 +60,7 @@ export abstract class AbstractDiviner<
|
|
|
60
60
|
await this.emit('divineEnd', {
|
|
61
61
|
errors: [], inPayloads: payloads, mod: this, outPayloads: resultPayloads,
|
|
62
62
|
})
|
|
63
|
-
return
|
|
63
|
+
return resultPayloads.map(payload => PayloadBuilder.omitStorageMeta(payload))
|
|
64
64
|
})
|
|
65
65
|
}
|
|
66
66
|
|