address template feedback

Author: sethconve

src/client/index.ts

@@ -9,6 +9,7 @@ import {
 import { v, type VString } from "convex/values";
 import { Webhook } from "svix";
 import {
+  Template,
   vEmailEvent,
   type EmailEvent,
   type RunMutationCtx,
@@ -303,43 +304,20 @@ export class Resend {
     if (this.config.apiKey === "") throw new Error("API key is not set");
 
     // Prepare the mutation args based on whether it's a template or traditional email
-    if ("template" in sendEmailArgs) {
-      // Template-based email
-      const id = await ctx.runMutation(this.component.lib.sendEmail, {
-        options: await configToRuntimeConfig(this.config, this.onEmailEvent),
-        from: sendEmailArgs.from,
-        to:
-          typeof sendEmailArgs.to === "string"
-            ? [sendEmailArgs.to]
-            : sendEmailArgs.to,
-        cc: toArray(sendEmailArgs.cc),
-        bcc: toArray(sendEmailArgs.bcc),
-        subject: sendEmailArgs.subject,
-        replyTo: sendEmailArgs.replyTo,
-        headers: sendEmailArgs.headers,
-        templateId: sendEmailArgs.template.id,
-        templateVariables: JSON.stringify(sendEmailArgs.template.variables),
-      });
-      return id as EmailId;
-    } else {
-      // Traditional email
-      const id = await ctx.runMutation(this.component.lib.sendEmail, {
-        options: await configToRuntimeConfig(this.config, this.onEmailEvent),
-        from: sendEmailArgs.from,
-        to:
-          typeof sendEmailArgs.to === "string"
-            ? [sendEmailArgs.to]
-            : sendEmailArgs.to,
-        cc: toArray(sendEmailArgs.cc),
-        bcc: toArray(sendEmailArgs.bcc),
-        replyTo: sendEmailArgs.replyTo,
-        headers: sendEmailArgs.headers,
-        subject: sendEmailArgs.subject,
-        html: sendEmailArgs.html,
-        text: sendEmailArgs.text,
-      });
-      return id as EmailId;
-    }
+
+    // Traditional email
+    const id = await ctx.runMutation(this.component.lib.sendEmail, {
+      options: await configToRuntimeConfig(this.config, this.onEmailEvent),
+      ...sendEmailArgs,
+      to:
+        typeof sendEmailArgs.to === "string"
+          ? [sendEmailArgs.to]
+          : sendEmailArgs.to,
+      cc: toArray(sendEmailArgs.cc),
+      bcc: toArray(sendEmailArgs.bcc),
+    });
+
+    return id as EmailId;
   }
 
   async sendEmailManually(
@@ -452,8 +430,7 @@ export class Resend {
     createdAt: number;
     html?: string;
     text?: string;
-    templateId?: string;
-    templateVariables?: string;
+    template?: Template;
   } | null> {
     return await ctx.runQuery(this.component.lib.get, {
       emailId,

src/component/_generated/component.ts

@@ -90,8 +90,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             | "bounced"
             | "failed";
           subject?: string;
-          templateId?: string;
-          templateVariables?: string;
+          template?: { id: string; variables: Record<string, string | number> };
           text?: string;
           to: Array<string>;
         } | null,
@@ -146,8 +145,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           };
           replyTo?: Array<string>;
           subject?: string;
-          templateId?: string;
-          templateVariables?: string;
+          template?: { id: string; variables: Record<string, string | number> };
           text?: string;
           to: Array<string>;
         },

src/component/lib.ts

@@ -18,6 +18,7 @@ import {
   vEmailEvent,
   vOptions,
   vStatus,
+  vTemplate,
 } from "./shared.js";
 import type { FunctionHandle } from "convex/server";
 import type { EmailEvent, RunMutationCtx, RunQueryCtx } from "./shared.js";
@@ -129,8 +130,7 @@ export const sendEmail = mutation({
     subject: v.optional(v.string()),
     html: v.optional(v.string()),
     text: v.optional(v.string()),
-    templateId: v.optional(v.string()),
-    templateVariables: v.optional(v.string()),
+    template: v.optional(vTemplate),
     replyTo: v.optional(v.array(v.string())),
     headers: v.optional(
       v.array(
@@ -155,7 +155,7 @@ export const sendEmail = mutation({
     }
     // We require either html/text or a template to be provided.
     const hasContent = args.html !== undefined || args.text !== undefined;
-    const hasTemplate = args.templateId !== undefined;
+    const hasTemplate = args.template?.id !== undefined;
 
     if (!hasContent && !hasTemplate) {
       throw new Error("Either html/text or template must be provided");
@@ -198,8 +198,7 @@ export const sendEmail = mutation({
       subject: args.subject,
       html: htmlContentId,
       text: textContentId,
-      templateId: args.templateId,
-      templateVariables: args.templateVariables,
+      template: args.template,
       headers: args.headers,
       segment,
       status: "waiting",
@@ -689,13 +688,8 @@ async function createResendBatchPayload(
     };
 
     // Add either template or traditional content
-    if (email.templateId) {
-      payload.template = {
-        id: email.templateId,
-        variables: email.templateVariables
-          ? JSON.parse(email.templateVariables)
-          : {},
-      };
+    if (email.template) {
+      payload.template = email.template;
       // Subject can be optionally provided with templates
       if (email.subject) {
         payload.subject = email.subject;

src/component/schema.ts

@@ -1,6 +1,6 @@
 import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
-import { vEventType, vOptions, vStatus } from "./shared.js";
+import { vEventType, vOptions, vStatus, vTemplate } from "./shared.js";
 
 export default defineSchema({
   content: defineTable({
@@ -31,8 +31,7 @@ export default defineSchema({
     replyTo: v.array(v.string()),
     html: v.optional(v.id("content")),
     text: v.optional(v.id("content")),
-    templateId: v.optional(v.string()),
-    templateVariables: v.optional(v.string()),
+    template: v.optional(vTemplate),
     headers: v.optional(
       v.array(
         v.object({