refactor (#7)

.prettierrc

@@ -2,7 +2,6 @@
   "semi": true,
   "trailingComma": "all",
   "singleQuote": true,
-  "printWidth": 120,
   "tabWidth": 2,
   "useTabs": false
 }

src/index.js

@@ -1,21 +1,28 @@
 import { mail } from './mail';
 
 const validate = async (request) => {
+  const contentType = request.headers.get('content-type');
   const required = ['subject', 'to'];
   let data = {};
   try {
-    if (request.headers.get('content-type') === 'application/json') {
+    if (contentType === 'application/json') {
       data = (await request.json()) ?? {};
     }
 
-    if (request.headers.get('content-type') === 'application/x-www-form-urlencoded') {
-      data = Object.fromEntries(new URLSearchParams((await request.text()) ?? ''));
+    if (contentType === 'application/x-www-form-urlencoded') {
+      data = Object.fromEntries(
+        new URLSearchParams((await request.text()) ?? ''),
+      );
     }
   } catch (e) {
     data = {};
   }
 
-  data.errors = required.reduce((acc, el) => (data?.[el] ? acc : [...acc, `missing required parameter '${el}'`]), []);
+  data.errors = required.reduce(
+    (acc, el) =>
+      data?.[el] ? acc : [...acc, `missing required parameter '${el}'`],
+    [],
+  );
 
   return data;
 };

src/index.spec.js

@@ -1,4 +1,9 @@
-import { env, createExecutionContext, waitOnExecutionContext, SELF } from 'cloudflare:test';
+import {
+  env,
+  createExecutionContext,
+  waitOnExecutionContext,
+  SELF,
+} from 'cloudflare:test';
 import { describe, it, expect } from 'vitest';
 import worker from '../src';
 
@@ -19,7 +24,10 @@ describe('API', () => {
     });
     const response = await send(request);
     expect(await response.json()).toEqual({
-      errors: ["missing required parameter 'subject'", "missing required parameter 'to'"],
+      errors: [
+        "missing required parameter 'subject'",
+        "missing required parameter 'to'",
+      ],
     });
     expect(response.status).toEqual(400);
   });

src/mail.js

@@ -1,28 +1,30 @@
+const payload = ({ subject, to }) => ({
+  // https://docs.sendgrid.com/api-reference/mail-send/mail-send#body
+  content: [
+    {
+      type: 'text/plain',
+      value: ' ',
+    },
+  ],
+  from: {
+    email: '[email protected]',
+  },
+  personalizations: [
+    {
+      subject,
+      to: [{ email: to }],
+    },
+  ],
+});
+
 export const mail = async ({ subject, to, env = {} }) => {
   const response = await fetch('https://api.sendgrid.com/v3/mail/send', {
     headers: {
       Authorization: `Bearer ${env.SENDGRID_API_KEY}`,
       'Content-Type': 'application/json',
     },
     method: 'POST',
-    body: JSON.stringify({
-      // https://docs.sendgrid.com/api-reference/mail-send/mail-send#body
-      content: [
-        {
-          type: 'text/plain',
-          value: ' ',
-        },
-      ],
-      from: {
-        email: '[email protected]',
-      },
-      personalizations: [
-        {
-          subject,
-          to: [{ email: to }],
-        },
-      ],
-    }),
+    body: JSON.stringify(payload({ subject, to })),
   });
   let data;
   try {

src/mail.test.js

@@ -16,13 +16,16 @@ describe('mail', () => {
     const to = '[email protected]';
     const subject = 'hello';
     await mail({ to, subject });
-    expect(global.fetch).toHaveBeenCalledWith('https://api.sendgrid.com/v3/mail/send', {
-      headers: {
-        Authorization: expect.any(String),
-        'Content-Type': 'application/json',
+    expect(global.fetch).toHaveBeenCalledWith(
+      'https://api.sendgrid.com/v3/mail/send',
+      {
+        headers: {
+          Authorization: expect.any(String),
+          'Content-Type': 'application/json',
+        },
+        method: 'POST',
+        body: expect.stringMatching(/hello(.*)ex@mple.com/),
       },
-      method: 'POST',
-      body: expect.stringMatching(/hello(.*)ex@mple.com/),
-    });
+    );
   });
 });