@antelopejs/dms-mailing 0.8.0 → 0.9.1

package/src/engine/paths.ts

@@ -1,7 +1,13 @@
+import type {
+  TemplateVariables,
+  TemplateVariableValue,
+} from "@antelopejs/interface-dms-mailing";
 import { isObject } from "../validation/guards";
 
 const PATH_SEPARATOR = ".";
 const ARRAY_SUFFIX = "[]";
+const ARRAY_LENGTH = "length";
+const ARRAY_INDEX = /^(?:0|[1-9]\d*)$/;
 
 export function normalizePath(path: string): string {
   const trimmed = path.trim();
@@ -17,18 +23,45 @@ export function normalizePath(path: string): string {
  */
 const RESERVED_SEGMENTS = ["__proto__", "constructor", "prototype"];
 
-function readSegment(current: unknown, segment: string): unknown {
-  if (!isObject(current)) return undefined;
+/** Whether a path can step into `value`: a record or a money value, not a list or a `Date`. */
+export function isRecord(
+  value: TemplateVariableValue | undefined,
+): value is TemplateVariables {
+  return isObject(value) && !Array.isArray(value) && !(value instanceof Date);
+}
+
+function readKey(record: TemplateVariables, key: string) {
+  return Object.hasOwn(record, key) ? record[key] : undefined;
+}
+
+function readSegment(
+  current: TemplateVariableValue | undefined,
+  segment: string,
+): TemplateVariableValue | undefined {
   if (RESERVED_SEGMENTS.includes(segment)) return undefined;
-  return current[segment];
+  if (Array.isArray(current)) {
+    if (segment === ARRAY_LENGTH) return current.length;
+    return ARRAY_INDEX.test(segment) ? current[Number(segment)] : undefined;
+  }
+  return isRecord(current) ? readKey(current, segment) : undefined;
 }
 
-export function getPath(data: unknown, path: string): unknown {
+/**
+ * The value `path` names in `data`: a key a record owns, a list's element by
+ * index or its length. `undefined` when the path leaves the data.
+ */
+export function getPath(
+  data: TemplateVariableValue | undefined,
+  path: string,
+): TemplateVariableValue | undefined {
   return normalizePath(path)
     .split(PATH_SEPARATOR)
-    .reduce<unknown>(readSegment, data);
+    .reduce<TemplateVariableValue | undefined>(readSegment, data);
 }
 
-export function isPresent(value: unknown): boolean {
+/** Whether `value` is neither missing nor `null`. */
+export function isPresent(
+  value: TemplateVariableValue | undefined,
+): value is Exclude<TemplateVariableValue, null> {
   return value !== undefined && value !== null;
 }

package/src/engine/plain-text.ts

@@ -13,14 +13,12 @@ const FOOTER_TYPE = "footer";
  * Languages whose typography spaces a colon off its label, with a no-break
  * space so the colon never starts a line ("Total : 64,00 €").
  */
-const LABEL_SEPARATORS: Record<string, string> = {
-  fr: " : ",
-};
+const LABEL_SEPARATORS = new Map([["fr", " : "]]);
 
 /** What goes between a label and its value in the e-mail's language. */
 export function labelSeparatorOf(locale = ""): string {
   const language = locale.toLowerCase().split(LOCALE_PARTS)[0] ?? "";
-  return LABEL_SEPARATORS[language] ?? DEFAULT_LABEL_SEPARATOR;
+  return LABEL_SEPARATORS.get(language) ?? DEFAULT_LABEL_SEPARATOR;
 }
 
 const linked = (label: string, href: string, separator: string): string =>

package/src/engine/resolve.ts

@@ -1,3 +1,7 @@
+import type {
+  TemplateVariables,
+  TemplateVariableValue,
+} from "@antelopejs/interface-dms-mailing";
 import {
   PREFERENCES_URL_PATH,
   SYSTEM_VARIABLE_PATHS,
@@ -15,12 +19,12 @@ import type {
 } from "../types";
 import { evaluateCondition } from "./conditions";
 import { safeUrl } from "./fallback-html";
-import { formatValue, type ValueFormat } from "./formats";
+import { formatValue, plainText, type ValueFormat } from "./formats";
 import { getPath, isPresent } from "./paths";
 import { footerLinkPaths } from "./system-variables";
 import { type InterpolationMode, interpolate } from "./tokens";
 
-type Data = Record<string, unknown>;
+type Data = TemplateVariables;
 
 interface ResolveState {
   data: Data;
@@ -60,11 +64,15 @@ function systemUrl(
 ): string {
   if (!footerLinkPaths(block).includes(path)) return "";
   const value = getPath(state.data, path);
-  return isPresent(value) ? safeUrl(String(value)) : "";
+  return isPresent(value) ? safeUrl(plainText(value)) : "";
 }
 
 /** A list cell: a money value or a date in it is written for the locale. */
-function cell(item: unknown, path: string, state: ResolveState): string {
+function cell(
+  item: TemplateVariableValue,
+  path: string,
+  state: ResolveState,
+): string {
   const value = getPath(item, path);
   return isPresent(value) ? formatValue(value, "", state.format) : "";
 }

package/src/engine/system-variables.ts

@@ -1,3 +1,4 @@
+import type { TemplateVariables } from "@antelopejs/interface-dms-mailing";
 import {
   PREFERENCES_URL_PATH,
   SYSTEM_VARIABLE_PATHS,
@@ -93,7 +94,7 @@ export function systemVariables(
 export function missingSystemVariables(
   content: LocaleContent,
   category: string | null | undefined,
-  data: Record<string, unknown>,
+  data: TemplateVariables,
 ): string[] {
   return systemVariables(localeSystemPaths(content), category)
     .filter((variable) => variable.required)

package/src/engine/tokens.ts

@@ -1,3 +1,4 @@
+import type { TemplateVariables } from "@antelopejs/interface-dms-mailing";
 import { formatValue, type ValueFormat } from "./formats";
 import { getPath, isPresent } from "./paths";
 
@@ -31,7 +32,7 @@ export function extractTokens(text: string): string[] {
  */
 export function interpolate(
   text: string,
-  data: Record<string, unknown>,
+  data: TemplateVariables,
   mode: InterpolationMode = "preview",
   format?: ValueFormat,
 ): InterpolationResult {

package/src/hooks/tenant-export.ts

@@ -11,14 +11,17 @@ import {
 import { MODULE_ID } from "../constants";
 import {
   type MailingTemplate,
-  SettingsModel,
   SuppressionModel,
   TemplateModel,
   TemplateVersionModel,
 } from "../db";
+import { findSettings } from "../services/settings";
 import type { MailingSettingsValues } from "../types";
 
-export type ExportedSettings = Omit<MailingSettingsValues, "webhookSecret">;
+export type ExportedSettings = Omit<
+  MailingSettingsValues,
+  "webhookSecret" | "webhookSecretSource"
+>;
 
 export type ExportPageLoader<T> = (
   offset: number,
@@ -26,7 +29,7 @@ export type ExportPageLoader<T> = (
 ) => Promise<T[]>;
 
 interface RowCodec<T> {
-  fromDatabase(row: unknown): T | undefined;
+  fromDatabase(row: T): T | undefined;
 }
 
 export interface ExportedCollection {
@@ -72,18 +75,16 @@ export async function* jsonArrayChunks<T>(
 async function exportedSettings(
   tenantId: string,
 ): Promise<ExportedSettings | null> {
-  const row = await GetModel(SettingsModel, tenantId).get(tenantId);
-  if (!row) return null;
+  const settings = await findSettings(tenantId);
+  if (!settings) return null;
   return {
-    fallbackLocale: row.fallbackLocale,
-    logRetentionDays: row.logRetentionDays,
-    blockOnMissingVariables: row.blockOnMissingVariables,
-    senderName: row.senderName,
-    senderEmail: row.senderEmail,
-    replyTo: row.replyTo,
-    categories: JSON.parse(
-      row.json_categories,
-    ) as ExportedSettings["categories"],
+    fallbackLocale: settings.fallbackLocale,
+    logRetentionDays: settings.logRetentionDays,
+    blockOnMissingVariables: settings.blockOnMissingVariables,
+    senderName: settings.senderName,
+    senderEmail: settings.senderEmail,
+    replyTo: settings.replyTo,
+    categories: settings.categories,
   };
 }
 

package/src/implementations/dms-mailing/index.ts

@@ -4,5 +4,6 @@ export {
 } from "../../services/declarations";
 export { importSends as ImportSends } from "../../services/send-import";
 export { declareSender as DeclareSender } from "../../services/sender-declaration";
+export { declareWebhookSecret as DeclareWebhookSecret } from "../../services/webhook-secret-declaration";
 export { recordEmailEvent as RecordEmailEvent } from "../../services/events";
 export { sendUnlessSuppressed as SendTemplate } from "../../services/checked-send";

package/src/pages/sends.ts

@@ -225,8 +225,9 @@ export class SendsPageController extends PageController(
     pageSize: 50,
     rowClick: "single",
     /**
-     * New sends wait in a "N new sends" strip while the user reads a send,
-     * scrolls down the log or searches it, so the rows do not move under them.
+     * New sends wait behind a "N new sends" pill while the log is on screen,
+     * so the rows do not move under the user. A send open in the drawer, a
+     * scroll down the log or a search also names the hold above the rows.
      */
     liveHold: {
       whileRowOpen: true,

package/src/pages/templates.ts

@@ -109,7 +109,9 @@ export class TemplatesPageController extends PageController(
       },
       async edit(ctx, { id, body, current }) {
         await assertEditable(getRequestTenantId(ctx), body, current);
-        return afterEdit(this.model, id, body.name, localeOfRequest(ctx));
+        return body.name === undefined
+          ? undefined
+          : afterEdit(this.model, id, localeOfRequest(ctx));
       },
     },
     rowActions: {

package/src/routes/events.ts

@@ -18,13 +18,16 @@ import {
   WEBHOOK_SECRET_HEADER,
 } from "../services/webhook-status";
 import type { WebhookRefusal } from "../types";
+import type { JsonValue } from "../types/json";
+import { parseJson } from "../validation/json";
+import { jsonObjectSchema } from "../validation/json.schema";
 import { sendEventTypeSchema } from "../validation/send-event-type.schema";
 
 const eventSchema = z.object({
   messageId: z.string().min(1),
   type: sendEventTypeSchema,
   at: z.coerce.date().optional(),
-  details: z.record(z.unknown()).optional(),
+  details: jsonObjectSchema.optional(),
 });
 
 type ParsedEvent = z.infer<typeof eventSchema>;
@@ -38,7 +41,7 @@ const STATUS_OF_REFUSAL: Record<WebhookRefusal, number> = {
 interface ReceivedEvent {
   provider: string;
   secret: string | undefined;
-  body: unknown;
+  body: JsonValue | undefined;
   /** The tenant the URL names. */
   tenantId: string;
 }
@@ -54,9 +57,9 @@ export interface WebhookResponse {
  * The body as JSON, `undefined` when it is not: a malformed body is refused
  * as an invalid event, after the secret, never answered with a parser error.
  */
-function parseBody(raw: Buffer): unknown {
+function parseBody(raw: Buffer): JsonValue | undefined {
   try {
-    return JSON.parse(raw.toString("utf8"));
+    return parseJson(raw.toString("utf8"));
   } catch {
     return undefined;
   }

package/src/routes/index.ts

@@ -5,5 +5,6 @@ export * from "./provider";
 export * from "./sends";
 export * from "./settings";
 export * from "./suppressions";
+export * from "./template-content";
 export * from "./template-versions";
 export * from "./templates";

package/src/routes/metrics.ts

@@ -63,16 +63,16 @@ const TEMPLATE_VOLUME_KEY = "$dms_mailing.metrics.template_volume";
 const FIRST_ROW_OFFSET = 0;
 const SINGLE_ROW = 1;
 
-const KPI_EXTRACTORS: Record<string, TotalsExtractor> = {
-  sends: (totals) => totals.sends,
-  deliverability: (totals) => totals.deliverability,
-  "open-rate": (totals) => totals.openRate,
-  "click-rate": (totals) => totals.clickRate,
-  bounces: (totals) => totals.bounced,
-  unsubscribes: (totals) => totals.unsubscribed,
-  queued: (totals) => totals.queued,
-  latency: (totals) => totals.latencyMedian,
-};
+const KPI_EXTRACTORS = new Map<string, TotalsExtractor>([
+  ["sends", (totals) => totals.sends],
+  ["deliverability", (totals) => totals.deliverability],
+  ["open-rate", (totals) => totals.openRate],
+  ["click-rate", (totals) => totals.clickRate],
+  ["bounces", (totals) => totals.bounced],
+  ["unsubscribes", (totals) => totals.unsubscribed],
+  ["queued", (totals) => totals.queued],
+  ["latency", (totals) => totals.latencyMedian],
+]);
 
 /** The KPIs read from delivery events: unmeasured when nothing reports them. */
 const DELIVERY_METRICS = new Set(["deliverability", "open-rate", "click-rate"]);
@@ -88,14 +88,17 @@ const OPEN_RATE_METRIC: TopMetric = {
   minDeliveries: MIN_RANKED_DELIVERIES,
 };
 
-const TOP_METRICS: Record<string, TopMetric> = {
-  "open-rate": OPEN_RATE_METRIC,
-  "click-rate": {
-    extract: (totals) => totals.clickRate,
-    minDeliveries: MIN_RANKED_DELIVERIES,
-  },
-  sends: { extract: (totals) => totals.sends, minDeliveries: 0 },
-};
+const TOP_METRICS = new Map<string, TopMetric>([
+  ["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 = OPEN_RATE_METRIC;
 
 interface FunnelStepDefinition {
@@ -225,7 +228,7 @@ export class MetricsController extends Controller(`${API_BASE_PATH}/metrics`) {
   async kpi(
     @Parameter("metric", "param") metric: string,
   ): Promise<KpiCardData> {
-    const extract = KPI_EXTRACTORS[metric];
+    const extract = KPI_EXTRACTORS.get(metric);
     assert(extract, HTTP_NOT_FOUND, UNKNOWN_METRIC);
     const range = currentRange(this.ctx);
     const [current, previous, tracking] = await Promise.all([
@@ -254,7 +257,7 @@ export class MetricsController extends Controller(`${API_BASE_PATH}/metrics`) {
   @Get("/top-templates")
   async topTemplates() {
     const metric =
-      TOP_METRICS[this.ctx.url.searchParams.get("metric") ?? ""] ??
+      TOP_METRICS.get(this.ctx.url.searchParams.get("metric") ?? "") ??
       DEFAULT_TOP_METRIC;
     const range = currentRange(this.ctx);
     const [sends, previous, templates] = await Promise.all([
@@ -469,22 +472,19 @@ export function comparedSteps(
 /** Which sends the funnel counts: all, or one side of the marketing split. */
 export type FunnelKind = "all" | "marketing" | "transactional";
 
-const FUNNEL_KINDS: Record<string, FunnelKind> = {
-  all: "all",
-  marketing: "marketing",
-  transactional: "transactional",
-};
-
-export function readFunnelKind(raw: string | null): FunnelKind {
-  return FUNNEL_KINDS[raw ?? ""] ?? "all";
-}
-
 const KIND_KEEPS: Record<FunnelKind, (category: string) => boolean> = {
   all: () => true,
   marketing: (category) => isMarketingCategory(category),
   transactional: (category) => !isMarketingCategory(category),
 };
 
+const isFunnelKind = (raw: string): raw is FunnelKind =>
+  Object.hasOwn(KIND_KEEPS, raw);
+
+export function readFunnelKind(raw: string | null): FunnelKind {
+  return raw !== null && isFunnelKind(raw) ? raw : "all";
+}
+
 /**
  * Sends of the templates on one side of the split. A template's category
  * decides: "marketing" is the campaign side, everything else transactional.

package/src/routes/period.ts

@@ -18,10 +18,10 @@ const PREVIOUS_YEAR = "previous-year";
  * What the comparison series is called, by the selector's `comparison`. A
  * custom window, or a caller naming none, is neither of the two.
  */
-const COMPARISON_SERIES_LABELS: Record<string, string> = {
-  "previous-period": "$dms_mailing.metrics.previous",
-  [PREVIOUS_YEAR]: "$dms_mailing.metrics.previous_year",
-};
+const COMPARISON_SERIES_LABELS = new Map([
+  ["previous-period", "$dms_mailing.metrics.previous"],
+  [PREVIOUS_YEAR, "$dms_mailing.metrics.previous_year"],
+]);
 const COMPARED_SERIES_LABEL = "$dms_mailing.metrics.compared";
 
 function readQuery(ctx: RangeContext, key: string): string | undefined {
@@ -67,7 +67,7 @@ export function isComparisonWanted(ctx: RangeContext): boolean {
 /** The label of the comparison series, for the comparison the caller asks. */
 export function comparisonLabel(ctx: RangeContext): string {
   const comparison = readQuery(ctx, "comparison") ?? "previous-period";
-  return COMPARISON_SERIES_LABELS[comparison] ?? COMPARED_SERIES_LABEL;
+  return COMPARISON_SERIES_LABELS.get(comparison) ?? COMPARED_SERIES_LABEL;
 }
 
 function yearBefore(date: Date): Date {

package/src/routes/sends.ts

@@ -69,6 +69,7 @@ import {
   snapshotOfVersion,
 } from "../services/templates";
 import type { SendStatus, SuppressionSummary, TemplateStatus } from "../types";
+import type { JsonObject } from "../types/json";
 import {
   type previewVersionSchema,
   realSendSchema,
@@ -184,10 +185,10 @@ const sameAddress = (left: string, right: string): boolean =>
   normalizeAddress(left) === normalizeAddress(right);
 
 /** A bad address gets its own message; any other invalid field is the content's. */
-function sendInputError(error: unknown): string {
-  const isRecipient =
-    error instanceof ZodError &&
-    error.issues.some((issue) => issue.path[0] === RECIPIENT_FIELD);
+function sendInputError(error: ZodError): string {
+  const isRecipient = error.issues.some(
+    (issue) => issue.path[0] === RECIPIENT_FIELD,
+  );
   return isRecipient ? INVALID_RECIPIENT : INVALID_CONTENT;
 }
 
@@ -255,7 +256,8 @@ export class SendsController extends Controller(API_BASE_PATH) {
     const input = assertValidation(
       body,
       (value) => testSendSchema.parse(value),
-      sendInputError,
+      (error) =>
+        error instanceof ZodError ? sendInputError(error) : INVALID_CONTENT,
     );
     const template = await requireTemplate(this.templates, id);
     const ownAddressSuppressed = await this.ownSuppression(input.to);
@@ -301,7 +303,8 @@ export class SendsController extends Controller(API_BASE_PATH) {
     const input = assertValidation(
       body,
       (value) => realSendSchema.parse(value),
-      sendInputError,
+      (error) =>
+        error instanceof ZodError ? sendInputError(error) : INVALID_CONTENT,
     );
     const template = await requireTemplate(this.templates, id);
     const result = await this.send(
@@ -574,8 +577,10 @@ function requestedVersionOf(
   return version === "draft" || version === "published" ? undefined : version;
 }
 
-function variablesOf(send: MailingSend): Record<string, unknown> {
-  return JSON.parse(send.json_variables || "{}") as Record<string, unknown>;
+function variablesOf(send: MailingSend): JsonObject {
+  // SAFETY: json_variables is written only as JSON.stringify(params.variables ?? {}) (services/send.ts) or
+  // JSON.stringify(send.variables) (services/send-import.ts), both a JsonObject.
+  return JSON.parse(send.json_variables || "{}") as JsonObject;
 }
 
 function summarize(template: MailingTemplate): SendTemplateSummary {

package/src/routes/settings.ts

@@ -33,6 +33,7 @@ import {
   mergeSettingsPatch,
   missingVariablesPolicy,
   saveSettings,
+  saveWebhookSecret,
   WEBHOOK_SECRET_BYTES,
 } from "../services/settings";
 import {
@@ -48,7 +49,8 @@ import {
   settingsPatchSchema,
 } from "../validation/settings.schema";
 import { retentionLimit } from "../crons/retention";
-import { isJsonObject } from "../validation/guards";
+import { isJsonObject } from "../validation/json";
+import { zodIssuesJson } from "./zod-json";
 
 const INVALID_SETTINGS = "$dms_mailing.errors.invalid_settings";
 const CATEGORIES_REASSIGNED = "$dms_mailing.settings.categories.reassigned";
@@ -77,7 +79,15 @@ const retentionDaysSchema = z.coerce
  * The DMS form reads and writes localized values whole
  * (`x-content-language: *`): category labels travel with every language.
  */
-export interface MailingSettingsResponse extends MailingSettingsValues {
+/** The settings as the form reads and writes them: who set the secret stays inside the module. */
+type FormSettings = Omit<MailingSettingsValues, "webhookSecretSource">;
+
+function formSettings(values: MailingSettingsValues): FormSettings {
+  const { webhookSecretSource: _source, ...form } = values;
+  return form;
+}
+
+export interface MailingSettingsResponse extends FormSettings {
   /** Where the provider posts its events; read-only. */
   webhookUrl: string;
   /** The configured provider, as the read-only provider row shows it. */
@@ -90,10 +100,10 @@ export interface MailingSettingsResponse extends MailingSettingsValues {
 export interface SettingsNotice {
   title: string;
   color?: string;
-  params?: Record<string, unknown>;
+  params?: Record<string, number | string>;
 }
 
-export interface SettingsWriteResponse extends MailingSettingsValues {
+export interface SettingsWriteResponse extends FormSettings {
   notice?: SettingsNotice;
 }
 
@@ -147,9 +157,11 @@ function formIssue(issue: z.ZodIssue): z.ZodIssue {
 }
 
 /** A refused write: the generic message, and each issue for its field. */
-function invalidSettings(error: unknown) {
-  if (!(error instanceof z.ZodError)) return INVALID_SETTINGS;
-  return { message: INVALID_SETTINGS, issues: error.issues.map(formIssue) };
+function invalidSettings(error: z.ZodError) {
+  return {
+    message: INVALID_SETTINGS,
+    issues: zodIssuesJson(error.issues.map(formIssue)),
+  };
 }
 
 function senderNotice(values: MailingSettingsValues): SettingsNotice[] {
@@ -208,7 +220,7 @@ export class MailingSettingsController extends Controller(
       readCapabilities(),
     ]);
     return {
-      ...values,
+      ...formSettings(values),
       webhookUrl: await this.providerWebhookUrl(capabilities?.name),
       provider: capabilities?.name ?? "",
       missingVariables: missingVariablesPolicy(values),
@@ -231,7 +243,7 @@ export class MailingSettingsController extends Controller(
       ? await this.reassignCategories(categories, categoryMoves(entries))
       : 0;
     const [notice] = [...reassignedNotice(reassigned), ...senderNotice(saved)];
-    return { ...saved, ...(notice && { notice }) };
+    return { ...formSettings(saved), ...(notice && { notice }) };
   }
 
   /** The body as a checked patch; 400 for anything else. */
@@ -241,16 +253,20 @@ export class MailingSettingsController extends Controller(
     return assertValidation(
       clearedToEmpty(body),
       (value) => settingsPatchSchema.parse(value),
-      invalidSettings,
+      (error) =>
+        error instanceof z.ZodError ? invalidSettings(error) : INVALID_SETTINGS,
     );
   }
 
-  /** Issues a new webhook secret; the old one stops working at once. */
+  /**
+   * Issues a new webhook secret, the workspace owner's from now on; the old
+   * one stops working at once.
+   */
   @Post("/webhook-secret/rotate")
   async rotateSecret(): Promise<{ value: string }> {
-    const current = await getSettings(this.tenantId);
+    await getSettings(this.tenantId);
     const value = randomBytes(WEBHOOK_SECRET_BYTES).toString("hex");
-    await saveSettings(this.tenantId, { ...current, webhookSecret: value });
+    await saveWebhookSecret(this.tenantId, value, "operator");
     return { value };
   }
 
@@ -295,7 +311,8 @@ export class MailingSettingsController extends Controller(
     return assertValidation(
       raw,
       (value) => retentionDaysSchema.parse(value),
-      invalidSettings,
+      (error) =>
+        error instanceof z.ZodError ? invalidSettings(error) : INVALID_SETTINGS,
     );
   }
 
@@ -306,12 +323,12 @@ export class MailingSettingsController extends Controller(
   @Get("/category-usage")
   async categoryUsage(): Promise<{ counts: Record<string, number> }> {
     const templates = await this.templates.getAll();
-    const counts: Record<string, number> = {};
+    const counts = new Map<string, number>();
     for (const template of templates) {
       if (!template.category || template.status === ARCHIVED_STATUS) continue;
-      counts[template.category] = (counts[template.category] ?? 0) + 1;
+      counts.set(template.category, (counts.get(template.category) ?? 0) + 1);
     }
-    return { counts };
+    return { counts: Object.fromEntries(counts) };
   }
 
   /**

package/src/routes/suppressions.ts

@@ -18,6 +18,7 @@ import { API_BASE_PATH, HTTP_CONFLICT, HTTP_NOT_FOUND } from "../constants";
 import { SuppressionModel } from "../db";
 import { SuppressionsPageController } from "../pages/suppressions";
 import { suppressAddress } from "../services/suppressions";
+import { zodIssuesJson } from "./zod-json";
 
 const INVALID_SUPPRESSION = "$dms_mailing.suppressions.errors.invalid";
 const ALREADY_SUPPRESSED = "$dms_mailing.suppressions.errors.already";
@@ -32,12 +33,6 @@ const manualSuppressionSchema = z.object({
   note: z.string().trim().max(MAX_NOTE_LENGTH).optional(),
 });
 
-/** A refused entry: the generic message, and each issue under its field. */
-function invalidSuppression(error: unknown) {
-  if (!(error instanceof z.ZodError)) return INVALID_SUPPRESSION;
-  return { message: INVALID_SUPPRESSION, issues: error.issues };
-}
-
 /** An address already on the list, told under the address field. */
 const alreadySuppressed = () => ({
   message: ALREADY_SUPPRESSED,
@@ -56,13 +51,22 @@ export class SuppressionsController extends Controller(
   @TenantScopedModel(SuppressionModel)
   declare suppressions: SuppressionModel;
 
-  /** Puts an address on the list by hand: nothing is sent to it any more. */
+  /**
+   * Puts an address on the list by hand: nothing is sent to it any more. A
+   * refused entry answers the generic message, and each issue under its field.
+   */
   @Post("")
   async add(@JSONBody() body: unknown): Promise<{ added: true }> {
     const input = assertValidation(
       body ?? {},
       (value) => manualSuppressionSchema.parse(value),
-      invalidSuppression,
+      (error) => {
+        if (!(error instanceof z.ZodError)) return INVALID_SUPPRESSION;
+        return {
+          message: INVALID_SUPPRESSION,
+          issues: zodIssuesJson(error.issues),
+        };
+      },
     );
     const isAdded = await suppressAddress(getRequestTenantId(this.ctx), {
       email: input.email,