refactor: refactor core and check domain implementation

Yizack · Yizack · commit 80a19de86be5 · 2025-03-16T16:05:00.000-05:00
diff --git a/src/emails/check-domain.ts b/src/emails/check-domain.ts
@@ -1,36 +1,50 @@
 import type { MailChannels } from "../mailchannels";
 import type { EmailsCheckDomainOptions, EmailsCheckDomainResponse } from "../types/emails";
 
-export default (mailchannels: MailChannels) => {
+export const checkDomain = (mailchannels: MailChannels) => {
   /**
    * Validates a domain's email authentication setup by retrieving its DKIM, SPF, and Domain Lockdown status. This endpoint checks whether the domain is properly configured for secure email delivery.
    * @param options - The domain options to check
    * @example
    * ```ts
    * const mailchannels = new MailChannels("your-api-key");
-   * const { success } = await mailchannels.emails.checkDomain({
-   *   dkim: {
+   * const { results } = await mailchannels.emails.checkDomain({
+   *   dkim: [{
    *     domain: "example.com",
    *     privateKey
    *     selector: "mailchannels"
-   *   },
+   *   }],
    *   domain: "example.com",
    *   senderId: "sender-id"
    * })
    * ```
    */
   return async (options: EmailsCheckDomainOptions) => {
     const { dkim, domain, senderId } = options;
-    return mailchannels.post<EmailsCheckDomainResponse>("/tx/v1/check-domain", {
+    const dkimOptions = Array.isArray(dkim) ? dkim : [dkim];
+
+    const check = await mailchannels.post<EmailsCheckDomainResponse>("/tx/v1/check-domain", {
       body: {
-        dkim_settings: [{
-          dkim_domain: dkim.domain,
-          dkim_private_key: dkim.privateKey,
-          dkim_selector: dkim.selector
-        }],
+        dkim_settings: dkimOptions.map(({ domain, privateKey, selector }) => ({
+          dkim_domain: domain,
+          dkim_private_key: privateKey,
+          dkim_selector: selector
+        })),
         domain,
         sender_id: senderId
       }
     });
+
+    return {
+      results: {
+        spf: check.check_results.spf,
+        domainLockdown: check.check_results.domain_lockdown,
+        dkim: check.check_results.dkim.map(({ dkim_domain, dkim_selector, verdict }) => ({
+          dkimDomain: dkim_domain,
+          dkimSelector: dkim_selector,
+          verdict
+        }))
+      }
+    };
   };
 };
diff --git a/src/emails/index.ts b/src/emails/index.ts
@@ -1,10 +1,10 @@
 import type { MailChannels } from "../mailchannels";
-import checkDomain from "./check-domain";
-import send from "./send";
+import { send } from "./send";
+import { checkDomain } from "./check-domain";
+import { applyMailChannels } from "../utils/core";
 
-export function defineEmails (mailchannels: MailChannels) {
-  return {
-    send: send(mailchannels),
-    checkDomain: checkDomain(mailchannels)
-  };
-}
+
+export const defineEmails = (mailchannels: MailChannels) => applyMailChannels(mailchannels, {
+  send,
+  checkDomain
+});
diff --git a/src/emails/send.ts b/src/emails/send.ts
@@ -1,8 +1,8 @@
 import type { MailChannels } from "../mailchannels";
 import type { EmailsSendOptions, EmailsSendPayload, EmailsSendContent } from "../types/emails";
-import { parseRecipient, parseArrayRecipients } from "../utils/helpers";
+import { parseRecipient, parseArrayRecipients } from "../utils/recipients";
 
-export default (mailchannels: MailChannels) => {
+export const send = (mailchannels: MailChannels) => {
   /**
    * Send an email using MailChannels Email API
    * @param options - The email options to send
diff --git a/src/types/emails/check-domain.d.ts b/src/types/emails/check-domain.d.ts
@@ -5,7 +5,7 @@ interface EmailsCheckDomainDkim {
 }
 
 export interface EmailsCheckDomainOptions {
-  dkim: EmailsCheckDomainDkim;
+  dkim: EmailsCheckDomainDkim[] | EmailsCheckDomainDkim;
   domain: string;
   senderId: string;
 }
@@ -20,12 +20,10 @@ export interface EmailsCheckDomainResponse {
     domain_lockdown: {
       verdict: Extract<EmailsCheckDomainVerdict, "passed" | "failed">;
     };
-    dkim: [
-      {
-        dkim_domain: "mappedlove.com";
-        dkim_selector: "mailchannels";
-        verdict: Extract<EmailsCheckDomainVerdict, "passed" | "failed">;
-      }
-    ];
+    dkim: {
+      dkim_domain: "mappedlove.com";
+      dkim_selector: "mailchannels";
+      verdict: Extract<EmailsCheckDomainVerdict, "passed" | "failed">;
+    }[];
   };
 }
diff --git a/src/utils/core.ts b/src/utils/core.ts
@@ -0,0 +1,8 @@
+import type { MailChannels } from "../mailchannels";
+
+export const applyMailChannels = <T extends Record<string, (mc: MailChannels) => unknown>>(
+  mc: MailChannels,
+  exports: T
+) => Object.fromEntries(
+  Object.entries(exports).map(([key, fn]) => [key, fn(mc)])
+) as { [K in keyof T]: ReturnType<T[K]> };
diff --git a/src/utils/recipients.ts b/src/utils/recipients.ts
