@webda/core 2.0.0 → 2.0.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/models/aclmodel.spec.js +2 -1
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +27 -9
- package/lib/models/coremodel.js +109 -18
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +58 -3
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +6 -6
- package/lib/models/user.js.map +1 -1
- package/lib/services/authentication.js +13 -13
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/binary.d.ts +1 -1
- package/lib/services/binary.js +1 -1
- package/lib/services/binary.js.map +1 -1
- package/lib/services/invitationservice.d.ts +1 -1
- package/lib/services/invitationservice.js +1 -1
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +8 -8
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/stores/file.spec.js +3 -2
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.spec.js +5 -3
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/store.d.ts +10 -4
- package/lib/stores/store.js +23 -11
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.js +6 -5
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/unpackedapplication.js +19 -7
- package/lib/unpackedapplication.js.map +1 -1
- package/package.json +3 -3
- package/webda.module.json +1 -63
|
@@ -19,7 +19,7 @@ let AclPolicyTest = class AclPolicyTest {
|
|
|
19
19
|
this._ctx = await this._webda.newContext(new HttpContext("test.webda.io", "GET", "/"));
|
|
20
20
|
this._session = this._ctx.getSession();
|
|
21
21
|
this._session.login("user-uid", "none");
|
|
22
|
-
this.model = new AclModel();
|
|
22
|
+
this.model = new AclModel().getProxy();
|
|
23
23
|
this._user = new User();
|
|
24
24
|
this._user.uuid = "user-uid";
|
|
25
25
|
this._user.addGroup("gip-123");
|
|
@@ -88,6 +88,7 @@ let AclPolicyTest = class AclPolicyTest {
|
|
|
88
88
|
// @ts-ignore
|
|
89
89
|
this.model.__store = {
|
|
90
90
|
save: async () => this.model,
|
|
91
|
+
patch: async () => this.model,
|
|
91
92
|
// @ts-ignore
|
|
92
93
|
getService: () => {
|
|
93
94
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aclmodel.spec.js","sourceRoot":"","sources":["../../src/models/aclmodel.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAW,IAAI,EAAE,WAAW,EAAW,IAAI,EAAE,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAG/D,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOjB,KAAK,CAAC,MAAM;QACV,IAAI,GAAG,GAAG,IAAI,eAAe,CAAC,SAAS,GAAG,yBAAyB,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"aclmodel.spec.js","sourceRoot":"","sources":["../../src/models/aclmodel.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -116,7 +116,8 @@ declare class CoreModel {
|
|
|
116
116
|
*
|
|
117
117
|
* @TJS-ignore
|
|
118
118
|
*/
|
|
119
|
-
__store: Store<
|
|
119
|
+
__store: Store<this>;
|
|
120
|
+
__dirty: Set<string | symbol>;
|
|
120
121
|
/**
|
|
121
122
|
* Creation date
|
|
122
123
|
*/
|
|
@@ -132,6 +133,16 @@ declare class CoreModel {
|
|
|
132
133
|
*/
|
|
133
134
|
__deleted: boolean;
|
|
134
135
|
constructor();
|
|
136
|
+
/**
|
|
137
|
+
* Return a proxy to the object to detect if dirty
|
|
138
|
+
* @returns
|
|
139
|
+
*/
|
|
140
|
+
getProxy(): this;
|
|
141
|
+
/**
|
|
142
|
+
* Return true if needs a save
|
|
143
|
+
* @returns
|
|
144
|
+
*/
|
|
145
|
+
isDirty(): boolean;
|
|
135
146
|
/**
|
|
136
147
|
*
|
|
137
148
|
* @returns the uuid of the object
|
|
@@ -181,6 +192,12 @@ declare class CoreModel {
|
|
|
181
192
|
* @returns
|
|
182
193
|
*/
|
|
183
194
|
static factory(model: new () => CoreModel, object: any, context?: Context): CoreModel;
|
|
195
|
+
/**
|
|
196
|
+
* Detect what looks like a CoreModel but can be from different version
|
|
197
|
+
* @param object
|
|
198
|
+
* @returns
|
|
199
|
+
*/
|
|
200
|
+
static instanceOf(object: any): boolean;
|
|
184
201
|
/**
|
|
185
202
|
* Return if an object is attached to its store
|
|
186
203
|
*/
|
|
@@ -188,7 +205,7 @@ declare class CoreModel {
|
|
|
188
205
|
/**
|
|
189
206
|
* Attach an object to a store instance
|
|
190
207
|
*/
|
|
191
|
-
attach(store: Store<
|
|
208
|
+
attach(store: Store<this>): this;
|
|
192
209
|
/**
|
|
193
210
|
* Return a unique reference within the application to the object
|
|
194
211
|
*
|
|
@@ -224,7 +241,7 @@ declare class CoreModel {
|
|
|
224
241
|
/**
|
|
225
242
|
* Return the object registered store
|
|
226
243
|
*/
|
|
227
|
-
getStore(): Store<
|
|
244
|
+
getStore(): Store<this>;
|
|
228
245
|
/**
|
|
229
246
|
* Get the object again
|
|
230
247
|
*
|
|
@@ -238,17 +255,18 @@ declare class CoreModel {
|
|
|
238
255
|
*/
|
|
239
256
|
delete(): Promise<void>;
|
|
240
257
|
/**
|
|
241
|
-
*
|
|
242
|
-
*
|
|
243
|
-
* @
|
|
258
|
+
* Patch current object with this update
|
|
259
|
+
* @param obj
|
|
260
|
+
* @param conditionField
|
|
261
|
+
* @param conditionValue
|
|
244
262
|
*/
|
|
245
|
-
|
|
263
|
+
patch(obj: Partial<this>, conditionField?: string | null, conditionValue?: any): Promise<void>;
|
|
246
264
|
/**
|
|
247
|
-
*
|
|
265
|
+
* Save this object
|
|
248
266
|
*
|
|
249
267
|
* @throws Error if the object is not coming from a store
|
|
250
268
|
*/
|
|
251
|
-
|
|
269
|
+
save(full?: boolean | keyof this, ...args: (keyof this)[]): Promise<this>;
|
|
252
270
|
/**
|
|
253
271
|
* Validate objet modification
|
|
254
272
|
*
|
package/lib/models/coremodel.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 util from "util";
|
|
7
8
|
import { v4 as uuidv4 } from "uuid";
|
|
8
9
|
import { Context } from "../utils/context.js";
|
|
9
10
|
/**
|
|
@@ -38,8 +39,67 @@ export function NotEnumerable(target, propertyKey) {
|
|
|
38
39
|
*/
|
|
39
40
|
class CoreModel {
|
|
40
41
|
constructor() {
|
|
42
|
+
this.__dirty = new Set();
|
|
41
43
|
this.__class = new.target;
|
|
42
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* Return a proxy to the object to detect if dirty
|
|
47
|
+
* @returns
|
|
48
|
+
*/
|
|
49
|
+
getProxy() {
|
|
50
|
+
const subProxier = prop => {
|
|
51
|
+
return {
|
|
52
|
+
set: (target, p, value) => {
|
|
53
|
+
this.__dirty.add(prop);
|
|
54
|
+
target[p] = value;
|
|
55
|
+
return true;
|
|
56
|
+
},
|
|
57
|
+
get: (target, p) => {
|
|
58
|
+
if (Array.isArray(target[p]) || (target[p] instanceof Object && target[p].prototype == Object.prototype)) {
|
|
59
|
+
return new Proxy(target[p], subProxier(prop));
|
|
60
|
+
}
|
|
61
|
+
return target[p];
|
|
62
|
+
},
|
|
63
|
+
deleteProperty: (t, property) => {
|
|
64
|
+
delete t[property];
|
|
65
|
+
this.__dirty.add(prop);
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
};
|
|
70
|
+
const proxier = {
|
|
71
|
+
deleteProperty: (t, property) => {
|
|
72
|
+
delete t[property];
|
|
73
|
+
this.__dirty.add(property);
|
|
74
|
+
return true;
|
|
75
|
+
},
|
|
76
|
+
set: (target, p, value) => {
|
|
77
|
+
if (p !== "__dirty") {
|
|
78
|
+
target.__dirty.add(p);
|
|
79
|
+
}
|
|
80
|
+
target[p] = value;
|
|
81
|
+
return true;
|
|
82
|
+
},
|
|
83
|
+
get: (target, p) => {
|
|
84
|
+
if (typeof p === "string" && p.startsWith("__")) {
|
|
85
|
+
return target[p];
|
|
86
|
+
}
|
|
87
|
+
if (Array.isArray(target[p]) ||
|
|
88
|
+
(typeof target[p] === "object" && target[p].constructor.prototype === Object.prototype)) {
|
|
89
|
+
return new Proxy(target[p], subProxier(p));
|
|
90
|
+
}
|
|
91
|
+
return target[p];
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
return new Proxy(this, proxier);
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Return true if needs a save
|
|
98
|
+
* @returns
|
|
99
|
+
*/
|
|
100
|
+
isDirty() {
|
|
101
|
+
return this.__dirty.size > 0;
|
|
102
|
+
}
|
|
43
103
|
/**
|
|
44
104
|
*
|
|
45
105
|
* @returns the uuid of the object
|
|
@@ -106,6 +166,14 @@ class CoreModel {
|
|
|
106
166
|
static factory(model, object, context) {
|
|
107
167
|
return new model().setContext(context).load(object, context === undefined);
|
|
108
168
|
}
|
|
169
|
+
/**
|
|
170
|
+
* Detect what looks like a CoreModel but can be from different version
|
|
171
|
+
* @param object
|
|
172
|
+
* @returns
|
|
173
|
+
*/
|
|
174
|
+
static instanceOf(object) {
|
|
175
|
+
return (typeof object.toStoredJSON === "function" && object.__class && object.__class.factory && object.__class.instanceOf);
|
|
176
|
+
}
|
|
109
177
|
/**
|
|
110
178
|
* Return if an object is attached to its store
|
|
111
179
|
*/
|
|
@@ -142,7 +210,7 @@ class CoreModel {
|
|
|
142
210
|
const [store, uuid] = fullUuid.split("$");
|
|
143
211
|
let service = core.getService(store);
|
|
144
212
|
if (partials) {
|
|
145
|
-
return service.
|
|
213
|
+
return service.newModel(partials).setUuid(uuid);
|
|
146
214
|
}
|
|
147
215
|
return service.get(uuid);
|
|
148
216
|
}
|
|
@@ -160,6 +228,12 @@ class CoreModel {
|
|
|
160
228
|
}
|
|
161
229
|
this[prop] = raw[prop];
|
|
162
230
|
}
|
|
231
|
+
if (this._creationDate) {
|
|
232
|
+
this._creationDate = new Date(this._creationDate);
|
|
233
|
+
}
|
|
234
|
+
if (this._lastUpdate) {
|
|
235
|
+
this._lastUpdate = new Date(this._lastUpdate);
|
|
236
|
+
}
|
|
163
237
|
this.__type = this.__class.name;
|
|
164
238
|
if (!this.getUuid()) {
|
|
165
239
|
this.setUuid(this.generateUid(raw));
|
|
@@ -198,13 +272,11 @@ class CoreModel {
|
|
|
198
272
|
}
|
|
199
273
|
let obj = await this.__store.get(this.getUuid());
|
|
200
274
|
if (obj) {
|
|
201
|
-
|
|
202
|
-
this[i] = obj[i];
|
|
203
|
-
}
|
|
275
|
+
Object.assign(this, obj);
|
|
204
276
|
for (let i in this) {
|
|
205
277
|
// @ts-ignore
|
|
206
278
|
if (obj[i] !== this[i]) {
|
|
207
|
-
this[i]
|
|
279
|
+
delete this[i];
|
|
208
280
|
}
|
|
209
281
|
}
|
|
210
282
|
}
|
|
@@ -222,28 +294,44 @@ class CoreModel {
|
|
|
222
294
|
return this.__store.delete(this.getUuid());
|
|
223
295
|
}
|
|
224
296
|
/**
|
|
225
|
-
*
|
|
226
|
-
*
|
|
227
|
-
* @
|
|
297
|
+
* Patch current object with this update
|
|
298
|
+
* @param obj
|
|
299
|
+
* @param conditionField
|
|
300
|
+
* @param conditionValue
|
|
228
301
|
*/
|
|
229
|
-
async
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
}
|
|
233
|
-
Object.assign(this, await this.__store.save(this));
|
|
234
|
-
return this;
|
|
302
|
+
async patch(obj, conditionField, conditionValue) {
|
|
303
|
+
await this.__store.patch({ [this.__class.getUuidField()]: this.getUuid(), ...obj }, true, conditionField, conditionValue);
|
|
304
|
+
Object.assign(this, obj);
|
|
235
305
|
}
|
|
236
306
|
/**
|
|
237
|
-
*
|
|
307
|
+
* Save this object
|
|
238
308
|
*
|
|
239
309
|
* @throws Error if the object is not coming from a store
|
|
240
310
|
*/
|
|
241
|
-
async
|
|
311
|
+
async save(full, ...args) {
|
|
242
312
|
if (!this.__store) {
|
|
243
313
|
throw new CoreModelUnattachedError();
|
|
244
314
|
}
|
|
245
|
-
|
|
246
|
-
|
|
315
|
+
// If proxy is not used and not field specified call save
|
|
316
|
+
if ((!util.types.isProxy(this) && full === undefined) || full === true) {
|
|
317
|
+
await this.__store.save(this);
|
|
318
|
+
return this;
|
|
319
|
+
}
|
|
320
|
+
const patch = {
|
|
321
|
+
[this.__class.getUuidField()]: this.getUuid()
|
|
322
|
+
};
|
|
323
|
+
if (typeof full === "string") {
|
|
324
|
+
[full, ...args].forEach(k => {
|
|
325
|
+
patch[k] = this[k];
|
|
326
|
+
});
|
|
327
|
+
}
|
|
328
|
+
else {
|
|
329
|
+
for (let entry of this.__dirty.entries()) {
|
|
330
|
+
patch[entry[0]] = this[entry[0]];
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
await this.__store.patch(patch);
|
|
334
|
+
this.__dirty.clear();
|
|
247
335
|
return this;
|
|
248
336
|
}
|
|
249
337
|
/**
|
|
@@ -386,5 +474,8 @@ __decorate([
|
|
|
386
474
|
__decorate([
|
|
387
475
|
NotEnumerable
|
|
388
476
|
], CoreModel.prototype, "__store", void 0);
|
|
477
|
+
__decorate([
|
|
478
|
+
NotEnumerable
|
|
479
|
+
], CoreModel.prototype, "__dirty", void 0);
|
|
389
480
|
export { CoreModel };
|
|
390
481
|
//# sourceMappingURL=coremodel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAyE3C;;GAEG;AACH,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC1C,CAAC;CACF;AAED,MAAM,UAAU,aAAa,CAAC,MAAW,EAAE,WAAmB;IAC5D,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;QACzC,GAAG,CAAC,KAAK;YACP,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE;gBACvC,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;QACD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,SAAS;
|
|
1
|
+
{"version":3,"file":"coremodel.js","sourceRoot":"","sources":["../../src/models/coremodel.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ import { suite, test } from "@testdeck/mocha";
|
|
|
8
8
|
import * as assert from "assert";
|
|
9
9
|
import * as sinon from "sinon";
|
|
10
10
|
import { CoreModel } from "...js";
|
|
11
|
-
import { WebdaTest } from "../test.js";
|
|
12
11
|
import { Task } from "../../test/models/task.js";
|
|
12
|
+
import { WebdaTest } from "../test.js";
|
|
13
13
|
let CoreModelTest = class CoreModelTest extends WebdaTest {
|
|
14
14
|
unsecureLoad() {
|
|
15
15
|
let object = new CoreModel();
|
|
@@ -64,13 +64,19 @@ let CoreModelTest = class CoreModelTest extends WebdaTest {
|
|
|
64
64
|
}
|
|
65
65
|
async cov() {
|
|
66
66
|
let task = new Task();
|
|
67
|
+
assert.ok(CoreModel.instanceOf(task));
|
|
67
68
|
await assert.rejects(() => new CoreModel().canAct(undefined, "test"), /403/);
|
|
68
69
|
assert.ok(!task.isAttached());
|
|
69
70
|
const unattachedMsg = /No store linked to this object/;
|
|
70
71
|
await assert.rejects(() => task.refresh(), unattachedMsg);
|
|
71
72
|
await assert.rejects(() => task.save(), unattachedMsg);
|
|
72
73
|
await assert.rejects(() => task.delete(), unattachedMsg);
|
|
73
|
-
|
|
74
|
+
task.plop = 1;
|
|
75
|
+
assert.ok(!task.isDirty());
|
|
76
|
+
task = task.getProxy();
|
|
77
|
+
assert.ok(!task.isDirty());
|
|
78
|
+
task.plop = 2;
|
|
79
|
+
assert.ok(task.isDirty());
|
|
74
80
|
assert.throws(() => task.getService("ResourceService"), unattachedMsg);
|
|
75
81
|
let store = {
|
|
76
82
|
getService: this.webda.getService.bind(this.webda),
|
|
@@ -91,7 +97,10 @@ let CoreModelTest = class CoreModelTest extends WebdaTest {
|
|
|
91
97
|
assert.strictEqual(task.bouzouf, "test");
|
|
92
98
|
await task.delete();
|
|
93
99
|
assert.strictEqual(deleteSpy.callCount, 1);
|
|
94
|
-
|
|
100
|
+
task.plop = "bouzouf";
|
|
101
|
+
assert.ok(task.isDirty());
|
|
102
|
+
await task.save();
|
|
103
|
+
assert.ok(!task.isDirty());
|
|
95
104
|
assert.strictEqual(updateSpy.callCount, 1);
|
|
96
105
|
assert.strictEqual(task.plop, "bouzouf");
|
|
97
106
|
}
|
|
@@ -127,6 +136,49 @@ let CoreModelTest = class CoreModelTest extends WebdaTest {
|
|
|
127
136
|
await task.refresh();
|
|
128
137
|
assert.strictEqual(task.plop, "bouzouf");
|
|
129
138
|
}
|
|
139
|
+
async isDirty() {
|
|
140
|
+
let task = new Task().getProxy();
|
|
141
|
+
assert.ok(!task.isDirty());
|
|
142
|
+
task.plop = [];
|
|
143
|
+
// Adding a property
|
|
144
|
+
assert.ok(task.isDirty());
|
|
145
|
+
task.__dirty.clear();
|
|
146
|
+
// Array element
|
|
147
|
+
task.plop.push("plop");
|
|
148
|
+
assert.ok(task.isDirty());
|
|
149
|
+
task.__dirty.clear();
|
|
150
|
+
// Object element
|
|
151
|
+
task.plop2 = {
|
|
152
|
+
array: [],
|
|
153
|
+
test: true
|
|
154
|
+
};
|
|
155
|
+
assert.ok(task.isDirty());
|
|
156
|
+
task.__dirty.clear();
|
|
157
|
+
task.plop2.array.push("plop2");
|
|
158
|
+
assert.ok(task.isDirty());
|
|
159
|
+
task.__dirty.clear();
|
|
160
|
+
task.plop2.newProp = 1;
|
|
161
|
+
assert.ok(task.isDirty());
|
|
162
|
+
task.__dirty.clear();
|
|
163
|
+
delete task.plop2.newProp;
|
|
164
|
+
assert.ok(task.isDirty());
|
|
165
|
+
task.__dirty.clear();
|
|
166
|
+
task.plop2.array.push("plop5");
|
|
167
|
+
task.plop2.array.push("plop2");
|
|
168
|
+
task.__dirty.clear();
|
|
169
|
+
task.plop2.array.sort();
|
|
170
|
+
assert.ok(task.isDirty());
|
|
171
|
+
task.__dirty.clear();
|
|
172
|
+
delete task.plop2.array[1];
|
|
173
|
+
assert.ok(task.isDirty());
|
|
174
|
+
task.__store = {
|
|
175
|
+
patch: () => undefined
|
|
176
|
+
};
|
|
177
|
+
await task.save();
|
|
178
|
+
assert.ok(!task.isDirty());
|
|
179
|
+
delete task.plop2;
|
|
180
|
+
assert.ok(task.isDirty());
|
|
181
|
+
}
|
|
130
182
|
};
|
|
131
183
|
__decorate([
|
|
132
184
|
test("Verify unsecure loaded")
|
|
@@ -155,6 +207,9 @@ __decorate([
|
|
|
155
207
|
__decorate([
|
|
156
208
|
test
|
|
157
209
|
], CoreModelTest.prototype, "refresh", null);
|
|
210
|
+
__decorate([
|
|
211
|
+
test
|
|
212
|
+
], CoreModelTest.prototype, "isDirty", null);
|
|
158
213
|
CoreModelTest = __decorate([
|
|
159
214
|
suite
|
|
160
215
|
], CoreModelTest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coremodel.spec.js","sourceRoot":"","sources":["../../src/models/coremodel.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;AAC/B,OAAO,EAAE,SAAS,EAAS,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"coremodel.spec.js","sourceRoot":"","sources":["../../src/models/coremodel.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;AAC/B,OAAO,EAAE,SAAS,EAAS,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,SAAS;IACH,YAAY;QAC1C,IAAI,MAAM,GAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEkC,iBAAiB;QAClD,IAAI,MAAM,GAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CACT;YACE,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,QAAQ;SACvB,EACD,IAAI,CACL,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IAE2B,UAAU;QACpC,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAEkC,gBAAgB;QACjD,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,IAAI,QAAQ,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QACrC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAE8C,yBAAyB;QACtE,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAEsD,KAAK,CAAC,WAAW;QACtE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAEK,KAAK,CAAC,GAAG;QACb,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7E,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9B,MAAM,aAAa,GAAG,gCAAgC,CAAC;QACvD,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;QACvD,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3B,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC;QACvE,IAAI,KAAK,GAAG;YACV,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YAClD,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC;YAChB,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;SAChB,CAAC;QACF,aAAa;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACvE,IAAI,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAClF,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACzC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3B,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;SAC1C;gBAAS;YACR,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,SAAS,CAAC,OAAO,EAAE,CAAC;SACrB;QACD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC7F,CAAC;IAEK,KAAK,CAAC,QAAQ;QAClB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,8CAA8C,CAAC,CAAC;QACxF,IAAI,WAAW,GAAG,IAAI,CAAC,UAAU,CAAQ,aAAa,CAAC,CAAC;QACxD,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC7D,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QAClE,aAAa;QACb,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,aAAa;QACb,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAEK,KAAK,CAAC,OAAO;QACjB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;SACrB,CAAC;QACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SACjC,CAAC;QACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAGD,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,oBAAoB;QACpB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,gBAAgB;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,iBAAiB;QACjB,IAAI,CAAC,KAAK,GAAG;YACX,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,IAAI;SACX,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;QACvB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG;YACb,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS;SACvB,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AApLiC;IAA/B,IAAI,CAAC,wBAAwB,CAAC;iDAQ9B;AAEkC;IAAlC,IAAI,CAAC,2BAA2B,CAAC;sDAajC;AAE2B;IAA3B,IAAI,CAAC,oBAAoB,CAAC;+CAO1B;AAEkC;IAAlC,IAAI,CAAC,2BAA2B,CAAC;qDAMjC;AAE8C;IAA9C,IAAI,CAAC,uCAAuC,CAAC;8DAO7C;AAEsD;IAAtD,IAAI,CAAC,+CAA+C,CAAC;gDAOrD;AAEK;IAAL,IAAI;wCA8CJ;AAEK;IAAL,IAAI;6CAaJ;AAEK;IAAL,IAAI;4CAWJ;AAGD;IADC,IAAI;4CA2CJ;AApLG,aAAa;IADlB,KAAK;GACA,aAAa,CAqLlB"}
|
package/lib/models/user.d.ts
CHANGED
|
@@ -10,24 +10,24 @@ export declare class User extends OwnerModel {
|
|
|
10
10
|
/**
|
|
11
11
|
* Password of the user if defined
|
|
12
12
|
*/
|
|
13
|
-
|
|
13
|
+
__password?: string;
|
|
14
14
|
/**
|
|
15
15
|
* Display name for this user
|
|
16
16
|
* @optional
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
displayName: string;
|
|
19
19
|
/**
|
|
20
20
|
* Last time the password was recovered
|
|
21
21
|
*/
|
|
22
|
-
|
|
22
|
+
_lastPasswordRecovery?: number;
|
|
23
23
|
/**
|
|
24
24
|
* Roles of the user
|
|
25
25
|
*/
|
|
26
|
-
|
|
26
|
+
_roles: string[];
|
|
27
27
|
/**
|
|
28
28
|
* Groups for a user
|
|
29
29
|
*/
|
|
30
|
-
|
|
30
|
+
_groups: string[];
|
|
31
31
|
/**
|
|
32
32
|
* Idents used by the user
|
|
33
33
|
*/
|
|
@@ -35,7 +35,7 @@ export declare class User extends OwnerModel {
|
|
|
35
35
|
/**
|
|
36
36
|
* Define the user avatar if exists
|
|
37
37
|
*/
|
|
38
|
-
|
|
38
|
+
_avatar?: string;
|
|
39
39
|
/**
|
|
40
40
|
* Contains the locale of the user if known
|
|
41
41
|
*/
|
package/lib/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;GAIG;AACH,MAAM,OAAO,IAAK,SAAQ,UAAU;IAApC;;QAUE;;WAEG;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"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"}
|