@lenne.tech/nest-server 10.0.2 → 10.0.4
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/README.md +9 -0
- package/dist/config.env.js +47 -17
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/args/filter.args.js +3 -3
- package/dist/core/common/args/filter.args.js.map +1 -1
- package/dist/core/common/args/pagination.args.js +6 -6
- package/dist/core/common/args/pagination.args.js.map +1 -1
- package/dist/core/common/decorators/restricted.decorator.js +15 -17
- package/dist/core/common/decorators/restricted.decorator.js.map +1 -1
- package/dist/core/common/filters/http-exception-log.filter.js +1 -3
- package/dist/core/common/filters/http-exception-log.filter.js.map +1 -1
- package/dist/core/common/helpers/db.helper.js +14 -14
- package/dist/core/common/helpers/db.helper.js.map +1 -1
- package/dist/core/common/helpers/file.helper.js +2 -2
- package/dist/core/common/helpers/file.helper.js.map +1 -1
- package/dist/core/common/helpers/filter.helper.d.ts +2 -2
- package/dist/core/common/helpers/filter.helper.js +1 -1
- package/dist/core/common/helpers/filter.helper.js.map +1 -1
- package/dist/core/common/helpers/graphql.helper.js +1 -1
- package/dist/core/common/helpers/graphql.helper.js.map +1 -1
- package/dist/core/common/helpers/input.helper.js +31 -38
- package/dist/core/common/helpers/input.helper.js.map +1 -1
- package/dist/core/common/helpers/model.helper.js +7 -7
- package/dist/core/common/helpers/model.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.js +2 -2
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/inputs/combined-filter.input.js +3 -3
- package/dist/core/common/inputs/combined-filter.input.js.map +1 -1
- package/dist/core/common/inputs/core-input.input.js +1 -1
- package/dist/core/common/inputs/core-input.input.js.map +1 -1
- package/dist/core/common/inputs/filter.input.js +3 -3
- package/dist/core/common/inputs/filter.input.js.map +1 -1
- package/dist/core/common/inputs/single-filter.input.js +4 -4
- package/dist/core/common/inputs/single-filter.input.js.map +1 -1
- package/dist/core/common/inputs/sort.input.js +1 -1
- package/dist/core/common/inputs/sort.input.js.map +1 -1
- package/dist/core/common/interceptors/check-security.interceptor.d.ts +1 -1
- package/dist/core/common/interceptors/check-security.interceptor.js +2 -2
- package/dist/core/common/interceptors/check-security.interceptor.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +28 -0
- package/dist/core/common/models/core-model.model.js.map +1 -1
- package/dist/core/common/models/core-persistence.model.js +3 -3
- package/dist/core/common/models/core-persistence.model.js.map +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.d.ts +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.js +1 -1
- package/dist/core/common/pipes/map-and-validate.pipe.js.map +1 -1
- package/dist/core/common/scalars/any.scalar.js +2 -2
- package/dist/core/common/scalars/any.scalar.js.map +1 -1
- package/dist/core/common/scalars/date-timestamp.scalar.js +1 -1
- package/dist/core/common/scalars/date-timestamp.scalar.js.map +1 -1
- package/dist/core/common/scalars/date.scalar.js +1 -1
- package/dist/core/common/scalars/date.scalar.js.map +1 -1
- package/dist/core/common/scalars/json.scalar.js +2 -2
- package/dist/core/common/scalars/json.scalar.js.map +1 -1
- package/dist/core/common/services/config.service.js +7 -7
- package/dist/core/common/services/config.service.js.map +1 -1
- package/dist/core/common/services/core-cron-jobs.service.js +5 -5
- package/dist/core/common/services/core-cron-jobs.service.js.map +1 -1
- package/dist/core/common/services/crud.service.js +1 -1
- package/dist/core/common/services/crud.service.js.map +1 -1
- package/dist/core/common/services/mailjet.service.js +5 -5
- package/dist/core/common/services/mailjet.service.js.map +1 -1
- package/dist/core/common/services/model-doc.service.d.ts +16 -0
- package/dist/core/common/services/model-doc.service.js +107 -0
- package/dist/core/common/services/model-doc.service.js.map +1 -0
- package/dist/core/common/services/module.service.js.map +1 -1
- package/dist/core/common/services/template.service.js +3 -3
- package/dist/core/common/services/template.service.js.map +1 -1
- package/dist/core/common/types/core-model-constructor.type.d.ts +2 -2
- package/dist/core/modules/auth/core-auth.module.js +3 -3
- package/dist/core/modules/auth/core-auth.module.js.map +1 -1
- package/dist/core/modules/auth/core-auth.resolver.js +5 -5
- package/dist/core/modules/auth/core-auth.resolver.js.map +1 -1
- package/dist/core/modules/auth/guards/auth.guard.js +4 -4
- package/dist/core/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/core/modules/auth/services/core-auth.service.js +5 -5
- package/dist/core/modules/auth/services/core-auth.service.js.map +1 -1
- package/dist/core/modules/auth/strategies/jwt.strategy.js.map +1 -1
- package/dist/core/modules/auth/tokens.decorator.js +2 -2
- package/dist/core/modules/auth/tokens.decorator.js.map +1 -1
- package/dist/core/modules/file/core-file-info.model.js +2 -2
- package/dist/core/modules/file/core-file-info.model.js.map +1 -1
- package/dist/core/modules/file/core-file.controller.d.ts +1 -2
- package/dist/core/modules/file/core-file.controller.js +3 -6
- package/dist/core/modules/file/core-file.controller.js.map +1 -1
- package/dist/core/modules/file/core-file.service.js +1 -1
- package/dist/core/modules/file/core-file.service.js.map +1 -1
- package/dist/core/modules/file/interfaces/file-upload.interface.d.ts +1 -1
- package/dist/core/modules/health-check/core-health-check-result.model.d.ts +8 -0
- package/dist/core/modules/health-check/core-health-check-result.model.js +53 -0
- package/dist/core/modules/health-check/core-health-check-result.model.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.controller.d.ts +6 -0
- package/dist/core/modules/health-check/core-health-check.controller.js +33 -0
- package/dist/core/modules/health-check/core-health-check.controller.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.module.d.ts +2 -0
- package/dist/core/modules/health-check/core-health-check.module.js +24 -0
- package/dist/core/modules/health-check/core-health-check.module.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.resolver.d.ts +6 -0
- package/dist/core/modules/health-check/core-health-check.resolver.js +38 -0
- package/dist/core/modules/health-check/core-health-check.resolver.js.map +1 -0
- package/dist/core/modules/health-check/core-health-check.service.d.ts +11 -0
- package/dist/core/modules/health-check/core-health-check.service.js +52 -0
- package/dist/core/modules/health-check/core-health-check.service.js.map +1 -0
- package/dist/core/modules/user/core-user.model.js +5 -5
- package/dist/core/modules/user/core-user.model.js.map +1 -1
- package/dist/core/modules/user/core-user.service.js +2 -2
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user.input.js +1 -1
- package/dist/core/modules/user/inputs/core-user.input.js.map +1 -1
- package/dist/core.module.js +14 -5
- package/dist/core.module.js.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/server/modules/auth/auth.service.js +1 -1
- package/dist/server/modules/auth/auth.service.js.map +1 -1
- package/dist/server/modules/file/file.controller.js +1 -1
- package/dist/server/modules/file/file.controller.js.map +1 -1
- package/dist/server/modules/file/file.resolver.js +2 -2
- package/dist/server/modules/file/file.resolver.js.map +1 -1
- package/dist/server/modules/file/file.service.js +1 -1
- package/dist/server/modules/file/file.service.js.map +1 -1
- package/dist/server/modules/file/multer-config.service.js +1 -1
- package/dist/server/modules/file/multer-config.service.js.map +1 -1
- package/dist/server/modules/user/avatar.controller.js +1 -1
- package/dist/server/modules/user/avatar.controller.js.map +1 -1
- package/dist/server/modules/user/user.resolver.js +1 -1
- package/dist/server/modules/user/user.resolver.js.map +1 -1
- package/dist/server/modules/user/user.service.js +3 -3
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/templates/index.ejs +2 -0
- package/dist/templates/password-reset.ejs +3 -0
- package/dist/templates/welcome.ejs +3 -0
- package/dist/test/test.helper.d.ts +1 -1
- package/dist/test/test.helper.js +7 -7
- package/dist/test/test.helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +32 -26
- package/src/config.env.ts +50 -20
- package/src/core/common/args/filter.args.ts +4 -4
- package/src/core/common/args/pagination.args.ts +7 -7
- package/src/core/common/decorators/graphql-service-options.decorator.ts +2 -2
- package/src/core/common/decorators/graphql-user.decorator.ts +1 -1
- package/src/core/common/decorators/rest-user.decorator.ts +1 -1
- package/src/core/common/decorators/restricted.decorator.ts +18 -18
- package/src/core/common/filters/http-exception-log.filter.ts +4 -4
- package/src/core/common/helpers/db.helper.ts +35 -40
- package/src/core/common/helpers/decorator.helper.ts +1 -1
- package/src/core/common/helpers/file.helper.ts +2 -2
- package/src/core/common/helpers/filter.helper.ts +7 -8
- package/src/core/common/helpers/graphql.helper.ts +6 -6
- package/src/core/common/helpers/input.helper.ts +54 -61
- package/src/core/common/helpers/model.helper.ts +33 -41
- package/src/core/common/helpers/service.helper.ts +8 -8
- package/src/core/common/inputs/combined-filter.input.ts +4 -4
- package/src/core/common/inputs/core-input.input.ts +2 -2
- package/src/core/common/inputs/filter.input.ts +4 -4
- package/src/core/common/inputs/single-filter.input.ts +4 -4
- package/src/core/common/inputs/sort.input.ts +1 -1
- package/src/core/common/interceptors/check-response.interceptor.ts +1 -1
- package/src/core/common/interceptors/check-security.interceptor.ts +5 -5
- package/src/core/common/interfaces/server-options.interface.ts +109 -0
- package/src/core/common/models/core-model.model.ts +6 -4
- package/src/core/common/models/core-persistence.model.ts +3 -3
- package/src/core/common/pipes/map-and-validate.pipe.ts +2 -2
- package/src/core/common/scalars/any.scalar.ts +2 -2
- package/src/core/common/scalars/date-timestamp.scalar.ts +1 -2
- package/src/core/common/scalars/date.scalar.ts +1 -2
- package/src/core/common/scalars/json.scalar.ts +4 -4
- package/src/core/common/services/config.service.ts +16 -16
- package/src/core/common/services/core-cron-jobs.service.ts +7 -7
- package/src/core/common/services/crud.service.ts +22 -22
- package/src/core/common/services/email.service.ts +1 -1
- package/src/core/common/services/mailjet.service.ts +8 -8
- package/src/core/common/services/model-doc.service.ts +140 -0
- package/src/core/common/services/module.service.ts +5 -6
- package/src/core/common/services/template.service.ts +4 -4
- package/src/core/common/types/core-model-constructor.type.ts +2 -2
- package/src/core/modules/auth/core-auth.controller.ts +2 -2
- package/src/core/modules/auth/core-auth.module.ts +4 -4
- package/src/core/modules/auth/core-auth.resolver.ts +9 -9
- package/src/core/modules/auth/guards/auth.guard.ts +8 -7
- package/src/core/modules/auth/guards/roles.guard.ts +1 -1
- package/src/core/modules/auth/services/core-auth.service.ts +9 -9
- package/src/core/modules/auth/strategies/jwt-refresh.strategy.ts +1 -1
- package/src/core/modules/auth/strategies/jwt.strategy.ts +1 -1
- package/src/core/modules/auth/tokens.decorator.ts +6 -7
- package/src/core/modules/file/core-file-info.model.ts +2 -2
- package/src/core/modules/file/core-file.controller.ts +2 -4
- package/src/core/modules/file/core-file.service.ts +6 -5
- package/src/core/modules/file/interfaces/file-upload.interface.ts +1 -1
- package/src/core/modules/health-check/core-health-check-result.model.ts +46 -0
- package/src/core/modules/health-check/core-health-check.controller.ts +24 -0
- package/src/core/modules/health-check/core-health-check.module.ts +17 -0
- package/src/core/modules/health-check/core-health-check.resolver.ts +32 -0
- package/src/core/modules/health-check/core-health-check.service.ts +62 -0
- package/src/core/modules/user/core-user.model.ts +6 -6
- package/src/core/modules/user/core-user.service.ts +10 -9
- package/src/core/modules/user/inputs/core-user.input.ts +1 -2
- package/src/core.module.ts +23 -12
- package/src/index.ts +11 -0
- package/src/main.ts +2 -2
- package/src/server/modules/auth/auth.controller.ts +1 -1
- package/src/server/modules/auth/auth.resolver.ts +3 -3
- package/src/server/modules/auth/auth.service.ts +2 -2
- package/src/server/modules/file/file.controller.ts +1 -2
- package/src/server/modules/file/file.module.ts +1 -1
- package/src/server/modules/file/file.resolver.ts +4 -3
- package/src/server/modules/file/file.service.ts +1 -1
- package/src/server/modules/file/multer-config.service.ts +1 -1
- package/src/server/modules/user/avatar.controller.ts +3 -3
- package/src/server/modules/user/user.model.ts +1 -1
- package/src/server/modules/user/user.resolver.ts +4 -4
- package/src/server/modules/user/user.service.ts +4 -4
- package/src/test/test.helper.ts +11 -11
|
@@ -8,6 +8,8 @@ import { CronExpression } from '@nestjs/schedule';
|
|
|
8
8
|
import compression from 'compression';
|
|
9
9
|
import { CollationOptions } from 'mongodb';
|
|
10
10
|
import * as SMTPTransport from 'nodemailer/lib/smtp-transport';
|
|
11
|
+
import { MongoosePingCheckSettings } from '@nestjs/terminus/dist/health-indicator/database/mongoose.health';
|
|
12
|
+
import { DiskHealthIndicatorOptions } from '@nestjs/terminus/dist/health-indicator/disk/disk-health-options.type';
|
|
11
13
|
import { Falsy } from '../types/falsy.type';
|
|
12
14
|
import { CronJobConfig } from './cron-job-config.interface';
|
|
13
15
|
import { MailjetOptions } from './mailjet-options.interface';
|
|
@@ -45,6 +47,31 @@ export interface IServerOptions {
|
|
|
45
47
|
maxComplexity?: number;
|
|
46
48
|
options?: GqlModuleAsyncOptions;
|
|
47
49
|
};
|
|
50
|
+
healthCheck?: {
|
|
51
|
+
enabled?: boolean;
|
|
52
|
+
configs?: {
|
|
53
|
+
database?: {
|
|
54
|
+
enabled?: boolean;
|
|
55
|
+
key?: string;
|
|
56
|
+
options?: MongoosePingCheckSettings;
|
|
57
|
+
};
|
|
58
|
+
memoryHeap?: {
|
|
59
|
+
enabled?: boolean;
|
|
60
|
+
key?: string;
|
|
61
|
+
heapUsedThreshold?: number;
|
|
62
|
+
};
|
|
63
|
+
memoryRss?: {
|
|
64
|
+
enabled?: boolean;
|
|
65
|
+
key?: string;
|
|
66
|
+
rssThreshold?: number;
|
|
67
|
+
};
|
|
68
|
+
storage?: {
|
|
69
|
+
enabled?: boolean;
|
|
70
|
+
key?: string;
|
|
71
|
+
options?: DiskHealthIndicatorOptions;
|
|
72
|
+
};
|
|
73
|
+
};
|
|
74
|
+
};
|
|
48
75
|
ignoreSelectionsForPopulate?: boolean;
|
|
49
76
|
jwt?: {
|
|
50
77
|
refresh?: {
|
|
@@ -55,6 +82,7 @@ export interface IServerOptions {
|
|
|
55
82
|
logExceptions?: boolean;
|
|
56
83
|
mongoose?: {
|
|
57
84
|
collation?: CollationOptions;
|
|
85
|
+
modelDocumentation?: boolean;
|
|
58
86
|
uri: string;
|
|
59
87
|
options?: MongooseModuleOptions;
|
|
60
88
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-model.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-model.model.ts"],"names":[],"mappings":";;;AAAA,0DAA8C;AAY9C,MAAsB,SAAS;IAItB,MAAM,CAAC,IAAI,CAAuD,GAAG,IAAW;QACrF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAKM,MAAM,CAAC,GAAG,CAEf,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAUM,MAAM,CAAC,OAAO,CAEnB,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"core-model.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-model.model.ts"],"names":[],"mappings":";;;AAAA,0DAA8C;AAY9C,MAAsB,SAAS;IAItB,MAAM,CAAC,IAAI,CAAuD,GAAG,IAAW;QACrF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAKM,MAAM,CAAC,GAAG,CAEf,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAUM,MAAM,CAAC,OAAO,CAEnB,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAOM,IAAI,CAAC,GAAG,IAAW;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAKM,GAAG,CACR,IAAyC,EACzC,UAMI,EAAE;QAEN,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,OAAO;SACX,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;QACD,OAAO,IAAA,kBAAG,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAUM,OAAO,CACZ,IAAyC,EACzC,UAMI,EAAE;QAEN,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,OAAO;SACX,CAAC;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAMM,aAAa,CAAC,IAAS,EAAE,KAAe;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5HD,8BA4HC"}
|
|
@@ -36,7 +36,7 @@ let CorePersistenceModel = exports.CorePersistenceModel = class CorePersistenceM
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
__decorate([
|
|
39
|
-
(0, graphql_1.Field)(
|
|
39
|
+
(0, graphql_1.Field)(type => graphql_1.ID, {
|
|
40
40
|
description: 'ID of the persistence object',
|
|
41
41
|
nullable: true,
|
|
42
42
|
}),
|
|
@@ -48,7 +48,7 @@ __decorate([
|
|
|
48
48
|
__metadata("design:type", Date)
|
|
49
49
|
], CorePersistenceModel.prototype, "createdAt", void 0);
|
|
50
50
|
__decorate([
|
|
51
|
-
(0, graphql_1.Field)(
|
|
51
|
+
(0, graphql_1.Field)(type => [String], {
|
|
52
52
|
description: 'Labels of the object',
|
|
53
53
|
nullable: true,
|
|
54
54
|
}),
|
|
@@ -56,7 +56,7 @@ __decorate([
|
|
|
56
56
|
__metadata("design:type", Array)
|
|
57
57
|
], CorePersistenceModel.prototype, "labels", void 0);
|
|
58
58
|
__decorate([
|
|
59
|
-
(0, graphql_1.Field)(
|
|
59
|
+
(0, graphql_1.Field)(type => [String], {
|
|
60
60
|
description: 'Tags for the object',
|
|
61
61
|
nullable: true,
|
|
62
62
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-persistence.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-persistence.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAwD;AACxD,+CAAgD;AAChD,uCAAiC;AACjC,yDAA+C;AAmBxC,IAAe,oBAAoB,kCAAnC,MAAe,oBAAqB,SAAQ,4BAAS;IAArD;;QAoBL,OAAE,GAAW,SAAS,CAAC;QAOvB,cAAS,GAAS,SAAS,CAAC;QAU5B,WAAM,GAAa,SAAS,CAAC;QAU7B,SAAI,GAAa,SAAS,CAAC;QAO3B,cAAS,GAAS,SAAS,CAAC;IAiB9B,CAAC;IAlEC,IAAI,GAAG;QACL,OAAO,IAAI,gBAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAwDQ,IAAI;QACX,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAnDC;IAJC,IAAA,eAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"core-persistence.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-persistence.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAwD;AACxD,+CAAgD;AAChD,uCAAiC;AACjC,yDAA+C;AAmBxC,IAAe,oBAAoB,kCAAnC,MAAe,oBAAqB,SAAQ,4BAAS;IAArD;;QAoBL,OAAE,GAAW,SAAS,CAAC;QAOvB,cAAS,GAAS,SAAS,CAAC;QAU5B,WAAM,GAAa,SAAS,CAAC;QAU7B,SAAI,GAAa,SAAS,CAAC;QAO3B,cAAS,GAAS,SAAS,CAAC;IAiB9B,CAAC;IAlEC,IAAI,GAAG;QACL,OAAO,IAAI,gBAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAwDQ,IAAI;QACX,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAnDC;IAJC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,YAAE,EAAE;QACjB,WAAW,EAAE,8BAA8B;QAC3C,QAAQ,EAAE,IAAI;KACf,CAAC;;gDACqB;AAOvB;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtD,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;8BAC1B,IAAI;uDAAa;AAU5B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE;QACvB,WAAW,EAAE,sBAAsB;QACnC,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,eAAI,EAAC,CAAC,MAAM,CAAC,CAAC;;oDACc;AAU7B;IALC,IAAA,eAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE;QACvB,WAAW,EAAE,qBAAqB;QAClC,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,eAAI,EAAC,CAAC,MAAM,CAAC,CAAC;;kDACY;AAO3B;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtD,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;8BAC1B,IAAI;uDAAa;+BAtDR,oBAAoB;IALzC,IAAA,oBAAU,EAAC;QACV,WAAW,EAAE,6CAA6C;QAC1D,UAAU,EAAE,IAAI;KACjB,CAAC;IACD,IAAA,iBAAM,EAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;GACP,oBAAoB,CAuEzC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ArgumentMetadata, PipeTransform } from '@nestjs/common';
|
|
2
2
|
export declare class MapAndValidatePipe implements PipeTransform {
|
|
3
3
|
transform(value: any, metadata: ArgumentMetadata): Promise<any>;
|
|
4
4
|
}
|
|
@@ -27,7 +27,7 @@ let MapAndValidatePipe = exports.MapAndValidatePipe = class MapAndValidatePipe {
|
|
|
27
27
|
}
|
|
28
28
|
const errors = await (0, class_validator_1.validate)(value, { forbidUnknownValues: false });
|
|
29
29
|
if (errors.length > 0) {
|
|
30
|
-
throw new common_1.BadRequestException(
|
|
30
|
+
throw new common_1.BadRequestException(`Input validation failed:${errors.join('; ')}`);
|
|
31
31
|
}
|
|
32
32
|
return value;
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-and-validate.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/map-and-validate.pipe.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAkG;AAClG,yDAAoD;AACpD,qDAA2C;AAC3C,0DAAsD;AAG/C,IAAM,kBAAkB,gCAAxB,MAAM,kBAAkB;IAC7B,KAAK,CAAC,SAAS,CAAC,KAAU,EAAE,QAA0B;QACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QAE9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,QAAQ,IAAI,IAAA,0BAAW,EAAC,QAAQ,CAAC,EAAE;YACnE,OAAO,KAAK,CAAC;SACd;QAGD,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE;YAChC,IAAK,QAAgB,EAAE,GAAG,EAAE;gBAC1B,KAAK,GAAI,QAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;aACvC;iBAAM;gBACL,KAAK,GAAG,IAAA,mCAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC1C;SACF;QAGD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,4BAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"map-and-validate.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/map-and-validate.pipe.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAkG;AAClG,yDAAoD;AACpD,qDAA2C;AAC3C,0DAAsD;AAG/C,IAAM,kBAAkB,gCAAxB,MAAM,kBAAkB;IAC7B,KAAK,CAAC,SAAS,CAAC,KAAU,EAAE,QAA0B;QACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QAE9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,QAAQ,IAAI,IAAA,0BAAW,EAAC,QAAQ,CAAC,EAAE;YACnE,OAAO,KAAK,CAAC;SACd;QAGD,IAAI,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE;YAChC,IAAK,QAAgB,EAAE,GAAG,EAAE;gBAC1B,KAAK,GAAI,QAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;aACvC;iBAAM;gBACL,KAAK,GAAG,IAAA,mCAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC1C;SACF;QAGD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,4BAAmB,CAAC,2BAA2B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC/E;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;6BAzBY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAyB9B"}
|
|
@@ -37,7 +37,7 @@ let Any = exports.Any = Any_1 = class Any {
|
|
|
37
37
|
return value;
|
|
38
38
|
}
|
|
39
39
|
case graphql_2.Kind.LIST:
|
|
40
|
-
return ast.values.map(
|
|
40
|
+
return ast.values.map(n => this.parseLiteral(n, variables));
|
|
41
41
|
case graphql_2.Kind.NULL:
|
|
42
42
|
return null;
|
|
43
43
|
case graphql_2.Kind.VARIABLE: {
|
|
@@ -50,6 +50,6 @@ let Any = exports.Any = Any_1 = class Any {
|
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
52
|
exports.Any = Any = Any_1 = __decorate([
|
|
53
|
-
(0, graphql_1.Scalar)('Any',
|
|
53
|
+
(0, graphql_1.Scalar)('Any', type => Any_1)
|
|
54
54
|
], Any);
|
|
55
55
|
//# sourceMappingURL=any.scalar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"any.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/any.scalar.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAAuD;AACvD,qCAA0C;AAMnC,IAAM,GAAG,yBAAT,MAAM,GAAG;IAAT;QAIL,gBAAW,GAAG,iBAAiB,CAAC;IA+ClC,CAAC;IA1CC,UAAU,CAAC,KAAa;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,SAAS,CAAC,KAAU;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,YAAY,CAAC,GAAc,EAAE,SAA+B;QAC1D,QAAQ,GAAG,CAAC,IAAI,EAAE;YAChB,KAAK,cAAI,CAAC,MAAM,CAAC;YACjB,KAAK,cAAI,CAAC,IAAI,CAAC;YACf,KAAK,cAAI,CAAC,OAAO;gBACf,OAAO,GAAG,CAAC,KAAK,CAAC;YACnB,KAAK,cAAI,CAAC,GAAG,CAAC;YACd,KAAK,cAAI,CAAC,KAAK;gBACb,OAAO,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,cAAI,CAAC,MAAM,CAAC,CAAC;gBAChB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAClC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3B,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC;aACd;YACD,KAAK,cAAI,CAAC,IAAI;gBACZ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"any.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/any.scalar.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAAuD;AACvD,qCAA0C;AAMnC,IAAM,GAAG,yBAAT,MAAM,GAAG;IAAT;QAIL,gBAAW,GAAG,iBAAiB,CAAC;IA+ClC,CAAC;IA1CC,UAAU,CAAC,KAAa;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,SAAS,CAAC,KAAU;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,YAAY,CAAC,GAAc,EAAE,SAA+B;QAC1D,QAAQ,GAAG,CAAC,IAAI,EAAE;YAChB,KAAK,cAAI,CAAC,MAAM,CAAC;YACjB,KAAK,cAAI,CAAC,IAAI,CAAC;YACf,KAAK,cAAI,CAAC,OAAO;gBACf,OAAO,GAAG,CAAC,KAAK,CAAC;YACnB,KAAK,cAAI,CAAC,GAAG,CAAC;YACd,KAAK,cAAI,CAAC,KAAK;gBACb,OAAO,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,cAAI,CAAC,MAAM,CAAC,CAAC;gBAChB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAClC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3B,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC;aACd;YACD,KAAK,cAAI,CAAC,IAAI;gBACZ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC9D,KAAK,cAAI,CAAC,IAAI;gBACZ,OAAO,IAAI,CAAC;YACd,KAAK,cAAI,CAAC,QAAQ,CAAC,CAAC;gBAClB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC5B,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aAChD;YACD;gBACE,OAAO,SAAS,CAAC;SACpB;IACH,CAAC;CACF,CAAA;cAnDY,GAAG;IADf,IAAA,gBAAM,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,KAAG,CAAC;GACd,GAAG,CAmDf"}
|
|
@@ -24,6 +24,6 @@ let DateTimestampScalar = exports.DateTimestampScalar = class DateTimestampScala
|
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
exports.DateTimestampScalar = DateTimestampScalar = __decorate([
|
|
27
|
-
(0, graphql_1.Scalar)('Date',
|
|
27
|
+
(0, graphql_1.Scalar)('Date', type => Date)
|
|
28
28
|
], DateTimestampScalar);
|
|
29
29
|
//# sourceMappingURL=date-timestamp.scalar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date-timestamp.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/date-timestamp.scalar.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAAuD;
|
|
1
|
+
{"version":3,"file":"date-timestamp.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/date-timestamp.scalar.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAAuD;AACvD,0DAA8E;AAMvE,IAAM,mBAAmB,iCAAzB,MAAM,mBAAmB;IAAzB;QACL,gBAAW,GAAG,wCAAwC,CAAC;IAsBzD,CAAC;IAjBC,UAAU,CAAC,KAAa;QACtB,OAAO,IAAA,8BAAe,EAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAKD,SAAS,CAAC,KAAW;QACnB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAKD,YAAY,CAAC,GAAQ;QACnB,OAAO,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;8BAvBY,mBAAmB;IAD/B,IAAA,gBAAM,EAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;GAChB,mBAAmB,CAuB/B"}
|
|
@@ -24,6 +24,6 @@ let DateScalar = exports.DateScalar = class DateScalar {
|
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
exports.DateScalar = DateScalar = __decorate([
|
|
27
|
-
(0, graphql_1.Scalar)('Date',
|
|
27
|
+
(0, graphql_1.Scalar)('Date', type => Date)
|
|
28
28
|
], DateScalar);
|
|
29
29
|
//# sourceMappingURL=date.scalar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/date.scalar.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAAuD;
|
|
1
|
+
{"version":3,"file":"date.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/date.scalar.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAAuD;AACvD,0DAA8E;AAMvE,IAAM,UAAU,wBAAhB,MAAM,UAAU;IAAhB;QACL,gBAAW,GAAG,yBAAyB,CAAC;IAsB1C,CAAC;IAjBC,UAAU,CAAC,KAAa;QACtB,OAAO,IAAA,8BAAe,EAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAKD,SAAS,CAAC,KAAW;QACnB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IAKD,YAAY,CAAC,GAAQ;QACnB,OAAO,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;qBAvBY,UAAU;IADtB,IAAA,gBAAM,EAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;GAChB,UAAU,CAuBtB"}
|
|
@@ -37,7 +37,7 @@ let JSON = exports.JSON = JSON_1 = class JSON {
|
|
|
37
37
|
return value;
|
|
38
38
|
}
|
|
39
39
|
case graphql_2.Kind.LIST:
|
|
40
|
-
return ast.values.map(
|
|
40
|
+
return ast.values.map(n => this.parseLiteral(n, variables));
|
|
41
41
|
case graphql_2.Kind.NULL:
|
|
42
42
|
return null;
|
|
43
43
|
case graphql_2.Kind.VARIABLE: {
|
|
@@ -50,6 +50,6 @@ let JSON = exports.JSON = JSON_1 = class JSON {
|
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
52
|
exports.JSON = JSON = JSON_1 = __decorate([
|
|
53
|
-
(0, graphql_1.Scalar)('JSON',
|
|
53
|
+
(0, graphql_1.Scalar)('JSON', type => JSON_1)
|
|
54
54
|
], JSON);
|
|
55
55
|
//# sourceMappingURL=json.scalar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/json.scalar.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAAuD;AACvD,qCAA0C;AAMnC,IAAM,IAAI,2BAAV,MAAM,IAAI;IAAV;QAIL,gBAAW,
|
|
1
|
+
{"version":3,"file":"json.scalar.js","sourceRoot":"","sources":["../../../../src/core/common/scalars/json.scalar.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6CAAuD;AACvD,qCAA0C;AAMnC,IAAM,IAAI,2BAAV,MAAM,IAAI;IAAV;QAIL,gBAAW,GACP,oHAAoH,CAAC;IA+C3H,CAAC;IA1CC,UAAU,CAAC,KAAa;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,SAAS,CAAC,KAAU;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,YAAY,CAAC,GAAc,EAAE,SAA+B;QAC1D,QAAQ,GAAG,CAAC,IAAI,EAAE;YAChB,KAAK,cAAI,CAAC,MAAM,CAAC;YACjB,KAAK,cAAI,CAAC,IAAI,CAAC;YACf,KAAK,cAAI,CAAC,OAAO;gBACf,OAAO,GAAG,CAAC,KAAK,CAAC;YACnB,KAAK,cAAI,CAAC,GAAG,CAAC;YACd,KAAK,cAAI,CAAC,KAAK;gBACb,OAAO,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,cAAI,CAAC,MAAM,CAAC,CAAC;gBAChB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAClC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3B,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC;aACd;YACD,KAAK,cAAI,CAAC,IAAI;gBACZ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC9D,KAAK,cAAI,CAAC,IAAI;gBACZ,OAAO,IAAI,CAAC;YACd,KAAK,cAAI,CAAC,QAAQ,CAAC,CAAC;gBAClB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC5B,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aAChD;YACD;gBACE,OAAO,SAAS,CAAC;SACpB;IACH,CAAC;CACF,CAAA;eApDY,IAAI;IADhB,IAAA,gBAAM,EAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,MAAI,CAAC;GAChB,IAAI,CAoDhB"}
|
|
@@ -64,13 +64,13 @@ class ConfigService {
|
|
|
64
64
|
return ConfigService.observable;
|
|
65
65
|
}
|
|
66
66
|
static get observable() {
|
|
67
|
-
return ConfigService._configSubject$.asObservable().pipe((0, operators_1.filter)(
|
|
67
|
+
return ConfigService._configSubject$.asObservable().pipe((0, operators_1.filter)(config => !config), (0, operators_1.map)(config => (0, input_helper_1.clone)(config, { circles: false })));
|
|
68
68
|
}
|
|
69
69
|
get observableFastButReadOnly() {
|
|
70
70
|
return ConfigService.observableFastButReadOnly;
|
|
71
71
|
}
|
|
72
72
|
static get observableFastButReadOnly() {
|
|
73
|
-
return ConfigService._frozenConfigSubject$.asObservable().pipe((0, operators_1.filter)(
|
|
73
|
+
return ConfigService._frozenConfigSubject$.asObservable().pipe((0, operators_1.filter)(config => !config));
|
|
74
74
|
}
|
|
75
75
|
get promise() {
|
|
76
76
|
return ConfigService.promise;
|
|
@@ -101,7 +101,7 @@ class ConfigService {
|
|
|
101
101
|
const merged = (0, config_helper_1.merge)(ConfigService._configSubject$.getValue() || {}, (0, lodash_1.cloneDeep)(configData));
|
|
102
102
|
ConfigService._configSubject$.next(merged);
|
|
103
103
|
if (config.warn) {
|
|
104
|
-
console.warn(
|
|
104
|
+
console.warn(`ConfigService ${activity}`, JSON.stringify(merged, null, 2));
|
|
105
105
|
}
|
|
106
106
|
return ConfigService.config;
|
|
107
107
|
}
|
|
@@ -125,7 +125,7 @@ class ConfigService {
|
|
|
125
125
|
}
|
|
126
126
|
ConfigService._configSubject$.next(current);
|
|
127
127
|
if (config.warn) {
|
|
128
|
-
console.warn(
|
|
128
|
+
console.warn(`ConfigService ${key}:`, JSON.stringify(current[key], null, 2));
|
|
129
129
|
}
|
|
130
130
|
return ConfigService.config;
|
|
131
131
|
}
|
|
@@ -141,8 +141,8 @@ class ConfigService {
|
|
|
141
141
|
};
|
|
142
142
|
const firstInitialization = !ConfigService.isInitialized;
|
|
143
143
|
if (!firstInitialization && !config.reInit) {
|
|
144
|
-
throw new Error('Unintentional overwriting of the configuration. '
|
|
145
|
-
'If overwriting is desired, please set `reInit` in setConfig of ConfigService to `true`.');
|
|
144
|
+
throw new Error('Unintentional overwriting of the configuration. '
|
|
145
|
+
+ 'If overwriting is desired, please set `reInit` in setConfig of ConfigService to `true`.');
|
|
146
146
|
}
|
|
147
147
|
if (firstInitialization && config.init) {
|
|
148
148
|
new ConfigService();
|
|
@@ -170,7 +170,7 @@ class ConfigService {
|
|
|
170
170
|
current[key] = value;
|
|
171
171
|
ConfigService._configSubject$.next(current);
|
|
172
172
|
if (config.warn) {
|
|
173
|
-
console.warn(
|
|
173
|
+
console.warn(`ConfigService ${key}:`, JSON.stringify(value, null, 2));
|
|
174
174
|
}
|
|
175
175
|
return ConfigService.config;
|
|
176
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA6B;AAC7B,mCAAmC;AACnC,+BAAuD;AACvD,8CAA6C;AAC7C,4DAAiD;AACjD,0DAA4D;AA0B5D,MAAa,aAAa;IA6BxB,YACE,YAA+D,EAC/D,OAA8C;QAE9C,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI;YACV,GAAG,OAAO;SACX,CAAC;QAGF,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC;QAGlD,IAAI,CAAC,aAAa,EAAE;YAClB,aAAa,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjD,aAAa,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAA,yBAAU,EAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;SACJ;QAGD,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;YACpC,aAAa;gBACX,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC5E,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;SAC9E;QAGD,IAAI,CAAC,aAAa,EAAE;YAClB,aAAa,CAAC,SAAS,GAAG,IAAI,CAAC;SAChC;QAGD,OAAO,aAAa,CAAC,SAAS,CAAC;IACjC,CAAC;IASD,IAAI,MAAM;QACR,OAAO,aAAa,CAAC,MAAM,CAAC;IAC9B,CAAC;IAKD,MAAM,KAAK,MAAM;QACf,OAAO,IAAA,oBAAK,EAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7E,CAAC;IAKD,IAAI,qBAAqB;QACvB,OAAO,aAAa,CAAC,qBAAqB,CAAC;IAC7C,CAAC;IAKD,MAAM,KAAK,qBAAqB;QAC9B,OAAO,aAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC;IACxD,CAAC;IAKD,GAAG,CAAU,GAAW,EAAE,eAAoB,SAAS;QACrD,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9C,CAAC;IAKD,MAAM,CAAC,GAAG,CAAU,GAAW,EAAE,eAAoB,SAAS;QAC5D,OAAO,IAAA,oBAAK,EAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACvG,CAAC;IAKD,kBAAkB,CAAU,GAAW,EAAE,eAAoB,SAAS;QACpE,OAAO,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;IAKD,MAAM,CAAC,kBAAkB,CAAU,GAAW,EAAE,eAAoB,SAAS;QAC3E,OAAO,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAClF,CAAC;IAKD,IAAI,aAAa;QACf,OAAO,aAAa,CAAC,aAAa,CAAC;IACrC,CAAC;IAKD,MAAM,KAAK,aAAa;QACtB,OAAO,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC;IACnC,CAAC;IAKD,IAAI,eAAe;QACjB,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAKD,MAAM,KAAK,UAAU;QACnB,OAAO,aAAa,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,IAAI,CACtD,IAAA,kBAAM,EAAC,
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,14 +44,14 @@ class CoreCronJobs {
|
|
|
44
44
|
}
|
|
45
45
|
if (!this[name]) {
|
|
46
46
|
if (this.config.log) {
|
|
47
|
-
console.info(
|
|
47
|
+
console.info(`Missing cron job function ${name}`);
|
|
48
48
|
}
|
|
49
49
|
continue;
|
|
50
50
|
}
|
|
51
51
|
const job = new cron_1.CronJob(config.cronTime, async () => {
|
|
52
52
|
const dates = this.runningJobs[name];
|
|
53
|
-
if (dates?.length
|
|
54
|
-
(!config.runParallel || (typeof config.runParallel === 'number' && dates.length >= config.runParallel))) {
|
|
53
|
+
if (dates?.length
|
|
54
|
+
&& (!config.runParallel || (typeof config.runParallel === 'number' && dates.length >= config.runParallel))) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
if (!this.runningJobs[name]) {
|
|
@@ -63,7 +63,7 @@ class CoreCronJobs {
|
|
|
63
63
|
await this[name]();
|
|
64
64
|
}
|
|
65
65
|
catch (e) {
|
|
66
|
-
this.runningJobs[name] = this.runningJobs[name].filter(
|
|
66
|
+
this.runningJobs[name] = this.runningJobs[name].filter(item => item !== date);
|
|
67
67
|
if (config.throwException) {
|
|
68
68
|
throw e;
|
|
69
69
|
}
|
|
@@ -71,7 +71,7 @@ class CoreCronJobs {
|
|
|
71
71
|
console.error(e);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
this.runningJobs[name] = this.runningJobs[name].filter(
|
|
74
|
+
this.runningJobs[name] = this.runningJobs[name].filter(item => item !== date);
|
|
75
75
|
}, null, true, config.timeZone, config.context, config.runOnInit, config.utcOffset, config.unrefTimeout);
|
|
76
76
|
this.schedulerRegistry.addCronJob(name, job);
|
|
77
77
|
if (this.config.log && this.schedulerRegistry.getCronJob(name)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-cron-jobs.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/core-cron-jobs.service.ts"],"names":[],"mappings":";;;AAEA,+BAA+B;AAO/B,MAAsB,YAAY;IAqBhC,YACY,iBAAoC,EACpC,QAAgF,EAC1F,OAA2B;QAFjB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,aAAQ,GAAR,QAAQ,CAAwE;QAX5F,gBAAW,GAA2B,EAAE,CAAC;QAcvC,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,EAAE,IAAI;YACT,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAMD,sBAAsB;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAKS,YAAY;QAEpB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO;SACR;QAGD,KAAK,MAAM,CAAC,IAAI,EAAE,sBAAsB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAE1E,IAAI,CAAC,sBAAsB,EAAE;gBAC3B,SAAS;aACV;YAGD,IAAI,IAAI,GAA2D,sBAAsB,CAAC;YAC1F,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,YAAY,IAAI,EAAE;gBACpD,IAAI,GAAG;oBACL,QAAQ,EAAE,IAAI;iBACf,CAAC;aACH;YAGD,MAAM,MAAM,GAAkB;gBAC5B,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;gBACjB,cAAc,EAAE,IAAI;gBACpB,QAAQ,EAAE,eAAe;gBACzB,GAAG,IAAI;aACR,CAAC;YAGF,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE;gBACrB,SAAS;aACV;YAGD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACf,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;oBACnB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"core-cron-jobs.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/core-cron-jobs.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,7 +118,7 @@ class CrudService extends module_service_1.ModuleService {
|
|
|
118
118
|
const collation = serviceOptions?.collation || config_service_1.ConfigService.get('mongoose.collation');
|
|
119
119
|
const dbResult = (await this.mainDbModel.aggregate(aggregation, collation ? { collation } : {}).exec())[0] || {};
|
|
120
120
|
dbResult.totalCount = dbResult.totalCount?.[0]?.total || 0;
|
|
121
|
-
dbResult.items = dbResult.items?.map(
|
|
121
|
+
dbResult.items = dbResult.items?.map(item => this.mainDbModel.hydrate(item)) || [];
|
|
122
122
|
return dbResult;
|
|
123
123
|
}, { input: filter, outputPath: 'items', serviceOptions });
|
|
124
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/crud.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/crud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.MailjetService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const config_service_1 = require("./config.service");
|
|
15
14
|
const node_mailjet_1 = require("node-mailjet");
|
|
15
|
+
const config_service_1 = require("./config.service");
|
|
16
16
|
let MailjetService = exports.MailjetService = class MailjetService {
|
|
17
17
|
constructor(configService) {
|
|
18
18
|
this.configService = configService;
|
|
@@ -61,15 +61,15 @@ let MailjetService = exports.MailjetService = class MailjetService {
|
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
catch (e) {
|
|
64
|
-
if (this.configService.getFastButReadOnly('email.mailjet.api_key_public')
|
|
65
|
-
this.configService.getFastButReadOnly('email.mailjet.api_key_private')) {
|
|
64
|
+
if (this.configService.getFastButReadOnly('email.mailjet.api_key_public')
|
|
65
|
+
&& this.configService.getFastButReadOnly('email.mailjet.api_key_private')) {
|
|
66
66
|
throw new common_1.HttpException('Cannot connect to mailjet.', 502);
|
|
67
67
|
}
|
|
68
68
|
console.debug(JSON.stringify({
|
|
69
|
-
info: 'Mailjet credentials are missing',
|
|
69
|
+
'info': 'Mailjet credentials are missing',
|
|
70
70
|
'email.mailjet.api_key_public': this.configService.getFastButReadOnly('email.mailjet.api_key_public') || 'missing',
|
|
71
71
|
'email.mailjet.api_key_private': this.configService.getFastButReadOnly('email.mailjet.api_key_private') || 'missing',
|
|
72
|
-
templateData: templateData,
|
|
72
|
+
'templateData': templateData,
|
|
73
73
|
}, null, 2));
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailjet.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/mailjet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA2D;AAC3D
|
|
1
|
+
{"version":3,"file":"mailjet.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/mailjet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA2D;AAC3D,+CAAmC;AACnC,qDAAiD;AAM1C,IAAM,cAAc,4BAApB,MAAM,cAAc;IAIzB,YAAsB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAK/C,KAAK,CAAC,QAAQ,CACnB,UAA6B,EAC7B,OAAe,EACf,UAAkB,EAClB,MAWC;QAGD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG;YACtE,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,2BAA2B,CAAC;YAC/E,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,0BAA0B,CAAC;YAC7E,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;YAClB,GAAG,MAAM;SACV,CAAC;QAGF,IAAI,EAAE,CAAC;QACP,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC7B,EAAE,GAAG,EAAE,CAAC;YACR,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;aAC/B;SACF;aAAM;YACL,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;SAC9B;QAGD,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE;wBACJ,KAAK,EAAE,WAAW;wBAClB,IAAI,EAAE,UAAU;qBACjB;oBACD,EAAE,EAAE,EAAE;oBACN,UAAU,EAAE,UAAU;oBACtB,gBAAgB,EAAE,IAAI;oBACtB,SAAS,EAAE,YAAY;oBACvB,OAAO,EAAE,OAAO;oBAChB,WAAW,EAAE,WAAW;iBACzB;aACF;YACD,WAAW,EAAE,OAAO;SACrB,CAAC;QAEF,IAAI,UAAU,CAAC;QACf,IAAI;YAEF,UAAU,GAAG,IAAI,sBAAO,CAAC;gBACvB,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,8BAA8B,CAAC;gBAC7E,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,+BAA+B,CAAC;aAClF,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IACE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,8BAA8B,CAAC;mBAClE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,EACzE;gBACA,MAAM,IAAI,sBAAa,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAC5D;YACD,OAAO,CAAC,KAAK,CACX,IAAI,CAAC,SAAS,CACZ;gBACE,MAAM,EAAE,iCAAiC;gBACzC,8BAA8B,EAC5B,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,8BAA8B,CAAC,IAAI,SAAS;gBACpF,+BAA+B,EAC7B,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,IAAI,SAAS;gBACrF,cAAc,EAAE,YAAY;aAC7B,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;YACF,OAAO;SACR;QAGD,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;yBApGY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAK0B,8BAAa;GAJvC,cAAc,CAoG1B"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { OnApplicationBootstrap } from '@nestjs/common';
|
|
2
|
+
import { Connection } from 'mongoose';
|
|
3
|
+
export interface ModelDocSchemaConfig {
|
|
4
|
+
isArray: boolean;
|
|
5
|
+
name: string;
|
|
6
|
+
ref: string;
|
|
7
|
+
type: string;
|
|
8
|
+
}
|
|
9
|
+
export declare class ModelDocService implements OnApplicationBootstrap {
|
|
10
|
+
private readonly connection;
|
|
11
|
+
constructor(connection: Connection);
|
|
12
|
+
onApplicationBootstrap(): Promise<void>;
|
|
13
|
+
protected getSchemaJson(): Record<string, Record<string, ModelDocSchemaConfig>>;
|
|
14
|
+
protected jsonToYuml(json: Record<string, Record<string, ModelDocSchemaConfig>>): string;
|
|
15
|
+
protected yUmlToSvg(yUmlText: String): void;
|
|
16
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.ModelDocService = void 0;
|
|
16
|
+
const fs = require("fs");
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
18
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
19
|
+
const mongoose_2 = require("mongoose");
|
|
20
|
+
const YumlDiagram = require("yuml-diagram");
|
|
21
|
+
let ModelDocService = exports.ModelDocService = class ModelDocService {
|
|
22
|
+
constructor(connection) {
|
|
23
|
+
this.connection = connection;
|
|
24
|
+
}
|
|
25
|
+
async onApplicationBootstrap() {
|
|
26
|
+
const schemaJson = this.getSchemaJson();
|
|
27
|
+
const yUml = this.jsonToYuml(schemaJson);
|
|
28
|
+
this.yUmlToSvg(yUml);
|
|
29
|
+
}
|
|
30
|
+
getSchemaJson() {
|
|
31
|
+
const results = {};
|
|
32
|
+
const models = this.connection.modelNames();
|
|
33
|
+
for (const modelName of models) {
|
|
34
|
+
results[modelName] = {};
|
|
35
|
+
const schema = this.connection.model(modelName).schema;
|
|
36
|
+
Object.keys(schema.paths).forEach((key) => {
|
|
37
|
+
const obj = schema.obj[key] || {};
|
|
38
|
+
const path = schema.paths[key];
|
|
39
|
+
results[modelName][key] = {
|
|
40
|
+
isArray: path.instance === 'Array',
|
|
41
|
+
name: path.path,
|
|
42
|
+
ref: Array.isArray(obj) ? undefined : obj.ref,
|
|
43
|
+
type: path.instance === 'Array'
|
|
44
|
+
? Array.isArray(obj)
|
|
45
|
+
? obj[0]() === '' ? 'String' : obj[0]()
|
|
46
|
+
: typeof obj.type === 'function' ? obj.type.name : obj.type
|
|
47
|
+
: path.instance,
|
|
48
|
+
};
|
|
49
|
+
if (results[modelName][key].type === 'Mixed') {
|
|
50
|
+
results[modelName][key].type = 'JSON';
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
return results;
|
|
55
|
+
}
|
|
56
|
+
jsonToYuml(json) {
|
|
57
|
+
let yumlText = '// {type:class}';
|
|
58
|
+
for (const [modelName, properties] of Object.entries(json)) {
|
|
59
|
+
yumlText += `\n[${modelName} | `;
|
|
60
|
+
const refs = [];
|
|
61
|
+
let subYumlText = '';
|
|
62
|
+
for (const [key, value] of Object.entries(properties)) {
|
|
63
|
+
let type = value.type;
|
|
64
|
+
if (value.isArray) {
|
|
65
|
+
type = `Array<${type}>`;
|
|
66
|
+
}
|
|
67
|
+
if (value.ref) {
|
|
68
|
+
refs.push(`[${modelName}]-${key}>[${value.ref}]`);
|
|
69
|
+
}
|
|
70
|
+
if (key.startsWith('__')) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
if (key === '_id') {
|
|
74
|
+
subYumlText = `id: ObjectId; ${subYumlText}`;
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
subYumlText += `${key}: ${type}; `;
|
|
78
|
+
}
|
|
79
|
+
yumlText += `${subYumlText}]\n`;
|
|
80
|
+
for (const ref of refs) {
|
|
81
|
+
yumlText += `${ref}\n`;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return yumlText;
|
|
85
|
+
}
|
|
86
|
+
yUmlToSvg(yUmlText) {
|
|
87
|
+
const yuml = new YumlDiagram();
|
|
88
|
+
const svgLightBg = yuml.processYumlDocument(yUmlText, false);
|
|
89
|
+
const svgDarkBg = yuml.processYumlDocument(yUmlText, true);
|
|
90
|
+
fs.writeFile('model-doc-light.svg', svgLightBg, (err) => {
|
|
91
|
+
if (err) {
|
|
92
|
+
console.error(err);
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
fs.writeFile('model-doc-dark.svg', svgDarkBg, (err) => {
|
|
96
|
+
if (err) {
|
|
97
|
+
console.error(err);
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
exports.ModelDocService = ModelDocService = __decorate([
|
|
103
|
+
(0, common_1.Injectable)(),
|
|
104
|
+
__param(0, (0, mongoose_1.InjectConnection)()),
|
|
105
|
+
__metadata("design:paramtypes", [mongoose_2.Connection])
|
|
106
|
+
], ModelDocService);
|
|
107
|
+
//# sourceMappingURL=model-doc.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-doc.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/model-doc.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/module.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/module.service.ts"],"names":[],"mappings":"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"}
|