@xyo-network/module-abstract 2.53.15 → 2.53.17
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/cjs/AbstractModule.js +3 -3
- package/dist/cjs/AbstractModule.js.map +1 -1
- package/dist/cjs/Error.js +6 -6
- package/dist/cjs/Error.js.map +1 -1
- package/dist/cjs/Query/QueryBoundWitnessBuilder.js +1 -1
- package/dist/cjs/Query/QueryBoundWitnessBuilder.js.map +1 -1
- package/dist/cjs/Query/QueryBoundWitnessValidator.js +22 -13
- package/dist/cjs/Query/QueryBoundWitnessValidator.js.map +1 -1
- package/dist/cjs/Query/QueryBoundWitnessWrapper.js +2 -3
- package/dist/cjs/Query/QueryBoundWitnessWrapper.js.map +1 -1
- package/dist/cjs/QueryValidator/SupportedQueryValidator.js.map +1 -1
- package/dist/cjs/index.js +0 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/docs.json +17815 -32805
- package/dist/esm/AbstractModule.js +3 -3
- package/dist/esm/AbstractModule.js.map +1 -1
- package/dist/esm/Error.js +4 -4
- package/dist/esm/Error.js.map +1 -1
- package/dist/esm/Query/QueryBoundWitnessBuilder.js +2 -2
- package/dist/esm/Query/QueryBoundWitnessBuilder.js.map +1 -1
- package/dist/esm/Query/QueryBoundWitnessValidator.js +23 -14
- package/dist/esm/Query/QueryBoundWitnessValidator.js.map +1 -1
- package/dist/esm/Query/QueryBoundWitnessWrapper.js +2 -3
- package/dist/esm/Query/QueryBoundWitnessWrapper.js.map +1 -1
- package/dist/esm/QueryValidator/SupportedQueryValidator.js.map +1 -1
- package/dist/esm/index.js +0 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/types/AbstractModule.d.ts +5 -5
- package/dist/types/AbstractModule.d.ts.map +1 -1
- package/dist/types/Error.d.ts +6 -6
- package/dist/types/Error.d.ts.map +1 -1
- package/dist/types/Query/QueryBoundWitnessBuilder.d.ts +2 -2
- package/dist/types/Query/QueryBoundWitnessBuilder.d.ts.map +1 -1
- package/dist/types/Query/QueryBoundWitnessValidator.d.ts +2 -2
- package/dist/types/Query/QueryBoundWitnessValidator.d.ts.map +1 -1
- package/dist/types/Query/QueryBoundWitnessWrapper.d.ts +3 -3
- package/dist/types/Query/QueryBoundWitnessWrapper.d.ts.map +1 -1
- package/dist/types/QueryValidator/QueryValidator.d.ts +3 -3
- package/dist/types/QueryValidator/QueryValidator.d.ts.map +1 -1
- package/dist/types/QueryValidator/SupportedQueryValidator.d.ts.map +1 -1
- package/dist/types/index.d.ts +0 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/lib/duplicateModules.d.ts +6 -0
- package/dist/types/lib/duplicateModules.d.ts.map +1 -1
- package/package.json +18 -18
- package/src/AbstractModule.ts +12 -12
- package/src/Error.ts +7 -7
- package/src/Query/QueryBoundWitnessBuilder.ts +4 -4
- package/src/Query/QueryBoundWitnessValidator.ts +23 -16
- package/src/Query/QueryBoundWitnessWrapper.ts +6 -6
- package/src/QueryValidator/QueryValidator.ts +3 -3
- package/src/QueryValidator/SupportedQueryValidator.ts +2 -6
- package/src/index.ts +0 -1
- package/dist/cjs/IdLogger.js +0 -38
- package/dist/cjs/IdLogger.js.map +0 -1
- package/dist/cjs/ModuleWrapper.js +0 -227
- package/dist/cjs/ModuleWrapper.js.map +0 -1
- package/dist/esm/IdLogger.js +0 -31
- package/dist/esm/IdLogger.js.map +0 -1
- package/dist/esm/ModuleWrapper.js +0 -210
- package/dist/esm/ModuleWrapper.js.map +0 -1
- package/dist/types/IdLogger.d.ts +0 -14
- package/dist/types/IdLogger.d.ts.map +0 -1
- package/dist/types/ModuleWrapper.d.ts +0 -73
- package/dist/types/ModuleWrapper.d.ts.map +0 -1
- package/src/IdLogger.ts +0 -37
- package/src/ModuleWrapper.ts +0 -322
|
@@ -9,10 +9,10 @@ import { creatableModule, ModuleDiscoverQuerySchema, ModuleSubscribeQuerySchema,
|
|
|
9
9
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
10
10
|
import { PromiseEx } from '@xyo-network/promise';
|
|
11
11
|
import { QuerySchema } from '@xyo-network/query-payload-plugin';
|
|
12
|
+
import { IdLogger } from '@xyo-network/shared';
|
|
12
13
|
import compact from 'lodash/compact';
|
|
13
14
|
import { BaseEmitter } from './BaseEmitter';
|
|
14
|
-
import {
|
|
15
|
-
import { IdLogger } from './IdLogger';
|
|
15
|
+
import { ModuleErrorBuilder } from './Error';
|
|
16
16
|
import { duplicateModules, serializableField } from './lib';
|
|
17
17
|
import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query';
|
|
18
18
|
import { ModuleConfigQueryValidator, SupportedQueryValidator } from './QueryValidator';
|
|
@@ -115,7 +115,7 @@ let AbstractModule = AbstractModule_1 = class AbstractModule extends BaseEmitter
|
|
|
115
115
|
}
|
|
116
116
|
catch (ex) {
|
|
117
117
|
const error = ex;
|
|
118
|
-
resultPayloads.push(new
|
|
118
|
+
resultPayloads.push(new ModuleErrorBuilder([wrapper.hash], error.message).build());
|
|
119
119
|
}
|
|
120
120
|
const result = await this.bindResult(resultPayloads, queryAccount);
|
|
121
121
|
const args = { module: this, payloads, query, result };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAiB,YAAY,EAAE,MAAM,oCAAoC,CAAA;AAChF,OAAO,EAGL,eAAe,EAGf,yBAAyB,EAOzB,0BAA0B,GAK3B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,OAAO,EAAc,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAgB,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC7E,OAAO,
|
|
1
|
+
{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Error.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
2
|
-
export const
|
|
3
|
-
export class
|
|
2
|
+
export const ModuleErrorSchema = 'network.xyo.error.module';
|
|
3
|
+
export class ModuleErrorBuilder extends PayloadBuilder {
|
|
4
4
|
message;
|
|
5
5
|
sources;
|
|
6
6
|
constructor(sources, message) {
|
|
7
|
-
super({ schema:
|
|
7
|
+
super({ schema: ModuleErrorSchema });
|
|
8
8
|
this.sources = sources;
|
|
9
9
|
this.message = message;
|
|
10
10
|
}
|
|
11
11
|
build() {
|
|
12
12
|
return {
|
|
13
13
|
message: this.message,
|
|
14
|
-
schema:
|
|
14
|
+
schema: ModuleErrorSchema,
|
|
15
15
|
sources: this.sources,
|
|
16
16
|
};
|
|
17
17
|
}
|
package/dist/esm/Error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,MAAM,CAAC,MAAM,iBAAiB,GAAsB,0BAA0B,CAAA;AAI9E,MAAM,OAAO,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAS;IAChB,OAAO,CAAU;IACjB,YAAY,OAAiB,EAAE,OAAgB;QAC7C,KAAK,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,iBAAiB;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder';
|
|
3
|
-
import {
|
|
3
|
+
import { QueryBoundWitnessSchema } from '@xyo-network/module-model';
|
|
4
4
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
5
5
|
export class QueryBoundWitnessBuilder extends BoundWitnessBuilder {
|
|
6
6
|
_query;
|
|
7
7
|
_resultSet;
|
|
8
8
|
hashableFields() {
|
|
9
|
-
return { ...super.hashableFields(), query: assertEx(this._query?.hash, 'No Query Specified'), schema:
|
|
9
|
+
return { ...super.hashableFields(), query: assertEx(this._query?.hash, 'No Query Specified'), schema: QueryBoundWitnessSchema };
|
|
10
10
|
}
|
|
11
11
|
query(query) {
|
|
12
12
|
this._query = PayloadWrapper.parse(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessBuilder.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessBuilder.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAA4B,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAE7F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,wBAGX,SAAQ,mBAAkC;IAClC,MAAM,CAAoC;IAC1C,UAAU,CAA+C;IAExD,cAAc;QACrB,OAAO,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAA;IACjI,CAAC;IAED,KAAK,CAA4C,KAAQ;QACvD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAkE,UAAa;QACtF,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { assertEx } from '@xylabs/assert';
|
|
1
2
|
import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
3
|
+
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
|
|
4
|
+
import { QueryBoundWitnessSchema } from '@xyo-network/module-model';
|
|
5
|
+
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
4
6
|
export class QueryBoundWitnessValidator extends BoundWitnessValidator {
|
|
5
7
|
_query;
|
|
6
8
|
get expectedSchema() {
|
|
7
|
-
return
|
|
9
|
+
return QueryBoundWitnessSchema;
|
|
8
10
|
}
|
|
9
11
|
static isQueryBoundWitnessValidator(obj) {
|
|
10
12
|
return obj?.constructor === QueryBoundWitnessValidator;
|
|
@@ -17,17 +19,24 @@ export class QueryBoundWitnessValidator extends BoundWitnessValidator {
|
|
|
17
19
|
}
|
|
18
20
|
validateResultSet() {
|
|
19
21
|
const errors = [];
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
22
|
+
try {
|
|
23
|
+
const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet');
|
|
24
|
+
const wrapper = BoundWitnessWrapper.parse(this.obj);
|
|
25
|
+
const resultSet = PayloadWrapper.parse(wrapper.payloads[resultSetHash]);
|
|
26
|
+
const required = resultSet?.payload.required;
|
|
27
|
+
if (required) {
|
|
28
|
+
Object.entries(required).forEach(([key, value]) => {
|
|
29
|
+
const found = wrapper.payloadSchemas.reduce((count, schema) => {
|
|
30
|
+
return count + (schema === key ? 1 : 0);
|
|
31
|
+
}, 0);
|
|
32
|
+
if (found !== value) {
|
|
33
|
+
errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`));
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
catch (ex) {
|
|
39
|
+
errors.push(ex);
|
|
31
40
|
}
|
|
32
41
|
return errors;
|
|
33
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessValidator.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessValidator.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAA4B,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAE7F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,0BAAoD,SAAQ,qBAAwC;IACvG,MAAM,CAA+B;IAE7C,IAAuB,cAAc;QACnC,OAAO,uBAAuB,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAY;QAC9C,OAAQ,GAAkC,EAAE,WAAW,KAAK,0BAA0B,CAAA;IACxF,CAAC;IAEQ,QAAQ;QACf,OAAO;YACL,GAAG,KAAK,CAAC,QAAQ,EAAE;YACnB,8BAA8B;SAC/B,CAAA;IACH,CAAC;IAED,iBAAiB;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI;YACF,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;YACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACnD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAoB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB,CAAC,CAAA;YAC/G,MAAM,QAAQ,GAAG,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAA;YAC5C,IAAI,QAAQ,EAAE;gBACZ,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAChD,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;wBAC5D,OAAO,KAAK,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBACzC,CAAC,EAAE,CAAC,CAAC,CAAA;oBACL,IAAI,KAAK,KAAK,KAAK,EAAE;wBACnB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sCAAsC,GAAG,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,CAAC,CAAA;qBACnF;gBACH,CAAC,CAAC,CAAA;aACH;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,CAAC,IAAI,CAAC,EAAW,CAAC,CAAA;SACzB;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
|
|
3
|
-
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
4
3
|
import { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator';
|
|
5
4
|
export class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
|
|
6
5
|
_query;
|
|
@@ -11,7 +10,7 @@ export class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
|
|
|
11
10
|
}
|
|
12
11
|
get query() {
|
|
13
12
|
return assertEx((this._query =
|
|
14
|
-
(this._query ?? this.payloads[this.boundwitness.query]) ?
|
|
13
|
+
(this._query ?? this.payloads[this.boundwitness.query]) ? this.payloads[this.boundwitness.query] : undefined), () => `Missing Query [${this.boundwitness}, ${JSON.stringify(this.payloads, null, 2)}]`);
|
|
15
14
|
}
|
|
16
15
|
get resultSet() {
|
|
17
16
|
const resultSetHash = this.boundwitness.resultSet;
|
|
@@ -19,7 +18,7 @@ export class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
|
|
|
19
18
|
this._resultSet ??
|
|
20
19
|
(resultSetHash
|
|
21
20
|
? this.payloads[resultSetHash]
|
|
22
|
-
?
|
|
21
|
+
? this.payloads[resultSetHash]
|
|
23
22
|
: undefined
|
|
24
23
|
: undefined)), () => `Missing resultSet [${resultSetHash}, ${JSON.stringify(this.payloads, null, 2)}]`);
|
|
25
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessWrapper.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessWrapper.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAKvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAEzE,MAAM,OAAO,wBAAkD,SAAQ,mBAAsC;IACnG,MAAM,CAA+B;IACrC,UAAU,CAA+C;IAEzD,0BAA0B,GAAG,IAAI,CAAA;IAEzC,IAAa,MAAM;QACjB,OAAO,IAAI,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAA;IACrE,CAAC;IAED,IAAI,KAAK;QACP,OAAO,QAAQ,CACb,CAAC,IAAI,CAAC,MAAM;YACV,CAAA,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAC,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,EACpI,GAAG,EAAE,CAAC,kBAAkB,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CACxF,CAAA;IACH,CAAC;IAED,IAAI,SAAS;QACX,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAA;QACjD,OAAO,QAAQ,CACb,CAAC,IAAI,CAAC,UAAU;YACd,IAAI,CAAC,UAAU;gBACf,CAAC,aAAa;oBACZ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;wBAC5B,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAuC;wBACrE,CAAC,CAAC,SAAS;oBACb,CAAC,CAAC,SAAS,CAAC,CAAC,EACjB,GAAG,EAAE,CAAC,sBAAsB,aAAa,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CACxF,CAAA;IACH,CAAC;IAED,MAAM,CAAC,UAAU,CAA0B,GAAY,EAAE,QAAoB;QAC3E,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,wDAAwD,CAAC,CAAA;QACvF,QAAQ,OAAO,GAAG,EAAE;YAClB,KAAK,QAAQ,CAAC,CAAC;gBACb,MAAM,WAAW,GAAG,GAAkC,CAAA;gBACtD,MAAM,OAAO,GAAG,WAAW,EAAE,0BAA0B,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,wBAAwB,CAAI,GAAwB,EAAE,QAAQ,CAAC,CAAA;gBAC3I,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBAClB,OAAO,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;iBACjH;gBACD,OAAO,OAAO,CAAA;aACf;SACF;QACD,MAAM,KAAK,CAAC,oBAAoB,OAAO,GAAG,GAAG,CAAC,CAAA;IAChD,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SupportedQueryValidator.js","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAGnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,
|
|
1
|
+
{"version":3,"file":"SupportedQueryValidator.js","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AAGnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAkD,GAAW,EAAE,KAAQ,EAAE,QAAoB,EAAW,EAAE;IAChJ,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAc,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjF,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAA;IACnC,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,OAAO,uBAAuB;IACH;IAA/B,YAA+B,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAC9C,SAAS,GAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACzC,OAAO,wBAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC5D,CAAC,CAAA;CACF"}
|
package/dist/esm/index.js
CHANGED
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AccountInstance } from '@xyo-network/account-model';
|
|
2
2
|
import { BoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
|
-
import { CreatableModule, Module, ModuleConfig, ModuleEventData, ModuleFilter, ModuleParams, ModuleQueryResult,
|
|
3
|
+
import { CreatableModule, Module, ModuleConfig, ModuleEventData, ModuleFilter, ModuleParams, ModuleQueryResult, Query, QueryBoundWitness, SchemaString } from '@xyo-network/module-model';
|
|
4
4
|
import { Payload } from '@xyo-network/payload-model';
|
|
5
5
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
6
6
|
import { Promisable, PromiseEx } from '@xyo-network/promise';
|
|
@@ -23,15 +23,15 @@ export declare class AbstractModule<TParams extends ModuleParams = ModuleParams,
|
|
|
23
23
|
get queries(): string[];
|
|
24
24
|
static create<TModule extends Module>(this: CreatableModule<TModule>, params?: TModule['params']): Promise<TModule>;
|
|
25
25
|
discover(): Promisable<Payload[]>;
|
|
26
|
-
query<T extends
|
|
27
|
-
queryable<T extends
|
|
26
|
+
query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
|
|
27
|
+
queryable<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): boolean;
|
|
28
28
|
start(_timeout?: number): Promisable<void>;
|
|
29
29
|
started(notStartedAction?: 'error' | 'throw' | 'warn' | 'log' | 'none'): boolean;
|
|
30
30
|
subscribe(_queryAccount?: AccountInstance): void;
|
|
31
31
|
protected bindHashes(hashes: string[], schema: SchemaString[], account?: AccountInstance): PromiseEx<unknown, AccountInstance>;
|
|
32
32
|
protected bindHashesInternal(hashes: string[], schema: SchemaString[], account?: AccountInstance): BoundWitness;
|
|
33
|
-
protected bindQuery<T extends
|
|
34
|
-
protected bindQueryInternal<T extends
|
|
33
|
+
protected bindQuery<T extends Query | PayloadWrapper<Query>>(query: T, payloads?: Payload[], account?: AccountInstance): PromiseEx<[QueryBoundWitness, Payload[]], AccountInstance>;
|
|
34
|
+
protected bindQueryInternal<T extends Query | PayloadWrapper<Query>>(query: T, payloads?: Payload[], account?: AccountInstance): [QueryBoundWitness, Payload[]];
|
|
35
35
|
protected bindResult(payloads: Payload[], account?: AccountInstance): PromiseEx<ModuleQueryResult, AccountInstance>;
|
|
36
36
|
protected bindResultInternal(payloads: Payload[], account?: AccountInstance): ModuleQueryResult;
|
|
37
37
|
protected loadAccount(account?: AccountInstance): AccountInstance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAEL,eAAe,EAEf,MAAM,EACN,YAAY,EAEZ,eAAe,EACf,YAAY,EACZ,YAAY,EAGZ,iBAAiB,EAEjB,
|
|
1
|
+
{"version":3,"file":"AbstractModule.d.ts","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":"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"}
|
package/dist/types/Error.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
|
-
export type
|
|
4
|
-
export declare const
|
|
5
|
-
export type
|
|
3
|
+
export type ModuleErrorSchema = 'network.xyo.error.module';
|
|
4
|
+
export declare const ModuleErrorSchema: ModuleErrorSchema;
|
|
5
|
+
export type ModuleError = Payload<{
|
|
6
6
|
message?: string;
|
|
7
|
-
schema:
|
|
7
|
+
schema: ModuleErrorSchema;
|
|
8
8
|
sources: string[];
|
|
9
9
|
}>;
|
|
10
|
-
export declare class
|
|
10
|
+
export declare class ModuleErrorBuilder extends PayloadBuilder {
|
|
11
11
|
message?: string;
|
|
12
12
|
sources: string[];
|
|
13
13
|
constructor(sources: string[], message?: string);
|
|
14
|
-
build():
|
|
14
|
+
build(): ModuleError;
|
|
15
15
|
}
|
|
16
16
|
//# sourceMappingURL=Error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Error.d.ts","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"Error.d.ts","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,iBAAiB,GAAG,0BAA0B,CAAA;AAC1D,eAAO,MAAM,iBAAiB,EAAE,iBAA8C,CAAA;AAE9E,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAAA;AAErG,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;gBACL,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM;IAMtC,KAAK,IAAI,WAAW;CAO9B"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder';
|
|
2
|
-
import {
|
|
2
|
+
import { Query, QueryBoundWitness } from '@xyo-network/module-model';
|
|
3
3
|
import { PayloadSetPayload } from '@xyo-network/payload-model';
|
|
4
4
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
5
|
-
export declare class QueryBoundWitnessBuilder<TBoundWitness extends
|
|
5
|
+
export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
|
|
6
6
|
private _query;
|
|
7
7
|
private _resultSet;
|
|
8
8
|
hashableFields(): TBoundWitness;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAA2B,MAAM,2BAA2B,CAAA;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,UAAU,CAA+C;IAExD,cAAc,IAAI,aAAa;IAIxC,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IAMzD,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,CAAC;CAKzF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
|
|
2
|
-
import {
|
|
3
|
-
export declare class QueryBoundWitnessValidator<T extends
|
|
2
|
+
import { Query, QueryBoundWitness } from '@xyo-network/module-model';
|
|
3
|
+
export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
|
|
4
4
|
private _query;
|
|
5
5
|
protected get expectedSchema(): string;
|
|
6
6
|
static isQueryBoundWitnessValidator(obj: unknown): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAA2B,MAAM,2BAA2B,CAAA;AAI7F,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIvC,QAAQ;IAOjB,iBAAiB;CAsBlB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
|
|
2
|
-
import {
|
|
2
|
+
import { Query, QueryBoundWitness } from '@xyo-network/module-model';
|
|
3
3
|
import { Payload } from '@xyo-network/payload-model';
|
|
4
4
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
5
|
-
export declare class QueryBoundWitnessWrapper<T extends
|
|
5
|
+
export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
|
|
6
6
|
private _query;
|
|
7
7
|
private _resultSet;
|
|
8
8
|
private isQueryBoundWitnessWrapper;
|
|
@@ -11,6 +11,6 @@ export declare class QueryBoundWitnessWrapper<T extends XyoQuery = XyoQuery> ext
|
|
|
11
11
|
get resultSet(): PayloadWrapper<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {
|
|
12
12
|
schema: "network.xyo.payload.set";
|
|
13
13
|
}>;
|
|
14
|
-
static parseQuery<T extends
|
|
14
|
+
static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T>;
|
|
15
15
|
}
|
|
16
16
|
//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,OAAO,EAAqB,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,UAAU,CAA+C;IAEjE,OAAO,CAAC,0BAA0B,CAAO;IAEzC,IAAa,MAAM,YAElB;IAED,IAAI,KAAK,sBAMR;IAED,IAAI,SAAS;;OAYZ;IAED,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,wBAAwB,CAAC,CAAC,CAAC;CAc5G"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { QueryBoundWitness } from '@xyo-network/module-model';
|
|
2
2
|
import { Payload } from '@xyo-network/payload-model';
|
|
3
|
-
export type Queryable<T extends
|
|
4
|
-
export interface QueryValidator<T extends
|
|
3
|
+
export type Queryable<T extends QueryBoundWitness = QueryBoundWitness> = (query: T, payloads?: Payload[]) => boolean;
|
|
4
|
+
export interface QueryValidator<T extends QueryBoundWitness = QueryBoundWitness> {
|
|
5
5
|
queryable: Queryable<T>;
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=QueryValidator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/QueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"QueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/QueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAA;AAEpH,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB;IAC7E,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;CACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SupportedQueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SupportedQueryValidator.d.ts","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkC,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAE5D,eAAO,MAAM,wBAAwB;;;;;;;;QAA0D,MAAM,uBAAuB,OAAO,EAAE,KAAG,OAIvI,CAAA;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAChD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;gBAAX,GAAG,EAAE,MAAM;IAC1C,SAAS,EAAE,SAAS,CAEnB;CACF"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA"}
|
|
@@ -10,6 +10,9 @@ import { Module } from '@xyo-network/module-model';
|
|
|
10
10
|
*/
|
|
11
11
|
export declare const duplicateModules: (value: Module, index: number, array: Module[]) => value is Module<import("@xyo-network/module-model").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
|
|
12
12
|
name?: string | undefined;
|
|
13
|
+
paging?: Record<string, {
|
|
14
|
+
size?: number | undefined;
|
|
15
|
+
}> | undefined;
|
|
13
16
|
schema: string;
|
|
14
17
|
security?: {
|
|
15
18
|
allowAnonymous?: boolean | undefined;
|
|
@@ -19,6 +22,9 @@ export declare const duplicateModules: (value: Module, index: number, array: Mod
|
|
|
19
22
|
storeQueries?: boolean | undefined;
|
|
20
23
|
} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
|
|
21
24
|
name?: string | undefined;
|
|
25
|
+
paging?: Record<string, {
|
|
26
|
+
size?: number | undefined;
|
|
27
|
+
}> | undefined;
|
|
22
28
|
schema: "network.xyo.module.config";
|
|
23
29
|
security?: {
|
|
24
30
|
allowAnonymous?: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"duplicateModules.d.ts","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAElD;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,SAAS,MAAM,SAAS,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"duplicateModules.d.ts","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAElD;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,SAAS,MAAM,SAAS,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;8EAE7E,CAAA"}
|
package/package.json
CHANGED
|
@@ -12,23 +12,23 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.7.6",
|
|
14
14
|
"@xylabs/promise": "^2.7.6",
|
|
15
|
-
"@xyo-network/account": "^2.53.
|
|
16
|
-
"@xyo-network/account-model": "^2.53.
|
|
17
|
-
"@xyo-network/address-payload-plugin": "^2.53.
|
|
18
|
-
"@xyo-network/boundwitness-builder": "^2.53.
|
|
19
|
-
"@xyo-network/boundwitness-model": "^2.53.
|
|
20
|
-
"@xyo-network/boundwitness-validator": "^2.53.
|
|
21
|
-
"@xyo-network/boundwitness-wrapper": "^2.53.
|
|
22
|
-
"@xyo-network/config-payload-plugin": "^2.53.
|
|
23
|
-
"@xyo-network/core": "^2.53.
|
|
24
|
-
"@xyo-network/module-events": "^2.53.
|
|
25
|
-
"@xyo-network/module-model": "^2.53.
|
|
26
|
-
"@xyo-network/payload-builder": "^2.53.
|
|
27
|
-
"@xyo-network/payload-model": "^2.53.
|
|
28
|
-
"@xyo-network/payload-wrapper": "^2.53.
|
|
29
|
-
"@xyo-network/promise": "^2.53.
|
|
30
|
-
"@xyo-network/query-payload-plugin": "^2.53.
|
|
31
|
-
"@xyo-network/shared": "^2.53.
|
|
15
|
+
"@xyo-network/account": "^2.53.17",
|
|
16
|
+
"@xyo-network/account-model": "^2.53.17",
|
|
17
|
+
"@xyo-network/address-payload-plugin": "^2.53.17",
|
|
18
|
+
"@xyo-network/boundwitness-builder": "^2.53.17",
|
|
19
|
+
"@xyo-network/boundwitness-model": "^2.53.17",
|
|
20
|
+
"@xyo-network/boundwitness-validator": "^2.53.17",
|
|
21
|
+
"@xyo-network/boundwitness-wrapper": "^2.53.17",
|
|
22
|
+
"@xyo-network/config-payload-plugin": "^2.53.17",
|
|
23
|
+
"@xyo-network/core": "^2.53.17",
|
|
24
|
+
"@xyo-network/module-events": "^2.53.17",
|
|
25
|
+
"@xyo-network/module-model": "^2.53.17",
|
|
26
|
+
"@xyo-network/payload-builder": "^2.53.17",
|
|
27
|
+
"@xyo-network/payload-model": "^2.53.17",
|
|
28
|
+
"@xyo-network/payload-wrapper": "^2.53.17",
|
|
29
|
+
"@xyo-network/promise": "^2.53.17",
|
|
30
|
+
"@xyo-network/query-payload-plugin": "^2.53.17",
|
|
31
|
+
"@xyo-network/shared": "^2.53.17",
|
|
32
32
|
"lodash": "^4.17.21"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
},
|
|
70
70
|
"sideEffects": false,
|
|
71
71
|
"types": "dist/types/index.d.ts",
|
|
72
|
-
"version": "2.53.
|
|
72
|
+
"version": "2.53.17"
|
|
73
73
|
}
|
package/src/AbstractModule.ts
CHANGED
|
@@ -19,21 +19,21 @@ import {
|
|
|
19
19
|
ModuleQuery,
|
|
20
20
|
ModuleQueryResult,
|
|
21
21
|
ModuleSubscribeQuerySchema,
|
|
22
|
+
Query,
|
|
23
|
+
QueryBoundWitness,
|
|
22
24
|
SchemaString,
|
|
23
25
|
WalletModuleParams,
|
|
24
|
-
XyoQuery,
|
|
25
|
-
XyoQueryBoundWitness,
|
|
26
26
|
} from '@xyo-network/module-model'
|
|
27
27
|
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
28
28
|
import { Payload } from '@xyo-network/payload-model'
|
|
29
29
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
30
30
|
import { Promisable, PromiseEx } from '@xyo-network/promise'
|
|
31
31
|
import { QueryPayload, QuerySchema } from '@xyo-network/query-payload-plugin'
|
|
32
|
+
import { IdLogger } from '@xyo-network/shared'
|
|
32
33
|
import compact from 'lodash/compact'
|
|
33
34
|
|
|
34
35
|
import { BaseEmitter } from './BaseEmitter'
|
|
35
|
-
import {
|
|
36
|
-
import { IdLogger } from './IdLogger'
|
|
36
|
+
import { ModuleErrorBuilder } from './Error'
|
|
37
37
|
import { duplicateModules, serializableField } from './lib'
|
|
38
38
|
import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query'
|
|
39
39
|
import { ModuleConfigQueryValidator, Queryable, SupportedQueryValidator } from './QueryValidator'
|
|
@@ -130,7 +130,7 @@ export class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventD
|
|
|
130
130
|
return compact([config, configSchema, address, ...queries])
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
async query<T extends
|
|
133
|
+
async query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
|
|
134
134
|
query: T,
|
|
135
135
|
payloads?: Payload[],
|
|
136
136
|
queryConfig?: TConfig,
|
|
@@ -161,7 +161,7 @@ export class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventD
|
|
|
161
161
|
}
|
|
162
162
|
} catch (ex) {
|
|
163
163
|
const error = ex as Error
|
|
164
|
-
resultPayloads.push(new
|
|
164
|
+
resultPayloads.push(new ModuleErrorBuilder([wrapper.hash], error.message).build())
|
|
165
165
|
}
|
|
166
166
|
const result = await this.bindResult(resultPayloads, queryAccount)
|
|
167
167
|
|
|
@@ -171,7 +171,7 @@ export class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventD
|
|
|
171
171
|
return result
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
-
queryable<T extends
|
|
174
|
+
queryable<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
|
|
175
175
|
query: T,
|
|
176
176
|
payloads?: Payload[],
|
|
177
177
|
queryConfig?: TConfig,
|
|
@@ -231,12 +231,12 @@ export class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventD
|
|
|
231
231
|
return result
|
|
232
232
|
}
|
|
233
233
|
|
|
234
|
-
protected bindQuery<T extends
|
|
234
|
+
protected bindQuery<T extends Query | PayloadWrapper<Query>>(
|
|
235
235
|
query: T,
|
|
236
236
|
payloads?: Payload[],
|
|
237
237
|
account?: AccountInstance,
|
|
238
|
-
): PromiseEx<[
|
|
239
|
-
const promise = new PromiseEx<[
|
|
238
|
+
): PromiseEx<[QueryBoundWitness, Payload[]], AccountInstance> {
|
|
239
|
+
const promise = new PromiseEx<[QueryBoundWitness, Payload[]], AccountInstance>((resolve) => {
|
|
240
240
|
const result = this.bindQueryInternal(query, payloads, account)
|
|
241
241
|
resolve?.(result)
|
|
242
242
|
return result
|
|
@@ -244,11 +244,11 @@ export class AbstractModule<TParams extends ModuleParams = ModuleParams, TEventD
|
|
|
244
244
|
return promise
|
|
245
245
|
}
|
|
246
246
|
|
|
247
|
-
protected bindQueryInternal<T extends
|
|
247
|
+
protected bindQueryInternal<T extends Query | PayloadWrapper<Query>>(
|
|
248
248
|
query: T,
|
|
249
249
|
payloads?: Payload[],
|
|
250
250
|
account?: AccountInstance,
|
|
251
|
-
): [
|
|
251
|
+
): [QueryBoundWitness, Payload[]] {
|
|
252
252
|
const builder = new QueryBoundWitnessBuilder().payloads(payloads).witness(this.account).query(query)
|
|
253
253
|
const result = (account ? builder.witness(account) : builder).build()
|
|
254
254
|
//this.logger?.debug(`result: ${JSON.stringify(result, null, 2)}`)
|