Merge pull request #27 from xtr-dev/dev

Align `sendEmail` and `sendEmailTask` with updated `BaseEmail` typing
Bump package version to 0.1.11 in package.json.
2025-12-10 08:13:23 +00:00 · 2025-09-13 22:49:05 +02:00 · 2025-09-13 22:48:55 +02:00 · 2025-09-13 22:46:30 +02:00 · 2025-09-13 22:41:28 +02:00 · 2025-09-13 22:39:28 +02:00
17 changed files with 767 additions and 564 deletions
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ export default buildConfig({
 ### 2. Send emails with type-safe helper
 ```typescript
 // sendEmail is a primary export for easy access
 import { sendEmail } from '@xtr-dev/payload-mailing'
 import { Email } from './payload-types' // Your generated types
@@ -138,10 +139,6 @@ mailingPlugin({
  retryDelay: 300000,            // 5 minutes (default)
  // Advanced options
  emailWrapper: (email) => ({    // optional layout wrapper
    ...email,
    html: `<html><body>${email.html}</body></html>`
  }),
  richTextEditor: lexicalEditor(),  // optional custom editor
  onReady: async (payload) => {     // optional initialization hook
    console.log('Mailing plugin ready!')
@@ -226,7 +223,7 @@ Thanks for joining {{siteName}}. We're excited to have you!
 **What you can do:**
 • Create beautiful emails with rich text formatting
-• Use the emailWrapper hook to add custom layouts  
+  
 • Queue and schedule emails effortlessly
 Your account was created on {{formatDate createdAt "long"}}.
@@ -237,282 +234,6 @@ The {{siteName}} Team
 ## Advanced Features
 ### Custom HTML Layouts with Email Wrapper Hook
 The `emailWrapper` hook allows you to apply consistent HTML layouts and styling to all emails sent through the plugin. This is perfect for adding company branding, headers, footers, and responsive styling.
 #### Basic Email Wrapper
 ```typescript
 mailingPlugin({
  // ... other config
  emailWrapper: (email) => {
    const wrappedHtml = `
      <!DOCTYPE html>
      <html>
      <head>
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <title>${email.subject}</title>
        <style>
          body { font-family: Arial, sans-serif; margin: 0; padding: 20px; background-color: #f4f4f4; }
          .container { max-width: 600px; margin: 0 auto; background: white; border-radius: 8px; overflow: hidden; }
          .header { background: #007bff; color: white; padding: 20px; text-align: center; }
          .content { padding: 30px; line-height: 1.6; }
          .footer { background: #f8f9fa; padding: 15px; text-align: center; color: #6c757d; font-size: 14px; }
          /* Responsive styles */
          @media only screen and (max-width: 600px) {
            .container { margin: 0 10px; }
            .content { padding: 20px; }
          }
        </style>
      </head>
      <body>
        <div class="container">
          <div class="header">
            <h1>My Company</h1>
          </div>
          <div class="content">
            ${email.html}
          </div>
          <div class="footer">
            © 2024 My Company. All rights reserved.<br>
            <a href="#" style="color: #007bff;">Unsubscribe</a> |
            <a href="#" style="color: #007bff;">Contact Support</a>
          </div>
        </div>
      </body>
      </html>
    `
    return {
      ...email,
      html: wrappedHtml,
      text: `MY COMPANY\n\n${email.text}\n\n© 2024 My Company\nUnsubscribe: [link] | Contact Support: [link]`
    }
  }
 })
 ```
 #### Advanced Email Wrapper with Dynamic Content
 ```typescript
 mailingPlugin({
  // ... other config
  emailWrapper: (email) => {
    // You can access email properties and customize based on content
    const isTransactional = email.subject?.includes('Receipt') || email.subject?.includes('Confirmation');
    const headerColor = isTransactional ? '#28a745' : '#007bff';
    const headerText = isTransactional ? 'Order Confirmation' : 'My Company';
    const wrappedHtml = `
      <!DOCTYPE html>
      <html lang="en">
      <head>
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
        <title>${email.subject}</title>
        <!--[if mso]>
        <noscript>
          <xml>
            <o:OfficeDocumentSettings>
              <o:PixelsPerInch>96</o:PixelsPerInch>
            </o:OfficeDocumentSettings>
          </xml>
        </noscript>
        <![endif]-->
        <style>
          /* Reset styles */
          body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
          table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
          img { -ms-interpolation-mode: bicubic; border: 0; outline: none; text-decoration: none; }
          /* Base styles */
          body {
            margin: 0 !important;
            padding: 0 !important;
            background-color: #f4f4f4;
            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
          }
          .email-container {
            max-width: 600px;
            margin: 0 auto;
            background-color: #ffffff;
            border-radius: 8px;
            overflow: hidden;
            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
          }
          .email-header {
            background: linear-gradient(135deg, ${headerColor}, ${headerColor}dd);
            color: white;
            padding: 30px 20px;
            text-align: center;
          }
          .email-content {
            padding: 30px;
            color: #333333;
            line-height: 1.6;
          }
          .email-footer {
            background-color: #f8f9fa;
            padding: 20px;
            text-align: center;
            color: #6c757d;
            font-size: 14px;
            border-top: 1px solid #e9ecef;
          }
          .email-footer a {
            color: ${headerColor};
            text-decoration: none;
          }
          /* Responsive */
          @media only screen and (max-width: 600px) {
            .email-container {
              margin: 0 10px !important;
            }
            .email-header, .email-content {
              padding: 20px !important;
            }
          }
        </style>
      </head>
      <body>
        <div class="email-container">
          <div class="email-header">
            <h1 style="margin: 0; font-size: 24px;">${headerText}</h1>
          </div>
          <div class="email-content">
            ${email.html}
          </div>
          <div class="email-footer">
            <p style="margin: 0 0 10px;">© ${new Date().getFullYear()} My Company. All rights reserved.</p>
            <p style="margin: 0;">
              <a href="mailto:support@mycompany.com">Contact Support</a> |
              <a href="#">Privacy Policy</a> |
              <a href="#">Unsubscribe</a>
            </p>
          </div>
        </div>
      </body>
      </html>
    `
    // Also enhance the plain text version
    const wrappedText = `
 ${headerText.toUpperCase()}
 ${'='.repeat(headerText.length)}
 ${email.text || email.html?.replace(/<[^>]*>/g, '')}
 ---
 © ${new Date().getFullYear()} My Company. All rights reserved.
 Contact Support: support@mycompany.com
 Privacy Policy: [link]
 Unsubscribe: [link]
    `.trim();
    return {
      ...email,
      html: wrappedHtml,
      text: wrappedText
    }
  }
 })
 ```
 #### External CSS and Assets
 You can also reference external stylesheets and assets:
 ```typescript
 mailingPlugin({
  emailWrapper: (email) => {
    const wrappedHtml = `
      <!DOCTYPE html>
      <html>
      <head>
        <meta charset="utf-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <title>${email.subject}</title>
        <!-- External CSS -->
        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
        <style>
          body { font-family: 'Inter', sans-serif; }
          /* Your custom styles here */
        </style>
      </head>
      <body>
        <div style="max-width: 600px; margin: 0 auto;">
          <img src="https://mycompany.com/email-header.png" alt="My Company" style="width: 100%; height: auto;">
          <div style="padding: 20px;">
            ${email.html}
          </div>
          <img src="https://mycompany.com/email-footer.png" alt="Footer" style="width: 100%; height: auto;">
        </div>
      </body>
      </html>
    `;
    return { ...email, html: wrappedHtml };
  }
 })
 ```
 #### Template-Specific Layouts
 You can customize layouts based on email templates:
 ```typescript
 mailingPlugin({
  emailWrapper: (email, context) => {
    // Access template information if available
    const templateSlug = context?.templateSlug;
    let layoutClass = 'default-layout';
    let headerColor = '#007bff';
    if (templateSlug === 'welcome-email') {
      layoutClass = 'welcome-layout';
      headerColor = '#28a745';
    } else if (templateSlug === 'invoice-email') {
      layoutClass = 'invoice-layout';
      headerColor = '#dc3545';
    }
    const wrappedHtml = `
      <!DOCTYPE html>
      <html>
      <head>
        <meta charset="utf-8">
        <title>${email.subject}</title>
        <style>
          .${layoutClass} { /* template-specific styles */ }
          .header { background-color: ${headerColor}; }
        </style>
      </head>
      <body>
        <div class="${layoutClass}">
          ${email.html}
        </div>
      </body>
      </html>
    `;
    return { ...email, html: wrappedHtml };
  }
 })
 ```
 The `emailWrapper` hook receives the email object with `html`, `text`, and `subject` properties, and should return the modified email object with your custom layout applied.
 ### Custom Rich Text Editor
 Override the rich text editor used for templates:
--- a/dev/README.md
+++ b/dev/README.md
@@ -184,25 +184,43 @@ The plugin automatically processes the outbox every 5 minutes and retries failed
 ## Plugin API Usage
 ```javascript
-import { sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { sendEmail } from '@xtr-dev/payload-mailing'
-// Send immediate email
+// Send immediate email with template
-const emailId = await sendEmail(payload, {
+const email = await sendEmail(payload, {
-  templateId: 'welcome-template-id',
+  template: {
-  to: 'user@example.com',
+    slug: 'welcome-email',
-  variables: {
+    variables: {
-    firstName: 'John',
+      firstName: 'John',
-    siteName: 'My App'
+      siteName: 'My App'
    }
  },
  data: {
    to: 'user@example.com',
  }
 })
-// Schedule email
+// Schedule email for later
-const scheduledId = await scheduleEmail(payload, {
+const scheduledEmail = await sendEmail(payload, {
-  templateId: 'reminder-template-id', 
+  template: {
-  to: 'user@example.com',
+    slug: 'reminder',
-  scheduledAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
+    variables: {
-  variables: {
+      eventName: 'Product Launch'
-    eventName: 'Product Launch'
+    }
  },
  data: {
    to: 'user@example.com',
    scheduledAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
  }
 })
 // Send direct HTML email (no template)
 const directEmail = await sendEmail(payload, {
  data: {
    to: 'user@example.com',
    subject: 'Direct Email',
    html: '<h1>Hello World</h1>',
    text: 'Hello World'
  }
 })
 ```
--- a/dev/app/api/test-email/route.ts
+++ b/dev/app/api/test-email/route.ts
@@ -1,37 +1,50 @@
 import { getPayload } from 'payload'
 import config from '@payload-config'
-import { sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { sendEmail } from '@xtr-dev/payload-mailing'
 export async function POST(request: Request) {
  try {
    const payload = await getPayload({ config })
    const body = await request.json()
-    const { type = 'send', templateSlug, to, variables, scheduledAt } = body
+    const { type = 'send', templateSlug, to, variables, scheduledAt, subject, html, text } = body
-    let result
+    // Use the new sendEmail API
-    if (type === 'send') {
+    const emailOptions: any = {
-      // Send immediately
+      data: {
      result = await sendEmail(payload, {
        templateSlug,
        to,
-        variables,
+      }
      })
    } else if (type === 'schedule') {
      // Schedule for later
      result = await scheduleEmail(payload, {
        templateSlug,
        to,
        variables,
        scheduledAt: scheduledAt ? new Date(scheduledAt) : new Date(Date.now() + 60000), // Default to 1 minute
      })
    } else {
      return Response.json({ error: 'Invalid type. Use "send" or "schedule"' }, { status: 400 })
    }
    // Add template if provided
    if (templateSlug) {
      emailOptions.template = {
        slug: templateSlug,
        variables: variables || {}
      }
    } else if (subject && html) {
      // Direct email without template
      emailOptions.data.subject = subject
      emailOptions.data.html = html
      if (text) {
        emailOptions.data.text = text
      }
    } else {
      return Response.json({
        error: 'Either templateSlug or subject+html must be provided'
      }, { status: 400 })
    }
    // Add scheduling if needed
    if (type === 'schedule' || scheduledAt) {
      emailOptions.data.scheduledAt = scheduledAt ? new Date(scheduledAt) : new Date(Date.now() + 60000)
    }
    const result = await sendEmail(payload, emailOptions)
    return Response.json({
      success: true,
-      emailId: result,
+      emailId: result.id,
-      message: type === 'send' ? 'Email sent successfully' : 'Email scheduled successfully',
+      message: scheduledAt ? 'Email scheduled successfully' : 'Email queued successfully',
    })
  } catch (error) {
    console.error('Test email error:', error)
--- a/dev/payload-types.ts
+++ b/dev/payload-types.ts
@@ -100,7 +100,8 @@ export interface Config {
  };
  jobs: {
    tasks: {
-      'process-email-queue': ProcessEmailQueueJob;
+      processEmails: ProcessEmailsJob;
      'send-email': TaskSendEmail;
      inline: {
        input: unknown;
        output: unknown;
@@ -232,21 +233,17 @@ export interface Email {
   */
  template?: (string | null) | EmailTemplate;
  /**
-   * Template slug used for this email
+   * Recipient email addresses
   */
-  templateSlug?: string | null;
+  to: string[];
  /**
-   * Recipient email address(es), comma-separated
+   * CC email addresses
   */
-  to: string;
+  cc?: string[] | null;
  /**
-   * CC email address(es), comma-separated
+   * BCC email addresses
   */
-  cc?: string | null;
+  bcc?: string[] | null;
  /**
   * BCC email address(es), comma-separated
   */
  bcc?: string | null;
  /**
   * Sender email address (optional, uses default if not provided)
   */
@@ -362,7 +359,7 @@ export interface PayloadJob {
    | {
        executedAt: string;
        completedAt: string;
-        taskSlug: 'inline' | 'process-email-queue';
+        taskSlug: 'inline' | 'processEmails' | 'send-email';
        taskID: string;
        input?:
          | {
@@ -395,7 +392,7 @@ export interface PayloadJob {
        id?: string | null;
      }[]
    | null;
-  taskSlug?: ('inline' | 'process-email-queue') | null;
+  taskSlug?: ('inline' | 'processEmails' | 'send-email') | null;
  queue?: string | null;
  waitUntil?: string | null;
  processing?: boolean | null;
@@ -542,7 +539,6 @@ export interface EmailTemplatesSelect<T extends boolean = true> {
 */
 export interface EmailsSelect<T extends boolean = true> {
  template?: T;
  templateSlug?: T;
  to?: T;
  cc?: T;
  bcc?: T;
@@ -627,12 +623,69 @@ export interface PayloadMigrationsSelect<T extends boolean = true> {
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "ProcessEmailQueueJob".
+ * via the `definition` "ProcessEmailsJob".
 */
-export interface ProcessEmailQueueJob {
+export interface ProcessEmailsJob {
  input?: unknown;
  output?: unknown;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "TaskSend-email".
 */
 export interface TaskSendEmail {
  input: {
    /**
     * Use a template (leave empty for direct email)
     */
    templateSlug?: string | null;
    /**
     * JSON object with variables for template rendering
     */
    variables?:
      | {
          [k: string]: unknown;
        }
      | unknown[]
      | string
      | number
      | boolean
      | null;
    /**
     * Email subject (required if not using template)
     */
    subject?: string | null;
    /**
     * HTML email content (required if not using template)
     */
    html?: string | null;
    /**
     * Plain text email content (optional)
     */
    text?: string | null;
    /**
     * Comma-separated list of email addresses
     */
    to: string;
    /**
     * Optional comma-separated list of CC email addresses
     */
    cc?: string | null;
    /**
     * Optional comma-separated list of BCC email addresses
     */
    bcc?: string | null;
    /**
     * Optional date/time to schedule email for future delivery
     */
    scheduledAt?: string | null;
    /**
     * Email priority (1 = highest, 10 = lowest)
     */
    priority?: number | null;
  };
  output?: unknown;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "auth".
--- a/dev/payload.config.ts
+++ b/dev/payload.config.ts
@@ -1,12 +1,10 @@
 import { mongooseAdapter } from '@payloadcms/db-mongodb'
 import { lexicalEditor } from '@payloadcms/richtext-lexical'
 import {
  BlocksFeature,
  FixedToolbarFeature,
  HeadingFeature,
  HorizontalRuleFeature,
  InlineToolbarFeature,
  lexicalHTML,
 } from '@payloadcms/richtext-lexical'
 import { MongoMemoryReplSet } from 'mongodb-memory-server'
 import path from 'path'
@@ -17,7 +15,7 @@ import { fileURLToPath } from 'url'
 import { testEmailAdapter } from './helpers/testEmailAdapter.js'
 import { seed, seedUser } from './seed.js'
 import mailingPlugin from "../src/plugin.js"
-import { sendEmail } from "../src/utils/helpers.js"
+import {sendEmail} from "@xtr-dev/payload-mailing"
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -85,15 +83,19 @@ const buildConfigWithMemoryDB = async () => {
                  // Queue the welcome email using template slug
                  const emailId = await sendEmail(req.payload, {
-                    templateSlug: 'welcome-email',
+                    template: {
-                    to: doc.email,
+                      slug: 'welcome-email',
-                    variables: {
+                      variables: {
-                      firstName: doc.firstName || doc.email?.split('@')?.[0],
+                        firstName: doc.firstName || doc.email?.split('@')?.[0],
-                      siteName: 'PayloadCMS Mailing Demo',
+                        siteName: 'PayloadCMS Mailing Demo',
-                      createdAt: new Date().toISOString(),
+                        createdAt: new Date().toISOString(),
-                      isPremium: false,
+                        isPremium: false,
-                      dashboardUrl: 'http://localhost:3000/admin',
+                        dashboardUrl: 'http://localhost:3000/admin',
                      },
                    },
                    data: {
                      to: doc.email,
                    }
                  })
                  console.log('✅ Welcome email queued successfully. Email ID:', emailId)
@@ -280,56 +282,6 @@ const buildConfigWithMemoryDB = async () => {
          ],
        }),
        emailWrapper: (email) => {
          // Example: wrap email content in a custom layout
          const wrappedHtml = `
            <!DOCTYPE html>
            <html>
            <head>
              <meta charset="utf-8">
              <meta name="viewport" content="width=device-width, initial-scale=1">
              <title>${email.subject}</title>
              <style>
                body { font-family: Arial, sans-serif; margin: 0; padding: 20px; background-color: #f5f5f5; }
                .container { max-width: 600px; margin: 0 auto; background: white; border-radius: 8px; overflow: hidden; }
                .header { background: #007bff; color: white; padding: 20px; text-align: center; }
                .content { padding: 30px; }
                .footer { background: #f8f9fa; padding: 15px; text-align: center; font-size: 12px; color: #6c757d; }
              </style>
            </head>
            <body>
              <div class="container">
                <div class="header">
                  <h1>My Company</h1>
                </div>
                <div class="content">
                  ${email.html}
                </div>
                <div class="footer">
                  This email was sent from My Company. If you have questions, contact support@mycompany.com
                </div>
              </div>
            </body>
            </html>
          `
          const wrappedText = `
 MY COMPANY
 ==========
 ${email.text || email.html?.replace(/<[^>]*>/g, '')}
 ---
 This email was sent from My Company.
 If you have questions, contact support@mycompany.com
          `
          return {
            ...email,
            html: wrappedHtml,
            text: wrappedText.trim(),
          }
        },
        // Called after mailing plugin is fully initialized
        onReady: async (payload) => {
--- a/dev/seed.ts
+++ b/dev/seed.ts
@@ -102,7 +102,7 @@ export const seed = async (payload: Payload) => {
                        format: 0,
                        mode: 'normal',
                        style: '',
-                        text: 'Use the emailWrapper hook to add custom layouts',
+                        text: 'Create beautiful emails with rich text formatting',
                        type: 'text',
                        version: 1,
                      },
--- a/dev/test-plugin.mjs
+++ b/dev/test-plugin.mjs
@@ -1,10 +1,10 @@
 // Simple test to verify plugin can be imported and initialized
-import { mailingPlugin, sendEmail, scheduleEmail } from '@xtr-dev/payload-mailing'
+import { mailingPlugin, sendEmail, renderTemplate } from '@xtr-dev/payload-mailing'
 console.log('✅ Plugin imports successfully')
 console.log('✅ mailingPlugin:', typeof mailingPlugin)
-console.log('✅ sendEmail:', typeof sendEmail) 
+console.log('✅ sendEmail:', typeof sendEmail)
-console.log('✅ scheduleEmail:', typeof scheduleEmail)
+console.log('✅ renderTemplate:', typeof renderTemplate)
 // Test plugin configuration
 try {
--- a/dev/tsconfig.json
+++ b/dev/tsconfig.json
@@ -19,13 +19,13 @@
      "@payload-config": [
        "./payload.config.ts"
      ],
-      "temp-project": [
+      "@xtr-dev/payload-mailing": [
        "../src/index.ts"
      ],
-      "temp-project/client": [
+      "@xtr-dev/payload-mailing/client": [
        "../src/exports/client.ts"
      ],
-      "temp-project/rsc": [
+      "@xtr-dev/payload-mailing/rsc": [
        "../src/exports/rsc.ts"
      ]
    },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@xtr-dev/payload-mailing",
-  "version": "0.1.5",
+  "version": "0.1.11",
  "description": "Template-based email system with scheduling and job processing for PayloadCMS",
  "type": "module",
  "main": "dist/index.js",
@@ -23,8 +23,9 @@
    "dev:generate-importmap": "npm run dev:payload generate:importmap",
    "dev:generate-types": "npm run dev:payload generate:types",
    "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
-    "generate:importmap": "npm run dev:generate-importmap",
+    "payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
-    "generate:types": "npm run dev:generate-types",
+    "generate:importmap": "npm run payload generate:importmap",
    "generate:types": "npm run payload generate:types",
    "lint": "eslint",
    "lint:fix": "eslint ./src --fix",
    "prepublishOnly": "npm run clean && npm run build",
--- a/payload.config.ts
+++ b/payload.config.ts
@@ -0,0 +1,31 @@
 /**
 * This config is only used to generate types.
 */
 import { BaseDatabaseAdapter, buildConfig, Payload} from 'payload'
 import Emails from "./src/collections/Emails.js"
 import {createEmailTemplatesCollection} from "./src/collections/EmailTemplates.js"
 import path from "path"
 import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 export default buildConfig({
  collections: [
    Emails,
    createEmailTemplatesCollection()
  ],
  db: {
    allowIDOnCreate: undefined,
    defaultIDType: 'number',
    init: function (args: { payload: Payload; }): BaseDatabaseAdapter {
      throw new Error('Function not implemented.');
    },
    name: undefined
  },
  secret: '',
  typescript: {
    outputFile: path.resolve(__dirname, 'src/payload-types.ts'),
  }
 });
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,13 +15,15 @@ export { default as Emails } from './collections/Emails.js'
 export { mailingJobs, sendEmailJob } from './jobs/index.js'
 export type { SendEmailTaskInput } from './jobs/sendEmailTask.js'
 // Main email sending function
 export { sendEmail, type SendEmailOptions } from './sendEmail.js'
 export { default as sendEmailDefault } from './sendEmail.js'
 // Utility functions for developers
 export {
  getMailing,
  renderTemplate,
  processEmails,
  retryFailedEmails,
-  sendEmail,
+  parseAndValidateEmails,
  type BaseEmailData,
  type SendEmailOptions,
 } from './utils/helpers.js'
--- a/src/jobs/sendEmailTask.ts
+++ b/src/jobs/sendEmailTask.ts
@@ -1,4 +1,6 @@
-import { sendEmail, type BaseEmailData } from '../utils/helpers.js'
+import { sendEmail } from '../sendEmail.js'
 import { Email } from '../payload-types.js'
 import {BaseEmail} from "../types/index.js"
 export interface SendEmailTaskInput {
  // Template mode fields
@@ -115,6 +117,12 @@ export const sendEmailJob = {
      }
    }
  ],
  outputSchema: [
    {
      name: 'id',
      type: 'text' as const
    }
  ],
  handler: async ({ input, payload }: any) => {
    // Cast input to our expected type
    const taskInput = input as SendEmailTaskInput
@@ -153,18 +161,12 @@ export const sendEmailJob = {
      })
      // Use the sendEmail helper to create the email
-      const email = await sendEmail<BaseEmailData>(payload, sendEmailOptions)
+      const email = await sendEmail<BaseEmail>(payload, sendEmailOptions)
      return {
        output: {
          success: true,
-          emailId: email.id,
+          id: email.id,
          message: `Email queued successfully with ID: ${email.id}`,
          mode: taskInput.templateSlug ? 'template' : 'direct',
          templateSlug: taskInput.templateSlug || null,
          subject: email.subject,
          recipients: Array.isArray(email.to) ? email.to.length : 1,
          scheduledAt: email.scheduledAt || null
        }
      }
@@ -175,4 +177,4 @@ export const sendEmailJob = {
  }
 }
-export default sendEmailJob
+export default sendEmailJob
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -0,0 +1,431 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
 * This file was automatically generated by Payload.
 * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
 * and re-run `payload generate:types` to regenerate this file.
 */
 /**
 * Supported timezones in IANA format.
 *
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "supportedTimezones".
 */
 export type SupportedTimezones =
  | 'Pacific/Midway'
  | 'Pacific/Niue'
  | 'Pacific/Honolulu'
  | 'Pacific/Rarotonga'
  | 'America/Anchorage'
  | 'Pacific/Gambier'
  | 'America/Los_Angeles'
  | 'America/Tijuana'
  | 'America/Denver'
  | 'America/Phoenix'
  | 'America/Chicago'
  | 'America/Guatemala'
  | 'America/New_York'
  | 'America/Bogota'
  | 'America/Caracas'
  | 'America/Santiago'
  | 'America/Buenos_Aires'
  | 'America/Sao_Paulo'
  | 'Atlantic/South_Georgia'
  | 'Atlantic/Azores'
  | 'Atlantic/Cape_Verde'
  | 'Europe/London'
  | 'Europe/Berlin'
  | 'Africa/Lagos'
  | 'Europe/Athens'
  | 'Africa/Cairo'
  | 'Europe/Moscow'
  | 'Asia/Riyadh'
  | 'Asia/Dubai'
  | 'Asia/Baku'
  | 'Asia/Karachi'
  | 'Asia/Tashkent'
  | 'Asia/Calcutta'
  | 'Asia/Dhaka'
  | 'Asia/Almaty'
  | 'Asia/Jakarta'
  | 'Asia/Bangkok'
  | 'Asia/Shanghai'
  | 'Asia/Singapore'
  | 'Asia/Tokyo'
  | 'Asia/Seoul'
  | 'Australia/Brisbane'
  | 'Australia/Sydney'
  | 'Pacific/Guam'
  | 'Pacific/Noumea'
  | 'Pacific/Auckland'
  | 'Pacific/Fiji';
 export interface Config {
  auth: {
    users: UserAuthOperations;
  };
  blocks: {};
  collections: {
    emails: Email;
    'email-templates': EmailTemplate;
    users: User;
    'payload-locked-documents': PayloadLockedDocument;
    'payload-preferences': PayloadPreference;
    'payload-migrations': PayloadMigration;
  };
  collectionsJoins: {};
  collectionsSelect: {
    emails: EmailsSelect<false> | EmailsSelect<true>;
    'email-templates': EmailTemplatesSelect<false> | EmailTemplatesSelect<true>;
    users: UsersSelect<false> | UsersSelect<true>;
    'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
    'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
    'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
  };
  db: {
    defaultIDType: number;
  };
  globals: {};
  globalsSelect: {};
  locale: null;
  user: User & {
    collection: 'users';
  };
  jobs: {
    tasks: unknown;
    workflows: unknown;
  };
 }
 export interface UserAuthOperations {
  forgotPassword: {
    email: string;
    password: string;
  };
  login: {
    email: string;
    password: string;
  };
  registerFirstUser: {
    email: string;
    password: string;
  };
  unlock: {
    email: string;
    password: string;
  };
 }
 /**
 * Email delivery and status tracking
 *
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "emails".
 */
 export interface Email {
  id: number;
  /**
   * Email template used (optional if custom content provided)
   */
  template?: (number | null) | EmailTemplate;
  /**
   * Recipient email addresses
   */
  to: string[];
  /**
   * CC email addresses
   */
  cc?: string[] | null;
  /**
   * BCC email addresses
   */
  bcc?: string[] | null;
  /**
   * Sender email address (optional, uses default if not provided)
   */
  from?: string | null;
  /**
   * Reply-to email address
   */
  replyTo?: string | null;
  /**
   * Email subject line
   */
  subject: string;
  /**
   * Rendered HTML content of the email
   */
  html: string;
  /**
   * Plain text version of the email
   */
  text?: string | null;
  /**
   * Template variables used to render this email
   */
  variables?:
    | {
        [k: string]: unknown;
      }
    | unknown[]
    | string
    | number
    | boolean
    | null;
  /**
   * When this email should be sent (leave empty for immediate)
   */
  scheduledAt?: string | null;
  /**
   * When this email was actually sent
   */
  sentAt?: string | null;
  /**
   * Current status of this email
   */
  status: 'pending' | 'processing' | 'sent' | 'failed';
  /**
   * Number of send attempts made
   */
  attempts?: number | null;
  /**
   * When the last send attempt was made
   */
  lastAttemptAt?: string | null;
  /**
   * Last error message if send failed
   */
  error?: string | null;
  /**
   * Email priority (1=highest, 10=lowest)
   */
  priority?: number | null;
  updatedAt: string;
  createdAt: string;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "email-templates".
 */
 export interface EmailTemplate {
  id: number;
  /**
   * A descriptive name for this email template
   */
  name: string;
  /**
   * Unique identifier for this template (e.g., "welcome-email", "password-reset")
   */
  slug: string;
  /**
   * Email subject line. You can use Handlebars variables like {{firstName}} or {{siteName}}.
   */
  subject: string;
  /**
   * Email content with rich text formatting. Supports Handlebars variables like {{firstName}} and helpers like {{formatDate createdAt "long"}}. Content is converted to HTML and plain text automatically.
   */
  content: {
    root: {
      type: string;
      children: {
        type: string;
        version: number;
        [k: string]: unknown;
      }[];
      direction: ('ltr' | 'rtl') | null;
      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
      indent: number;
      version: number;
    };
    [k: string]: unknown;
  };
  updatedAt: string;
  createdAt: string;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "users".
 */
 export interface User {
  id: number;
  updatedAt: string;
  createdAt: string;
  email: string;
  resetPasswordToken?: string | null;
  resetPasswordExpiration?: string | null;
  salt?: string | null;
  hash?: string | null;
  loginAttempts?: number | null;
  lockUntil?: string | null;
  sessions?:
    | {
        id: string;
        createdAt?: string | null;
        expiresAt: string;
      }[]
    | null;
  password?: string | null;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-locked-documents".
 */
 export interface PayloadLockedDocument {
  id: number;
  document?:
    | ({
        relationTo: 'emails';
        value: number | Email;
      } | null)
    | ({
        relationTo: 'email-templates';
        value: number | EmailTemplate;
      } | null)
    | ({
        relationTo: 'users';
        value: number | User;
      } | null);
  globalSlug?: string | null;
  user: {
    relationTo: 'users';
    value: number | User;
  };
  updatedAt: string;
  createdAt: string;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-preferences".
 */
 export interface PayloadPreference {
  id: number;
  user: {
    relationTo: 'users';
    value: number | User;
  };
  key?: string | null;
  value?:
    | {
        [k: string]: unknown;
      }
    | unknown[]
    | string
    | number
    | boolean
    | null;
  updatedAt: string;
  createdAt: string;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-migrations".
 */
 export interface PayloadMigration {
  id: number;
  name?: string | null;
  batch?: number | null;
  updatedAt: string;
  createdAt: string;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "emails_select".
 */
 export interface EmailsSelect<T extends boolean = true> {
  template?: T;
  to?: T;
  cc?: T;
  bcc?: T;
  from?: T;
  replyTo?: T;
  subject?: T;
  html?: T;
  text?: T;
  variables?: T;
  scheduledAt?: T;
  sentAt?: T;
  status?: T;
  attempts?: T;
  lastAttemptAt?: T;
  error?: T;
  priority?: T;
  updatedAt?: T;
  createdAt?: T;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "email-templates_select".
 */
 export interface EmailTemplatesSelect<T extends boolean = true> {
  name?: T;
  slug?: T;
  subject?: T;
  content?: T;
  updatedAt?: T;
  createdAt?: T;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "users_select".
 */
 export interface UsersSelect<T extends boolean = true> {
  updatedAt?: T;
  createdAt?: T;
  email?: T;
  resetPasswordToken?: T;
  resetPasswordExpiration?: T;
  salt?: T;
  hash?: T;
  loginAttempts?: T;
  lockUntil?: T;
  sessions?:
    | T
    | {
        id?: T;
        createdAt?: T;
        expiresAt?: T;
      };
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-locked-documents_select".
 */
 export interface PayloadLockedDocumentsSelect<T extends boolean = true> {
  document?: T;
  globalSlug?: T;
  user?: T;
  updatedAt?: T;
  createdAt?: T;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-preferences_select".
 */
 export interface PayloadPreferencesSelect<T extends boolean = true> {
  user?: T;
  key?: T;
  value?: T;
  updatedAt?: T;
  createdAt?: T;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "payload-migrations_select".
 */
 export interface PayloadMigrationsSelect<T extends boolean = true> {
  name?: T;
  batch?: T;
  updatedAt?: T;
  createdAt?: T;
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
 * via the `definition` "auth".
 */
 export interface Auth {
  [k: string]: unknown;
 }
 declare module 'payload' {
  export interface GeneratedTypes extends Config {}
 }
--- a/src/sendEmail.ts
+++ b/src/sendEmail.ts
@@ -0,0 +1,103 @@
 import { Payload } from 'payload'
 import { getMailing, renderTemplate, parseAndValidateEmails } from './utils/helpers.js'
 import {Email} from "./payload-types.js"
 import {BaseEmail} from "./types/index.js"
 // Options for sending emails
 export interface SendEmailOptions<T extends BaseEmail = BaseEmail> {
  // Template-based email
  template?: {
    slug: string
    variables?: Record<string, any>
  }
  // Direct email data
  data?: Partial<T>
  // Common options
  collectionSlug?: string // defaults to 'emails'
 }
 /**
 * Send an email with full type safety
 *
 * @example
 * ```typescript
 * // With your generated Email type
 * import { Email } from './payload-types'
 *
 * const email = await sendEmail<Email>(payload, {
 *   template: {
 *     slug: 'welcome',
 *     variables: { name: 'John' }
 *   },
 *   data: {
 *     to: 'user@example.com',
 *     customField: 'value' // Your custom fields are type-safe!
 *   }
 * })
 * ```
 */
 export const sendEmail = async <T extends BaseEmail = BaseEmail, ID = string | number>(
  payload: Payload,
  options: SendEmailOptions<T>
 ): Promise<T & {id: ID}> => {
  const mailing = getMailing(payload)
  const collectionSlug = options.collectionSlug || mailing.collections.emails || 'emails'
  let emailData: Partial<T> = { ...options.data } as Partial<T>
  // If using a template, render it first
  if (options.template) {
    const { html, text, subject } = await renderTemplate(
      payload,
      options.template.slug,
      options.template.variables || {}
    )
    // Template values take precedence over data values
    emailData = {
      ...emailData,
      subject,
      html,
      text,
    } as Partial<T>
  }
  // Validate required fields
  if (!emailData.to) {
    throw new Error('Field "to" is required for sending emails')
  }
  // Validate required fields based on whether template was used
  if (options.template) {
    // When using template, subject and html should have been set by renderTemplate
    if (!emailData.subject || !emailData.html) {
      throw new Error(`Template rendering failed: template "${options.template.slug}" did not provide required subject and html content`)
    }
  } else {
    // When not using template, user must provide subject and html directly
    if (!emailData.subject || !emailData.html) {
      throw new Error('Fields "subject" and "html" are required when sending direct emails without a template')
    }
  }
  // Process email addresses using shared validation (handle null values)
  if (emailData.to) {
    emailData.to = parseAndValidateEmails(emailData.to as string | string[])
  }
  if (emailData.cc) {
    emailData.cc = parseAndValidateEmails(emailData.cc as string | string[])
  }
  if (emailData.bcc) {
    emailData.bcc = parseAndValidateEmails(emailData.bcc as string | string[])
  }
  // Create the email in the collection with proper typing
  const email = await payload.create({
    collection: collectionSlug,
    data: emailData
  })
  return email as T & {id: ID}
 }
 export default sendEmail
--- a/src/services/MailingService.ts
+++ b/src/services/MailingService.ts
@@ -8,7 +8,7 @@ import {
  EmailTemplate,
  QueuedEmail,
  MailingTransportConfig,
-  EmailObject
+  BaseEmail
 } from '../types/index.js'
 import { serializeRichTextToHTML, serializeRichTextToText } from '../utils/richTextSerializer.js'
@@ -238,10 +238,10 @@ export class MailingService implements IMailingService {
      const email = await this.payload.findByID({
        collection: this.emailsCollection as any,
        id: emailId,
-      }) as QueuedEmail
+      }) as BaseEmail
-      let emailObject: EmailObject = {
+      const mailOptions = {
-        from: email.from || this.getDefaultFrom(),
+        from: email.from,
        to: email.to,
        cc: email.cc || undefined,
        bcc: email.bcc || undefined,
@@ -249,23 +249,6 @@ export class MailingService implements IMailingService {
        subject: email.subject,
        html: email.html,
        text: email.text || undefined,
        variables: email.variables,
      }
      // Apply emailWrapper hook if configured
      if (this.config.emailWrapper) {
        emailObject = await this.config.emailWrapper(emailObject)
      }
      const mailOptions = {
        from: emailObject.from,
        to: emailObject.to,
        cc: emailObject.cc || undefined,
        bcc: emailObject.bcc || undefined,
        replyTo: emailObject.replyTo || undefined,
        subject: emailObject.subject,
        html: emailObject.html,
        text: emailObject.text || undefined,
      }
      await this.transporter.sendMail(mailOptions)
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,20 +1,9 @@
 import { Payload } from 'payload'
-import type { CollectionConfig, RichTextField, TypedCollection } from 'payload'
+import type { CollectionConfig, RichTextField } from 'payload'
 import { Transporter } from 'nodemailer'
 import {Email} from "../payload-types.js"
-export interface EmailObject {
+export type BaseEmail<TEmail = Email, TEmailTemplate = EmailTemplate> = Omit<TEmail, 'id' | 'template'> & {template: Omit<TEmailTemplate, 'id'>}
  to: string | string[]
  cc?: string | string[]
  bcc?: string | string[]
  from?: string
  replyTo?: string
  subject: string
  html: string
  text?: string
  variables?: Record<string, any>
 }
 export type EmailWrapperHook = (email: EmailObject) => EmailObject | Promise<EmailObject>
 export type TemplateRendererHook = (template: string, variables: Record<string, any>) => string | Promise<string>
@@ -31,7 +20,6 @@ export interface MailingPluginConfig {
  queue?: string
  retryAttempts?: number
  retryDelay?: number
  emailWrapper?: EmailWrapperHook
  templateRenderer?: TemplateRendererHook
  templateEngine?: TemplateEngine
  richTextEditor?: RichTextField['editor']
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -1,38 +1,12 @@
 import { Payload } from 'payload'
 import { TemplateVariables } from '../types/index.js'
 // Base type for email data that all emails must have
 export interface BaseEmailData {
  to: string | string[]
  cc?: string | string[]
  bcc?: string | string[]
  subject?: string
  html?: string
  text?: string
  scheduledAt?: string | Date
  priority?: number
  [key: string]: any
 }
 // Options for sending emails
 export interface SendEmailOptions<T extends BaseEmailData = BaseEmailData> {
  // Template-based email
  template?: {
    slug: string
    variables?: Record<string, any>
  }
  // Direct email data
  data?: Partial<T>
  // Common options
  collectionSlug?: string // defaults to 'emails'
 }
 /**
 * Parse and validate email addresses
 * @internal
 */
-export const parseAndValidateEmails = (emails: string | string[] | undefined): string[] | undefined => {
+export const parseAndValidateEmails = (emails: string | string[] | null | undefined): string[] | undefined => {
-  if (!emails) return undefined
+  if (!emails || emails === null) return undefined
  let emailList: string[]
  if (Array.isArray(emails)) {
@@ -41,9 +15,20 @@ export const parseAndValidateEmails = (emails: string | string[] | undefined): s
    emailList = emails.split(',').map(email => email.trim()).filter(Boolean)
  }
-  // Basic email validation
+  // RFC 5322 compliant email validation
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
-  const invalidEmails = emailList.filter(email => !emailRegex.test(email))
+  const invalidEmails = emailList.filter(email => {
    // Check basic format
    if (!emailRegex.test(email)) return true
    // Check for common invalid patterns
    if (email.includes('..') || email.startsWith('.') || email.endsWith('.')) return true
    if (email.includes('@.') || email.includes('.@')) return true
    // Check domain has at least one dot
    const parts = email.split('@')
    if (parts.length !== 2 || !parts[1].includes('.')) return true
    return false
  })
  if (invalidEmails.length > 0) {
    throw new Error(`Invalid email addresses: ${invalidEmails.join(', ')}`)
  }
@@ -72,84 +57,4 @@ export const processEmails = async (payload: Payload): Promise<void> => {
 export const retryFailedEmails = async (payload: Payload): Promise<void> => {
  const mailing = getMailing(payload)
  return mailing.service.retryFailedEmails()
 }
 /**
 * Send an email with full type safety
 *
 * @example
 * ```typescript
 * // With your generated Email type
 * import { Email } from './payload-types'
 *
 * const email = await sendEmail<Email>(payload, {
 *   template: {
 *     slug: 'welcome',
 *     variables: { name: 'John' }
 *   },
 *   data: {
 *     to: 'user@example.com',
 *     customField: 'value' // Your custom fields are type-safe!
 *   }
 * })
 * ```
 */
 export const sendEmail = async <T extends BaseEmailData = BaseEmailData>(
  payload: Payload,
  options: SendEmailOptions<T>
 ): Promise<T> => {
  const mailing = getMailing(payload)
  const collectionSlug = options.collectionSlug || mailing.collections.emails || 'emails'
  let emailData: Partial<T> = { ...options.data } as Partial<T>
  // If using a template, render it first
  if (options.template) {
    const { html, text, subject } = await renderTemplate(
      payload,
      options.template.slug,
      options.template.variables || {}
    )
    // Template values take precedence over data values
    emailData = {
      ...emailData,
      subject,
      html,
      text,
    } as Partial<T>
  }
  // Validate required fields
  if (!emailData.to) {
    throw new Error('Field "to" is required for sending emails')
  }
  if (!emailData.subject || !emailData.html) {
    throw new Error('Fields "subject" and "html" are required when not using a template')
  }
  // Process email addresses using shared validation
  if (emailData.to) {
    emailData.to = parseAndValidateEmails(emailData.to as string | string[])
  }
  if (emailData.cc) {
    emailData.cc = parseAndValidateEmails(emailData.cc as string | string[])
  }
  if (emailData.bcc) {
    emailData.bcc = parseAndValidateEmails(emailData.bcc as string | string[])
  }
  // Convert scheduledAt to ISO string if it's a Date
  if (emailData.scheduledAt instanceof Date) {
    emailData.scheduledAt = emailData.scheduledAt.toISOString()
  }
  // Create the email in the collection
  const email = await payload.create({
    collection: collectionSlug as any,
    data: emailData as any
  })
  return email as unknown as T
 }
Author	SHA1	Message	Date
Bas	768b70a003	Merge pull request #27 from xtr-dev/dev Align `sendEmail` and `sendEmailTask` with updated `BaseEmail` typing	2025-09-13 22:49:05 +02:00
Bas van den Aakster	e91ab7e54e	Bump package version to 0.1.11 in `package.json`.	2025-09-13 22:48:55 +02:00
Bas van den Aakster	06f9c2cb5b	Align `sendEmail` and `sendEmailTask` with updated `BaseEmail` typing - Refactor `sendEmail` to return extended type with `id` for better type inference. - Update `sendEmailTask` to use `BaseEmail` instead of `Email`. - Add `outputSchema` in `sendEmailTask` for consistent output structure.	2025-09-13 22:46:30 +02:00
Bas	21b22a033a	Merge pull request #26 from xtr-dev/dev Refactor `sendEmail` to improve type safety and align with `BaseEmail…	2025-09-13 22:41:28 +02:00
Bas van den Aakster	6ad90874cf	Refactor `sendEmail` to improve type safety and align with `BaseEmail` interface - Replace `Email` with `BaseEmail` for stricter type validation. - Update `SendEmailOptions` and `sendEmail` typing for improved extensibility.	2025-09-13 22:39:28 +02:00
Bas	03f1f62fbf	Merge pull request #25 from xtr-dev/dev Remove `emailWrapper` hook and all associated references.	2025-09-13 22:34:48 +02:00
Bas van den Aakster	e55e4197d3	Bump package version to 0.1.9 in `package.json`.	2025-09-13 22:32:19 +02:00
Bas van den Aakster	2e6feccf54	Remove `emailWrapper` hook and all associated references. - Simplified email sending logic by dropping custom layout wrapping. - Updated service, config, types, and readme to remove `emailWrapper` usage. - Retained focus on core email functionality while ensuring consistent formatting.	2025-09-13 22:31:05 +02:00
Bas	e38b63d814	Merge pull request #24 from xtr-dev/dev Dev	2025-09-13 22:00:51 +02:00
Bas van den Aakster	31721dc110	Add comment to clarify purpose of `payload.config.ts`	2025-09-13 22:00:29 +02:00
Bas van den Aakster	6e4f754306	Fix critical type safety and validation issues Issue 2 - Type Safety: - Remove dangerous 'as any' casts in sendEmail function - Use proper typing for payload.create() calls - Maintain type safety throughout email creation process Issue 3 - Email Validation: - Implement RFC 5322 compliant email regex - Add comprehensive validation for common invalid patterns - Check for consecutive dots, invalid domain formats - Prevent emails like 'test@.com' and 'test@domain.' Issue 4 - Error Message Logic: - Add contextual error messages for template vs direct email modes - Distinguish between template rendering failures and missing direct email content - Provide clearer guidance to developers on what went wrong Additional fixes: - Update imports to use generated Email type instead of BaseEmailData - Maintain compatibility with updated sendEmail interface 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-13 21:57:02 +02:00
Bas van den Aakster	45559804b0	Refactor email handling for improved type safety and extensibility - Replace `BaseEmailData` with `Email` type for stricter type validation - Update `sendEmail` API to support new typed structure and template integration - Migrate to `@xtr-dev/payload-mailing` for enhanced email sending capabilities - Remove unnecessary null checks and redundant code in email scheduling logic - Regenerate PayloadCMS types for aligning with revised schema changes - Update dev scripts and imports for seamless compatibility with the new email module	2025-09-13 21:51:52 +02:00
Bas van den Aakster	934b7c2de7	Fix ES module __dirname error in payload config Resolves: ReferenceError: __dirname is not defined in ES module scope - Import fileURLToPath from 'url' module - Create __filename and __dirname using ES module pattern - Maintains compatibility with TypeScript output file path resolution 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-13 21:50:05 +02:00
Bas	c78a8c2480	Merge pull request #23 from xtr-dev/dev Fix TypeScript compatibility with PayloadCMS generated types	2025-09-13 21:10:09 +02:00
Bas van den Aakster	a27481c818	Bump package version to 0.1.7 in `package.json`.	2025-09-13 21:07:22 +02:00
Bas van den Aakster	b342f32d97	Simplify null checks in sendEmail validation logic	2025-09-13 21:06:54 +02:00
Bas van den Aakster	e1800f5a6e	Fix TypeScript compatibility with PayloadCMS generated types Resolves: TS2344: Type Email does not satisfy the constraint BaseEmailData - Add null support to BaseEmailData interface for all optional fields - Update parseAndValidateEmails to handle null values - Update sendEmail validation to properly check for null values - Maintain compatibility with PayloadCMS generated types that include null Generated Email types like cc?: string[] \| null \| undefined now work correctly. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-13 21:03:21 +02:00
Bas	0c4d894f51	Merge pull request #22 from xtr-dev/dev Move sendEmail to dedicated file for better visibility	2025-09-13 20:58:13 +02:00
Bas van den Aakster	1af54c6573	Bump package version to 0.1.6 in `package.json`.	2025-09-13 20:55:00 +02:00
Bas van den Aakster	24f1f4c5a4	Fix broken development routes and imports Critical fixes: - Update dev/app/api/test-email/route.ts to use new sendEmail API instead of deprecated sendEmail/scheduleEmail - Fix dev/test-plugin.mjs imports to remove scheduleEmail reference - Update dev/README.md examples to use new sendEmail pattern - Replace templateId with template.slug throughout dev examples - Add support for direct HTML emails in test route The development routes now work correctly with v0.1.5 API changes. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-13 20:53:54 +02:00
Bas van den Aakster	de41f4ecb2	Move sendEmail to dedicated file for better visibility - Extract sendEmail function to src/sendEmail.ts as primary module - Export BaseEmailData and SendEmailOptions interfaces alongside - Update all imports to use new location - Add sendEmailDefault export for CommonJS compatibility - Export parseAndValidateEmails for external utility use - Updated README to highlight sendEmail as primary export Breaking change: BaseEmailData and SendEmailOptions now imported from main module, not utils/helpers 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-09-13 20:46:38 +02:00