@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudbinary.spec.js","sourceRoot":"","sources":["../../src/services/cloudbinary.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;
|
|
1
|
+
{"version":3,"file":"cloudbinary.spec.js","sourceRoot":"","sources":["../../src/services/cloudbinary.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import jsonpath from "jsonpath";
|
|
2
|
-
import { WebdaError } from "../
|
|
2
|
+
import { WebdaError } from "../index.js";
|
|
3
3
|
import { Service, ServiceParameters } from "./service.js";
|
|
4
4
|
export class ConfigurationServiceParameters extends ServiceParameters {
|
|
5
5
|
constructor(params) {
|
|
@@ -42,19 +42,19 @@ export default class ConfigurationService extends Service {
|
|
|
42
42
|
async init() {
|
|
43
43
|
// Check interval by default every hour
|
|
44
44
|
if (!this.parameters.source) {
|
|
45
|
-
throw new WebdaError("CONFIGURATION_SOURCE_MISSING", "Need a source for ConfigurationService");
|
|
45
|
+
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_MISSING", "Need a source for ConfigurationService");
|
|
46
46
|
}
|
|
47
47
|
let source = this.parameters.source.split(":");
|
|
48
48
|
this.sourceService = this.getService(source[0]);
|
|
49
49
|
if (!this.sourceService) {
|
|
50
|
-
throw new WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService:sourceId")');
|
|
50
|
+
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService:sourceId")');
|
|
51
51
|
}
|
|
52
52
|
this.sourceId = source[1];
|
|
53
53
|
if (!this.sourceId) {
|
|
54
|
-
throw new WebdaError("CONFIGURATION_SOURCE_INVALID", 'Need a valid source ("sourceService:sourceId")');
|
|
54
|
+
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_INVALID", 'Need a valid source ("sourceService:sourceId")');
|
|
55
55
|
}
|
|
56
56
|
if (!this.sourceService.getConfiguration) {
|
|
57
|
-
throw new WebdaError("CONFIGURATION_SOURCE_INVALID", `Service '${source[0]}' is not implementing ConfigurationProvider interface`);
|
|
57
|
+
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_INVALID", `Service '${source[0]}' is not implementing ConfigurationProvider interface`);
|
|
58
58
|
}
|
|
59
59
|
this.serializedConfiguration = JSON.stringify(this.parameters.default);
|
|
60
60
|
await this.checkUpdate();
|
|
@@ -62,7 +62,7 @@ export default class ConfigurationService extends Service {
|
|
|
62
62
|
this.interval = setInterval(this.checkUpdate.bind(this), 1000);
|
|
63
63
|
}
|
|
64
64
|
// Add webda info
|
|
65
|
-
this.watch("$.
|
|
65
|
+
this.watch("$.services", (updates) => this._webda.reinit(updates));
|
|
66
66
|
return this;
|
|
67
67
|
}
|
|
68
68
|
/**
|
|
@@ -131,11 +131,11 @@ export default class ConfigurationService extends Service {
|
|
|
131
131
|
this.serializedConfiguration = serializedConfig;
|
|
132
132
|
this.configuration = newConfig;
|
|
133
133
|
// Add the webda parameters logical
|
|
134
|
-
if (this.configuration
|
|
134
|
+
if (this.configuration && this.configuration.services) {
|
|
135
135
|
// Merge parameters with each service
|
|
136
|
-
for (let i in this.configuration.
|
|
136
|
+
for (let i in this.configuration.services) {
|
|
137
137
|
if (this.getWebda().getService(i)) {
|
|
138
|
-
this.configuration.
|
|
138
|
+
this.configuration.services[i] = this.getWebda().getServiceParams(i, this.configuration);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,13 +44,11 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends WebdaTest
|
|
|
44
44
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
45
45
|
let test = {
|
|
46
46
|
uuid: "test",
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
text: "Plop"
|
|
53
|
-
}
|
|
47
|
+
services: {
|
|
48
|
+
Authentication: {
|
|
49
|
+
providers: {
|
|
50
|
+
email: {
|
|
51
|
+
text: "Plop"
|
|
54
52
|
}
|
|
55
53
|
}
|
|
56
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { suite, test } from "@testdeck/mocha";
|
|
8
8
|
import * as assert from "assert";
|
|
9
|
-
import * as sinon from "sinon";
|
|
10
9
|
import { Cron, CronDefinition, CronService, Service } from "...js";
|
|
11
10
|
import { WebdaTest } from "../test.js";
|
|
12
11
|
class MyService extends Service {
|
|
@@ -24,18 +23,18 @@ __decorate([
|
|
|
24
23
|
let CronServiceTest = class CronServiceTest extends WebdaTest {
|
|
25
24
|
annotations() {
|
|
26
25
|
this.registerService(new MyService(this.webda, "myService", {}));
|
|
27
|
-
let def = new CronDefinition("0/15 * * * *", [], "
|
|
26
|
+
let def = new CronDefinition("0/15 * * * *", [], "myService", "test", "plop");
|
|
28
27
|
let service = new CronService(this.webda, "cron", {});
|
|
29
28
|
service.schedule("* * * * *", () => { }, "mine");
|
|
30
29
|
assert.deepStrictEqual(service.getCrontab()[1], def);
|
|
31
30
|
// for cov
|
|
32
31
|
assert.deepStrictEqual(service.getCrontab()[1], def);
|
|
33
|
-
|
|
32
|
+
service.crontabSchedule = (cron, cb) => {
|
|
34
33
|
try {
|
|
35
34
|
cb();
|
|
36
35
|
}
|
|
37
36
|
catch (err) { }
|
|
38
|
-
}
|
|
37
|
+
};
|
|
39
38
|
try {
|
|
40
39
|
let promise = service.work();
|
|
41
40
|
promise.cancel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import {
|
|
3
|
+
import { OperationContext, RegistryEntry, Store } from "../index.js";
|
|
4
4
|
import { DeepPartial, Service, ServiceParameters } from "./service.js";
|
|
5
5
|
export interface KeysRegistry {
|
|
6
6
|
/**
|
|
@@ -175,7 +175,7 @@ export default class CryptoService<T extends CryptoServiceParameters = CryptoSer
|
|
|
175
175
|
/**
|
|
176
176
|
*
|
|
177
177
|
*/
|
|
178
|
-
serveJWKS(context:
|
|
178
|
+
serveJWKS(context: OperationContext): Promise<void>;
|
|
179
179
|
/**
|
|
180
180
|
* Load keys from registry
|
|
181
181
|
*/
|
|
@@ -242,7 +242,10 @@ export default class CryptoService extends Service {
|
|
|
242
242
|
let iv = randomBytes(16);
|
|
243
243
|
let cipher = createCipheriv(this.parameters.symetricCipher, Buffer.from(key.keys.symetric, "base64"), iv);
|
|
244
244
|
let encrypted = Buffer.concat([iv, cipher.update(Buffer.from(JSON.stringify(data))), cipher.final()]).toString("base64");
|
|
245
|
-
return this.jwtSign(encrypted, {
|
|
245
|
+
return this.jwtSign(encrypted, {
|
|
246
|
+
keyid: `S${key.id}`,
|
|
247
|
+
secretOrPublicKey: key.keys.symetric
|
|
248
|
+
});
|
|
246
249
|
}
|
|
247
250
|
/**
|
|
248
251
|
* Parse the JWT header section
|
|
@@ -301,7 +304,7 @@ __decorate([
|
|
|
301
304
|
Inject("Registry")
|
|
302
305
|
], CryptoService.prototype, "registry", void 0);
|
|
303
306
|
__decorate([
|
|
304
|
-
Route(".", ["GET"],
|
|
307
|
+
Route(".", ["GET"], {
|
|
305
308
|
description: "Serve JWKS keys",
|
|
306
309
|
get: {
|
|
307
310
|
operationId: "getJWKS"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoservice.js","sourceRoot":"","sources":["../../src/services/cryptoservice.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACxG,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAe,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAsEnF,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IA4E5D,YAAY,MAAW;;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,iBAAiB,KAAtB,IAAI,CAAC,iBAAiB,GAAK,GAAG,EAAC;QAC/B,IAAI,CAAC,cAAc,KAAnB,IAAI,CAAC,cAAc,GAAK,aAAa,EAAC;QACtC,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,KAAK,EAAC;QAC7B,IAAI,CAAC,gBAAgB,KAArB,IAAI,CAAC,gBAAgB,GAAK,EAAE,EAAC;QAC7B,MAAA,IAAI,CAAC,gBAAgB,EAAC,aAAa,QAAb,aAAa,GAAK,IAAI,EAAC;QAC7C,MAAA,IAAI,CAAC,gBAAgB,EAAC,kBAAkB,QAAlB,kBAAkB,GAAK,EAAE,EAAC;QAChD,MAAA,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAC,MAAM,QAAN,MAAM,GAAK,KAAK,EAAC;QAC1D,MAAA,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAC,IAAI,QAAJ,IAAI,GAAK,OAAO,EAAC;QAC1D,MAAA,IAAI,CAAC,gBAAgB,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,EAAE,EAAC;QAC/C,MAAA,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAC,MAAM,QAAN,MAAM,GAAK,KAAK,EAAC;QACzD,MAAA,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAC,IAAI,QAAJ,IAAI,GAAK,MAAM,EAAC;QACxD,IAAI,CAAC,GAAG,KAAR,IAAI,CAAC,GAAG,GAAK,EAAE,EAAC;QAChB,MAAA,IAAI,CAAC,GAAG,EAAC,SAAS,QAAT,SAAS,GAAK,OAAO,EAAC;IACjC,CAAC;CACF;AAQD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAA2E,SAAQ,OAAU;IAAlH;;QAQE;;WAEG;QACH,SAAI,GAKA,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cryptoservice.js","sourceRoot":"","sources":["../../src/services/cryptoservice.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { Application, CoreModelDefinition, DeepPartial, Service, ServiceParameters } from "../index.js";
|
|
2
|
+
/**
|
|
3
|
+
* @WebdaModda
|
|
4
|
+
*/
|
|
5
|
+
export declare class ModelsOperationsService extends Service {
|
|
6
|
+
/**
|
|
7
|
+
* Add operations for all exposed models
|
|
8
|
+
* @returns
|
|
9
|
+
*/
|
|
10
|
+
initOperations(): void;
|
|
11
|
+
}
|
|
12
|
+
export declare class DomainServiceParameters extends ServiceParameters {
|
|
13
|
+
/**
|
|
14
|
+
* Expose objects as operations too
|
|
15
|
+
*/
|
|
16
|
+
operations: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Transform the name of the model to be used in the URL
|
|
19
|
+
*/
|
|
20
|
+
nameTransfomer: "camelCase" | "lowercase" | "none";
|
|
21
|
+
/**
|
|
22
|
+
* Method used for query objects
|
|
23
|
+
*
|
|
24
|
+
* @default "PUT"
|
|
25
|
+
*/
|
|
26
|
+
queryMethod: "PUT" | "GET";
|
|
27
|
+
/**
|
|
28
|
+
* List of models to include
|
|
29
|
+
*
|
|
30
|
+
* If model is prefixed with a ! it will be excluded
|
|
31
|
+
*
|
|
32
|
+
* @default ["*"]
|
|
33
|
+
*/
|
|
34
|
+
models: string[];
|
|
35
|
+
/**
|
|
36
|
+
*
|
|
37
|
+
* @SchemaIgnore
|
|
38
|
+
*/
|
|
39
|
+
private excludedModels;
|
|
40
|
+
constructor(params: DeepPartial<DomainServiceParameters>);
|
|
41
|
+
/**
|
|
42
|
+
* Is a model is included in the service
|
|
43
|
+
* @param model
|
|
44
|
+
* @returns
|
|
45
|
+
*/
|
|
46
|
+
isIncluded(model: string): boolean;
|
|
47
|
+
/**
|
|
48
|
+
* Is a model excluded from the service
|
|
49
|
+
* @param model
|
|
50
|
+
* @returns
|
|
51
|
+
*/
|
|
52
|
+
isExcluded(model: string): boolean;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Domain Service expose all the models as Route and Operations
|
|
56
|
+
*
|
|
57
|
+
* Model are exposed if they have a Expose decorator
|
|
58
|
+
*
|
|
59
|
+
* Children models Exposed should be under the first ModelRelated targetting them or the segment endpoint of Expose
|
|
60
|
+
*
|
|
61
|
+
* Other relations (ModelLinks, ModelParent) should only display their information but not be exposed
|
|
62
|
+
* ModelRelated should be ignored
|
|
63
|
+
*/
|
|
64
|
+
export declare abstract class DomainService<T extends DomainServiceParameters = DomainServiceParameters> extends Service<T> {
|
|
65
|
+
app: Application;
|
|
66
|
+
/**
|
|
67
|
+
* Load the paremeters for your service
|
|
68
|
+
* @param params
|
|
69
|
+
* @param name
|
|
70
|
+
*/
|
|
71
|
+
loadParameters(params: DeepPartial<DomainServiceParameters>): DomainServiceParameters;
|
|
72
|
+
/**
|
|
73
|
+
* Return the model name for this service
|
|
74
|
+
* @param name
|
|
75
|
+
* @returns
|
|
76
|
+
*/
|
|
77
|
+
transformName(name: string): string;
|
|
78
|
+
/**
|
|
79
|
+
* Handle one model and expose it based on the service
|
|
80
|
+
* @param model
|
|
81
|
+
* @param name
|
|
82
|
+
* @param context
|
|
83
|
+
* @returns
|
|
84
|
+
*/
|
|
85
|
+
abstract handleModel(model: CoreModelDefinition, name: string, context: any): boolean;
|
|
86
|
+
/**
|
|
87
|
+
* Explore the models
|
|
88
|
+
* @param model
|
|
89
|
+
* @param name
|
|
90
|
+
* @param depth
|
|
91
|
+
* @param modelContext
|
|
92
|
+
* @returns
|
|
93
|
+
*/
|
|
94
|
+
walkModel(model: CoreModelDefinition, name: string, depth?: number, modelContext?: any): void;
|
|
95
|
+
/**
|
|
96
|
+
* Your service is now created as all the other services
|
|
97
|
+
*/
|
|
98
|
+
resolve(): this;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Expose all models via a REST API
|
|
102
|
+
* @WebdaModda
|
|
103
|
+
*/
|
|
104
|
+
export declare class RESTDomainService<T extends DomainServiceParameters = DomainServiceParameters> extends DomainService<T> {
|
|
105
|
+
/**
|
|
106
|
+
* Handle one model and expose it based on the service
|
|
107
|
+
* @param model
|
|
108
|
+
* @param name
|
|
109
|
+
* @param context
|
|
110
|
+
* @returns
|
|
111
|
+
*/
|
|
112
|
+
handleModel(model: CoreModelDefinition, name: string, context: any): boolean;
|
|
113
|
+
}
|