@webda/core 2.0.0-beta.3 → 2.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 +5 -5
- package/lib/application.js +71 -84
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +121 -140
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +20 -24
- package/lib/core.js +222 -315
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +332 -406
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +49 -48
- package/lib/index.js +53 -70
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.js +63 -90
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +127 -152
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +7 -6
- package/lib/models/coremodel.js +65 -113
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +88 -107
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.js +1 -2
- package/lib/models/ident.d.ts +3 -3
- package/lib/models/ident.js +4 -9
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +9 -11
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +2 -2
- package/lib/models/ownermodel.js +39 -62
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +126 -168
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -1
- package/lib/models/rolemodel.js +24 -40
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.js +44 -63
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +3 -3
- package/lib/models/user.js +3 -8
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +14 -16
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +2 -2
- package/lib/queues/filequeue.js +72 -93
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +53 -70
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +2 -2
- package/lib/queues/memoryqueue.js +37 -61
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +142 -165
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +2 -2
- package/lib/queues/pubsubservice.js +3 -7
- package/lib/queues/pubsubservice.js.map +1 -1
- package/lib/queues/queue.spec.d.ts +1 -1
- package/lib/queues/queue.spec.js +42 -56
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +3 -3
- package/lib/queues/queueservice.js +51 -67
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +3 -3
- package/lib/router.js +46 -47
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +64 -61
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.d.ts +2 -2
- package/lib/services/asyncevents.js +44 -64
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.js +81 -98
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +23 -13
- package/lib/services/authentication.js +537 -563
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +411 -447
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +7 -5
- package/lib/services/binary.js +211 -244
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +3 -3
- package/lib/services/binary.spec.js +390 -443
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -3
- package/lib/services/cloudbinary.js +45 -70
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +3 -3
- package/lib/services/cloudbinary.spec.js +133 -162
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +1 -1
- package/lib/services/configuration.js +78 -105
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +63 -83
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +3 -2
- package/lib/services/cron.js +9 -13
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +18 -21
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +9 -4
- package/lib/services/cryptoservice.js +187 -221
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.js +88 -115
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +1 -1
- package/lib/services/debugmailer.js +13 -34
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.js +16 -29
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +2 -2
- package/lib/services/echo.js +15 -31
- package/lib/services/echo.js.map +1 -1
- package/lib/services/echo.spec.js +27 -40
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +5 -5
- package/lib/services/filebinary.js +165 -210
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +2 -1
- package/lib/services/filebinary.spec.js +106 -116
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -1
- package/lib/services/fileconfiguration.js +25 -44
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +79 -109
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +7 -7
- package/lib/services/invitationservice.js +274 -314
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +442 -448
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -1
- package/lib/services/kubernetesconfiguration.js +41 -60
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +80 -98
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +4 -4
- package/lib/services/mailer.js +62 -86
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +86 -127
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +3 -3
- package/lib/services/notificationservice.js +21 -42
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +47 -73
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +4 -4
- package/lib/services/oauth.js +68 -83
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +130 -156
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +2 -6
- package/lib/services/proxy.js +45 -58
- package/lib/services/proxy.js.map +1 -1
- package/lib/services/proxy.spec.js +34 -53
- package/lib/services/proxy.spec.js.map +1 -1
- package/lib/services/resource.d.ts +2 -2
- package/lib/services/resource.js +12 -18
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +67 -99
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +26 -3
- package/lib/services/service.js +68 -40
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +62 -67
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.js +3 -8
- package/lib/services/version.js.map +1 -1
- package/lib/services/version.spec.js +11 -24
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +2 -2
- package/lib/stores/aggregator.js +37 -58
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -3
- package/lib/stores/file.js +93 -131
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +2 -2
- package/lib/stores/file.spec.js +261 -289
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +3 -3
- package/lib/stores/mapper.js +110 -137
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +131 -150
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +3 -3
- package/lib/stores/memory.js +98 -144
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -2
- package/lib/stores/memory.spec.js +124 -145
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +17 -13
- package/lib/stores/store.js +819 -847
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +5 -4
- package/lib/stores/store.spec.js +624 -669
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +4 -4
- package/lib/stores/webdaql/WebdaQLParserLexer.js +9 -13
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +10 -10
- package/lib/stores/webdaql/WebdaQLParserParser.js +62 -91
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +2 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +1 -2
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +1 -1
- package/lib/stores/webdaql/query.d.ts +4 -5
- package/lib/stores/webdaql/query.js +16 -19
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +30 -32
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +3 -3
- package/lib/test.js +73 -100
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +1 -1
- package/lib/unpackedapplication.js +25 -31
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.js +1 -5
- package/lib/utils/abstractdeployer.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +6 -8
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +7 -5
- package/lib/utils/context.js +95 -103
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +139 -163
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +3 -3
- package/lib/utils/cookie.js +42 -61
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +42 -64
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +4 -0
- package/lib/utils/esm.js +10 -0
- package/lib/utils/esm.js.map +1 -0
- package/lib/utils/httpcontext.d.ts +3 -0
- package/lib/utils/httpcontext.js +48 -65
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.js +37 -56
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +15 -28
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js +9 -11
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +17 -20
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +43 -44
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +6 -6
- package/lib/utils/session.js +37 -59
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.js +38 -51
- package/lib/utils/session.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -1
- package/lib/utils/waiter.js +32 -52
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +75 -92
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +17 -12
- package/test/config-invitation.json +1 -3
- package/test/config.json +1 -2
- package/test/config.old.json +1 -2
- package/test/moddas/annotatedservice.js +5 -5
- package/test/moddas/debugmailer.js +2 -3
- package/test/moddas/fakeservice.js +2 -3
- package/test/moddas/voidstore.js +6 -4
- package/test/models/ident.js +2 -6
- package/test/models/task.js +3 -7
- package/test/package.json +2 -1
- package/webda.module.json +956 -189
package/lib/utils/logger.js
CHANGED
|
@@ -1,39 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const workout_1 = require("@webda/workout");
|
|
5
|
-
const service_1 = require("../services/service");
|
|
6
|
-
class LoggerServiceParameters extends service_1.ServiceParameters {
|
|
1
|
+
import { ConsoleLogger, FileLogger, MemoryLogger } from "@webda/workout";
|
|
2
|
+
import { Service, ServiceParameters } from "../services/service.js";
|
|
3
|
+
export class LoggerServiceParameters extends ServiceParameters {
|
|
7
4
|
/**
|
|
8
5
|
* @inheritdoc
|
|
9
6
|
*/
|
|
10
7
|
constructor(params) {
|
|
11
|
-
var _a;
|
|
12
8
|
super(params);
|
|
13
9
|
// Use the environment variable or fallback to INFO
|
|
14
|
-
|
|
10
|
+
this.logLevel ?? (this.logLevel = process.env["LOG_LEVEL"] || "INFO");
|
|
15
11
|
}
|
|
16
12
|
}
|
|
17
|
-
exports.LoggerServiceParameters = LoggerServiceParameters;
|
|
18
13
|
/**
|
|
19
14
|
* LoggerService is useful for inheritance
|
|
20
15
|
*/
|
|
21
|
-
class LoggerService extends
|
|
16
|
+
export class LoggerService extends Service {
|
|
22
17
|
}
|
|
23
|
-
|
|
24
|
-
class MemoryLoggerServiceParameters extends LoggerServiceParameters {
|
|
18
|
+
export class MemoryLoggerServiceParameters extends LoggerServiceParameters {
|
|
25
19
|
}
|
|
26
|
-
exports.MemoryLoggerServiceParameters = MemoryLoggerServiceParameters;
|
|
27
20
|
/**
|
|
28
21
|
* Store logs within memory
|
|
29
22
|
*
|
|
30
23
|
* Useful for test and other last logs
|
|
31
24
|
* @WebdaModda Webda/MemoryLogger
|
|
32
25
|
*/
|
|
33
|
-
class MemoryLoggerService extends LoggerService {
|
|
26
|
+
export class MemoryLoggerService extends LoggerService {
|
|
34
27
|
constructor(webda, name, params) {
|
|
35
28
|
super(webda, name, params);
|
|
36
|
-
this.workoutLogger = new
|
|
29
|
+
this.workoutLogger = new MemoryLogger(webda.getWorkerOutput(), this.parameters.logLevel, this.parameters.limit);
|
|
37
30
|
}
|
|
38
31
|
/**
|
|
39
32
|
* @inheritdoc
|
|
@@ -42,10 +35,8 @@ class MemoryLoggerService extends LoggerService {
|
|
|
42
35
|
return new MemoryLoggerServiceParameters(params);
|
|
43
36
|
}
|
|
44
37
|
}
|
|
45
|
-
|
|
46
|
-
class ConsoleLoggerServiceParameters extends LoggerServiceParameters {
|
|
38
|
+
export class ConsoleLoggerServiceParameters extends LoggerServiceParameters {
|
|
47
39
|
}
|
|
48
|
-
exports.ConsoleLoggerServiceParameters = ConsoleLoggerServiceParameters;
|
|
49
40
|
/**
|
|
50
41
|
* Log to the console
|
|
51
42
|
*
|
|
@@ -54,10 +45,10 @@ exports.ConsoleLoggerServiceParameters = ConsoleLoggerServiceParameters;
|
|
|
54
45
|
* @see @webda/workout.ConsoleLogger
|
|
55
46
|
* @WebdaModda ConsoleLogger
|
|
56
47
|
*/
|
|
57
|
-
class ConsoleLoggerService extends LoggerService {
|
|
48
|
+
export class ConsoleLoggerService extends LoggerService {
|
|
58
49
|
constructor(webda, name, params) {
|
|
59
50
|
super(webda, name, params);
|
|
60
|
-
this.workoutLogger = new
|
|
51
|
+
this.workoutLogger = new ConsoleLogger(webda.getWorkerOutput(), this.parameters.logLevel, this.parameters.format);
|
|
61
52
|
}
|
|
62
53
|
/**
|
|
63
54
|
* @inheritdoc
|
|
@@ -66,10 +57,8 @@ class ConsoleLoggerService extends LoggerService {
|
|
|
66
57
|
return new ConsoleLoggerServiceParameters(params);
|
|
67
58
|
}
|
|
68
59
|
}
|
|
69
|
-
|
|
70
|
-
class FileLoggerServiceParameters extends LoggerServiceParameters {
|
|
60
|
+
export class FileLoggerServiceParameters extends LoggerServiceParameters {
|
|
71
61
|
}
|
|
72
|
-
exports.FileLoggerServiceParameters = FileLoggerServiceParameters;
|
|
73
62
|
/**
|
|
74
63
|
* Save logs into a file
|
|
75
64
|
*
|
|
@@ -78,10 +67,10 @@ exports.FileLoggerServiceParameters = FileLoggerServiceParameters;
|
|
|
78
67
|
* @see `@webda/workout FileLogger`
|
|
79
68
|
* @WebdaModda FileLogger
|
|
80
69
|
*/
|
|
81
|
-
class FileLoggerService extends LoggerService {
|
|
70
|
+
export class FileLoggerService extends LoggerService {
|
|
82
71
|
constructor(webda, name, params) {
|
|
83
72
|
super(webda, name, params);
|
|
84
|
-
this.workoutLogger = new
|
|
73
|
+
this.workoutLogger = new FileLogger(webda.getWorkerOutput(), this.parameters.logLevel, this.parameters.file, this.parameters.sizeLimit, this.parameters.format);
|
|
85
74
|
}
|
|
86
75
|
/**
|
|
87
76
|
* @inheritdoc
|
|
@@ -90,11 +79,10 @@ class FileLoggerService extends LoggerService {
|
|
|
90
79
|
return new FileLoggerServiceParameters(params);
|
|
91
80
|
}
|
|
92
81
|
}
|
|
93
|
-
exports.FileLoggerService = FileLoggerService;
|
|
94
82
|
/**
|
|
95
83
|
*
|
|
96
84
|
*/
|
|
97
|
-
class Logger {
|
|
85
|
+
export class Logger {
|
|
98
86
|
constructor(output, clazz) {
|
|
99
87
|
this.output = output;
|
|
100
88
|
this.clazz = clazz;
|
|
@@ -127,5 +115,4 @@ class Logger {
|
|
|
127
115
|
this.output.setTitle(title);
|
|
128
116
|
}
|
|
129
117
|
}
|
|
130
|
-
exports.Logger = Logger;
|
|
131
118
|
//# sourceMappingURL=logger.js.map
|
package/lib/utils/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,YAAY,EAGb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEjE,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IAM5D;;OAEG;IACH,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,mDAAmD;QACnD,IAAI,CAAC,QAAQ,KAAb,IAAI,CAAC,QAAQ,GAAU,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,MAAM,EAAC;IAC5D,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,aAA2E,SAAQ,OAAU;CAAG;AAE7G,MAAM,OAAO,6BAA8B,SAAQ,uBAAuB;CAEzE;AACD;;;;;GAKG;AACH,MAAM,OAAO,mBAEX,SAAQ,aAAgB;IAExB,YAAY,KAAW,EAAE,IAAY,EAAE,MAAW;QAChD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClH,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,6BAA6B,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,OAAO,8BAA+B,SAAQ,uBAAuB;CAE1E;AACD;;;;;;;GAOG;AAEH,MAAM,OAAO,oBAEX,SAAQ,aAAgB;IAExB,YAAY,KAAW,EAAE,IAAY,EAAE,MAAW;QAChD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACpH,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,uBAAuB;CAIvE;AACD;;;;;;;GAOG;AACH,MAAM,OAAO,iBAEX,SAAQ,aAAgB;IAExB,YAAY,KAAW,EAAE,IAAY,EAAE,MAAW;QAChD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,UAAU,CACjC,KAAK,CAAC,eAAe,EAAE,EACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,EACxB,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,UAAU,CAAC,SAAS,EACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CACvB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,MAAM;IAIjB,YAAY,MAAoB,EAAE,KAAa;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,KAAqB,EAAE,GAAG,IAAI;QAChC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,cAAc,CAAC,KAAqB,EAAE,OAAY,EAAE,GAAG,IAAI;QACzD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;SAC5B;QACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,gBAAgB,CAAC,GAAW,EAAE,KAAa,EAAE,QAAgB,SAAS;QACpE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,oBAAoB,CAAC,MAAc,CAAC,EAAE,MAAc,SAAS;QAC3D,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IACD,iBAAiB,CAAC,OAAe,EAAE,MAAc,SAAS,EAAE,QAAgB,SAAS;QACnF,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF"}
|
package/lib/utils/logger.spec.js
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
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;
|
|
6
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
6
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
let LoggerTest = class LoggerTest extends test_1.WebdaTest {
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import { WebdaTest } from "../test.js";
|
|
9
|
+
import { FileLoggerService, Logger } from "./logger.js";
|
|
10
|
+
let LoggerTest = class LoggerTest extends WebdaTest {
|
|
13
11
|
testLogger() {
|
|
14
12
|
let output = {
|
|
15
13
|
log: (...args) => { },
|
|
@@ -21,7 +19,7 @@ let LoggerTest = class LoggerTest extends test_1.WebdaTest {
|
|
|
21
19
|
updateProgress: (...args) => { },
|
|
22
20
|
setTitle: (...args) => { }
|
|
23
21
|
};
|
|
24
|
-
let logger = new
|
|
22
|
+
let logger = new Logger(output, "plop");
|
|
25
23
|
logger.log("DEBUG", "test");
|
|
26
24
|
logger.logGroupOpen("bouzouf");
|
|
27
25
|
logger.logProgressStart("test", 100, "plop");
|
|
@@ -32,16 +30,16 @@ let LoggerTest = class LoggerTest extends test_1.WebdaTest {
|
|
|
32
30
|
logger.logTitle("MyTitle");
|
|
33
31
|
}
|
|
34
32
|
fileLogger() {
|
|
35
|
-
let logger = new
|
|
33
|
+
let logger = new FileLoggerService(this.webda, "flogger", {});
|
|
36
34
|
}
|
|
37
35
|
};
|
|
38
36
|
__decorate([
|
|
39
|
-
|
|
37
|
+
test
|
|
40
38
|
], LoggerTest.prototype, "testLogger", null);
|
|
41
39
|
__decorate([
|
|
42
|
-
|
|
40
|
+
test
|
|
43
41
|
], LoggerTest.prototype, "fileLogger", null);
|
|
44
42
|
LoggerTest = __decorate([
|
|
45
|
-
|
|
43
|
+
suite
|
|
46
44
|
], LoggerTest);
|
|
47
45
|
//# sourceMappingURL=logger.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../src/utils/logger.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../src/utils/logger.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGrD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,SAAS;IAEhC,UAAU;QACR,IAAI,MAAM,GAAQ;YAChB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YACpB,cAAc,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAC/B,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAC1B,UAAU,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAC3B,aAAa,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAC9B,iBAAiB,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAClC,cAAc,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;YAC/B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAE,CAAC;SAC1B,CAAC;QACF,IAAI,MAAM,GAAG,IAAI,MAAM,CAAe,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACrC,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAGD,UAAU;QACR,IAAI,MAAM,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;CACF,CAAA;AA1BC;IADC,IAAI;4CAqBJ;AAGD;IADC,IAAI;4CAGJ;AA3BG,UAAU;IADf,KAAK;GACA,UAAU,CA4Bf"}
|
package/lib/utils/serializers.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const fs_1 = require("fs");
|
|
5
|
-
const jsonc = require("jsonc-parser");
|
|
6
|
-
const yaml = require("yaml");
|
|
1
|
+
import { existsSync, readFileSync, writeFileSync } from "fs";
|
|
2
|
+
import * as jsonc from "jsonc-parser";
|
|
3
|
+
import * as yaml from "yaml";
|
|
7
4
|
/**
|
|
8
5
|
* Allow save/load of yaml or json file
|
|
9
6
|
*/
|
|
10
|
-
|
|
7
|
+
export const FileUtils = {
|
|
11
8
|
/**
|
|
12
9
|
* Load a YAML or JSON file based on its extension
|
|
13
10
|
*
|
|
@@ -15,10 +12,10 @@ exports.FileUtils = {
|
|
|
15
12
|
* @returns
|
|
16
13
|
*/
|
|
17
14
|
load: filename => {
|
|
18
|
-
if (!
|
|
15
|
+
if (!existsSync(filename)) {
|
|
19
16
|
throw new Error("File does not exist");
|
|
20
17
|
}
|
|
21
|
-
let content =
|
|
18
|
+
let content = readFileSync(filename, "utf-8");
|
|
22
19
|
if (filename.match(/\.ya?ml$/i)) {
|
|
23
20
|
let res = yaml.parseAllDocuments(content);
|
|
24
21
|
if (res.length === 1) {
|
|
@@ -43,10 +40,10 @@ exports.FileUtils = {
|
|
|
43
40
|
*/
|
|
44
41
|
save: (object, filename = "", publicAudience = false) => {
|
|
45
42
|
if (filename.match(/\.ya?ml$/i)) {
|
|
46
|
-
return
|
|
43
|
+
return writeFileSync(filename, yaml.stringify(JSON.parse(JSONUtils.stringify(object, undefined, 0, publicAudience))));
|
|
47
44
|
}
|
|
48
45
|
else if (filename.match(/\.json$/i)) {
|
|
49
|
-
return
|
|
46
|
+
return writeFileSync(filename, JSONUtils.stringify(object, undefined, 2, publicAudience));
|
|
50
47
|
}
|
|
51
48
|
throw new Error("Unknown format");
|
|
52
49
|
}
|
|
@@ -54,7 +51,7 @@ exports.FileUtils = {
|
|
|
54
51
|
/**
|
|
55
52
|
* Simple JSON utils
|
|
56
53
|
*/
|
|
57
|
-
|
|
54
|
+
export const JSONUtils = {
|
|
58
55
|
/**
|
|
59
56
|
* Safe Stringify stringify a object included circular object
|
|
60
57
|
* and also remove any attributes starting with a __
|
|
@@ -106,7 +103,7 @@ exports.JSONUtils = {
|
|
|
106
103
|
}
|
|
107
104
|
catch (err) {
|
|
108
105
|
if (err.message && err.message.startsWith("Converting circular structure to JSON")) {
|
|
109
|
-
return
|
|
106
|
+
return JSONUtils.safeStringify(value, replacer, space, publicAudience);
|
|
110
107
|
}
|
|
111
108
|
throw err;
|
|
112
109
|
}
|
|
@@ -125,33 +122,33 @@ exports.JSONUtils = {
|
|
|
125
122
|
* Duplicate an object using serializer
|
|
126
123
|
*/
|
|
127
124
|
duplicate: value => {
|
|
128
|
-
return JSON.parse(
|
|
125
|
+
return JSON.parse(JSONUtils.stringify(value));
|
|
129
126
|
},
|
|
130
127
|
/**
|
|
131
128
|
* Helper to FileUtils.save
|
|
132
129
|
*/
|
|
133
|
-
loadFile:
|
|
130
|
+
loadFile: FileUtils.load,
|
|
134
131
|
/**
|
|
135
132
|
* Helper to FileUtils.save
|
|
136
133
|
*/
|
|
137
|
-
saveFile:
|
|
134
|
+
saveFile: FileUtils.save
|
|
138
135
|
};
|
|
139
136
|
/**
|
|
140
137
|
* Expose basic YAML function
|
|
141
138
|
*/
|
|
142
|
-
|
|
139
|
+
export const YAMLUtils = {
|
|
143
140
|
/**
|
|
144
141
|
* Helper to FileUtils.save
|
|
145
142
|
*/
|
|
146
|
-
saveFile:
|
|
143
|
+
saveFile: FileUtils.save,
|
|
147
144
|
/**
|
|
148
145
|
* Helper to FileUtils.load
|
|
149
146
|
*/
|
|
150
|
-
loadFile:
|
|
147
|
+
loadFile: FileUtils.load,
|
|
151
148
|
/**
|
|
152
149
|
* Duplicate an object using serializer
|
|
153
150
|
*/
|
|
154
|
-
duplicate:
|
|
151
|
+
duplicate: JSONUtils.duplicate,
|
|
155
152
|
/**
|
|
156
153
|
* Parse a single document yaml
|
|
157
154
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../../src/utils/serializers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../../src/utils/serializers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,33 +1,32 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
2
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
3
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
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;
|
|
6
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
6
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const TEST_FOLDER =
|
|
7
|
+
import { suite, test } from "@testdeck/mocha";
|
|
8
|
+
import * as assert from "assert";
|
|
9
|
+
import { readFileSync } from "fs";
|
|
10
|
+
import * as path from "path";
|
|
11
|
+
import { FileUtils, JSONUtils, YAMLUtils } from "./serializers.js";
|
|
12
|
+
import { fileURLToPath } from 'url';
|
|
13
|
+
const TEST_FOLDER = path.dirname(fileURLToPath(import.meta.url)) + "/../../test/jsonutils/";
|
|
15
14
|
let UtilsTest = class UtilsTest {
|
|
16
15
|
fileJson() {
|
|
17
|
-
assert.deepStrictEqual(
|
|
18
|
-
assert.deepStrictEqual(
|
|
19
|
-
assert.deepStrictEqual(
|
|
20
|
-
assert.throws(() =>
|
|
21
|
-
assert.throws(() =>
|
|
16
|
+
assert.deepStrictEqual(JSONUtils.loadFile(TEST_FOLDER + "test.json"), { test: "ok" });
|
|
17
|
+
assert.deepStrictEqual(YAMLUtils.loadFile(TEST_FOLDER + "test.json"), { test: "ok" });
|
|
18
|
+
assert.deepStrictEqual(FileUtils.load(TEST_FOLDER + "test.json"), { test: "ok" });
|
|
19
|
+
assert.throws(() => JSONUtils.loadFile("/none"), /File does not exist/);
|
|
20
|
+
assert.throws(() => JSONUtils.loadFile("./Dockerfile"), /Unknown format/);
|
|
22
21
|
}
|
|
23
22
|
fileYml() {
|
|
24
|
-
assert.deepStrictEqual(
|
|
23
|
+
assert.deepStrictEqual(JSONUtils.loadFile(TEST_FOLDER + "test.yml"), {
|
|
25
24
|
test: { ok: "plop" },
|
|
26
25
|
tab: ["ok", "item2"]
|
|
27
26
|
});
|
|
28
27
|
}
|
|
29
28
|
fileYaml() {
|
|
30
|
-
assert.strictEqual(
|
|
29
|
+
assert.strictEqual(JSONUtils.loadFile(TEST_FOLDER + "mdocs.yaml").length, 2);
|
|
31
30
|
}
|
|
32
31
|
circularJSON() {
|
|
33
32
|
let a = {
|
|
@@ -37,9 +36,9 @@ let UtilsTest = class UtilsTest {
|
|
|
37
36
|
n: null
|
|
38
37
|
};
|
|
39
38
|
a.c.a = a;
|
|
40
|
-
assert.deepStrictEqual(
|
|
41
|
-
assert.deepStrictEqual(
|
|
42
|
-
assert.deepStrictEqual(
|
|
39
|
+
assert.deepStrictEqual(JSONUtils.stringify(a), JSON.stringify({ b: "test", c: {}, __test: true }, undefined, 2));
|
|
40
|
+
assert.deepStrictEqual(JSONUtils.safeStringify(a), JSON.stringify({ b: "test", c: {}, __test: true }, undefined, 2));
|
|
41
|
+
assert.deepStrictEqual(JSONUtils.stringify(a, (key, value) => {
|
|
43
42
|
if (key !== "b" && key !== "n")
|
|
44
43
|
return value;
|
|
45
44
|
return undefined;
|
|
@@ -54,75 +53,75 @@ let UtilsTest = class UtilsTest {
|
|
|
54
53
|
__test: true
|
|
55
54
|
};
|
|
56
55
|
a.d = a.c;
|
|
57
|
-
assert.deepStrictEqual(
|
|
56
|
+
assert.deepStrictEqual(JSONUtils.stringify(a), JSON.stringify({ b: "test", c: { plop: "bouzouf" }, __test: true, d: { plop: "bouzouf" } }, undefined, 2));
|
|
58
57
|
}
|
|
59
58
|
writeJSON() {
|
|
60
59
|
let file = path.join(TEST_FOLDER, "writeTest.json");
|
|
61
|
-
|
|
62
|
-
assert.strictEqual(
|
|
60
|
+
JSONUtils.saveFile({ test: "plop" }, file);
|
|
61
|
+
assert.strictEqual(readFileSync(file).toString(), '{\n "test": "plop"\n}');
|
|
63
62
|
file = path.join(TEST_FOLDER, "writeTest.yaml");
|
|
64
|
-
|
|
65
|
-
assert.strictEqual(
|
|
63
|
+
JSONUtils.saveFile({ test: "plop" }, file);
|
|
64
|
+
assert.strictEqual(readFileSync(file).toString(), `test: plop\n`);
|
|
66
65
|
// Yaml alias
|
|
67
66
|
file = path.join(TEST_FOLDER, "writeTest.json");
|
|
68
|
-
|
|
69
|
-
assert.strictEqual(
|
|
67
|
+
YAMLUtils.saveFile({ test: "plop" }, file);
|
|
68
|
+
assert.strictEqual(readFileSync(file).toString(), '{\n "test": "plop"\n}');
|
|
70
69
|
// True implem
|
|
71
70
|
file = path.join(TEST_FOLDER, "writeTest.json");
|
|
72
|
-
|
|
73
|
-
assert.strictEqual(
|
|
74
|
-
assert.throws(() =>
|
|
71
|
+
FileUtils.save({ test: "plop" }, file);
|
|
72
|
+
assert.strictEqual(readFileSync(file).toString(), '{\n "test": "plop"\n}');
|
|
73
|
+
assert.throws(() => JSONUtils.saveFile({}, "./Dockerfile.zzz"), /Unknown format/);
|
|
75
74
|
}
|
|
76
75
|
duplicate() {
|
|
77
76
|
let obj = { plop: "test" };
|
|
78
|
-
let obj2 =
|
|
77
|
+
let obj2 = JSONUtils.duplicate(obj);
|
|
79
78
|
assert.notStrictEqual(obj, obj2);
|
|
80
79
|
assert.deepStrictEqual(obj, obj2);
|
|
81
|
-
obj2 =
|
|
80
|
+
obj2 = JSONUtils.parse('{"plop": "test"}');
|
|
82
81
|
assert.deepStrictEqual(obj, obj2);
|
|
83
82
|
}
|
|
84
83
|
audience() {
|
|
85
|
-
assert.strictEqual(
|
|
86
|
-
assert.throws(() =>
|
|
84
|
+
assert.strictEqual(JSONUtils.stringify({ __dirname: "plop", me: null, test: "plop" }, undefined, 2, true), '{\n "test": "plop"\n}');
|
|
85
|
+
assert.throws(() => JSONUtils.stringify({ test: true }, () => {
|
|
87
86
|
throw new Error("BOUZOUF");
|
|
88
87
|
}), /BOUZOUF/);
|
|
89
88
|
}
|
|
90
89
|
yaml() {
|
|
91
|
-
assert.strictEqual(
|
|
90
|
+
assert.strictEqual(YAMLUtils.stringify({ plop: "test" }), `plop: test
|
|
92
91
|
`);
|
|
93
|
-
assert.deepEqual(
|
|
92
|
+
assert.deepEqual(YAMLUtils.parse(`
|
|
94
93
|
plop: test
|
|
95
94
|
`), { plop: "test" });
|
|
96
95
|
}
|
|
97
96
|
};
|
|
98
97
|
__decorate([
|
|
99
|
-
|
|
98
|
+
test("LoadJSON File")
|
|
100
99
|
], UtilsTest.prototype, "fileJson", null);
|
|
101
100
|
__decorate([
|
|
102
|
-
|
|
101
|
+
test("LoadYAML File")
|
|
103
102
|
], UtilsTest.prototype, "fileYml", null);
|
|
104
103
|
__decorate([
|
|
105
|
-
|
|
104
|
+
test("LoadYAML Multiple Docs File")
|
|
106
105
|
], UtilsTest.prototype, "fileYaml", null);
|
|
107
106
|
__decorate([
|
|
108
|
-
|
|
107
|
+
test("CircularJSON")
|
|
109
108
|
], UtilsTest.prototype, "circularJSON", null);
|
|
110
109
|
__decorate([
|
|
111
|
-
|
|
110
|
+
test("DuplicateJSON")
|
|
112
111
|
], UtilsTest.prototype, "duplicatedJSON", null);
|
|
113
112
|
__decorate([
|
|
114
|
-
|
|
113
|
+
test("Write JSON/YAML")
|
|
115
114
|
], UtilsTest.prototype, "writeJSON", null);
|
|
116
115
|
__decorate([
|
|
117
|
-
|
|
116
|
+
test
|
|
118
117
|
], UtilsTest.prototype, "duplicate", null);
|
|
119
118
|
__decorate([
|
|
120
|
-
|
|
119
|
+
test
|
|
121
120
|
], UtilsTest.prototype, "audience", null);
|
|
122
121
|
__decorate([
|
|
123
|
-
|
|
122
|
+
test("YAML stringify")
|
|
124
123
|
], UtilsTest.prototype, "yaml", null);
|
|
125
124
|
UtilsTest = __decorate([
|
|
126
|
-
|
|
125
|
+
suite
|
|
127
126
|
], UtilsTest);
|
|
128
127
|
//# sourceMappingURL=serializers.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.spec.js","sourceRoot":"","sources":["../../src/utils/serializers.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serializers.spec.js","sourceRoot":"","sources":["../../src/utils/serializers.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/session.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { CoreModel } from "../models/coremodel";
|
|
2
|
-
import CryptoService, { JWTOptions } from "../services/cryptoservice";
|
|
3
|
-
import { DeepPartial, Service, ServiceParameters } from "../services/service";
|
|
4
|
-
import { Store } from "../stores/store";
|
|
5
|
-
import { Context } from "./context";
|
|
6
|
-
import { CookieOptions } from "./cookie";
|
|
1
|
+
import { CoreModel } from "../models/coremodel.js";
|
|
2
|
+
import CryptoService, { JWTOptions } from "../services/cryptoservice.js";
|
|
3
|
+
import { DeepPartial, Service, ServiceParameters } from "../services/service.js";
|
|
4
|
+
import { Store } from "../stores/store.js";
|
|
5
|
+
import { Context } from "./context.js";
|
|
6
|
+
import { CookieOptions } from "./cookie.js";
|
|
7
7
|
/**
|
|
8
8
|
* Manage load and save of sessions
|
|
9
9
|
*/
|