@tstdl/base 0.82.0 → 0.82.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/utils.js +3 -1
- package/api/utils.js.map +1 -1
- package/authentication/authentication-credentials.service.d.ts +2 -2
- package/authentication/authentication-session.repository.d.ts +6 -0
- package/authentication/{authentication-session.service.js → authentication-session.repository.js} +7 -6
- package/authentication/authentication-session.repository.js.map +1 -0
- package/authentication/authentication.service.d.ts +3 -3
- package/authentication/authentication.service.js +7 -7
- package/authentication/authentication.service.js.map +1 -1
- package/authentication/models/authentication-credentials.model.d.ts +6 -1
- package/authentication/models/authentication-credentials.model.js +9 -2
- package/authentication/models/authentication-credentials.model.js.map +1 -1
- package/authentication/models/authentication-session.model.d.ts +6 -1
- package/authentication/models/authentication-session.model.js +9 -2
- package/authentication/models/authentication-session.model.js.map +1 -1
- package/container/container.js +3 -3
- package/container/container.js.map +1 -1
- package/container/decorators.js +0 -1
- package/container/decorators.js.map +1 -1
- package/container/resolve-chain.js +1 -1
- package/container/resolve-chain.js.map +1 -1
- package/mail/mail.service.d.ts +3 -1
- package/mail/mail.service.js +11 -6
- package/mail/mail.service.js.map +1 -1
- package/mail/models/mail-data.model.d.ts +1 -0
- package/mail/module.d.ts +3 -1
- package/mail/module.js +6 -2
- package/mail/module.js.map +1 -1
- package/mail/tokens.d.ts +1 -0
- package/mail/tokens.js +2 -1
- package/mail/tokens.js.map +1 -1
- package/notification/api.d.ts +2 -5
- package/notification/api.js +2 -5
- package/notification/api.js.map +1 -1
- package/notification/models/index.d.ts +2 -0
- package/notification/models/index.js +19 -0
- package/notification/models/index.js.map +1 -0
- package/notification/models/notification-channel-job.model.d.ts +3 -0
- package/notification/models/notification-channel-job.model.js +3 -0
- package/notification/models/notification-channel-job.model.js.map +1 -0
- package/notification/models/notification.model.d.ts +27 -0
- package/notification/{model.js → models/notification.model.js} +28 -16
- package/notification/models/notification.model.js.map +1 -0
- package/notification/notification-channel.service.d.ts +5 -0
- package/notification/notification-channel.service.js +7 -0
- package/notification/notification-channel.service.js.map +1 -0
- package/notification/notification.service.d.ts +8 -0
- package/notification/notification.service.js +40 -0
- package/notification/notification.service.js.map +1 -0
- package/orm/decorators.d.ts +26 -0
- package/orm/decorators.js +170 -0
- package/orm/decorators.js.map +1 -1
- package/orm/entity-definition.model.d.ts +51 -0
- package/orm/entity-definition.model.js +27 -0
- package/orm/entity-definition.model.js.map +1 -0
- package/orm/index.d.ts +1 -0
- package/orm/index.js +18 -0
- package/orm/index.js.map +1 -0
- package/orm/models/entity.d.ts +22 -0
- package/orm/models/entity.js +87 -0
- package/orm/models/entity.js.map +1 -0
- package/orm/models/index.d.ts +1 -0
- package/orm/models/index.js +18 -0
- package/orm/models/index.js.map +1 -0
- package/orm/repository/mongo/classes.d.ts +25 -0
- package/orm/repository/mongo/classes.js +33 -0
- package/orm/repository/mongo/classes.js.map +1 -0
- package/orm/repository/mongo/module.d.ts +8 -0
- package/orm/repository/mongo/module.js +88 -0
- package/orm/repository/mongo/module.js.map +1 -0
- package/orm/repository/mongo/mongo-repository.d.ts +11 -0
- package/orm/repository/mongo/mongo-repository.js +55 -0
- package/orm/repository/mongo/mongo-repository.js.map +1 -0
- package/orm/repository/mongo/mongo-transaction.d.ts +10 -0
- package/orm/repository/mongo/mongo-transaction.js +28 -0
- package/orm/repository/mongo/mongo-transaction.js.map +1 -0
- package/orm/repository/repository.d.ts +75 -0
- package/orm/repository/repository.js +182 -0
- package/orm/repository/repository.js.map +1 -0
- package/orm/repository/transaction.d.ts +26 -0
- package/orm/repository/transaction.js +65 -0
- package/orm/repository/transaction.js.map +1 -0
- package/orm/{types.d.ts → types/definition.d.ts} +1 -1
- package/orm/{types.js → types/definition.js} +8 -8
- package/orm/types/definition.js.map +1 -0
- package/orm/types/index.d.ts +3 -0
- package/orm/types/index.js +20 -0
- package/orm/types/index.js.map +1 -0
- package/orm/types/options.d.ts +36 -0
- package/orm/types/options.js +5 -0
- package/orm/types/options.js.map +1 -0
- package/orm/types/query.d.ts +110 -0
- package/orm/types/query.js +10 -0
- package/orm/types/query.js.map +1 -0
- package/package.json +3 -3
- package/reflection/decorator-data.js +2 -1
- package/reflection/decorator-data.js.map +1 -1
- package/reflection/registry.d.ts +9 -8
- package/reflection/registry.js +25 -10
- package/reflection/registry.js.map +1 -1
- package/reflection/types.d.ts +2 -2
- package/reflection/utils.d.ts +3 -3
- package/reflection/utils.js +6 -6
- package/reflection/utils.js.map +1 -1
- package/schema/array-constraints/maximum-length.d.ts +2 -2
- package/schema/array-constraints/maximum-length.js +2 -2
- package/schema/array-constraints/maximum-length.js.map +1 -1
- package/schema/array-constraints/minimum-length.d.ts +2 -2
- package/schema/array-constraints/minimum-length.js +2 -2
- package/schema/array-constraints/minimum-length.js.map +1 -1
- package/schema/constraints/enumeration.d.ts +4 -4
- package/schema/constraints/enumeration.js +5 -5
- package/schema/constraints/enumeration.js.map +1 -1
- package/schema/constraints/generic.d.ts +2 -2
- package/schema/constraints/generic.js +2 -2
- package/schema/constraints/generic.js.map +1 -1
- package/schema/constraints/integer.d.ts +2 -2
- package/schema/constraints/integer.js +3 -2
- package/schema/constraints/integer.js.map +1 -1
- package/schema/constraints/literal.d.ts +2 -2
- package/schema/constraints/literal.js +2 -2
- package/schema/constraints/literal.js.map +1 -1
- package/schema/constraints/maximum-date.d.ts +2 -2
- package/schema/constraints/maximum-date.js +3 -2
- package/schema/constraints/maximum-date.js.map +1 -1
- package/schema/constraints/maximum-length.d.ts +2 -2
- package/schema/constraints/maximum-length.js +2 -2
- package/schema/constraints/maximum-length.js.map +1 -1
- package/schema/constraints/maximum.d.ts +2 -2
- package/schema/constraints/maximum.js +3 -2
- package/schema/constraints/maximum.js.map +1 -1
- package/schema/constraints/minimum-date.d.ts +2 -2
- package/schema/constraints/minimum-date.js +3 -2
- package/schema/constraints/minimum-date.js.map +1 -1
- package/schema/constraints/minimum-length.d.ts +2 -2
- package/schema/constraints/minimum-length.js +2 -2
- package/schema/constraints/minimum-length.js.map +1 -1
- package/schema/constraints/minimum.d.ts +2 -2
- package/schema/constraints/minimum.js +3 -2
- package/schema/constraints/minimum.js.map +1 -1
- package/schema/constraints/pattern.d.ts +2 -2
- package/schema/constraints/pattern.js +3 -2
- package/schema/constraints/pattern.js.map +1 -1
- package/schema/decorators/utils.d.ts +4 -1
- package/schema/decorators/utils.js +1 -1
- package/schema/decorators/utils.js.map +1 -1
- package/schema/schemas/array.d.ts +1 -1
- package/schema/schemas/array.js +2 -2
- package/schema/schemas/array.js.map +1 -1
- package/schema/schemas/date.d.ts +1 -1
- package/schema/schemas/date.js +2 -2
- package/schema/schemas/date.js.map +1 -1
- package/schema/schemas/enumeration.d.ts +1 -1
- package/schema/schemas/enumeration.js +2 -2
- package/schema/schemas/enumeration.js.map +1 -1
- package/schema/schemas/literal.d.ts +1 -1
- package/schema/schemas/literal.js +2 -2
- package/schema/schemas/literal.js.map +1 -1
- package/schema/schemas/number.d.ts +1 -1
- package/schema/schemas/number.js +2 -2
- package/schema/schemas/number.js.map +1 -1
- package/schema/schemas/omit.d.ts +2 -2
- package/schema/schemas/omit.js.map +1 -1
- package/schema/schemas/string.d.ts +1 -1
- package/schema/schemas/string.js +3 -3
- package/schema/schemas/string.js.map +1 -1
- package/schema/schemas/uint8-array.d.ts +1 -1
- package/schema/schemas/uint8-array.js +3 -3
- package/schema/schemas/uint8-array.js.map +1 -1
- package/schema/types/index.d.ts +5 -0
- package/schema/types/index.js +22 -0
- package/schema/types/index.js.map +1 -0
- package/schema/types/schema-array-constraint.d.ts +5 -0
- package/schema/types/schema-array-constraint.js +7 -0
- package/schema/types/schema-array-constraint.js.map +1 -0
- package/schema/types/schema-value-coercer.d.ts +8 -0
- package/schema/types/schema-value-coercer.js +7 -0
- package/schema/types/schema-value-coercer.js.map +1 -0
- package/schema/types/schema-value-constraint.d.ts +8 -0
- package/schema/types/schema-value-constraint.js +7 -0
- package/schema/types/schema-value-constraint.js.map +1 -0
- package/schema/types/schema-value-transformer.d.ts +7 -0
- package/schema/types/schema-value-transformer.js +7 -0
- package/schema/types/schema-value-transformer.js.map +1 -0
- package/schema/{types.d.ts → types/types.d.ts} +16 -26
- package/schema/types/types.js +174 -0
- package/schema/types/types.js.map +1 -0
- package/schema/utils/schema.js +1 -1
- package/schema/utils/schema.js.map +1 -1
- package/schema/utils/value-type.d.ts +1 -1
- package/schema/utils/value-type.js +1 -1
- package/schema/utils/value-type.js.map +1 -1
- package/utils/array/array.d.ts +14 -1
- package/utils/array/array.js +16 -2
- package/utils/array/array.js.map +1 -1
- package/utils/object/object.js +1 -2
- package/utils/object/object.js.map +1 -1
- package/authentication/authentication-session.service.d.ts +0 -6
- package/authentication/authentication-session.service.js.map +0 -1
- package/notification/model.d.ts +0 -18
- package/notification/model.js.map +0 -1
- package/orm/mongo/mongo-repository.d.ts +0 -2
- package/orm/mongo/mongo-repository.js +0 -7
- package/orm/mongo/mongo-repository.js.map +0 -1
- package/orm/types.js.map +0 -1
- package/schema/types.js +0 -102
- package/schema/types.js.map +0 -1
package/api/utils.js
CHANGED
|
@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getFullApiEndpointResource = void 0;
|
|
4
4
|
const array_1 = require("../utils/array/array");
|
|
5
5
|
const comparison_1 = require("../utils/comparison");
|
|
6
|
+
const iterable_helpers_1 = require("../utils/iterable-helpers");
|
|
6
7
|
const type_guards_1 = require("../utils/type-guards");
|
|
7
8
|
function getFullApiEndpointResource({ api, endpoint, defaultPrefix, explicitVersion }) {
|
|
8
|
-
const
|
|
9
|
+
const versionArray = (0, array_1.toArray)((0, type_guards_1.isDefined)(explicitVersion) ? explicitVersion : endpoint.version);
|
|
10
|
+
const version = (0, iterable_helpers_1.sort)(versionArray, comparison_1.compareByValueDescending)[0];
|
|
9
11
|
const versionPrefix = (0, type_guards_1.isNull)(version) ? undefined : `v${version ?? 1}`;
|
|
10
12
|
const rootResource = ((0, type_guards_1.isNull)(endpoint.rootResource) ? '' : endpoint.rootResource) ?? api.resource;
|
|
11
13
|
const prefix = ((0, type_guards_1.isNull)(endpoint.prefix) ? '' : endpoint.prefix) ?? ((0, type_guards_1.isNull)(api.prefix) ? '' : api.prefix) ?? ((0, type_guards_1.isNull)(defaultPrefix) ? undefined : (defaultPrefix ?? 'api'));
|
package/api/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/api/utils.ts"],"names":[],"mappings":";;;AAAA,gDAA8C;AAC9C,oDAA8D;AAC9D,sDAAwD;AAUxD,SAAgB,0BAA0B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAyB;IACjH,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/api/utils.ts"],"names":[],"mappings":";;;AAAA,gDAA8C;AAC9C,oDAA8D;AAC9D,gEAAgD;AAChD,sDAAwD;AAUxD,SAAgB,0BAA0B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAyB;IACjH,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,IAAA,uBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,IAAA,uBAAI,EAAC,YAAY,EAAE,qCAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,IAAA,oBAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;IACvE,MAAM,YAAY,GAAG,CAAC,IAAA,oBAAM,EAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC;IAClG,MAAM,MAAM,GAAG,CAAC,IAAA,oBAAM,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,oBAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,oBAAM,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,KAAK,CAAC,CAAC,CAAC;IAE5K,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,uBAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjF,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAXD,gEAWC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { AuthenticationCredentials } from './models';
|
|
1
|
+
import type { AuthenticationCredentials, NewAuthenticationCredentials } from './models';
|
|
2
2
|
export declare abstract class AuthenticationCredentialsService {
|
|
3
3
|
abstract has(subject: string): Promise<boolean>;
|
|
4
4
|
abstract tryGet(subject: string): Promise<AuthenticationCredentials | undefined>;
|
|
5
|
-
abstract save(credentials: AuthenticationCredentials): Promise<void>;
|
|
5
|
+
abstract save(credentials: NewAuthenticationCredentials | AuthenticationCredentials): Promise<void>;
|
|
6
6
|
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Repository } from "../orm/repository/repository";
|
|
2
|
+
import type { AuthenticationSession } from './models';
|
|
3
|
+
export declare abstract class AuthenticationSessionRepository extends Repository<AuthenticationSession> {
|
|
4
|
+
abstract hasBySubject(subject: string): Promise<boolean>;
|
|
5
|
+
abstract tryLoadBySubject(subject: string, tokenId: string): Promise<AuthenticationSession | undefined>;
|
|
6
|
+
}
|
package/authentication/{authentication-session.service.js → authentication-session.repository.js}
RENAMED
|
@@ -6,12 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.AuthenticationSessionRepository = void 0;
|
|
10
|
+
const repository_1 = require("../orm/repository/repository");
|
|
10
11
|
const reflection_1 = require("../reflection");
|
|
11
|
-
let
|
|
12
|
+
let AuthenticationSessionRepository = class AuthenticationSessionRepository extends repository_1.Repository {
|
|
12
13
|
};
|
|
13
|
-
|
|
14
|
+
AuthenticationSessionRepository = __decorate([
|
|
14
15
|
(0, reflection_1.Class)()
|
|
15
|
-
],
|
|
16
|
-
exports.
|
|
17
|
-
//# sourceMappingURL=authentication-session.
|
|
16
|
+
], AuthenticationSessionRepository);
|
|
17
|
+
exports.AuthenticationSessionRepository = AuthenticationSessionRepository;
|
|
18
|
+
//# sourceMappingURL=authentication-session.repository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authentication-session.repository.js","sourceRoot":"","sources":["../../source/authentication/authentication-session.repository.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAAyD;AACzD,8CAAqC;AAI9B,IAAe,+BAA+B,GAA9C,MAAe,+BAAgC,SAAQ,uBAAiC;CAG9F,CAAA;AAHqB,+BAA+B;IADpD,IAAA,kBAAK,GAAE;GACc,+BAA+B,CAGpD;AAHqB,0EAA+B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { JwtToken, JwtTokenHeader } from "../utils/jwt";
|
|
2
2
|
import { AuthenticationCredentialsService } from './authentication-credentials.service';
|
|
3
|
-
import {
|
|
3
|
+
import { AuthenticationSessionRepository } from './authentication-session.repository';
|
|
4
4
|
import { AuthenticationTokenPayloadProvider } from './authentication-token-payload.provider';
|
|
5
5
|
export type Token<TokenPayload> = JwtToken<TokenPayload & {
|
|
6
6
|
jti: string;
|
|
@@ -26,13 +26,13 @@ export type AuthenticationResult = {
|
|
|
26
26
|
};
|
|
27
27
|
export declare class AuthenticationService<TokenPayload, AdditionalAuthenticationData> {
|
|
28
28
|
private readonly credentialsService;
|
|
29
|
-
private readonly
|
|
29
|
+
private readonly authenticationSessionRepository;
|
|
30
30
|
private readonly tokenPayloadProviderService;
|
|
31
31
|
private readonly secret;
|
|
32
32
|
private readonly tokenVersion;
|
|
33
33
|
private readonly tokenTimeToLive;
|
|
34
34
|
private readonly sessionTimeToLive;
|
|
35
|
-
constructor(credentialsService: AuthenticationCredentialsService,
|
|
35
|
+
constructor(credentialsService: AuthenticationCredentialsService, authenticationSessionRepository: AuthenticationSessionRepository, tokenPayloadProviderService: AuthenticationTokenPayloadProvider<TokenPayload, AdditionalAuthenticationData>, options: AuthenticationServiceOptions);
|
|
36
36
|
updateCredentials(subject: string, secret: string): Promise<void>;
|
|
37
37
|
authenticate(subject: string, secret: string, additionalAuthenticationData: AdditionalAuthenticationData): Promise<AuthenticationResult>;
|
|
38
38
|
validate(token: string): Promise<Token<TokenPayload>>;
|
|
@@ -25,20 +25,20 @@ const random_1 = require("../utils/random");
|
|
|
25
25
|
const type_guards_1 = require("../utils/type-guards");
|
|
26
26
|
const units_1 = require("../utils/units");
|
|
27
27
|
const authentication_credentials_service_1 = require("./authentication-credentials.service");
|
|
28
|
-
const
|
|
28
|
+
const authentication_session_repository_1 = require("./authentication-session.repository");
|
|
29
29
|
const authentication_token_payload_provider_1 = require("./authentication-token-payload.provider");
|
|
30
30
|
const tokens_1 = require("./tokens");
|
|
31
31
|
let AuthenticationService = class AuthenticationService {
|
|
32
32
|
credentialsService;
|
|
33
|
-
|
|
33
|
+
authenticationSessionRepository;
|
|
34
34
|
tokenPayloadProviderService;
|
|
35
35
|
secret;
|
|
36
36
|
tokenVersion;
|
|
37
37
|
tokenTimeToLive;
|
|
38
38
|
sessionTimeToLive;
|
|
39
|
-
constructor(credentialsService,
|
|
39
|
+
constructor(credentialsService, authenticationSessionRepository, tokenPayloadProviderService, options) {
|
|
40
40
|
this.credentialsService = credentialsService;
|
|
41
|
-
this.
|
|
41
|
+
this.authenticationSessionRepository = authenticationSessionRepository;
|
|
42
42
|
this.tokenPayloadProviderService = tokenPayloadProviderService;
|
|
43
43
|
this.secret = options.secret;
|
|
44
44
|
this.tokenVersion = options.version ?? 1;
|
|
@@ -69,7 +69,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
69
69
|
const tokenPayload = await this.tokenPayloadProviderService.getTokenPayload(subject, additionalAuthenticationData);
|
|
70
70
|
const { token, payload } = await this.createToken(tokenPayload, now);
|
|
71
71
|
const refreshToken = await this.createRefreshToken();
|
|
72
|
-
await this.
|
|
72
|
+
await this.authenticationSessionRepository.saveAndLoad({
|
|
73
73
|
subject,
|
|
74
74
|
begin: now,
|
|
75
75
|
end: now + this.sessionTimeToLive,
|
|
@@ -82,7 +82,7 @@ let AuthenticationService = class AuthenticationService {
|
|
|
82
82
|
}
|
|
83
83
|
/*
|
|
84
84
|
async refresh(subject: string, tokenId: string, refreshToken: string): Promise<string> {
|
|
85
|
-
const session = await this.
|
|
85
|
+
const session = await this.AuthenticationSessionRepository.tryGet(subject, tokenId);
|
|
86
86
|
}
|
|
87
87
|
*/
|
|
88
88
|
async validate(token) {
|
|
@@ -126,7 +126,7 @@ AuthenticationService = __decorate([
|
|
|
126
126
|
(0, container_1.singleton)(),
|
|
127
127
|
__param(3, (0, container_1.inject)(tokens_1.AUTHENTICATION_SERVICE_OPTIONS)),
|
|
128
128
|
__metadata("design:paramtypes", [authentication_credentials_service_1.AuthenticationCredentialsService,
|
|
129
|
-
|
|
129
|
+
authentication_session_repository_1.AuthenticationSessionRepository,
|
|
130
130
|
authentication_token_payload_provider_1.AuthenticationTokenPayloadProvider, Object])
|
|
131
131
|
], AuthenticationService);
|
|
132
132
|
exports.AuthenticationService = AuthenticationService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../source/authentication/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAgD;AAChD,oCAA4C;AAC5C,sEAAgE;AAChE,gDAA4C;AAC5C,wDAAmE;AACnE,kDAAkF;AAClF,4CAA8C;AAE9C,sCAAmF;AACnF,4CAAiE;AACjE,sDAAkD;AAClD,0CAA0E;AAC1E,6FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../source/authentication/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
import { Entity } from "../../orm/models";
|
|
2
|
+
export declare class AuthenticationCredentials extends Entity {
|
|
2
3
|
subject: string;
|
|
3
4
|
hashVersion: number;
|
|
4
5
|
salt: Uint8Array;
|
|
5
6
|
hash: Uint8Array;
|
|
6
7
|
}
|
|
8
|
+
declare const NewAuthenticationCredentials_base: import("../../types").Type<import("../../types").PartialProperty<AuthenticationCredentials, "id">, any>;
|
|
9
|
+
export declare class NewAuthenticationCredentials extends NewAuthenticationCredentials_base {
|
|
10
|
+
}
|
|
11
|
+
export {};
|
|
@@ -9,9 +9,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.AuthenticationCredentials = void 0;
|
|
12
|
+
exports.NewAuthenticationCredentials = exports.AuthenticationCredentials = void 0;
|
|
13
|
+
const models_1 = require("../../orm/models");
|
|
13
14
|
const schema_1 = require("../../schema");
|
|
14
|
-
class AuthenticationCredentials {
|
|
15
|
+
class AuthenticationCredentials extends models_1.Entity {
|
|
15
16
|
subject;
|
|
16
17
|
hashVersion;
|
|
17
18
|
salt;
|
|
@@ -34,4 +35,10 @@ __decorate([
|
|
|
34
35
|
__metadata("design:type", Uint8Array)
|
|
35
36
|
], AuthenticationCredentials.prototype, "hash", void 0);
|
|
36
37
|
exports.AuthenticationCredentials = AuthenticationCredentials;
|
|
38
|
+
let NewAuthenticationCredentials = class NewAuthenticationCredentials extends (0, models_1.newEntity)(AuthenticationCredentials) {
|
|
39
|
+
};
|
|
40
|
+
NewAuthenticationCredentials = __decorate([
|
|
41
|
+
(0, schema_1.Class)()
|
|
42
|
+
], NewAuthenticationCredentials);
|
|
43
|
+
exports.NewAuthenticationCredentials = NewAuthenticationCredentials;
|
|
37
44
|
//# sourceMappingURL=authentication-credentials.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication-credentials.model.js","sourceRoot":"","sources":["../../../source/authentication/models/authentication-credentials.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"authentication-credentials.model.js","sourceRoot":"","sources":["../../../source/authentication/models/authentication-credentials.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiD;AACjD,yCAA2C;AAE3C,MAAa,yBAA0B,SAAQ,eAAM;IAEnD,OAAO,CAAS;IAGhB,WAAW,CAAS;IAGpB,IAAI,CAAa;IAGjB,IAAI,CAAa;CAClB;AAXC;IAAC,IAAA,iBAAQ,GAAE;;0DACK;AAEhB;IAAC,IAAA,iBAAQ,GAAE;;8DACS;AAEpB;IAAC,IAAA,iBAAQ,GAAE;8BACL,UAAU;uDAAC;AAEjB;IAAC,IAAA,iBAAQ,GAAE;8BACL,UAAU;uDAAC;AAXnB,8DAYC;AAGM,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,IAAA,kBAAS,EAAC,yBAAyB,CAAC;CAAI,CAAA;AAA7E,4BAA4B;IADxC,IAAA,cAAK,GAAE;GACK,4BAA4B,CAAiD;AAA7E,oEAA4B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { Entity } from "../../orm";
|
|
2
|
+
export declare class AuthenticationSession extends Entity {
|
|
2
3
|
subject: string;
|
|
3
4
|
begin: number;
|
|
4
5
|
end: number;
|
|
@@ -7,3 +8,7 @@ export declare class AuthenticationSession {
|
|
|
7
8
|
refreshTokenSalt: Uint8Array;
|
|
8
9
|
refreshTokenHash: Uint8Array;
|
|
9
10
|
}
|
|
11
|
+
declare const NewAuthenticationSession_base: import("../../types").Type<import("../../types").PartialProperty<AuthenticationSession, "id">, any>;
|
|
12
|
+
export declare class NewAuthenticationSession extends NewAuthenticationSession_base {
|
|
13
|
+
}
|
|
14
|
+
export {};
|
|
@@ -9,9 +9,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.AuthenticationSession = void 0;
|
|
12
|
+
exports.NewAuthenticationSession = exports.AuthenticationSession = void 0;
|
|
13
|
+
const orm_1 = require("../../orm");
|
|
13
14
|
const schema_1 = require("../../schema");
|
|
14
|
-
class AuthenticationSession {
|
|
15
|
+
class AuthenticationSession extends orm_1.Entity {
|
|
15
16
|
subject;
|
|
16
17
|
begin;
|
|
17
18
|
end;
|
|
@@ -49,4 +50,10 @@ __decorate([
|
|
|
49
50
|
__metadata("design:type", Uint8Array)
|
|
50
51
|
], AuthenticationSession.prototype, "refreshTokenHash", void 0);
|
|
51
52
|
exports.AuthenticationSession = AuthenticationSession;
|
|
53
|
+
let NewAuthenticationSession = class NewAuthenticationSession extends (0, orm_1.newEntity)(AuthenticationSession) {
|
|
54
|
+
};
|
|
55
|
+
NewAuthenticationSession = __decorate([
|
|
56
|
+
(0, schema_1.Class)()
|
|
57
|
+
], NewAuthenticationSession);
|
|
58
|
+
exports.NewAuthenticationSession = NewAuthenticationSession;
|
|
52
59
|
//# sourceMappingURL=authentication-session.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication-session.model.js","sourceRoot":"","sources":["../../../source/authentication/models/authentication-session.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"authentication-session.model.js","sourceRoot":"","sources":["../../../source/authentication/models/authentication-session.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA0C;AAC1C,yCAA2C;AAE3C,MAAa,qBAAsB,SAAQ,YAAM;IAE/C,OAAO,CAAS;IAGhB,KAAK,CAAS;IAGd,GAAG,CAAS;IAGZ,OAAO,CAAS;IAGhB,WAAW,CAAS;IAGpB,gBAAgB,CAAa;IAG7B,gBAAgB,CAAa;CAC9B;AApBC;IAAC,IAAA,iBAAQ,GAAE;;sDACK;AAEhB;IAAC,IAAA,iBAAQ,GAAE;;oDACG;AAEd;IAAC,IAAA,iBAAQ,GAAE;;kDACC;AAEZ;IAAC,IAAA,iBAAQ,GAAE;;sDACK;AAEhB;IAAC,IAAA,iBAAQ,GAAE;;0DACS;AAEpB;IAAC,IAAA,iBAAQ,GAAE;8BACO,UAAU;+DAAC;AAE7B;IAAC,IAAA,iBAAQ,GAAE;8BACO,UAAU;+DAAC;AApB/B,sDAqBC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,IAAA,eAAS,EAAC,qBAAqB,CAAC;CAAI,CAAA;AAArE,wBAAwB;IADpC,IAAA,cAAK,GAAE;GACK,wBAAwB,CAA6C;AAArE,4DAAwB"}
|
package/container/container.js
CHANGED
|
@@ -39,7 +39,7 @@ class Container {
|
|
|
39
39
|
*/
|
|
40
40
|
register(token, provider, options = {}) {
|
|
41
41
|
if ((0, provider_1.isClassProvider)(provider) && !(0, utils_1.isStubClass)(provider.useClass)) {
|
|
42
|
-
const injectable = reflection_1.reflectionRegistry.
|
|
42
|
+
const injectable = reflection_1.reflectionRegistry.getMetadata(provider.useClass)?.data.has(exports.injectMetadataSymbol) ?? false;
|
|
43
43
|
if (!injectable) {
|
|
44
44
|
throw new Error(`${provider.useClass.name} is not injectable.`);
|
|
45
45
|
}
|
|
@@ -167,7 +167,7 @@ class Container {
|
|
|
167
167
|
let instance;
|
|
168
168
|
if ((0, provider_1.isClassProvider)(registration.provider)) {
|
|
169
169
|
const typeMetadata = reflection_1.reflectionRegistry.getMetadata(registration.provider.useClass);
|
|
170
|
-
if (!typeMetadata.data.has(exports.injectMetadataSymbol)) {
|
|
170
|
+
if ((0, type_guards_1.isUndefined)(typeMetadata) || !typeMetadata.data.has(exports.injectMetadataSymbol)) {
|
|
171
171
|
throw new resolve_error_1.ResolveError(`${registration.provider.useClass.name} is not injectable.`, chain);
|
|
172
172
|
}
|
|
173
173
|
if ((0, utils_1.isStubClass)(typeMetadata.constructor)) {
|
|
@@ -270,7 +270,7 @@ class Container {
|
|
|
270
270
|
let instance;
|
|
271
271
|
if ((0, provider_1.isClassProvider)(registration.provider)) {
|
|
272
272
|
const typeMetadata = reflection_1.reflectionRegistry.getMetadata(registration.provider.useClass);
|
|
273
|
-
if (!typeMetadata.data.has(exports.injectMetadataSymbol)) {
|
|
273
|
+
if ((0, type_guards_1.isUndefined)(typeMetadata) || !typeMetadata.data.has(exports.injectMetadataSymbol)) {
|
|
274
274
|
throw new resolve_error_1.ResolveError(`${registration.provider.useClass.name} is not injectable.`, chain);
|
|
275
275
|
}
|
|
276
276
|
if ((0, utils_1.isStubClass)(typeMetadata.constructor)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../source/container/container.ts"],"names":[],"mappings":";;;AAAA,wEAAmE;AACnE,oEAA8D;AAE9D,8CAAkD;AAElD,6DAA8D;AAC9D,uEAAuE;AACvE,6DAAwD;AACxD,mDAAsD;AACtD,sDAAoF;AAEpF,+BAA+B;AAE/B,6CAA4C;AAE5C,yCAAkG;AAClG,mDAA+C;AAC/C,mDAA+C;AAE/C,mCAAuC;AAGvC,mCAAsC;AAEzB,QAAA,oBAAoB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAsD9D,MAAa,SAAS;IACH,eAAe,CAAoC;IACnD,mBAAmB,CAAwB;IAE5D,gCAAgC;IACvB,aAAa,CAA2B;IAEjD,wBAAwB;IACxB,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC;IAED;QACE,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,mBAAmB,GAAG,IAAI,cAAO,EAAE,CAAC;QAEzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC;IAC/D,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAa,KAA2B,EAAE,QAAwB,EAAE,UAAqC,EAAE;QACjH,IAAI,IAAA,0BAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,mBAAW,EAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAChE,MAAM,UAAU,GAAG,+BAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,+BAAkB,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,4BAAoB,CAAC,CAAC;YAErJ,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,CAAC;aACjE;SACF;QAED,MAAM,YAAY,GAAiB;YACjC,KAAK;YACL,QAAQ;YACR,OAAO;YACP,SAAS,EAAE,IAAI,GAAG,EAAE;SACrB,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC9C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,iBAAiB,CAAa,KAA2B,EAAE,QAAwB,EAAE,OAA2D;QAC9I,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,KAAqB;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,eAAe,CAAO,KAA2B;QAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,IAAA,yBAAW,EAAC,YAAY,CAAC,EAAE;YAC7B,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,mBAAmB,SAAS,cAAc,CAAC,CAAC;SAC7D;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAAO,KAA2B;QAClD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAA6D,KAA2B,EAAE,QAA4D,EAAE,SAAmC;QAChM,MAAM,OAAO,GAA2B;YACtC,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,CAAC;YACX,eAAe,EAAE,IAAI,gCAAc,EAAE;YACrC,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,IAAI,GAAG,EAAE;YACtB,iBAAiB,EAAE,IAAI,GAAG,CAAC,SAAS,CAAC;YACrC,SAAS,EAAE,IAAI,2BAAW,EAAE;YAC5B,SAAS,EAAE,IAAI,2BAAW,EAAE;SAC7B,CAAC;QAEF,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,4BAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7F,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CAA6D,KAA2B,EAAE,QAA4D,EAAE,SAAmC;QAC3M,MAAM,OAAO,GAA2B;YACtC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,CAAC;YACX,eAAe,EAAE,IAAI,gCAAc,EAAE;YACrC,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,IAAI,GAAG,EAAE;YACtB,iBAAiB,EAAE,IAAI,GAAG,CAAC,SAAS,CAAC;YACrC,SAAS,EAAE,IAAI,2BAAW,EAAE;YAC5B,SAAS,EAAE,IAAI,2BAAW,EAAE;SAC7B,CAAC;QAEF,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,4BAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;IAClG,CAAC;IAED,8EAA8E;IACtE,QAAQ,CAAO,KAA2B,EAAE,QAA6B,EAAE,SAA+C,EAAE,OAA+B,EAAE,KAAmB,EAAE,OAAgB;QACxM,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE;YACxD,MAAM,IAAI,4BAAY,CAAC,wIAAwI,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SACtL;QAED,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YACtB,MAAM,IAAI,4BAAY,CAAC,4GAA4G,EAAE,KAAK,CAAC,CAAC;SAC7I;QAED,IAAI,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAM,CAAC;SAClD;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEpD,IAAI,IAAA,yBAAW,EAAC,YAAY,CAAC,EAAE;YAC7B,IAAI,QAAQ,IAAI,IAAI,EAAE;gBACpB,OAAO,SAAyB,CAAC;aAClC;YAED,MAAM,IAAI,4BAAY,CAAC,mBAAmB,IAAA,oBAAY,EAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;SACrF;QAED,MAAM,eAAe,GAAG,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,eAAe,IAAI,YAAY,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAEpK,IAAI,IAAA,uBAAS,EAAC,eAAe,CAAC,EAAE;YAC9B,MAAM,IAAI,4BAAY,CAAC,qDAAqD,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAC;SAC7J;QAED,MAAM,gBAAgB,GAAG,CAAC,IAAA,uBAAS,EAAC,YAAY,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC;YAC1L,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,wBAAwB,CAAC,eAAe,CAAC;YAChE,CAAC,CAAC,eAAe,CAAC;QAEpB,IAAI,IAAA,uBAAS,EAAC,gBAAgB,CAAC,EAAE;YAC/B,MAAM,IAAI,4BAAY,CAAC,8DAA8D,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAC;SACtK;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACxG,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAM,CAAC;SAC9D;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;YACnG,OAAO,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAE,CAAC;SACtD;QAED,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACpD,MAAM,IAAI,4BAAY,CAAC,yHAAyH,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SACvK;QAED,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvD,IAAI,QAAY,CAAC;QAEjB,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,YAAY,GAAG,+BAAkB,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAEpF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,4BAAoB,CAAC,EAAE;gBAChD,MAAM,IAAI,4BAAY,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,qBAAqB,EAAE,KAAK,CAAC,CAAC;aAC5F;YAED,IAAI,IAAA,mBAAW,EAAC,YAAY,CAAC,WAAW,CAAC,EAAE;gBACzC,MAAM,IAAI,4BAAY,CAAC,mBAAmB,IAAA,oBAAY,EAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;aACrF;YAED,MAAM,UAAU,GAAG,CAAC,YAAY,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAW,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;YAErK,QAAQ,GAAG,IAAK,YAAY,CAAC,WAA2B,CAAC,GAAG,UAAU,CAAM,CAAC;YAE7E,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE;gBAC1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,4BAAoB,CAAC,EAAE;oBAC5C,SAAS;iBACV;gBAEA,QAAmB,CAAC,QAAkB,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;aAClI;SACF;QAED,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC3C;QAED,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,GAAG,GAAG,eAAe,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC5G,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAE9F,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAO,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;SACpG;QAED,IAAI,IAAA,4BAAiB,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC5C,IAAI;gBACF,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBAEzG,IAAI,IAAA,uBAAS,EAAC,MAAM,CAAC,EAAE;oBACrB,MAAM,IAAI,4BAAY,CAAC,oDAAoD,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAC;iBAC5J;gBAED,QAAQ,GAAG,MAAM,CAAC;aACnB;YACD,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,4BAAY,CAAC,mBAAmB,EAAE,KAAK,EAAE,KAAc,CAAC,CAAC;aACpE;SACF;QAED,IAAI,CAAC,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC3C,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,EAAE;gBAClD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC5D;YAED,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,EAAE;gBACjD,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;aACxD;YAED,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;SACtD;QAED,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEpD,IAAI,OAAO,EAAE;YACX,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;gBACjD,EAAiB,EAAE,CAAC;aACtB;YAED,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAE1B,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxD,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;gBAE3C,IAAI,IAAA,wBAAU,EAAE,UAAU,CAAC,QAAqC,EAAE,CAAC,yBAAY,CAAC,CAAC,EAAE;oBACjF,MAAM,WAAW,GAAI,UAAU,CAAC,QAAyB,CAAC,yBAAY,CAAE,EAAE,CAAC;oBAE3E,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,EAAE;wBAC1B,MAAM,IAAI,4BAAY,CAAC,iDAAiD,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAC;qBACzJ;iBACF;gBAED,IAAI,IAAA,uBAAS,EAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBAC1D,MAAM,WAAW,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAErF,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,EAAE;wBAC1B,MAAM,IAAI,4BAAY,CAAC,8CAA8C,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,KAAK,CAAC,CAAC;qBACtJ;iBACF;aACF;SACF;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,8EAA8E;IACtE,KAAK,CAAC,aAAa,CAAO,KAA2B,EAAE,QAA6B,EAAE,SAA+C,EAAE,OAA+B,EAAE,KAAmB,EAAE,OAAgB;QACnN,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE;YACxD,MAAM,IAAI,4BAAY,CAAC,wIAAwI,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SACtL;QAED,IAAI,IAAA,yBAAW,EAAC,KAAK,CAAC,EAAE;YACtB,MAAM,IAAI,4BAAY,CAAC,4GAA4G,EAAE,KAAK,CAAC,CAAC;SAC7I;QAED,IAAI,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAM,CAAC;SAClD;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEpD,IAAI,IAAA,yBAAW,EAAC,YAAY,CAAC,EAAE;YAC7B,IAAI,QAAQ,IAAI,IAAI,EAAE;gBACpB,OAAO,SAAyB,CAAC;aAClC;YAED,MAAM,IAAI,4BAAY,CAAC,mBAAmB,IAAA,oBAAY,EAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;SACrF;QAED,MAAM,eAAe,GAAG,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,eAAe,IAAI,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAE5K,MAAM,gBAAgB,GAAG,CAAC,IAAA,uBAAS,EAAC,YAAY,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC;YAC1L,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,wBAAwB,CAAC,eAAe,CAAC;YACtE,CAAC,CAAC,eAAe,CAAC;QAEpB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACxG,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAM,CAAC;SAC9D;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;YACnG,OAAO,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAE,CAAC;SACtD;QAED,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACpD,MAAM,IAAI,4BAAY,CAAC,yHAAyH,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SACvK;QAED,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvD,IAAI,QAAY,CAAC;QAEjB,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,YAAY,GAAG,+BAAkB,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAEpF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,4BAAoB,CAAC,EAAE;gBAChD,MAAM,IAAI,4BAAY,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,qBAAqB,EAAE,KAAK,CAAC,CAAC;aAC5F;YAED,IAAI,IAAA,mBAAW,EAAC,YAAY,CAAC,WAAW,CAAC,EAAE;gBACzC,MAAM,IAAI,4BAAY,CAAC,mBAAmB,IAAA,oBAAY,EAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;aACrF;YAED,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAY,EAAC,IAAA,cAAQ,EAAC,YAAY,CAAC,UAAU,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7L,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE9D,QAAQ,GAAG,IAAK,YAAY,CAAC,WAA2B,CAAC,GAAG,UAAU,CAAM,CAAC;YAE7E,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE;gBAC1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,4BAAoB,CAAC,EAAE;oBAC5C,SAAS;iBACV;gBAEA,QAAmB,CAAC,QAAkB,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;aACjJ;SACF;QAED,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC3C;QAED,IAAI,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,GAAG,GAAG,eAAe,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC5G,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAE9F,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAO,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;SAC/G;QAED,IAAI,IAAA,4BAAiB,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC5C,IAAI;gBACF,QAAQ,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;aAC5G;YACD,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,4BAAY,CAAC,mBAAmB,EAAE,KAAK,EAAE,KAAc,CAAC,CAAC;aACpE;SACF;QAED,IAAI,CAAC,IAAA,0BAAe,EAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC3C,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,YAAY,EAAE;gBAClD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC5D;YAED,IAAI,YAAY,CAAC,OAAO,CAAC,SAAS,IAAI,WAAW,EAAE;gBACjD,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;aACxD;YAED,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;SACtD;QAED,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEpD,IAAI,OAAO,EAAE;YACX,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;gBAClD,MAAM,EAAE,EAAE,CAAC;aACZ;YAED,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAE1B,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxD,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;gBAE3C,IAAI,IAAA,wBAAU,EAAE,UAAU,CAAC,QAAqC,EAAE,CAAC,yBAAY,CAAC,CAAC,EAAE;oBACjF,MAAO,UAAU,CAAC,QAAyB,CAAC,yBAAY,CAAE,EAAE,CAAC;iBAC9D;gBAED,IAAI,IAAA,uBAAS,EAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBAC1D,MAAM,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;iBACxE;aACF;SACF;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAC,KAAqB,EAAE,OAA+B,EAAE,YAA0B,EAAE,QAAyD,EAAE,eAAoB,EAAE,KAAmB;QAC/M,MAAM,QAAQ,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,uBAAuB,CAAC;YACjE,CAAC,CAAC,CAAC,WAAuC,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,EAAE,WAAY,CAAC,CAAC,QAAQ,CAAC,WAAY,CAAC;YAChJ,CAAC,CAAC,CAAC,WAAuC,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,WAAY,CAAC,CAAC,QAAQ,CAAC,WAAY,CAAC,CAAC;QAEhJ,MAAM,cAAc,GAAmB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,4BAAoB,CAAC,IAAI,EAAE,CAAC;QACxF,MAAM,WAAW,GAAG,CAAC,cAAc,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAE,CAAC;QAEnE,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,IAAA,uBAAS,EAAC,eAAe,CAAC,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,CAAC,EAAE;YACpJ,MAAM,MAAM,GAAG,cAAc,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YAEpE,IAAI,IAAA,uBAAS,EAAC,MAAM,CAAC,EAAE;gBACrB,MAAM,IAAI,4BAAY,CAAC,mDAAmD,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;aAC3K;YAED,OAAO,MAAM,CAAC;SACf;QAED,MAAM,wBAAwB,GAAG,cAAc,CAAC,qBAAqB,EAAE,CAAC,eAAe,CAAC,IAAI,cAAc,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE7L,IAAI,IAAA,uBAAS,EAAC,wBAAwB,CAAC,EAAE;YACvC,MAAM,IAAI,4BAAY,CAAC,qDAAqD,IAAA,oBAAY,EAAC,KAAK,CAAC,oDAAoD,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;SAC7K;QAED,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,wBAAU,CAAC,MAAM,EAAE,CAAC;YACvC,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;YAEvD,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE;gBAC/B,MAAM,YAAY,GAAG,IAAA,wBAAU,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,EAAoB,CAAC,CAAC,CAAC,eAAe,CAAC;gBAEzG,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,EAAE;oBACpC,MAAM,IAAI,4BAAY,CAAC,2CAA2C,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;iBAC7F;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;gBACxI,wBAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACpC,OAAO,UAAU,CAAC;SACnB;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC;QACtI,OAAO,IAAA,uBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvF,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,OAA+B,EAAE,YAA0B,EAAE,QAAyD,EAAE,eAAoB,EAAE,KAAmB;QACnM,MAAM,QAAQ,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,uBAAuB,CAAC;YACjE,CAAC,CAAC,CAAC,WAAuC,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,EAAE,WAAY,CAAC,CAAC,QAAQ,CAAC,WAAY,CAAC;YAChJ,CAAC,CAAC,CAAC,WAAuC,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,WAAY,CAAC,CAAC,QAAQ,CAAC,WAAY,CAAC,CAAC;QAEhJ,MAAM,cAAc,GAAmB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,4BAAoB,CAAC,IAAI,EAAE,CAAC;QACxF,MAAM,WAAW,GAAG,CAAC,cAAc,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAE,CAAC;QAEnE,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,IAAA,uBAAS,EAAC,eAAe,CAAC,IAAI,IAAA,yBAAW,EAAC,WAAW,CAAC,CAAC,EAAE;YACpJ,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC;SAC3E;QAED,MAAM,wBAAwB,GAAG,MAAM,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC,eAAe,CAAC,IAAI,cAAc,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAErM,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,wBAAU,CAAC,MAAM,EAAE,CAAC;YACvC,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;YAEvD,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrC,MAAM,YAAY,GAAG,IAAA,wBAAU,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,EAAoB,CAAC,CAAC,CAAC,eAAe,CAAC;gBAEzG,IAAI,IAAA,uBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,EAAE;oBACpC,MAAM,IAAI,4BAAY,CAAC,2CAA2C,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;iBAC7F;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,cAAc,CAAC,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;gBACnJ,wBAAU,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACpC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC;QACjJ,OAAO,EAAE,QAAQ,EAAE,IAAA,uBAAS,EAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrG,CAAC;IAEO,iBAAiB,CAAC,cAAsC,EAAE,KAAmB;QACnF,MAAM,OAAO,GAAmB;YAC9B,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;gBACtC,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAC7D,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7F,CAAC;YACD,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;gBACjD,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAC7D,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;YAClG,CAAC;SACF,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,4BAA4B,CAAC,SAA8C,EAAE,cAAsC;QACzH,IAAI,IAAA,yBAAW,EAAC,SAAS,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,SAAS,EAAE;YACjD,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;SAC/D;IACH,CAAC;CACF;AAlgBD,8BAkgBC;AAED,SAAS,gBAAgB,CAAC,OAA+B;IACvD,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,IAAI,CAAC,CAAC,OAAO,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE;YAC7C,SAAS;SACV;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAA,sBAAa,EAAC,UAAU,CAAC,QAAkB,CAAC,EAAE;YACvE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,KAAmB,CAAC,EAAE;gBACjD,SAAS;aACV;YAEA,UAAU,CAAC,QAAmB,CAAC,GAAG,CAAC,GAAG,wBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAEY,QAAA,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../source/container/container.ts"],"names":[],"mappings":"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"}
|
package/container/decorators.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.forwardRef = exports.optional = exports.forwardArg = exports.injectArg = exports.resolveArgProvider = exports.resolveArg = exports.inject = exports.scoped = exports.singleton = exports.injectable = exports.replaceClass = void 0;
|
|
4
|
-
/* eslint-disable @typescript-eslint/ban-types */
|
|
5
4
|
const reflection_1 = require("../reflection");
|
|
6
5
|
const array_1 = require("../utils/array");
|
|
7
6
|
const type_guards_1 = require("../utils/type-guards");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../source/container/decorators.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../source/container/decorators.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ class ResolveChain {
|
|
|
39
39
|
case 'parameter':
|
|
40
40
|
const metadata = reflection_1.reflectionRegistry.getMetadata(node.constructor);
|
|
41
41
|
const prefix = '_, '.repeat(node.index);
|
|
42
|
-
const suffix = ', _'.repeat((0, type_guards_1.assertDefinedPass)(metadata
|
|
42
|
+
const suffix = ', _'.repeat((0, type_guards_1.assertDefinedPass)(metadata?.parameters, 'missing parameters metadata').length - node.index - 1);
|
|
43
43
|
chainString += `(${prefix}${tokenName}${suffix})`;
|
|
44
44
|
break;
|
|
45
45
|
case 'property':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-chain.js","sourceRoot":"","sources":["../../source/container/resolve-chain.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,sDAAwD;AAExD,mCAAuC;AAWvC,MAAa,YAAY;IACd,KAAK,CAA8B;IAE5C,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,YAAY,KAA0B;QACpC,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,KAAqB;QACpC,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,QAAQ,CAAC,KAAqB;QAC5B,MAAM,IAAI,GAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACxD,OAAO,IAAI,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,WAAgC,EAAE,KAAa,EAAE,KAAqB;QACjF,MAAM,IAAI,GAAqB,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAChF,OAAO,IAAI,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,WAAW,CAAC,WAAgC,EAAE,QAAqB,EAAE,KAAqB;QACxF,MAAM,IAAI,GAAqB,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAClF,OAAO,IAAI,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,MAAM;QACJ,IAAI,WAAW,GAAG,EAAE,CAAC;QAErB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE3C,QAAQ,IAAI,CAAC,IAAI,EAAE;gBACjB,KAAK,OAAO;oBACV,WAAW,IAAI,YAAY,SAAS,EAAE,CAAC;oBACvC,MAAM;gBAER,KAAK,WAAW;oBACd,MAAM,QAAQ,GAAG,+BAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAClE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAA,+BAAiB,EAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"resolve-chain.js","sourceRoot":"","sources":["../../source/container/resolve-chain.ts"],"names":[],"mappings":"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"}
|
package/mail/mail.service.d.ts
CHANGED
|
@@ -4,13 +4,15 @@ import type { TypedOmit } from "../types";
|
|
|
4
4
|
import { MailLogRepository } from './mail-log.repository';
|
|
5
5
|
import { MailClient } from './mail.client';
|
|
6
6
|
import type { MailData, MailSendResult } from './models';
|
|
7
|
+
import { DefaultMailData } from './models';
|
|
7
8
|
export declare class MailService {
|
|
8
9
|
private readonly mailClient;
|
|
9
10
|
private readonly templateService;
|
|
10
11
|
private readonly mailLogRepository;
|
|
12
|
+
private readonly defaultData;
|
|
11
13
|
private readonly logger;
|
|
12
14
|
private readonly mailDataSourceTemplateKey;
|
|
13
|
-
constructor(mailClient: MailClient, templateService: TemplateService, mailLogRepository: MailLogRepository | undefined, logger: Logger);
|
|
15
|
+
constructor(mailClient: MailClient, templateService: TemplateService, mailLogRepository: MailLogRepository | undefined, defaultData: DefaultMailData, logger: Logger);
|
|
14
16
|
send(mailData: MailData): Promise<MailSendResult>;
|
|
15
17
|
sendTemplate(key: string, mailData: TypedOmit<MailData, 'content' | 'subject'>, templateContext?: object): Promise<MailSendResult>;
|
|
16
18
|
}
|
package/mail/mail.service.js
CHANGED
|
@@ -22,33 +22,37 @@ const format_error_1 = require("../utils/format-error");
|
|
|
22
22
|
const type_guards_1 = require("../utils/type-guards");
|
|
23
23
|
const mail_log_repository_1 = require("./mail-log.repository");
|
|
24
24
|
const mail_client_1 = require("./mail.client");
|
|
25
|
+
const tokens_1 = require("./tokens");
|
|
25
26
|
let MailService = MailService_1 = class MailService {
|
|
26
27
|
mailClient;
|
|
27
28
|
templateService;
|
|
28
29
|
mailLogRepository;
|
|
30
|
+
defaultData;
|
|
29
31
|
logger;
|
|
30
32
|
mailDataSourceTemplateKey;
|
|
31
|
-
constructor(mailClient, templateService, mailLogRepository, logger) {
|
|
33
|
+
constructor(mailClient, templateService, mailLogRepository, defaultData, logger) {
|
|
32
34
|
this.mailClient = mailClient;
|
|
33
35
|
this.templateService = templateService;
|
|
34
36
|
this.mailLogRepository = mailLogRepository;
|
|
37
|
+
this.defaultData = defaultData;
|
|
35
38
|
this.logger = logger;
|
|
36
39
|
this.mailDataSourceTemplateKey = new WeakMap();
|
|
37
40
|
}
|
|
38
41
|
async send(mailData) {
|
|
42
|
+
const data = { ...this.defaultData, ...mailData };
|
|
39
43
|
let mailLog;
|
|
40
44
|
if ((0, type_guards_1.isDefined)(this.mailLogRepository)) {
|
|
41
45
|
const log = {
|
|
42
46
|
timestamp: (0, date_time_1.currentTimestamp)(),
|
|
43
|
-
templateKey: this.mailDataSourceTemplateKey.get(
|
|
44
|
-
data
|
|
47
|
+
templateKey: this.mailDataSourceTemplateKey.get(data) ?? null,
|
|
48
|
+
data,
|
|
45
49
|
sendResult: null,
|
|
46
50
|
errors: null
|
|
47
51
|
};
|
|
48
52
|
mailLog = await this.mailLogRepository.insert(log);
|
|
49
53
|
}
|
|
50
54
|
try {
|
|
51
|
-
const result = await this.mailClient.send(
|
|
55
|
+
const result = await this.mailClient.send(data);
|
|
52
56
|
if ((0, type_guards_1.isDefined)(mailLog)) {
|
|
53
57
|
await this.mailLogRepository.patch(mailLog, { sendResult: result });
|
|
54
58
|
}
|
|
@@ -77,9 +81,10 @@ MailService = MailService_1 = __decorate([
|
|
|
77
81
|
(0, container_1.singleton)(),
|
|
78
82
|
__param(2, (0, container_1.inject)(mail_log_repository_1.MailLogRepository)),
|
|
79
83
|
__param(2, (0, container_1.optional)()),
|
|
80
|
-
__param(3, (0, container_1.
|
|
84
|
+
__param(3, (0, container_1.inject)(tokens_1.MAIL_DEFAULT_DATA)),
|
|
85
|
+
__param(4, (0, container_1.resolveArg)(MailService_1.name)),
|
|
81
86
|
__metadata("design:paramtypes", [mail_client_1.MailClient,
|
|
82
|
-
templates_1.TemplateService, Object, logger_1.Logger])
|
|
87
|
+
templates_1.TemplateService, Object, Object, logger_1.Logger])
|
|
83
88
|
], MailService);
|
|
84
89
|
exports.MailService = MailService;
|
|
85
90
|
//# sourceMappingURL=mail.service.js.map
|
package/mail/mail.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../source/mail/mail.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAsE;AAEtE,sCAAkC;AAClC,4CAA8C;AAE9C,kDAAqD;AACrD,wDAAmD;AACnD,sDAAgD;AAChD,+DAA0D;AAC1D,+CAA2C;
|
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../source/mail/mail.service.ts"],"names":[],"mappings":"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"}
|
package/mail/module.d.ts
CHANGED
|
@@ -2,13 +2,15 @@ import type { Type } from "../types";
|
|
|
2
2
|
import { MailLogRepository } from './mail-log.repository';
|
|
3
3
|
import type { MailClientConfig } from './mail.client';
|
|
4
4
|
import { MailClient } from './mail.client';
|
|
5
|
+
import type { DefaultMailData } from './models';
|
|
5
6
|
export type MailModuleConfig = {
|
|
6
7
|
clientConfig: MailClientConfig;
|
|
7
8
|
client: Type<MailClient>;
|
|
8
9
|
logRepository: Type<MailLogRepository> | undefined;
|
|
10
|
+
defaultData: DefaultMailData;
|
|
9
11
|
};
|
|
10
12
|
export declare const mailModuleConfig: MailModuleConfig;
|
|
11
13
|
/**
|
|
12
14
|
* configure mail module
|
|
13
15
|
*/
|
|
14
|
-
export declare function configureMail({ clientConfig, client, logRepository }: Partial<MailModuleConfig>): void;
|
|
16
|
+
export declare function configureMail({ clientConfig, client, logRepository, defaultData }: Partial<MailModuleConfig>): void;
|
package/mail/module.js
CHANGED
|
@@ -9,12 +9,13 @@ const tokens_1 = require("./tokens");
|
|
|
9
9
|
exports.mailModuleConfig = {
|
|
10
10
|
clientConfig: { host: '127.0.0.1', port: 25 },
|
|
11
11
|
client: (0, container_1.stubClass)(mail_client_1.MailClient),
|
|
12
|
-
logRepository: (0, container_1.stubClass)(mail_log_repository_1.MailLogRepository)
|
|
12
|
+
logRepository: (0, container_1.stubClass)(mail_log_repository_1.MailLogRepository),
|
|
13
|
+
defaultData: {}
|
|
13
14
|
};
|
|
14
15
|
/**
|
|
15
16
|
* configure mail module
|
|
16
17
|
*/
|
|
17
|
-
function configureMail({ clientConfig, client, logRepository }) {
|
|
18
|
+
function configureMail({ clientConfig, client, logRepository, defaultData }) {
|
|
18
19
|
if ((0, type_guards_1.isDefined)(clientConfig)) {
|
|
19
20
|
container_1.container.registerSingleton(tokens_1.MAIL_CLIENT_CONFIG, { useValue: clientConfig });
|
|
20
21
|
}
|
|
@@ -24,6 +25,9 @@ function configureMail({ clientConfig, client, logRepository }) {
|
|
|
24
25
|
if ((0, type_guards_1.isDefined)(logRepository)) {
|
|
25
26
|
container_1.container.registerSingleton(mail_log_repository_1.MailLogRepository, { useToken: logRepository });
|
|
26
27
|
}
|
|
28
|
+
if ((0, type_guards_1.isDefined)(defaultData)) {
|
|
29
|
+
container_1.container.registerSingleton(tokens_1.MAIL_DEFAULT_DATA, { useValue: defaultData });
|
|
30
|
+
}
|
|
27
31
|
}
|
|
28
32
|
exports.configureMail = configureMail;
|
|
29
33
|
//# sourceMappingURL=module.js.map
|
package/mail/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/mail/module.ts"],"names":[],"mappings":";;;AAAA,4CAAmD;AAEnD,sDAAgD;AAChD,+DAA0D;AAE1D,+CAA2C;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/mail/module.ts"],"names":[],"mappings":";;;AAAA,4CAAmD;AAEnD,sDAAgD;AAChD,+DAA0D;AAE1D,+CAA2C;AAE3C,qCAAiE;AASpD,QAAA,gBAAgB,GAAqB;IAChD,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,EAAE;IAC7C,MAAM,EAAE,IAAA,qBAAS,EAAC,wBAAU,CAAC;IAC7B,aAAa,EAAE,IAAA,qBAAS,EAAC,uCAAiB,CAAC;IAC3C,WAAW,EAAE,EAAE;CAChB,CAAC;AAEF;;GAEG;AACH,SAAgB,aAAa,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAA6B;IAC3G,IAAI,IAAA,uBAAS,EAAC,YAAY,CAAC,EAAE;QAC3B,qBAAS,CAAC,iBAAiB,CAAC,2BAAkB,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;KAC7E;IAED,IAAI,IAAA,uBAAS,EAAC,MAAM,CAAC,EAAE;QACrB,qBAAS,CAAC,iBAAiB,CAAC,wBAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;KAC/D;IAED,IAAI,IAAA,uBAAS,EAAC,aAAa,CAAC,EAAE;QAC5B,qBAAS,CAAC,iBAAiB,CAAC,uCAAiB,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;KAC7E;IAED,IAAI,IAAA,uBAAS,EAAC,WAAW,CAAC,EAAE;QAC1B,qBAAS,CAAC,iBAAiB,CAAC,0BAAiB,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AAhBD,sCAgBC"}
|
package/mail/tokens.d.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import type { MailClientConfig } from './mail.client';
|
|
2
2
|
export declare const MAIL_CLIENT_CONFIG: import("../container").InjectionToken<MailClientConfig, any>;
|
|
3
|
+
export declare const MAIL_DEFAULT_DATA: import("../container").InjectionToken<Partial<import("./models").MailData>, any>;
|
package/mail/tokens.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MAIL_CLIENT_CONFIG = void 0;
|
|
3
|
+
exports.MAIL_DEFAULT_DATA = exports.MAIL_CLIENT_CONFIG = void 0;
|
|
4
4
|
const container_1 = require("../container");
|
|
5
5
|
exports.MAIL_CLIENT_CONFIG = (0, container_1.injectionToken)('MAIL_CLIENT_CONFIG');
|
|
6
|
+
exports.MAIL_DEFAULT_DATA = (0, container_1.injectionToken)('MAIL_DEFAULT_DATA');
|
|
6
7
|
//# sourceMappingURL=tokens.js.map
|
package/mail/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../source/mail/tokens.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../source/mail/tokens.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAIhC,QAAA,kBAAkB,GAAG,IAAA,0BAAc,EAAmB,oBAAoB,CAAC,CAAC;AAE5E,QAAA,iBAAiB,GAAG,IAAA,0BAAc,EAAkB,mBAAmB,CAAC,CAAC"}
|