@tstdl/base 0.78.0-beta35 → 0.78.0-beta38

package/examples/mail/basic.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const container_1 = require("../../container");
 const mail_1 = require("../../mail");
 const nodemailer_mail_client_1 = require("../../mail/clients/nodemailer.mail-client");
-const file_mail_template_provider_1 = require("../../mail/template-providers/file-mail-template.provider");
-const handlebars_mail_template_renderer_1 = require("../../mail/template-renderers/handlebars.mail-template-renderer");
-const mjml_mail_template_renderer_1 = require("../../mail/template-renderers/mjml.mail-template-renderer");
+const templates_1 = require("../../templates");
+const file_provider_template_1 = require("../../templates/providers/file.provider-template");
+const handlebars_template_renderer_1 = require("../../templates/renderers/handlebars.template-renderer");
+const mjml_template_renderer_1 = require("../../templates/renderers/mjml.template-renderer");
+const file_template_resolver_1 = require("../../templates/resolvers/file.template-resolver");
 const config_parser_1 = require("../../utils/config-parser");
 const path_1 = require("path");
 const core_1 = require("../../core");
@@ -19,11 +21,14 @@ const core_1 = require("../../core");
             password: (0, config_parser_1.string)('PASS', 'password')
         }
     },
-    client: nodemailer_mail_client_1.NodemailerMailClient,
-    templateProvider: file_mail_template_provider_1.FileMailTemplateProvider,
-    templateRenderers: [mjml_mail_template_renderer_1.MjmlMailTemplateRenderer, handlebars_mail_template_renderer_1.HandlebarsMailTemplateRenderer]
+    client: nodemailer_mail_client_1.NodemailerMailClient
 });
-(0, file_mail_template_provider_1.configureFileMailTemplateProvider)({ basePath: (0, path_1.resolve)(__dirname.replace('/dist', '/source'), 'templates') });
+(0, templates_1.configureTemplates)({
+    templateProvider: file_provider_template_1.FileTemplateProvider,
+    templateRenderers: [mjml_template_renderer_1.MjmlTemplateRenderer, handlebars_template_renderer_1.HandlebarsTemplateRenderer]
+});
+(0, file_provider_template_1.configureFileTemplateProvider)({ basePath: (0, path_1.resolve)(__dirname, 'templates') });
+(0, file_template_resolver_1.configureFileTemplateResolver)({ basePath: (0, path_1.resolve)(__dirname.replace('/dist', '/source'), 'templates') });
 async function test() {
     const service = await container_1.container.resolveAsync(mail_1.MailService);
     const result = await service.sendTemplate('hello-name', { from: (0, config_parser_1.string)('FROM', (0, config_parser_1.string)('USER', 'user@example.com')), to: (0, config_parser_1.string)('TO', 'user@example.com') }, { name: 'Max Mustermann' });

package/examples/mail/basic.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/mail/basic.ts"],"names":[],"mappings":";;AAAA,+CAAwC;AACxC,qCAAoD;AACpD,sFAA6E;AAC7E,2GAAoI;AACpI,uHAA6G;AAC7G,2GAAiG;AACjG,6DAAwD;AACxD,+BAA+B;AAC/B,qCAA4C;AAE5C,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,oBAAa,EAAC;IACZ,YAAY,EAAE;QACZ,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,YAAY,CAAC;QAClC,IAAI,EAAE,IAAA,uBAAO,EAAC,MAAM,EAAE,EAAE,CAAC;QACzB,IAAI,EAAE;YACJ,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,MAAM,CAAC;YAC5B,QAAQ,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,UAAU,CAAC;SACrC;KACF;IACD,MAAM,EAAE,6CAAoB;IAC5B,gBAAgB,EAAE,sDAAwB;IAC1C,iBAAiB,EAAE,CAAC,sDAAwB,EAAE,kEAA8B,CAAC;CAC9E,CAAC,CAAC;AAEH,IAAA,+DAAiC,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAE7G,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,kBAAW,CAAC,CAAC;IAE1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CACvC,YAAY,EACZ,EAAE,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,sBAAM,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAClG,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAC3B,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC;AAED,KAAK,IAAI,EAAE,CAAC"}
+{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/mail/basic.ts"],"names":[],"mappings":";;AAAA,+CAAwC;AACxC,qCAAoD;AACpD,sFAA6E;AAC7E,+CAAiD;AACjD,6FAAmH;AACnH,yGAAgG;AAChG,6FAAoF;AACpF,6FAAmH;AACnH,6DAAwD;AACxD,+BAA+B;AAC/B,qCAA4C;AAE5C,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,oBAAa,EAAC;IACZ,YAAY,EAAE;QACZ,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,YAAY,CAAC;QAClC,IAAI,EAAE,IAAA,uBAAO,EAAC,MAAM,EAAE,EAAE,CAAC;QACzB,IAAI,EAAE;YACJ,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,MAAM,CAAC;YAC5B,QAAQ,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,UAAU,CAAC;SACrC;KACF;IACD,MAAM,EAAE,6CAAoB;CAC7B,CAAC,CAAC;AAEH,IAAA,8BAAkB,EAAC;IACjB,gBAAgB,EAAE,6CAAoB;IACtC,iBAAiB,EAAE,CAAC,6CAAoB,EAAE,yDAA0B,CAAC;CACtE,CAAC,CAAC;AAEH,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAC7E,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAEzG,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,kBAAW,CAAC,CAAC;IAE1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CACvC,YAAY,EACZ,EAAE,IAAI,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,IAAA,sBAAM,EAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,sBAAM,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAClG,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAC3B,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC;AAED,KAAK,IAAI,EAAE,CAAC"}

package/examples/mail/templates/hello-name.d.ts

@@ -0,0 +1,2 @@
+declare const template: import("../../../mail").MailTemplate;
+export default template;

package/examples/mail/templates/hello-name.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mail_1 = require("../../../mail");
+const string_template_resolver_1 = require("../../../templates/resolvers/string.template-resolver");
+const template = (0, mail_1.mailTemplate)({
+    subject: (0, string_template_resolver_1.stringTemplateField)({ renderer: 'handlebars', template: 'Hello {{ name }} in subject!' }),
+    html: (0, string_template_resolver_1.stringTemplateField)({ renderer: 'mjml-handlebars', template: '<mjml>\n<mj-body>\n<mj-section>\n<mj-column>\n<mj-text font-size="20px" color="#F45E43" font-family="helvetica">Hello {{ name }} in html!</mj-text>\n</mj-column>\n</mj-section>\n</mj-body>\n</mjml>' }),
+    text: (0, string_template_resolver_1.stringTemplateField)({ renderer: 'handlebars', template: 'Hello {{ name }} in text!' })
+});
+exports.default = template;
+//# sourceMappingURL=hello-name.js.map

package/examples/mail/templates/hello-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/mail/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,wCAAsC;AAGtC,oGAAqF;AAErF,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC;IAC5B,OAAO,EAAE,IAAA,8CAAmB,EAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,8BAA8B,EAAE,CAAC;IAC9H,IAAI,EAAE,IAAA,8CAAmB,EAAuB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,uMAAuM,EAAE,CAAC;IACnS,IAAI,EAAE,IAAA,8CAAmB,EAA6B,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,2BAA2B,EAAE,CAAC;CACzH,CAAC,CAAC;AAEH,kBAAe,QAAQ,CAAC"}

package/examples/pdf/basic.js

@@ -5,16 +5,19 @@ const container_1 = require("../../container");
 const core_1 = require("../../core");
 const pdf_service_1 = require("../../pdf/pdf.service");
 const templates_1 = require("../../templates");
-const file_template_provider_1 = require("../../templates/providers/file-template.provider");
+const file_provider_template_1 = require("../../templates/providers/file.provider-template");
 const handlebars_template_renderer_1 = require("../../templates/renderers/handlebars.template-renderer");
 const mjml_template_renderer_1 = require("../../templates/renderers/mjml.template-renderer");
+const file_template_resolver_1 = require("../../templates/resolvers/file.template-resolver");
 const path_1 = require("path");
 (0, core_1.configureTstdl)();
 (0, templates_1.configureTemplates)({
-    templateProvider: file_template_provider_1.FileTemplateProvider,
+    templateProvider: file_provider_template_1.FileTemplateProvider,
+    templateResolvers: [file_template_resolver_1.FileTemplateResolver],
     templateRenderers: [mjml_template_renderer_1.MjmlTemplateRenderer, handlebars_template_renderer_1.HandlebarsTemplateRenderer]
 });
-(0, file_template_provider_1.configureFileTemplateProvider)({ basePath: (0, path_1.resolve)(__dirname, 'templates') });
+(0, file_provider_template_1.configureFileTemplateProvider)({ basePath: (0, path_1.resolve)(__dirname, 'templates') });
+(0, file_template_resolver_1.configureFileTemplateResolver)({ basePath: (0, path_1.resolve)(__dirname.replace('dist', 'source'), 'templates') });
 async function test() {
     const service = await container_1.container.resolveAsync(pdf_service_1.PdfService);
     const result = await service.renderTemplate('hello-name', { name: 'Max Mustermann' });

package/examples/pdf/basic.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/pdf/basic.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAC5C,+CAAwC;AACxC,qCAAwC;AACxC,uDAA+C;AAC/C,+CAAiD;AACjD,6FAAmH;AACnH,yGAAgG;AAChG,6FAAoF;AACpF,+BAA+B;AAE/B,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,8BAAkB,EAAC;IACjB,gBAAgB,EAAE,6CAAoB;IACtC,iBAAiB,EAAE,CAAC,6CAAoB,EAAE,yDAA0B,CAAC;CACtE,CAAC,CAAC;AAEH,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAE7E,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,wBAAU,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtF,OAAO,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,yBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/pdf/basic.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAC5C,+CAAwC;AACxC,qCAAwC;AACxC,uDAA+C;AAC/C,+CAAiD;AACjD,6FAAmH;AACnH,yGAAgG;AAChG,6FAAoF;AACpF,6FAAmH;AACnH,+BAA+B;AAE/B,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,8BAAkB,EAAC;IACjB,gBAAgB,EAAE,6CAAoB;IACtC,iBAAiB,EAAE,CAAC,6CAAoB,CAAC;IACzC,iBAAiB,EAAE,CAAC,6CAAoB,EAAE,yDAA0B,CAAC;CACtE,CAAC,CAAC;AAEH,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAC7E,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAEvG,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,wBAAU,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtF,OAAO,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,yBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC"}

package/examples/pdf/templates/hello-name.d.ts

@@ -1,2 +1,2 @@
-declare const template: import("../../../templates/providers/file-template.provider").FileTemplate<import("../../../templates").Template<string, any>>;
+declare const template: import("../../../pdf").PdfTemplate;
 export default template;

package/examples/pdf/templates/hello-name.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const file_template_provider_1 = require("../../../templates/providers/file-template.provider");
+const pdf_1 = require("../../../pdf");
+const file_template_resolver_1 = require("../../../templates/resolvers/file.template-resolver");
+const string_template_resolver_1 = require("../../../templates/resolvers/string.template-resolver");
 const path_1 = require("path");
-const template = (0, file_template_provider_1.fileTemplate)({
-    type: 'mjml-handlebars',
-    templateFile: (0, path_1.resolve)(__dirname.replace('dist', 'source'), 'hello-name.hbs')
+const template = (0, pdf_1.pdfTemplate)({
+    body: (0, file_template_resolver_1.fileTemplateField)({
+        renderer: 'handlebars',
+        templateFile: (0, path_1.resolve)(__dirname.replace('dist', 'source'), 'hello-name.hbs')
+    }),
+    header: (0, string_template_resolver_1.stringTemplateField)({
+        renderer: 'handlebars',
+        template: '<div></div>'
+    })
 });
 exports.default = template;
 //# sourceMappingURL=hello-name.js.map

package/examples/pdf/templates/hello-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/pdf/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,gGAA4E;AAC5E,+BAA+B;AAE/B,MAAM,QAAQ,GAAG,IAAA,qCAAY,EAAC;IAC5B,IAAI,EAAE,iBAAiB;IACvB,YAAY,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7E,CAAC,CAAC;AAEH,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"hello-name.js","sourceRoot":"","sources":["../../../../source/examples/pdf/templates/hello-name.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AAEpC,gGAAiF;AACjF,oGAAqF;AACrF,+BAA+B;AAE/B,MAAM,QAAQ,GAAG,IAAA,iBAAW,EAAC;IAC3B,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;KAC7E,CAAC;IACF,MAAM,EAAE,IAAA,8CAAmB,EAA6B;QACtD,QAAQ,EAAE,YAAY;QACtB,QAAQ,EAAE,aAAa;KACxB,CAAC;CACH,CAAC,CAAC;AAEH,kBAAe,QAAQ,CAAC"}

package/mail/index.d.ts

@@ -1,6 +1,3 @@
-export * from './mail-template-renderer.provider';
-export * from './mail-template.provider';
-export * from './mail-template.renderer';
 export * from './mail.client';
 export * from './mail.service';
 export * from './models';

package/mail/index.js

@@ -14,9 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./mail-template-renderer.provider"), exports);
-__exportStar(require("./mail-template.provider"), exports);
-__exportStar(require("./mail-template.renderer"), exports);
 __exportStar(require("./mail.client"), exports);
 __exportStar(require("./mail.service"), exports);
 __exportStar(require("./models"), exports);

package/mail/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/mail/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oEAAkD;AAClD,2DAAyC;AACzC,2DAAyC;AACzC,gDAA8B;AAC9B,iDAA+B;AAC/B,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/mail/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,iDAA+B;AAC/B,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB"}

package/mail/mail.service.d.ts

@@ -1,18 +1,16 @@
 import { Logger } from "../logger";
+import { TemplateService } from "../templates";
 import type { TypedOmit } from "../types";
 import { MailLogRepository } from './mail-log.repository';
-import { MailTemplateRendererProvider } from './mail-template-renderer.provider';
-import { MailTemplateProvider } from './mail-template.provider';
 import { MailClient } from './mail.client';
 import type { MailData, MailSendResult } from './models';
 export declare class MailService {
     private readonly mailClient;
-    private readonly mailTemplateProvider;
-    private readonly mailTemplateRendererProvider;
+    private readonly templateService;
     private readonly mailLogRepository;
     private readonly logger;
     private readonly mailDataSourceTemplateKey;
-    constructor(mailClient: MailClient, mailTemplateProvider: MailTemplateProvider, mailTemplateRendererProvider: MailTemplateRendererProvider, mailLogRepository: MailLogRepository | undefined, logger: Logger);
+    constructor(mailClient: MailClient, templateService: TemplateService, mailLogRepository: MailLogRepository | undefined, logger: Logger);
     send(mailData: MailData): Promise<MailSendResult>;
     sendTemplate(key: string, mailData: TypedOmit<MailData, 'content' | 'subject'>, templateContext?: object): Promise<MailSendResult>;
 }

package/mail/mail.service.js

@@ -16,18 +16,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailService = void 0;
 const container_1 = require("../container");
 const logger_1 = require("../logger");
+const templates_1 = require("../templates");
 const date_time_1 = require("../utils/date-time");
 const format_error_1 = require("../utils/format-error");
 const type_guards_1 = require("../utils/type-guards");
 const mail_log_repository_1 = require("./mail-log.repository");
-const mail_template_renderer_provider_1 = require("./mail-template-renderer.provider");
-const mail_template_provider_1 = require("./mail-template.provider");
 const mail_client_1 = require("./mail.client");
 let MailService = MailService_1 = class MailService {
-    constructor(mailClient, mailTemplateProvider, mailTemplateRendererProvider, mailLogRepository, logger) {
+    constructor(mailClient, templateService, mailLogRepository, logger) {
         this.mailClient = mailClient;
-        this.mailTemplateProvider = mailTemplateProvider;
-        this.mailTemplateRendererProvider = mailTemplateRendererProvider;
+        this.templateService = templateService;
         this.mailLogRepository = mailLogRepository;
         this.logger = logger;
         this.mailDataSourceTemplateKey = new WeakMap();
@@ -64,9 +62,7 @@ let MailService = MailService_1 = class MailService {
         }
     }
     async sendTemplate(key, mailData, templateContext) {
-        const template = await this.mailTemplateProvider.get(key);
-        const renderer = this.mailTemplateRendererProvider.get(template.type);
-        const { subject, html, text } = await renderer.render(template, templateContext);
+        const { fields: { subject, html, text } } = await this.templateService.render(key, templateContext);
         const fullMailData = { ...mailData, subject, content: { html, text } };
         this.mailDataSourceTemplateKey.set(fullMailData, key);
         return this.send(fullMailData);
@@ -74,13 +70,11 @@ let MailService = MailService_1 = class MailService {
 };
 MailService = MailService_1 = __decorate([
     (0, container_1.singleton)(),
-    __param(1, (0, container_1.optional)()),
-    __param(3, (0, container_1.inject)(mail_log_repository_1.MailLogRepository)),
-    __param(3, (0, container_1.optional)()),
-    __param(4, (0, container_1.resolveArg)(MailService_1.name)),
+    __param(2, (0, container_1.inject)(mail_log_repository_1.MailLogRepository)),
+    __param(2, (0, container_1.optional)()),
+    __param(3, (0, container_1.resolveArg)(MailService_1.name)),
     __metadata("design:paramtypes", [mail_client_1.MailClient,
-        mail_template_provider_1.MailTemplateProvider,
-        mail_template_renderer_provider_1.MailTemplateRendererProvider, Object, logger_1.Logger])
+        templates_1.TemplateService, Object, logger_1.Logger])
 ], MailService);
 exports.MailService = MailService;
 //# sourceMappingURL=mail.service.js.map

package/mail/mail.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../source/mail/mail.service.ts"],"names":[],"mappings":"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"}
+{"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;AAIpC,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAOtB,YACE,UAAsB,EACtB,eAAgC,EACO,iBAAgD,EACzC,MAAc;QAE5D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,yBAAyB,GAAG,IAAI,OAAO,EAAE,CAAC;IACjD,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,WAAW,EAAE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI;gBACjE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,IAAI;gBAChB,MAAM,EAAE,IAAI;aACb,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,0BAAW,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,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAe,GAAG,EAAE,eAAe,CAAC,CAAC;QAElH,MAAM,YAAY,GAAG,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;QAEvE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AAnEY,WAAW;IADvB,IAAA,qBAAS,GAAE;IAWP,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;IACrC,WAAA,IAAA,sBAAU,EAAiB,aAAW,CAAC,IAAI,CAAC,CAAA;qCAHjC,wBAAU;QACL,2BAAe,UAEsB,eAAM;GAXnD,WAAW,CAmEvB;AAnEY,kCAAW"}

package/mail/models/mail-template.model.d.ts

@@ -1,10 +1,11 @@
-export declare type MailTemplate<Type extends string = string, Options = any> = {
-    type: Type;
-    /** subject template */
-    subject?: string;
-    /** html template */
-    html?: string;
-    /** text template */
-    text?: string;
-    options?: Options;
-};
+import type { Template, TemplateField } from "../../templates";
+export declare type MailTemplate = Template<{
+    subject: false;
+    html: false;
+    text: false;
+}, undefined>;
+export declare function mailTemplate(fields: {
+    subject?: TemplateField;
+    html?: TemplateField;
+    text?: TemplateField;
+}): MailTemplate;

package/mail/models/mail-template.model.js

@@ -1,3 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mailTemplate = void 0;
+function mailTemplate(fields) {
+    return {
+        fields
+    };
+}
+exports.mailTemplate = mailTemplate;
 //# sourceMappingURL=mail-template.model.js.map

package/mail/models/mail-template.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"mail-template.model.js","sourceRoot":"","sources":["../../../source/mail/models/mail-template.model.ts"],"names":[],"mappings":""}
+{"version":3,"file":"mail-template.model.js","sourceRoot":"","sources":["../../../source/mail/models/mail-template.model.ts"],"names":[],"mappings":";;;AAIA,SAAgB,YAAY,CAAC,MAA+E;IAC1G,OAAO;QACL,MAAM;KACP,CAAC;AACJ,CAAC;AAJD,oCAIC"}

package/mail/module.d.ts

@@ -1,18 +1,14 @@
 import type { Type } from "../types";
 import { MailLogRepository } from './mail-log.repository';
-import { MailTemplateProvider } from './mail-template.provider';
-import type { MailTemplateRenderer } from './mail-template.renderer';
 import type { MailClientConfig } from './mail.client';
 import { MailClient } from './mail.client';
 export declare type MailModuleConfig = {
     clientConfig: MailClientConfig;
     client: Type<MailClient>;
     logRepository: Type<MailLogRepository> | undefined;
-    templateProvider: Type<MailTemplateProvider>;
-    templateRenderers: Type<MailTemplateRenderer>[];
 };
 export declare const mailModuleConfig: MailModuleConfig;
 /**
  * configure mail module
  */
-export declare function configureMail({ clientConfig, client, logRepository, templateProvider, templateRenderers }: Partial<MailModuleConfig>): void;
+export declare function configureMail({ clientConfig, client, logRepository }: Partial<MailModuleConfig>): void;

package/mail/module.js

@@ -4,20 +4,17 @@ exports.configureMail = exports.mailModuleConfig = void 0;
 const container_1 = require("../container");
 const type_guards_1 = require("../utils/type-guards");
 const mail_log_repository_1 = require("./mail-log.repository");
-const mail_template_provider_1 = require("./mail-template.provider");
 const mail_client_1 = require("./mail.client");
 const tokens_1 = require("./tokens");
 exports.mailModuleConfig = {
     clientConfig: { host: '127.0.0.1', port: 25 },
     client: (0, container_1.stubClass)(mail_client_1.MailClient),
-    logRepository: (0, container_1.stubClass)(mail_log_repository_1.MailLogRepository),
-    templateProvider: (0, container_1.stubClass)(mail_template_provider_1.MailTemplateProvider),
-    templateRenderers: []
+    logRepository: (0, container_1.stubClass)(mail_log_repository_1.MailLogRepository)
 };
 /**
  * configure mail module
  */
-function configureMail({ clientConfig, client, logRepository, templateProvider, templateRenderers }) {
+function configureMail({ clientConfig, client, logRepository }) {
     if ((0, type_guards_1.isDefined)(clientConfig)) {
         container_1.container.registerSingleton(tokens_1.MAIL_CLIENT_CONFIG, { useValue: clientConfig });
     }
@@ -27,12 +24,6 @@ function configureMail({ clientConfig, client, logRepository, templateProvider,
     if ((0, type_guards_1.isDefined)(logRepository)) {
         container_1.container.registerSingleton(mail_log_repository_1.MailLogRepository, { useToken: logRepository });
     }
-    if ((0, type_guards_1.isDefined)(templateRenderers)) {
-        container_1.container.registerSingleton(tokens_1.MAIL_TEMPLATE_RENDERERS, { useValue: templateRenderers });
-    }
-    if ((0, type_guards_1.isDefined)(templateProvider)) {
-        container_1.container.registerSingleton(mail_template_provider_1.MailTemplateProvider, { useToken: templateProvider });
-    }
 }
 exports.configureMail = configureMail;
 //# sourceMappingURL=module.js.map

package/mail/module.js.map

@@ -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;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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/mail/module.ts"],"names":[],"mappings":";;;AAAA,4CAAmD;AAEnD,sDAAgD;AAChD,+DAA0D;AAE1D,+CAA2C;AAC3C,qCAA8C;AAQjC,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;CAC5C,CAAC;AAEF;;GAEG;AACH,SAAgB,aAAa,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAA6B;IAC9F,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;AACH,CAAC;AAZD,sCAYC"}

package/mail/tokens.d.ts

@@ -1,5 +1,2 @@
-import type { Type } from "../types";
-import type { MailTemplateRenderer } from './mail-template.renderer';
 import type { MailClientConfig } from './mail.client';
 export declare const MAIL_CLIENT_CONFIG: import("../container").InjectionToken<MailClientConfig, any>;
-export declare const MAIL_TEMPLATE_RENDERERS: import("../container").InjectionToken<Type<MailTemplateRenderer<import("./models").MailTemplate<string, any>>, any>[], any>;

package/mail/tokens.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAIL_TEMPLATE_RENDERERS = exports.MAIL_CLIENT_CONFIG = void 0;
+exports.MAIL_CLIENT_CONFIG = void 0;
 const container_1 = require("../container");
 exports.MAIL_CLIENT_CONFIG = (0, container_1.injectionToken)('MAIL_CLIENT_CONFIG');
-exports.MAIL_TEMPLATE_RENDERERS = (0, container_1.injectionToken)('MAIL_TEMPLATE_RENDERERS');
 //# sourceMappingURL=tokens.js.map

package/mail/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../source/mail/tokens.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAKhC,QAAA,kBAAkB,GAAG,IAAA,0BAAc,EAAmB,oBAAoB,CAAC,CAAC;AAE5E,QAAA,uBAAuB,GAAG,IAAA,0BAAc,EAA+B,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../source/mail/tokens.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAGhC,QAAA,kBAAkB,GAAG,IAAA,0BAAc,EAAmB,oBAAoB,CAAC,CAAC"}

package/openid-connect/oidc-configuration.service.d.ts

@@ -3,7 +3,8 @@ export declare type OidcConfiguration = {
     authorizationEndpoint: string;
     tokenEndpoint: string;
     revocationEndpoint?: string;
-    userinfoEndpoint: string;
+    userInfoEndpoint?: string;
+    endSessionEndpoint?: string;
 };
 export declare class OidcConfigurationService {
     private readonly httpClient;

package/openid-connect/oidc-configuration.service.js

@@ -18,7 +18,8 @@ const oidcConfigurationSchema = (0, schema_1.object)({
     authorization_endpoint: (0, schema_1.string)(),
     token_endpoint: (0, schema_1.string)(),
     revocation_endpoint: (0, schema_1.optional)((0, schema_1.string)()),
-    userinfo_endpoint: (0, schema_1.string)()
+    userinfo_endpoint: (0, schema_1.optional)((0, schema_1.string)()),
+    end_session_endpoint: (0, schema_1.optional)((0, schema_1.string)())
     /* eslint-enable @typescript-eslint/naming-convention */
 });
 let OidcConfigurationService = class OidcConfigurationService {
@@ -28,12 +29,13 @@ let OidcConfigurationService = class OidcConfigurationService {
     async getConfiguration(endpoint) {
         const wellKnownUrl = `${endpoint}/.well-known/openid-configuration`;
         const configurationResponse = await this.httpClient.getJson(wellKnownUrl);
-        const { authorization_endpoint, token_endpoint, revocation_endpoint, userinfo_endpoint } = schema_1.Schema.parse(oidcConfigurationSchema, configurationResponse, { mask: true }); // eslint-disable-line @typescript-eslint/naming-convention
+        const { authorization_endpoint, token_endpoint, revocation_endpoint, userinfo_endpoint, end_session_endpoint } = schema_1.Schema.parse(oidcConfigurationSchema, configurationResponse, { mask: true }); // eslint-disable-line @typescript-eslint/naming-convention
         const oidcConfiguration = {
             authorizationEndpoint: authorization_endpoint,
             tokenEndpoint: token_endpoint,
             revocationEndpoint: revocation_endpoint,
-            userinfoEndpoint: userinfo_endpoint
+            userInfoEndpoint: userinfo_endpoint,
+            endSessionEndpoint: end_session_endpoint
         };
         return oidcConfiguration;
     }

package/openid-connect/oidc-configuration.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidc-configuration.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc-configuration.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwC;AACxC,2CAA2C;AAC3C,sCAA4D;AAS5D,MAAM,uBAAuB,GAAG,IAAA,eAAM,EAAC;IACrC,yDAAyD;IACzD,sBAAsB,EAAE,IAAA,eAAM,GAAE;IAChC,cAAc,EAAE,IAAA,eAAM,GAAE;IACxB,mBAAmB,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IACvC,iBAAiB,EAAE,IAAA,eAAM,GAAE;IAC3B,wDAAwD;CACzD,CAAC,CAAC;AAGI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGnC,YAAY,UAAsB;QAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,MAAM,YAAY,GAAG,GAAG,QAAQ,mCAAmC,CAAC;QAEpE,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,2DAA2D;QAEpO,MAAM,iBAAiB,GAAsB;YAC3C,qBAAqB,EAAE,sBAAsB;YAC7C,aAAa,EAAE,cAAc;YAC7B,kBAAkB,EAAE,mBAAmB;YACvC,gBAAgB,EAAE,iBAAiB;SACpC,CAAC;QAEF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;CACF,CAAA;AAtBY,wBAAwB;IADpC,IAAA,qBAAS,GAAE;qCAIc,mBAAU;GAHvB,wBAAwB,CAsBpC;AAtBY,4DAAwB"}
+{"version":3,"file":"oidc-configuration.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc-configuration.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwC;AACxC,2CAA2C;AAC3C,sCAA4D;AAU5D,MAAM,uBAAuB,GAAG,IAAA,eAAM,EAAC;IACrC,yDAAyD;IACzD,sBAAsB,EAAE,IAAA,eAAM,GAAE;IAChC,cAAc,EAAE,IAAA,eAAM,GAAE;IACxB,mBAAmB,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IACvC,iBAAiB,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IACrC,oBAAoB,EAAE,IAAA,iBAAQ,EAAC,IAAA,eAAM,GAAE,CAAC;IACxC,wDAAwD;CACzD,CAAC,CAAC;AAGI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGnC,YAAY,UAAsB;QAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,MAAM,YAAY,GAAG,GAAG,QAAQ,mCAAmC,CAAC;QAEpE,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,2DAA2D;QAE1P,MAAM,iBAAiB,GAAsB;YAC3C,qBAAqB,EAAE,sBAAsB;YAC7C,aAAa,EAAE,cAAc;YAC7B,kBAAkB,EAAE,mBAAmB;YACvC,gBAAgB,EAAE,iBAAiB;YACnC,kBAAkB,EAAE,oBAAoB;SACzC,CAAC;QAEF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;CACF,CAAA;AAvBY,wBAAwB;IADpC,IAAA,qBAAS,GAAE;qCAIc,mBAAU;GAHvB,wBAAwB,CAuBpC;AAvBY,4DAAwB"}

package/openid-connect/oidc.service.js

@@ -144,7 +144,10 @@ let OidcService = class OidcService {
     }
     async getUserInfo(endpoint, token) {
         const oidcConfiguration = await this.oidcConfigurationService.getConfiguration(endpoint);
-        const userInfoResponse = await client_1.HttpClient.instance.getJson(oidcConfiguration.userinfoEndpoint, { headers: { authorization: `${token.tokenType} ${token.accessToken}` } });
+        if ((0, type_guards_1.isUndefined)(oidcConfiguration.userInfoEndpoint)) {
+            throw new Error('User info endpoint not supported.');
+        }
+        const userInfoResponse = await client_1.HttpClient.instance.getJson(oidcConfiguration.userInfoEndpoint, { headers: { authorization: `${token.tokenType} ${token.accessToken}` } });
         return userInfoResponse;
     }
 };

package/openid-connect/oidc.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../source/openid-connect/oidc.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.78.0-beta35",
+  "version": "0.78.0-beta38",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -39,7 +39,7 @@
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.2",
     "@koa/router": "^12.0",
-    "@tstdl/angular": "^0.11.0-beta35",
+    "@tstdl/angular": "^0.11.0-beta38",
     "chroma-js": "^2.4",
     "got": "^12.3",
     "handlebars": "^4.7",
@@ -48,7 +48,7 @@
     "mjml": "^4.13",
     "mongodb": "4.9",
     "nodemailer": "^6.7",
-    "puppeteer": "^16.2",
+    "puppeteer": "^17.0",
     "undici": "^5.10",
     "urlpattern-polyfill": "^4.0"
   },

package/pdf/pdf.service.d.ts

@@ -2,23 +2,49 @@ import type { AfterResolve } from "../container";
 import { afterResolve } from "../container";
 import type { AsyncDisposable } from "../disposable/disposable";
 import { disposeAsync } from "../disposable/disposable";
-import { TemplateService } from "../templates";
-export declare type PdfRenderOptions = {
+import type { TemplateField } from "../templates";
+import { Template, TemplateService } from "../templates";
+export declare enum PdfFormat {
+    Letter = "letter",
+    Legal = "legal",
+    Tabloid = "tabloid",
+    Ledger = "ledger",
+    A0 = "a0",
+    A1 = "a1",
+    A2 = "a2",
+    A3 = "a3",
+    A4 = "a4",
+    A5 = "a5",
+    A6 = "a6"
+}
+export declare class PdfMarginObject {
+    top?: number | string;
+    bottom?: number | string;
+    right?: number | string;
+    left?: number | string;
+}
+export declare class PdfRenderOptions {
     omitDefaultBackground?: boolean;
     renderBackground?: boolean;
     landscape?: boolean;
-    format?: 'letter' | 'legal' | 'tabloid' | 'ledger' | 'a0' | 'a1' | 'a2' | 'a3' | 'a4' | 'a5' | 'a6';
+    format?: PdfFormat;
     width?: string | number;
     height?: string | number;
     scale?: number;
-    margin?: string | number | {
-        top?: number | string;
-        bottom?: number | string;
-        right?: number | string;
-        left?: number | string;
-    };
+    margin?: string | number | PdfMarginObject;
+    displayHeaderFooter?: boolean;
     waitForNetworkIdle?: boolean;
-};
+    headerTemplate?: string;
+    footerTemplate?: string;
+}
+export declare type PdfTemplateOptions = PdfRenderOptions;
+export declare class PdfTemplate extends Template<{
+    header: false;
+    body: true;
+    footer: false;
+}, PdfRenderOptions> {
+    options?: PdfTemplateOptions;
+}
 export declare class PdfService implements AsyncDisposable, AfterResolve {
     private readonly templateService;
     private readonly pool;
@@ -28,6 +54,18 @@ export declare class PdfService implements AsyncDisposable, AfterResolve {
     dispose(): Promise<void>;
     renderHtml(html: string, options?: PdfRenderOptions): Promise<Uint8Array>;
     renderUrl(url: string, options?: PdfRenderOptions): Promise<Uint8Array>;
+    /**
+     * renders a pdf template
+     * @param key template key
+     * @param templateContext context for template rendering
+     * @param options additional options, overwrites options specified in template
+     * @returns PDF bytes
+     */
     renderTemplate(key: string, templateContext?: object, options?: PdfRenderOptions): Promise<Uint8Array>;
     private render;
 }
+export declare function pdfTemplate(fields: {
+    body: TemplateField;
+    header?: TemplateField;
+    footer?: TemplateField;
+}, options?: PdfTemplateOptions): PdfTemplate;