@cosmicdrift/kumiko-bundled-features 0.349.0 → 0.350.0

package/dist/channel-email/email-channel.js

@@ -78,13 +78,15 @@ export function createEmailChannel(options) {
             title: message.title,
             body: message.body,
         };
-        const html = await renderer.render({
+        const rendererInput = {
             template: message.notificationType,
             variables,
             locale: message.locale,
-        });
+        };
+        const html = await renderer.render(rendererInput);
+        const text = renderer.renderText ? await renderer.renderText(rendererInput) : undefined;
         const subject = variables["subject"] ?? message.title; // @cast-boundary dynamic-key
-        return { html, subject };
+        return { html, subject, ...(text !== undefined && { text }) };
     }
     return {
         name: "email",
@@ -101,9 +103,15 @@ export function createEmailChannel(options) {
             return renderMessage(message);
         },
         async send(address, message, _ctx, rendered) {
-            const { html, subject } = rendered ?? (await renderMessage(message));
+            const { html, subject, text } = rendered ?? (await renderMessage(message));
             const envelope = emailEnvelopeFrom(message.data);
-            await transport.send(guardEmailMessage({ to: address, subject, html, ...envelope }));
+            await transport.send(guardEmailMessage({
+                to: address,
+                subject,
+                html,
+                ...(text !== undefined && { text }),
+                ...envelope,
+            }));
             return { status: "sent", address };
         },
     };

package/dist/channel-email/pii-guard.js

@@ -28,7 +28,9 @@ export function guardEmailMessage(message) {
                 `("${PII_CIPHERTEXT_PREFIX}…") — decrypt the stored value before mailing (decryptStoredPii).`);
         }
     }
-    const leaking = message.subject.includes(CIPHERTEXT_MARKER) || message.html.includes(CIPHERTEXT_MARKER);
+    const leaking = message.subject.includes(CIPHERTEXT_MARKER) ||
+        message.html.includes(CIPHERTEXT_MARKER) ||
+        message.text?.includes(CIPHERTEXT_MARKER) === true;
     if (!leaking)
         return message;
     const detail = "[channel-email] mail subject/body contains a PII ciphertext " +
@@ -41,6 +43,9 @@ export function guardEmailMessage(message) {
         ...message,
         subject: message.subject.replace(CIPHERTEXT_RE, "[pii-redacted]"),
         html: message.html.replace(CIPHERTEXT_RE, "[pii-redacted]"),
+        ...(message.text !== undefined && {
+            text: message.text.replace(CIPHERTEXT_RE, "[pii-redacted]"),
+        }),
     };
 }
 export function withPiiCiphertextGuard(transport) {

package/dist/channel-email/smtp-transport.js

@@ -54,6 +54,7 @@ export function createSmtpTransport(options) {
                 to: message.to,
                 subject: message.subject,
                 html: message.html,
+                ...(message.text !== undefined && { text: message.text }),
                 ...(message.replyTo && { replyTo: message.replyTo }),
                 ...(message.headers && { headers: message.headers }),
             });

package/dist/channel-email/types.d.ts

@@ -2,6 +2,7 @@ export type EmailMessage = {
     readonly to: string;
     readonly subject: string;
     readonly html: string;
+    readonly text?: string;
     readonly from?: string;
     readonly fromName?: string;
     readonly replyTo?: string;

package/dist/delivery/jobs.js

@@ -28,7 +28,9 @@ const renderJobPayloadSchema = z.object({
     message: channelMessageSchema,
 });
 const sendJobPayloadSchema = renderJobPayloadSchema.extend({
-    rendered: z.object({ html: z.string(), subject: z.string() }).optional(),
+    rendered: z
+        .object({ html: z.string(), subject: z.string(), text: z.string().optional() })
+        .optional(),
 });
 function requireTenantScopedDeps(ctx, tenantId) {
     const registry = ctx.registry;

package/dist/delivery/types.d.ts

@@ -26,6 +26,7 @@ export type ChannelResult = {
 export type RenderedMessage = {
     readonly html: string;
     readonly subject: string;
+    readonly text?: string;
 };
 export declare const DELIVERY_CHANNEL_MODES: readonly ["inline", "queued"];
 export type DeliveryChannelMode = (typeof DELIVERY_CHANNEL_MODES)[number];
@@ -44,6 +45,8 @@ export type RendererInput = {
 export type NotificationRenderer = {
     readonly name: string;
     render(input: RendererInput): Promise<string>;
+    /** Plain-text version of the same mail; the email channel sends it as the text part of a multipart/alternative mail. */
+    renderText?(input: RendererInput): Promise<string>;
 };
 export type DeliveryLogEntry = {
     readonly tenantId: TenantId;

package/dist/renderer-simple/simple-renderer.js

@@ -73,25 +73,57 @@ function renderBrandingHeader(branding, primaryColor, logoUrl) {
         : `<span style="font-size:18px;font-weight:700;color:${escapeHtmlAttr(primaryColor)}">${escapeHtml(branding.productName ?? "")}</span>`;
     return `<div style="margin:0 0 24px;padding:0 0 16px;border-bottom:3px solid ${escapeHtmlAttr(primaryColor)}">${logo}</div>`;
 }
-function renderBrandingFooter(branding, locale) {
-    if (!branding)
-        return "";
+function resolveBrandingFooter(branding, locale) {
     const pick = (value) => resolveLocalized(value, locale, branding.defaultLocale);
     const links = (branding.footerLinks ?? []).flatMap((link) => {
         const url = pick(link.url);
         if (url === undefined || !isHttpUrl(url))
             return [];
-        return [
-            `<a href="${escapeHtmlAttr(url)}" style="color:#999">${escapeHtml(pick(link.label) ?? "")}</a>`,
-        ];
+        return [{ label: pick(link.label) ?? "", url }];
     });
-    const footerText = pick(branding.footerText);
+    return { footerText: pick(branding.footerText), links };
+}
+function renderBrandingFooter(branding, locale) {
+    if (!branding)
+        return "";
+    const { footerText, links: resolvedLinks } = resolveBrandingFooter(branding, locale);
+    const links = resolvedLinks.map((link) => `<a href="${escapeHtmlAttr(link.url)}" style="color:#999">${escapeHtml(link.label)}</a>`);
     const footerPartsHtml = [footerText ? escapeHtml(footerText) : "", links.join(" · ")].filter((part) => part !== "");
     if (footerPartsHtml.length === 0)
         return "";
     const footerHtml = footerPartsHtml.join("<br />");
     return `<p style="margin:16px 0 0;color:#999;font-size:12px">${footerHtml}</p>`;
 }
+function brandingFooterLines(branding, locale) {
+    if (!branding)
+        return [];
+    const { footerText, links } = resolveBrandingFooter(branding, locale);
+    return [
+        ...(footerText ? [footerText] : []),
+        ...links.map((link) => (link.label ? `${link.label}: ${link.url}` : link.url)),
+    ];
+}
+function templateContent(variables) {
+    const data = variables; // @cast-boundary render-helper
+    // Without structured fields, title + body become the header and a single text section.
+    return {
+        header: data.header ?? data.title,
+        sections: data.sections ?? (data.body ? [{ text: data.body }] : undefined),
+        footer: data.footer,
+    };
+}
+// Markdown stays as written: its source is already readable plain text.
+function sectionText(section) {
+    if ("text" in section)
+        return section.text;
+    if ("heading" in section)
+        return section.heading;
+    if ("markdown" in section)
+        return section.markdown;
+    if ("button" in section)
+        return `${section.button.label}: ${section.button.url}`;
+    return "";
+}
 function renderSection(section, primaryColor) {
     if ("text" in section) {
         return `<p style="margin:0 0 16px;color:#333;font-size:14px;line-height:1.5">${escapeHtml(section.text)}</p>`;
@@ -118,10 +150,7 @@ export function createSimpleRenderer(branding) {
     return {
         name: "simple",
         async render(input) {
-            const data = input.variables; // @cast-boundary render-helper
-            // Fallback: if no structured fields, use title + body as header + single text section
-            const header = data.header ?? data.title;
-            const sections = data.sections ?? (data.body ? [{ text: data.body }] : undefined);
+            const { header, sections, footer } = templateContent(input.variables);
             const parts = [];
             parts.push('<!DOCTYPE html><html><body style="margin:0;padding:0;font-family:sans-serif">');
             parts.push('<div style="max-width:600px;margin:0 auto;padding:24px">');
@@ -134,13 +163,20 @@ export function createSimpleRenderer(branding) {
                     parts.push(renderSection(section, primaryColor));
                 }
             }
-            if (data.footer) {
-                parts.push(`<p style="margin:24px 0 0;color:#999;font-size:12px;border-top:1px solid #eee;padding-top:16px">${escapeHtml(data.footer)}</p>`);
+            if (footer) {
+                parts.push(`<p style="margin:24px 0 0;color:#999;font-size:12px;border-top:1px solid #eee;padding-top:16px">${escapeHtml(footer)}</p>`);
             }
             parts.push(renderBrandingFooter(branding, input.locale));
             parts.push("</div></body></html>");
             return parts.join("");
         },
+        async renderText(input) {
+            const { header, sections, footer } = templateContent(input.variables);
+            const brandingFooter = brandingFooterLines(branding, input.locale).join("\n");
+            return [header, ...(sections ?? []).map(sectionText), footer, brandingFooter]
+                .filter((block) => block !== undefined && block !== "")
+                .join("\n\n");
+        },
     };
 }
 export const simpleRenderer = createSimpleRenderer();

package/dist/user-data-rights/email-templates.d.ts

@@ -4,6 +4,7 @@ export declare const GDPR_MAIL_EN: Readonly<Record<string, string>>;
 export type RenderedEmail = {
     readonly subject: string;
     readonly html: string;
+    readonly text: string;
 };
 export type RenderExportReadyEmailArgs = {
     readonly downloadUrl: string;

package/dist/user-data-rights/email-templates.js

@@ -45,7 +45,13 @@ export function renderExportReadyEmail(args) {
     <p style="margin: 0 0 24px;">${renderButton({ url: args.downloadUrl, label: t(locale, "gdpr.mail.exportReady.button") })}</p>
     <p style="margin: 0 0 8px; font-size: 13px; color: #555;">${escapeHtml(t(locale, "gdpr.mail.exportReady.expiry", { when: formatTimestamp(args.expiresAt) }))}</p>
     ${renderFallbackUrl({ url: args.downloadUrl, label: t(locale, "gdpr.mail.fallbackUrl") })}`;
-    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }) };
+    const text = plainTextBody([
+        t(locale, "gdpr.mail.greeting"),
+        t(locale, "gdpr.mail.exportReady.intro", { app }),
+        `${t(locale, "gdpr.mail.exportReady.button")}: ${args.downloadUrl}`,
+        t(locale, "gdpr.mail.exportReady.expiry", { when: formatTimestamp(args.expiresAt) }),
+    ]);
+    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }), text };
 }
 export function renderExportFailedEmail(args) {
     const locale = args.locale ?? "en";
@@ -54,7 +60,11 @@ export function renderExportFailedEmail(args) {
     const body = `
     <p style="margin: 0 0 16px; font-size: 16px;">${escapeHtml(t(locale, "gdpr.mail.greeting"))}</p>
     <p style="margin: 0; font-size: 14px; line-height: 1.5;">${escapeHtml(t(locale, "gdpr.mail.exportFailed.intro", { app }))}</p>`;
-    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }) };
+    const text = plainTextBody([
+        t(locale, "gdpr.mail.greeting"),
+        t(locale, "gdpr.mail.exportFailed.intro", { app }),
+    ]);
+    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }), text };
 }
 export function renderDeletionRequestedEmail(args) {
     const locale = args.locale ?? "en";
@@ -65,7 +75,12 @@ export function renderDeletionRequestedEmail(args) {
     <p style="margin: 0 0 16px; font-size: 16px;">${escapeHtml(t(locale, "gdpr.mail.greeting"))}</p>
     <p style="margin: 0 0 16px; font-size: 14px; line-height: 1.5;">${escapeHtml(t(locale, "gdpr.mail.deletionRequested.intro", { app, when }))}</p>
     <p style="margin: 0; font-size: 13px; color: #555;">${escapeHtml(t(locale, "gdpr.mail.deletionRequested.cancel"))}</p>`;
-    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }) };
+    const text = plainTextBody([
+        t(locale, "gdpr.mail.greeting"),
+        t(locale, "gdpr.mail.deletionRequested.intro", { app, when }),
+        t(locale, "gdpr.mail.deletionRequested.cancel"),
+    ]);
+    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }), text };
 }
 export function renderDeletionExecutedEmail(args) {
     const locale = args.locale ?? "en";
@@ -75,7 +90,14 @@ export function renderDeletionExecutedEmail(args) {
     const body = `
     <p style="margin: 0 0 16px; font-size: 16px;">${escapeHtml(t(locale, "gdpr.mail.greeting"))}</p>
     <p style="margin: 0; font-size: 14px; line-height: 1.5;">${escapeHtml(t(locale, "gdpr.mail.deletionExecuted.intro", { app, when }))}</p>`;
-    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }) };
+    const text = plainTextBody([
+        t(locale, "gdpr.mail.greeting"),
+        t(locale, "gdpr.mail.deletionExecuted.intro", { app, when }),
+    ]);
+    return { subject, html: renderShell({ title: subject, bodyHtml: wrapCell(body), locale }), text };
+}
+function plainTextBody(paragraphs) {
+    return paragraphs.join("\n\n");
 }
 function wrapCell(bodyHtml) {
     return `<tr><td>${bodyHtml}</td></tr>`;

package/dist/user-data-rights/lib/default-mailers.js

@@ -29,34 +29,34 @@ function localeFor(userLocale, defaults) {
 export function makeDefaultExportReadyEmail(resolveTransport, defaults = {}) {
     return async (args) => {
         const transport = await resolveTransport(args.tenantId);
-        const { subject, html } = renderExportReadyEmail({
+        const { subject, html, text } = renderExportReadyEmail({
             downloadUrl: args.downloadUrl,
             expiresAt: args.expiresAt,
             locale: localeFor(args.userLocale, defaults),
             appName: defaults.appName,
         });
-        await transport.send({ to: args.userEmail, subject, html });
+        await transport.send({ to: args.userEmail, subject, html, text });
     };
 }
 export function makeDefaultExportFailedEmail(resolveTransport, defaults = {}) {
     return async (args) => {
         const transport = await resolveTransport(args.tenantId);
-        const { subject, html } = renderExportFailedEmail({
+        const { subject, html, text } = renderExportFailedEmail({
             locale: localeFor(args.userLocale, defaults),
             appName: defaults.appName,
         });
-        await transport.send({ to: args.userEmail, subject, html });
+        await transport.send({ to: args.userEmail, subject, html, text });
     };
 }
 export function makeDefaultDeletionRequestedEmail(resolveTransport, defaults = {}) {
     return async (args) => {
         const transport = await resolveTransport(args.tenantId);
-        const { subject, html } = renderDeletionRequestedEmail({
+        const { subject, html, text } = renderDeletionRequestedEmail({
             gracePeriodEnd: args.gracePeriodEnd,
             locale: localeFor(args.userLocale, defaults),
             appName: defaults.appName,
         });
-        await transport.send({ to: args.userEmail, subject, html });
+        await transport.send({ to: args.userEmail, subject, html, text });
     };
 }
 export function makeDefaultDeletionExecutedEmail(resolveTransport, defaults = {}) {
@@ -70,11 +70,11 @@ export function makeDefaultDeletionExecutedEmail(resolveTransport, defaults = {}
             return;
         }
         const transport = await resolveTransport(tenantId);
-        const { subject, html } = renderDeletionExecutedEmail({
+        const { subject, html, text } = renderDeletionExecutedEmail({
             executedAt: args.executedAt,
             locale: localeFor(args.userLocale, defaults),
             appName: defaults.appName,
         });
-        await transport.send({ to: args.userEmail, subject, html });
+        await transport.send({ to: args.userEmail, subject, html, text });
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.349.0",
+  "version": "0.350.0",
   "description": "Built-in features — tenant, user, auth, delivery. The stuff you'd rewrite anyway, already typed.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -503,12 +503,12 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.349.0",
-    "@cosmicdrift/kumiko-framework": "0.349.0",
-    "@cosmicdrift/kumiko-headless": "0.349.0",
-    "@cosmicdrift/kumiko-renderer": "0.349.0",
-    "@cosmicdrift/kumiko-renderer-web": "0.349.0",
-    "@cosmicdrift/kumiko-types": "0.349.0",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.350.0",
+    "@cosmicdrift/kumiko-framework": "0.350.0",
+    "@cosmicdrift/kumiko-headless": "0.350.0",
+    "@cosmicdrift/kumiko-renderer": "0.350.0",
+    "@cosmicdrift/kumiko-renderer-web": "0.350.0",
+    "@cosmicdrift/kumiko-types": "0.350.0",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/mailparser": "^3.4.6",
@@ -1025,8 +1025,8 @@
   ],
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
-    "@cosmicdrift/kumiko-locale-de": "0.349.0",
-    "@cosmicdrift/kumiko-locale-es": "0.349.0",
+    "@cosmicdrift/kumiko-locale-de": "0.350.0",
+    "@cosmicdrift/kumiko-locale-es": "0.350.0",
     "jsqr": "^1.4.0"
   }
 }

package/src/channel-email/changes.json

@@ -1,4 +1,10 @@
 [
+  {
+    "version": "0.350.0",
+    "type": "improvement",
+    "title": "Mails get a plain-text part (EmailMessage.text, NotificationRenderer.renderText, simple renderer and GDPR mails fill it)",
+    "detail": "Email text part\n`EmailMessage` gets an optional `text`. With it the SMTP transport sends `multipart/alternative` with a plain-text part. `NotificationRenderer` gets an optional `renderText`, which the email channel sends next to the HTML through the queued render and send jobs. `createSimpleRenderer` implements it from the template data (header, sections, footer, branding footer; buttons as `label: url`). The GDPR default mails return and send `text` as well. The PII guard checks and redacts `text` like the body."
+  },
   {
     "version": "0.348.1",
     "type": "fix",