@cosmicdrift/kumiko-renderer-mail-html 0.366.0 → 0.368.0

package/dist/default-layout.d.ts

@@ -1,2 +1,2 @@
 export { DEFAULT_MAIL_LAYOUT_SLUG } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
-export declare const DEFAULT_MAIL_LAYOUT_MJML = "<mjml lang=\"{{lang}}\">\n  <mj-head>\n    <mj-title>{{subject}}</mj-title>\n    <mj-preview>{{previewText}}</mj-preview>\n    <mj-attributes>\n      <mj-all font-family=\"Helvetica, Arial, sans-serif\" />\n      <mj-text font-size=\"14px\" color=\"#333\" line-height=\"1.6\" />\n    </mj-attributes>\n  </mj-head>\n  <mj-body background-color=\"#f5f5f5\">\n    <mj-section background-color=\"#ffffff\" padding=\"20px\">\n      <mj-column>\n        <mj-text font-size=\"22px\" font-weight=\"bold\" color=\"#111\">{{tenantName}}</mj-text>\n      </mj-column>\n    </mj-section>\n    <mj-section background-color=\"#ffffff\" padding=\"20px\">\n      <mj-column>\n        <mj-text>{{{content}}}</mj-text>\n      </mj-column>\n    </mj-section>\n    <mj-section background-color=\"#f5f5f5\" padding=\"20px\">\n      <mj-column>\n        <mj-text font-size=\"11px\" color=\"#888\" align=\"center\">\n          {{#if tenantName}}<p>Sent by {{tenantName}}</p>{{/if}}{{#if mailFooterHtml}}<p>{{{mailFooterHtml}}}</p>{{/if}}\n        </mj-text>\n      </mj-column>\n    </mj-section>\n  </mj-body>\n</mjml>";
+export declare const DEFAULT_MAIL_LAYOUT_MJML = "<mjml lang=\"{{lang}}\">\n  <mj-head>\n    <mj-title>{{subject}}</mj-title>\n    <mj-preview>{{previewText}}</mj-preview>\n    <mj-attributes>\n      <mj-all font-family=\"Helvetica, Arial, sans-serif\" />\n      <mj-text font-size=\"14px\" color=\"#333\" line-height=\"1.6\" />\n    </mj-attributes>\n  </mj-head>\n  <mj-body background-color=\"#f5f5f5\">\n    <mj-section background-color=\"#ffffff\" padding=\"20px\">\n      <mj-column>\n        <mj-text font-size=\"22px\" font-weight=\"bold\" color=\"#111\">{{tenantName}}</mj-text>\n      </mj-column>\n    </mj-section>\n    <mj-section background-color=\"#ffffff\" padding=\"20px\">\n      <mj-column>\n        <mj-text>{{{content}}}</mj-text>\n      </mj-column>\n    </mj-section>\n    <mj-section background-color=\"#f5f5f5\" padding=\"20px\">\n      <mj-column>\n        <mj-text font-size=\"11px\" color=\"#888\" align=\"center\">\n          {{#if mailSentBy}}<p>{{mailSentBy}}</p>{{/if}}{{#if mailFooterHtml}}<p>{{{mailFooterHtml}}}</p>{{/if}}\n        </mj-text>\n      </mj-column>\n    </mj-section>\n  </mj-body>\n</mjml>";

package/dist/default-layout.js

@@ -3,7 +3,8 @@
 // structured layout instead, which also shows the branding logo and accent.
 //
 // **Variables the layout receives (nothing else):**
-//   - {{tenantName}}      - header + footer
+//   - {{tenantName}}      - header
+//   - {{mailSentBy}}      - "Sent by <tenant>" in the mail locale, empty without a tenant name
 //   - {{{content}}}       - the rendered mail body (escaped values), triple-stash.
 //                           It sits in mj-text: mj-raw would put block HTML straight into
 //                           the column tbody, where browsers move it out of the table into
@@ -44,7 +45,7 @@ export const DEFAULT_MAIL_LAYOUT_MJML = `<mjml lang="{{lang}}">
     <mj-section background-color="#f5f5f5" padding="20px">
       <mj-column>
         <mj-text font-size="11px" color="#888" align="center">
-          {{#if tenantName}}<p>Sent by {{tenantName}}</p>{{/if}}{{#if mailFooterHtml}}<p>{{{mailFooterHtml}}}</p>{{/if}}
+          {{#if mailSentBy}}<p>{{mailSentBy}}</p>{{/if}}{{#if mailFooterHtml}}<p>{{{mailFooterHtml}}}</p>{{/if}}
         </mj-text>
       </mj-column>
     </mj-section>

package/dist/document-kit.d.ts

@@ -16,5 +16,6 @@ export declare function readBrandingSiteUrl(ctx: RendererContext): Promise<strin
 export declare const LOGO_RESOURCE_KEY = "logo";
 export declare function resolveResourceFileRefs(tplApi: TemplateResolverApi, ctx: RendererContext, template: TemplateResource, keys: readonly string[]): Promise<ReadonlyMap<string, string>>;
 export declare function readBrandingLogo(ctx: RendererContext): Promise<string | undefined>;
+export declare function readBrandingLogoUrl(ctx: RendererContext): Promise<string | undefined>;
 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,6 +1,7 @@
 import { BRANDING_QN } from "@cosmicdrift/kumiko-bundled-features/managed-pages";
-import { collectDocumentResourceKeys, isHexColor, sanitizeDocumentHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { isSafeHttpsUrl } from "@cosmicdrift/kumiko-bundled-features/page-render";
+import { collectDocumentResourceKeys, flattenParagraphsToLineBreaks, isHexColor, sanitizeDocumentHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { selectMany } from "@cosmicdrift/kumiko-framework/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";
@@ -58,12 +59,24 @@ export function createDocumentHandlebars(format) {
             return String(value);
         }
     });
-    hbs.registerHelper("richText", (value) => {
+    hbs.registerHelper("percent", (value) => {
+        if (typeof value === "number" && Number.isFinite(value)) {
+            return new Intl.NumberFormat(resolveSafeMoneyLocale(format.locale), {
+                style: "percent",
+                maximumFractionDigits: 2,
+            }).format(value / 100);
+        }
+        return value === undefined || value === null ? "" : String(value);
+    });
+    hbs.registerHelper("richText", (value, options) => {
         if (typeof value !== "string")
             return "";
         const sanitized = sanitizeDocumentHtml(value);
-        if (sanitized.ok)
-            return new hbs.SafeString(sanitized.html);
+        if (sanitized.ok) {
+            return new hbs.SafeString(options.hash["inline"] === true
+                ? flattenParagraphsToLineBreaks(sanitized.html)
+                : 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),
@@ -95,6 +108,7 @@ const KNOWN_HELPERS = {
     link: true,
     richText: true,
     stepIs: true,
+    percent: true,
 };
 export function compileDocumentSource(hbs, source, options = {}) {
     return hbs.compile(source, {
@@ -174,6 +188,12 @@ export async function readBrandingLogo(ctx) {
     });
     return row === undefined ? undefined : fileRefId;
 }
+// The branding mask also stores a logo address instead of an upload. Mail clients load it
+// themselves; the PDF renderer must not, since the server would fetch an arbitrary URL.
+export async function readBrandingLogoUrl(ctx) {
+    const value = await readConfigText(ctx, BRANDING_QN.logoUrl);
+    return value !== undefined && isSafeHttpsUrl(value) ? value : undefined;
+}
 function ownLink(links, key) {
     return Object.hasOwn(links, key) && links[key] !== "" ? links[key] : undefined;
 }

package/dist/feature.js

@@ -19,7 +19,7 @@ import { mailHtmlRender } from "./render.js";
 // the tenant-editable footer region, so a tenant cannot remove it.
 export function createRendererMailHtmlFeature(options = {}) {
     return defineFeature("renderer-mail-html", (r) => {
-        r.describe('A `renderer-foundation` plugin that handles `RenderRequest { kind: "mail" }` and returns `{ subject, html, text, previewText? }` suitable for sending via `channel-email`. The mail template (`kind: "mail"`, document HTML, subject in `meta`) resolves through `template-resolver`\'s DB fallback, its body is compiled to Handlebars by template-resolver and rendered with escaping, then placed into an MJML layout (`kind: "mail-layout"`, slug `default` unless `meta.layoutSlug` says otherwise, an in-code structured layout with the tenant branding logo and accent color as last resort) that `mjml()` compiles to email-safe table HTML, with `html-to-text` producing the plain-text alternative. An optional `footer` resolver adds the platform imprint, privacy link and footer text below every structured layout, and an optional `brandSuffix` resolver adds a word after the tenant name in the brand row of the in-code layout. Mail meta `headerChip`, `tone` and `footerNote` add a chip beside the brand, the tone of the top line and chip, and a note above the site and unsubscribe links of the card. Seed an editable system layout with `seedSystemMailLayout(db)`. Requires `renderer-foundation` + `template-resolver`.');
+        r.describe('A `renderer-foundation` plugin that handles `RenderRequest { kind: "mail" }` and returns `{ subject, html, text, previewText? }` suitable for sending via `channel-email`. The mail template (`kind: "mail"`, document HTML, subject in `meta`) resolves through `template-resolver`\'s DB fallback, its body is compiled to Handlebars by template-resolver and rendered with escaping, then placed into an MJML layout (`kind: "mail-layout"`, slug `default` unless `meta.layoutSlug` says otherwise, an in-code structured layout with the tenant branding logo and accent color as last resort) that `mjml()` compiles to email-safe table HTML, with `html-to-text` producing the plain-text alternative. An optional `footer` resolver adds the platform imprint, privacy link and footer text below every structured layout, an optional `brandSuffix` resolver adds a word after the tenant name in the brand row of the in-code layout, and an optional `siteUrl` resolver supplies the site link of the card when the tenant branding has no site URL (without either, the link is left out). The brand row and `data-resource="logo"` images use the branding logo upload, or the branding logo https address when no file is uploaded. Mail meta `headerChip`, `tone` and `footerNote` add a chip beside the brand, the tone of the top line and chip, and a note above the site and unsubscribe links of the card. Seed an editable system layout with `seedSystemMailLayout(db)`. Requires `renderer-foundation` + `template-resolver`.');
         r.requires({ features: ["renderer-foundation"] });
         r.requires({ features: ["template-resolver"] });
         r.useExtension("renderer", "mail-html", {

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export { DEFAULT_MAIL_LAYOUT_MJML } from "./default-layout.js";
 export { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, type DocumentFormat, mergeResourceFileRefs, readBrandingAccentColor, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
 export { createRendererMailHtmlFeature } from "./feature.js";
 export type { MailFooter, MailFooterLink, MailFooterResolver } from "./mail-footer.js";
-export { type MailBrandSuffixResolver, type MailHtmlRenderOptions, mailHtmlRender, } from "./render.js";
+export { MAIL_CHROME_EN } from "./mail-strings.js";
+export { type MailBrandSuffixResolver, type MailHtmlRenderOptions, type MailSiteUrlResolver, mailHtmlRender, } from "./render.js";

package/dist/index.js

@@ -1,4 +1,5 @@
 export { DEFAULT_MAIL_LAYOUT_MJML } from "./default-layout.js";
 export { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, mergeResourceFileRefs, readBrandingAccentColor, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
 export { createRendererMailHtmlFeature } from "./feature.js";
+export { MAIL_CHROME_EN } from "./mail-strings.js";
 export { mailHtmlRender, } from "./render.js";

package/dist/mail-footer.d.ts

@@ -1,6 +1,7 @@
 import type { RendererContext } from "@cosmicdrift/kumiko-bundled-features/renderer-foundation";
+/** Without a label the imprint and privacy links use the framework's text in the mail locale. */
 export type MailFooterLink = {
-    readonly label: string;
+    readonly label?: string;
     readonly url: string;
 };
 export type MailFooter = {

package/dist/mail-footer.js

@@ -1,15 +1,7 @@
 import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+import { mailChromeText } from "./mail-strings.js";
 const SAFE_FOOTER_URL = /^(https?:|mailto:)/i;
 const BAND_LINK_COLOR = "#4A515E";
-const UNSUBSCRIBE_LABEL_BY_LANGUAGE = {
-    de: "Abmelden",
-    en: "Unsubscribe",
-    es: "Darse de baja",
-};
-function unsubscribeLabel(locale) {
-    const language = (locale.split("-")[0] ?? locale).toLowerCase();
-    return UNSUBSCRIBE_LABEL_BY_LANGUAGE[language] ?? "Unsubscribe";
-}
 function linkHtml(link, color = "#888") {
     const url = link.url.trim();
     if (!SAFE_FOOTER_URL.test(url) || link.label.trim() === "")
@@ -34,7 +26,10 @@ export function buildMailBandLinksHtml(input) {
             : linkHtml({ label: host, url: input.siteUrl }, BAND_LINK_COLOR),
         input.unsubscribeUrl === "" || input.layoutLinksUnsubscribe
             ? null
-            : linkHtml({ label: unsubscribeLabel(input.locale), url: input.unsubscribeUrl }, BAND_LINK_COLOR),
+            : linkHtml({
+                label: mailChromeText(input.locale, "mail.footer.unsubscribe"),
+                url: input.unsubscribeUrl,
+            }, BAND_LINK_COLOR),
     ];
     return links.filter((link) => link !== null).join(" · ");
 }
@@ -47,17 +42,26 @@ export function buildMailFooterHtml(input) {
     const { footer, unsubscribeUrl, locale } = input;
     const links = [];
     if (footer?.imprint !== undefined && !input.layoutLinksImprint) {
-        const html = linkHtml(footer.imprint);
+        const html = linkHtml({
+            label: footer.imprint.label ?? mailChromeText(locale, "mail.footer.imprint"),
+            url: footer.imprint.url,
+        });
         if (html !== null)
             links.push(html);
     }
     if (footer?.privacy !== undefined) {
-        const html = linkHtml(footer.privacy);
+        const html = linkHtml({
+            label: footer.privacy.label ?? mailChromeText(locale, "mail.footer.privacy"),
+            url: footer.privacy.url,
+        });
         if (html !== null)
             links.push(html);
     }
     if (unsubscribeUrl !== "" && !input.layoutLinksUnsubscribe) {
-        const html = linkHtml({ label: unsubscribeLabel(locale), url: unsubscribeUrl });
+        const html = linkHtml({
+            label: mailChromeText(locale, "mail.footer.unsubscribe"),
+            url: unsubscribeUrl,
+        });
         if (html !== null)
             links.push(html);
     }

package/dist/mail-strings.d.ts

@@ -0,0 +1,8 @@
+export declare const MAIL_CHROME_EN: {
+    readonly "mail.footer.sentBy": "Sent by {sender}";
+    readonly "mail.footer.unsubscribe": "Unsubscribe";
+    readonly "mail.footer.imprint": "Imprint";
+    readonly "mail.footer.privacy": "Privacy policy";
+};
+export type MailChromeKey = keyof typeof MAIL_CHROME_EN;
+export declare function mailChromeText(locale: string, key: MailChromeKey, params?: Readonly<Record<string, string>>): string;

package/dist/mail-strings.js

@@ -0,0 +1,13 @@
+import { mailT, registerMailTranslations } from "@cosmicdrift/kumiko-framework/i18n";
+// English ships here; other languages come from the locale packages, and an
+// unknown locale falls back through its root language to English (mailT).
+export const MAIL_CHROME_EN = {
+    "mail.footer.sentBy": "Sent by {sender}",
+    "mail.footer.unsubscribe": "Unsubscribe",
+    "mail.footer.imprint": "Imprint",
+    "mail.footer.privacy": "Privacy policy",
+};
+registerMailTranslations("en", MAIL_CHROME_EN);
+export function mailChromeText(locale, key, params) {
+    return mailT(locale, key, params);
+}

package/dist/render.d.ts

@@ -4,9 +4,15 @@ export type MailBrandSuffixResolver = (input: {
     readonly locale: string;
     readonly ctx: RendererContext;
 }) => string | null | Promise<string | null>;
+export type MailSiteUrlResolver = (input: {
+    readonly locale: string;
+    readonly ctx: RendererContext;
+}) => string | null | Promise<string | null>;
 export type MailHtmlRenderOptions = {
     readonly footer?: MailFooterResolver;
     /** Text after the tenant name in the in-code layout's brand row, e.g. "Status". */
     readonly brandSuffix?: MailBrandSuffixResolver;
+    /** Site link in the mail band when the tenant's branding has no site URL. */
+    readonly siteUrl?: MailSiteUrlResolver;
 };
 export declare function mailHtmlRender(req: RenderRequest, ctx: RendererContext, options?: MailHtmlRenderOptions): Promise<RenderResponse>;

package/dist/render.js

@@ -10,15 +10,16 @@
 //   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, mailLayoutAppearance, parseTemplateMeta, pdfAttachmentLinksOf, readLayoutRegions, resolveTemplateVariables, sanitizeDocumentHtml, sanitizeLayoutHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { collectDocumentResourceKeys, compileDocumentBodyToHandlebars, createTemplateResolverApi, fileAttachmentsOf, imageLinksOf, isMailTemplateMeta, isSystemOnlyTemplate, 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_SLUG } from "./default-layout.js";
-import { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, LOGO_RESOURCE_KEY, mergeResourceFileRefs, readBrandingAccentColor, readBrandingLogo, readBrandingSiteUrl, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
+import { collectRegionResourceKeys, compileDocumentSource, createDocumentHandlebars, LOGO_RESOURCE_KEY, mergeResourceFileRefs, readBrandingAccentColor, readBrandingLogo, readBrandingLogoUrl, readBrandingSiteUrl, readDocumentFormat, readTenantName, resolveResourceFileRefs, } from "./document-kit.js";
 import { buildRenderedPdfAttachments, combineMailAttachments, mergeInheritedAttachments, } from "./mail-attachments.js";
 import { brandHeaderHtml, DEFAULT_ACCENT_COLOR, readMailTone, toneColors, } from "./mail-chrome.js";
 import { buildMailBandLinksHtml, buildMailFooterHtml, layoutLinksToPlaceholder, safeFooterUrl, } from "./mail-footer.js";
+import { mailChromeText } from "./mail-strings.js";
 import { MAIL_IMAGE_MAX_WIDTH_PX, renderStructuredLayoutMjml } from "./structured-layout.js";
 const LINE_BREAKS = /[\r\n]+/g;
 function describe(e) {
@@ -31,6 +32,13 @@ const IN_CODE_LAYOUT_META = {
     width: 640,
     outerBackground: "#ecedea",
 };
+function mailResourceSrc(resourceFileRefs, brandingLogoUrl) {
+    return (key) => resourceFileRefs.has(key)
+        ? `cid:${key}`
+        : key === LOGO_RESOURCE_KEY
+            ? brandingLogoUrl
+            : undefined;
+}
 async function inCodeLayout(ctx) {
     const logoFileRefId = await readBrandingLogo(ctx);
     return {
@@ -99,7 +107,10 @@ async function resolveLayout(tplApi, ctx, meta, locale) {
 }
 async function findStoredMailTemplate(tplApi, ctx, slug, locale) {
     try {
-        return await tplApi.resolveTemplate({ tenantId: ctx.tenantId, slug, kind: "mail", locale });
+        const tenantId = isSystemOnlyTemplate(ctx.registry, slug, "mail")
+            ? SYSTEM_TENANT_ID
+            : ctx.tenantId;
+        return await tplApi.resolveTemplate({ tenantId, slug, kind: "mail", locale });
     }
     catch (e) {
         if (e instanceof TemplateNotFoundError)
@@ -178,11 +189,11 @@ 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, buttonInlineStyle, stepsColor) {
+async function renderMailBody(tplApi, ctx, template, hbs, context, buttonInlineStyle, stepsColor, brandingLogoUrl) {
     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),
+            resourceSrc: mailResourceSrc(resourceFileRefs, brandingLogoUrl),
             resourceImageMaxWidthPx: MAIL_IMAGE_MAX_WIDTH_PX,
             alignmentAsInlineStyle: true,
             buttonAsInlineStyle: true,
@@ -287,7 +298,7 @@ function compileLayoutMjml(args) {
                 contentHtml,
                 context: layoutContext,
                 compile: (source) => compileDocumentSource(hbs, source),
-                resourceSrc: (key) => (resourceFileRefs.has(key) ? `cid:${key}` : undefined),
+                resourceSrc: mailResourceSrc(resourceFileRefs, args.brandingLogoUrl),
                 ...(appearance !== undefined && { appearance }),
                 ...(accentColor !== undefined && { accentColor }),
                 ...(args.chrome.tone !== undefined && { tone: args.chrome.tone }),
@@ -386,6 +397,17 @@ async function resolveBrandSuffix(options, ctx, locale) {
         throw new RendererError(`renderer-mail-html: the brand suffix resolver failed — ${describe(e)}`, "other");
     }
 }
+async function resolveMailSiteUrl(options, ctx, locale) {
+    const brandingSiteUrl = await readBrandingSiteUrl(ctx);
+    if (brandingSiteUrl !== undefined || options.siteUrl === undefined)
+        return brandingSiteUrl;
+    try {
+        return (await options.siteUrl({ locale, ctx })) ?? undefined;
+    }
+    catch (e) {
+        throw new RendererError(`renderer-mail-html: the site URL resolver failed — ${describe(e)}`, "other");
+    }
+}
 // A structured layout shows the site and unsubscribe links inside the card and only the
 // platform line below it; an mjml layout gets everything in one line.
 function renderFooterParts(args) {
@@ -419,12 +441,13 @@ export async function mailHtmlRender(req, ctx, options = {}) {
     const { slug, locale, variables, unsubscribeUrl, draft } = req.payload;
     const tplApi = createTemplateResolverApi(ctx.db);
     const { template, meta } = await resolveMailTemplate(tplApi, ctx, slug, locale, draft);
-    const [format, tenantName, footer, siteUrl, brandSuffix] = await Promise.all([
+    const [format, tenantName, footer, siteUrl, brandSuffix, brandingLogoUrl] = await Promise.all([
         readDocumentFormat(ctx, locale),
         readTenantName(ctx),
         resolveMailFooter(options, ctx, locale),
-        readBrandingSiteUrl(ctx),
+        resolveMailSiteUrl(options, ctx, locale),
         resolveBrandSuffix(options, ctx, locale),
+        readBrandingLogoUrl(ctx),
     ]);
     const layout = (await resolveLayout(tplApi, ctx, meta, locale)) ?? (await inCodeLayout(ctx));
     const hbs = createDocumentHandlebars(format);
@@ -437,7 +460,7 @@ export async function mailHtmlRender(req, ctx, options = {}) {
     const context = { ...variables, ...systemPlaceholders };
     const { appearance, accentColor, brandColor } = await resolveMailBranding(ctx, layout);
     const chrome = renderMailChrome(hbs, meta, slug, context, brandColor);
-    const body = await renderMailBody(tplApi, ctx, template, hbs, context, appearance?.buttonStyle, chrome.tone?.bar ?? brandColor ?? DEFAULT_ACCENT_COLOR);
+    const body = await renderMailBody(tplApi, ctx, template, hbs, context, appearance?.buttonStyle, chrome.tone?.bar ?? brandColor ?? DEFAULT_ACCENT_COLOR, brandingLogoUrl);
     const { contentHtml } = body;
     const layoutFileRefs = await resolveLayoutFileRefs(tplApi, ctx, layout);
     const resourceFileRefs = mergeResourceFileRefs(body.resourceFileRefs, layoutFileRefs);
@@ -458,8 +481,12 @@ export async function mailHtmlRender(req, ctx, options = {}) {
         appearance,
         accentColor,
         resourceFileRefs,
+        brandingLogoUrl,
         layoutContext: {
             ...systemPlaceholders,
+            mailSentBy: tenantName === ""
+                ? ""
+                : mailChromeText(locale, "mail.footer.sentBy", { sender: tenantName }),
             lang: locale,
             subject,
             previewText: previewText ?? "",
@@ -470,7 +497,7 @@ export async function mailHtmlRender(req, ctx, options = {}) {
             : brandHeaderHtml({
                 tenantName,
                 suffix: brandSuffix,
-                logoSrc: layout.brandHeader.hasLogo ? `cid:${LOGO_RESOURCE_KEY}` : undefined,
+                logoSrc: layout.brandHeader.hasLogo ? `cid:${LOGO_RESOURCE_KEY}` : brandingLogoUrl,
                 accentColor: brandColor ?? DEFAULT_ACCENT_COLOR,
             }),
         ...renderFooterParts({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer-mail-html",
-  "version": "0.366.0",
+  "version": "0.368.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,17 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.366.0",
-    "@cosmicdrift/kumiko-framework": "0.366.0",
-    "@cosmicdrift/kumiko-headless": "0.366.0",
-    "@cosmicdrift/kumiko-types": "0.366.0",
+    "@cosmicdrift/kumiko-bundled-features": "0.368.0",
+    "@cosmicdrift/kumiko-framework": "0.368.0",
+    "@cosmicdrift/kumiko-headless": "0.368.0",
+    "@cosmicdrift/kumiko-types": "0.368.0",
     "handlebars": "^4.7.8",
     "html-to-text": "^9.0.5",
     "mjml": "^5.2.2"
   },
   "devDependencies": {
-    "@cosmicdrift/kumiko-testing": "0.366.0",
+    "@cosmicdrift/kumiko-locale-de": "0.368.0",
+    "@cosmicdrift/kumiko-testing": "0.368.0",
     "@types/html-to-text": "^9.0.4",
     "@types/mjml": "^5.0.0"
   },

package/src/changes.json

@@ -1,4 +1,17 @@
 [
+  {
+    "version": "0.367.0",
+    "type": "improvement",
+    "title": "Mail header shows the branding logo address, band link falls back to an app site URL",
+    "detail": "Without an uploaded logo file the mail renderer now uses the https address from branding.logoUrl for the layout brand row (28 px high) and for a logo image in the body; the mail client loads it, the PDF renderer never does. New option siteUrl on createRendererMailHtmlFeature (type MailSiteUrlResolver) supplies the site link of the footer band when the tenant has no branding.siteUrl. Without either value the band shows only the unsubscribe link, never an empty link."
+  },
+  {
+    "version": "0.367.0",
+    "type": "breaking",
+    "title": "Mail footer texts come from the i18n system",
+    "detail": "The \"Sent by\" line of the default mail layout, the unsubscribe label and the imprint and privacy labels now come from the mail translations (mail.footer.sentBy, mail.footer.unsubscribe, mail.footer.imprint, mail.footer.privacy). English ships with the renderer, German and Spanish with locale-de and locale-es; an unknown locale falls back to its root language and then to English. MailFooterLink.label is optional and defaults to the framework text. The default layout renders the sender line through the new mailSentBy placeholder. MAIL_CHROME_EN exports the English source texts for translation tooling.",
+    "migration": "Apps that send German or Spanish mails mount localeDe() or localeEs(), otherwise the footer labels are English. A mail layout already stored from the old default keeps its fixed \"Sent by\" text until it is reseeded or edited."
+  },
   {
     "version": "0.365.0",
     "type": "improvement",