@tstdl/base 0.71.12 → 0.71.15
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/image-service/image-service.d.ts +8 -8
- package/mail/mail.service.d.ts +1 -1
- package/mail/mail.service.js +11 -12
- package/mail/mail.service.js.map +1 -1
- package/mail/module.js +1 -3
- package/mail/module.js.map +1 -1
- package/mail/template-providers/file-mail-template.provider.d.ts +3 -2
- package/mail/template-providers/file-mail-template.provider.js.map +1 -1
- package/package.json +4 -4
- package/schema/schemas/index.d.ts +1 -0
- package/schema/schemas/index.js +1 -0
- package/schema/schemas/index.js.map +1 -1
- package/schema/schemas/object.d.ts +4 -2
- package/schema/schemas/object.js +10 -3
- package/schema/schemas/object.js.map +1 -1
- package/schema/schemas/union.d.ts +17 -0
- package/schema/schemas/union.js +38 -0
- package/schema/schemas/union.js.map +1 -0
- package/utils/cryptography.d.ts +4 -4
- package/utils/cryptography.js +7 -7
- package/utils/cryptography.js.map +1 -1
|
@@ -4,12 +4,12 @@ export declare const imageResizeModeSchema: import("superstruct").Struct<"fill"
|
|
|
4
4
|
fit: "fit";
|
|
5
5
|
}>;
|
|
6
6
|
export declare type ImageResizeMode = Infer<typeof imageResizeModeSchema>;
|
|
7
|
-
export declare const imageOriginSchema: import("superstruct").Struct<"
|
|
8
|
-
right: "right";
|
|
9
|
-
left: "left";
|
|
7
|
+
export declare const imageOriginSchema: import("superstruct").Struct<"center" | "smart" | "top" | "left" | "right" | "bottom" | "topleft" | "topright" | "bottomleft" | "bottomright", {
|
|
10
8
|
center: "center";
|
|
11
9
|
smart: "smart";
|
|
12
10
|
top: "top";
|
|
11
|
+
left: "left";
|
|
12
|
+
right: "right";
|
|
13
13
|
bottom: "bottom";
|
|
14
14
|
topleft: "topleft";
|
|
15
15
|
topright: "topright";
|
|
@@ -26,12 +26,12 @@ export declare const imageFormatSchema: import("superstruct").Struct<"png" | "jp
|
|
|
26
26
|
}>;
|
|
27
27
|
export declare type ImageFormat = Infer<typeof imageFormatSchema>;
|
|
28
28
|
export declare const imageOptionsSchema: import("superstruct").Struct<{
|
|
29
|
-
origin?: "
|
|
30
|
-
format?: "png" | "jpg" | "jpeg" | "webp" | "avif" | undefined;
|
|
29
|
+
origin?: "center" | "smart" | "top" | "left" | "right" | "bottom" | "topleft" | "topright" | "bottomleft" | "bottomright" | undefined;
|
|
31
30
|
resizeMode?: "fill" | "fit" | undefined;
|
|
32
31
|
width?: number | undefined;
|
|
33
32
|
height?: number | undefined;
|
|
34
33
|
quality?: number | undefined;
|
|
34
|
+
format?: "png" | "jpg" | "jpeg" | "webp" | "avif" | undefined;
|
|
35
35
|
cacheBuster?: string | undefined;
|
|
36
36
|
}, {
|
|
37
37
|
resizeMode: import("superstruct").Struct<"fill" | "fit" | undefined, {
|
|
@@ -40,12 +40,12 @@ export declare const imageOptionsSchema: import("superstruct").Struct<{
|
|
|
40
40
|
}>;
|
|
41
41
|
width: import("superstruct").Struct<number | undefined, null>;
|
|
42
42
|
height: import("superstruct").Struct<number | undefined, null>;
|
|
43
|
-
origin: import("superstruct").Struct<"
|
|
44
|
-
right: "right";
|
|
45
|
-
left: "left";
|
|
43
|
+
origin: import("superstruct").Struct<"center" | "smart" | "top" | "left" | "right" | "bottom" | "topleft" | "topright" | "bottomleft" | "bottomright" | undefined, {
|
|
46
44
|
center: "center";
|
|
47
45
|
smart: "smart";
|
|
48
46
|
top: "top";
|
|
47
|
+
left: "left";
|
|
48
|
+
right: "right";
|
|
49
49
|
bottom: "bottom";
|
|
50
50
|
topleft: "topleft";
|
|
51
51
|
topright: "topright";
|
package/mail/mail.service.d.ts
CHANGED
|
@@ -9,9 +9,9 @@ export declare class MailService {
|
|
|
9
9
|
private readonly mailClient;
|
|
10
10
|
private readonly mailTemplateProvider;
|
|
11
11
|
private readonly mailTemplateRendererProvider;
|
|
12
|
-
private readonly mailQueue;
|
|
13
12
|
private readonly mailLogRepository;
|
|
14
13
|
private readonly logger;
|
|
15
14
|
constructor(mailClient: MailClient, mailTemplateProvider: MailTemplateProvider, mailTemplateRendererProvider: MailTemplateRendererProvider, mailLogRepository: MailLogRepository | undefined, logger: Logger);
|
|
15
|
+
send(mailData: MailData): Promise<MailSendResult>;
|
|
16
16
|
sendTemplate(key: string, mailData: TypedOmit<MailData, 'content' | 'subject'>, templateContext?: object): Promise<MailSendResult>;
|
|
17
17
|
}
|
package/mail/mail.service.js
CHANGED
|
@@ -24,32 +24,24 @@ const mail_template_renderer_provider_1 = require("./mail-template-renderer.prov
|
|
|
24
24
|
const mail_template_provider_1 = require("./mail-template.provider");
|
|
25
25
|
const mail_client_1 = require("./mail.client");
|
|
26
26
|
let MailService = MailService_1 = class MailService {
|
|
27
|
-
constructor(mailClient, mailTemplateProvider, mailTemplateRendererProvider,
|
|
28
|
-
// @inject(Queue) @resolveArgProvider(() => mailModuleConfig.queueKey) @optional() mailQueue: Queue<unknown> | undefined,
|
|
29
|
-
mailLogRepository, logger) {
|
|
27
|
+
constructor(mailClient, mailTemplateProvider, mailTemplateRendererProvider, mailLogRepository, logger) {
|
|
30
28
|
this.mailClient = mailClient;
|
|
31
29
|
this.mailTemplateProvider = mailTemplateProvider;
|
|
32
30
|
this.mailTemplateRendererProvider = mailTemplateRendererProvider;
|
|
33
|
-
// this.mailQueue = mailQueue;
|
|
34
31
|
this.mailLogRepository = mailLogRepository;
|
|
35
32
|
this.logger = logger;
|
|
36
33
|
}
|
|
37
|
-
async
|
|
38
|
-
const template = await this.mailTemplateProvider.get(key);
|
|
39
|
-
const renderer = this.mailTemplateRendererProvider.get(template.type);
|
|
40
|
-
const { subject, html, text } = await renderer.render(template, templateContext);
|
|
41
|
-
const fullMailData = Object.assign(Object.assign({}, mailData), { subject, content: { html, text } });
|
|
34
|
+
async send(mailData) {
|
|
42
35
|
let mailLog;
|
|
43
36
|
if ((0, type_guards_1.isDefined)(this.mailLogRepository)) {
|
|
44
37
|
const log = {
|
|
45
38
|
timestamp: (0, date_time_1.currentTimestamp)(),
|
|
46
|
-
|
|
47
|
-
data: fullMailData
|
|
39
|
+
data: mailData
|
|
48
40
|
};
|
|
49
41
|
mailLog = await this.mailLogRepository.insert(log);
|
|
50
42
|
}
|
|
51
43
|
try {
|
|
52
|
-
const result = await this.mailClient.send(
|
|
44
|
+
const result = await this.mailClient.send(mailData);
|
|
53
45
|
if ((0, type_guards_1.isDefined)(mailLog)) {
|
|
54
46
|
await this.mailLogRepository.patch(mailLog, { sendResult: result });
|
|
55
47
|
}
|
|
@@ -67,6 +59,13 @@ let MailService = MailService_1 = class MailService {
|
|
|
67
59
|
throw error;
|
|
68
60
|
}
|
|
69
61
|
}
|
|
62
|
+
async sendTemplate(key, mailData, templateContext) {
|
|
63
|
+
const template = await this.mailTemplateProvider.get(key);
|
|
64
|
+
const renderer = this.mailTemplateRendererProvider.get(template.type);
|
|
65
|
+
const { subject, html, text } = await renderer.render(template, templateContext);
|
|
66
|
+
const fullMailData = Object.assign(Object.assign({}, mailData), { subject, content: { html, text } });
|
|
67
|
+
return this.send(fullMailData);
|
|
68
|
+
}
|
|
70
69
|
};
|
|
71
70
|
MailService = MailService_1 = __decorate([
|
|
72
71
|
(0, container_1.singleton)(),
|
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;
|
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../source/mail/mail.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAsE;AAEtE,sCAAkC;AAElC,kDAAqD;AACrD,8CAA8C;AAC9C,sDAAgD;AAChD,+DAA0D;AAC1D,uFAAiF;AACjF,qEAAgE;AAChE,+CAA2C;AAI3C,IAAa,WAAW,mBAAxB,MAAa,WAAW;IAOtB,YACE,UAAsB,EACV,oBAA0C,EACtD,4BAA0D,EACnB,iBAAgD,EACzC,MAAc;QAE5D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,4BAA4B,GAAG,4BAA4B,CAAC;QACjE,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAkB;QAC3B,IAAI,OAA4B,CAAC;QAEjC,IAAI,IAAA,uBAAS,EAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YACrC,MAAM,GAAG,GAAe;gBACtB,SAAS,EAAE,IAAA,4BAAgB,GAAE;gBAC7B,IAAI,EAAE,QAAQ;aACf,CAAC;YAEF,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACpD;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAEpD,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,EAAE;gBACtB,MAAM,IAAI,CAAC,iBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;aACtE;YAED,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,EAAE;YACZ,IAAI;gBACF,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,EAAE;oBACtB,MAAM,IAAI,CAAC,iBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBAChF;aACF;YACD,OAAO,QAAQ,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAiB,CAAC,CAAC;aACtC;YAED,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,QAAoD,EAAE,eAAwB;QAC5G,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACjF,MAAM,YAAY,mCAAQ,QAAQ,KAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAE,CAAC;QAEvE,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AAhEY,WAAW;IADvB,IAAA,qBAAS,GAAE;IAUP,WAAA,IAAA,oBAAQ,GAAE,CAAA;IAEV,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;IACrC,WAAA,IAAA,sBAAU,EAAiB,aAAW,CAAC,IAAI,CAAC,CAAA;qCAJjC,wBAAU;QACY,6CAAoB;QACxB,8DAA4B,UAEJ,eAAM;GAZnD,WAAW,CAgEvB;AAhEY,kCAAW"}
|
package/mail/module.js
CHANGED
|
@@ -13,13 +13,11 @@ exports.mailModuleConfig = {
|
|
|
13
13
|
logRepository: (0, container_1.stubClass)(mail_log_repository_1.MailLogRepository),
|
|
14
14
|
templateProvider: (0, container_1.stubClass)(mail_template_provider_1.MailTemplateProvider),
|
|
15
15
|
templateRenderers: []
|
|
16
|
-
// queueKey: undefined
|
|
17
16
|
};
|
|
18
17
|
/**
|
|
19
18
|
* configure mail module
|
|
20
19
|
*/
|
|
21
|
-
function configureMail({ clientConfig, client, logRepository, templateProvider, templateRenderers
|
|
22
|
-
// mailModuleConfig.queueKey = queueKey ?? mailModuleConfig.queueKey;
|
|
20
|
+
function configureMail({ clientConfig, client, logRepository, templateProvider, templateRenderers }) {
|
|
23
21
|
if ((0, type_guards_1.isDefined)(clientConfig)) {
|
|
24
22
|
container_1.container.registerSingleton(tokens_1.MAIL_CLIENT_CONFIG, { useValue: clientConfig });
|
|
25
23
|
}
|
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;AAC1D,qEAAgE;AAGhE,+CAA2C;AAC3C,qCAAuE;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/mail/module.ts"],"names":[],"mappings":";;;AAAA,4CAAmD;AAEnD,sDAAgD;AAChD,+DAA0D;AAC1D,qEAAgE;AAGhE,+CAA2C;AAC3C,qCAAuE;AAU1D,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,gBAAgB,EAAE,IAAA,qBAAS,EAAC,6CAAoB,CAAC;IACjD,iBAAiB,EAAE,EAAE;CACtB,CAAC;AAEF;;GAEG;AACH,SAAgB,aAAa,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAA6B;IACnI,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,iBAAiB,CAAC,EAAE;QAChC,qBAAS,CAAC,iBAAiB,CAAC,gCAAuB,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;KACvF;IAED,IAAI,IAAA,uBAAS,EAAC,gBAAgB,CAAC,EAAE;QAC/B,qBAAS,CAAC,iBAAiB,CAAC,6CAAoB,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;KACnF;AACH,CAAC;AApBD,sCAoBC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { Injectable
|
|
2
|
-
import {
|
|
1
|
+
import type { Injectable } from "../../container";
|
|
2
|
+
import { resolveArgumentType } from "../../container";
|
|
3
|
+
import type { TypedOmit } from "../../types";
|
|
3
4
|
import { MailTemplateProvider } from '../mail-template.provider';
|
|
4
5
|
import type { MailTemplate } from '../models';
|
|
5
6
|
export declare type FileMailTemplate = TypedOmit<MailTemplate, 'key'> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-mail-template.provider.js","sourceRoot":"","sources":["../../../source/mail/template-providers/file-mail-template.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"file-mail-template.provider.js","sourceRoot":"","sources":["../../../source/mail/template-providers/file-mail-template.provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.15",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"@types/node": ">=16",
|
|
26
26
|
"@types/nodemailer": "^6.4.4",
|
|
27
27
|
"@types/yup": "0.29",
|
|
28
|
-
"@typescript-eslint/eslint-plugin": "5.
|
|
29
|
-
"@typescript-eslint/parser": "5.
|
|
30
|
-
"eslint": "8.
|
|
28
|
+
"@typescript-eslint/eslint-plugin": "5.23",
|
|
29
|
+
"@typescript-eslint/parser": "5.23",
|
|
30
|
+
"eslint": "8.15",
|
|
31
31
|
"ttypescript": "1.5",
|
|
32
32
|
"typedoc": "0.22",
|
|
33
33
|
"typescript": "4.6",
|
package/schema/schemas/index.js
CHANGED
|
@@ -35,5 +35,6 @@ __exportStar(require("./regexp"), exports);
|
|
|
35
35
|
__exportStar(require("./string"), exports);
|
|
36
36
|
__exportStar(require("./transform"), exports);
|
|
37
37
|
__exportStar(require("./uint8-array"), exports);
|
|
38
|
+
__exportStar(require("./union"), exports);
|
|
38
39
|
__exportStar(require("./unknown"), exports);
|
|
39
40
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/schema/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,0CAAwB;AACxB,mDAAiC;AACjC,4CAA0B;AAC1B,8CAA4B;AAC5B,gDAA8B;AAC9B,6CAA2B;AAC3B,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,2CAAyB;AACzB,2CAAyB;AACzB,6CAA2B;AAC3B,+CAA6B;AAC7B,oDAAkC;AAClC,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,4CAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/schema/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,0CAAwB;AACxB,mDAAiC;AACjC,4CAA0B;AAC1B,8CAA4B;AAC5B,gDAA8B;AAC9B,6CAA2B;AAC3B,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,2CAAyB;AACzB,2CAAyB;AACzB,6CAA2B;AAC3B,+CAA6B;AAC7B,oDAAkC;AAClC,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,0CAAwB;AACxB,4CAA0B"}
|
|
@@ -2,15 +2,17 @@ import type { JsonPath } from "../../json-path";
|
|
|
2
2
|
import type { Optionalize, Simplify, SimplifyObject, StringMap } from "../../types";
|
|
3
3
|
import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
|
|
4
4
|
import { SchemaValidator, test, testAsync } from '../schema.validator';
|
|
5
|
-
import type { SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
|
|
5
|
+
import type { Maskable, SchemaDefinition, SchemaOptions, SchemaOutput } from '../types';
|
|
6
6
|
export declare type ObjectOutputType<T extends StringMap<SchemaDefinition>> = Simplify<Optionalize<{
|
|
7
7
|
[P in keyof T]: SchemaOutput<T[P]>;
|
|
8
8
|
}>>;
|
|
9
9
|
export declare type ObjectSchemaValidatorEntries<T extends StringMap<SchemaDefinition>> = {
|
|
10
10
|
[P in keyof T]: SchemaValidator<T[P]>;
|
|
11
11
|
};
|
|
12
|
-
export declare type ObjectSchemaDefinition<T extends StringMap<SchemaDefinition> = StringMap<SchemaDefinition>> = SchemaDefinition<'object', unknown, ObjectOutputType<T>> & {
|
|
12
|
+
export declare type ObjectSchemaDefinition<T extends StringMap<SchemaDefinition> = StringMap<SchemaDefinition>> = SchemaDefinition<'object', unknown, ObjectOutputType<T>> & Maskable & {
|
|
13
13
|
entries: T;
|
|
14
|
+
/** Keep unknown properties instead of raising an error. This overwrites mask. */
|
|
15
|
+
keepUnknown?: boolean;
|
|
14
16
|
};
|
|
15
17
|
export declare type ObjectAssign<A extends StringMap<SchemaDefinition>, B extends StringMap<SchemaDefinition>> = SimplifyObject<Omit<A, keyof B> & B>;
|
|
16
18
|
export declare class ObjectSchemaValidator<T extends StringMap<SchemaDefinition>> extends SchemaValidator<ObjectSchemaDefinition<T>> {
|
package/schema/schemas/object.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.assign = exports.object = exports.ObjectSchemaValidator = void 0;
|
|
4
4
|
const map_1 = require("../../utils/map");
|
|
5
|
+
const type_guards_1 = require("../../utils/type-guards");
|
|
5
6
|
const schema_error_1 = require("../schema.error");
|
|
6
7
|
const schema_validator_1 = require("../schema.validator");
|
|
7
8
|
const types_1 = require("../types");
|
|
@@ -23,7 +24,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
23
24
|
if (!testBaseResult.valid) {
|
|
24
25
|
return testBaseResult;
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
+
let resultObject = {};
|
|
27
28
|
for (const [key, validator] of this.validatorEntries) {
|
|
28
29
|
const innerValue = testBaseResult.value.get(key);
|
|
29
30
|
const innerValueValidationTestResult = validator[schema_validator_1.test](innerValue, options, path.add(key));
|
|
@@ -32,6 +33,9 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
32
33
|
}
|
|
33
34
|
resultObject[key] = innerValueValidationTestResult.value;
|
|
34
35
|
}
|
|
36
|
+
if (this.schema.keepUnknown == true) {
|
|
37
|
+
resultObject = Object.assign(Object.assign({}, value), resultObject);
|
|
38
|
+
}
|
|
35
39
|
return { valid: true, value: resultObject };
|
|
36
40
|
}
|
|
37
41
|
async [schema_validator_1.testAsync](value, options, path) {
|
|
@@ -39,7 +43,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
39
43
|
if (!testBaseResult.valid) {
|
|
40
44
|
return testBaseResult;
|
|
41
45
|
}
|
|
42
|
-
|
|
46
|
+
let resultObject = {};
|
|
43
47
|
for (const [key, validator] of this.validatorEntries) {
|
|
44
48
|
const innerValue = testBaseResult.value.get(key);
|
|
45
49
|
const innerValueValidationTestResult = await validator[schema_validator_1.testAsync](innerValue, options, path.add(key));
|
|
@@ -48,6 +52,9 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
48
52
|
}
|
|
49
53
|
resultObject[key] = innerValueValidationTestResult.value;
|
|
50
54
|
}
|
|
55
|
+
if (this.schema.keepUnknown == true) {
|
|
56
|
+
resultObject = Object.assign(Object.assign({}, value), resultObject);
|
|
57
|
+
}
|
|
51
58
|
return { valid: true, value: resultObject };
|
|
52
59
|
}
|
|
53
60
|
_testBase(value, options, path) {
|
|
@@ -60,7 +67,7 @@ class ObjectSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
60
67
|
}
|
|
61
68
|
const valueEntries = new Map(Object.entries(value));
|
|
62
69
|
const unknownKeys = (0, map_1.differenceMaps)(valueEntries, this.validatorEntries);
|
|
63
|
-
if ((unknownKeys.length > 0) && !options.mask) {
|
|
70
|
+
if ((unknownKeys.length > 0) && (this.schema.mask != true) && ((0, type_guards_1.isBoolean)(this.schema.mask) || !options.mask) && (this.schema.keepUnknown != true)) {
|
|
64
71
|
const keys = unknownKeys.map((entry) => entry[0]).join(', ');
|
|
65
72
|
return { valid: false, error: (0, schema_error_1.schemaError)(`unexpecet keys in object: ${keys}`, path) };
|
|
66
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":";;;AAEA,yCAA6C;AAC7C,kDAA2D;AAE3D,0DAAuE;AAEvE,oCAAwC;
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../source/schema/schemas/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { JsonPath } from "../../json-path";
|
|
2
|
+
import type { DefinedValidationOptions, ValidationTestResult } from '../schema.validator';
|
|
3
|
+
import { SchemaValidator, test, testAsync } from '../schema.validator';
|
|
4
|
+
import type { SchemaDefinition, SchemaInput, SchemaOptions, SchemaOutput } from '../types';
|
|
5
|
+
export declare type UnionSchemaInput<A extends SchemaDefinition, B extends SchemaDefinition[]> = SchemaInput<A> | SchemaInput<B[number]>;
|
|
6
|
+
export declare type UnionSchemaOutput<A extends SchemaDefinition, B extends SchemaDefinition[]> = SchemaOutput<A> | SchemaOutput<B[number]>;
|
|
7
|
+
export declare type UnionSchemaDefinition<A extends SchemaDefinition, B extends SchemaDefinition[]> = SchemaDefinition<'union', UnionSchemaInput<A, B>, UnionSchemaOutput<A, B>> & {
|
|
8
|
+
schemas: [A, ...B];
|
|
9
|
+
};
|
|
10
|
+
export declare class UnionSchemaValidator<A extends SchemaDefinition, B extends SchemaDefinition[]> extends SchemaValidator<UnionSchemaDefinition<A, B>> {
|
|
11
|
+
private readonly innerSchemas;
|
|
12
|
+
private readonly innerSchemaTypesString;
|
|
13
|
+
constructor(innerSchemas: [SchemaValidator<A>, ...SchemaValidator<B[number]>[]], schema: UnionSchemaDefinition<A, B>);
|
|
14
|
+
[test](value: unknown, options: DefinedValidationOptions, path: JsonPath): ValidationTestResult<UnionSchemaOutput<A, B>>;
|
|
15
|
+
protected [testAsync](value: unknown, options: DefinedValidationOptions, path: JsonPath): Promise<ValidationTestResult<UnionSchemaOutput<A, B>>>;
|
|
16
|
+
}
|
|
17
|
+
export declare function union<A extends SchemaValidator, B extends SchemaValidator[]>(schemas: [A, ...B], options?: SchemaOptions<UnionSchemaDefinition<A['schema'], B[number]['schema'][]>, 'schemas'>): UnionSchemaValidator<A['schema'], B[number]['schema'][]>;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.union = exports.UnionSchemaValidator = void 0;
|
|
4
|
+
const schema_error_1 = require("../schema.error");
|
|
5
|
+
const schema_validator_1 = require("../schema.validator");
|
|
6
|
+
const types_1 = require("../types");
|
|
7
|
+
class UnionSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
8
|
+
constructor(innerSchemas, schema) {
|
|
9
|
+
super(schema);
|
|
10
|
+
this.innerSchemas = innerSchemas;
|
|
11
|
+
this.innerSchemaTypesString = this.innerSchemas.map((innerSchema) => innerSchema.schema.type).join(', ');
|
|
12
|
+
}
|
|
13
|
+
[schema_validator_1.test](value, options, path) {
|
|
14
|
+
for (const schema of this.innerSchemas) {
|
|
15
|
+
const result = schema.test(value, options);
|
|
16
|
+
if (result.valid) {
|
|
17
|
+
return result;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return { valid: false, error: new schema_error_1.SchemaError(`Value did not match any of the allowed schemas (${this.innerSchemaTypesString}).`, { path }) };
|
|
21
|
+
}
|
|
22
|
+
async [schema_validator_1.testAsync](value, options, path) {
|
|
23
|
+
for (const schema of this.innerSchemas) {
|
|
24
|
+
const result = await schema.testAsync(value, options);
|
|
25
|
+
if (result.valid) {
|
|
26
|
+
return result;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return { valid: false, error: new schema_error_1.SchemaError(`Value did not match any of the allowed schemas (${this.innerSchemaTypesString}).`, { path }) };
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.UnionSchemaValidator = UnionSchemaValidator;
|
|
33
|
+
function union(schemas, options) {
|
|
34
|
+
const schema = (0, types_1.schemaHelper)(Object.assign({ type: 'union', schemas: schemas.map((innerSchema) => innerSchema.schema) }, options));
|
|
35
|
+
return new UnionSchemaValidator(schemas, schema);
|
|
36
|
+
}
|
|
37
|
+
exports.union = union;
|
|
38
|
+
//# sourceMappingURL=union.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,oBAA+E,SAAQ,kCAA4C;IAI9I,YAAY,YAAmE,EAAE,MAAmC;QAClH,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3G,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAEhE,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChJ,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAE3E,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChJ,CAAC;CACF;AAlCD,oDAkCC;AAED,SAAgB,KAAK,CAAyD,OAAkB,EAAE,OAA6F;IAC7L,MAAM,MAAM,GAAG,IAAA,oBAAY,kBACzB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAuC,IAC5F,OAAO,EACV,CAAC;IAEH,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AARD,sBAQC"}
|
package/utils/cryptography.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export interface DigestResult extends CryptionResult {
|
|
|
30
30
|
export interface SignResult extends CryptionResult {
|
|
31
31
|
}
|
|
32
32
|
export declare const deriveBits: (algorithm: AlgorithmIdentifier | Pbkdf2Params | EcdhKeyDeriveParams | HkdfParams, baseKey: CryptoKey, length: number) => Promise<ArrayBuffer>;
|
|
33
|
-
export declare const deriveKey: (algorithm: AlgorithmIdentifier | Pbkdf2Params | EcdhKeyDeriveParams | HkdfParams, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | Pbkdf2Params |
|
|
33
|
+
export declare const deriveKey: (algorithm: AlgorithmIdentifier | Pbkdf2Params | EcdhKeyDeriveParams | HkdfParams, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | Pbkdf2Params | HkdfParams | AesDerivedKeyParams | HmacImportParams, extractable: boolean, keyUsages: KeyUsage[]) => Promise<CryptoKey>;
|
|
34
34
|
export declare const exportKey: {
|
|
35
35
|
(format: "jwk", key: CryptoKey): Promise<JsonWebKey>;
|
|
36
36
|
(format: "raw" | "pkcs8" | "spki", key: CryptoKey): Promise<ArrayBuffer>;
|
|
@@ -41,10 +41,10 @@ export declare const generateKey: {
|
|
|
41
41
|
(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey | CryptoKeyPair>;
|
|
42
42
|
};
|
|
43
43
|
export declare const importKey: {
|
|
44
|
-
(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier |
|
|
45
|
-
(format: "raw" | "pkcs8" | "spki", keyData: BufferSource, algorithm: AlgorithmIdentifier |
|
|
44
|
+
(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | HmacImportParams | RsaHashedImportParams | EcKeyImportParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
|
|
45
|
+
(format: "raw" | "pkcs8" | "spki", keyData: BufferSource, algorithm: AlgorithmIdentifier | HmacImportParams | RsaHashedImportParams | EcKeyImportParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
|
|
46
46
|
};
|
|
47
|
-
export declare const unwrapKey: (format: KeyFormat, wrappedKey: BufferSource, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams, unwrappedKeyAlgorithm: AlgorithmIdentifier |
|
|
47
|
+
export declare const unwrapKey: (format: KeyFormat, wrappedKey: BufferSource, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | HmacImportParams | RsaHashedImportParams | EcKeyImportParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]) => Promise<CryptoKey>;
|
|
48
48
|
export declare const wrapKey: (format: KeyFormat, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams) => Promise<ArrayBuffer>;
|
|
49
49
|
/**
|
|
50
50
|
* encrypt data
|
package/utils/cryptography.js
CHANGED
|
@@ -22,13 +22,13 @@ catch (error) {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
/* eslint-disable */
|
|
25
|
-
exports.deriveBits = subtle === null || subtle === void 0 ? void 0 : subtle.deriveBits;
|
|
26
|
-
exports.deriveKey = subtle === null || subtle === void 0 ? void 0 : subtle.deriveKey;
|
|
27
|
-
exports.exportKey = subtle === null || subtle === void 0 ? void 0 : subtle.exportKey;
|
|
28
|
-
exports.generateKey = subtle === null || subtle === void 0 ? void 0 : subtle.generateKey;
|
|
29
|
-
exports.importKey = subtle === null || subtle === void 0 ? void 0 : subtle.importKey;
|
|
30
|
-
exports.unwrapKey = subtle === null || subtle === void 0 ? void 0 : subtle.unwrapKey;
|
|
31
|
-
exports.wrapKey = subtle === null || subtle === void 0 ? void 0 : subtle.wrapKey;
|
|
25
|
+
exports.deriveBits = subtle === null || subtle === void 0 ? void 0 : subtle.deriveBits.bind(subtle);
|
|
26
|
+
exports.deriveKey = subtle === null || subtle === void 0 ? void 0 : subtle.deriveKey.bind(subtle);
|
|
27
|
+
exports.exportKey = subtle === null || subtle === void 0 ? void 0 : subtle.exportKey.bind(subtle);
|
|
28
|
+
exports.generateKey = subtle === null || subtle === void 0 ? void 0 : subtle.generateKey.bind(subtle);
|
|
29
|
+
exports.importKey = subtle === null || subtle === void 0 ? void 0 : subtle.importKey.bind(subtle);
|
|
30
|
+
exports.unwrapKey = subtle === null || subtle === void 0 ? void 0 : subtle.unwrapKey.bind(subtle);
|
|
31
|
+
exports.wrapKey = subtle === null || subtle === void 0 ? void 0 : subtle.wrapKey.bind(subtle);
|
|
32
32
|
/* eslint-enable */
|
|
33
33
|
/**
|
|
34
34
|
* encrypt data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptography.js","sourceRoot":"","sources":["../../source/utils/cryptography.ts"],"names":[],"mappings":";;;;AAEA,qCAAyD;AACzD,yCAA+D;AAC/D,qCAA0C;AAC1C,+CAAiE;AACjE,yCAA2C;AAsC3C,IAAI,MAAoB,CAAC;AAEzB,IAAI;IACF,uEAAuE;IACvE,MAAM,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,0CAAE,MAAM,CAAC;IAEpC,IAAI,IAAA,yBAAW,EAAC,MAAM,CAAC,EAAE;QACvB,mCAAmC;QACnC,MAAM,GAAK,IAAI,CAAC,qBAAqB,CAAuB,CAAC,SAA6C,CAAC,MAAM,CAAC;KACnH;CACF;AACD,OAAO,KAAc,EAAE;IACrB,IAAI,IAAA,yBAAW,EAAC,MAAO,CAAC,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;KACpE;CACF;AAED,oBAAoB;AACP,QAAA,UAAU,GAAI,MAAoC,aAApC,MAAM,uBAAN,MAAM,CAAgC,
|
|
1
|
+
{"version":3,"file":"cryptography.js","sourceRoot":"","sources":["../../source/utils/cryptography.ts"],"names":[],"mappings":"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"}
|