@cosmicdrift/kumiko-bundled-features 0.104.0 → 0.105.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.104.0",
+  "version": "0.105.0",
   "description": "Built-in features — tenant, user, auth, delivery. The stuff you'd rewrite anyway, already typed.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -92,11 +92,11 @@
     "./step-dispatcher": "./src/step-dispatcher/index.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.104.0",
-    "@cosmicdrift/kumiko-framework": "0.104.0",
-    "@cosmicdrift/kumiko-headless": "0.104.0",
-    "@cosmicdrift/kumiko-renderer": "0.104.0",
-    "@cosmicdrift/kumiko-renderer-web": "0.104.0",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.105.0",
+    "@cosmicdrift/kumiko-framework": "0.105.0",
+    "@cosmicdrift/kumiko-headless": "0.105.0",
+    "@cosmicdrift/kumiko-renderer": "0.105.0",
+    "@cosmicdrift/kumiko-renderer-web": "0.105.0",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/nodemailer": "^8.0.0",

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 };
+}