@odla-ai/chapter 0.60.0 → 0.61.0

package/dist/worker/index.d.cts

@@ -122,7 +122,7 @@ interface ChapterCopy {
         availability: TextFields<"loading" | "loadFailed" | "saved" | "title" | "days" | "startHour" | "endHour" | "slotMinutes" | "minNoticeHours" | "windowDays" | "timezone" | "summaryTemplate" | "save"> & {
             dayLabels: readonly string[];
         };
-        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
+        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "htmlBody" | "htmlBodyHint" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
         meetings: TextFields<"loading" | "loadFailed" | "cancelConfirm" | "newStartPrompt" | "parseFailed" | "agenda" | "empty" | "unknown" | "drift" | "meet" | "reschedule" | "cancel">;
         admission: TextFields<"title" | "description" | "email" | "decision" | "expires" | "note" | "waive" | "require" | "add" | "ledger" | "loading" | "consumed" | "revoked" | "expired" | "active" | "local" | "parent" | "revoke">;
         network: AdminNetworkCopy;

package/dist/worker/index.d.ts

@@ -122,7 +122,7 @@ interface ChapterCopy {
         availability: TextFields<"loading" | "loadFailed" | "saved" | "title" | "days" | "startHour" | "endHour" | "slotMinutes" | "minNoticeHours" | "windowDays" | "timezone" | "summaryTemplate" | "save"> & {
             dayLabels: readonly string[];
         };
-        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
+        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "htmlBody" | "htmlBodyHint" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
         meetings: TextFields<"loading" | "loadFailed" | "cancelConfirm" | "newStartPrompt" | "parseFailed" | "agenda" | "empty" | "unknown" | "drift" | "meet" | "reschedule" | "cancel">;
         admission: TextFields<"title" | "description" | "email" | "decision" | "expires" | "note" | "waive" | "require" | "add" | "ledger" | "loading" | "consumed" | "revoked" | "expired" | "active" | "local" | "parent" | "revoke">;
         network: AdminNetworkCopy;

package/dist/worker/index.js

@@ -1642,18 +1642,72 @@ function isRetiredEmailCopy(subject, text10) {
 // src/email.ts
 import { validateEmailCopy } from "@odla-ai/crm";
 
+// src/email-render.ts
+import { renderTemplate, templateLiveVars, templateSectionIssues, templateSectionNames, templateVars } from "@odla-ai/crm";
+
+// src/email-html.ts
+var URL_RE = /https?:\/\/[^\s<>"')\]]+[^\s<>"').,;:!?\]]/g;
+function escapeHtml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function lineHtml(line) {
+  let out = "", last = 0;
+  for (const match of line.matchAll(URL_RE)) {
+    out += escapeHtml(line.slice(last, match.index));
+    const url = escapeHtml(match[0]);
+    out += `<a href="${url}">${url}</a>`;
+    last = match.index + match[0].length;
+  }
+  return out + escapeHtml(line.slice(last));
+}
+function textToHtml(text10) {
+  const paragraphs = text10.replace(/\r\n/g, "\n").trim().split(/\n{2,}/).filter((paragraph) => paragraph.trim());
+  const body = paragraphs.map((paragraph) => `<p>${paragraph.split("\n").map(lineHtml).join("<br>\n")}</p>`).join("\n");
+  return `<!doctype html>
+<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width"></head>
+<body style="margin:0;padding:24px 16px;background:#ffffff;color:#1a1a1a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;font-size:16px;line-height:1.5">
+${body}
+</body></html>`;
+}
+
+// src/email-render.ts
+function render(template, vars) {
+  return renderTemplate(template, vars);
+}
+var HTML_BODY_LIMIT = 2e5;
+function renderHtmlBody(template, vars) {
+  const escaped = Object.fromEntries(Object.entries(vars).map(([name, value]) => [name, escapeHtml(value).replace(/\r?\n/g, "<br>")]));
+  return renderTemplate(template, escaped);
+}
+function htmlBodyIssues(html, options) {
+  const issues = [];
+  if (html.length > HTML_BODY_LIMIT) issues.push({ code: "html-invalid", message: `Keep the HTML body within ${HTML_BODY_LIMIT.toLocaleString("en-US")} characters.` });
+  for (const message of templateSectionIssues(html)) issues.push({ code: "section-invalid", message: `${message} (HTML body)` });
+  const unknown = new Set(templateVars(html).filter((variable) => options.allowedVariables && !options.allowedVariables.includes(variable)));
+  for (const variable of unknown) issues.push({ code: "variable-unknown", variable, message: `This event does not supply {{${variable}}} (HTML body).` });
+  if (options.values) {
+    for (const name of templateSectionNames(html)) if (typeof options.values[name] !== "string") issues.push({ code: "value-missing", variable: name, message: `Missing event value: ${name} (HTML body).` });
+    for (const variable of templateLiveVars(html, options.values)) {
+      if (unknown.has(variable)) continue;
+      const value = options.values[variable];
+      if (typeof value !== "string" || !value.trim() && !options.optionalVariables?.includes(variable)) issues.push({ code: "value-missing", variable, message: `Missing event value: ${variable} (HTML body).` });
+    }
+  }
+  return issues;
+}
+
 // src/email-events.ts
 var identity = ["firstName", "lastName", "email", "phone", "state"];
 var policy = ["refundPolicyText", "commitmentText", "normsText"];
-var checkout = ["tier", "tierName", "paymentAmount", "paymentAmountSummary"];
-var optionalVariables = ["phone", "state", "paymentAmount", "paymentAmountSummary"];
+var checkout = ["tier", "tierName", "paymentAmount", "paymentAmountSummary", "namedSeat", "namedSeatRecipientName"];
+var optionalVariables = ["phone", "state", "paymentAmount", "paymentAmountSummary", "namedSeat", "namedSeatRecipientName"];
 var event = (label, trigger, audience, variables, requiresTier = true) => ({ label, trigger, audience, variables: [...variables, ...policy], optionalVariables, requiresTier });
 var CHAPTER_EMAIL_EVENTS = {
   adminNotification: event("Application notification", "Application submitted or payment received, according to notification settings", "Administrator", [...identity, ...checkout, "adminUrl", "membersUrl"]),
   submitConfirmation: event("Application receipt", "Application submitted", "Applicant", [...identity, ...checkout, "submitNextStep", "membersUrl"]),
   paymentConfirmation: event("Payment confirmation", "Membership payment received", "Applicant", ["firstName", ...checkout, "paymentNextStep"]),
   prepEmail: event("Call confirmation", "Introduction call booked", "Applicant", [...identity, ...checkout, "startAt", "endAt", "timezone", "meetUrl", "htmlLink", "meetingTime", "meetingLink"]),
-  onboardingInvite: event("Membership welcome", "Membership approved", "Member", ["firstName", "membersUrl", "tierName"]),
+  onboardingInvite: event("Membership welcome", "Membership approved", "Member", ["firstName", "membersUrl", "tierName", "namedSeat", "namedSeatRecipientName"]),
   namedSeatInvitation: event("Gift membership invitation", "A gift membership is ready to be accepted", "Gift recipient", ["firstName", "purchaserName", "chapterName", "acceptBy", "joinUrl", "tierName"]),
   seatAccepted: event("Gift accepted", "Gift recipient accepts their membership", "Purchaser", ["firstName", "purchaserName", "recipientName", "tierName", "chapterName", "membersUrl"])
 };
@@ -1668,9 +1722,6 @@ function chapterEmailEvents(chapter) {
 }
 
 // src/email.ts
-function render(template, vars) {
-  return template.replace(/\{\{(\w+)\}\}/g, (_, key3) => vars[key3] ?? "");
-}
 function groupVars(group, vars) {
   return {
     ...vars,
@@ -1703,7 +1754,9 @@ function planDelivery(input) {
     values: vars,
     tierId: vars.tierId
   });
-  if (issues.length) return { deliver: false, reason: "template-invalid", issues: issues.map((issue) => issue.message) };
+  const html = typeof tpl.html === "string" && tpl.html.trim() ? tpl.html : void 0;
+  const htmlIssues = html ? htmlBodyIssues(html, { allowedVariables: event2?.variables, optionalVariables: event2?.optionalVariables, values: vars }) : [];
+  if (issues.length || htmlIssues.length) return { deliver: false, reason: "template-invalid", issues: [...issues, ...htmlIssues].map((issue) => issue.message) };
   const isProd = input.envName === "prod";
   const redirect = !isProd && !!input.group.debugEmail;
   const transport = !isProd && !redirect ? "log-only" : input.cloudflareReady ? "cloudflare" : "log-only";
@@ -1716,32 +1769,9 @@ function planDelivery(input) {
   const text10 = redirect ? `(dev redirect; original recipient: ${input.to})
 
 ` + renderedText : renderedText;
-  return { deliver: true, transport, to, subject, text: text10, redirected: redirect };
-}
-
-// src/email-html.ts
-var URL_RE = /https?:\/\/[^\s<>"')\]]+[^\s<>"').,;:!?\]]/g;
-function escapeHtml(s) {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function lineHtml(line) {
-  let out = "", last = 0;
-  for (const match of line.matchAll(URL_RE)) {
-    out += escapeHtml(line.slice(last, match.index));
-    const url = escapeHtml(match[0]);
-    out += `<a href="${url}">${url}</a>`;
-    last = match.index + match[0].length;
-  }
-  return out + escapeHtml(line.slice(last));
-}
-function textToHtml(text10) {
-  const paragraphs = text10.replace(/\r\n/g, "\n").trim().split(/\n{2,}/).filter((paragraph) => paragraph.trim());
-  const body = paragraphs.map((paragraph) => `<p>${paragraph.split("\n").map(lineHtml).join("<br>\n")}</p>`).join("\n");
-  return `<!doctype html>
-<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width"></head>
-<body style="margin:0;padding:24px 16px;background:#ffffff;color:#1a1a1a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;font-size:16px;line-height:1.5">
-${body}
-</body></html>`;
+  const renderedHtml = html ? renderHtmlBody(html, vars) : void 0;
+  const htmlOut = renderedHtml && redirect ? `<p style="font:13px monospace;color:#555;margin:0 0 12px">(dev redirect; original recipient: ${escapeHtml(input.to)})</p>` + renderedHtml : renderedHtml;
+  return { deliver: true, transport, to, subject, text: text10, ...htmlOut ? { html: htmlOut } : {}, redirected: redirect };
 }
 
 // src/email-deliverability.ts
@@ -1873,10 +1903,14 @@ async function frozenCheckoutVariables(db, app) {
   if (Number.isSafeInteger(amount) && Number(amount) > 0 && typeof currency === "string" && /^[a-z]{3}$/.test(currency)) {
     formatted = new Intl.NumberFormat("en-US", { style: "currency", currency: currency.toUpperCase() }).format(Number(amount) / 100);
   }
+  const seat = quote?.namedSeat, seatCents = quote?.lineItems?.namedSeatCents;
+  const namedSeatRecipientName = typeof seat?.recipientName === "string" ? seat.recipientName.trim() : "";
   return {
     paymentAmount: formatted,
     paymentAmountSummary: formatted ? ` of ${formatted}` : "",
-    tierName: typeof quote?.tierName === "string" ? quote.tierName : ""
+    tierName: typeof quote?.tierName === "string" ? quote.tierName : "",
+    namedSeat: namedSeatRecipientName ? Number.isSafeInteger(seatCents) && Number(seatCents) > 0 ? "paid" : "included" : "",
+    namedSeatRecipientName
   };
 }
 async function catalogTierName(db, group, app) {
@@ -1934,6 +1968,8 @@ function sampleVariables(origin, timeZone, now = Date.now()) {
     purchaserName: "Sample Purchaser",
     recipientName: "Sample Recipient",
     chapterName: "Sample Chapter",
+    namedSeat: "paid",
+    namedSeatRecipientName: "Sample Recipient",
     acceptBy: new Date(now + 7 * 864e5).toISOString().slice(0, 10),
     joinUrl: `${origin}/join?seat=sample`
   };
@@ -2032,7 +2068,7 @@ async function sendTemplated(deps, input) {
   let messageId;
   try {
     const text10 = String(row2.body);
-    const html = deps.renderHtml === false ? void 0 : (deps.renderHtml ?? textToHtml)(text10);
+    const html = deps.renderHtml === false ? void 0 : decision.html ?? (deps.renderHtml ?? textToHtml)(text10);
     const headers = deliverabilityHeaders({ event: event2, replyTo: input.group.replyTo });
     const response = await deps.sender.send({
       from: fromAddress(deps.from, input.group.fromName),
@@ -12508,7 +12544,7 @@ var handleAdminApplicationPatch = async (req, url, env, ctx) => {
 import { getConfig, saveConfig, validateEmailCopy as validateEmailCopy4 } from "@odla-ai/crm";
 
 // src/email-readiness.ts
-import { isEmailTierName as isEmailTierName2, validateEmailCopy as validateEmailCopy3 } from "@odla-ai/crm";
+import { isEmailTierName as isEmailTierName2, templateSectionNames as templateSectionNames2, templateVars as templateVars2, validateEmailCopy as validateEmailCopy3 } from "@odla-ai/crm";
 
 // src/email-spam-signals.ts
 var TRIGGER_PHRASES = [
@@ -12545,6 +12581,7 @@ var phraseIn = (phrases, haystack) => phrases.find((phrase) => new RegExp(`(?:^|
 function emailSpamSignals(copy) {
   const subject = typeof copy.subject === "string" ? copy.subject : "";
   const text10 = typeof copy.text === "string" ? copy.text : "";
+  const html = typeof copy.html === "string" ? copy.html : "";
   const out = [];
   const letters = strip(subject).replace(/[^A-Za-z]/g, "");
   const shouting = letters.length >= 6 && letters.replace(/[^A-Z]/g, "").length / letters.length > 0.5 || words(subject).some((word) => /^[A-Z]{4,}$/.test(word.replace(/[^A-Za-z]/g, "")));
@@ -12557,7 +12594,8 @@ function emailSpamSignals(copy) {
   if (bodyHit) out.push({ code: "body-trigger-words", message: `The body uses "${bodyHit}", a phrase filters weight against the sender.` });
   if (/(?:^|\s)[A-Z]{3,}(?:\s+[A-Z]{3,}){2,}(?=\s|$)/.test(strip(text10))) out.push({ code: "body-caps", message: "The body shouts a run of capitalised words; use sentence case." });
   if (/!{2,}/.test(text10)) out.push({ code: "body-punctuation", message: "Repeated exclamation marks in the body are a classic spam signal." });
-  const urls = [...text10.matchAll(URL_RE2)].map((match) => match[0]);
+  const urls = [...`${text10}
+${html}`.matchAll(URL_RE2)].map((match) => match[0].replace(/&quot;.*$/, ""));
   const hosts = urls.map((url) => {
     try {
       return new URL(url).hostname;
@@ -12602,10 +12640,14 @@ function validateEmailReadiness(input) {
     const template = input.templates[key3];
     const problems = !template ? [{ code: "template-missing", message: "No email is configured for this event." }] : validateEmailCopy3(template, { allowedVariables: event2.variables });
     if (template && typeof template.enabled !== "boolean") problems.push({ code: "enabled-missing", message: "Choose explicitly whether this email is enabled. Sending is blocked until then." });
+    const html = typeof template?.html === "string" && template.html.trim() ? template.html : "";
+    if (html) problems.push(...htmlBodyIssues(html, { allowedVariables: event2.variables }));
     if (template) {
-      const used = [...`${template.subject ?? ""}
-${template.text ?? ""}`.matchAll(/\{\{(\w+)\}\}/g)].map((match) => match[1]);
-      for (const name of used) if (name in input.groupValues && !input.groupValues[name]?.trim()) {
+      const copy = `${template.subject ?? ""}
+${template.text ?? ""}
+${html}`;
+      const sectionOnly = new Set(templateSectionNames2(copy));
+      for (const name of templateVars2(copy)) if (name in input.groupValues && !input.groupValues[name]?.trim() && !sectionOnly.has(name)) {
         problems.push({ code: "value-missing", variable: name, message: `Add the ${name} used by this email.` });
       }
     }
@@ -12634,6 +12676,7 @@ async function emailSettings(db, ctx, env) {
   const emailTemplates = Object.fromEntries(Object.keys(events).filter((key3) => key3 in stored).map((key3) => [key3, {
     subject: str2(stored[key3]?.subject),
     text: str2(stored[key3]?.text),
+    html: str2(stored[key3]?.html),
     enabled: stored[key3]?.enabled
   }]));
   let tiers = [], tiersUnavailable = false;
@@ -12680,12 +12723,14 @@ async function updateEmailSettings(db, ctx, env, body) {
     if (!value || typeof value !== "object" || Array.isArray(value)) return json({ error: `Invalid template: ${key3}` }, 400);
     const t = value;
     if (typeof t.enabled !== "boolean") return json({ error: `Choose whether ${key3} is enabled.` }, 400);
-    const subject = str2(t.subject).trim(), text10 = str2(t.text);
+    const subject = str2(t.subject).trim(), text10 = str2(t.text), html = str2(t.html);
+    if (t.html !== void 0 && typeof t.html !== "string") return json({ error: `Invalid HTML body: ${key3}` }, 400);
     const issues = validateEmailCopy4({ subject, text: text10 }, { allowedVariables: events[key3].variables });
-    if (t.enabled && issues.length || issues.some((issue) => ["subject-invalid", "body-invalid"].includes(issue.code))) {
-      return json({ error: `${events[key3].label} is incomplete.`, errors: issues.map((issue) => issue.message) }, 400);
+    const htmlIssues = html.trim() ? htmlBodyIssues(html, { allowedVariables: events[key3].variables }) : [];
+    if (t.enabled && (issues.length || htmlIssues.length) || issues.some((issue) => ["subject-invalid", "body-invalid"].includes(issue.code)) || html.length > HTML_BODY_LIMIT) {
+      return json({ error: `${events[key3].label} is incomplete.`, errors: [...issues, ...htmlIssues].map((issue) => issue.message) }, 400);
     }
-    clean[key3] = { subject, text: text10, enabled: t.enabled };
+    clean[key3] = { subject, text: text10, ...html.trim() ? { html } : {}, enabled: t.enabled };
   }
   const notificationEmail = str2(body.notificationEmail).trim(), replyTo = str2(body.replyTo).trim(), debugEmail = str2(body.debugEmail).trim();
   const emailish = /^[^\s@,;<>]+@[^\s@,;<>]+\.[^\s@,;<>]+$/;