@h3ravel/mail 11.0.21 → 11.15.0-alpha.11

package/dist/index.cjs

@@ -1,4 +1,5 @@
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19,15 +20,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
 let nodemailer = require("nodemailer");
-nodemailer = __toESM(nodemailer);
+nodemailer = __toESM(nodemailer, 1);
 let stream = require("stream");
-stream = __toESM(stream);
-let __aws_sdk_client_sesv2 = require("@aws-sdk/client-sesv2");
-let __h3ravel_core = require("@h3ravel/core");
-
+stream = __toESM(stream, 1);
+let _aws_sdk_client_sesv2 = require("@aws-sdk/client-sesv2");
+let _h3ravel_core = require("@h3ravel/core");
 //#region src/Drivers/LOGDriver.ts
 var LOGDriver = class {
 	transporter;
@@ -46,7 +45,6 @@ var LOGDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SendMailDriver.ts
 var SendMailDriver = class {
@@ -69,13 +67,12 @@ var SendMailDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SESDriver.ts
 var SESDriver = class {
 	transporter;
 	constructor(config) {
-		const sesClient = new __aws_sdk_client_sesv2.SESv2Client({
+		const sesClient = new _aws_sdk_client_sesv2.SESv2Client({
 			region: config.region,
 			credentials: {
 				accessKeyId: config.key,
@@ -86,7 +83,7 @@ var SESDriver = class {
 		this.transporter = nodemailer.default.createTransport({
 			SES: {
 				sesClient,
-				SendEmailCommand: __aws_sdk_client_sesv2.SendEmailCommand
+				SendEmailCommand: _aws_sdk_client_sesv2.SendEmailCommand
 			},
 			maxConnections: config.maxConnections,
 			sendingRate: config.sendingRate
@@ -104,7 +101,6 @@ var SESDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SMTPDriver.ts
 var SMTPDriver = class {
@@ -132,7 +128,6 @@ var SMTPDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Mailable.ts
 var Mailable = class {
@@ -199,10 +194,11 @@ var Mailable = class {
 		};
 	}
 };
-
 //#endregion
 //#region src/Mailer.ts
 var Mailer = class {
+	driver;
+	edgeRenderer;
 	constructor(driver, edgeRenderer) {
 		this.driver = driver;
 		this.edgeRenderer = edgeRenderer;
@@ -210,7 +206,11 @@ var Mailer = class {
 	async send(mailable) {
 		await mailable.build();
 		const options = mailable.getMessageOptions();
-		if (options.viewPath && !options.html) options.html = await this.edgeRenderer(options.viewPath, options.viewData || {});
+		if (options.viewPath && !options.html) {
+			let view = await this.edgeRenderer(options.viewPath, options.viewData || {});
+			if (typeof view !== "string") view = String(view.body);
+			options.html = view;
+		}
 		try {
 			return this.driver.send(options);
 		} catch {
@@ -218,7 +218,6 @@ var Mailer = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/Service.ts
 /**
@@ -241,6 +240,9 @@ var Service = class {
 		* Configure mailer settings for different drivers
 		*/
 		const mailConfig = {
+			/**
+			* SMTP configuration with fallback defaults
+			*/
 			smtp: {
 				host: config.get("mail.mailers.smtp.host", "smtp.mailtrap.io"),
 				port: Number(config.get("mail.mailers.smtp.port", 2525)),
@@ -252,6 +254,9 @@ var Service = class {
 				connectionTimeout: config.get("mail.mailers.smtp.timeout"),
 				debug: false
 			},
+			/**
+			* SES configuration with fallback defaults
+			*/
 			ses: {
 				key: config.get("services.ses.key", ""),
 				token: config.get("services.ses.token", ""),
@@ -260,15 +265,34 @@ var Service = class {
 				maxConnections: config.get("mail.mailers.ses.connections", 10),
 				sendingRate: config.get("mail.mailers.ses.rate", 5)
 			},
+			/**
+			* Sendmail configuration with fallback default path
+			*/
 			sendmail: { path: config.get("mail.mailers.sendmail.path", "sendmail") }
 		};
 		/**
 		* Define available mail drivers
 		*/
 		const driver = {
+			/**
+			* SES driver factory
+			* @returns 
+			*/
 			ses: () => new SESDriver(mailConfig.ses),
+			/**
+			* SMTP driver factory
+			* @returns 
+			*/
 			smtp: () => new SMTPDriver(mailConfig.smtp),
+			/**
+			* LOG driver factory for debugging
+			* @returns 
+			*/
 			log: () => new LOGDriver(mailConfig.smtp),
+			/**
+			* Sendmail driver factory
+			* @returns 
+			*/
 			sendmail: () => new SendMailDriver(mailConfig.sendmail)
 		};
 		/**
@@ -278,7 +302,6 @@ var Service = class {
 		return new Mailer((driver[config.get("mail.default")] ?? driver.smtp)(), async (viewPath, data) => await view(viewPath, data));
 	}
 };
-
 //#endregion
 //#region src/Providers/MailServiceProvider.ts
 /**
@@ -289,7 +312,7 @@ var Service = class {
 * Register Mail facade.
 * 
 */
-var MailServiceProvider = class extends __h3ravel_core.ServiceProvider {
+var MailServiceProvider = class extends _h3ravel_core.ServiceProvider {
 	static priority = 990;
 	register() {
 		/**
@@ -305,7 +328,6 @@ var MailServiceProvider = class extends __h3ravel_core.ServiceProvider {
 		*/
 	}
 };
-
 //#endregion
 exports.LOGDriver = LOGDriver;
 exports.MailServiceProvider = MailServiceProvider;
@@ -314,4 +336,4 @@ exports.Mailer = Mailer;
 exports.SESDriver = SESDriver;
 exports.SMTPDriver = SMTPDriver;
 exports.SendMailDriver = SendMailDriver;
-exports.Service = Service;
+exports.Service = Service;

package/dist/index.d.ts

@@ -1,11 +1,9 @@
 /// <reference path="./app.globals.d.ts" />
 import { SendMailOptions as SendMailOptions$1, SentMessageInfo } from "nodemailer";
-import * as nodemailer_lib_ses_transport0 from "nodemailer/lib/ses-transport";
-import SESConnection from "nodemailer/lib/ses-transport";
-import SMTPConnection from "nodemailer/lib/smtp-connection";
-import * as nodemailer_lib_sendmail_transport0 from "nodemailer/lib/sendmail-transport";
-import SendmailTransport from "nodemailer/lib/sendmail-transport";
-import * as nodemailer_lib_smtp_transport0 from "nodemailer/lib/smtp-transport";
+import SESConnection from "nodemailer/lib/ses-transport/index.js";
+import SMTPConnection from "nodemailer/lib/smtp-connection/index.js";
+import SendmailTransport from "nodemailer/lib/sendmail-transport/index.js";
+import { IResponsable } from "@h3ravel/contracts";
 import { Application, ServiceProvider } from "@h3ravel/core";
 
 //#region src/Contracts/Mailer.d.ts
@@ -68,21 +66,21 @@ declare class LOGDriver implements MailDriverContract {
 declare class SendMailDriver implements MailDriverContract {
   private transporter;
   constructor(config: SendMailConfig);
-  send(options: SendMailOptions$1): Promise<nodemailer_lib_sendmail_transport0.SentMessageInfo>;
+  send(options: SendMailOptions$1): Promise<import("nodemailer/lib/sendmail-transport").SentMessageInfo>;
 }
 //#endregion
 //#region src/Drivers/SESDriver.d.ts
 declare class SESDriver implements MailDriverContract {
   private transporter;
   constructor(config: SESConfig);
-  send(options: SendMailOptions$1): Promise<nodemailer_lib_ses_transport0.SentMessageInfo>;
+  send(options: SendMailOptions$1): Promise<import("nodemailer/lib/ses-transport").SentMessageInfo>;
 }
 //#endregion
 //#region src/Drivers/SMTPDriver.d.ts
 declare class SMTPDriver implements MailDriverContract {
   private transporter;
   constructor(config: SMTPConfig);
-  send(options: SendMailOptions$1): Promise<nodemailer_lib_smtp_transport0.SentMessageInfo>;
+  send(options: SendMailOptions$1): Promise<import("nodemailer/lib/smtp-transport").SentMessageInfo>;
 }
 //#endregion
 //#region src/Mailable.d.ts
@@ -118,7 +116,7 @@ declare abstract class Mailable {
 declare class Mailer {
   private driver;
   private edgeRenderer;
-  constructor(driver: MailDriverContract, edgeRenderer: (viewPath: string, data: Record<string, any>) => Promise<string>);
+  constructor(driver: MailDriverContract, edgeRenderer: (viewPath: string, data: Record<string, any>) => Promise<IResponsable | string>);
   send(mailable: Mailable): Promise<DeliveryReport | undefined | void>;
 }
 //#endregion

package/dist/index.js

@@ -2,7 +2,6 @@ import nodemailer from "nodemailer";
 import Stream from "stream";
 import { SESv2Client, SendEmailCommand } from "@aws-sdk/client-sesv2";
 import { ServiceProvider } from "@h3ravel/core";
-
 //#region src/Drivers/LOGDriver.ts
 var LOGDriver = class {
 	transporter;
@@ -21,7 +20,6 @@ var LOGDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SendMailDriver.ts
 var SendMailDriver = class {
@@ -44,7 +42,6 @@ var SendMailDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SESDriver.ts
 var SESDriver = class {
@@ -79,7 +76,6 @@ var SESDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Drivers/SMTPDriver.ts
 var SMTPDriver = class {
@@ -107,7 +103,6 @@ var SMTPDriver = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/Mailable.ts
 var Mailable = class {
@@ -174,10 +169,11 @@ var Mailable = class {
 		};
 	}
 };
-
 //#endregion
 //#region src/Mailer.ts
 var Mailer = class {
+	driver;
+	edgeRenderer;
 	constructor(driver, edgeRenderer) {
 		this.driver = driver;
 		this.edgeRenderer = edgeRenderer;
@@ -185,7 +181,11 @@ var Mailer = class {
 	async send(mailable) {
 		await mailable.build();
 		const options = mailable.getMessageOptions();
-		if (options.viewPath && !options.html) options.html = await this.edgeRenderer(options.viewPath, options.viewData || {});
+		if (options.viewPath && !options.html) {
+			let view = await this.edgeRenderer(options.viewPath, options.viewData || {});
+			if (typeof view !== "string") view = String(view.body);
+			options.html = view;
+		}
 		try {
 			return this.driver.send(options);
 		} catch {
@@ -193,7 +193,6 @@ var Mailer = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/Service.ts
 /**
@@ -216,6 +215,9 @@ var Service = class {
 		* Configure mailer settings for different drivers
 		*/
 		const mailConfig = {
+			/**
+			* SMTP configuration with fallback defaults
+			*/
 			smtp: {
 				host: config.get("mail.mailers.smtp.host", "smtp.mailtrap.io"),
 				port: Number(config.get("mail.mailers.smtp.port", 2525)),
@@ -227,6 +229,9 @@ var Service = class {
 				connectionTimeout: config.get("mail.mailers.smtp.timeout"),
 				debug: false
 			},
+			/**
+			* SES configuration with fallback defaults
+			*/
 			ses: {
 				key: config.get("services.ses.key", ""),
 				token: config.get("services.ses.token", ""),
@@ -235,15 +240,34 @@ var Service = class {
 				maxConnections: config.get("mail.mailers.ses.connections", 10),
 				sendingRate: config.get("mail.mailers.ses.rate", 5)
 			},
+			/**
+			* Sendmail configuration with fallback default path
+			*/
 			sendmail: { path: config.get("mail.mailers.sendmail.path", "sendmail") }
 		};
 		/**
 		* Define available mail drivers
 		*/
 		const driver = {
+			/**
+			* SES driver factory
+			* @returns 
+			*/
 			ses: () => new SESDriver(mailConfig.ses),
+			/**
+			* SMTP driver factory
+			* @returns 
+			*/
 			smtp: () => new SMTPDriver(mailConfig.smtp),
+			/**
+			* LOG driver factory for debugging
+			* @returns 
+			*/
 			log: () => new LOGDriver(mailConfig.smtp),
+			/**
+			* Sendmail driver factory
+			* @returns 
+			*/
 			sendmail: () => new SendMailDriver(mailConfig.sendmail)
 		};
 		/**
@@ -253,7 +277,6 @@ var Service = class {
 		return new Mailer((driver[config.get("mail.default")] ?? driver.smtp)(), async (viewPath, data) => await view(viewPath, data));
 	}
 };
-
 //#endregion
 //#region src/Providers/MailServiceProvider.ts
 /**
@@ -280,6 +303,5 @@ var MailServiceProvider = class extends ServiceProvider {
 		*/
 	}
 };
-
 //#endregion
-export { LOGDriver, MailServiceProvider, Mailable, Mailer, SESDriver, SMTPDriver, SendMailDriver, Service };
+export { LOGDriver, MailServiceProvider, Mailable, Mailer, SESDriver, SMTPDriver, SendMailDriver, Service };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/mail",
-  "version": "11.0.21",
+  "version": "11.15.0-alpha.11",
   "description": "Mail drivers and templates system for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -31,19 +31,18 @@
     "directory": "packages/mail"
   },
   "peerDependencies": {
-    "@h3ravel/core": "~1.21.12"
+    "@h3ravel/core": "^1.29.0-alpha.11"
   },
   "devDependencies": {
     "@types/nodemailer": "^6.4.17",
-    "typescript": "^5.4.0"
+    "typescript": "^6.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-sesv2": "^3.864.0",
+    "@aws-sdk/client-sesv2": "^3.1066.0",
     "nodemailer": "^7.0.5"
   },
   "scripts": {
-    "barrel": "barrelsby --directory src --delete --singleQuotes",
-    "build": "tsdown --config-loader unconfig",
+    "build": "tsdown --config-loader unrun",
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",
     "lint": "eslint . --ext .ts",