@cosmicdrift/kumiko-renderer-mail-html 0.363.0 → 0.364.0

package/dist/document-kit.d.ts

@@ -11,6 +11,7 @@ export declare function compileDocumentSource(hbs: typeof Handlebars, source: st
 }): HandlebarsTemplateDelegate;
 export declare function readDocumentFormat(ctx: RendererContext, templateLocale: string): Promise<DocumentFormat>;
 export declare function readTenantName(ctx: RendererContext): Promise<string>;
+export declare function readBrandingAccentColor(ctx: RendererContext): Promise<string | undefined>;
 export declare function resolveResourceFileRefs(tplApi: TemplateResolverApi, ctx: RendererContext, template: TemplateResource, keys: readonly string[]): Promise<ReadonlyMap<string, string>>;
 export declare function collectRegionResourceKeys(regions: LayoutRegions): readonly string[];
 export declare function mergeResourceFileRefs(bodyRefs: ReadonlyMap<string, string>, layoutRefs: ReadonlyMap<string, string>): ReadonlyMap<string, string>;

package/dist/document-kit.js

@@ -1,16 +1,19 @@
 import { BRANDING_QN } from "@cosmicdrift/kumiko-bundled-features/managed-pages";
-import { collectDocumentResourceKeys, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { collectDocumentResourceKeys, isHexColor, sanitizeDocumentHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { isUuid, SYSTEM_TENANT_ID, TENANT_CURRENCY_CONFIG_KEY, } from "@cosmicdrift/kumiko-framework/engine";
 import { fileRefsTable } from "@cosmicdrift/kumiko-framework/files";
+import { createFallbackLogger } from "@cosmicdrift/kumiko-framework/logging";
 import { formatMoney, resolveSafeMoneyLocale } from "@cosmicdrift/kumiko-headless";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
 import Handlebars from "handlebars";
 // Handlebars instance, template resolution and resource lookup shared by the
 // mail and PDF renderers, so both format money/dates and find images the same way.
+const documentKitLogger = createFallbackLogger("renderer-mail-html");
 const FALLBACK_CURRENCY = "EUR";
 const SAFE_LINK_PROTOCOL = /^(https?:|mailto:)/i;
 const DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
+const DATE_TIME_WITH_OFFSET = /^\d{4}-\d{2}-\d{2}T.*[+-]\d{2}(:?\d{2})?$/;
 function isPlainRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -39,6 +42,13 @@ export function createDocumentHandlebars(format) {
             if (typeof value === "string" && DATE_ONLY.test(value)) {
                 return Temporal.PlainDate.from(value).toLocaleString(locale, { dateStyle: "long" });
             }
+            // An explicit offset names the sender's zone: the calendar date is the wall-clock
+            // date of the string, not the date at UTC.
+            if (typeof value === "string" && DATE_TIME_WITH_OFFSET.test(value)) {
+                return Temporal.PlainDateTime.from(value)
+                    .toPlainDate()
+                    .toLocaleString(locale, { dateStyle: "long" });
+            }
             const instant = typeof value === "number"
                 ? Temporal.Instant.fromEpochMilliseconds(value)
                 : Temporal.Instant.from(value);
@@ -48,10 +58,29 @@ export function createDocumentHandlebars(format) {
             return String(value);
         }
     });
+    hbs.registerHelper("richText", (value) => {
+        if (typeof value !== "string")
+            return "";
+        const sanitized = sanitizeDocumentHtml(value);
+        if (sanitized.ok)
+            return new hbs.SafeString(sanitized.html);
+        // Rejected markup renders as visible text (escaped by Handlebars) instead of vanishing.
+        documentKitLogger.warn("richText value rejected by sanitizer, rendered as escaped text", {
+            violations: sanitized.violations.map((item) => item.code),
+        });
+        return value;
+    });
     hbs.registerHelper("link", (value) => typeof value === "string" && SAFE_LINK_PROTOCOL.test(value.trim()) ? value : "#");
     return hbs;
 }
-const KNOWN_HELPERS = { each: true, if: true, money: true, date: true, link: true };
+const KNOWN_HELPERS = {
+    each: true,
+    if: true,
+    money: true,
+    date: true,
+    link: true,
+    richText: true,
+};
 export function compileDocumentSource(hbs, source, options = {}) {
     return hbs.compile(source, {
         knownHelpers: KNOWN_HELPERS,
@@ -78,6 +107,10 @@ export async function readDocumentFormat(ctx, templateLocale) {
 export async function readTenantName(ctx) {
     return (await readConfigText(ctx, BRANDING_QN.title)) ?? "";
 }
+export async function readBrandingAccentColor(ctx) {
+    const value = await readConfigText(ctx, BRANDING_QN.accentColor);
+    return value !== undefined && isHexColor(value) ? value : undefined;
+}
 const LOGO_RESOURCE_KEY = "logo";
 // Lookup order: the template's own link, the system template it overrides, and for
 // "logo" the tenant's branding logo. The system lookup is skipped for system templates.

package/dist/mail-attachments.d.ts

@@ -8,3 +8,4 @@ export declare function buildRenderedPdfAttachments(args: {
     readonly renderFileName: (pattern: string) => string;
 }): readonly RenderedPdfAttachmentRef[];
 export declare function combineMailAttachments(slug: string, inline: readonly InlineAttachmentRef[], files: readonly FileAttachmentRef[], renderedPdfs: readonly RenderedPdfAttachmentRef[]): readonly MailAttachmentRef[];
+export declare function mergeInheritedAttachments<T>(own: readonly T[], inherited: readonly T[], fileNameOf: (attachment: T) => string): readonly T[];

package/dist/mail-attachments.js

@@ -1,9 +1,10 @@
-import { MAX_EMAIL_ATTACHMENTS, MAX_RENDERED_PDF_VARIABLES_BYTES, sanitizePdfAttachmentFileName, } from "@cosmicdrift/kumiko-bundled-features/delivery";
+import { MAX_EMAIL_ATTACHMENTS, MAX_RENDERED_PDF_VARIABLES_BYTES, sanitizePdfAttachmentFileName, withoutDeliveryEnvelopeKeys, } from "@cosmicdrift/kumiko-bundled-features/delivery";
 import { RendererError, } from "@cosmicdrift/kumiko-bundled-features/renderer-foundation";
 export function buildRenderedPdfAttachments(args) {
-    const { slug, links, variables, locale, renderFileName } = args;
+    const { slug, links, locale, renderFileName } = args;
     if (links.length === 0)
         return [];
+    const variables = withoutDeliveryEnvelopeKeys(args.variables);
     if (Buffer.byteLength(JSON.stringify(variables)) > MAX_RENDERED_PDF_VARIABLES_BYTES) {
         throw new RendererError(`renderer-mail-html: the variables of mail "${slug}" exceed ${MAX_RENDERED_PDF_VARIABLES_BYTES} bytes as JSON, too large to hand to the attached PDF`, "invalid_payload");
     }
@@ -24,3 +25,13 @@ export function combineMailAttachments(slug, inline, files, renderedPdfs) {
     }
     return attachments;
 }
+// A tenant override carries its own links only; what the overridden system mail attaches
+// must not silently vanish. Attachments are slot-less here, so an own attachment with the
+// same file name replaces the inherited one.
+export function mergeInheritedAttachments(own, inherited, fileNameOf) {
+    const ownNames = new Set(own.map((attachment) => fileNameOf(attachment).toLowerCase()));
+    return [
+        ...inherited.filter((attachment) => !ownNames.has(fileNameOf(attachment).toLowerCase())),
+        ...own,
+    ];
+}

package/dist/render.js

@@ -10,14 +10,14 @@
 //   4. mjml -> email HTML, html-to-text -> plain-text alternative.
 // Handlebars runs in an isolated instance with a fixed helper set.
 import { RendererError, } from "@cosmicdrift/kumiko-bundled-features/renderer-foundation";
-import { collectDocumentResourceKeys, compileDocumentBodyToHandlebars, createTemplateResolverApi, fileAttachmentsOf, imageLinksOf, isMailTemplateMeta, parseTemplateMeta, pdfAttachmentLinksOf, readLayoutRegions, resolveTemplateVariables, sanitizeDocumentHtml, sanitizeLayoutHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { collectDocumentResourceKeys, compileDocumentBodyToHandlebars, createTemplateResolverApi, fileAttachmentsOf, imageLinksOf, isMailTemplateMeta, mailLayoutAppearance, parseTemplateMeta, pdfAttachmentLinksOf, readLayoutRegions, resolveTemplateVariables, sanitizeDocumentHtml, sanitizeLayoutHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import { SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { convert as htmlToText } from "html-to-text";
 import mjml2html from "mjml";
 import { DEFAULT_MAIL_LAYOUT_MJML, DEFAULT_MAIL_LAYOUT_SLUG } from "./default-layout.js";
-import { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, mergeResourceFileRefs, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
-import { buildRenderedPdfAttachments, combineMailAttachments } from "./mail-attachments.js";
-import { renderStructuredLayoutMjml } from "./structured-layout.js";
+import { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, mergeResourceFileRefs, readBrandingAccentColor, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
+import { buildRenderedPdfAttachments, combineMailAttachments, mergeInheritedAttachments, } from "./mail-attachments.js";
+import { MAIL_IMAGE_MAX_WIDTH_PX, renderStructuredLayoutMjml } from "./structured-layout.js";
 const LINE_BREAKS = /[\r\n]+/g;
 function describe(e) {
     return e instanceof Error ? e.message : String(e);
@@ -53,7 +53,7 @@ async function resolveLayout(tplApi, ctx, meta, locale) {
                     useSystemLayout = true;
             }
             else {
-                useSystemLayout = layout.contentFormat === "mjml";
+                useSystemLayout = true;
             }
         }
         if (useSystemLayout) {
@@ -160,12 +160,16 @@ async function resolveMailTemplate(tplApi, ctx, slug, locale, draft) {
 }
 // Each data-resource image is referenced by cid; the bytes are read at send time, so
 // the render result carries only file ref ids.
-async function renderMailBody(tplApi, ctx, template, hbs, context) {
+async function renderMailBody(tplApi, ctx, template, hbs, context, buttonInlineStyle) {
     try {
         const resourceFileRefs = await resolveResourceFileRefs(tplApi, ctx, template, collectDocumentResourceKeys(template.content));
         const handlebarsSource = compileDocumentBodyToHandlebars(template.content, resolveTemplateVariables(ctx.registry, template.slug, template.variableSchema), {
             resourceSrc: (key) => (resourceFileRefs.has(key) ? `cid:${key}` : undefined),
+            resourceImageMaxWidthPx: MAIL_IMAGE_MAX_WIDTH_PX,
             alignmentAsInlineStyle: true,
+            buttonAsInlineStyle: true,
+            tableAsInlineStyle: true,
+            ...(buttonInlineStyle !== undefined && { buttonInlineStyle }),
         });
         return {
             contentHtml: compileDocumentSource(hbs, handlebarsSource)(context),
@@ -200,17 +204,104 @@ function renderSubjectLines(hbs, meta, slug, context) {
         throw new RendererError(`renderer-mail-html: rendering subject or preview text of "${slug}" failed — ${describe(e)}`, "other");
     }
 }
-function assembleMailAttachments(args) {
-    const { slug, template, resourceFileRefs, variables, locale, renderFileName } = args;
+// Same fallback as for images (resolveResourceFileRefs): a tenant override of a system mail
+// keeps the attachments the system mail carries.
+async function resolveSystemAttachments(tplApi, template) {
+    if (template.scope !== "tenant")
+        return {};
+    try {
+        const system = await tplApi.resolveTemplate({
+            tenantId: SYSTEM_TENANT_ID,
+            slug: template.slug,
+            kind: template.kind,
+            locale: template.locale,
+        });
+        return {
+            fileAttachments: system.fileAttachments ?? [],
+            pdfAttachmentLinks: system.pdfAttachmentLinks ?? [],
+        };
+    }
+    catch (e) {
+        if (e instanceof TemplateNotFoundError)
+            return {};
+        throw new RendererError(`renderer-mail-html: resolving the system attachments of "${template.slug}" failed — ${describe(e)}`, "other");
+    }
+}
+async function assembleMailAttachments(args) {
+    const { tplApi, slug, template, resourceFileRefs, variables, locale, renderFileName } = args;
+    const inherited = await resolveSystemAttachments(tplApi, template);
     const inlineAttachments = [...resourceFileRefs].map(([cid, fileRefId]) => ({ kind: "inline", cid, fileRefId }));
     const renderedPdfs = buildRenderedPdfAttachments({
         slug,
-        links: template.pdfAttachmentLinks ?? [],
+        links: mergeInheritedAttachments(template.pdfAttachmentLinks ?? [], inherited.pdfAttachmentLinks ?? [], (link) => link.fileName),
         variables,
         locale,
         renderFileName,
     });
-    return combineMailAttachments(slug, inlineAttachments, template.fileAttachments ?? [], renderedPdfs);
+    return combineMailAttachments(slug, inlineAttachments, mergeInheritedAttachments(template.fileAttachments ?? [], inherited.fileAttachments ?? [], (file) => file.fileName), renderedPdfs);
+}
+function compileLayoutMjml(args) {
+    const { layout, hbs, contentHtml, appearance, accentColor, resourceFileRefs, layoutContext } = args;
+    try {
+        return layout.format === "html"
+            ? renderStructuredLayoutMjml({
+                layoutHtml: layout.content,
+                contentHtml,
+                context: layoutContext,
+                compile: (source) => compileDocumentSource(hbs, source),
+                resourceSrc: (key) => (resourceFileRefs.has(key) ? `cid:${key}` : undefined),
+                ...(appearance !== undefined && { appearance }),
+                ...(accentColor !== undefined && { accentColor }),
+            })
+            : compileDocumentSource(hbs, layout.content)({ ...layoutContext, content: contentHtml });
+    }
+    catch (e) {
+        // "other": the caller's payload is fine, the layout template is broken.
+        throw new RendererError(`renderer-mail-html: Handlebars compile failed for layout — ${describe(e)}`, "other");
+    }
+}
+async function compileMjmlToHtml(mjmlSource) {
+    // mjml@5 is async
+    const mjmlResult = await mjml2html(mjmlSource, { validationLevel: "soft" });
+    const errors = mjmlResult.errors ?? [];
+    if (errors.length > 0) {
+        const firstErrors = errors
+            .slice(0, 3)
+            .map((e) => `line ${e.line}: ${e.message}`)
+            .join("; ");
+        throw new RendererError(`renderer-mail-html: MJML compile produced ${errors.length} error(s) — ${firstErrors}`, "other");
+    }
+    return mjmlResult.html;
+}
+function htmlToPlainText(html) {
+    return htmlToText(html, {
+        wordwrap: 80,
+        selectors: [
+            { selector: "a", options: { hideLinkHrefIfSameAsText: true } },
+            { selector: "img", format: "skip" },
+        ],
+    });
+}
+function buildMailRenderResponse(args) {
+    const { subject, previewText, html, text, meta, attachments, template, layout, isDraft } = args;
+    return {
+        kind: "mail",
+        subject,
+        html,
+        text,
+        ...(previewText === undefined ? {} : { previewText }),
+        ...(meta.senderName !== undefined && { fromName: meta.senderName }),
+        ...(meta.replyTo !== undefined && { replyTo: meta.replyTo }),
+        ...(attachments.length > 0 && { attachments }),
+        ...(!isDraft && {
+            template: {
+                templateId: template.id,
+                templateVersion: template.version,
+                scope: template.scope,
+            },
+        }),
+        ...(layout.ref === null ? {} : { layout: layout.ref }),
+    };
 }
 export async function mailHtmlRender(req, ctx) {
     if (req.kind !== "mail") {
@@ -233,11 +324,14 @@ export async function mailHtmlRender(req, ctx) {
         imprint: "",
         unsubscribeUrl: unsubscribeUrl ?? "",
     };
-    const body = await renderMailBody(tplApi, ctx, template, hbs, context);
+    // Only a structured (html) layout carries appearance; an mjml layout keeps its own look.
+    const appearance = layout.format === "html" ? mailLayoutAppearance(layout.template?.meta) : undefined;
+    const body = await renderMailBody(tplApi, ctx, template, hbs, context, appearance?.buttonStyle);
     const { contentHtml } = body;
     const layoutFileRefs = await resolveLayoutFileRefs(tplApi, ctx, layout);
     const resourceFileRefs = mergeResourceFileRefs(body.resourceFileRefs, layoutFileRefs);
-    const attachments = assembleMailAttachments({
+    const attachments = await assembleMailAttachments({
+        tplApi,
         slug,
         template,
         resourceFileRefs,
@@ -246,62 +340,33 @@ export async function mailHtmlRender(req, ctx) {
         renderFileName: (pattern) => renderFileNamePattern(hbs, pattern, slug, context),
     });
     const { subject, previewText } = renderSubjectLines(hbs, meta, slug, context);
-    let mjmlSource;
-    try {
-        const layoutContext = {
+    const accentColor = appearance?.accentLine === true ? await readBrandingAccentColor(ctx) : undefined;
+    const mjmlSource = compileLayoutMjml({
+        layout,
+        hbs,
+        contentHtml,
+        appearance,
+        accentColor,
+        resourceFileRefs,
+        layoutContext: {
             subject,
             previewText: previewText ?? "",
             tenantName,
             signature: "",
             imprint: "",
             unsubscribeUrl: unsubscribeUrl ?? "",
-        };
-        mjmlSource =
-            layout.format === "html"
-                ? renderStructuredLayoutMjml({
-                    layoutHtml: layout.content,
-                    contentHtml,
-                    context: layoutContext,
-                    compile: (source) => compileDocumentSource(hbs, source),
-                    resourceSrc: (key) => (resourceFileRefs.has(key) ? `cid:${key}` : undefined),
-                })
-                : compileDocumentSource(hbs, layout.content)({ ...layoutContext, content: contentHtml });
-    }
-    catch (e) {
-        // "other": the caller's payload is fine, the layout template is broken.
-        throw new RendererError(`renderer-mail-html: Handlebars compile failed for layout — ${describe(e)}`, "other");
-    }
-    // mjml@5 is async
-    const mjmlResult = await mjml2html(mjmlSource, { validationLevel: "soft" });
-    const errors = mjmlResult.errors ?? [];
-    if (errors.length > 0) {
-        const firstErrors = errors
-            .slice(0, 3)
-            .map((e) => `line ${e.line}: ${e.message}`)
-            .join("; ");
-        throw new RendererError(`renderer-mail-html: MJML compile produced ${errors.length} error(s) — ${firstErrors}`, "other");
-    }
-    const text = htmlToText(mjmlResult.html, {
-        wordwrap: 80,
-        selectors: [
-            { selector: "a", options: { hideLinkHrefIfSameAsText: true } },
-            { selector: "img", format: "skip" },
-        ],
+        },
     });
-    return {
-        kind: "mail",
+    const html = await compileMjmlToHtml(mjmlSource);
+    return buildMailRenderResponse({
         subject,
-        html: mjmlResult.html,
-        text,
-        ...(previewText === undefined ? {} : { previewText }),
-        ...(attachments.length > 0 && { attachments }),
-        ...(draft === undefined && {
-            template: {
-                templateId: template.id,
-                templateVersion: template.version,
-                scope: template.scope,
-            },
-        }),
-        ...(layout.ref === null ? {} : { layout: layout.ref }),
-    };
+        previewText,
+        html,
+        text: htmlToPlainText(html),
+        meta,
+        attachments,
+        template,
+        layout,
+        isDraft: draft !== undefined,
+    });
 }

package/dist/structured-layout.d.ts

@@ -1,3 +1,5 @@
+import { type MailLayoutAppearance } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+export declare const MAIL_IMAGE_MAX_WIDTH_PX = 180;
 export type StructuredLayoutInput = {
     readonly layoutHtml: string;
     readonly contentHtml: string;
@@ -7,5 +9,9 @@ export type StructuredLayoutInput = {
     readonly compile: (source: string) => (context: Readonly<Record<string, unknown>>) => string;
     /** src for `img[data-resource]` in the regions; without it layout images are dropped. */
     readonly resourceSrc?: (key: string) => string | undefined;
+    /** Parsed layout appearance; defaults apply when missing. */
+    readonly appearance?: MailLayoutAppearance;
+    /** Tenant branding accent color for the accent line; ignored unless it is a #rrggbb hex. */
+    readonly accentColor?: string;
 };
 export declare function renderStructuredLayoutMjml(input: StructuredLayoutInput): string;

package/dist/structured-layout.js

@@ -1,16 +1,30 @@
 // Renders a structured (html) mail layout: the tenant-editable regions go into
 // a fixed in-code MJML frame, so a tenant layout never contributes MJML source.
-import { compileDocumentBodyToHandlebars, readLayoutRegions, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
-const STRUCTURED_LAYOUT_FRAME = `<mjml>
+import { compileDocumentBodyToHandlebars, isHexColor, mailLayoutAppearance, readLayoutRegions, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+// The logo of a mail layout and of a mail body is capped here; the editors show the same width.
+export const MAIL_IMAGE_MAX_WIDTH_PX = 180;
+// Appearance values are enum members or a strict hex (see mailLayoutAppearance / isHexColor),
+// so interpolating them into the frame cannot inject MJML; the escaping keeps that if the schema widens.
+function structuredLayoutFrame(appearance, accentColor) {
+    const accentLine = appearance.accentLine && accentColor !== undefined && isHexColor(accentColor)
+        ? `<mj-section background-color="${escapeHtmlAttr(accentColor)}" padding="0">
+      <mj-column padding="0">
+        <mj-spacer height="4px" padding="0" />
+      </mj-column>
+    </mj-section>`
+        : "";
+    return `<mjml>
   <mj-head>
     <mj-title>{{subject}}</mj-title>
     <mj-preview>{{previewText}}</mj-preview>
     <mj-attributes>
-      <mj-all font-family="Helvetica, Arial, sans-serif" />
+      <mj-all font-family="${escapeHtmlAttr(appearance.fontFamily)}" />
       <mj-text font-size="14px" color="#333" line-height="1.6" />
     </mj-attributes>
   </mj-head>
-  <mj-body background-color="#f5f5f5">
+  <mj-body width="${appearance.width}px" background-color="${escapeHtmlAttr(appearance.outerBackground)}">
+    ${accentLine}
     {{#if regionHeader}}
     <mj-section background-color="#ffffff" padding="20px">
       <mj-column>
@@ -20,7 +34,7 @@ const STRUCTURED_LAYOUT_FRAME = `<mjml>
     {{/if}}
     <mj-section background-color="#ffffff" padding="20px">
       <mj-column>
-        <mj-raw>{{{content}}}</mj-raw>
+        <mj-text>{{{content}}}</mj-text>
       </mj-column>
     </mj-section>
     {{#if regionSignature}}
@@ -31,7 +45,7 @@ const STRUCTURED_LAYOUT_FRAME = `<mjml>
     </mj-section>
     {{/if}}
     {{#if regionFooter}}
-    <mj-section background-color="#f5f5f5" padding="20px">
+    <mj-section background-color="${escapeHtmlAttr(appearance.outerBackground)}" padding="20px">
       <mj-column>
         <mj-text font-size="11px" color="#888" align="center">{{{regionFooter}}}</mj-text>
       </mj-column>
@@ -39,12 +53,17 @@ const STRUCTURED_LAYOUT_FRAME = `<mjml>
     {{/if}}
   </mj-body>
 </mjml>`;
+}
 export function renderStructuredLayoutMjml(input) {
     const regions = readLayoutRegions(input.layoutHtml);
     const renderRegion = (region) => region.trim() === ""
         ? ""
-        : input.compile(compileDocumentBodyToHandlebars(region, {}, input.resourceSrc && { resourceSrc: input.resourceSrc }))(input.context);
-    return input.compile(STRUCTURED_LAYOUT_FRAME)({
+        : input.compile(compileDocumentBodyToHandlebars(region, {}, {
+            ...(input.resourceSrc && { resourceSrc: input.resourceSrc }),
+            resourceImageMaxWidthPx: MAIL_IMAGE_MAX_WIDTH_PX,
+        }))(input.context);
+    const frame = structuredLayoutFrame(input.appearance ?? mailLayoutAppearance({}), input.accentColor);
+    return input.compile(frame)({
         ...input.context,
         content: input.contentHtml,
         regionHeader: renderRegion(regions.header),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer-mail-html",
-  "version": "0.363.0",
+  "version": "0.364.0",
   "description": "Renderer-Foundation plugin for branded HTML emails: mail-kind templates (document HTML + subject meta) rendered with isolated Handlebars into an MJML layout, plus plain text via html-to-text. Templates resolved from template-resolver.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -19,16 +19,16 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.363.0",
-    "@cosmicdrift/kumiko-framework": "0.363.0",
-    "@cosmicdrift/kumiko-headless": "0.363.0",
-    "@cosmicdrift/kumiko-types": "0.363.0",
+    "@cosmicdrift/kumiko-bundled-features": "0.364.0",
+    "@cosmicdrift/kumiko-framework": "0.364.0",
+    "@cosmicdrift/kumiko-headless": "0.364.0",
+    "@cosmicdrift/kumiko-types": "0.364.0",
     "handlebars": "^4.7.8",
     "html-to-text": "^9.0.5",
     "mjml": "^5.2.2"
   },
   "devDependencies": {
-    "@cosmicdrift/kumiko-testing": "0.363.0",
+    "@cosmicdrift/kumiko-testing": "0.364.0",
     "@types/html-to-text": "^9.0.4",
     "@types/mjml": "^5.0.0"
   },

package/src/changes.json

@@ -1,4 +1,16 @@
 [
+  {
+    "version": "0.364.0",
+    "type": "fix",
+    "title": "Structured mail layouts show the mail body",
+    "detail": "The structured layout frame wraps the body in mj-text instead of mj-raw. With mj-raw the body HTML sat directly in the column table, browsers moved it into the column wrapper with font-size 0, and every mail on a tenant layout had an invisible body."
+  },
+  {
+    "version": "0.364.0",
+    "type": "fix",
+    "title": "Mail renderer keeps wall-clock dates and system attachments",
+    "detail": "The date helper keeps the calendar date of offset datetimes, tenant overrides of system mails keep inherited attachments, markdown templates use the system layout and delivery envelope keys are not exposed as variables."
+  },
   {
     "version": "0.363.0",
     "type": "breaking",