@antelopejs/dms-mailing 0.7.1 → 0.8.0

package/skills/dms-mailing/cases.json

@@ -0,0 +1,49 @@
+{
+  "version": 1,
+  "cases": [
+    {
+      "id": "mailing-send-template",
+      "area": "modules",
+      "style": "clean",
+      "prompt": "Send the welcome e-mail template when a user signs up.",
+      "expect": {
+        "skills": ["dms-mailing"],
+        "acceptable": ["dms", "dms-auth"],
+        "mustMention": ["SendTemplate"]
+      }
+    },
+    {
+      "id": "mailing-bounces",
+      "area": "modules",
+      "style": "clean",
+      "prompt": "Our e-mail provider reports bounces through a webhook. How do we record them?",
+      "expect": {
+        "skills": ["dms-mailing"],
+        "acceptable": ["dms"],
+        "mustMention": ["RecordEmailEvent"]
+      }
+    },
+    {
+      "id": "mailing-missing-variable-casual",
+      "area": "modules",
+      "style": "casual",
+      "prompt": "mail send says missing variable firstName??",
+      "expect": {
+        "skills": ["dms-mailing"],
+        "acceptable": ["dms"]
+      }
+    },
+    {
+      "id": "dms-mailing-avoid-tracker",
+      "area": "modules",
+      "style": "clean",
+      "prompt": "Put the tracking script on our public website and count how many visitors click the signup button.",
+      "expect": {
+        "skills": ["dms-marketing"],
+        "acceptable": ["dms"],
+        "mustMention": ["data-website-id"],
+        "avoid": ["dms-mailing"]
+      }
+    }
+  ]
+}

package/src/crons/jobs.ts

@@ -5,7 +5,7 @@ import cron, { type ScheduledTask } from "node-cron";
 export interface CronJob {
   name: string;
   schedule: string;
-  run: () => Promise<unknown>;
+  run: () => Promise<number | void>;
 }
 
 /** A job as it runs once scheduled. */

package/src/data/body.ts

@@ -1,10 +1,11 @@
 import { HTTPResult } from "@antelopejs/interface-api";
 import { HTTP_BAD_REQUEST } from "../constants";
+import { isText } from "../validation/guards";
 
 const INVALID_BODY = "$dms_mailing.errors.invalid_body";
 
 export function parseBody(body: Buffer | string): Record<string, unknown> {
-  const raw = typeof body === "string" ? body : body.toString("utf8");
+  const raw = isText(body) ? body : body.toString("utf8");
   if (!raw) return {};
   try {
     return JSON.parse(raw) as Record<string, unknown>;

package/src/data/templates-table.ts

@@ -84,6 +84,7 @@ import {
   createTemplateSchema,
   templateDetailsSchema,
 } from "../validation/templates.schema";
+import { isObject, isText } from "../validation/guards";
 import { parseBody } from "./body";
 import { CategoryDisplay, LocaleChipsDisplay } from "./displays";
 
@@ -155,7 +156,7 @@ function assertKnownCategory(
   category: unknown,
 ): void {
   if (isBlank(category)) return;
-  if (typeof category === "string" && findCategory(categories, category)) {
+  if (isText(category) && findCategory(categories, category)) {
     return;
   }
   throw new HTTPResult(HTTP_UNPROCESSABLE, UNKNOWN_CATEGORY);
@@ -171,7 +172,8 @@ interface CreatedRow {
  * The creation's seed, and the body to store: slug trimmed, and the name
  * typed in the reader's language as every language of the localized field,
  * the fallback one included until someone translates it. A body a guard
- * already parsed arrives as an object.
+ * already parsed arrives as an object. The body to store is handed on as an
+ * object: interface-data-api 0.3 refuses a JSON string.
  */
 function parseCreation(body: Validation.WrittenBody, locale: string) {
   const raw = Buffer.isBuffer(body) ? parseBody(body) : body;
@@ -181,7 +183,6 @@ function parseCreation(body: Validation.WrittenBody, locale: string) {
     () => INVALID_TEMPLATE,
     HTTP_BAD_REQUEST,
   );
-  // Handed as an object: interface-data-api 0.3 refuses a JSON string.
   const normalized = {
     ...raw,
     slug: seed.slug,
@@ -198,6 +199,12 @@ interface LocalizedController {
 /** The key that writes every language of a localized field at once. */
 const ALL_LANGUAGES = "*";
 
+/**
+ * The data API's `new` callback, seeding the template it creates. The
+ * module's creation dialogs send one typed name, and the stored name holds
+ * every language, written at once: the controller's language key is set to
+ * all languages before the creation.
+ */
 function withSeeding(base: DataControllerCallback): DataControllerCallback {
   return {
     ...base,
@@ -213,8 +220,6 @@ function withSeeding(base: DataControllerCallback): DataControllerCallback {
       const settings = await getSettings(tenantId);
       assertKnownCategory(settings.categories, seed.category);
       const fields = await seedFields(tenantId, seed, settings.fallbackLocale);
-      // The module's creation dialogs send one typed name; the stored name
-      // holds every language, written at once.
       (this as LocalizedController).language = ALL_LANGUAGES;
       const created = (await refuseTakenSlug(
         base.func.call(this, ctx, params, normalized, ...rest),
@@ -334,8 +339,8 @@ export async function saveDetails(
  * or, from a form editing every language, all of them.
  */
 function isBlankName(name: unknown): boolean {
-  const texts = typeof name === "object" && name ? Object.values(name) : [name];
-  return !texts.some((text) => typeof text === "string" && text.trim());
+  const texts = isObject(name) ? Object.values(name) : [name];
+  return !texts.some((text) => isText(text) && text.trim());
 }
 
 /** The names trimmed, blank ones left out, the fallback language filled. */

package/src/db/models/template-versions.model.ts

@@ -45,8 +45,12 @@ export class TemplateVersionModel extends BasicDataModel(
     }
   }
 
+  /**
+   * The published versions of a template, newest first. It reads the
+   * template's publication before the version rows: any later publication
+   * must have materialized the version that read names.
+   */
   async listForTemplate(templateId: string): Promise<MailingTemplateVersion[]> {
-    // Read the publication first: any later publication must have materialized it.
     const template = await new TemplateModel(this.database).get(templateId);
     if (!template) return [];
     const rows = await this.getBy("templateId", templateId);

package/src/db/models/templates.model.ts

@@ -5,6 +5,7 @@ import {
 } from "@antelopejs/interface-database-decorators";
 import type { LocalizedText } from "@antelopejs/interface-dms-mailing";
 import { MAILING_TEMPLATES_TABLE_NAME, MailingTemplate } from "../tables";
+import { isText } from "../../validation/guards";
 
 /** The attention fields of a template, as the refresh writes them. */
 export type TemplateAttentionFields = Pick<
@@ -15,7 +16,7 @@ export type TemplateAttentionFields = Pick<
 const isLocalizedText = (value: unknown): value is LocalizedText =>
   typeof value === "object" &&
   value !== null &&
-  Object.values(value).every((text) => typeof text === "string");
+  Object.values(value).every(isText);
 
 /** Where a row keeps its modifier-held fields, the localized name among them. */
 const MODIFIER_CONTAINER = "_internal";
@@ -37,9 +38,11 @@ export class TemplateModel extends BasicDataModel(
     return TemplateModel.fromPlainData(fields).localize("*", ["name"]);
   }
 
-  /** The names of `template`, one per language. */
+  /**
+   * The names of `template`, one per language: unlocked with `"*"`, the
+   * localized field holds the whole per-language record.
+   */
   static namesOf(template: MailingTemplate): LocalizedText {
-    // Unlocked with "*", the localized field holds the whole per-language record.
     const names: unknown = template.localize("*", ["name"]).name;
     return isLocalizedText(names) ? names : {};
   }

package/src/engine/changes.ts

@@ -6,6 +6,7 @@ import type {
   VariableDefinition,
 } from "../types";
 import { walkBlocks } from "./walk";
+import { isObject } from "../validation/guards";
 
 export type TemplateChangeKind =
   | "locale_added"
@@ -51,11 +52,11 @@ const NESTED_KEYS = new Set(["children", "elseChildren"]);
  */
 function canonical(value: unknown): unknown {
   if (Array.isArray(value)) return value.map(canonical);
-  if (!value || typeof value !== "object") return value;
+  if (!isObject(value)) return value;
   return Object.fromEntries(
     Object.keys(value)
       .sort()
-      .map((key) => [key, canonical((value as Record<string, unknown>)[key])]),
+      .map((key) => [key, canonical(value[key])]),
   );
 }
 

package/src/engine/conditions.ts

@@ -3,15 +3,13 @@ import { getPath } from "./paths";
 
 type Evaluator = (actual: unknown, expected: string) => boolean;
 
-const asNumber = (value: unknown): number => Number(value);
-
 const EVALUATORS: Record<ConditionOperator, Evaluator> = {
   truthy: (actual) => Boolean(actual),
   falsy: (actual) => !actual,
   eq: (actual, expected) => String(actual) === expected,
   ne: (actual, expected) => String(actual) !== expected,
-  gt: (actual, expected) => asNumber(actual) > asNumber(expected),
-  lt: (actual, expected) => asNumber(actual) < asNumber(expected),
+  gt: (actual, expected) => Number(actual) > Number(expected),
+  lt: (actual, expected) => Number(actual) < Number(expected),
 };
 
 /** Whether `data` passes the condition a block is shown under. */

package/src/engine/fallback-html.ts

@@ -1,15 +1,15 @@
 import type { ResolvedBlock, ResolvedEmail } from "../types";
 
-const ESCAPES: Record<string, string> = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#39;",
-};
+const ESCAPES = new Map([
+  ["&", "&amp;"],
+  ["<", "&lt;"],
+  [">", "&gt;"],
+  ['"', "&quot;"],
+  ["'", "&#39;"],
+]);
 
 export const escapeHtml = (value: string): string =>
-  value.replace(/[&<>"']/g, (char) => ESCAPES[char] ?? char);
+  value.replace(/[&<>"']/g, (char) => ESCAPES.get(char) ?? char);
 
 const LINE_BREAK = /\r?\n/g;
 
@@ -77,7 +77,7 @@ const row = (label: string, value: string, weight: string): string =>
 const table = (rows: string): string =>
   `<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="${BLOCK_SPACING}">${rows}</table>`;
 
-const TEXT_RENDERERS: Record<string, BlockHtml> = {
+const TEXT_RENDERERS = {
   heading: (block) =>
     block.type === "heading"
       ? `<h1 style="${FONT};font-size:${block.size}px;font-weight:600;color:${HEADING_COLOR};text-align:${block.align};margin:0 0 24px;${WRAP}">${escapeLines(block.text)}</h1>`
@@ -94,7 +94,7 @@ const TEXT_RENDERERS: Record<string, BlockHtml> = {
     block.type === "button"
       ? `<div style="text-align:${block.align};margin:24px 0"><a href="${escapeHtml(safeUrl(block.href))}" style="${FONT};${BUTTON_STYLE}">${escapeHtml(block.text)}</a></div>`
       : "",
-};
+} satisfies Record<string, BlockHtml>;
 
 const footerHtml = (block: ResolvedBlock): string => {
   if (block.type !== "footer") return "";
@@ -109,7 +109,7 @@ const footerHtml = (block: ResolvedBlock): string => {
   return `${DIVIDER}<p style="${FOOTER_STYLE}">${escapeLines(block.text)}${linkLine}</p>`;
 };
 
-const LAYOUT_RENDERERS: Record<string, BlockHtml> = {
+const LAYOUT_RENDERERS = {
   hero: (block) =>
     block.type === "hero" && block.imageUrl
       ? `<img src="${escapeHtml(safeUrl(block.imageUrl))}" alt="${escapeHtml(block.alt)}" style="display:block;width:100%;border-radius:8px;margin:0 0 20px">`
@@ -124,12 +124,12 @@ const LAYOUT_RENDERERS: Record<string, BlockHtml> = {
     block.type === "total" ? table(row(block.label, block.value, "600")) : "",
   divider: () => DIVIDER,
   footer: footerHtml,
-};
+} satisfies Record<string, BlockHtml>;
 
 const RENDERERS: Record<ResolvedBlock["type"], BlockHtml> = {
   ...TEXT_RENDERERS,
   ...LAYOUT_RENDERERS,
-} as Record<ResolvedBlock["type"], BlockHtml>;
+};
 
 const FOOTER_TYPE = "footer";
 

package/src/engine/formats.ts

@@ -1,4 +1,5 @@
 import type { VariableDefinition } from "../types";
+import { isObject, isText } from "../validation/guards";
 
 /**
  * An amount in the minor unit of its currency (cents for `EUR`), like the
@@ -55,12 +56,11 @@ export function valueFormatOf(
 }
 
 export function isMoneyValue(value: unknown): value is MoneyValue {
-  if (!value || typeof value !== "object") return false;
-  const candidate = value as Partial<MoneyValue>;
+  if (!isObject(value)) return false;
   return (
-    typeof candidate.value === "number" &&
-    Number.isFinite(candidate.value) &&
-    typeof candidate.currency === "string"
+    typeof value.value === "number" &&
+    Number.isFinite(value.value) &&
+    typeof value.currency === "string"
   );
 }
 
@@ -118,7 +118,7 @@ export function formatValue(
     return Number.isNaN(value.getTime())
       ? String(value)
       : formatDate(value, DATE_STYLE, locale);
-  if (typeof value === "string" && format?.datePaths.has(path))
+  if (isText(value) && format?.datePaths.has(path))
     return formatIsoDate(value, locale) ?? value;
   return String(value);
 }

package/src/engine/paths.ts

@@ -1,3 +1,5 @@
+import { isObject } from "../validation/guards";
+
 const PATH_SEPARATOR = ".";
 const ARRAY_SUFFIX = "[]";
 
@@ -16,10 +18,9 @@ export function normalizePath(path: string): string {
 const RESERVED_SEGMENTS = ["__proto__", "constructor", "prototype"];
 
 function readSegment(current: unknown, segment: string): unknown {
-  if (current === null || current === undefined) return undefined;
-  if (typeof current !== "object") return undefined;
+  if (!isObject(current)) return undefined;
   if (RESERVED_SEGMENTS.includes(segment)) return undefined;
-  return (current as Record<string, unknown>)[segment];
+  return current[segment];
 }
 
 export function getPath(data: unknown, path: string): unknown {

package/src/engine/system-variables.ts

@@ -22,7 +22,10 @@ export const MARKETING_CATEGORY = "marketing";
 
 const SYSTEM_VARIABLE_TYPE = "url";
 
-type FooterLabelKey = "unsubscribeLabel" | "preferencesLabel";
+/** The footer fields that label a link, in the order the links show. */
+const LABEL_KEYS = ["unsubscribeLabel", "preferencesLabel"] as const;
+
+type FooterLabelKey = (typeof LABEL_KEYS)[number];
 
 /** Each footer link: the label that shows it and the URL the caller passes. */
 const FOOTER_LINKS: Record<FooterLabelKey, string> = {
@@ -30,8 +33,6 @@ const FOOTER_LINKS: Record<FooterLabelKey, string> = {
   preferencesLabel: PREFERENCES_URL_PATH,
 };
 
-const LABEL_KEYS = Object.keys(FOOTER_LINKS) as FooterLabelKey[];
-
 export function isMarketingCategory(category?: string | null): boolean {
   return category === MARKETING_CATEGORY;
 }

package/src/engine/tokens.ts

@@ -21,8 +21,7 @@ const MISSING_TOKEN: Record<InterpolationMode, (token: string) => string> = {
 
 export function extractTokens(text: string): string[] {
   const found = new Set<string>();
-  for (const match of text.matchAll(TOKEN_PATTERN))
-    found.add(match[1] as string);
+  for (const match of text.matchAll(TOKEN_PATTERN)) found.add(match[1]);
   return [...found];
 }
 

package/src/pages/sends.ts

@@ -313,11 +313,13 @@ export class SendsPageController extends PageController(
               permissionMeta("send_drawer", "i-ph-info"),
             ),
             title: "$dms_mailing.sends.actions.details",
-            // Names the open send: its recipient and the template it used.
+            /** Names the open send: its recipient and the template it used. */
             rowTitle: "$dms_mailing.sends.drawer.heading",
             positionLabel: "$dms_mailing.sends.drawer.position",
-            // A side panel keeps the open send in the URL and words a missing
-            // one by default; a drawer does both only when asked.
+            /**
+             * A side panel keeps the open send in the URL and words a missing
+             * one by default; a drawer does both only when asked.
+             */
             deepLink: true,
             notFound: {},
           },

package/src/pages/templates.ts

@@ -146,7 +146,7 @@ export class TemplatesPageController extends PageController(
           deepLink: true,
           target: {
             type: "drawer",
-            // On the right, as the gallery opens it (useTemplateDrawer).
+            /** On the right, as the gallery opens it (`useTemplateDrawer`). */
             direction: "right",
             component: templateDrawer,
             title: "$dms_mailing.templates.actions.details",

package/src/pages/toolbar.ts

@@ -65,8 +65,10 @@ export function mailingToolbar(
       id: period.scope,
       presets: period.presets,
       defaultPreset: period.defaultPreset,
-      // More than one comparison: pageToolbar() draws them as a "vs …" menu
-      // on the first one, the previous period.
+      /**
+       * More than one comparison: `pageToolbar()` draws them as a "vs …" menu
+       * on the first one, the previous period.
+       */
       comparisons: MAILING_COMPARISONS,
     },
   }).meta({

package/src/routes/events.ts

@@ -17,15 +17,12 @@ import {
   secretRefusal,
   WEBHOOK_SECRET_HEADER,
 } from "../services/webhook-status";
-import {
-  SEND_EVENT_TYPES,
-  type SendEventType,
-  type WebhookRefusal,
-} from "../types";
+import type { WebhookRefusal } from "../types";
+import { sendEventTypeSchema } from "../validation/send-event-type.schema";
 
 const eventSchema = z.object({
   messageId: z.string().min(1),
-  type: z.enum(SEND_EVENT_TYPES as [SendEventType, ...SendEventType[]]),
+  type: sendEventTypeSchema,
   at: z.coerce.date().optional(),
   details: z.record(z.unknown()).optional(),
 });

package/src/routes/metrics.ts

@@ -83,18 +83,20 @@ export interface TopMetric {
   minDeliveries: number;
 }
 
+const OPEN_RATE_METRIC: TopMetric = {
+  extract: (totals) => totals.openRate,
+  minDeliveries: MIN_RANKED_DELIVERIES,
+};
+
 const TOP_METRICS: Record<string, TopMetric> = {
-  "open-rate": {
-    extract: (totals) => totals.openRate,
-    minDeliveries: MIN_RANKED_DELIVERIES,
-  },
+  "open-rate": OPEN_RATE_METRIC,
   "click-rate": {
     extract: (totals) => totals.clickRate,
     minDeliveries: MIN_RANKED_DELIVERIES,
   },
   sends: { extract: (totals) => totals.sends, minDeliveries: 0 },
 };
-const DEFAULT_TOP_METRIC = TOP_METRICS["open-rate"] as TopMetric;
+const DEFAULT_TOP_METRIC = OPEN_RATE_METRIC;
 
 interface FunnelStepDefinition {
   id: string;

package/src/routes/sends.ts

@@ -10,7 +10,7 @@ import {
 } from "@antelopejs/interface-api";
 import { assert, assertValidation } from "@antelopejs/interface-api-util";
 import { AuthUserWithPermission } from "@antelopejs/interface-dms/guards";
-import { ZodError } from "zod";
+import { ZodError, type z } from "zod";
 import { getRequestTenantId } from "@antelopejs/interface-dms/request-tenant";
 import { TenantScopedModel } from "@antelopejs/interface-dms/tenant-scoped-model";
 import type { User } from "@antelopejs/interface-dms/auth/db";
@@ -68,13 +68,9 @@ import {
   requireTemplate,
   snapshotOfVersion,
 } from "../services/templates";
-import type {
-  SendStatus,
-  SuppressionSummary,
-  TemplateContent,
-  TemplateStatus,
-} from "../types";
+import type { SendStatus, SuppressionSummary, TemplateStatus } from "../types";
 import {
+  type previewVersionSchema,
   realSendSchema,
   replayFailedSchema,
   replaySchema,
@@ -98,12 +94,6 @@ const DRAFT_VERSION = 0;
 /** Renders as the recipient got it, not as the editor previews it. */
 const SEND_MODE: InterpolationMode = "send";
 
-interface TestSendInput {
-  locale: string;
-  content?: TemplateContent;
-  data?: Record<string, unknown>;
-}
-
 export interface SendTemplateSummary {
   id: string;
   name: string;
@@ -274,9 +264,9 @@ export class SendsController extends Controller(API_BASE_PATH) {
         tenantId: this.tenantId,
         to: input.to,
         allowSuppressed: [this.user.email],
-        locale: (input as TestSendInput).locale,
-        variables: (input as TestSendInput).data,
-        content: (input as TestSendInput).content,
+        locale: input.locale,
+        variables: input.data,
+        content: input.content,
         version: requestedVersionOf(input.version),
         isTest: true,
         source: TEST_SEND_SOURCE,
@@ -578,8 +568,10 @@ export class SendsController extends Controller(API_BASE_PATH) {
  * The version a test of a published version records: a number names one,
  * "draft" or "published" let the send decide.
  */
-function requestedVersionOf(version: unknown): number | undefined {
-  return typeof version === "number" ? version : undefined;
+function requestedVersionOf(
+  version: z.infer<typeof previewVersionSchema> | undefined,
+): number | undefined {
+  return version === "draft" || version === "published" ? undefined : version;
 }
 
 function variablesOf(send: MailingSend): Record<string, unknown> {

package/src/routes/settings.ts

@@ -48,6 +48,7 @@ import {
   settingsPatchSchema,
 } from "../validation/settings.schema";
 import { retentionLimit } from "../crons/retention";
+import { isJsonObject } from "../validation/guards";
 
 const INVALID_SETTINGS = "$dms_mailing.errors.invalid_settings";
 const CATEGORIES_REASSIGNED = "$dms_mailing.settings.categories.reassigned";
@@ -61,9 +62,9 @@ const NEXT_RUN_MINUTE = 15;
 const RETENTION_DAYS_PARAM = "days";
 
 /** A settings field the form shows under another name. */
-const FORM_FIELD_OF: Record<string, string> = {
-  blockOnMissingVariables: "missingVariables",
-};
+const FORM_FIELD_OF = new Map([
+  ["blockOnMissingVariables", "missingVariables"],
+]);
 
 const retentionDaysSchema = z.coerce
   .number()
@@ -141,12 +142,12 @@ function webhookUrl(
 /** The issue of a refused write, under the form field it belongs to. */
 function formIssue(issue: z.ZodIssue): z.ZodIssue {
   const [field, ...rest] = issue.path;
-  const formField = FORM_FIELD_OF[String(field)];
+  const formField = FORM_FIELD_OF.get(String(field));
   return formField ? { ...issue, path: [formField, ...rest] } : issue;
 }
 
 /** A refused write: the generic message, and each issue for its field. */
-function invalidSettings(error: unknown): unknown {
+function invalidSettings(error: unknown) {
   if (!(error instanceof z.ZodError)) return INVALID_SETTINGS;
   return { message: INVALID_SETTINGS, issues: error.issues.map(formIssue) };
 }
@@ -236,11 +237,9 @@ export class MailingSettingsController extends Controller(
   /** The body as a checked patch; 400 for anything else. */
   private readPatch(raw: Buffer): SettingsPatch {
     const body: unknown = parseBody(raw);
-    const isPatch =
-      typeof body === "object" && body !== null && !Array.isArray(body);
-    assert(isPatch, HTTP_BAD_REQUEST, INVALID_SETTINGS);
+    assert(isJsonObject(body), HTTP_BAD_REQUEST, INVALID_SETTINGS);
     return assertValidation(
-      clearedToEmpty(body as Record<string, unknown>),
+      clearedToEmpty(body),
       (value) => settingsPatchSchema.parse(value),
       invalidSettings,
     );

package/src/routes/suppressions.ts

@@ -33,7 +33,7 @@ const manualSuppressionSchema = z.object({
 });
 
 /** A refused entry: the generic message, and each issue under its field. */
-function invalidSuppression(error: unknown): unknown {
+function invalidSuppression(error: unknown) {
   if (!(error instanceof z.ZodError)) return INVALID_SUPPRESSION;
   return { message: INVALID_SUPPRESSION, issues: error.issues };
 }

package/src/routes/templates.ts

@@ -352,7 +352,7 @@ export class TemplatesController extends Controller(
       (value) => saveContentSchema.parse(value),
       () => INVALID_CONTENT,
     );
-    const content = input.content as TemplateContent;
+    const { content } = input;
     const template = await requireTemplate(this.templates, id);
     assertCurrentDraft(template, input.revision);
     const variables = input.variables ?? workingVariables(template);
@@ -514,7 +514,7 @@ export class TemplatesController extends Controller(
     const { content, variables } = input.content
       ? {
           ...workingSnapshot(template),
-          content: input.content as TemplateContent,
+          content: input.content,
         }
       : await this.previewSnapshot(template, input.version);
     const settings = await getSettings(this.tenantId);
@@ -542,9 +542,9 @@ export class TemplatesController extends Controller(
     version: "draft" | "published" | number | undefined,
   ): Promise<TemplateDraft> | TemplateDraft {
     if (version === "published") return publishedSnapshot(template);
-    if (typeof version === "number")
-      return snapshotOfVersion(this.tenantId, template, version);
-    return workingSnapshot(template);
+    if (version === undefined || version === "draft")
+      return workingSnapshot(template);
+    return snapshotOfVersion(this.tenantId, template, version);
   }
 
   /**

package/src/services/attention.ts

@@ -11,6 +11,7 @@ import {
   type TemplateAttentionReason,
 } from "../types";
 import { isDeliveryUntracked, type ProviderTracking } from "./metrics";
+import { isNumber } from "../validation/guards";
 
 export type AttentionTone = "error" | "warning" | "neutral";
 
@@ -238,7 +239,7 @@ function namesOf(templates: MailingTemplate[]): ComposedTextParam {
   };
 }
 
-function problemBreakdown(problems: SendSummary[]): Record<string, number> {
+function problemBreakdown(problems: SendSummary[]) {
   const countOf = (status: string) =>
     problems.filter((send) => send.status === status).length;
   return {
@@ -334,9 +335,9 @@ const COUNT_PARAM = "count";
 function feedParams(
   item: AttentionItem,
 ): Record<string, ComposedTextParam> | undefined {
-  const params: Record<string, ComposedTextParam> = { ...item.params };
+  const params = { ...item.params };
   const count = item.count ?? item.params?.[COUNT_PARAM];
-  if (typeof count === "number") {
+  if (isNumber(count)) {
     params[COUNT_PARAM] = { type: "count", value: count };
   }
   return Object.keys(params).length ? params : undefined;