@cosmicdrift/kumiko-bundled-features 0.102.2 → 0.105.0

package/src/auth-email-password/handlers/invite-create.write.ts

@@ -1,8 +1,10 @@
 // Tenant-Invite Step 1 (create).
 //
 // Admin invitet email → DB-Row entsteht via event-store-executor (oder
-// wird re-used bei Re-Invite), Random-Token in Redis bidirektional,
-// Route-Layer schickt Mail mit Activation-URL.
+// wird re-used bei Re-Invite), Random-Token in Redis bidirektional, und der
+// Handler schickt die Invite-Mail an den Invitee via delivery (ctx.notify) —
+// wie reset/verify/signup. Der Token geht NICHT an den Admin zurück (er soll
+// die Annahme nicht impersonieren können).
 //
 // Resend-Idempotenz: Re-Invite für gleiche (tenantId, email) während
 // pending → existing row + token re-genutzt + TTL refresh + zweite Mail
@@ -33,7 +35,12 @@ import {
   reservedMembershipRoleError,
 } from "../../tenant/membership-roles";
 import { AUTH_INVITE_DEFAULT_TTL_MINUTES } from "../constants";
+import type { AuthMailLocale } from "../email-templates";
+import { renderInviteEmail } from "../email-templates";
 import { getTokenForInvitation, storeInviteToken } from "../invite-token-store";
+import { dispatchMagicLinkMail } from "../magic-link-mail";
+
+const INVITE_NOTIFICATION_TYPE = "auth-email-password:invite";
 
 const InviteCreateSchema = z.object({
   email: z.email(),
@@ -46,20 +53,24 @@ export type InviteCreateData = {
   readonly tenantId: string;
   readonly email: string;
   readonly role: string;
-  readonly token: string;
   readonly expiresAt: string;
 };
 
 export type InviteCreateOptions = {
   /** TTL für den Activation-Token. Default 7 Tage. */
   readonly tokenTtlMinutes?: number;
+  /** App page that receives the magic-link; the handler appends `?token=…`
+   *  and dispatches the invite mail via delivery (ctx.notify). */
+  readonly appUrl: string;
+  readonly appName?: string;
+  readonly locale?: AuthMailLocale;
 };
 
 const executor = createEventStoreExecutor(tenantInvitationsTable, tenantInvitationEntity, {
   entityName: "tenant-invitation",
 });
 
-export function createInviteCreateHandler(opts: InviteCreateOptions = {}) {
+export function createInviteCreateHandler(opts: InviteCreateOptions) {
   const ttlMinutes = opts.tokenTtlMinutes ?? AUTH_INVITE_DEFAULT_TTL_MINUTES;
   const ttlSeconds = ttlMinutes * 60;
 
@@ -133,6 +144,24 @@ export function createInviteCreateHandler(opts: InviteCreateOptions = {}) {
 
       await storeInviteToken(ctx.redis, { invitationId, token, ttlSeconds });
 
+      await dispatchMagicLinkMail(
+        ctx.notify,
+        {
+          handlerName: "invite-create",
+          notificationType: INVITE_NOTIFICATION_TYPE,
+          renderContent: (renderArgs) =>
+            renderInviteEmail({ ...renderArgs, role: event.payload.role }),
+        },
+        {
+          email,
+          appUrl: opts.appUrl,
+          token,
+          expiresAt: expiresAt.toString(),
+          ...(opts.appName !== undefined && { appName: opts.appName }),
+          ...(opts.locale !== undefined && { locale: opts.locale }),
+        },
+      );
+
       return {
         isSuccess: true,
         data: {
@@ -141,7 +170,6 @@ export function createInviteCreateHandler(opts: InviteCreateOptions = {}) {
           tenantId,
           email,
           role: event.payload.role,
-          token,
           expiresAt: expiresAt.toString(),
         },
       };

package/src/auth-email-password/handlers/request-email-verification.write.ts

@@ -1,4 +1,5 @@
 import { AUTH_VERIFY_DEFAULT_TTL_MINUTES, AuthErrors } from "../constants";
+import { renderVerifyEmail } from "../email-templates";
 import { signVerificationToken } from "../verification-token";
 import {
   createTokenRequestHandler,
@@ -6,6 +7,8 @@ import {
   type TokenRequestOptions,
 } from "./token-request-handler";
 
+const VERIFY_NOTIFICATION_TYPE = "auth-email-password:email-verification";
+
 export type RequestEmailVerificationOptions = TokenRequestOptions;
 
 export type RequestVerificationData = TokenRequestData<"verification-requested">;
@@ -24,6 +27,8 @@ export function createRequestEmailVerificationHandler(opts: RequestEmailVerifica
       // unknown/deleted to keep the enumeration surface symmetric — the
       // caller sees the same 200 regardless of whether a token was minted.
       extraSilentSkip: (user) => user.emailVerified === true,
+      notificationType: VERIFY_NOTIFICATION_TYPE,
+      renderContent: renderVerifyEmail,
     },
     opts,
   );

package/src/auth-email-password/handlers/request-password-reset.write.ts

@@ -1,4 +1,5 @@
 import { AUTH_RESET_DEFAULT_TTL_MINUTES, AuthErrors } from "../constants";
+import { renderResetPasswordEmail } from "../email-templates";
 import { signResetToken } from "../reset-token";
 import {
   createTokenRequestHandler,
@@ -6,6 +7,8 @@ import {
   type TokenRequestOptions,
 } from "./token-request-handler";
 
+const RESET_NOTIFICATION_TYPE = "auth-email-password:password-reset";
+
 export type RequestPasswordResetOptions = TokenRequestOptions;
 
 // Public shape re-exported for callers that build custom routes on top of
@@ -26,6 +29,8 @@ export function createRequestPasswordResetHandler(opts: RequestPasswordResetOpti
       // non-deleted user can initiate a reset regardless of verification
       // state. The sessions feature handles the post-change revocation.
       extraSilentSkip: () => false,
+      notificationType: RESET_NOTIFICATION_TYPE,
+      renderContent: renderResetPasswordEmail,
     },
     opts,
   );

package/src/auth-email-password/handlers/signup-request.write.ts

@@ -1,8 +1,8 @@
 // Magic-Link-Signup, Step 1 (request).
 //
 // User gibt Email ein → wir minten einen opaken Random-Token, speichern
-// ihn bidirektional in Redis (token↔email), und der Route-Layer schickt
-// die Activation-Mail. Anders als reset/verify-Flows machen wir HIER keinen
+// ihn bidirektional in Redis (token↔email), und schicken die Activation-Mail
+// via delivery (ctx.notify) — wie reset/verify. Anders als die: HIER kein
 // userId-Lookup und kein HMAC-signing (es gäbe kein Subject — im Normalfall
 // existiert der User noch nicht). Ob die Email bereits ein Konto hat,
 // entscheidet bewusst der Confirm-Schritt, nicht dieser.
@@ -28,8 +28,13 @@ import { InternalError, writeFailure } from "@cosmicdrift/kumiko-framework/error
 import { Temporal } from "temporal-polyfill";
 import { z } from "zod";
 import { AUTH_SIGNUP_DEFAULT_TTL_MINUTES } from "../constants";
+import type { AuthMailLocale } from "../email-templates";
+import { renderActivationEmail } from "../email-templates";
+import { dispatchMagicLinkMail } from "../magic-link-mail";
 import { getTokenForSignupEmail, normalizeEmail, storeSignupToken } from "../signup-token-store";
 
+const SIGNUP_NOTIFICATION_TYPE = "auth-email-password:signup-activation";
+
 const SignupRequestSchema = z.object({
   email: z.email(),
 });
@@ -47,9 +52,14 @@ export type SignupRequestOptions = {
   /** TTL für den Activation-Token. Default 24 h — lang genug damit User
    *  "morgen aktivieren" können ohne Resend-Spam. */
   readonly tokenTtlMinutes?: number;
+  /** App page that receives the magic-link; the handler appends `?token=…`
+   *  and dispatches the activation mail via delivery (ctx.notify). */
+  readonly appUrl: string;
+  readonly appName?: string;
+  readonly locale?: AuthMailLocale;
 };
 
-export function createSignupRequestHandler(opts: SignupRequestOptions = {}) {
+export function createSignupRequestHandler(opts: SignupRequestOptions) {
   const ttlMinutes = opts.tokenTtlMinutes ?? AUTH_SIGNUP_DEFAULT_TTL_MINUTES;
   const ttlSeconds = ttlMinutes * 60;
 
@@ -86,19 +96,39 @@ export function createSignupRequestHandler(opts: SignupRequestOptions = {}) {
       const token = existingToken ?? generateToken();
 
       const expiresAt = Temporal.Now.instant().add({ seconds: ttlSeconds });
+      const expiresAtIso = expiresAt.toString();
 
       await storeSignupToken(ctx.redis, { email, token, ttlSeconds });
 
+      // normalizeEmail aus dem Store — eine Quelle für die Normalisierungs-
+      // Verantwortung; delivery-Empfänger + Lookup-Pfad kriegen konsistent
+      // das gleiche Format.
+      const normalizedEmail = normalizeEmail(email);
+
+      await dispatchMagicLinkMail(
+        ctx.notify,
+        {
+          handlerName: "signup-request",
+          notificationType: SIGNUP_NOTIFICATION_TYPE,
+          renderContent: renderActivationEmail,
+        },
+        {
+          email: normalizedEmail,
+          appUrl: opts.appUrl,
+          token,
+          expiresAt: expiresAtIso,
+          ...(opts.appName !== undefined && { appName: opts.appName }),
+          ...(opts.locale !== undefined && { locale: opts.locale }),
+        },
+      );
+
       return {
         isSuccess: true,
         data: {
           kind: "signup-requested",
-          // normalizeEmail aus dem Store — eine Quelle für die
-          // Normalisierungs-Verantwortung; Mail-Callback kriegt
-          // konsistent das gleiche Format wie der Lookup-Pfad.
-          email: normalizeEmail(email),
+          email: normalizedEmail,
           token,
-          expiresAt: expiresAt.toString(),
+          expiresAt: expiresAtIso,
         },
       };
     },

package/src/auth-email-password/handlers/token-request-handler.ts

@@ -17,6 +17,8 @@ import type { Temporal } from "temporal-polyfill";
 import { z } from "zod";
 import { UserQueries } from "../../user";
 import { type AuthUserRow, parseAuthUserRow } from "../auth-user-row";
+import type { AuthMailContent, AuthMailLocale, RenderTokenContentArgs } from "../email-templates";
+import { dispatchMagicLinkMail } from "../magic-link-mail";
 
 const RequestTokenSchema = z.object({
   email: z.email(),
@@ -56,11 +58,22 @@ export type TokenRequestSpec<TName extends string, TSuccessKind extends string>
   // soft-deleted". Verification skips when emailVerified is already true;
   // password-reset has no extra condition (returns false).
   readonly extraSilentSkip: (user: AuthUserRow) => boolean;
+  // Notification type dispatched via ctx.notify on success. No r.notification
+  // is declared (the recipient is an anonymous email, not a userId) — the
+  // route:{email} path delivers directly and buildMessage falls back to data.
+  readonly notificationType: string;
+  // Builds the structured mail body from the magic-link + expiry. Per-flow
+  // (renderResetPasswordEmail / renderVerifyEmail).
+  readonly renderContent: (args: RenderTokenContentArgs) => AuthMailContent;
 };
 
 export type TokenRequestOptions = {
   readonly hmacSecret: string;
   readonly tokenTtlMinutes?: number;
+  // App page that receives the magic-link; the handler appends `?token=…`.
+  readonly appUrl: string;
+  readonly appName?: string;
+  readonly locale?: AuthMailLocale;
 };
 
 export function createTokenRequestHandler<TName extends string, TSuccessKind extends string>(
@@ -103,6 +116,24 @@ export function createTokenRequestHandler<TName extends string, TSuccessKind ext
       }
 
       const { token, expiresAt } = spec.sign(user.id, ttl, opts.hmacSecret);
+
+      await dispatchMagicLinkMail(
+        ctx.notify,
+        {
+          handlerName: spec.handlerName,
+          notificationType: spec.notificationType,
+          renderContent: spec.renderContent,
+        },
+        {
+          email: user.email,
+          appUrl: opts.appUrl,
+          token,
+          expiresAt: expiresAt.toString(),
+          ...(opts.appName !== undefined && { appName: opts.appName }),
+          ...(opts.locale !== undefined && { locale: opts.locale }),
+        },
+      );
+
       const data: TokenRequestData<TSuccessKind> = {
         kind: spec.successKind,
         email: user.email,

package/src/auth-email-password/index.ts

@@ -1,27 +1,16 @@
-// Factory für app-spezifische Auth-Mail-Configs. Baut passwordReset,
-// emailVerification, signup und invite Setups gegen mailSender + Render-
-// Funktionen — eliminiert Duplikate zwischen kumiko-studio, publicstatus
-// und solon (jede App hatte identische send*Email-Wrapper kopiert).
-export {
-  type AuthMailerConfig,
-  type AuthPaths,
-  type CreateAuthMailerConfigArgs,
-  createAuthMailerConfig,
-  DEFAULT_AUTH_PATHS,
-  makeAuthPaths,
-} from "./auth-mailer";
+// Convention paths for the auth pages (reset/verify/signup/invite); apps build
+// their magic-link appUrls from these. All mail now goes through delivery.
+export { type AuthPaths, DEFAULT_AUTH_PATHS, makeAuthPaths } from "./auth-paths";
 export { AUTH_EMAIL_PASSWORD_FEATURE, AuthErrors, AuthHandlers } from "./constants";
-// Default-HTML-Renderer für die Reset-Password + Verify-Email Mails.
-// Apps wiren die `sendResetEmail` / `sendVerificationEmail` callbacks
-// im framework-config — diese Renderer können als one-liner genutzt
-// werden, oder die App schreibt einen eigenen Renderer für Branding.
+// Renderers for the auth mails. All four magic-link flows (reset, verify,
+// signup-activation, invite) emit structured AuthMailContent through delivery
+// (ctx.notify).
 export type {
+  AuthMailContent,
   AuthMailLocale,
-  RenderActivationEmailArgs,
-  RenderedEmail,
+  AuthMailSection,
   RenderInviteEmailArgs,
-  RenderResetPasswordEmailArgs,
-  RenderVerifyEmailArgs,
+  RenderTokenContentArgs,
 } from "./email-templates";
 export {
   renderActivationEmail,

package/src/auth-email-password/magic-link-mail.ts

@@ -0,0 +1,62 @@
+// Shared dispatch for the magic-link mails (password-reset, email-verification,
+// signup-activation). All three follow the same delivery shape: append the
+// token to the app page, render structured content, and notify the recipient
+// email directly (route:{email} skips preferences — the recipient may not have
+// a user account yet — and critical priority keeps a security mail
+// non-unsubscribable). No r.notification is declared; buildMessage falls back
+// to the structured `data` for the renderer.
+
+import type { NotifyFn } from "@cosmicdrift/kumiko-framework/engine";
+import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
+import type { AuthMailContent, AuthMailLocale, RenderTokenContentArgs } from "./email-templates";
+
+// Per-flow constants: which notification type to dispatch and how to render the
+// body. renderContent is the flow's template (renderResetPasswordEmail / … /
+// renderActivationEmail), all unified on RenderTokenContentArgs → AuthMailContent.
+export type MagicLinkMailSpec = {
+  readonly handlerName: string;
+  readonly notificationType: string;
+  readonly renderContent: (args: RenderTokenContentArgs) => AuthMailContent;
+};
+
+// Per-request values: the recipient + the app page that receives the token, plus
+// optional presentation. appUrl is the bare page URL; the token is appended here.
+export type MagicLinkMailParams = {
+  readonly email: string;
+  readonly appUrl: string;
+  readonly token: string;
+  readonly expiresAt: string;
+  readonly appName?: string;
+  readonly locale?: AuthMailLocale;
+};
+
+function appendToken(appUrl: string, token: string): string {
+  const sep = appUrl.includes("?") ? "&" : "?";
+  return `${appUrl}${sep}token=${encodeURIComponent(token)}`;
+}
+
+export async function dispatchMagicLinkMail(
+  notify: NotifyFn | undefined,
+  spec: MagicLinkMailSpec,
+  params: MagicLinkMailParams,
+): Promise<void> {
+  // delivery is a hard requirement when a magic-link flow is mounted (see
+  // feature.ts r.requires), so notify is always wired — this guard is a
+  // defensive boot-invariant, not a runtime branch.
+  if (!notify) {
+    throw new InternalError({
+      message: `${spec.handlerName}: ctx.notify unavailable — the delivery feature must be mounted`,
+    });
+  }
+  const content = spec.renderContent({
+    url: appendToken(params.appUrl, params.token),
+    expiresAt: params.expiresAt,
+    ...(params.locale !== undefined && { locale: params.locale }),
+    ...(params.appName !== undefined && { appName: params.appName }),
+  });
+  await notify(spec.notificationType, {
+    route: { email: params.email },
+    data: content,
+    priority: "critical",
+  });
+}

package/src/renderer-simple/__tests__/adapter.test.ts

@@ -1,16 +1,26 @@
 import { describe, expect, test } from "bun:test";
-import { RendererError } from "../../renderer-foundation";
+import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
+import { type RendererContext, RendererError } from "../../renderer-foundation";
 import { adaptToFoundation } from "../feature";
 
+const STUB_CTX: RendererContext = {
+  db: null as never,
+  registry: null as never,
+  tenantId: "11111111-1111-4111-8111-111111111111" as TenantId,
+};
+
 describe("renderer-simple :: adaptToFoundation", () => {
   test("kind='notification' rendert via simpleRenderer und gibt RenderResponse zurück", async () => {
-    const res = await adaptToFoundation({
-      kind: "notification",
-      payload: {
-        template: "welcome",
-        variables: { title: "Welcome!", body: "Hello there" },
+    const res = await adaptToFoundation(
+      {
+        kind: "notification",
+        payload: {
+          template: "welcome",
+          variables: { title: "Welcome!", body: "Hello there" },
+        },
       },
-    });
+      STUB_CTX,
+    );
     expect(res.kind).toBe("notification");
     if (res.kind === "notification") {
       // simpleRenderer baut HTML mit title als header + body als section
@@ -21,26 +31,35 @@ describe("renderer-simple :: adaptToFoundation", () => {
   });
 
   test("leere variables → leerer body, kein crash", async () => {
-    const res = await adaptToFoundation({
-      kind: "notification",
-      payload: { template: "", variables: {} },
-    });
+    const res = await adaptToFoundation(
+      {
+        kind: "notification",
+        payload: { template: "", variables: {} },
+      },
+      STUB_CTX,
+    );
     expect(res.kind).toBe("notification");
   });
 
   test("non-notification kind → RendererError mit code 'invalid_payload'", async () => {
     await expect(
-      adaptToFoundation({
-        kind: "mail-html",
-        payload: { content: "test", contentFormat: "markdown" },
-      }),
+      adaptToFoundation(
+        {
+          kind: "mail-html",
+          payload: { content: "test", contentFormat: "markdown" },
+        },
+        STUB_CTX,
+      ),
     ).rejects.toThrow(RendererError);
 
     try {
-      await adaptToFoundation({
-        kind: "document-pdf",
-        payload: { content: "test", contentFormat: "markdown" },
-      });
+      await adaptToFoundation(
+        {
+          kind: "document-pdf",
+          payload: { content: "test", contentFormat: "markdown" },
+        },
+        STUB_CTX,
+      );
       throw new Error("expected RendererError");
     } catch (e) {
       expect(e).toBeInstanceOf(RendererError);

package/src/renderer-simple/__tests__/template-resolver.integration.test.ts

@@ -0,0 +1,102 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { insertOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
+import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
+import {
+  setupTestStack,
+  type TestStack,
+  unsafeCreateEntityTable,
+} from "@cosmicdrift/kumiko-framework/stack";
+import type { RendererContext } from "../../renderer-foundation";
+import { SYSTEM_TENANT_ID } from "../../template-resolver/constants";
+import { createTemplateResolverFeature } from "../../template-resolver/feature";
+import { templateResourceEntity, templateResourcesTable } from "../../template-resolver/table";
+import { adaptToFoundation } from "../feature";
+
+let stack: TestStack;
+let db: DbConnection;
+
+const TENANT_ID = "11111111-1111-4111-8111-111111111111" as TenantId;
+
+const templateResolverFeature = createTemplateResolverFeature();
+
+beforeAll(async () => {
+  stack = await setupTestStack({ features: [templateResolverFeature] });
+  db = stack.db;
+  await unsafeCreateEntityTable(db, templateResourceEntity);
+});
+
+afterAll(async () => {
+  await stack.cleanup();
+});
+
+function rendererCtx(): RendererContext {
+  return { db, registry: stack.registry, tenantId: TENANT_ID };
+}
+
+async function seedPlainNotificationTemplate(content: string): Promise<void> {
+  await insertOne(db, templateResourcesTable, {
+    tenantId: SYSTEM_TENANT_ID,
+    slug: "welcome-mail",
+    kind: "notification",
+    locale: "de",
+    scope: "system",
+    status: "active",
+    content,
+    contentFormat: "plain",
+    variableSchema: JSON.stringify({}),
+    linkedResources: JSON.stringify({}),
+    parentTemplateId: null,
+    createdBy: "test",
+    updatedBy: "test",
+  });
+}
+
+describe("renderer-simple :: template-resolver integration", () => {
+  test("resolves slug via template-resolver and merges runtime variables", async () => {
+    await seedPlainNotificationTemplate(
+      JSON.stringify({
+        header: "Template header",
+        sections: [{ text: "Template body" }],
+      }),
+    );
+
+    const res = await adaptToFoundation(
+      {
+        kind: "notification",
+        payload: {
+          template: "welcome-mail",
+          locale: "de",
+          variables: { header: "Runtime override" },
+        },
+      },
+      rendererCtx(),
+    );
+
+    expect(res.kind).toBe("notification");
+    if (res.kind === "notification") {
+      expect(res.html).toContain("Runtime override");
+      expect(res.html).toContain("Template body");
+      expect(res.html).not.toContain("Template header");
+    }
+  });
+
+  test("falls back to variables when slug is unknown in template-resolver", async () => {
+    const res = await adaptToFoundation(
+      {
+        kind: "notification",
+        payload: {
+          template: "password-reset",
+          variables: { title: "Reset", body: "Click the link" },
+        },
+      },
+      rendererCtx(),
+    );
+
+    expect(res.kind).toBe("notification");
+    if (res.kind === "notification") {
+      expect(res.html).toContain("Reset");
+      expect(res.html).toContain("Click the link");
+    }
+  });
+});

package/src/renderer-simple/feature.ts

@@ -1,5 +1,11 @@
 import { defineFeature, type FeatureDefinition } from "@cosmicdrift/kumiko-framework/engine";
-import { RendererError, type RenderRequest, type RenderResponse } from "../renderer-foundation";
+import {
+  type RendererContext,
+  RendererError,
+  type RenderRequest,
+  type RenderResponse,
+} from "../renderer-foundation";
+import { resolveNotificationVariables } from "./resolve-variables";
 import { simpleRenderer } from "./simple-renderer";
 
 // Adapter: simpleRenderer.render hat `Promise<string>`-Signatur (Legacy
@@ -9,7 +15,10 @@ import { simpleRenderer } from "./simple-renderer";
 // Inline-CSS) und packt sie in den RendererPlugin-Contract.
 //
 // Exported damit der Adapter-Pfad direkt testbar ist (unit-test).
-export async function adaptToFoundation(req: RenderRequest): Promise<RenderResponse> {
+export async function adaptToFoundation(
+  req: RenderRequest,
+  ctx: RendererContext,
+): Promise<RenderResponse> {
   if (req.kind !== "notification") {
     // Defensiver Guard — Foundation wählt Plugins nur für matching kinds,
     // dieser Pfad sollte unter normalen Umständen nie erreicht werden.
@@ -18,9 +27,10 @@ export async function adaptToFoundation(req: RenderRequest): Promise<RenderRespo
       "invalid_payload",
     );
   }
+  const variables = await resolveNotificationVariables(req, ctx);
   const html = await simpleRenderer.render({
     template: req.payload.template ?? "",
-    variables: req.payload.variables ?? {},
+    variables,
   });
   return { kind: "notification", html };
 }
@@ -36,6 +46,7 @@ export function createRendererSimpleFeature(): FeatureDefinition {
       recommended: false,
     });
     r.requires("renderer-foundation");
+    r.optionalRequires("template-resolver");
 
     r.useExtension("renderer", "simple", {
       kinds: ["notification"] as const,

package/src/renderer-simple/resolve-variables.ts

@@ -0,0 +1,55 @@
+import type { RendererContext, RenderRequest } from "../renderer-foundation";
+import {
+  createTemplateResolverApi,
+  FALLBACK_LOCALE,
+  TemplateNotFoundError,
+} from "../template-resolver";
+
+type NotificationRequest = Extract<RenderRequest, { kind: "notification" }>;
+
+/** Merge template-resolver content (plain JSON EmailTemplateData) with runtime variables. */
+export async function resolveNotificationVariables(
+  req: NotificationRequest,
+  ctx: RendererContext,
+): Promise<Readonly<Record<string, unknown>>> {
+  const variables = req.payload.variables ?? {};
+  const slug = req.payload.template?.trim();
+  if (!slug || req.payload.content || !ctx.db) {
+    return variables;
+  }
+
+  try {
+    const api = createTemplateResolverApi(ctx.db);
+    const locale = req.payload.locale ?? FALLBACK_LOCALE;
+    const resolved = await api.resolveTemplate({
+      tenantId: ctx.tenantId,
+      slug,
+      kind: "notification",
+      locale,
+    });
+    if (resolved.contentFormat === "plain") {
+      const base = parsePlainTemplateContent(resolved.content);
+      return { ...base, ...variables };
+    }
+    return { ...variables, body: resolved.content };
+  } catch (err) {
+    if (err instanceof TemplateNotFoundError) {
+      return variables;
+    }
+    throw err;
+  }
+}
+
+function parsePlainTemplateContent(content: string): Record<string, unknown> {
+  const trimmed = content.trim();
+  if (!trimmed) return {};
+  try {
+    const parsed: unknown = JSON.parse(trimmed);
+    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+      return parsed as Record<string, unknown>;
+    }
+  } catch {
+    // ponytail: non-JSON plain content becomes a single body section downstream
+  }
+  return { body: content };
+}