@tstdl/base 0.82.5 → 0.82.6
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/examples/mail/templates/hello-name.js +1 -1
- package/examples/mail/templates/hello-name.js.map +1 -1
- package/examples/pdf/templates/hello-name.js +1 -1
- package/examples/pdf/templates/hello-name.js.map +1 -1
- package/examples/template/templates/hello-jsx.js +1 -1
- package/examples/template/templates/hello-jsx.js.map +1 -1
- package/examples/template/templates/hello-name.js +1 -1
- package/examples/template/templates/hello-name.js.map +1 -1
- package/mail/mail.service.d.ts +4 -3
- package/mail/mail.service.js +5 -8
- package/mail/mail.service.js.map +1 -1
- package/mail/models/mail-log.model.d.ts +1 -1
- package/mail/models/mail-template.model.d.ts +1 -1
- package/mail/models/mail-template.model.js +2 -1
- package/mail/models/mail-template.model.js.map +1 -1
- package/package.json +4 -4
- package/pdf/pdf.service.d.ts +5 -4
- package/pdf/pdf.service.js +7 -6
- package/pdf/pdf.service.js.map +1 -1
- package/templates/providers/file.template-provider.d.ts +1 -1
- package/templates/providers/file.template-provider.js +1 -1
- package/templates/providers/file.template-provider.js.map +1 -1
- package/templates/providers/memory.template-provider.d.ts +1 -1
- package/templates/providers/memory.template-provider.js +1 -1
- package/templates/providers/memory.template-provider.js.map +1 -1
- package/templates/template.model.d.ts +3 -1
- package/templates/template.model.js +8 -1
- package/templates/template.model.js.map +1 -1
- package/templates/template.provider.d.ts +1 -1
- package/templates/template.renderer.d.ts +3 -2
- package/templates/template.renderer.js.map +1 -1
- package/templates/template.service.d.ts +3 -2
- package/templates/template.service.js +6 -1
- package/templates/template.service.js.map +1 -1
|
@@ -7,7 +7,7 @@ const string_template_resolver_1 = require("../../../templates/resolvers/string.
|
|
|
7
7
|
function HelloMail({ name }) {
|
|
8
8
|
return ((0, jsx_runtime_1.jsx)("mjml", { children: (0, jsx_runtime_1.jsx)("mj-body", { children: (0, jsx_runtime_1.jsx)("mj-section", { children: (0, jsx_runtime_1.jsx)("mj-column", { children: (0, jsx_runtime_1.jsxs)("mj-text", { "font-size": "20px", color: "#F45E43", "font-family": "helvetica", children: ["Hello ", name, " in html!"] }) }) }) }) }));
|
|
9
9
|
}
|
|
10
|
-
const template = (0, mail_1.mailTemplate)({
|
|
10
|
+
const template = (0, mail_1.mailTemplate)('hello-name', {
|
|
11
11
|
subject: (0, string_template_resolver_1.stringTemplateField)({ renderer: 'handlebars', template: 'Hello {{ name }} in subject!' }),
|
|
12
12
|
html: (0, jsx_template_resolver_1.jsxTemplateField)({ renderer: 'mjml-jsx', template: HelloMail }),
|
|
13
13
|
text: (0, string_template_resolver_1.stringTemplateField)({ renderer: 'handlebars', template: 'Hello {{ name }} in text!' })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/mail/templates/hello-name.tsx"],"names":[],"mappings":";;;AAAA,wCAAsC;AAGtC,8FAA+E;AAC/E,oGAAqF;AAGrF,SAAS,SAAS,CAAC,EAAE,IAAI,EAAoB;IAC3C,OAAO,CACL,2CACE,8CACE,iDACE,gDACE,kDAAmB,MAAM,EAAC,KAAK,EAAC,SAAS,iBAAa,WAAW,uBAAQ,IAAI,iBAAoB,GACvF,GACD,GACL,GACL,CACR,CAAC;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC;
|
|
1
|
+
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/mail/templates/hello-name.tsx"],"names":[],"mappings":";;;AAAA,wCAAsC;AAGtC,8FAA+E;AAC/E,oGAAqF;AAGrF,SAAS,SAAS,CAAC,EAAE,IAAI,EAAoB;IAC3C,OAAO,CACL,2CACE,8CACE,iDACE,gDACE,kDAAmB,MAAM,EAAC,KAAK,EAAC,SAAS,iBAAa,WAAW,uBAAQ,IAAI,iBAAoB,GACvF,GACD,GACL,GACL,CACR,CAAC;AACJ,CAAC;AAED,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC,YAAY,EAAE;IAC1C,OAAO,EAAE,IAAA,8CAAmB,EAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,8BAA8B,EAAE,CAAC;IAC9H,IAAI,EAAE,IAAA,wCAAgB,EAAuB,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3F,IAAI,EAAE,IAAA,8CAAmB,EAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,2BAA2B,EAAE,CAAC;CACzH,CAAC,CAAC;AAEH,kBAAe,QAAQ,CAAC"}
|
|
@@ -7,7 +7,7 @@ const path_1 = require("path");
|
|
|
7
7
|
function reverse(value) {
|
|
8
8
|
return value.split('').reverse().join('');
|
|
9
9
|
}
|
|
10
|
-
const template = (0, pdf_1.pdfTemplate)({
|
|
10
|
+
const template = (0, pdf_1.pdfTemplate)('hello-name', {
|
|
11
11
|
body: (0, file_template_resolver_1.fileTemplateField)({
|
|
12
12
|
renderer: 'handlebars',
|
|
13
13
|
templateFile: (0, path_1.resolve)(__dirname.replace('dist', 'source'), 'hello-name.hbs'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/pdf/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AAGpC,gGAAiF;AACjF,oGAAqF;AACrF,+BAA+B;AAE/B,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAQ,KAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,QAAQ,GAAG,IAAA,iBAAW,EAAC;
|
|
1
|
+
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/pdf/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AAGpC,gGAAiF;AACjF,oGAAqF;AACrF,+BAA+B;AAE/B,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAQ,KAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,QAAQ,GAAG,IAAA,iBAAW,EAAC,YAAY,EAAE;IACzC,IAAI,EAAE,IAAA,0CAAiB,EAA6B;QAClD,QAAQ,EAAE,YAAY;QACtB,YAAY,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,gBAAgB,CAAC;QAC5E,OAAO,EAAE;YACP,QAAQ,EAAE;gBACR,QAAQ,EAAE,IAAA,8CAAmB,EAA6B;oBACxD,QAAQ,EAAE,YAAY;oBACtB,QAAQ,EAAE,6BAA6B;oBACvC,OAAO,EAAE;wBACP,OAAO,EAAE,EAAE,OAAO,EAAE;qBACrB;iBACF,CAAC;aACH;SACF;KACF,CAAC;IACF,MAAM,EAAE,IAAA,8CAAmB,EAAyB;QAClD,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,uBAAuB;KAClC,CAAC;IACF,MAAM,EAAE,IAAA,8CAAmB,EAAyB;QAClD,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,uBAAuB;KAClC,CAAC;CACH,CAAC,CAAC;AAEH,kBAAe,QAAQ,CAAC"}
|
|
@@ -7,7 +7,7 @@ const jsx_template_resolver_1 = require("../../../templates/resolvers/jsx.templa
|
|
|
7
7
|
function HelloJsx({ name }) {
|
|
8
8
|
return (0, jsx_runtime_1.jsxs)("h1", { children: ["Hello ", name, "!"] });
|
|
9
9
|
}
|
|
10
|
-
exports.template = (0, templates_1.simpleTemplate)((0, jsx_template_resolver_1.jsxTemplateField)({
|
|
10
|
+
exports.template = (0, templates_1.simpleTemplate)('hello-jsx', (0, jsx_template_resolver_1.jsxTemplateField)({
|
|
11
11
|
renderer: 'jsx',
|
|
12
12
|
template: HelloJsx
|
|
13
13
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hello-jsx.js","sourceRoot":"","sources":["../../../../source/examples/template/templates/hello-jsx.tsx"],"names":[],"mappings":";;;;AAAA,kDAA6C;AAE7C,8FAA+E;AAG/E,SAAS,QAAQ,CAAC,EAAE,IAAI,EAAoB;IAC1C,OAAO,qDAAW,IAAI,SAAO,CAAC;AAChC,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAA,0BAAc,
|
|
1
|
+
{"version":3,"file":"hello-jsx.js","sourceRoot":"","sources":["../../../../source/examples/template/templates/hello-jsx.tsx"],"names":[],"mappings":";;;;AAAA,kDAA6C;AAE7C,8FAA+E;AAG/E,SAAS,QAAQ,CAAC,EAAE,IAAI,EAAoB;IAC1C,OAAO,qDAAW,IAAI,SAAO,CAAC;AAChC,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAA,0BAAc,EAAC,WAAW,EAChD,IAAA,wCAAgB,EAAsB;IACpC,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,QAAQ;CACnB,CAAC,CACH,CAAC;AAEF,kBAAe,gBAAQ,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const templates_1 = require("../../../templates");
|
|
4
4
|
const string_template_resolver_1 = require("../../../templates/resolvers/string.template-resolver");
|
|
5
5
|
const type_guards_1 = require("../../../utils/type-guards");
|
|
6
|
-
const template = (0, templates_1.simpleTemplate)((0, string_template_resolver_1.stringTemplateField)({
|
|
6
|
+
const template = (0, templates_1.simpleTemplate)('hello-name', (0, string_template_resolver_1.stringTemplateField)({
|
|
7
7
|
renderer: 'handlebars',
|
|
8
8
|
template: '{{#fooBlockHelper this "A test argument"}}{{>fooPartial hobby="Music" }}{{/fooBlockHelper}}',
|
|
9
9
|
options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/template/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,kDAA6C;AAE7C,oGAAqF;AACrF,4DAAqD;AAErD,MAAM,QAAQ,GAAG,IAAA,0BAAc,
|
|
1
|
+
{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/template/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,kDAA6C;AAE7C,oGAAqF;AACrF,4DAAqD;AAErD,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,YAAY,EAC1C,IAAA,8CAAmB,EAA6B;IAC9C,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,6FAA6F;IACvG,OAAO,EAAE;QACP,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACzC,IAAA,4BAAc,EAAC,OAAO,CAAC,EAAE,EAAE,kDAAkD,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBAExC,OAAO,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACtC,CAAC;SACF;QACD,QAAQ,EAAE;YACR,UAAU,EAAE,IAAA,8CAAmB,EAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,qDAAqD,EAAE,CAAC;SACzJ;KACF;CACF,CAAC,CACH,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
|
package/mail/mail.service.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { TemplateService } from "../templates";
|
|
|
3
3
|
import type { TypedOmit } from "../types";
|
|
4
4
|
import { MailLogRepository } from './mail-log.repository';
|
|
5
5
|
import { MailClient } from './mail.client';
|
|
6
|
-
import type { MailData, MailSendResult } from './models';
|
|
6
|
+
import type { MailData, MailSendResult, MailTemplate } from './models';
|
|
7
7
|
import { DefaultMailData } from './models';
|
|
8
8
|
export declare class MailService {
|
|
9
9
|
private readonly mailClient;
|
|
@@ -11,8 +11,9 @@ export declare class MailService {
|
|
|
11
11
|
private readonly mailLogRepository;
|
|
12
12
|
private readonly defaultData;
|
|
13
13
|
private readonly logger;
|
|
14
|
-
private readonly mailDataSourceTemplateKey;
|
|
15
14
|
constructor(mailClient: MailClient, templateService: TemplateService, mailLogRepository: MailLogRepository | undefined, logger: Logger, defaultData?: DefaultMailData);
|
|
16
15
|
send(mailData: MailData): Promise<MailSendResult>;
|
|
17
|
-
|
|
16
|
+
/** @deprecated internal */
|
|
17
|
+
send(mailData: MailData, templateName?: string): Promise<MailSendResult>;
|
|
18
|
+
sendTemplate(keyOrTemplate: string | MailTemplate, mailData: TypedOmit<MailData, 'content' | 'subject'>, templateContext?: object): Promise<MailSendResult>;
|
|
18
19
|
}
|
package/mail/mail.service.js
CHANGED
|
@@ -29,22 +29,20 @@ let MailService = MailService_1 = class MailService {
|
|
|
29
29
|
mailLogRepository;
|
|
30
30
|
defaultData;
|
|
31
31
|
logger;
|
|
32
|
-
mailDataSourceTemplateKey;
|
|
33
32
|
constructor(mailClient, templateService, mailLogRepository, logger, defaultData = {}) {
|
|
34
33
|
this.mailClient = mailClient;
|
|
35
34
|
this.templateService = templateService;
|
|
36
35
|
this.mailLogRepository = mailLogRepository;
|
|
37
36
|
this.defaultData = defaultData;
|
|
38
37
|
this.logger = logger;
|
|
39
|
-
this.mailDataSourceTemplateKey = new WeakMap();
|
|
40
38
|
}
|
|
41
|
-
async send(mailData) {
|
|
39
|
+
async send(mailData, templateName) {
|
|
42
40
|
const data = { ...this.defaultData, ...mailData };
|
|
43
41
|
let mailLog;
|
|
44
42
|
if ((0, type_guards_1.isDefined)(this.mailLogRepository)) {
|
|
45
43
|
const log = {
|
|
46
44
|
timestamp: (0, date_time_1.currentTimestamp)(),
|
|
47
|
-
|
|
45
|
+
template: templateName ?? null,
|
|
48
46
|
data,
|
|
49
47
|
sendResult: null,
|
|
50
48
|
errors: null
|
|
@@ -70,11 +68,10 @@ let MailService = MailService_1 = class MailService {
|
|
|
70
68
|
throw error;
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
|
-
async sendTemplate(
|
|
74
|
-
const { fields: { subject, html, text } } = await this.templateService.render(
|
|
71
|
+
async sendTemplate(keyOrTemplate, mailData, templateContext) {
|
|
72
|
+
const { name, fields: { subject, html, text } } = await this.templateService.render(keyOrTemplate, templateContext);
|
|
75
73
|
const fullMailData = { ...mailData, subject, content: { html, text } };
|
|
76
|
-
this.
|
|
77
|
-
return this.send(fullMailData);
|
|
74
|
+
return this.send(fullMailData, name);
|
|
78
75
|
}
|
|
79
76
|
};
|
|
80
77
|
MailService = MailService_1 = __decorate([
|
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;AAG3C,qCAA6C;
|
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../source/mail/mail.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { MailData } from './mail-data.model';
|
|
|
3
3
|
import type { MailSendResult } from './mail-send-result.model';
|
|
4
4
|
export type MailLog = Entity & {
|
|
5
5
|
timestamp: number;
|
|
6
|
-
|
|
6
|
+
template: string | null;
|
|
7
7
|
data: MailData;
|
|
8
8
|
sendResult: MailSendResult | null;
|
|
9
9
|
errors: string[] | null;
|
|
@@ -4,7 +4,7 @@ export type MailTemplate = Template<{
|
|
|
4
4
|
html: false;
|
|
5
5
|
text: false;
|
|
6
6
|
}, undefined>;
|
|
7
|
-
export declare function mailTemplate(fields: {
|
|
7
|
+
export declare function mailTemplate(name: string, fields: {
|
|
8
8
|
subject?: TemplateField;
|
|
9
9
|
html?: TemplateField;
|
|
10
10
|
text?: TemplateField;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail-template.model.js","sourceRoot":"","sources":["../../../source/mail/models/mail-template.model.ts"],"names":[],"mappings":";;;AAIA,SAAgB,YAAY,CAAC,MAA+E;
|
|
1
|
+
{"version":3,"file":"mail-template.model.js","sourceRoot":"","sources":["../../../source/mail/models/mail-template.model.ts"],"names":[],"mappings":";;;AAIA,SAAgB,YAAY,CAAC,IAAY,EAAE,MAA+E;IACxH,OAAO;QACL,IAAI;QACJ,MAAM;KACP,CAAC;AACJ,CAAC;AALD,oCAKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.82.
|
|
3
|
+
"version": "0.82.6",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"@elastic/elasticsearch": "^8.6",
|
|
41
41
|
"@koa/router": "^12.0",
|
|
42
|
-
"@tstdl/angular": "^0.82
|
|
42
|
+
"@tstdl/angular": "^0.82",
|
|
43
43
|
"chroma-js": "^2.4",
|
|
44
44
|
"got": "^12.5",
|
|
45
45
|
"handlebars": "^4.7",
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
"mjml": "^4.13",
|
|
50
50
|
"mongodb": "5.0",
|
|
51
51
|
"nodemailer": "^6.9",
|
|
52
|
-
"preact-render-to-string": "^5.2
|
|
53
|
-
"preact": "^10.11
|
|
52
|
+
"preact-render-to-string": "^5.2",
|
|
53
|
+
"preact": "^10.11",
|
|
54
54
|
"puppeteer": "^19.6",
|
|
55
55
|
"undici": "^5.18",
|
|
56
56
|
"urlpattern-polyfill": "^6.0"
|
package/pdf/pdf.service.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { AfterResolve,
|
|
1
|
+
import type { AfterResolve, Injectable } from "../container";
|
|
2
|
+
import { afterResolve, resolveArgumentType } from "../container";
|
|
2
3
|
import type { AsyncDisposable } from "../disposable/disposable";
|
|
3
4
|
import { disposeAsync } from "../disposable/disposable";
|
|
4
5
|
import { Logger } from "../logger";
|
|
@@ -100,7 +101,7 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
|
|
|
100
101
|
* @param options additional options, overwrites options specified in template
|
|
101
102
|
* @returns pdf bytes
|
|
102
103
|
*/
|
|
103
|
-
renderTemplateStream(
|
|
104
|
+
renderTemplateStream(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
|
|
104
105
|
/**
|
|
105
106
|
* Renders a template to pdf
|
|
106
107
|
* @param key template key
|
|
@@ -108,11 +109,11 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
|
|
|
108
109
|
* @param options additional options, overwrites options specified in template
|
|
109
110
|
* @returns pdf bytes
|
|
110
111
|
*/
|
|
111
|
-
renderTemplate(
|
|
112
|
+
renderTemplate(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfRenderOptions): Promise<Uint8Array>;
|
|
112
113
|
private renderStream;
|
|
113
114
|
private convertOptions;
|
|
114
115
|
}
|
|
115
|
-
export declare function pdfTemplate(fields: {
|
|
116
|
+
export declare function pdfTemplate(name: string, fields: {
|
|
116
117
|
body: TemplateField;
|
|
117
118
|
header?: TemplateField;
|
|
118
119
|
footer?: TemplateField;
|
package/pdf/pdf.service.js
CHANGED
|
@@ -222,9 +222,9 @@ let PdfService = class PdfService {
|
|
|
222
222
|
* @param options additional options, overwrites options specified in template
|
|
223
223
|
* @returns pdf bytes
|
|
224
224
|
*/
|
|
225
|
-
renderTemplateStream(
|
|
225
|
+
renderTemplateStream(keyOrTemplate, templateContext, options) {
|
|
226
226
|
return this.renderStream(async (page) => {
|
|
227
|
-
const { fields: { header, body, footer }, options: optionsFromTemplate } = await this.templateService.render(
|
|
227
|
+
const { fields: { header, body, footer }, options: optionsFromTemplate } = await this.templateService.render(keyOrTemplate, templateContext);
|
|
228
228
|
await page.setContent(body, { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load', ...options });
|
|
229
229
|
return { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, ...options };
|
|
230
230
|
}, options);
|
|
@@ -236,8 +236,8 @@ let PdfService = class PdfService {
|
|
|
236
236
|
* @param options additional options, overwrites options specified in template
|
|
237
237
|
* @returns pdf bytes
|
|
238
238
|
*/
|
|
239
|
-
async renderTemplate(
|
|
240
|
-
const stream = this.renderTemplateStream(
|
|
239
|
+
async renderTemplate(keyOrTemplate, templateContext, options) {
|
|
240
|
+
const stream = this.renderTemplateStream(keyOrTemplate, templateContext, options);
|
|
241
241
|
return (0, stream_reader_1.readBinaryStream)(stream);
|
|
242
242
|
}
|
|
243
243
|
renderStream(handler, options = {}) {
|
|
@@ -253,7 +253,7 @@ let PdfService = class PdfService {
|
|
|
253
253
|
throw error;
|
|
254
254
|
}
|
|
255
255
|
if ((0, type_guards_1.isDefined)(options.language)) {
|
|
256
|
-
page.setExtraHTTPHeaders({ 'Accept-Language': options.language });
|
|
256
|
+
await page.setExtraHTTPHeaders({ 'Accept-Language': options.language });
|
|
257
257
|
}
|
|
258
258
|
const timeoutRef = setTimeout(() => void page.close().catch((error) => this.logger.error(error)), (options.timeout ?? units_1.millisecondsPerMinute));
|
|
259
259
|
const optionsFromHandler = await handler(page) ?? {};
|
|
@@ -313,8 +313,9 @@ PdfService = __decorate([
|
|
|
313
313
|
__metadata("design:paramtypes", [templates_1.TemplateService, logger_1.Logger, Object])
|
|
314
314
|
], PdfService);
|
|
315
315
|
exports.PdfService = PdfService;
|
|
316
|
-
function pdfTemplate(fields, options) {
|
|
316
|
+
function pdfTemplate(name, fields, options) {
|
|
317
317
|
return {
|
|
318
|
+
name,
|
|
318
319
|
fields,
|
|
319
320
|
options
|
|
320
321
|
};
|
package/pdf/pdf.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,6 @@ export declare class FileTemplateProvider extends TemplateProvider implements In
|
|
|
11
11
|
private readonly basePath;
|
|
12
12
|
readonly [resolveArgumentType]: FileTemplateProviderArgument;
|
|
13
13
|
constructor(basePath: string);
|
|
14
|
-
get(key: string): Promise<
|
|
14
|
+
get<T extends Template = Template>(key: string): Promise<T>;
|
|
15
15
|
}
|
|
16
16
|
export declare function configureFileTemplateProvider(config?: Partial<FileTemplateProviderConfig>): void;
|
|
@@ -38,7 +38,7 @@ let FileTemplateProvider = class FileTemplateProvider extends template_provider_
|
|
|
38
38
|
throw new bad_request_error_1.BadRequestError(`Illegal file path. Must be inside "${this.basePath}".`);
|
|
39
39
|
}
|
|
40
40
|
const templateModule = await (_a = filePath, Promise.resolve().then(() => require(_a)));
|
|
41
|
-
const fileContent = templateModule.default;
|
|
41
|
+
const fileContent = templateModule.template ?? templateModule.default;
|
|
42
42
|
return schema_1.Schema.parse(template_model_1.Template, fileContent);
|
|
43
43
|
}
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.template-provider.js","sourceRoot":"","sources":["../../../source/templates/providers/file.template-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAwE;AACxE,qEAA4D;AAC5D,yCAAkC;AAClC,6BAA6B;AAC7B,sDAA6C;AAC7C,4DAAwD;AAQ3C,QAAA,0BAA0B,GAA+B,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,aAAa,CAAC;AAK1B,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,oCAAgB;IACvC,QAAQ,CAAS;IAEzB,CAAC,+BAAmB,CAAC,CAA+B;IAC7D,YAAyB,QAAgB;QACvC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"file.template-provider.js","sourceRoot":"","sources":["../../../source/templates/providers/file.template-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+CAAwE;AACxE,qEAA4D;AAC5D,yCAAkC;AAClC,6BAA6B;AAC7B,sDAA6C;AAC7C,4DAAwD;AAQ3C,QAAA,0BAA0B,GAA+B,EAAE,CAAC;AAEzE,MAAM,UAAU,GAAG,aAAa,CAAC;AAK1B,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,oCAAgB;IACvC,QAAQ,CAAS;IAEzB,CAAC,+BAAmB,CAAC,CAA+B;IAC7D,YAAyB,QAAgB;QACvC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,GAAG,CAAgC,GAAW;;QAClD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,IAAI,mCAAe,CAAC,gEAAgE,CAAC,CAAC;SAC7F;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,GAAG,KAAK,CAAC,CAAC;QAE1D,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACvC,MAAM,IAAI,mCAAe,CAAC,sCAAsC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;SACpF;QAED,MAAM,cAAc,GAAG,YAAa,QAAQ,4CAA8C,CAAC;QAC3F,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,OAAO,CAAC;QAEtE,OAAO,eAAM,CAAC,KAAK,CAAC,yBAAQ,EAAE,WAAW,CAAM,CAAC;IAClD,CAAC;CACF,CAAA;AA1BY,oBAAoB;IAHhC,IAAA,qBAAS,EAAC;QACT,uBAAuB,EAAE,GAAG,EAAE,CAAC,kCAA0B,CAAC,QAAQ;KACnE,CAAC;IAKa,WAAA,IAAA,qBAAS,GAAE,CAAA;;GAJb,oBAAoB,CA0BhC;AA1BY,oDAAoB;AA4BjC,SAAgB,6BAA6B,CAAC,SAA8C,EAAE;IAC5F,kCAA0B,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,kCAA0B,CAAC,QAAQ,CAAC;AAC/F,CAAC;AAFD,sEAEC"}
|
|
@@ -22,7 +22,7 @@ let MemoryTemplateProvider = class MemoryTemplateProvider extends template_provi
|
|
|
22
22
|
add(key, template) {
|
|
23
23
|
this.map.set(key, template);
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
get(key) {
|
|
26
26
|
const template = this.map.get(key);
|
|
27
27
|
if ((0, type_guards_1.isUndefined)(template)) {
|
|
28
28
|
throw new Error(`Template ${key} not available.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.template-provider.js","sourceRoot":"","sources":["../../../source/templates/providers/memory.template-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,yDAAkD;AAElD,4DAAwD;AAGjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oCAAgB;IACzC,GAAG,CAAwB;IAE5C;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,QAAkB;QACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"memory.template-provider.js","sourceRoot":"","sources":["../../../source/templates/providers/memory.template-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,yDAAkD;AAElD,4DAAwD;AAGjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oCAAgB;IACzC,GAAG,CAAwB;IAE5C;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,QAAkB;QACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,IAAA,yBAAW,EAAC,QAAQ,CAAC,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;SACnD;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AAtBY,sBAAsB;IADlC,IAAA,qBAAS,GAAE;;GACC,sBAAsB,CAsBlC;AAtBY,wDAAsB"}
|
|
@@ -10,7 +10,9 @@ export type TemplateFields<Fields extends Record<string, boolean>, Resolver exte
|
|
|
10
10
|
[P in keyof PickBy<Fields, false>]?: TemplateField<Resolver, Renderer, Options>;
|
|
11
11
|
}>;
|
|
12
12
|
export declare abstract class Template<Fields extends Record<string, boolean> = Record<string, boolean>, TemplateOptions = any> {
|
|
13
|
+
/** name of template */
|
|
14
|
+
name: string;
|
|
13
15
|
fields: TemplateFields<Fields>;
|
|
14
16
|
options?: TemplateOptions;
|
|
15
17
|
}
|
|
16
|
-
export declare function simpleTemplate(template: TemplateField): Template;
|
|
18
|
+
export declare function simpleTemplate(name: string, template: TemplateField): Template;
|
|
@@ -34,9 +34,15 @@ TemplateField = __decorate([
|
|
|
34
34
|
], TemplateField);
|
|
35
35
|
exports.TemplateField = TemplateField;
|
|
36
36
|
class Template {
|
|
37
|
+
/** name of template */
|
|
38
|
+
name;
|
|
37
39
|
fields;
|
|
38
40
|
options;
|
|
39
41
|
}
|
|
42
|
+
__decorate([
|
|
43
|
+
(0, schema_1.Property)(),
|
|
44
|
+
__metadata("design:type", String)
|
|
45
|
+
], Template.prototype, "name", void 0);
|
|
40
46
|
__decorate([
|
|
41
47
|
(0, schema_1.Property)({ schema: (0, schema_1.object)({}, { allowUnknownProperties: TemplateField }) }),
|
|
42
48
|
__metadata("design:type", Object)
|
|
@@ -47,8 +53,9 @@ __decorate([
|
|
|
47
53
|
__metadata("design:type", Object)
|
|
48
54
|
], Template.prototype, "options", void 0);
|
|
49
55
|
exports.Template = Template;
|
|
50
|
-
function simpleTemplate(template) {
|
|
56
|
+
function simpleTemplate(name, template) {
|
|
51
57
|
return {
|
|
58
|
+
name,
|
|
52
59
|
fields: {
|
|
53
60
|
template
|
|
54
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.model.js","sourceRoot":"","sources":["../../source/templates/template.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAuE;AAIhE,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,QAAQ,CAAW;IAGnB,QAAQ,CAAW;IAInB,OAAO,CAAW;CACnB,CAAA;AATC;IAAC,IAAA,iBAAQ,GAAE;;+CACQ;AAEnB;IAAC,IAAA,iBAAQ,GAAE;;+CACQ;AAEnB;IAAC,IAAA,YAAG,GAAE;IACL,IAAA,iBAAQ,GAAE;;8CACO;AATP,aAAa;IADzB,IAAA,cAAK,EAAC,EAAE,sBAAsB,EAAE,IAAA,YAAG,GAAE,EAAE,CAAC;GAC5B,aAAa,CAUzB;AAVY,sCAAa;AAiB1B,MAAsB,QAAQ;
|
|
1
|
+
{"version":3,"file":"template.model.js","sourceRoot":"","sources":["../../source/templates/template.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAuE;AAIhE,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,QAAQ,CAAW;IAGnB,QAAQ,CAAW;IAInB,OAAO,CAAW;CACnB,CAAA;AATC;IAAC,IAAA,iBAAQ,GAAE;;+CACQ;AAEnB;IAAC,IAAA,iBAAQ,GAAE;;+CACQ;AAEnB;IAAC,IAAA,YAAG,GAAE;IACL,IAAA,iBAAQ,GAAE;;8CACO;AATP,aAAa;IADzB,IAAA,cAAK,EAAC,EAAE,sBAAsB,EAAE,IAAA,YAAG,GAAE,EAAE,CAAC;GAC5B,aAAa,CAUzB;AAVY,sCAAa;AAiB1B,MAAsB,QAAQ;IAC5B,uBAAuB;IAEvB,IAAI,CAAS;IAGb,MAAM,CAAyB;IAI/B,OAAO,CAAmB;CAC3B;AATC;IAAC,IAAA,iBAAQ,GAAE;;sCACE;AAEb;IAAC,IAAA,iBAAQ,EAAC,EAAE,MAAM,EAAE,IAAA,eAAM,EAAC,EAAE,EAAE,EAAE,sBAAsB,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;;wCAC7C;AAE/B;IAAC,IAAA,YAAG,GAAE;IACL,IAAA,iBAAQ,GAAE;;yCACe;AAV5B,4BAWC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,QAAuB;IAClE,OAAO;QACL,IAAI;QACJ,MAAM,EAAE;YACN,QAAQ;SACT;KACF,CAAC;AACJ,CAAC;AAPD,wCAOC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { SchemaTestable } from "../schema";
|
|
1
|
+
import type { SchemaTestable } from "../schema";
|
|
2
|
+
import type { Record } from "../types";
|
|
2
3
|
export type TemplateRenderResult = string;
|
|
3
4
|
export type TemplateRenderObject<Renderer extends string = string, Options = any, V = unknown> = {
|
|
4
5
|
renderer: Renderer;
|
|
5
6
|
template: V;
|
|
6
|
-
contextSchema?: SchemaTestable
|
|
7
|
+
contextSchema?: SchemaTestable<Record>;
|
|
7
8
|
options?: Options;
|
|
8
9
|
};
|
|
9
10
|
export type TemplateRendererString = typeof templateRendererString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.renderer.js","sourceRoot":"","sources":["../../source/templates/template.renderer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"template.renderer.js","sourceRoot":"","sources":["../../source/templates/template.renderer.ts"],"names":[],"mappings":";;;AACA,sCAAkC;AAElC,sDAAgD;AAiBhD,MAAsB,gBAAgB;IAC3B,CAAC,8BAAsB,CAAC,CAAW;IACnC,CAAC,+BAAuB,CAAC,CAAU;IAE5C,KAAK,CAAC,MAAM,CAAC,QAAiD,EAAE,OAAgB;QAC9E,MAAM,aAAa,GAAG,IAAA,uBAAS,EAAC,QAAQ,CAAC,aAAa,CAAC;YACrD,CAAC,CAAC,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;YAC/C,CAAC,CAAC,OAAO,CAAC;QAEZ,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC/C,CAAC;CAKF;AAfD,4CAeC"}
|
|
@@ -4,6 +4,7 @@ import { TemplateResolverProvider } from './template-resolver.provider';
|
|
|
4
4
|
import type { Template } from './template.model';
|
|
5
5
|
import { TemplateProvider } from './template.provider';
|
|
6
6
|
export type TemplateServiceRenderResult<T extends Template = Template> = {
|
|
7
|
+
name: string;
|
|
7
8
|
fields: Record<keyof T['fields'], string>;
|
|
8
9
|
options: T['options'];
|
|
9
10
|
};
|
|
@@ -12,6 +13,6 @@ export declare class TemplateService {
|
|
|
12
13
|
private readonly templateRendererProvider;
|
|
13
14
|
private readonly templateResolverProvider;
|
|
14
15
|
constructor(templateProvider: TemplateProvider | undefined, templateRendererProvider: TemplateRendererProvider, templateResolverProvider: TemplateResolverProvider);
|
|
15
|
-
|
|
16
|
-
render<T extends Template = Template>(
|
|
16
|
+
get<T extends Template = Template>(key: string): Promise<T>;
|
|
17
|
+
render<T extends Template = Template>(keyOrTemplate: string | T, templateContext?: object): Promise<TemplateServiceRenderResult<T>>;
|
|
17
18
|
}
|
|
@@ -29,9 +29,14 @@ let TemplateService = class TemplateService {
|
|
|
29
29
|
this.templateRendererProvider = templateRendererProvider;
|
|
30
30
|
this.templateResolverProvider = templateResolverProvider;
|
|
31
31
|
}
|
|
32
|
+
async get(key) {
|
|
33
|
+
const template = await this.templateProvider.get(key);
|
|
34
|
+
return template;
|
|
35
|
+
}
|
|
32
36
|
async render(keyOrTemplate, templateContext) {
|
|
33
|
-
const template = (0, type_guards_1.isString)(keyOrTemplate) ? await this.
|
|
37
|
+
const template = (0, type_guards_1.isString)(keyOrTemplate) ? await this.get(keyOrTemplate) : keyOrTemplate;
|
|
34
38
|
const result = {
|
|
39
|
+
name: template.name,
|
|
35
40
|
fields: {},
|
|
36
41
|
options: template.options
|
|
37
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.service.js","sourceRoot":"","sources":["../../source/templates/template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA0D;AAE1D,mDAAsD;AACtD,0CAAuC;AACvC,sDAA+C;AAC/C,6EAAwE;AACxE,6EAAwE;AAExE,2DAAuD;
|
|
1
|
+
{"version":3,"file":"template.service.js","sourceRoot":"","sources":["../../source/templates/template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA0D;AAE1D,mDAAsD;AACtD,0CAAuC;AACvC,sDAA+C;AAC/C,6EAAwE;AACxE,6EAAwE;AAExE,2DAAuD;AAShD,IAAM,eAAe,GAArB,MAAM,eAAe;IACT,gBAAgB,CAAmB;IACnC,wBAAwB,CAA2B;IACnD,wBAAwB,CAA2B;IAEpE,YACwC,gBAA8C,EACpF,wBAAkD,EAClD,wBAAkD;QAElD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,IAAA,cAAM,EAAC,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC,EAAE,CAAC;QAC5I,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,GAAG,CAAgC,GAAW;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtD,OAAO,QAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM,CAAgC,aAAyB,EAAE,eAAwB;QAC7F,MAAM,QAAQ,GAAG,IAAA,sBAAQ,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAEzF,MAAM,MAAM,GAAmC;YAC7C,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,EAAS;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC;QAEF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAA,sBAAa,EAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEnE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;YAE5I,MAAM,CAAC,MAAM,CAAC,GAAwB,CAAC,GAAG,YAAY,CAAC;SACxD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAzCY,eAAe;IAD3B,IAAA,qBAAS,GAAE;IAOP,WAAA,IAAA,oBAAQ,GAAE,CAAA;IAAE,WAAA,IAAA,kBAAM,EAAC,oCAAgB,CAAC,CAAA;6CACX,qDAAwB;QACxB,qDAAwB;GARzC,eAAe,CAyC3B;AAzCY,0CAAe"}
|