@webda/core 2.4.2 → 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 +4 -4
- 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
package/lib/test.js
CHANGED
|
@@ -1,37 +1,33 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Core, HttpContext, WebContext } from "./index.js";
|
|
2
2
|
import { ConsoleLoggerService } from "./utils/logger.js";
|
|
3
3
|
import * as path from "path";
|
|
4
4
|
import { execSync } from "child_process";
|
|
5
5
|
import { SectionEnum } from "./application.js";
|
|
6
6
|
import { existsSync, unlinkSync } from "fs";
|
|
7
7
|
import { UnpackedApplication } from "./unpackedapplication.js";
|
|
8
|
-
import { FileUtils
|
|
8
|
+
import { FileUtils } from "./utils/serializers.js";
|
|
9
9
|
import { PrometheusService } from "./services/prometheus.js";
|
|
10
10
|
import { register } from "prom-client";
|
|
11
|
-
export class Executor {
|
|
12
|
-
/**
|
|
13
|
-
* Main method called by the webda framework if the route don't specify a _method
|
|
14
|
-
*/
|
|
15
|
-
execute(ctx) {
|
|
16
|
-
if (typeof ctx._route._method === "function") {
|
|
17
|
-
return ctx.execute();
|
|
18
|
-
}
|
|
19
|
-
return Promise.reject(Error("Not implemented"));
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
11
|
/**
|
|
23
12
|
* TestApplication ensure we load the typescript sources instead of compiled version
|
|
24
13
|
*
|
|
25
14
|
* Test use ts-node so to share same prototypes we need to load from the sources
|
|
26
15
|
*/
|
|
27
16
|
export class TestApplication extends UnpackedApplication {
|
|
28
|
-
constructor() {
|
|
29
|
-
super(
|
|
17
|
+
constructor(file, logger) {
|
|
18
|
+
super(file || "./", logger);
|
|
30
19
|
/**
|
|
31
20
|
* Flag if application has been compiled already
|
|
32
21
|
*/
|
|
33
22
|
this.compiled = false;
|
|
34
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* Force the namespace to WebdaDemo
|
|
26
|
+
* @returns
|
|
27
|
+
*/
|
|
28
|
+
getNamespace() {
|
|
29
|
+
return "WebdaDemo";
|
|
30
|
+
}
|
|
35
31
|
/**
|
|
36
32
|
* Set the status of the compilation
|
|
37
33
|
*
|
|
@@ -62,17 +58,6 @@ export class TestApplication extends UnpackedApplication {
|
|
|
62
58
|
}
|
|
63
59
|
this.compiled = true;
|
|
64
60
|
}
|
|
65
|
-
/**
|
|
66
|
-
* Only allow local and core module and sample-app
|
|
67
|
-
*/
|
|
68
|
-
filterModule(filename) {
|
|
69
|
-
// Just for cov
|
|
70
|
-
const relativePath = path.relative(process.cwd(), filename);
|
|
71
|
-
return (super.filterModule(filename) &&
|
|
72
|
-
(!relativePath.includes("..") ||
|
|
73
|
-
relativePath.startsWith("../core") ||
|
|
74
|
-
relativePath.startsWith("../../sample-app/")));
|
|
75
|
-
}
|
|
76
61
|
/**
|
|
77
62
|
* Load a webda.module.json file
|
|
78
63
|
* Resolve the linked file to current application
|
|
@@ -91,6 +76,9 @@ export class TestApplication extends UnpackedApplication {
|
|
|
91
76
|
module[SectionEnum[p]][key] = path.join(path.relative(this.getAppPath(), path.dirname(moduleFile)), module[SectionEnum[p]][key].replace(/^lib\//, "src/"));
|
|
92
77
|
}
|
|
93
78
|
});
|
|
79
|
+
for (let key in module.models.list) {
|
|
80
|
+
module.models.list[key] = path.join(path.relative(this.getAppPath(), path.dirname(moduleFile)), module.models.list[key].replace(/^lib\//, "src/"));
|
|
81
|
+
}
|
|
94
82
|
return module;
|
|
95
83
|
}
|
|
96
84
|
return super.loadWebdaModule(moduleFile);
|
|
@@ -104,6 +92,10 @@ export class TestApplication extends UnpackedApplication {
|
|
|
104
92
|
class WebdaTest {
|
|
105
93
|
constructor() {
|
|
106
94
|
this.addConsoleLogger = true;
|
|
95
|
+
/**
|
|
96
|
+
* Files to clean after test
|
|
97
|
+
*/
|
|
98
|
+
this.cleanFiles = [];
|
|
107
99
|
}
|
|
108
100
|
/**
|
|
109
101
|
* Get the configuration file to use for the test
|
|
@@ -118,11 +110,11 @@ class WebdaTest {
|
|
|
118
110
|
* @param app
|
|
119
111
|
*/
|
|
120
112
|
async tweakApp(app) {
|
|
121
|
-
app.addService("
|
|
122
|
-
app.addService("
|
|
123
|
-
app.addService("
|
|
124
|
-
app.addModel("
|
|
125
|
-
app.addModel("
|
|
113
|
+
app.addService("WebdaTest/VoidStore", (await import("../test/moddas/voidstore")).VoidStore);
|
|
114
|
+
app.addService("WebdaTest/FakeService", (await import("../test/moddas/fakeservice")).FakeService);
|
|
115
|
+
app.addService("WebdaTest/Mailer", (await import("../test/moddas/debugmailer")).DebugMailer);
|
|
116
|
+
app.addModel("WebdaTest/Task", (await import("../test/models/task")).Task);
|
|
117
|
+
app.addModel("WebdaTest/Ident", (await import("../test/models/ident")).Ident);
|
|
126
118
|
}
|
|
127
119
|
/**
|
|
128
120
|
* Build the webda application
|
|
@@ -130,17 +122,9 @@ class WebdaTest {
|
|
|
130
122
|
* Add a ConsoleLogger if addConsoleLogger is true
|
|
131
123
|
*/
|
|
132
124
|
async buildWebda() {
|
|
133
|
-
var _a;
|
|
134
125
|
let app = new TestApplication(this.getTestConfiguration());
|
|
135
126
|
await app.load();
|
|
136
|
-
if (app.getConfiguration() && app.getConfiguration().parameters) {
|
|
137
|
-
(_a = app.getConfiguration().parameters).sessionSecret ?? (_a.sessionSecret = "1234567890ABCDEF".repeat(16));
|
|
138
|
-
}
|
|
139
127
|
await this.tweakApp(app);
|
|
140
|
-
if (JSONUtils.loadFile("package.json").name === "@webda/core" && existsSync(".registry")) {
|
|
141
|
-
// Auto remove registry for core test
|
|
142
|
-
unlinkSync(".registry");
|
|
143
|
-
}
|
|
144
128
|
this.webda = new Core(app);
|
|
145
129
|
if (this.addConsoleLogger) {
|
|
146
130
|
// @ts-ignore - Hack a ConsoleLogger in
|
|
@@ -162,8 +146,15 @@ class WebdaTest {
|
|
|
162
146
|
await this.buildWebda();
|
|
163
147
|
if (init) {
|
|
164
148
|
await this.webda.init();
|
|
149
|
+
// Prevent persistance for tests
|
|
150
|
+
this.webda.getRegistry().persist = async () => { };
|
|
165
151
|
}
|
|
166
152
|
}
|
|
153
|
+
after() {
|
|
154
|
+
// Clean all remaining files
|
|
155
|
+
this.cleanFiles.filter(f => existsSync(f)).forEach(f => unlinkSync(f));
|
|
156
|
+
this.cleanFiles = [];
|
|
157
|
+
}
|
|
167
158
|
/**
|
|
168
159
|
*
|
|
169
160
|
* @param level
|
|
@@ -186,7 +177,7 @@ class WebdaTest {
|
|
|
186
177
|
* @returns
|
|
187
178
|
*/
|
|
188
179
|
async newContext(body = {}) {
|
|
189
|
-
let res = await this.webda.
|
|
180
|
+
let res = await this.webda.newWebContext(new HttpContext("test.webda.io", "GET", "/"));
|
|
190
181
|
res.getHttpContext().setBody(body);
|
|
191
182
|
return res;
|
|
192
183
|
}
|
|
@@ -206,37 +197,37 @@ class WebdaTest {
|
|
|
206
197
|
httpContext.setBody(body);
|
|
207
198
|
httpContext.setClientIp("127.0.0.1");
|
|
208
199
|
if (!ctx) {
|
|
209
|
-
|
|
200
|
+
// @ts-ignore
|
|
201
|
+
ctx = new WebContext(this.webda, httpContext);
|
|
210
202
|
}
|
|
211
203
|
else {
|
|
212
204
|
ctx.setHttpContext(httpContext);
|
|
213
205
|
}
|
|
214
206
|
if (this.webda.updateContextWithRoute(ctx)) {
|
|
215
|
-
return
|
|
216
|
-
execute: async (argCtx = ctx) => {
|
|
217
|
-
if (typeof argCtx._route._method === "function") {
|
|
218
|
-
return Promise.resolve(argCtx.getExecutor()[argCtx._route._method.name](argCtx));
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
};
|
|
207
|
+
return ctx;
|
|
222
208
|
}
|
|
223
209
|
}
|
|
224
|
-
|
|
225
|
-
|
|
210
|
+
/**
|
|
211
|
+
* Execute a test request
|
|
212
|
+
* @param params
|
|
213
|
+
* @returns
|
|
214
|
+
*/
|
|
215
|
+
async http(params = {}) {
|
|
216
|
+
if (params.context) {
|
|
217
|
+
params.context.resetResponse();
|
|
218
|
+
}
|
|
219
|
+
params.context ?? (params.context = await this.newContext());
|
|
220
|
+
params.method ?? (params.method = "GET");
|
|
221
|
+
params.url ?? (params.url = "/");
|
|
222
|
+
return await this.execute(params.context, "test.webda.io", params.method, params.url, params.body, params.headers);
|
|
223
|
+
}
|
|
224
|
+
async execute(context = undefined, host = "test.webda.io", method = "GET", url = "/", body = {}, headers = {}) {
|
|
225
|
+
const exec = this.getExecutor(context, host, method, url, body, headers);
|
|
226
226
|
if (!exec) {
|
|
227
227
|
throw new Error(`${method} ${url} route not found`);
|
|
228
228
|
}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
}
|
|
232
|
-
catch (err) {
|
|
233
|
-
if (err instanceof Error) {
|
|
234
|
-
this.log("ERROR", err);
|
|
235
|
-
throw 500;
|
|
236
|
-
}
|
|
237
|
-
throw err;
|
|
238
|
-
}
|
|
239
|
-
let res = ctx.getResponseBody();
|
|
229
|
+
await exec.execute(context);
|
|
230
|
+
let res = context.getResponseBody();
|
|
240
231
|
if (res) {
|
|
241
232
|
try {
|
|
242
233
|
return JSON.parse(res);
|
|
@@ -254,6 +245,117 @@ class WebdaTest {
|
|
|
254
245
|
async sleep(time) {
|
|
255
246
|
return Core.sleep(time);
|
|
256
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* Create a graph of objets from sample-app to be able to test graph
|
|
250
|
+
*/
|
|
251
|
+
async createGraphObjects() {
|
|
252
|
+
const Teacher = this.webda.getModel("Teacher");
|
|
253
|
+
const Course = this.webda.getModel("Course");
|
|
254
|
+
const Classroom = this.webda.getModel("Classroom");
|
|
255
|
+
const Student = this.webda.getModel("Student");
|
|
256
|
+
const Hardware = this.webda.getModel("Hardware");
|
|
257
|
+
const ComputerScreen = this.webda.getModel("ComputerScreen");
|
|
258
|
+
const Company = this.webda.getModel("Company");
|
|
259
|
+
const User = this.webda.getModel("User");
|
|
260
|
+
// 2 Companies
|
|
261
|
+
const companies = [await Company.create({ name: "company 1" }), await Company.create({ name: "company 2" })];
|
|
262
|
+
const users = [];
|
|
263
|
+
for (let company of companies) {
|
|
264
|
+
for (let i = 1; i < 6; i++) {
|
|
265
|
+
// 2 User per company
|
|
266
|
+
users.push(await User.create({
|
|
267
|
+
name: `User ${users.length + 1}`,
|
|
268
|
+
_company: company.uuid
|
|
269
|
+
}));
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
// 2 Teachers
|
|
273
|
+
const teachers = [await Teacher.create({ name: "test" }), await Teacher.create({ name: "test2", senior: true })];
|
|
274
|
+
const students = [];
|
|
275
|
+
const courses = [];
|
|
276
|
+
// 10 Students
|
|
277
|
+
for (let i = 1; i < 11; i++) {
|
|
278
|
+
students.push(await Student.create({
|
|
279
|
+
email: `student${i}@webda.io`,
|
|
280
|
+
firstName: `Student ${i}`,
|
|
281
|
+
lastName: `Lastname ${i}`
|
|
282
|
+
}));
|
|
283
|
+
}
|
|
284
|
+
// 10 Topics
|
|
285
|
+
const topics = ["Math", "French", "English", "Physics", "Computer Science"];
|
|
286
|
+
for (let i = 1; i < 13; i++) {
|
|
287
|
+
let courseStudents = [];
|
|
288
|
+
for (let j = i; j < i + 6; j++) {
|
|
289
|
+
let s = students[j % 10];
|
|
290
|
+
courseStudents.push({
|
|
291
|
+
uuid: s.getUuid(),
|
|
292
|
+
email: s.email,
|
|
293
|
+
firstName: s.firstName,
|
|
294
|
+
lastName: s.lastName
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
courses.push(await Course.create({
|
|
298
|
+
name: `${topics[i % 5]} ${i}`,
|
|
299
|
+
teacher: teachers[i % 2].uuid,
|
|
300
|
+
students: courseStudents
|
|
301
|
+
}));
|
|
302
|
+
}
|
|
303
|
+
// 3 classrooms
|
|
304
|
+
const classrooms = [];
|
|
305
|
+
for (let i = 1; i < 4; i++) {
|
|
306
|
+
let classCourses = [];
|
|
307
|
+
classCourses.push({ uuid: courses[i].uuid, name: courses[i].name });
|
|
308
|
+
classCourses.push({ uuid: courses[i * 2].uuid, name: courses[i * 2].name });
|
|
309
|
+
classCourses.push({ uuid: courses[i * 3].uuid, name: courses[i * 3].name });
|
|
310
|
+
classrooms.push(await Classroom.create({
|
|
311
|
+
name: `Classroom ${i}`,
|
|
312
|
+
courses: classCourses
|
|
313
|
+
}));
|
|
314
|
+
}
|
|
315
|
+
let count = 1;
|
|
316
|
+
for (let course of courses) {
|
|
317
|
+
course.classroom.set(classrooms[count++ % 3].uuid);
|
|
318
|
+
await course.save();
|
|
319
|
+
}
|
|
320
|
+
// 12 Hardware
|
|
321
|
+
const hardwares = [];
|
|
322
|
+
for (let i = 1; i < 12; i++) {
|
|
323
|
+
if (i % 2) {
|
|
324
|
+
hardwares.push(await ComputerScreen.create({
|
|
325
|
+
classroom: classrooms[i % 3].uuid,
|
|
326
|
+
name: `Computer Screen ${i}`
|
|
327
|
+
}));
|
|
328
|
+
}
|
|
329
|
+
else {
|
|
330
|
+
hardwares.push(await Hardware.create({
|
|
331
|
+
classroom: classrooms[i % 3].uuid,
|
|
332
|
+
name: `Hardware ${i}`
|
|
333
|
+
}));
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
count = 1;
|
|
337
|
+
for (let classroom of classrooms) {
|
|
338
|
+
let classCourses = [];
|
|
339
|
+
for (let i = 0; i < 3; i++) {
|
|
340
|
+
classCourses.push({
|
|
341
|
+
uuid: courses[count++ % 12].uuid,
|
|
342
|
+
name: courses[count % 12].name
|
|
343
|
+
});
|
|
344
|
+
}
|
|
345
|
+
await classroom.patch({
|
|
346
|
+
courses: classCourses
|
|
347
|
+
});
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
/**
|
|
351
|
+
* Wait for the next tick(s)
|
|
352
|
+
* @param ticks if you want to wait for more than one tick
|
|
353
|
+
*/
|
|
354
|
+
async nextTick(ticks = 1) {
|
|
355
|
+
while (ticks-- > 0) {
|
|
356
|
+
await new Promise(resolve => process.nextTick(resolve));
|
|
357
|
+
}
|
|
358
|
+
}
|
|
257
359
|
/**
|
|
258
360
|
* Get service from Webda
|
|
259
361
|
* @param service name
|
|
@@ -271,8 +373,14 @@ class WebdaTest {
|
|
|
271
373
|
registerService(service, name = service.getName()) {
|
|
272
374
|
// Have to override protected
|
|
273
375
|
// @ts-ignore
|
|
274
|
-
this.webda.services[name
|
|
376
|
+
this.webda.services[name] = service;
|
|
377
|
+
return service;
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
class WebdaSimpleTest extends WebdaTest {
|
|
381
|
+
getTestConfiguration() {
|
|
382
|
+
return undefined;
|
|
275
383
|
}
|
|
276
384
|
}
|
|
277
|
-
export { WebdaTest };
|
|
385
|
+
export { WebdaTest, WebdaSimpleTest };
|
|
278
386
|
//# sourceMappingURL=test.js.map
|
package/lib/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,11 @@ export declare class UnpackedApplication extends Application {
|
|
|
22
22
|
* @returns
|
|
23
23
|
*/
|
|
24
24
|
loadConfiguration(file: string): void;
|
|
25
|
+
/**
|
|
26
|
+
* Compute short ids
|
|
27
|
+
* @returns
|
|
28
|
+
*/
|
|
29
|
+
load(): Promise<this>;
|
|
25
30
|
/**
|
|
26
31
|
* Add Moddas, Models and Deployers definitions
|
|
27
32
|
* It also add the project metadata
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { deepmerge } from "deepmerge-ts";
|
|
2
2
|
import * as fs from "fs";
|
|
3
|
-
import Finder from "fs-finder";
|
|
4
3
|
import * as path from "path";
|
|
5
4
|
import { Application, SectionEnum } from "./application.js";
|
|
6
5
|
import { FileUtils } from "./utils/serializers.js";
|
|
@@ -42,6 +41,33 @@ export class UnpackedApplication extends Application {
|
|
|
42
41
|
this.baseConfiguration = this.completeConfiguration(FileUtils.load(file));
|
|
43
42
|
}
|
|
44
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Compute short ids
|
|
46
|
+
* @returns
|
|
47
|
+
*/
|
|
48
|
+
async load() {
|
|
49
|
+
await super.load();
|
|
50
|
+
const keys = Object.keys(this.getModels());
|
|
51
|
+
const namespace = this.getNamespace() + "/";
|
|
52
|
+
// All models from current namespace should have a short id
|
|
53
|
+
keys
|
|
54
|
+
.filter(key => key.startsWith(namespace))
|
|
55
|
+
.forEach(key => {
|
|
56
|
+
this.baseConfiguration.cachedModules.models.shortIds[key.substring(namespace.length)] = key;
|
|
57
|
+
this.baseConfiguration.cachedModules.models.shortIds[key] = key.substring(namespace.length);
|
|
58
|
+
});
|
|
59
|
+
// If models from other namespaces have no local ones then they have short id too
|
|
60
|
+
keys
|
|
61
|
+
.filter(key => !key.startsWith(namespace))
|
|
62
|
+
.forEach(key => {
|
|
63
|
+
const shortId = key.split("/")[1];
|
|
64
|
+
if (!this.baseConfiguration.cachedModules.models.shortIds[shortId]) {
|
|
65
|
+
this.baseConfiguration.cachedModules.models.shortIds[shortId] = key;
|
|
66
|
+
this.baseConfiguration.cachedModules.models.shortIds[key] = shortId;
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
return this;
|
|
70
|
+
}
|
|
45
71
|
/**
|
|
46
72
|
* Add Moddas, Models and Deployers definitions
|
|
47
73
|
* It also add the project metadata
|
|
@@ -72,7 +98,14 @@ export class UnpackedApplication extends Application {
|
|
|
72
98
|
project: this.loadProjectInformation(),
|
|
73
99
|
beans: {},
|
|
74
100
|
deployers: {},
|
|
75
|
-
models: {
|
|
101
|
+
models: {
|
|
102
|
+
list: {},
|
|
103
|
+
graph: {},
|
|
104
|
+
tree: {},
|
|
105
|
+
plurals: {},
|
|
106
|
+
shortIds: {},
|
|
107
|
+
reflections: {}
|
|
108
|
+
},
|
|
76
109
|
schemas: {},
|
|
77
110
|
moddas: {}
|
|
78
111
|
};
|
|
@@ -154,16 +187,21 @@ export class UnpackedApplication extends Application {
|
|
|
154
187
|
if (fs.existsSync(currentModule)) {
|
|
155
188
|
files.push(currentModule);
|
|
156
189
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
190
|
+
const findModuleFiles = (nodeModules) => {
|
|
191
|
+
if (!fs.existsSync(nodeModules)) {
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
FileUtils.walk(nodeModules, filepath => {
|
|
195
|
+
// We filter out the cache of nx
|
|
196
|
+
if (filepath.endsWith("webda.module.json") && !filepath.includes("node_modules/.cache/nx")) {
|
|
197
|
+
files.push(filepath);
|
|
198
|
+
}
|
|
199
|
+
}, { followSymlinks: true });
|
|
200
|
+
};
|
|
201
|
+
findModuleFiles(this.getAppPath("node_modules"));
|
|
161
202
|
// Search workspace for webda.module.json
|
|
162
203
|
if (module.project.webda.workspaces && module.project.webda.workspaces.path !== "") {
|
|
163
|
-
|
|
164
|
-
if (fs.existsSync(nodeModules)) {
|
|
165
|
-
files.push(...Finder.from(nodeModules).findFiles("webda.module.json"));
|
|
166
|
-
}
|
|
204
|
+
findModuleFiles(path.join(module.project.webda.workspaces.path, "node_modules"));
|
|
167
205
|
}
|
|
168
206
|
// Ensure we are not adding many times the same modules
|
|
169
207
|
return Array.from(new Set(files.map(n => fs.realpathSync(n)))).filter(f => this.filterModule(f));
|
|
@@ -186,6 +224,7 @@ export class UnpackedApplication extends Application {
|
|
|
186
224
|
Object.keys(SectionEnum)
|
|
187
225
|
.filter(k => Number.isNaN(+k))
|
|
188
226
|
.forEach(p => {
|
|
227
|
+
// Do not keep Beans from other modules
|
|
189
228
|
if (this.getAppPath("webda.module.json") !== moduleFile && SectionEnum[p] === "beans") {
|
|
190
229
|
delete module[SectionEnum[p]];
|
|
191
230
|
return;
|
|
@@ -194,6 +233,9 @@ export class UnpackedApplication extends Application {
|
|
|
194
233
|
module[SectionEnum[p]][key] = path.join(path.relative(this.getAppPath(), path.dirname(moduleFile)), module[SectionEnum[p]][key]);
|
|
195
234
|
}
|
|
196
235
|
});
|
|
236
|
+
for (let key in module.models.list) {
|
|
237
|
+
module.models.list[key] = path.join(path.relative(this.getAppPath(), path.dirname(moduleFile)), module.models.list[key]);
|
|
238
|
+
}
|
|
197
239
|
return module;
|
|
198
240
|
}
|
|
199
241
|
/**
|
|
@@ -226,6 +268,12 @@ export class UnpackedApplication extends Application {
|
|
|
226
268
|
.forEach(p => {
|
|
227
269
|
module[SectionEnum[p]] = value[SectionEnum[p]];
|
|
228
270
|
});
|
|
271
|
+
// Copying models
|
|
272
|
+
module.models.list = value.models.list;
|
|
273
|
+
module.models.graph = value.models.graph;
|
|
274
|
+
module.models.tree = value.models.tree;
|
|
275
|
+
module.models.plurals = value.models.plurals;
|
|
276
|
+
// Copying schemas
|
|
229
277
|
module.schemas = value.schemas;
|
|
230
278
|
}
|
|
231
279
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unpackedapplication.js","sourceRoot":"","sources":["../src/unpackedapplication.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"unpackedapplication.js","sourceRoot":"","sources":["../src/unpackedapplication.ts"],"names":[],"mappings":"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"}
|