@cosmicdrift/kumiko-bundled-features 0.215.5 → 0.215.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.215.5",
+  "version": "0.215.6",
   "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>",
@@ -126,12 +126,12 @@
     "./step-dispatcher": "./src/step-dispatcher/index.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.215.5",
-    "@cosmicdrift/kumiko-framework": "0.215.5",
-    "@cosmicdrift/kumiko-headless": "0.215.5",
-    "@cosmicdrift/kumiko-renderer": "0.215.5",
-    "@cosmicdrift/kumiko-renderer-web": "0.215.5",
-    "@cosmicdrift/kumiko-types": "0.215.5",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.215.6",
+    "@cosmicdrift/kumiko-framework": "0.215.6",
+    "@cosmicdrift/kumiko-headless": "0.215.6",
+    "@cosmicdrift/kumiko-renderer": "0.215.6",
+    "@cosmicdrift/kumiko-renderer-web": "0.215.6",
+    "@cosmicdrift/kumiko-types": "0.215.6",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/mailparser": "^3.4.6",
@@ -160,6 +160,6 @@
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
     "@types/qrcode": "^1.5.5",
-    "@cosmicdrift/kumiko-locale-de": "0.215.5"
+    "@cosmicdrift/kumiko-locale-de": "0.215.6"
   }
 }

package/src/template-resolver/__tests__/seed-legal-content.integration.test.ts

@@ -1,5 +1,10 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { type DbConnection, fetchOne, selectMany } from "@cosmicdrift/kumiko-framework/db";
+import {
+  type DbConnection,
+  deleteMany,
+  fetchOne,
+  selectMany,
+} from "@cosmicdrift/kumiko-framework/db";
 import { SYSTEM_TENANT_ID, SYSTEM_USER_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { createEventsTable, eventsTable } from "@cosmicdrift/kumiko-framework/event-store";
 import {
@@ -77,6 +82,32 @@ describe("seedLegalContentFromJson", () => {
     expect(row.modifiedById).toBe(SYSTEM_USER_ID);
   });
 
+  test("orphan projection (row without events) is recreated on ifExists:update", async () => {
+    await seedLegalContentFromJson(db, [
+      { slug: "orphan-privacy", locale: "de", title: "DS", content: "old" },
+    ]);
+    const before = await read("orphan-privacy", "de");
+    expect(before).not.toBeNull();
+
+    // Same desync as prod: projection left behind, event stream empty.
+    await deleteMany(db, eventsTable, { aggregateId: String(before!.id) });
+    expect(await read("orphan-privacy", "de")).not.toBeNull();
+
+    await seedLegalContentFromJson(db, [
+      {
+        slug: "orphan-privacy",
+        locale: "de",
+        title: "DS",
+        content: "new from template",
+      },
+    ]);
+    const after = await read("orphan-privacy", "de");
+    expect(after).toMatchObject({ content: "new from template", title: "DS" });
+    const events = await selectMany(db, eventsTable, { aggregateId: String(after!.id) });
+    expect(events.length).toBeGreaterThan(0);
+    expect(events.some((e) => e.type === "template-resource.created")).toBe(true);
+  });
+
   test("identical re-seed is a no-op (no update event, version/modifiedAt stable)", async () => {
     const blocks: LegalContentBlock[] = [
       { slug: "terms", locale: "de", title: "AGB", content: "stable" },

package/src/template-resolver/seeding.ts

@@ -10,18 +10,43 @@
 // bewusst nicht TestUsers (Prod-Seeds ≠ Test-Utilities).
 
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
-import { createTenantDb, type DbConnection } from "@cosmicdrift/kumiko-framework/db";
+import {
+  createTenantDb,
+  type DbConnection,
+  deleteMany,
+  type EntityTableMeta,
+} from "@cosmicdrift/kumiko-framework/db";
 import {
   createSystemUser,
   type SessionUser,
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
+import { getStreamVersion } from "@cosmicdrift/kumiko-framework/event-store";
 import { runEventStoreSeed, type SeedIfExists } from "@cosmicdrift/kumiko-framework/seeding";
 import { type ContentFormat, TEXT_BLOCK_KIND, type UpsertKind } from "./constants";
 import { executor } from "./handlers/shared";
 import { type TemplateResourceRow, templateResourcesTable } from "./table";
 
+/** Projection row without events — update() would 409 (expectedVersion from
+ *  projection, stream currentVersion=0). Drop the orphan and treat as create
+ *  so boot seeds (legal ifExists:update) survive desync. Stream version is the
+ *  optimistic-lock source of truth when events exist. */
+async function resolveExistingForEventStoreSeed(
+  db: DbConnection,
+  existingRow: { readonly id: string | number; readonly version: number } | null,
+  tenantId: TenantId,
+): Promise<{ id: string; version: number } | null> {
+  if (existingRow == null) return null;
+  const id = String(existingRow.id);
+  const streamVersion = await getStreamVersion(db, id, tenantId);
+  if (streamVersion === 0) {
+    await deleteMany(db, templateResourcesTable as EntityTableMeta, { id });
+    return null;
+  }
+  return { id, version: streamVersion };
+}
+
 export type SeedSystemTemplateOptions = {
   readonly slug: string;
   readonly kind: UpsertKind;
@@ -43,12 +68,17 @@ export async function seedSystemTemplate(
   const by = opts.by ?? createSystemUser(tenantId);
   const tdb = createTenantDb(db, tenantId, "system");
 
-  const existing = (await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
+  const existingRow = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
     tenantId,
     slug: opts.slug,
     kind: opts.kind,
     locale: opts.locale,
-  })) as { id: string; version: number } | null;
+  });
+  const existing = await resolveExistingForEventStoreSeed(
+    db,
+    existingRow ? { id: existingRow.id, version: existingRow.version } : null,
+    tenantId,
+  );
 
   const variableSchema = JSON.stringify(opts.variableSchema ?? {});
   const linkedResources = JSON.stringify(opts.linkedResources ?? {});
@@ -127,9 +157,11 @@ export async function seedTextBlock(
     kind: TEXT_BLOCK_KIND,
     locale: opts.locale,
   });
-  const existing = existingRow
-    ? { id: String(existingRow.id), version: existingRow.version }
-    : null;
+  const existing = await resolveExistingForEventStoreSeed(
+    db,
+    existingRow ? { id: existingRow.id, version: existingRow.version } : null,
+    opts.tenantId,
+  );
 
   const fields = {
     slug: opts.slug,