@cosmicdrift/kumiko-renderer-mail-html 0.374.0 → 0.378.0

package/dist/document-kit.d.ts

@@ -4,6 +4,8 @@ import Handlebars from "handlebars";
 export type DocumentFormat = {
     readonly locale: string;
     readonly currency: string;
+    /** Tenant zone for `{{date x time=true}}`; absent = UTC. */
+    readonly timeZone?: string;
 };
 export declare function createDocumentHandlebars(format: DocumentFormat): typeof Handlebars;
 export declare function compileDocumentSource(hbs: typeof Handlebars, source: string, options?: {

package/dist/document-kit.js

@@ -1,11 +1,14 @@
 import { BRANDING_QN } from "@cosmicdrift/kumiko-bundled-features/managed-pages";
 import { isSafeHttpsUrl } from "@cosmicdrift/kumiko-bundled-features/page-render";
 import { collectDocumentResourceKeys, flattenParagraphsToLineBreaks, isHexColor, sanitizeDocumentHtml, TemplateNotFoundError, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
+import { decryptTenantNames, TENANT_FEATURE, tenantTable, } from "@cosmicdrift/kumiko-bundled-features/tenant";
 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";
-import { DOCUMENT_FALLBACK_CURRENCY, formatDocumentDate, formatDocumentMoney, formatDocumentPercent, } from "@cosmicdrift/kumiko-headless";
+import { TENANT_TIMEZONE_CONFIG_KEY } from "@cosmicdrift/kumiko-framework/pipeline";
+import { isValidIanaTimeZone } from "@cosmicdrift/kumiko-framework/time";
+import { DOCUMENT_FALLBACK_CURRENCY, formatDocumentDate, formatDocumentMoney, formatDocumentPercent, } from "@cosmicdrift/kumiko-renderer/headless";
 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.
@@ -14,7 +17,10 @@ const SAFE_LINK_PROTOCOL = /^(https?:|mailto:)/i;
 export function createDocumentHandlebars(format) {
     const hbs = Handlebars.create();
     hbs.registerHelper("money", (value) => formatDocumentMoney(value, format.currency, format.locale));
-    hbs.registerHelper("date", (value) => formatDocumentDate(value, format.locale));
+    hbs.registerHelper("date", (value, options) => formatDocumentDate(value, format.locale, {
+        time: options?.hash?.["time"] === true,
+        ...(format.timeZone !== undefined && { timeZone: format.timeZone }),
+    }));
     hbs.registerHelper("percent", (value) => formatDocumentPercent(value, format.locale));
     hbs.registerHelper("richText", (value, options) => {
         if (typeof value !== "string")
@@ -79,10 +85,23 @@ async function readConfigText(ctx, key) {
 // "Oct 1, 2026". The currency is a tenant fact and still comes from its settings.
 export async function readDocumentFormat(ctx, templateLocale) {
     const currency = await readConfigText(ctx, TENANT_CURRENCY_CONFIG_KEY);
-    return { locale: templateLocale, currency: currency ?? DOCUMENT_FALLBACK_CURRENCY };
+    const zone = await readConfigText(ctx, TENANT_TIMEZONE_CONFIG_KEY);
+    return {
+        locale: templateLocale,
+        currency: currency ?? DOCUMENT_FALLBACK_CURRENCY,
+        ...(zone !== undefined && isValidIanaTimeZone(zone) && { timeZone: zone }),
+    };
 }
+// Without managed-pages there is no branding title; the tenant record's own name is the fallback.
 export async function readTenantName(ctx) {
-    return (await readConfigText(ctx, BRANDING_QN.title)) ?? "";
+    const branded = await readConfigText(ctx, BRANDING_QN.title);
+    if (branded !== undefined)
+        return branded;
+    if (ctx.registry.getFeature(TENANT_FEATURE) === undefined)
+        return "";
+    const rows = await selectMany(ctx.db, tenantTable, { id: ctx.tenantId });
+    const [row] = await decryptTenantNames(rows, "renderer-mail-html:tenant-name");
+    return typeof row?.name === "string" ? row.name : "";
 }
 export async function readBrandingAccentColor(ctx) {
     const value = await readConfigText(ctx, BRANDING_QN.accentColor);

package/dist/mail-chrome.js

@@ -1,5 +1,5 @@
 import { isHexColor, MAIL_TONES, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
-import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-renderer/headless";
 import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 const FIXED_TONES = {
     info: { bar: "#7C8DB5", fg: "#3E4C70", soft: "#EEF1F7" },

package/dist/mail-footer.js

@@ -1,4 +1,4 @@
-import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-renderer/headless";
 import { mailChromeText } from "./mail-strings.js";
 const SAFE_FOOTER_URL = /^(https?:|mailto:)/i;
 const BAND_LINK_COLOR = "#4A515E";

package/dist/render.js

@@ -22,6 +22,8 @@ import { buildMailBandLinksHtml, buildMailFooterHtml, layoutLinksToPlaceholder,
 import { mailChromeText } from "./mail-strings.js";
 import { MAIL_IMAGE_MAX_WIDTH_PX, renderStructuredLayoutMjml } from "./structured-layout.js";
 const LINE_BREAKS = /[\r\n]+/g;
+const PLAIN_REFERENCE = /\{\{\s*([\w.]+)\s*\}\}/g;
+const FORMATTED_VARIABLE_TYPES = new Set(["money", "date", "percent"]);
 function describe(e) {
     return e instanceof Error ? e.message : String(e);
 }
@@ -211,24 +213,35 @@ async function renderMailBody(tplApi, ctx, template, hbs, context, buttonInlineS
         throw new RendererError(`renderer-mail-html: rendering the body of "${template.slug}" failed — ${describe(e)}`, "other");
     }
 }
-function renderSubjectLine(hbs, source, context) {
-    return compileDocumentSource(hbs, source, { noEscape: true })(context).replace(LINE_BREAKS, "");
+// Meta lines only hold plain {{name}} references (checked on save); typed values
+// need the same format helpers the body compiler adds, or money renders as "[object Object]".
+function withFormatHelpers(source, variables) {
+    return source.replace(PLAIN_REFERENCE, (reference, name) => {
+        const type = variables[name]?.type;
+        return type !== undefined && FORMATTED_VARIABLE_TYPES.has(type)
+            ? `{{${type} ${name}}}`
+            : reference;
+    });
+}
+function renderSubjectLine(hbs, source, context, variables) {
+    return compileDocumentSource(hbs, withFormatHelpers(source, variables), { noEscape: true })(context).replace(LINE_BREAKS, "");
 }
 function renderFileNamePattern(hbs, pattern, slug, context) {
     try {
-        return renderSubjectLine(hbs, pattern, context);
+        // File names keep raw values: a formatted date or amount would put spaces into the name.
+        return renderSubjectLine(hbs, pattern, context, {});
     }
     catch (e) {
         throw new RendererError(`renderer-mail-html: rendering the attachment file name "${pattern}" of "${slug}" failed — ${describe(e)}`, "other");
     }
 }
-function renderSubjectLines(hbs, meta, slug, context) {
+function renderSubjectLines(hbs, meta, slug, context, variables) {
     try {
         return {
-            subject: renderSubjectLine(hbs, meta.subject, context),
+            subject: renderSubjectLine(hbs, meta.subject, context, variables),
             previewText: meta.previewText === undefined
                 ? undefined
-                : renderSubjectLine(hbs, meta.previewText, context),
+                : renderSubjectLine(hbs, meta.previewText, context, variables),
         };
     }
     catch (e) {
@@ -236,8 +249,8 @@ function renderSubjectLines(hbs, meta, slug, context) {
     }
 }
 // Chip and tone are author-chosen per mail; a chip without a known tone takes the accent tone.
-function renderMailChrome(hbs, meta, slug, context, brandColor) {
-    const render = (source) => source === undefined ? "" : renderSubjectLine(hbs, source, context).trim();
+function renderMailChrome(hbs, meta, slug, context, variables, brandColor) {
+    const render = (source) => source === undefined ? "" : renderSubjectLine(hbs, source, context, variables).trim();
     try {
         const headerChip = render(meta.headerChip);
         const tone = readMailTone(render(meta.tone));
@@ -483,8 +496,9 @@ export async function mailHtmlRender(req, ctx, options = {}) {
         unsubscribeUrl: unsubscribeUrl ?? "",
     };
     const context = { ...variables, ...systemPlaceholders };
+    const variableDefs = resolveTemplateVariables(ctx.registry, template.slug, template.variableSchema);
     const { appearance, accentColor, brandColor } = await resolveMailBranding(ctx, layout);
-    const chrome = renderMailChrome(hbs, meta, slug, context, brandColor);
+    const chrome = renderMailChrome(hbs, meta, slug, context, variableDefs, brandColor);
     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);
@@ -498,7 +512,7 @@ export async function mailHtmlRender(req, ctx, options = {}) {
         locale,
         renderFileName: (pattern) => renderFileNamePattern(hbs, pattern, slug, context),
     });
-    const { subject, previewText } = renderSubjectLines(hbs, meta, slug, context);
+    const { subject, previewText } = renderSubjectLines(hbs, meta, slug, context, variableDefs);
     const mjmlSource = compileLayoutMjml({
         layout,
         hbs,

package/dist/structured-layout.js

@@ -1,7 +1,7 @@
 // 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, isHexColor, mailLayoutAppearance, readLayoutRegions, } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
-import { escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+import { escapeHtmlAttr } from "@cosmicdrift/kumiko-renderer/headless";
 import { headerRowHtml } from "./mail-chrome.js";
 // 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;

package/package.json

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

package/src/changes.json

@@ -1,4 +1,22 @@
 [
+  {
+    "version": "0.378.0",
+    "type": "fix",
+    "title": "Typed placeholders in mail subject lines are formatted",
+    "detail": "A money placeholder in the subject or preview text rendered as \"[object Object]\" and a date as its raw ISO string, because only the body compiler added the format helpers. Subject, preview text, header chip, tone and footer note now use the same money, date and percent formatting as the body. Attachment file names keep the raw values."
+  },
+  {
+    "version": "0.377.0",
+    "type": "improvement",
+    "title": "Document dates can print the time in the tenant time zone",
+    "detail": "The date helper accepts time=true ({{date value time=true}}). Instants print date and time in the tenant's configured IANA zone (tenant timezone config, UTC without one), offset date-times keep their own wall clock, date-only values print no time. Without time=true nothing changes. formatDocumentDate takes an optional { time, timeZone } argument, DocumentFormat gets timeZone, and TENANT_TIMEZONE_CONFIG_KEY is exported from framework/pipeline."
+  },
+  {
+    "version": "0.377.0",
+    "type": "fix",
+    "title": "tenantName in the document context falls back to the tenant record",
+    "detail": "Without managed-pages there is no branding title, so tenantName was empty. It now falls back to the decrypted name of the tenant record when the tenant feature is mounted."
+  },
   {
     "version": "0.367.0",
     "type": "improvement",