@tstdl/base 0.83.26 → 0.83.28

package/browser/pdf-options.js

@@ -0,0 +1,134 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var pdf_options_exports = {};
+__export(pdf_options_exports, {
+  PdfFormat: () => PdfFormat,
+  PdfMarginObject: () => PdfMarginObject,
+  PdfRenderOptions: () => PdfRenderOptions
+});
+module.exports = __toCommonJS(pdf_options_exports);
+var import_enumeration = require("../schema/schemas/enumeration.js");
+var import_optional = require("../schema/schemas/optional.js");
+var __decorate = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = function(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+    return Reflect.metadata(k, v);
+};
+var PdfFormat;
+(function(PdfFormat2) {
+  PdfFormat2["Letter"] = "letter";
+  PdfFormat2["Legal"] = "legal";
+  PdfFormat2["Tabloid"] = "tabloid";
+  PdfFormat2["Ledger"] = "ledger";
+  PdfFormat2["A0"] = "a0";
+  PdfFormat2["A1"] = "a1";
+  PdfFormat2["A2"] = "a2";
+  PdfFormat2["A3"] = "a3";
+  PdfFormat2["A4"] = "a4";
+  PdfFormat2["A5"] = "a5";
+  PdfFormat2["A6"] = "a6";
+})(PdfFormat || (PdfFormat = {}));
+class PdfMarginObject {
+  top;
+  bottom;
+  right;
+  left;
+}
+__decorate([
+  (0, import_optional.Optional)([Number, String]),
+  __metadata("design:type", Object)
+], PdfMarginObject.prototype, "top", void 0);
+__decorate([
+  (0, import_optional.Optional)([Number, String]),
+  __metadata("design:type", Object)
+], PdfMarginObject.prototype, "bottom", void 0);
+__decorate([
+  (0, import_optional.Optional)([Number, String]),
+  __metadata("design:type", Object)
+], PdfMarginObject.prototype, "right", void 0);
+__decorate([
+  (0, import_optional.Optional)([Number, String]),
+  __metadata("design:type", Object)
+], PdfMarginObject.prototype, "left", void 0);
+class PdfRenderOptions {
+  omitDefaultBackground;
+  renderBackground;
+  landscape;
+  format;
+  width;
+  height;
+  scale;
+  margin;
+  displayHeaderFooter;
+  headerTemplate;
+  footerTemplate;
+}
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "omitDefaultBackground", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "renderBackground", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "landscape", void 0);
+__decorate([
+  (0, import_enumeration.Enumeration)(PdfFormat, { optional: true }),
+  __metadata("design:type", String)
+], PdfRenderOptions.prototype, "format", void 0);
+__decorate([
+  (0, import_optional.Optional)([String, Number]),
+  __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "width", void 0);
+__decorate([
+  (0, import_optional.Optional)([String, Number]),
+  __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "height", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", Number)
+], PdfRenderOptions.prototype, "scale", void 0);
+__decorate([
+  (0, import_optional.Optional)([String, Number, PdfMarginObject]),
+  __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "margin", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "displayHeaderFooter", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", String)
+], PdfRenderOptions.prototype, "headerTemplate", void 0);
+__decorate([
+  (0, import_optional.Optional)(),
+  __metadata("design:type", String)
+], PdfRenderOptions.prototype, "footerTemplate", void 0);

package/browser/types.d.ts

@@ -0,0 +1,3 @@
+import type * as puppeteer from 'puppeteer';
+export type Browser = puppeteer.Browser;
+export type Page = puppeteer.Page;

package/browser/types.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/core.d.ts

@@ -1,7 +1,7 @@
 import type { InjectionToken } from './container/index.js';
 import { AsyncDisposer } from './disposable/async-disposer.js';
 import type { LoggerArgument } from './logger/index.js';
-import { Logger, LogLevel } from './logger/index.js';
+import { LogLevel, Logger } from './logger/index.js';
 export declare const CORE_LOGGER: InjectionToken<Logger, any>;
 export declare const disposer: AsyncDisposer;
 export declare function connect(name: string, connectFunction: (() => Promise<any>), logger: Logger, maxTries?: number): Promise<void>;

package/examples/browser/basic.d.ts

@@ -0,0 +1 @@
+export {};

package/examples/browser/basic.js

@@ -0,0 +1,19 @@
+"use strict";
+var import_node_fs = require("node:fs");
+var import_application = require("../../application/index.js");
+var import_browser_service = require("../../browser/browser.service.js");
+var import_container = require("../../container/container.js");
+var import_timing = require("../../utils/timing.js");
+async function main() {
+  const browserService = await import_container.container.resolveAsync(import_browser_service.BrowserService);
+  const browser = await browserService.newBrowser();
+  const page = await browser.newPage();
+  await page.navigate("https://google.com");
+  await page.click("//div[text() = 'Alle ablehnen']", { xpath: true });
+  await (0, import_timing.timeout)(1e3);
+  const pdf = await page.renderPdf();
+  (0, import_node_fs.writeFileSync)("/tmp/pdf.pdf", pdf);
+  await page.navigate("file:///tmp/pdf.pdf");
+  await browser.waitForClose();
+}
+import_application.Application.run(main);

package/examples/mail/basic.js

@@ -1,4 +1,6 @@
 "use strict";
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_container = require("../../container/index.js");
 var import_nodemailer_mail_client = require("../../mail/clients/nodemailer.mail-client.js");
 var import_mail = require("../../mail/index.js");
@@ -8,8 +10,14 @@ var import_handlebars_template_renderer = require("../../templates/renderers/han
 var import_mjml_template_renderer = require("../../templates/renderers/mjml.template-renderer.js");
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
 var import_config_parser = require("../../utils/config-parser.js");
-var import_node_path = require("node:path");
 var import_core = require("../../core.js");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 (0, import_core.configureTstdl)();
 (0, import_mail.configureMail)({
   clientConfig: {
@@ -26,8 +34,8 @@ var import_core = require("../../core.js");
   templateProvider: import_file_template_provider.FileTemplateProvider,
   templateRenderers: [import_mjml_template_renderer.MjmlTemplateRenderer, import_handlebars_template_renderer.HandlebarsTemplateRenderer]
 });
-(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(__dirname, "templates") });
-(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(__dirname.replace("/dist", "/source"), "templates") });
+(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
+(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("/dist", "/source"), "templates") });
 async function test() {
   const service = await import_container.container.resolveAsync(import_mail.MailService);
   const result = await service.sendTemplate("hello-name", { from: (0, import_config_parser.string)("FROM", (0, import_config_parser.string)("USER", "user@example.com")), to: (0, import_config_parser.string)("TO", "user@example.com") }, { name: "Max Mustermann" });

package/examples/pdf/basic.js

@@ -1,5 +1,9 @@
 "use strict";
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_application = require("../../application/application.js");
+var import_browser_service = require("../../browser/browser.service.js");
 var import_container = require("../../container/index.js");
 var import_core = require("../../core.js");
 var import_pdf_service = require("../../pdf/pdf.service.js");
@@ -8,18 +12,36 @@ var import_file_template_provider = require("../../templates/providers/file.temp
 var import_handlebars_template_renderer = require("../../templates/renderers/handlebars.template-renderer.js");
 var import_mjml_template_renderer = require("../../templates/renderers/mjml.template-renderer.js");
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
-var import_node_path = require("node:path");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 (0, import_core.configureTstdl)();
 (0, import_module.configureTemplates)({
   templateProvider: import_file_template_provider.FileTemplateProvider,
   templateResolvers: [import_file_template_resolver.FileTemplateResolver],
   templateRenderers: [import_mjml_template_renderer.MjmlTemplateRenderer, import_handlebars_template_renderer.HandlebarsTemplateRenderer]
 });
-(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(__dirname, "templates") });
-(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(__dirname.replace("dist", "source"), "templates") });
-async function test() {
+(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
+(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "templates") });
+async function main() {
+  const browserService = await import_container.container.resolveAsync(import_browser_service.BrowserService);
   const pdfService = await import_container.container.resolveAsync(import_pdf_service.PdfService);
-  const result = await pdfService.renderTemplate("hello-name", { name: "Max Mustermann" });
-  console.log(`Resulting PDF has ${result.length} bytes.`);
+  const result1 = await pdfService.renderTemplate("hello-name", { name: "Max Mustermann" });
+  const result2 = await pdfService.renderUrl("https://google.de");
+  console.log(`Resulting PDFs have ${result1.length} and ${result2.length} bytes.`);
+  (0, import_node_fs.writeFileSync)("/tmp/template.pdf", result1);
+  (0, import_node_fs.writeFileSync)("/tmp/page.pdf", result2);
+  const browser = await browserService.newBrowser();
+  const page1 = await browser.newPage();
+  const page2 = await browser.newPage();
+  await Promise.all([
+    page1.navigate("file:///tmp/template.pdf"),
+    page2.navigate("file:///tmp/page.pdf")
+  ]);
+  await browser.waitForClose();
 }
-import_application.Application.run(test);
+import_application.Application.run(main);

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

@@ -21,17 +21,25 @@ __export(hello_name_exports, {
   default: () => hello_name_default
 });
 module.exports = __toCommonJS(hello_name_exports);
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_pdf_service = require("../../../pdf/pdf.service.js");
 var import_file_template_resolver = require("../../../templates/resolvers/file.template-resolver.js");
 var import_string_template_resolver = require("../../../templates/resolvers/string.template-resolver.js");
-var import_node_path = require("node:path");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 function reverse(value) {
   return value.split("").reverse().join("");
 }
 const template = (0, import_pdf_service.pdfTemplate)("hello-name", {
   body: (0, import_file_template_resolver.fileTemplateField)({
     renderer: "handlebars",
-    templateFile: (0, import_node_path.resolve)(__dirname.replace("dist", "source"), "hello-name.hbs"),
+    templateFile: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "hello-name.hbs"),
     options: {
       partials: {
         sometext: (0, import_string_template_resolver.stringTemplateField)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.83.26",
+  "version": "0.83.28",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
     "luxon": "^3.3",
     "reflect-metadata": "^0.1",
     "rxjs": "^7.8",
-    "type-fest": "^3.8"
+    "type-fest": "^3.9"
   },
   "devDependencies": {
     "@types/chroma-js": "2.4",
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "5.59",
     "concurrently": "8.0",
     "esbuild": "0.17",
-    "eslint": "8.38",
+    "eslint": "8.39",
     "eslint-import-resolver-typescript": "3.5",
     "eslint-plugin-import": "2.27",
     "tsc-alias": "1.8",
@@ -60,9 +60,9 @@
     "nodemailer": "^6.9",
     "preact": "^10.13",
     "preact-render-to-string": "^6.0",
-    "puppeteer": "^19.10",
+    "puppeteer": "^19.11",
     "undici": "^5.22",
-    "urlpattern-polyfill": "^7.0"
+    "urlpattern-polyfill": "^8.0"
   },
   "peerDependenciesMeta": {
     "@tstdl/angular": {

package/pdf/pdf.service.d.ts

@@ -1,3 +1,5 @@
+import { BrowserService } from '../browser/browser.service.js';
+import { PdfRenderOptions } from '../browser/pdf-options.js';
 import type { AfterResolve, Injectable } from '../container/index.js';
 import { afterResolve, type resolveArgumentType } from '../container/index.js';
 import type { AsyncDisposable } from '../disposable/disposable.js';
@@ -5,39 +7,9 @@ import { disposeAsync } from '../disposable/disposable.js';
 import { Logger } from '../logger/index.js';
 import type { TemplateField } from '../templates/index.js';
 import { Template, TemplateService } from '../templates/index.js';
-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 {
+export declare class PdfServiceRenderOptions extends PdfRenderOptions {
     language?: string;
-    omitDefaultBackground?: boolean;
-    renderBackground?: boolean;
-    landscape?: boolean;
-    format?: PdfFormat;
-    width?: string | number;
-    height?: string | number;
-    scale?: number;
-    margin?: string | number | PdfMarginObject;
-    displayHeaderFooter?: boolean;
     waitForNetworkIdle?: boolean;
-    headerTemplate?: string;
-    footerTemplate?: string;
     /**
      * Timeout for closing render context in case something went wrong.
      * @default 60000 (1 minute)
@@ -60,9 +32,8 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
     private readonly templateService;
     private readonly logger;
     private readonly pool;
-    private readonly options;
     readonly [resolveArgumentType]: PdfServiceArgument;
-    constructor(templateService: TemplateService, logger: Logger, options?: PdfServiceOptions);
+    constructor(templateService: TemplateService, browserService: BrowserService, logger: Logger, options?: PdfServiceOptions);
     [afterResolve](): void;
     [disposeAsync](): Promise<void>;
     dispose(): Promise<void>;
@@ -72,28 +43,28 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
      * @param options render options
      * @returns pdf stream
      */
-    renderHtmlStream(html: string, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderHtmlStream(html: string, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders HTML to pdf
      * @param html html to render
      * @param options render options
      * @returns pdf bytes
      */
-    renderHtml(html: string, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderHtml(html: string, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     /**
      * Renders an url to pdf stream
      * @param url url to load and render
      * @param options render options
      * @returns pdf stream
      */
-    renderUrlStream(url: string, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderUrlStream(url: string, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders an url to pdf
      * @param url url to load and render
      * @param options render options
      * @returns pdf bytes
      */
-    renderUrl(url: string, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderUrl(url: string, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     /**
      * Renders a template to pdf
      * @param key template key
@@ -101,7 +72,7 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
      * @param options additional options, overwrites options specified in template
      * @returns pdf bytes
      */
-    renderTemplateStream<Context extends object>(keyOrTemplate: string | PdfTemplate<Context>, templateContext?: Context, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderTemplateStream<Context extends object>(keyOrTemplate: string | PdfTemplate<Context>, templateContext?: Context, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders a template to pdf
      * @param key template key
@@ -109,9 +80,8 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
      * @param options additional options, overwrites options specified in template
      * @returns pdf bytes
      */
-    renderTemplate(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderTemplate(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     private renderStream;
-    private convertOptions;
 }
 export declare function pdfTemplate(name: string, fields: {
     body: TemplateField;