@webda/core 1.5.0 → 1.6.0-beta.1
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/lib/application.d.ts +0 -7
- package/lib/application.js +20 -18
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +32 -11
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +20 -2
- package/lib/core.js +73 -32
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +7 -7
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +40 -1
- package/lib/models/aclmodel.js +55 -0
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +17 -5
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +22 -6
- package/lib/models/coremodel.js +15 -7
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +6 -7
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ownermodel.spec.js +11 -11
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +2 -0
- package/lib/models/user.js +4 -2
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +9 -2
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.js +6 -5
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +3 -3
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +27 -0
- package/lib/queues/pubsubservice.js +21 -0
- package/lib/queues/pubsubservice.js.map +1 -0
- package/lib/queues/queueservice.d.ts +3 -16
- package/lib/queues/queueservice.js +2 -13
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/services/authentication.js +11 -6
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +14 -7
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.js +11 -6
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +6 -6
- package/lib/services/binary.spec.js +22 -21
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +9 -0
- package/lib/services/configuration.js +27 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +19 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.spec.js +2 -2
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/filebinary.js +9 -12
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.js +1 -1
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +7 -1
- package/lib/services/fileconfiguration.js +9 -0
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +83 -4
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +6 -0
- package/lib/services/kubernetesconfiguration.js +13 -0
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +40 -16
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +51 -2
- package/lib/services/mailer.js +24 -9
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +1 -1
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/oauth.js +1 -1
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/service.d.ts +10 -0
- package/lib/services/service.js +35 -5
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +28 -5
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +43 -0
- package/lib/stores/aggregator.js +106 -0
- package/lib/stores/aggregator.js.map +1 -0
- package/lib/stores/file.d.ts +1 -1
- package/lib/stores/file.js +5 -5
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +48 -20
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +151 -0
- package/lib/stores/mapper.js +294 -0
- package/lib/stores/mapper.js.map +1 -0
- package/lib/{policies/aclpolicy.spec.d.ts → stores/mapper.spec.d.ts} +0 -0
- package/lib/stores/mapper.spec.js +55 -0
- package/lib/stores/mapper.spec.js.map +1 -0
- package/lib/stores/memory.js +0 -3
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -1
- package/lib/stores/memory.spec.js +12 -0
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +31 -110
- package/lib/stores/store.js +51 -281
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +12 -0
- package/lib/stores/store.spec.js +116 -24
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/utils/context.d.ts +10 -0
- package/lib/utils/context.js +15 -3
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +5 -0
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +12 -0
- package/lib/utils/cookie.js +13 -1
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +13 -13
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/serializers.js +4 -4
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +11 -11
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/waiter.js +1 -1
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +6 -6
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +11 -9
- package/test/config-file-no-reload.json +70 -0
- package/test/config-file-reload.json +7 -1
- package/test/config-kube-reload.json +7 -1
- package/test/config.json +35 -23
- package/test/config.old-default.json +0 -16
- package/test/config.old.json +0 -16
- package/lib/policies/aclpolicy.d.ts +0 -16
- package/lib/policies/aclpolicy.js +0 -72
- package/lib/policies/aclpolicy.js.map +0 -1
- package/lib/policies/aclpolicy.spec.js +0 -104
- package/lib/policies/aclpolicy.spec.js.map +0 -1
- package/lib/policies/ownerpolicy.d.ts +0 -25
- package/lib/policies/ownerpolicy.js +0 -80
- package/lib/policies/ownerpolicy.js.map +0 -1
- package/lib/policies/ownerpolicy.spec.d.ts +0 -1
- package/lib/policies/ownerpolicy.spec.js +0 -199
- package/lib/policies/ownerpolicy.spec.js.map +0 -1
- package/lib/policies/rolepolicy.d.ts +0 -10
- package/lib/policies/rolepolicy.js +0 -47
- package/lib/policies/rolepolicy.js.map +0 -1
- package/lib/policies/rolepolicy.spec.d.ts +0 -1
- package/lib/policies/rolepolicy.spec.js +0 -91
- package/lib/policies/rolepolicy.spec.js.map +0 -1
- package/lib/utils/json.d.ts +0 -8
- package/lib/utils/json.js +0 -74
- package/lib/utils/json.js.map +0 -1
- package/lib/utils/json.spec.d.ts +0 -1
- package/lib/utils/json.spec.js +0 -83
- package/lib/utils/json.spec.js.map +0 -1
package/lib/services/mailer.d.ts
CHANGED
|
@@ -6,6 +6,44 @@ interface IEmailTemplate {
|
|
|
6
6
|
interface TemplatesMap {
|
|
7
7
|
[key: string]: IEmailTemplate;
|
|
8
8
|
}
|
|
9
|
+
interface MailerSendOptions {
|
|
10
|
+
/**
|
|
11
|
+
* Sender of the email
|
|
12
|
+
*
|
|
13
|
+
* @default parameters.sender
|
|
14
|
+
*/
|
|
15
|
+
from?: string;
|
|
16
|
+
/**
|
|
17
|
+
* Destination of the email
|
|
18
|
+
*/
|
|
19
|
+
to: string;
|
|
20
|
+
/**
|
|
21
|
+
* Template to user
|
|
22
|
+
*/
|
|
23
|
+
template?: string;
|
|
24
|
+
/**
|
|
25
|
+
* Replacements for the template
|
|
26
|
+
*/
|
|
27
|
+
replacements?: any;
|
|
28
|
+
/**
|
|
29
|
+
* Subject of the email
|
|
30
|
+
*
|
|
31
|
+
* Can be overriden by the template
|
|
32
|
+
*/
|
|
33
|
+
subject?: string;
|
|
34
|
+
/**
|
|
35
|
+
* HTML of the email
|
|
36
|
+
*
|
|
37
|
+
* Can be overriden by the template
|
|
38
|
+
*/
|
|
39
|
+
html?: string;
|
|
40
|
+
/**
|
|
41
|
+
* Text of the email
|
|
42
|
+
*
|
|
43
|
+
* Can be overriden by the template
|
|
44
|
+
*/
|
|
45
|
+
text?: string;
|
|
46
|
+
}
|
|
9
47
|
export declare class MailerParameters extends ServiceParameters {
|
|
10
48
|
/**
|
|
11
49
|
* Specify which foldeer contains templates
|
|
@@ -23,6 +61,10 @@ export declare class MailerParameters extends ServiceParameters {
|
|
|
23
61
|
* Define the default sender
|
|
24
62
|
*/
|
|
25
63
|
sender: string;
|
|
64
|
+
/**
|
|
65
|
+
* @see https://www.npmjs.com/package/email-templates
|
|
66
|
+
*/
|
|
67
|
+
emailTemplateOptions?: any;
|
|
26
68
|
constructor(params: any);
|
|
27
69
|
}
|
|
28
70
|
/**
|
|
@@ -56,13 +98,20 @@ declare class Mailer<T extends MailerParameters = MailerParameters> extends Serv
|
|
|
56
98
|
* @param name
|
|
57
99
|
* @returns
|
|
58
100
|
*/
|
|
59
|
-
_getTemplate(name:
|
|
101
|
+
_getTemplate(name: string): IEmailTemplate;
|
|
102
|
+
/**
|
|
103
|
+
* Check if the email template exists
|
|
104
|
+
*
|
|
105
|
+
* @param name
|
|
106
|
+
* @returns
|
|
107
|
+
*/
|
|
108
|
+
hasTemplate(name: string): boolean;
|
|
60
109
|
/**
|
|
61
110
|
*
|
|
62
111
|
* @params options Options to pass to the sendMail option of the nodemailer module
|
|
63
112
|
* @params callback to pass to the sendMail
|
|
64
113
|
*/
|
|
65
|
-
send(options:
|
|
114
|
+
send(options: MailerSendOptions, callback?: any): Promise<any>;
|
|
66
115
|
/**
|
|
67
116
|
* @inheritdoc
|
|
68
117
|
*/
|
package/lib/services/mailer.js
CHANGED
|
@@ -13,13 +13,22 @@ exports.Mailer = exports.MailerParameters = void 0;
|
|
|
13
13
|
const Email = require("email-templates");
|
|
14
14
|
const fs = require("fs");
|
|
15
15
|
const nodemailer = require("nodemailer");
|
|
16
|
+
const path = require("path");
|
|
16
17
|
const service_1 = require("./service");
|
|
17
18
|
class MailerParameters extends service_1.ServiceParameters {
|
|
18
19
|
constructor(params) {
|
|
19
|
-
var _a, _b;
|
|
20
|
+
var _a, _b, _c, _d, _e, _f;
|
|
21
|
+
var _g, _h, _j;
|
|
20
22
|
super(params);
|
|
21
23
|
(_a = this.templates) !== null && _a !== void 0 ? _a : (this.templates = "./templates");
|
|
24
|
+
if (!this.templates.endsWith("/")) {
|
|
25
|
+
this.templates += "/";
|
|
26
|
+
}
|
|
22
27
|
(_b = this.templatesEngine) !== null && _b !== void 0 ? _b : (this.templatesEngine = "mustache");
|
|
28
|
+
(_c = this.emailTemplateOptions) !== null && _c !== void 0 ? _c : (this.emailTemplateOptions = {});
|
|
29
|
+
(_d = (_g = this.emailTemplateOptions).juiceResources) !== null && _d !== void 0 ? _d : (_g.juiceResources = {});
|
|
30
|
+
(_e = (_h = this.emailTemplateOptions.juiceResources).webResources) !== null && _e !== void 0 ? _e : (_h.webResources = {});
|
|
31
|
+
(_f = (_j = this.emailTemplateOptions.juiceResources.webResources).relativeTo) !== null && _f !== void 0 ? _f : (_j.relativeTo = path.resolve(this.templates));
|
|
23
32
|
}
|
|
24
33
|
}
|
|
25
34
|
exports.MailerParameters = MailerParameters;
|
|
@@ -71,23 +80,29 @@ class Mailer extends service_1.Service {
|
|
|
71
80
|
*/
|
|
72
81
|
_getTemplate(name) {
|
|
73
82
|
if (!this._templates[name]) {
|
|
74
|
-
|
|
75
|
-
let templateDir = this.parameters.templates + "/";
|
|
76
|
-
if (!fs.existsSync(templateDir + name)) {
|
|
83
|
+
if (!this.hasTemplate(name)) {
|
|
77
84
|
this._webda.log("WARN", "No template found for", name);
|
|
78
85
|
return;
|
|
79
86
|
}
|
|
80
|
-
this._templates[name] = new Email({
|
|
81
|
-
|
|
82
|
-
root: templateDir,
|
|
87
|
+
this._templates[name] = new Email(Object.assign(Object.assign({}, this.parameters.emailTemplateOptions), { views: {
|
|
88
|
+
root: this.parameters.templates,
|
|
83
89
|
options: {
|
|
84
90
|
extension: this.parameters.templatesEngine
|
|
85
91
|
}
|
|
86
|
-
}
|
|
87
|
-
});
|
|
92
|
+
} }));
|
|
88
93
|
}
|
|
89
94
|
return this._templates[name];
|
|
90
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* Check if the email template exists
|
|
98
|
+
*
|
|
99
|
+
* @param name
|
|
100
|
+
* @returns
|
|
101
|
+
*/
|
|
102
|
+
hasTemplate(name) {
|
|
103
|
+
// Load template
|
|
104
|
+
return fs.existsSync(this.parameters.templates + name);
|
|
105
|
+
}
|
|
91
106
|
/**
|
|
92
107
|
*
|
|
93
108
|
* @params options Options to pass to the sendMail option of the nodemailer module
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,yCAAyC;AACzC,yBAAyB;AACzB,yCAAyC;
|
|
1
|
+
{"version":3,"file":"mailer.js","sourceRoot":"","sources":["../../src/services/mailer.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ let MailerTest = class MailerTest extends test_1.WebdaTest {
|
|
|
46
46
|
}
|
|
47
47
|
params() {
|
|
48
48
|
let params = new __1.MailerParameters({ templates: "ts", templatesEngine: "b" });
|
|
49
|
-
assert.strictEqual(params.templates, "ts");
|
|
49
|
+
assert.strictEqual(params.templates, "ts/");
|
|
50
50
|
assert.strictEqual(params.templatesEngine, "b");
|
|
51
51
|
}
|
|
52
52
|
unknownTemplate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;AAEb,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AAEpC,0BAAsC;AACtC,qCAAkC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gBAAS;IAO1B,MAAM;;;;;YACV,MAAM,OAAM,MAAM,WAAE,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAClF,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC5C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBACxD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;gBAC3B,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;gBAC7B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC,CAAC;YACF,qBAAqB;YACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;gBAC1C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,CAAC,CAAC;QACJ,CAAC;KAAA;IAGD,MAAM;QACJ,IAAI,MAAM,GAAG,IAAI,oBAAgB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7E,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"mailer.spec.js","sourceRoot":"","sources":["../../src/services/mailer.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/oauth.js
CHANGED
|
@@ -167,7 +167,7 @@ class OAuthService extends service_1.Service {
|
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
169
|
// Generate 2 random uuid: nonce and state
|
|
170
|
-
ctx.getSession().state = uuid_1.v4();
|
|
170
|
+
ctx.getSession().state = (0, uuid_1.v4)();
|
|
171
171
|
// Redirect to the calling uri
|
|
172
172
|
ctx.getSession().redirect = ctx.getHttpContext().getHeaders().referer;
|
|
173
173
|
ctx.redirect(this.generateAuthUrl(redirect_uri, ctx.getSession().state, ctx));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/services/oauth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/services/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,10 +132,20 @@ declare abstract class Service<T extends ServiceParameters = ServiceParameters>
|
|
|
132
132
|
* @param config new parameters for the service
|
|
133
133
|
*/
|
|
134
134
|
reinit(config: any): Promise<void>;
|
|
135
|
+
/**
|
|
136
|
+
* Display a message if the listener takes too long
|
|
137
|
+
* @param start
|
|
138
|
+
*/
|
|
139
|
+
elapse(start: number): void;
|
|
135
140
|
/**
|
|
136
141
|
* Emit the event with data and wait for Promise to finish if listener returned a Promise
|
|
137
142
|
*/
|
|
138
143
|
emitSync(event: any, data: any): Promise<any[]>;
|
|
144
|
+
/**
|
|
145
|
+
* Override to allow capturing long listeners
|
|
146
|
+
* @override
|
|
147
|
+
*/
|
|
148
|
+
emit(event: symbol | string, ...args: any[]): boolean;
|
|
139
149
|
/**
|
|
140
150
|
* Listen to an event as on(...) would do except that it will be asynchronous
|
|
141
151
|
* @param event
|
package/lib/services/service.js
CHANGED
|
@@ -235,21 +235,51 @@ class Service extends events.EventEmitter {
|
|
|
235
235
|
return this.init();
|
|
236
236
|
});
|
|
237
237
|
}
|
|
238
|
+
/**
|
|
239
|
+
* Display a message if the listener takes too long
|
|
240
|
+
* @param start
|
|
241
|
+
*/
|
|
242
|
+
elapse(start) {
|
|
243
|
+
let elapsed = Date.now() - start;
|
|
244
|
+
if (elapsed > 100) {
|
|
245
|
+
this.log("INFO", "Long listener", elapsed, "ms");
|
|
246
|
+
}
|
|
247
|
+
}
|
|
238
248
|
/**
|
|
239
249
|
* Emit the event with data and wait for Promise to finish if listener returned a Promise
|
|
240
250
|
*/
|
|
241
251
|
emitSync(event, data) {
|
|
242
|
-
var result;
|
|
243
252
|
var promises = [];
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
result =
|
|
253
|
+
for (let listener of this.listeners(event)) {
|
|
254
|
+
let start = Date.now();
|
|
255
|
+
let result = listener(data);
|
|
247
256
|
if (result instanceof Promise) {
|
|
248
|
-
promises.push(result
|
|
257
|
+
promises.push(result
|
|
258
|
+
.catch(err => {
|
|
259
|
+
this.log("ERROR", "Listener error", err);
|
|
260
|
+
})
|
|
261
|
+
.then(() => {
|
|
262
|
+
this.elapse(start);
|
|
263
|
+
}));
|
|
264
|
+
}
|
|
265
|
+
else {
|
|
266
|
+
this.elapse(start);
|
|
249
267
|
}
|
|
250
268
|
}
|
|
251
269
|
return Promise.all(promises);
|
|
252
270
|
}
|
|
271
|
+
/**
|
|
272
|
+
* Override to allow capturing long listeners
|
|
273
|
+
* @override
|
|
274
|
+
*/
|
|
275
|
+
emit(event, ...args) {
|
|
276
|
+
for (let listener of this.listeners(event)) {
|
|
277
|
+
let start = Date.now();
|
|
278
|
+
listener(...args);
|
|
279
|
+
this.elapse(start);
|
|
280
|
+
}
|
|
281
|
+
return true;
|
|
282
|
+
}
|
|
253
283
|
/**
|
|
254
284
|
* Listen to an event as on(...) would do except that it will be asynchronous
|
|
255
285
|
* @param event
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;AACb,iCAAkC;AAQlC;;;;GAIG;AACH,MAAM,QAAQ;IAMZ;;;;;;OAMG;IACH,YAAY,QAAgB,EAAE,eAAuB,EAAE,YAAqB,EAAE,WAAoB,KAAK;QACrG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBACzC,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aAC5C;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC;aAC9B;SACF;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC;SAClC;IACH,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAgB;QACtB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;SAC9D;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC7C,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,MAAM,IAAI,KAAK,CACb,gCAAgC,IAAI,eAAe,IAAI,CAAC,SAAS,UAAU,OAAO,CAAC,OAAO,EAAE,GAAG,CAChG,CAAC;aACH;YACD,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,UAAU,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SACrF;IACH,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,OAAgB;QAChC,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAClG,CAAC;CACF;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,MAAM,CAAC,eAAuB,EAAE,YAA+B,EAAE,QAAkB;IACjG,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QAC1C,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SAC7F;aAAM;YACL,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;SAC5F;IACH,CAAC,CAAC;AACJ,CAAC;AATD,wBASC;AAED;;GAEG;AACH,MAAa,iBAAiB;IAM5B;;;;OAIG;IACH,YAAY,MAAW;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;CACF;AAdD,8CAcC;AAED;;;;;;;;;GASG;AACH,MAAe,OAAyD,SAAQ,MAAM,CAAC,YAAY;IAsBjG;;;;;;;OAOG;IACH,YAAY,KAAW,EAAE,IAAY,EAAE,SAAc,EAAE;QACrD,KAAK,EAAE,CAAC;QAdV,mBAAc,GAAQ,SAAS,CAAC;QAe9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,2CAA2C;IAC7C,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;IACvD,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,sBAAsB;QACtB,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE1B,0EAA0E;QAC1E,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;OAMG;IACO,QAAQ,CAChB,GAAW,EACX,OAAyB,EACzB,QAAkB,EAClB,UAAkB,EAAE,EACpB,YAAqB,KAAK;QAE1B,IAAI,IAAI,GAAQ,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxB,OAAO,EAAE,QAAQ;YACjB,QAAQ,EAAE,IAAI,CAAC,KAAK;YACpB,SAAS;YACT,OAAO;YACP,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,UAAU;QACR,2CAA2C;IAC7C,CAAC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,MAAM;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACG,IAAI;;YACR,2CAA2C;QAC7C,CAAC;KAAA;IAED;;;OAGG;IACG,MAAM,CAAC,MAAM;;YACjB,IAAI,CAAC,UAAU,GAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;KAAA;IAED;;;OAGG;IACH,MAAM,CAAC,KAAa;QAClB,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACjC,IAAI,OAAO,GAAG,GAAG,EAAE;YACjB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI;QAClB,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC1C,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,MAAM,YAAY,OAAO,EAAE;gBAC7B,QAAQ,CAAC,IAAI,CACX,MAAM;qBACH,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;gBAC3C,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC,CAAC,CACL,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACpB;SACF;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,KAAsB,EAAE,GAAG,IAAW;QACzC,KAAK,IAAI,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC1C,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAgB,SAAS;QAChD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAe,aAAa,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtG,CAAC;IAED;;;OAGG;IACH,UAAU,CAAuC,OAAe;QAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAI,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ;QACb,2CAA2C;IAC7C,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,aAAa;QACb,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,UAAU,EAAE;YACnC,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,KAAqB,EAAE,GAAG,IAAW;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,SAAS;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAEQ,0BAAO"}
|
|
@@ -23,21 +23,21 @@ const sinon = require("sinon");
|
|
|
23
23
|
class FakeService extends __1.Service {
|
|
24
24
|
}
|
|
25
25
|
__decorate([
|
|
26
|
-
__1.Inject("Authentication2", true)
|
|
26
|
+
(0, __1.Inject)("Authentication2", true)
|
|
27
27
|
], FakeService.prototype, "serv", void 0);
|
|
28
28
|
__decorate([
|
|
29
|
-
__1.Inject("bean", "Authentication", true)
|
|
29
|
+
(0, __1.Inject)("bean", "Authentication", true)
|
|
30
30
|
], FakeService.prototype, "serv2", void 0);
|
|
31
31
|
__decorate([
|
|
32
|
-
__1.Inject("params:bean", undefined, true)
|
|
32
|
+
(0, __1.Inject)("params:bean", undefined, true)
|
|
33
33
|
], FakeService.prototype, "serv3", void 0);
|
|
34
34
|
__decorate([
|
|
35
|
-
__1.Inject("params:bean", undefined, false)
|
|
35
|
+
(0, __1.Inject)("params:bean", undefined, false)
|
|
36
36
|
], FakeService.prototype, "serv4", void 0);
|
|
37
37
|
class FakeService2 extends __1.Service {
|
|
38
38
|
}
|
|
39
39
|
__decorate([
|
|
40
|
-
__1.Inject("Authentication2")
|
|
40
|
+
(0, __1.Inject)("Authentication2")
|
|
41
41
|
], FakeService2.prototype, "serv", void 0);
|
|
42
42
|
let ServiceTest = class ServiceTest extends test_1.WebdaTest {
|
|
43
43
|
injector() {
|
|
@@ -77,6 +77,26 @@ let ServiceTest = class ServiceTest extends test_1.WebdaTest {
|
|
|
77
77
|
let service = new FakeService(this.webda, "plop", { type: "FakeService" });
|
|
78
78
|
assert.strictEqual(service.toString(), "FakeService[plop]");
|
|
79
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Ensure a message is displayed if listener is long
|
|
82
|
+
* Ensure error in listener are catched
|
|
83
|
+
*/
|
|
84
|
+
longListener() {
|
|
85
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
86
|
+
let service = new FakeService(this.webda, "plop", {});
|
|
87
|
+
let logs = [];
|
|
88
|
+
service.log = (...args) => {
|
|
89
|
+
logs.push(args);
|
|
90
|
+
};
|
|
91
|
+
service.on("test", () => __awaiter(this, void 0, void 0, function* () {
|
|
92
|
+
yield new Promise(resolve => setTimeout(resolve, 140));
|
|
93
|
+
throw new Error("My error");
|
|
94
|
+
}));
|
|
95
|
+
yield service.emitSync("test", undefined);
|
|
96
|
+
assert.strictEqual(logs.length, 2);
|
|
97
|
+
assert.deepStrictEqual(logs.map(l => `${l[0]}_${l[1]}`), ["ERROR_Listener error", "INFO_Long listener"]);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
80
100
|
};
|
|
81
101
|
__decorate([
|
|
82
102
|
mocha_1.test
|
|
@@ -90,6 +110,9 @@ __decorate([
|
|
|
90
110
|
__decorate([
|
|
91
111
|
mocha_1.test
|
|
92
112
|
], ServiceTest.prototype, "toStringMethod", null);
|
|
113
|
+
__decorate([
|
|
114
|
+
mocha_1.test
|
|
115
|
+
], ServiceTest.prototype, "longListener", null);
|
|
93
116
|
ServiceTest = __decorate([
|
|
94
117
|
mocha_1.suite
|
|
95
118
|
], ServiceTest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.spec.js","sourceRoot":"","sources":["../../src/services/service.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,kCAAoC;AACpC,iCAAiC;AACjC,0BAAqC;AACrC,+BAA+B;AAE/B,MAAM,WAAY,SAAQ,WAAO;CAShC;AAPC;IADC,UAAM,
|
|
1
|
+
{"version":3,"file":"service.spec.js","sourceRoot":"","sources":["../../src/services/service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { ModdaDefinition } from "../core";
|
|
2
|
+
import { CoreModel } from "../models/coremodel";
|
|
3
|
+
import MapperService, { MapperParameters, MapUpdates } from "./mapper";
|
|
4
|
+
export declare class AggregatorParameters extends MapperParameters {
|
|
5
|
+
/**
|
|
6
|
+
* @default index
|
|
7
|
+
*/
|
|
8
|
+
key: string;
|
|
9
|
+
constructor(params: any);
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Service that aggregate several CoreModel into one
|
|
13
|
+
* Similar to a Mapper except that the target is constant
|
|
14
|
+
*/
|
|
15
|
+
export default class AggregatorService<T extends AggregatorParameters = AggregatorParameters> extends MapperService<T> {
|
|
16
|
+
/**
|
|
17
|
+
* Create index if not existing
|
|
18
|
+
*
|
|
19
|
+
* @inheritdoc
|
|
20
|
+
*/
|
|
21
|
+
init(): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* @override
|
|
24
|
+
*/
|
|
25
|
+
loadParameters(params: any): AggregatorParameters;
|
|
26
|
+
/**
|
|
27
|
+
* Make sure the aggregate document exist
|
|
28
|
+
*/
|
|
29
|
+
createAggregate(): Promise<void>;
|
|
30
|
+
/**
|
|
31
|
+
* Create an aggregation
|
|
32
|
+
*
|
|
33
|
+
* @param object
|
|
34
|
+
* @param updates
|
|
35
|
+
* @returns
|
|
36
|
+
*/
|
|
37
|
+
handleMap(object: CoreModel, updates: MapUpdates): Promise<void>;
|
|
38
|
+
/**
|
|
39
|
+
* @override
|
|
40
|
+
*/
|
|
41
|
+
static getModda(): ModdaDefinition;
|
|
42
|
+
}
|
|
43
|
+
export { AggregatorService };
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.AggregatorService = exports.AggregatorParameters = void 0;
|
|
13
|
+
const mapper_1 = require("./mapper");
|
|
14
|
+
class AggregatorParameters extends mapper_1.MapperParameters {
|
|
15
|
+
constructor(params) {
|
|
16
|
+
var _a;
|
|
17
|
+
super(params);
|
|
18
|
+
(_a = this.key) !== null && _a !== void 0 ? _a : (this.key = "index");
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.AggregatorParameters = AggregatorParameters;
|
|
22
|
+
/**
|
|
23
|
+
* Service that aggregate several CoreModel into one
|
|
24
|
+
* Similar to a Mapper except that the target is constant
|
|
25
|
+
*/
|
|
26
|
+
class AggregatorService extends mapper_1.default {
|
|
27
|
+
/**
|
|
28
|
+
* Create index if not existing
|
|
29
|
+
*
|
|
30
|
+
* @inheritdoc
|
|
31
|
+
*/
|
|
32
|
+
init() {
|
|
33
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
yield this.createAggregate();
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* @override
|
|
39
|
+
*/
|
|
40
|
+
loadParameters(params) {
|
|
41
|
+
return new AggregatorParameters(params);
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Make sure the aggregate document exist
|
|
45
|
+
*/
|
|
46
|
+
createAggregate() {
|
|
47
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
+
if (!(yield this.targetStore.exists(this.parameters.key))) {
|
|
49
|
+
yield this.targetStore.save({
|
|
50
|
+
uuid: this.parameters.key
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Create an aggregation
|
|
57
|
+
*
|
|
58
|
+
* @param object
|
|
59
|
+
* @param updates
|
|
60
|
+
* @returns
|
|
61
|
+
*/
|
|
62
|
+
handleMap(object, updates) {
|
|
63
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
let mapUpdates = {};
|
|
65
|
+
if (typeof updates === "object") {
|
|
66
|
+
let toUpdate = false;
|
|
67
|
+
for (let i in updates) {
|
|
68
|
+
if (this.parameters.fields.indexOf(i) >= 0) {
|
|
69
|
+
toUpdate = true;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
if (!toUpdate) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (updates === "deleted") {
|
|
77
|
+
yield this.targetStore.removeAttribute(this.parameters.key, object.getUuid());
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
else if (updates === "created") {
|
|
81
|
+
updates = object;
|
|
82
|
+
}
|
|
83
|
+
// Create mapper
|
|
84
|
+
let mapper = {};
|
|
85
|
+
this.parameters.fields.forEach(id => {
|
|
86
|
+
mapper[id] = updates[id];
|
|
87
|
+
});
|
|
88
|
+
mapUpdates[object.getUuid()] = mapper;
|
|
89
|
+
mapUpdates._lastUpdate = new Date();
|
|
90
|
+
yield this.targetStore._patch(mapUpdates, this.parameters.key);
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* @override
|
|
95
|
+
*/
|
|
96
|
+
static getModda() {
|
|
97
|
+
return {
|
|
98
|
+
uuid: "Webda/Aggregator",
|
|
99
|
+
label: "Aggregator",
|
|
100
|
+
description: "Deduplicate content to an aggregate"
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
exports.default = AggregatorService;
|
|
105
|
+
exports.AggregatorService = AggregatorService;
|
|
106
|
+
//# sourceMappingURL=aggregator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregator.js","sourceRoot":"","sources":["../../src/stores/aggregator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCAAuE;AAEvE,MAAa,oBAAqB,SAAQ,yBAAgB;IAMxD,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAA,IAAI,CAAC,GAAG,oCAAR,IAAI,CAAC,GAAG,GAAK,OAAO,EAAC;IACvB,CAAC;CACF;AAVD,oDAUC;AAED;;;GAGG;AACH,MAAqB,iBAAyE,SAAQ,gBAAgB;IACpH;;;;OAIG;IACG,IAAI;;YACR,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC;KAAA;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACG,eAAe;;YACnB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE;gBACzD,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC1B,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG;iBAC1B,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAED;;;;;;OAMG;IACG,SAAS,CAAC,MAAiB,EAAE,OAAmB;;YACpD,IAAI,UAAU,GAAQ,EAAE,CAAC;YACzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,KAAK,IAAI,CAAC,IAAI,OAAO,EAAE;oBACrB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;wBAC1C,QAAQ,GAAG,IAAI,CAAC;qBACjB;iBACF;gBACD,IAAI,CAAC,QAAQ,EAAE;oBACb,OAAO;iBACR;aACF;iBAAM,IAAI,OAAO,KAAK,SAAS,EAAE;gBAChC,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9E,OAAO;aACR;iBAAM,IAAI,OAAO,KAAK,SAAS,EAAE;gBAChC,OAAO,GAAG,MAAM,CAAC;aAClB;YACD,gBAAgB;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBAClC,MAAM,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC;YACtC,UAAU,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,YAAY;YACnB,WAAW,EAAE,qCAAqC;SACnD,CAAC;IACJ,CAAC;CACF;AAzED,oCAyEC;AAEQ,8CAAiB"}
|
package/lib/stores/file.d.ts
CHANGED
package/lib/stores/file.js
CHANGED
|
@@ -175,8 +175,11 @@ class FileStore extends store_1.Store {
|
|
|
175
175
|
return __awaiter(this, void 0, void 0, function* () {
|
|
176
176
|
let res = yield this.exists(uid);
|
|
177
177
|
if (res) {
|
|
178
|
-
let data = fs.readFileSync(this.file(uid));
|
|
179
|
-
|
|
178
|
+
let data = JSON.parse(fs.readFileSync(this.file(uid)).toString());
|
|
179
|
+
if (data.__type !== this._model.name && this.parameters.strict) {
|
|
180
|
+
return undefined;
|
|
181
|
+
}
|
|
182
|
+
return this.initModel(data);
|
|
180
183
|
}
|
|
181
184
|
else if (raiseIfNotFound) {
|
|
182
185
|
throw new store_1.StoreNotFoundError(uid, this.getName());
|
|
@@ -204,9 +207,6 @@ class FileStore extends store_1.Store {
|
|
|
204
207
|
return __awaiter(this, void 0, void 0, function* () {
|
|
205
208
|
// This is only during test
|
|
206
209
|
require("fs-extra").emptyDirSync(this.parameters.folder);
|
|
207
|
-
if (this.parameters.index) {
|
|
208
|
-
yield this.createIndex();
|
|
209
|
-
}
|
|
210
210
|
});
|
|
211
211
|
}
|
|
212
212
|
/**
|
package/lib/stores/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/stores/file.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/stores/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { StoreTest } from "./store.spec";
|
|
2
|
-
import { Store } from "../index";
|
|
2
|
+
import { CoreModel, Store } from "../index";
|
|
3
3
|
declare class FileStoreTest extends StoreTest {
|
|
4
4
|
getUserStore(): Store<any>;
|
|
5
5
|
getIdentStore(): Store<any>;
|
|
6
|
+
getIndex(): Promise<CoreModel>;
|
|
7
|
+
recreateIndex(): Promise<void>;
|
|
6
8
|
cov(): Promise<void>;
|
|
7
9
|
configuration(): Promise<void>;
|
|
8
10
|
modelActions(): Promise<void>;
|