@latte-macchiat-io/latte-payload 1.0.1 → 1.0.3

package/src/collections/QueuedEmails/index.ts

@@ -1,246 +1,272 @@
 import { CollectionConfig } from 'payload';
-import { admins } from '../../access/admins';
+import { admins } from '@/access/admins';
 
-export const QueuedEmails: CollectionConfig = {
-  slug: 'queued-emails',
-  labels: {
-    singular: { fr: 'Email en file', nl: 'E-mail in wachtrij', en: 'Queued Email' },
-    plural: { fr: 'Emails en file', nl: 'E-mails in wachtrij', en: 'Queued Emails' },
-  },
-  admin: {
-    description: { fr: "File d'attente des emails à envoyer", nl: 'Wachtrij van te verzenden e-mails', en: 'Queue of emails to send' },
-    group: '✉️ Communication',
-    defaultColumns: ['status', 'code', 'recipient', 'createdAt', 'sentAt'],
-    hideAPIURL: true,
-  },
-  access: {
-    create: () => false, // Only created programmatically
-    delete: admins, // Allow admins to clean up old emails
-    read: admins,
-    update: admins, // Allow admins to manually retry failed emails
-    admin: admins,
-  },
-  fields: [
-    {
-      name: 'idempotencyKey',
-      label: { fr: "Clé d'idempotence", nl: 'Idempotentiesleutel', en: 'Idempotency Key' },
-      type: 'text',
-      required: false,
-      unique: true,
-      index: true,
-      admin: {
-        readOnly: true,
-        description: {
-          fr: 'Clé unique pour éviter les doublons',
-          nl: 'Unieke sleutel om duplicaten te voorkomen',
-          en: 'Unique key to prevent duplicates',
-        },
-      },
+/**
+ * Configuration options for QueuedEmails collection
+ */
+export interface QueuedEmailsConfig {
+  /**
+   * Default maximum number of retry attempts
+   * @default 5
+   */
+  defaultMaxAttempts?: number;
+}
+
+/**
+ * Create QueuedEmails collection with optional configuration
+ *
+ * @param config - Optional configuration for queued emails
+ * @returns CollectionConfig for QueuedEmails
+ */
+export function createQueuedEmailsCollection(config?: QueuedEmailsConfig): CollectionConfig {
+  const defaultMaxAttempts = config?.defaultMaxAttempts ?? 5;
+
+  return {
+    slug: 'queued-emails',
+    labels: {
+      singular: { fr: 'Email en file', nl: 'E-mail in wachtrij', en: 'Queued Email' },
+      plural: { fr: 'Emails en file', nl: 'E-mails in wachtrij', en: 'Queued Emails' },
     },
-    {
-      type: 'row',
-      fields: [
-        {
-          name: 'status',
-          label: { fr: 'Statut', nl: 'Status', en: 'Status' },
-          type: 'select',
-          required: true,
-          defaultValue: 'pending',
-          options: [
-            { label: { fr: 'En attente', nl: 'In afwachting', en: 'Pending' }, value: 'pending' },
-            { label: { fr: 'Envoi en cours', nl: 'Verzenden', en: 'Sending' }, value: 'sending' },
-            { label: { fr: 'Envoyé', nl: 'Verzonden', en: 'Sent' }, value: 'sent' },
-            { label: { fr: 'Échec', nl: 'Mislukt', en: 'Failed' }, value: 'failed' },
-          ],
-          admin: {
-            readOnly: true,
-          },
-        },
-        {
-          name: 'code',
-          label: { fr: 'Identifiant', nl: 'Identificatie', en: 'Code' },
-          type: 'text',
-          required: true,
-          admin: {
-            readOnly: true,
-          },
-        },
-      ],
+    admin: {
+      description: { fr: "File d'attente des emails à envoyer", nl: 'Wachtrij van te verzenden e-mails', en: 'Queue of emails to send' },
+      group: '✉️ Communication',
+      defaultColumns: ['status', 'code', 'recipient', 'createdAt', 'sentAt'],
+      hideAPIURL: true,
     },
-    {
-      name: 'retryActions',
-      type: 'ui',
-      admin: {
-        components: {
-          Field: '@latte-macchiat-io/latte-payload/collections/QueuedEmails/components/RetryEmailButtons#RetryEmailButtons',
-        },
-        condition: (data) => data.status === 'failed' && data.attemptCount >= data.maxAttempts,
-      },
+    access: {
+      create: () => false, // Only created programmatically
+      delete: admins, // Allow admins to clean up old emails
+      read: admins,
+      update: admins, // Allow admins to manually retry failed emails
+      admin: admins,
     },
-    {
-      type: 'row',
-      fields: [
-        {
-          name: 'recipient',
-          label: { fr: 'Destinataire', nl: 'Ontvanger', en: 'Recipient' },
-          type: 'text',
-          required: true,
-          admin: {
-            readOnly: true,
+    fields: [
+      {
+        name: 'idempotencyKey',
+        label: { fr: "Clé d'idempotence", nl: 'Idempotentiesleutel', en: 'Idempotency Key' },
+        type: 'text',
+        required: false,
+        unique: true,
+        index: true,
+        admin: {
+          readOnly: true,
+          description: {
+            fr: 'Clé unique pour éviter les doublons',
+            nl: 'Unieke sleutel om duplicaten te voorkomen',
+            en: 'Unique key to prevent duplicates',
           },
         },
-        {
-          name: 'cc',
-          label: { fr: 'CC', nl: 'CC', en: 'CC' },
-          type: 'text',
-          required: false,
-          admin: {
-            readOnly: true,
+      },
+      {
+        type: 'row',
+        fields: [
+          {
+            name: 'status',
+            label: { fr: 'Statut', nl: 'Status', en: 'Status' },
+            type: 'select',
+            required: true,
+            defaultValue: 'pending',
+            options: [
+              { label: { fr: 'En attente', nl: 'In afwachting', en: 'Pending' }, value: 'pending' },
+              { label: { fr: 'Envoi en cours', nl: 'Verzenden', en: 'Sending' }, value: 'sending' },
+              { label: { fr: 'Envoyé', nl: 'Verzonden', en: 'Sent' }, value: 'sent' },
+              { label: { fr: 'Échec', nl: 'Mislukt', en: 'Failed' }, value: 'failed' },
+            ],
+            admin: {
+              readOnly: true,
+            },
           },
-        },
-      ],
-    },
-    {
-      name: 'subject',
-      label: { fr: "Sujet de l'email", nl: 'Onderwerp van de e-mail', en: 'Email subject' },
-      type: 'text',
-      required: true,
-      admin: {
-        readOnly: true,
+          {
+            name: 'code',
+            label: { fr: 'Identifiant', nl: 'Identificatie', en: 'Code' },
+            type: 'text',
+            required: true,
+            admin: {
+              readOnly: true,
+            },
+          },
+        ],
       },
-    },
-    {
-      name: 'htmlBody',
-      label: { fr: "Contenu de l'email", nl: 'Inhoud van de e-mail', en: 'Email content' },
-      type: 'textarea',
-      required: true,
-      admin: {
-        readOnly: true,
-        components: {
-          Field: '@latte-macchiat-io/latte-payload/collections/QueuedEmails/components/HtmlViewer#HTMLViewer',
+      {
+        name: 'retryActions',
+        type: 'ui',
+        admin: {
+          components: {
+            Field: '@latte-macchiat-io/latte-payload/collections/QueuedEmails/components/RetryEmailButtons#RetryEmailButtons',
+          },
+          condition: (data) => data.status === 'failed' && data.attemptCount >= data.maxAttempts,
         },
       },
-    },
-    {
-      type: 'row',
-      fields: [
-        {
-          name: 'attemptCount',
-          label: { fr: 'Nombre de tentatives', nl: 'Aantal pogingen', en: 'Attempt count' },
-          type: 'number',
-          required: true,
-          defaultValue: 0,
-          admin: {
-            readOnly: true,
+      {
+        type: 'row',
+        fields: [
+          {
+            name: 'recipient',
+            label: { fr: 'Destinataire', nl: 'Ontvanger', en: 'Recipient' },
+            type: 'text',
+            required: true,
+            admin: {
+              readOnly: true,
+            },
           },
-        },
-        {
-          name: 'maxAttempts',
-          label: { fr: 'Tentatives maximales', nl: 'Maximaal aantal pogingen', en: 'Max attempts' },
-          type: 'number',
-          required: true,
-          defaultValue: 5,
-          admin: {
-            readOnly: true,
+          {
+            name: 'cc',
+            label: { fr: 'CC', nl: 'CC', en: 'CC' },
+            type: 'text',
+            required: false,
+            admin: {
+              readOnly: true,
+            },
           },
+        ],
+      },
+      {
+        name: 'subject',
+        label: { fr: "Sujet de l'email", nl: 'Onderwerp van de e-mail', en: 'Email subject' },
+        type: 'text',
+        required: true,
+        admin: {
+          readOnly: true,
         },
-      ],
-    },
-    {
-      name: 'lastError',
-      label: { fr: 'Dernière erreur', nl: 'Laatste fout', en: 'Last error' },
-      type: 'textarea',
-      required: false,
-      admin: {
-        readOnly: true,
-        condition: (data) => data.status === 'failed',
       },
-    },
-    {
-      name: 'errorHistory',
-      label: { fr: 'Historique des erreurs', nl: 'Foutengeschiedenis', en: 'Error history' },
-      type: 'array',
-      required: false,
-      admin: {
-        readOnly: true,
-        condition: (data) => data.errorHistory && data.errorHistory.length > 0,
-        description: {
-          fr: 'Liste complète de toutes les erreurs rencontrées',
-          nl: 'Volledige lijst van alle fouten',
-          en: 'Complete list of all errors encountered',
+      {
+        name: 'htmlBody',
+        label: { fr: "Contenu de l'email", nl: 'Inhoud van de e-mail', en: 'Email content' },
+        type: 'textarea',
+        required: true,
+        admin: {
+          readOnly: true,
+          components: {
+            Field: '@latte-macchiat-io/latte-payload/collections/QueuedEmails/components/HtmlViewer#HTMLViewer',
+          },
         },
       },
-      fields: [
-        {
-          name: 'timestamp',
-          label: { fr: 'Date', nl: 'Datum', en: 'Timestamp' },
-          type: 'date',
-          required: true,
-          timezone: true,
-          admin: {
-            readOnly: true,
-            date: {
-              pickerAppearance: 'dayAndTime',
-              timeFormat: 'HH:mm:ss',
-              displayFormat: 'dd/MM/yyyy HH:mm:ss',
+      {
+        type: 'row',
+        fields: [
+          {
+            name: 'attemptCount',
+            label: { fr: 'Nombre de tentatives', nl: 'Aantal pogingen', en: 'Attempt count' },
+            type: 'number',
+            required: true,
+            defaultValue: 0,
+            admin: {
+              readOnly: true,
             },
           },
-        },
-        {
-          name: 'attemptNumber',
-          label: { fr: 'Tentative n°', nl: 'Poging nr.', en: 'Attempt #' },
-          type: 'number',
-          required: true,
-          admin: {
-            readOnly: true,
+          {
+            name: 'maxAttempts',
+            label: { fr: 'Tentatives maximales', nl: 'Maximaal aantal pogingen', en: 'Max attempts' },
+            type: 'number',
+            required: true,
+            defaultValue: defaultMaxAttempts,
+            admin: {
+              readOnly: true,
+            },
           },
+        ],
+      },
+      {
+        name: 'lastError',
+        label: { fr: 'Dernière erreur', nl: 'Laatste fout', en: 'Last error' },
+        type: 'textarea',
+        required: false,
+        admin: {
+          readOnly: true,
+          condition: (data) => data.status === 'failed',
         },
-        {
-          name: 'error',
-          label: { fr: "Message d'erreur", nl: 'Foutmelding', en: 'Error message' },
-          type: 'textarea',
-          required: true,
-          admin: {
-            readOnly: true,
+      },
+      {
+        name: 'errorHistory',
+        label: { fr: 'Historique des erreurs', nl: 'Foutengeschiedenis', en: 'Error history' },
+        type: 'array',
+        required: false,
+        admin: {
+          readOnly: true,
+          condition: (data) => data.errorHistory && data.errorHistory.length > 0,
+          description: {
+            fr: 'Liste complète de toutes les erreurs rencontrées',
+            nl: 'Volledige lijst van alle fouten',
+            en: 'Complete list of all errors encountered',
           },
         },
-      ],
-    },
-    {
-      type: 'row',
-      fields: [
-        {
-          name: 'lastAttemptAt',
-          label: { fr: 'Dernière tentative', nl: 'Laatste poging', en: 'Last attempt' },
-          type: 'date',
-          required: false,
-          timezone: true,
-          admin: {
-            readOnly: true,
-            date: {
-              pickerAppearance: 'dayAndTime',
-              timeFormat: 'HH:mm:ss',
-              displayFormat: 'dd/MM/yyyy HH:mm:ss',
+        fields: [
+          {
+            name: 'timestamp',
+            label: { fr: 'Date', nl: 'Datum', en: 'Timestamp' },
+            type: 'date',
+            required: true,
+            timezone: true,
+            admin: {
+              readOnly: true,
+              date: {
+                pickerAppearance: 'dayAndTime',
+                timeFormat: 'HH:mm:ss',
+                displayFormat: 'dd/MM/yyyy HH:mm:ss',
+              },
             },
           },
-        },
-        {
-          name: 'sentAt',
-          label: { fr: "Date d'envoi", nl: 'Verzenddatum', en: 'Sent at' },
-          type: 'date',
-          required: false,
-          timezone: true,
-          admin: {
-            readOnly: true,
-            date: {
-              pickerAppearance: 'dayAndTime',
-              timeFormat: 'HH:mm:ss',
-              displayFormat: 'dd/MM/yyyy HH:mm:ss',
+          {
+            name: 'attemptNumber',
+            label: { fr: 'Tentative n°', nl: 'Poging nr.', en: 'Attempt #' },
+            type: 'number',
+            required: true,
+            admin: {
+              readOnly: true,
             },
-            condition: (data) => data.status === 'sent',
           },
-        },
-      ],
-    },
-  ],
-};
+          {
+            name: 'error',
+            label: { fr: "Message d'erreur", nl: 'Foutmelding', en: 'Error message' },
+            type: 'textarea',
+            required: true,
+            admin: {
+              readOnly: true,
+            },
+          },
+        ],
+      },
+      {
+        type: 'row',
+        fields: [
+          {
+            name: 'lastAttemptAt',
+            label: { fr: 'Dernière tentative', nl: 'Laatste poging', en: 'Last attempt' },
+            type: 'date',
+            required: false,
+            timezone: true,
+            admin: {
+              readOnly: true,
+              date: {
+                pickerAppearance: 'dayAndTime',
+                timeFormat: 'HH:mm:ss',
+                displayFormat: 'dd/MM/yyyy HH:mm:ss',
+              },
+            },
+          },
+          {
+            name: 'sentAt',
+            label: { fr: "Date d'envoi", nl: 'Verzenddatum', en: 'Sent at' },
+            type: 'date',
+            required: false,
+            timezone: true,
+            admin: {
+              readOnly: true,
+              date: {
+                pickerAppearance: 'dayAndTime',
+                timeFormat: 'HH:mm:ss',
+                displayFormat: 'dd/MM/yyyy HH:mm:ss',
+              },
+              condition: (data) => data.status === 'sent',
+            },
+          },
+        ],
+      },
+    ],
+  };
+}
+
+/**
+ * Default QueuedEmails collection with standard configuration
+ */
+export const QueuedEmails = createQueuedEmailsCollection();

package/tests/fixtures/sample-data.ts

@@ -1,4 +1,4 @@
-import type { Locale } from '../../src/types';
+import type { Locale } from '../../src';
 
 export const sampleUsers = [
   {

package/tests/helpers/init-payload.ts

@@ -1,12 +1,12 @@
 import { sqliteAdapter } from '@payloadcms/db-sqlite';
 import { lexicalEditor } from '@payloadcms/richtext-lexical';
-import { Config, getPayload, type Payload } from 'payload';
+import { buildConfig, getPayload, type Payload } from 'payload';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import { createEmailTemplatesCollection } from '../../src/collections/EmailTemplates/index.js';
-import { createQueuedEmailsCollection } from '../../src/collections/QueuedEmails/index.js';
-import { createUsersCollection } from '../../src/collections/Users/index.js';
+import { createEmailTemplatesCollection } from '@/collections/EmailTemplates/index';
+import { createQueuedEmailsCollection } from '@/collections/QueuedEmails/index';
+import { createUsersCollection } from '@/collections/Users/index';
 
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
@@ -24,7 +24,7 @@ export async function initPayloadInt(): Promise<Payload> {
   }
 
   // Minimal test configuration
-  const config: Config = {
+  const config = buildConfig({
     secret: process.env.PAYLOAD_SECRET || 'test-secret-key',
     db: sqliteAdapter({
       client: {
@@ -40,7 +40,7 @@ export async function initPayloadInt(): Promise<Payload> {
     onInit: async (payload) => {
       payload.logger.info('Payload initialized for testing');
     },
-  };
+  });
 
   const payload = await getPayload({ config });
 

package/tests/setup.integration.ts

@@ -6,4 +6,4 @@ config({ path: '.env.test' });
 // Set test-specific environment variables
 process.env.PAYLOAD_DROP_DATABASE = 'true';
 process.env.PAYLOAD_DISABLE_ADMIN = 'true';
-process.env.NODE_ENV = 'test';
+(process.env as any).NODE_ENV = 'test'; // Ensure NODE_ENV is 'test' even if it's read-only in some environments

package/tests/unit/utils/id-from-payload.spec.ts

@@ -39,7 +39,7 @@ describe('id-from-payload utility', () => {
       });
 
       it('should extract id from object with other properties', () => {
-        expect(getId({ id: 123, name: 'test', email: 'test@example.com' })).toBe(123);
+        expect(getId({ id: 123, name: 'test', email: 'test@example.com' } as any)).toBe(123);
       });
 
       it('should handle object with only id property', () => {

package/tsconfig.json

@@ -8,7 +8,6 @@
     "allowJs": true,
     "checkJs": false,
     "outDir": "./dist",
-    "rootDir": "./src",
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
@@ -26,6 +25,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "tests/**/*"],
   "exclude": ["node_modules", "dist"]
 }

package/.claude/settings.local.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx tsc:*)",
-      "Bash(pnpm test:unit:*)",
-      "Bash(pnpm test:coverage:*)"
-    ]
-  }
-}