@webda/core 2.4.1 → 3.0.0
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 +171 -34
- package/lib/application.js +243 -47
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +44 -8
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +113 -54
- package/lib/core.js +222 -135
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +87 -43
- package/lib/core.spec.js.map +1 -1
- package/lib/errors.d.ts +65 -0
- package/lib/errors.js +113 -0
- package/lib/errors.js.map +1 -0
- package/lib/errors.spec.d.ts +1 -0
- package/lib/errors.spec.js +33 -0
- package/lib/errors.spec.js.map +1 -0
- 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 +4 -4
- package/lib/models/aclmodel.js +10 -6
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +33 -24
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +284 -92
- package/lib/models/coremodel.js +403 -103
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +162 -24
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +20 -6
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ownermodel.d.ts +13 -23
- package/lib/models/ownermodel.js +24 -51
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +23 -11
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/relations.d.ts +167 -0
- package/lib/models/relations.js +113 -0
- package/lib/models/relations.js.map +1 -0
- package/lib/models/rolemodel.d.ts +3 -3
- package/lib/models/rolemodel.js +6 -6
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +12 -12
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +40 -24
- package/lib/models/user.js +74 -48
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +24 -4
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +9 -5
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +17 -8
- package/lib/router.js +81 -9
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +89 -5
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.spec.js +4 -4
- package/lib/services/authentication.d.ts +21 -22
- package/lib/services/authentication.js +90 -109
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +51 -65
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +132 -31
- package/lib/services/binary.js +257 -72
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +16 -6
- package/lib/services/binary.spec.js +44 -117
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +9 -10
- package/lib/services/cloudbinary.js +14 -15
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +2 -2
- package/lib/services/cloudbinary.spec.js +13 -12
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.js +9 -9
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +5 -7
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.spec.js +3 -4
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +2 -2
- package/lib/services/cryptoservice.js +5 -2
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/domainservice.d.ts +113 -0
- package/lib/services/domainservice.js +357 -0
- package/lib/services/domainservice.js.map +1 -0
- package/lib/services/domainservice.spec.d.ts +1 -0
- package/lib/services/domainservice.spec.js +334 -0
- package/lib/services/domainservice.spec.js.map +1 -0
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +9 -2
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +13 -14
- package/lib/services/filebinary.js +79 -73
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +5 -0
- package/lib/services/filebinary.spec.js +222 -11
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.js +7 -7
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +23 -24
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +11 -9
- package/lib/services/invitationservice.js +17 -23
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +43 -40
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.js +12 -22
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +1 -6
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.js +1 -1
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +4 -1
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +17 -9
- package/lib/services/oauth.js +30 -4
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +32 -15
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/prometheus.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +9 -8
- package/lib/services/proxy.js +65 -36
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +28 -2
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/resource.d.ts +3 -3
- package/lib/services/resource.js +4 -3
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +3 -3
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +10 -13
- package/lib/services/service.js +29 -13
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +49 -11
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +2 -2
- package/lib/services/version.js.map +1 -1
- package/lib/stores/aggregator.js +1 -0
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/aliasstore.d.ts +2 -2
- package/lib/stores/aliasstore.js +15 -4
- package/lib/stores/aliasstore.js.map +1 -1
- package/lib/stores/aliasstore.spec.js +4 -2
- package/lib/stores/aliasstore.spec.js.map +1 -1
- package/lib/stores/file.d.ts +5 -2
- package/lib/stores/file.js +11 -8
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.js +21 -34
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +4 -2
- package/lib/stores/mapper.js +18 -11
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +6 -3
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +5 -2
- package/lib/stores/memory.js +11 -9
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -0
- package/lib/stores/memory.spec.js +100 -11
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +177 -87
- package/lib/stores/store.js +312 -141
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +2 -2
- package/lib/stores/store.spec.js +54 -38
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +14 -13
- package/lib/stores/webdaql/WebdaQLLexer.js +121 -112
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +14 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js +121 -112
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +15 -3
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +23 -13
- package/lib/stores/webdaql/WebdaQLParserParser.js +149 -94
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +9 -2
- package/lib/stores/webdaql/query.d.ts +6 -2
- package/lib/stores/webdaql/query.js +14 -1
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +10 -1
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +48 -19
- package/lib/test.js +171 -63
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +5 -0
- package/lib/unpackedapplication.js +58 -10
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/context.d.ts +76 -29
- package/lib/utils/context.js +91 -55
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.d.ts +9 -1
- package/lib/utils/context.spec.js +73 -8
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +4 -5
- package/lib/utils/cookie.js +1 -2
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +5 -3
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +9 -3
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/serializers.d.ts +46 -17
- package/lib/utils/serializers.js +116 -2
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +84 -20
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +14 -8
- package/lib/utils/session.js +14 -3
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.js +6 -1
- package/lib/utils/session.spec.js.map +1 -1
- package/package.json +16 -10
- package/test/cachedapp/webda.config.json +6 -1
- package/test/config-cached.json +5 -0
- package/test/config-file-missing-file.json +5 -7
- package/test/config-file-no-reload.json +5 -7
- package/test/config-file-reload.json +5 -7
- package/test/config-kube-reload.json +5 -11
- package/test/config-reload.json +2 -4
- package/test/config.json +12 -2
- package/test/moddas/voidstore.js +1 -1
- package/test/models/ident.js +6 -4
- package/test/models/task.js +4 -4
- package/webda.module.json +1587 -1266
|
@@ -14,7 +14,7 @@ let AliasStoreTest = class AliasStoreTest extends StoreTest {
|
|
|
14
14
|
let services = [
|
|
15
15
|
new AliasStore(this.webda, "aliasUser", {
|
|
16
16
|
targetStore: "MemoryIdents",
|
|
17
|
-
model: "
|
|
17
|
+
model: "Webda/User",
|
|
18
18
|
idTemplate: "{id}",
|
|
19
19
|
expose: {
|
|
20
20
|
url: "/alias/users"
|
|
@@ -22,7 +22,7 @@ let AliasStoreTest = class AliasStoreTest extends StoreTest {
|
|
|
22
22
|
}),
|
|
23
23
|
new AliasStore(this.webda, "aliasIdent", {
|
|
24
24
|
targetStore: "MemoryIdents",
|
|
25
|
-
model: "
|
|
25
|
+
model: "WebdaTest/Ident",
|
|
26
26
|
idTemplate: "{id}",
|
|
27
27
|
expose: {
|
|
28
28
|
url: "/alias/idents"
|
|
@@ -45,7 +45,9 @@ let AliasStoreTest = class AliasStoreTest extends StoreTest {
|
|
|
45
45
|
let store = this.getService("MemoryIdents");
|
|
46
46
|
store.getParameters().forceModel = false;
|
|
47
47
|
store.getParameters().strict = false;
|
|
48
|
+
// @ts-ignore
|
|
48
49
|
let original = store._get.bind(store);
|
|
50
|
+
// @ts-ignore
|
|
49
51
|
store._get = async (...args) => {
|
|
50
52
|
await this.sleep(1);
|
|
51
53
|
return original(...args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliasstore.spec.js","sourceRoot":"","sources":["../../src/stores/aliasstore.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"aliasstore.spec.js","sourceRoot":"","sources":["../../src/stores/aliasstore.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/stores/file.d.ts
CHANGED
|
@@ -51,7 +51,7 @@ declare class FileStore<T extends CoreModel, K extends FileStoreParameters = Fil
|
|
|
51
51
|
/**
|
|
52
52
|
* @override
|
|
53
53
|
*/
|
|
54
|
-
|
|
54
|
+
_exists(uid: any): Promise<boolean>;
|
|
55
55
|
/**
|
|
56
56
|
* @override
|
|
57
57
|
*/
|
|
@@ -95,7 +95,10 @@ declare class FileStore<T extends CoreModel, K extends FileStoreParameters = Fil
|
|
|
95
95
|
/**
|
|
96
96
|
* @override
|
|
97
97
|
*/
|
|
98
|
-
|
|
98
|
+
_incrementAttributes(uid: string, params: {
|
|
99
|
+
property: string;
|
|
100
|
+
value: number;
|
|
101
|
+
}[], updateDate: Date): Promise<any>;
|
|
99
102
|
/**
|
|
100
103
|
* @override
|
|
101
104
|
*/
|
package/lib/stores/file.js
CHANGED
|
@@ -53,7 +53,7 @@ class FileStore extends Store {
|
|
|
53
53
|
/**
|
|
54
54
|
* @override
|
|
55
55
|
*/
|
|
56
|
-
async
|
|
56
|
+
async _exists(uid) {
|
|
57
57
|
return fs.existsSync(this.file(uid));
|
|
58
58
|
}
|
|
59
59
|
/**
|
|
@@ -104,7 +104,7 @@ class FileStore extends Store {
|
|
|
104
104
|
let res = await this._get(uid, true);
|
|
105
105
|
this.checkCollectionUpdateCondition(res, prop, itemWriteConditionField, itemWriteCondition, index);
|
|
106
106
|
res[prop].splice(index, 1);
|
|
107
|
-
res
|
|
107
|
+
res._lastUpdate = updateDate;
|
|
108
108
|
return this._save(res);
|
|
109
109
|
}
|
|
110
110
|
/**
|
|
@@ -172,13 +172,16 @@ class FileStore extends Store {
|
|
|
172
172
|
/**
|
|
173
173
|
* @override
|
|
174
174
|
*/
|
|
175
|
-
async
|
|
175
|
+
async _incrementAttributes(uid, params, updateDate) {
|
|
176
176
|
let stored = await this._get(uid, true);
|
|
177
|
-
|
|
178
|
-
stored[prop]
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
177
|
+
params.forEach(({ property: prop, value }) => {
|
|
178
|
+
if (stored[prop] === undefined) {
|
|
179
|
+
stored[prop] = 0;
|
|
180
|
+
}
|
|
181
|
+
stored._lastUpdate = updateDate;
|
|
182
|
+
stored[prop] += value;
|
|
183
|
+
});
|
|
184
|
+
stored._lastUpdate = updateDate;
|
|
182
185
|
return this._save(stored);
|
|
183
186
|
}
|
|
184
187
|
/**
|
package/lib/stores/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/stores/file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,KAAK,EAAmB,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAGtF,MAAM,mBAAoB,SAAQ,eAAe;CAiBhD;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,SAAoF,SAAQ,KAAW;IAG3G;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;YAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE;gBAC1E,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;aAC7B,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SACtC;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,GAAG;QACN,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/stores/file.ts"],"names":[],"mappings":"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"}
|
package/lib/stores/file.spec.js
CHANGED
|
@@ -9,7 +9,7 @@ import * as assert from "assert";
|
|
|
9
9
|
import { existsSync } from "fs";
|
|
10
10
|
import pkg from "fs-extra";
|
|
11
11
|
import * as sinon from "sinon";
|
|
12
|
-
import { FileUtils } from "../index.js";
|
|
12
|
+
import { FileUtils, ModelMapLoaderImplementation, WebdaError } from "../index.js";
|
|
13
13
|
import { HttpContext } from "../utils/httpcontext.js";
|
|
14
14
|
import { StoreNotFoundError, UpdateConditionFailError } from "./store.js";
|
|
15
15
|
import { StoreTest } from "./store.spec.js";
|
|
@@ -21,7 +21,9 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
21
21
|
getIdentStore() {
|
|
22
22
|
// Need to slow down the _get
|
|
23
23
|
let store = this.getService("Idents");
|
|
24
|
+
// @ts-ignore
|
|
24
25
|
let original = store._get.bind(store);
|
|
26
|
+
// @ts-ignore
|
|
25
27
|
store._get = async (...args) => {
|
|
26
28
|
await this.sleep(1);
|
|
27
29
|
return original(...args);
|
|
@@ -29,20 +31,20 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
29
31
|
return store;
|
|
30
32
|
}
|
|
31
33
|
async getIndex() {
|
|
32
|
-
return this.getService("
|
|
34
|
+
return this.getService("MemoryAggregators").get("idents-index");
|
|
33
35
|
}
|
|
34
36
|
async recreateIndex() {
|
|
35
|
-
let store = this.getService("
|
|
37
|
+
let store = this.getService("MemoryAggregators");
|
|
36
38
|
await store.__clean();
|
|
37
|
-
await this.getService("
|
|
39
|
+
await this.getService("IdentsIndexer").createAggregate();
|
|
38
40
|
}
|
|
39
41
|
async update(delay = 100) {
|
|
40
42
|
// Increase the delay for FileStore
|
|
41
43
|
return super.update(delay);
|
|
42
44
|
}
|
|
43
45
|
async cov() {
|
|
44
|
-
let identStore = this.getService("
|
|
45
|
-
let userStore = this.getService("
|
|
46
|
+
let identStore = this.getService("Idents");
|
|
47
|
+
let userStore = this.getService("Users");
|
|
46
48
|
let user = await userStore.save({});
|
|
47
49
|
let ident = await identStore.save({
|
|
48
50
|
_user: user.getUuid()
|
|
@@ -60,11 +62,14 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
60
62
|
}), StoreNotFoundError);
|
|
61
63
|
await user.refresh();
|
|
62
64
|
assert.strictEqual(user.plop, undefined);
|
|
65
|
+
user.idents[0] = new ModelMapLoaderImplementation(identStore._model, user.idents[0]);
|
|
66
|
+
userStore["initModel"](user);
|
|
63
67
|
await identStore.delete(user.getUuid());
|
|
64
68
|
}
|
|
65
69
|
finally {
|
|
66
70
|
stub.restore();
|
|
67
71
|
}
|
|
72
|
+
identStore.incrementAttribute("test", "test", 12);
|
|
68
73
|
// Shoud return directly
|
|
69
74
|
await identStore.incrementAttribute("test", "test", 0);
|
|
70
75
|
removeSync(identStore.getParameters().folder);
|
|
@@ -91,18 +96,9 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
91
96
|
};
|
|
92
97
|
userStore.initRoutes();
|
|
93
98
|
userStore.getUrl("/url", ["GET"]);
|
|
94
|
-
// Test getParentUrl
|
|
95
|
-
assert.strictEqual(userStore.getParentUrl(), "/users/{P0uuid}");
|
|
96
|
-
// @ts-ignore
|
|
97
|
-
userStore.parent = {
|
|
98
|
-
getParentUrl: depth => `/fake/{P${depth}}`
|
|
99
|
-
};
|
|
100
|
-
assert.strictEqual(userStore.getParentUrl(), "/fake/{P1}/users/{P0uuid}");
|
|
101
|
-
userStore.getParameters().expose = undefined;
|
|
102
|
-
assert.throws(() => userStore.getParentUrl(), /Parent store need to be exposed/);
|
|
103
99
|
}
|
|
104
100
|
async configuration() {
|
|
105
|
-
let identStore = this.getService("
|
|
101
|
+
let identStore = this.getService("Idents");
|
|
106
102
|
assert.strictEqual(identStore.canTriggerConfiguration("plop", () => { }), false);
|
|
107
103
|
assert.strictEqual(await identStore.getConfiguration("plop"), undefined);
|
|
108
104
|
await identStore.save({ plop: 1, other: true, uuid: "plop" });
|
|
@@ -115,14 +111,14 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
115
111
|
return super.modelActions();
|
|
116
112
|
}
|
|
117
113
|
async cacheMishit() {
|
|
118
|
-
let identStore = this.getService("
|
|
114
|
+
let identStore = this.getService("Idents");
|
|
119
115
|
let ident = await identStore.save({ uuid: "test" });
|
|
120
116
|
await identStore._cacheStore.__clean();
|
|
121
117
|
// @ts-ignore
|
|
122
118
|
await ident.patch({ retest: true });
|
|
123
119
|
}
|
|
124
120
|
async modelStaticActions() {
|
|
125
|
-
let identStore = this.getService("
|
|
121
|
+
let identStore = this.getService("Idents");
|
|
126
122
|
let ctx, executor;
|
|
127
123
|
let eventFired = 0;
|
|
128
124
|
identStore.on("Store.Action", evt => {
|
|
@@ -141,38 +137,29 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
141
137
|
ctx.resetResponse();
|
|
142
138
|
// Return some infos instead of using ctx
|
|
143
139
|
// @ts-ignore
|
|
144
|
-
identStore._model.
|
|
140
|
+
identStore._model.index = async () => {
|
|
145
141
|
return "vouzouf";
|
|
146
142
|
};
|
|
147
143
|
await executor.execute(ctx);
|
|
148
144
|
// Our fake index action is just outputing 'indexer'
|
|
149
145
|
assert.strictEqual(ctx.getResponseBody(), "vouzouf");
|
|
150
|
-
ctx.resetResponse();
|
|
151
|
-
// @ts-ignore
|
|
152
|
-
identStore._model.index = async () => {
|
|
153
|
-
return "bouzouf";
|
|
154
|
-
};
|
|
155
|
-
// @ts-ignore
|
|
156
|
-
identStore._model._index = undefined;
|
|
157
|
-
await executor.execute(ctx);
|
|
158
|
-
assert.strictEqual(ctx.getResponseBody(), "bouzouf");
|
|
159
146
|
}
|
|
160
147
|
async httpCRUD() {
|
|
161
|
-
return super.httpCRUD();
|
|
148
|
+
return await super.httpCRUD();
|
|
162
149
|
}
|
|
163
150
|
async getURL() {
|
|
164
151
|
//assert.strictEqual((<Store<CoreModel>>this.webda.getService("users")).getUrl(), "/users");
|
|
165
152
|
}
|
|
166
153
|
async schemaCreate() {
|
|
167
154
|
let taskStore = this.webda.getService("Tasks");
|
|
168
|
-
let ctx = await this.webda.
|
|
155
|
+
let ctx = await this.webda.newWebContext(new HttpContext("webda.io", "GET", "/"));
|
|
169
156
|
let executor = this.getExecutor(ctx, "test.webda.io", "POST", "/tasks", {
|
|
170
157
|
noname: "Task #1"
|
|
171
158
|
});
|
|
172
|
-
this.webda.getModules().schemas["
|
|
159
|
+
this.webda.getModules().schemas["WebdaTest/Task"] = FileUtils.load("./test/schemas/task.json");
|
|
173
160
|
assert.notStrictEqual(executor, undefined);
|
|
174
161
|
ctx.getSession().login("fake_user", "fake_ident");
|
|
175
|
-
await assert.rejects(executor.execute(ctx),
|
|
162
|
+
await assert.rejects(executor.execute(ctx), WebdaError.BadRequest, "Should reject for bad schema");
|
|
176
163
|
executor = this.getExecutor(ctx, "test.webda.io", "POST", "/tasks", {
|
|
177
164
|
name: "Task #1"
|
|
178
165
|
});
|
|
@@ -186,11 +173,11 @@ let FileStoreTest = class FileStoreTest extends StoreTest {
|
|
|
186
173
|
executor = this.getExecutor(ctx, "test.webda.io", "PUT", `/tasks/${task.uuid}`, {
|
|
187
174
|
test: "plop"
|
|
188
175
|
});
|
|
189
|
-
await assert.rejects(() => executor.execute(ctx),
|
|
176
|
+
await assert.rejects(() => executor.execute(ctx), (err) => err.getResponseCode() === 400);
|
|
190
177
|
executor = this.getExecutor(ctx, "test.webda.io", "PATCH", `/tasks/${task.uuid}`, {
|
|
191
178
|
name: 123
|
|
192
179
|
});
|
|
193
|
-
await assert.rejects(() => executor.execute(ctx),
|
|
180
|
+
await assert.rejects(() => executor.execute(ctx), (err) => err.getResponseCode() === 400);
|
|
194
181
|
}
|
|
195
182
|
computeParams() {
|
|
196
183
|
let usersStore = this.getUserStore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.spec.js","sourceRoot":"","sources":["../../src/stores/file.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAwB,SAAS,EAAS,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"file.spec.js","sourceRoot":"","sources":["../../src/stores/file.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/stores/mapper.d.ts
CHANGED
|
@@ -54,7 +54,9 @@ export declare class MapperParameters extends ServiceParameters {
|
|
|
54
54
|
* @WebdaModda Mapper
|
|
55
55
|
*/
|
|
56
56
|
export default class MapperService<T extends MapperParameters = MapperParameters> extends Service<T> {
|
|
57
|
-
targetStore: Store
|
|
57
|
+
targetStore: Store<CoreModel & {
|
|
58
|
+
[key: string]: any[];
|
|
59
|
+
}>;
|
|
58
60
|
sourceService: Store;
|
|
59
61
|
/**
|
|
60
62
|
* @override
|
|
@@ -128,7 +130,7 @@ export default class MapperService<T extends MapperParameters = MapperParameters
|
|
|
128
130
|
* @param updateDate
|
|
129
131
|
* @param prop
|
|
130
132
|
*/
|
|
131
|
-
_handleMapFromPartial(uid: string, updateDate: Date,
|
|
133
|
+
_handleMapFromPartial(uid: string, updateDate: Date, property?: string | string[]): Promise<void>;
|
|
132
134
|
/**
|
|
133
135
|
* Manage one mapping update
|
|
134
136
|
*
|
package/lib/stores/mapper.js
CHANGED
|
@@ -4,6 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
+
import { ModelRef } from "../models/coremodel.js";
|
|
7
8
|
import { Inject, Service, ServiceParameters } from "../services/service.js";
|
|
8
9
|
/**
|
|
9
10
|
* Mapper configuration
|
|
@@ -38,8 +39,8 @@ export default class MapperService extends Service {
|
|
|
38
39
|
const method = this.parameters.async ? "onAsync" : "on";
|
|
39
40
|
this.sourceService[method]("Store.PartialUpdated", async (evt) => {
|
|
40
41
|
let prop;
|
|
41
|
-
if (evt.partial_update.
|
|
42
|
-
prop = evt.partial_update.
|
|
42
|
+
if (evt.partial_update.increments) {
|
|
43
|
+
prop = evt.partial_update.increments.map(c => c.property);
|
|
43
44
|
}
|
|
44
45
|
else if (evt.partial_update.addItem) {
|
|
45
46
|
prop = evt.partial_update.addItem.property;
|
|
@@ -193,17 +194,22 @@ export default class MapperService extends Service {
|
|
|
193
194
|
* @param updateDate
|
|
194
195
|
* @param prop
|
|
195
196
|
*/
|
|
196
|
-
async _handleMapFromPartial(uid, updateDate,
|
|
197
|
-
|
|
197
|
+
async _handleMapFromPartial(uid, updateDate, property = undefined) {
|
|
198
|
+
const props = Array.isArray(property) ? property : [property];
|
|
199
|
+
if (props.find(p => this.isMapped(p)) || this.isMapped("_lastUpdate")) {
|
|
198
200
|
// Not optimal need to reload the object
|
|
199
201
|
let source = await this.sourceService.getObject(uid);
|
|
200
202
|
let updates = {};
|
|
201
|
-
if (this.isMapped(
|
|
202
|
-
updates[
|
|
203
|
-
}
|
|
204
|
-
if (this.isMapped(prop)) {
|
|
205
|
-
updates[prop] = source[prop];
|
|
203
|
+
if (this.isMapped("_lastUpdate")) {
|
|
204
|
+
updates["_lastUpdate"] = updateDate;
|
|
206
205
|
}
|
|
206
|
+
props
|
|
207
|
+
.filter(prop => this.isMapped(prop))
|
|
208
|
+
.forEach(prop => {
|
|
209
|
+
if (this.isMapped(prop)) {
|
|
210
|
+
updates[prop] = source[prop];
|
|
211
|
+
}
|
|
212
|
+
});
|
|
207
213
|
await this.handleMap(source, updates);
|
|
208
214
|
}
|
|
209
215
|
}
|
|
@@ -223,9 +229,10 @@ export default class MapperService extends Service {
|
|
|
223
229
|
let toAdd = [];
|
|
224
230
|
let ids = [];
|
|
225
231
|
// Manage the update of linked object
|
|
226
|
-
if (typeof attribute === "string") {
|
|
232
|
+
if (typeof attribute === "string" || attribute instanceof ModelRef) {
|
|
233
|
+
attribute = attribute.toString();
|
|
227
234
|
if (updates[this.parameters.attribute] !== undefined && updates[this.parameters.attribute] !== attribute) {
|
|
228
|
-
toAdd.push(updates[this.parameters.attribute]);
|
|
235
|
+
toAdd.push(updates[this.parameters.attribute].toString());
|
|
229
236
|
toDelete.push(attribute);
|
|
230
237
|
}
|
|
231
238
|
else {
|
package/lib/stores/mapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../src/stores/mapper.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../src/stores/mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,13 +19,16 @@ let MapperTest = class MapperTest extends WebdaTest {
|
|
|
19
19
|
assert.notStrictEqual(ident.getUuid(), undefined);
|
|
20
20
|
// Test guard-rails (seems hardly reachable so might be useless)
|
|
21
21
|
assert.strictEqual(service.getMapper([], "id"), -1);
|
|
22
|
+
assert.strictEqual(
|
|
22
23
|
// @ts-ignore
|
|
23
|
-
|
|
24
|
+
await service._handleUpdatedMap(ident, { idents: [] }, {}), undefined);
|
|
25
|
+
assert.strictEqual(
|
|
24
26
|
// @ts-ignore
|
|
25
|
-
|
|
27
|
+
await service._handleDeletedMap(undefined, {}), undefined);
|
|
26
28
|
let stb = sinon.stub(service.targetStore, "upsertItemToCollection").callsFake(async () => { });
|
|
29
|
+
await service._handleUpdatedMapMapper(ident,
|
|
27
30
|
// @ts-ignore
|
|
28
|
-
|
|
31
|
+
{ idents: [], getUuid: () => "t" }, { uuid: "t" });
|
|
29
32
|
assert.strictEqual(stb.getCall(0).args.length, 3);
|
|
30
33
|
await this.getService("MemoryUsers").emitSync("Store.Deleted", {
|
|
31
34
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapper.spec.js","sourceRoot":"","sources":["../../src/stores/mapper.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,aAAa,MAAM,UAAU,CAAC;AAGrC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,SAAS;IAE1B,AAAN,KAAK,CAAC,GAAG;QACP,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAgB,oBAAoB,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAQ,cAAc,CAAC,CAAC;QACxD,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACpC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QAElD,gEAAgE;QAChE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,
|
|
1
|
+
{"version":3,"file":"mapper.spec.js","sourceRoot":"","sources":["../../src/stores/mapper.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,aAAa,MAAM,UAAU,CAAC;AAGrC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,SAAS;IAE1B,AAAN,KAAK,CAAC,GAAG;QACP,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAgB,oBAAoB,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAQ,cAAc,CAAC,CAAC;QACxD,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACpC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;QAElD,gEAAgE;QAChE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,WAAW;QAChB,aAAa;QACb,MAAM,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAC1D,SAAS,CACV,CAAC;QACF,MAAM,CAAC,WAAW;QAChB,aAAa;QACb,MAAM,OAAO,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,EAC9C,SAAS,CACV,CAAC;QAEF,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAC9F,MAAM,OAAO,CAAC,uBAAuB,CACnC,KAAK;QACL,aAAa;QACb,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,EAClC,EAAE,IAAI,EAAE,GAAG,EAAE,CACd,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,UAAU,CAAQ,aAAa,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE;YACpE,aAAa;YACb,MAAM,EAAE,EAAE;SACX,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC7B,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,kBAA2C;QAC3D,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE;YACjD,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,aAAa;YACrB,SAAS,EAAE,MAAM;YACjB,eAAe,EAAE,aAAa;YAC9B,MAAM,EAAE,CAAC,OAAO,CAAC;SAClB,CAAC,CAAC;QACH,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,CAAe,cAAc,CAAC,CAAC;QAC/D,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAuC,aAAa,CAAC,CAAC;QACrF,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,IAAI,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,IAAI,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,IAAI,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;YACjC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,kBAAkB,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5C,KAAK,EAAE,eAAe;SACvB,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,aAAa;QACb,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,eAAe,CACpB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC,EACH;YACE;gBACE,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,QAAQ;aACf;SACF,CACF,CAAC;QACF,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AAvKO;IADL,IAAI;qCAmCJ;AAGK;IADL,IAAI;mDAGJ;AAGK;IADL,IAAI;oDAOJ;AAlDG,UAAU;IADf,KAAK;GACA,UAAU,CAyKf"}
|
package/lib/stores/memory.d.ts
CHANGED
|
@@ -80,7 +80,7 @@ declare class MemoryStore<T extends CoreModel = CoreModel, K extends MemoryStore
|
|
|
80
80
|
/**
|
|
81
81
|
* @override
|
|
82
82
|
*/
|
|
83
|
-
|
|
83
|
+
_exists(uid: any): Promise<boolean>;
|
|
84
84
|
/**
|
|
85
85
|
* @override
|
|
86
86
|
*/
|
|
@@ -127,7 +127,10 @@ declare class MemoryStore<T extends CoreModel = CoreModel, K extends MemoryStore
|
|
|
127
127
|
/**
|
|
128
128
|
* @override
|
|
129
129
|
*/
|
|
130
|
-
|
|
130
|
+
_incrementAttributes(uid: any, params: {
|
|
131
|
+
property: string;
|
|
132
|
+
value: number;
|
|
133
|
+
}[], updateDate: Date): Promise<T>;
|
|
131
134
|
/**
|
|
132
135
|
* @inheritdoc
|
|
133
136
|
*/
|
package/lib/stores/memory.js
CHANGED
|
@@ -101,7 +101,7 @@ class MemoryStore extends Store {
|
|
|
101
101
|
/**
|
|
102
102
|
* @override
|
|
103
103
|
*/
|
|
104
|
-
async
|
|
104
|
+
async _exists(uid) {
|
|
105
105
|
return this.storage[uid] !== undefined;
|
|
106
106
|
}
|
|
107
107
|
/**
|
|
@@ -114,7 +114,7 @@ class MemoryStore extends Store {
|
|
|
114
114
|
* @override
|
|
115
115
|
*/
|
|
116
116
|
async _save(object) {
|
|
117
|
-
let uid = object
|
|
117
|
+
let uid = object.getUuid();
|
|
118
118
|
this.storage[uid] = object.toStoredJSON(true);
|
|
119
119
|
return this._getSync(uid);
|
|
120
120
|
}
|
|
@@ -206,13 +206,15 @@ class MemoryStore extends Store {
|
|
|
206
206
|
/**
|
|
207
207
|
* @override
|
|
208
208
|
*/
|
|
209
|
-
async
|
|
209
|
+
async _incrementAttributes(uid, params, updateDate) {
|
|
210
210
|
const res = await this._get(uid, true);
|
|
211
|
-
|
|
212
|
-
res[prop]
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
211
|
+
params.forEach(({ property: prop, value }) => {
|
|
212
|
+
if (!res[prop]) {
|
|
213
|
+
res[prop] = 0;
|
|
214
|
+
}
|
|
215
|
+
res[prop] += value;
|
|
216
|
+
});
|
|
217
|
+
res._lastUpdate = updateDate;
|
|
216
218
|
return this._save(res);
|
|
217
219
|
}
|
|
218
220
|
/**
|
|
@@ -230,7 +232,7 @@ class MemoryStore extends Store {
|
|
|
230
232
|
throw new UpdateConditionFailError(uid, itemWriteConditionField, itemWriteCondition);
|
|
231
233
|
}
|
|
232
234
|
res[prop].splice(index, 1);
|
|
233
|
-
res
|
|
235
|
+
res._lastUpdate = updateDate;
|
|
234
236
|
return this._save(res);
|
|
235
237
|
}
|
|
236
238
|
}
|
package/lib/stores/memory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/stores/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAmB,kBAAkB,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAOhH;;GAEG;AACH,MAAM,qBAAsB,SAAQ,eAAe;IAyBjD,YAAY,MAAW,EAAE,OAAoB;;QAC3C,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,MAAA,IAAI,CAAC,WAAW,EAAC,KAAK,QAAL,KAAK,GAAK,IAAI,EAAC;YAChC,MAAA,IAAI,CAAC,WAAW,EAAC,MAAM,QAAN,MAAM,GAAK,aAAa,EAAC;SAC3C;IACH,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,WAGJ,SAAQ,KAAW;IAHrB;;QAIE;;WAEG;QACH,YAAO,GAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/stores/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAmB,kBAAkB,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAOhH;;GAEG;AACH,MAAM,qBAAsB,SAAQ,eAAe;IAyBjD,YAAY,MAAW,EAAE,OAAoB;;QAC3C,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,MAAA,IAAI,CAAC,WAAW,EAAC,KAAK,QAAL,KAAK,GAAK,IAAI,EAAC;YAChC,MAAA,IAAI,CAAC,WAAW,EAAC,MAAM,QAAN,MAAM,GAAK,aAAa,EAAC;SAC3C;IACH,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,WAGJ,SAAQ,KAAW;IAHrB;;QAIE;;WAEG;QACH,YAAO,GAAe,EAAE,CAAC;IAyP3B,CAAC;IA/OC;;;;OAIG;IACH,OAAO;QACL,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,wBAAwB;QACxB,IAAI,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClG,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzF,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;IACnF,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;aACzF;YACD,IAAI;gBACF,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBAChD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;iBACpG;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,qCAAqC,EAAE,GAAG,CAAC,CAAC;gBAC7D,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;aACnB;YACD,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;gBACrC,GAAG,EAAE,CAAC,MAAkB,EAAE,CAAS,EAAE,KAAU,EAAW,EAAE;oBAC1D,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;oBAClB,IAAI,CAAC,kBAAkB,KAAvB,IAAI,CAAC,kBAAkB,GAAK,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,EAAC;oBAChG,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;SACJ;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,GAAG;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,KAAoB;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,MAAS;QACnB,IAAI,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,GAAW;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,MAAW,EAAE,IAAY,EAAE,cAAoB,EAAE,mBAA4B;QACxF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAW,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7E,KAAK,IAAI,IAAI,IAAI,MAAM,EAAE;YACvB,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,MAAW,EAAE,GAAW,EAAE,cAAoB,EAAE,mBAA4B;QACxF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAW,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,IAAe;QAC1B,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;YAClB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrC;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,GAAW,EAAE,kBAA2B,KAAK;QACpD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACtD;aAAM,IAAI,eAAe,EAAE;YAC1B,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,SAAiB,EAAE,cAAoB,EAAE,mBAA4B;QACxG,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAW,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7E,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,kBAA2B,KAAK;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,eAAe,EAAE;gBACnB,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;aACnD;YACD,OAAO;SACR;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAA6C,EAAE,UAAgB;QAC7F,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACd,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACf;YACD,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,uBAAuB,CAC3B,GAAW,EACX,IAAY,EACZ,IAAS,EACT,KAAa,EACb,kBAAuB,EACvB,uBAA+B,EAC/B,UAAgB;QAEhB,OAAO,IAAI,CAAC,8BAA8B,CACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,EACnB,IAAI,EACT,IAAI,EACJ,UAAU,EACV,KAAK,EACL,kBAAkB,EAClB,uBAAuB,CACxB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,UAAgB;QAC7G,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,kBAAkB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,uBAAuB,CAAC,IAAI,kBAAkB,EAAE;YACzF,MAAM,IAAI,wBAAwB,CAAC,GAAG,EAAE,uBAAuB,EAAE,kBAAkB,CAAC,CAAC;SACtF;QACD,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3B,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;CACF;AAED,OAAO,EAAE,WAAW,EAAc,WAAW,IAAI,IAAI,EAAE,CAAC"}
|