@arkstack/notifications 0.16.8 → 0.16.10

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { Transporter } from "nodemailer";
 import { Model } from "@arkstack/database";
 import { User } from "@app/models/User";
 import { User as User$1 } from "@arkstack/auth";
+import { PhoneNumber } from "@kanun-hq/plugin-phone";
 
 //#region src/Contracts/UserNotification.d.ts
 declare abstract class UserNotification extends Model {
@@ -374,8 +375,9 @@ declare class SmsNotification extends NotificationContract {
   constructor(options?: SmsDriverOptions);
   from(from: string): this;
   subject(_subject: string): this;
-  recipient(recipient: NotificationRecipient): this;
-  send(message: string, _subject?: string, recipient?: NotificationRecipient, data?: NotificationData): Promise<unknown>;
+  recipient(recipient: NotificationRecipient | PhoneNumber | PhoneNumber[]): this;
+  send(message: string, _subject?: string, recipient?: NotificationRecipient | PhoneNumber | PhoneNumber[], data?: NotificationData): Promise<unknown>;
+  private resolveRecipient;
 }
 //#endregion
 //#region src/Contracts/Maps.d.ts

package/dist/index.js

@@ -447,7 +447,7 @@ var RealtimeNotification = class extends NotificationContract {
 	* @returns 
 	*/
 	recipient(recipient) {
-		if (typeof recipient === "object" && !Array.isArray(recipient) && "id" in recipient) {
+		if (typeof recipient === "object" && !Array.isArray(recipient) && typeof recipient.id !== "undefined") {
 			this.user = recipient;
 			return this;
 		}
@@ -622,14 +622,18 @@ var SmsNotification = class extends NotificationContract {
 		return this;
 	}
 	async send(message, _subject, recipient, data) {
-		const resolvedRecipient = recipient ?? this.recipients;
-		if (!resolvedRecipient) throw new Error("No recipient provided for SMS notification");
+		const resolvedRecipient = this.resolveRecipient(recipient ?? this.recipients ?? []);
+		if (!resolvedRecipient || Array.isArray(resolvedRecipient) && resolvedRecipient.length === 0) throw new Error("No recipient provided for SMS notification");
 		return await this.driver.send(message, resolvedRecipient, {
 			app_name: env("APP_NAME", "Arkstack"),
 			from: this.fromValue,
 			...this.mergeData(data)
 		});
 	}
+	resolveRecipient(recipient) {
+		if (Array.isArray(recipient)) return recipient.map((r) => typeof r === "string" ? r : r.toString());
+		return typeof recipient === "string" ? recipient : recipient.toString();
+	}
 };
 //#endregion
 //#region src/Notification.ts
@@ -658,7 +662,7 @@ var Notification = class Notification {
 	}
 	prepare(recipient, data = {}) {
 		this.driver.data(data);
-		if (recipient && typeof recipient === "object" && !Array.isArray(recipient) && "id" in recipient) {
+		if (recipient && typeof recipient === "object" && !Array.isArray(recipient) && typeof recipient.id !== "undefined") {
 			if (this.driver instanceof MailNotification) {
 				if (recipient.email) this.driver.recipient(recipient.email);
 			} else if (this.driver instanceof SmsNotification) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/notifications",
-  "version": "0.16.8",
+  "version": "0.16.10",
   "type": "module",
   "description": "Framework-agnostic notification module for Arkstack and Nodejs, providing support for multi-channel notification delivery.",
   "homepage": "https://arkstack.toneflix.net/guide/notifications",
@@ -34,13 +34,14 @@
     "africastalking": "^0.8.0",
     "nodemailer": "^8.0.7",
     "twilio": "^6.0.0",
-    "@arkstack/common": "^0.16.8"
+    "@arkstack/common": "^0.16.10"
   },
   "peerDependencies": {
-    "pusher": "^5.2.0",
+    "@kanun-hq/plugin-phone": "^0.1.8",
     "firebase-admin": "^13.0.0",
-    "@arkstack/contract": "^0.16.8",
-    "@arkstack/database": "^0.16.8"
+    "pusher": "^5.2.0",
+    "@arkstack/contract": "^0.16.10",
+    "@arkstack/database": "^0.16.10"
   },
   "peerDependenciesMeta": {
     "pusher": {
@@ -48,9 +49,13 @@
     },
     "firebase-admin": {
       "optional": true
+    },
+    "@kanun-hq/plugin-phone": {
+      "optional": true
     }
   },
   "devDependencies": {
+    "@types/africastalking": "^0.8.0",
     "@types/nodemailer": "^7.0.11"
   },
   "scripts": {