@cosmicdrift/kumiko-dev-server 0.174.1 → 0.176.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-dev-server",
-  "version": "0.174.1",
+  "version": "0.176.0",
   "description": "Dev-tooling for Kumiko apps: local dev-server bootstrap (runDevApp), scaffolding, codegen. Not shipped into production node_modules — see @cosmicdrift/kumiko-server-runtime for the prod boot path.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -54,9 +54,9 @@
     "kumiko-schema-check": "./bin/kumiko-schema-check.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.174.1",
-    "@cosmicdrift/kumiko-framework": "0.174.1",
-    "@cosmicdrift/kumiko-server-runtime": "0.174.1",
+    "@cosmicdrift/kumiko-bundled-features": "0.176.0",
+    "@cosmicdrift/kumiko-framework": "0.176.0",
+    "@cosmicdrift/kumiko-server-runtime": "0.176.0",
     "ts-morph": "^28.0.0"
   },
   "publishConfig": {

package/src/__tests__/compose-stacks.test.ts

@@ -29,8 +29,8 @@ describe("composeStacks", () => {
     ]);
   });
 
-  test("composePagesStack → text-content + legal-pages", () => {
-    expect(stackFeatureNames(composePagesStack())).toEqual(["text-content", "legal-pages"]);
+  test("composePagesStack → legal-pages (template-resolver comes from the renderer stack)", () => {
+    expect(stackFeatureNames(composePagesStack())).toEqual(["legal-pages"]);
   });
 
   test("composeMailStack mounts foundation + selected transports", () => {
@@ -134,6 +134,8 @@ describe("composeStacks boots for real", () => {
         createPersonalAccessTokensFeature({ scopes: {} }),
         ...composeOpsStack({ rateLimiting: true }),
         ...composePagesStack(),
+        // legal-pages requires template-resolver, which ships in the renderer stack.
+        ...composeRendererStack(),
         ...composeMailStack({ transports: ["inmemory"] }),
         ...composeFileStack({ providers: ["inmemory"] }),
         ...composeGdprStack({ order: "compliance-first", sessions: true }),
@@ -192,6 +194,8 @@ describe("composeStacks intended block names (snapshot, not live parity)", () =>
     const names = stackFeatureNames([
       ...composeOpsStack({ rateLimiting: true }),
       ...composePagesStack(),
+      // Pages content sits on template-resolver, which the renderer stack mounts.
+      ...composeRendererStack(),
       ...composeMailStack({ transports: ["inmemory", "smtp"] }),
       ...composeFileStack({ providers: ["inmemory", "s3"] }),
       ...composeGdprStack({ order: "compliance-first" }),
@@ -202,7 +206,7 @@ describe("composeStacks intended block names (snapshot, not live parity)", () =>
       "audit",
       "jobs",
       "rate-limiting",
-      "text-content",
+      "template-resolver",
       "legal-pages",
       "mail-foundation",
       "file-foundation",
@@ -226,7 +230,7 @@ describe("composeStacks intended block names (snapshot, not live parity)", () =>
       ...composeUserDataRightsStack(),
     ]);
     for (const expected of [
-      "text-content",
+      "template-resolver",
       "legal-pages",
       "data-retention",
       "compliance-profiles",
@@ -250,7 +254,7 @@ describe("composeStacks intended block names (snapshot, not live parity)", () =>
       ...composeUserDataRightsStack(),
     ]);
     for (const expected of [
-      "text-content",
+      "template-resolver",
       "legal-pages",
       "tenant-lifecycle",
       "audit",

package/src/__tests__/merge-extra-context.test.ts

@@ -3,7 +3,7 @@ import { mergeExtraContext } from "../setup-test-stack-from-features";
 
 // #882/4: the integration test only asserted getFeature("config") — which
 // includeBundled already provides — never that presets:["config"] actually
-// merges configResolver/textContent into extraContext. Unit-test the merge
+// merges configResolver/templateResolver into extraContext. Unit-test the merge
 // directly instead.
 
 const fakeDeps = {
@@ -41,16 +41,16 @@ describe("mergeExtraContext", () => {
     expect(result["configResolver"]).toBeDefined();
   });
 
-  test("text-content preset merges textContent, built from deps.db", () => {
-    const merged = mergeExtraContext(undefined, ["text-content"]);
+  test("template-resolver preset merges templateResolver, built from deps.db", () => {
+    const merged = mergeExtraContext(undefined, ["template-resolver"]);
     const result = (merged as (deps: typeof fakeDeps) => Record<string, unknown>)(fakeDeps);
-    expect(result["textContent"]).toBeDefined();
+    expect(result["templateResolver"]).toBeDefined();
   });
 
   test("both presets merge both fields", () => {
-    const merged = mergeExtraContext(undefined, ["config", "text-content"]);
+    const merged = mergeExtraContext(undefined, ["config", "template-resolver"]);
     const result = (merged as (deps: typeof fakeDeps) => Record<string, unknown>)(fakeDeps);
     expect(result["configResolver"]).toBeDefined();
-    expect(result["textContent"]).toBeDefined();
+    expect(result["templateResolver"]).toBeDefined();
   });
 });

package/src/__tests__/run-dev-app.integration.test.ts

@@ -7,9 +7,10 @@
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import {
-  requireTextContent,
-  type TextContentApi,
-} from "@cosmicdrift/kumiko-bundled-features/text-content";
+  requireTemplateResolver,
+  TEXT_BLOCK_KIND,
+  type TemplateResolverApi,
+} from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import {
   createEntity,
   createTextField,
@@ -111,28 +112,47 @@ describe("runDevApp — auth allowedOrigins forwarding (#399/1)", () => {
 });
 
 describe("runDevApp — extraContext merge order: app values win over boot defaults (707/1)", () => {
-  test("a caller-supplied extraContext.textContent wins over the auto-wired boot default", async () => {
+  test("a caller-supplied extraContext.templateResolver wins over the auto-wired boot default", async () => {
     // runDevApp's extraContext factory does `{ ...boot, ...base }` — boot's
-    // auto-wired textContent must lose to a caller-supplied override, exactly
+    // auto-wired templateResolver must lose to a caller-supplied override, exactly
     // the "app values win" parity claim this PR made against runProdApp. Every
     // OTHER test in this file only checks that runDevApp boots without
     // throwing; none dispatch a request that actually reads the merged value.
-    const sentinel: TextContentApi = {
-      getBlock: async () => ({
+    const sentinel: TemplateResolverApi = {
+      findExact: async () => ({
+        id: "sentinel",
+        version: 1,
+        tenantId: TestUsers.systemAdmin.tenantId,
         slug: "sentinel",
-        lang: "en",
+        kind: TEXT_BLOCK_KIND,
+        locale: "en",
         title: "from caller extraContext",
-        body: null,
+        folder: null,
+        content: "",
+        contentFormat: "markdown",
+        variableSchema: {},
+        linkedResources: {},
+        scope: "system",
+        parentTemplateId: null,
+        status: "active",
         updatedAt: new Date(0),
       }),
+      resolveTemplate: async () => {
+        throw new Error("not used in this test");
+      },
     };
     const readBlockQuery = defineQueryHandler({
       name: "read-block",
       schema: z.object({}),
       access: { openToAll: true },
       handler: async (_query, ctx) => {
-        const api = requireTextContent(ctx, "textcheck:query:read-block");
-        return api.getBlock({ tenantId: TestUsers.systemAdmin.tenantId, slug: "x", lang: "en" });
+        const api = requireTemplateResolver(ctx, "textcheck:query:read-block");
+        return api.findExact({
+          tenantId: TestUsers.systemAdmin.tenantId,
+          slug: "x",
+          kind: TEXT_BLOCK_KIND,
+          locale: "en",
+        });
       },
     });
     const textcheckFeature = defineFeature("textcheck", (r) => {
@@ -142,7 +162,7 @@ describe("runDevApp — extraContext merge order: app values win over boot defau
     handle = await runDevApp({
       features: [validFeature(), textcheckFeature],
       port: 0,
-      extraContext: { textContent: sentinel },
+      extraContext: { templateResolver: sentinel },
     });
 
     const res = await handle.stack.http.queryOk<{ title: string } | null>(

package/src/compose-stacks.ts

@@ -30,7 +30,7 @@ import { createRendererSimpleFeature } from "@cosmicdrift/kumiko-bundled-feature
 import { createSessionsFeature } from "@cosmicdrift/kumiko-bundled-features/sessions";
 import { createTemplateResolverFeature } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import { createTenantLifecycleFeature } from "@cosmicdrift/kumiko-bundled-features/tenant-lifecycle";
-import { createTextContentFeature } from "@cosmicdrift/kumiko-bundled-features/text-content";
+
 import {
   createUserDataRightsFeature,
   type UserDataRightsOptions,
@@ -98,8 +98,12 @@ export function stackFeatureNames(features: readonly FeatureDefinition[]): strin
 }
 
 export function composePagesStack(options: PagesStackOptions = {}): FeatureDefinition[] {
+  // Pages content lives in template-resolver (kind text-block), which the
+  // renderer stack already mounts — an app composing pages WITHOUT the renderer
+  // stack has to add createTemplateResolverFeature() itself, or legal-pages'
+  // r.requires fails the boot. Mounting it here instead would collide with
+  // composeRendererStack (createRegistry rejects duplicate features).
   return [
-    createTextContentFeature(),
     createLegalPagesFeature(
       options.wrapLayout !== undefined ? { wrapLayout: options.wrapLayout } : {},
     ),

package/src/run-dev-app.ts

@@ -204,7 +204,7 @@ export type RunDevAppOptions = {
   /** Eigene Seed-Funktionen, laufen nach dem Admin (wenn auth) in
    *  Array-Reihenfolge. */
   readonly seeds?: readonly SeedFn[];
-  /** Extra-AppContext-Keys. `textContent` (immer) + `secrets` (wenn das
+  /** Extra-AppContext-Keys. `templateResolver` (immer) + `secrets` (wenn das
    *  secrets-Feature gemountet ist) + `configResolver` (auth-mode) werden
    *  automatisch ergänzt — App-Werte gewinnen. Symmetrisch zu runProdApp. */
   readonly extraContext?: CreateKumikoServerOptions["extraContext"];
@@ -379,7 +379,7 @@ export async function runDevApp(options: RunDevAppOptions): Promise<KumikoServer
         bootCrypto.configCipher,
       )
     : options.extraContext;
-  // Auto-wire textContent (immer) + secrets (feature-gated), symmetrisch zu
+  // Auto-wire templateResolver (immer) + secrets (feature-gated), symmetrisch zu
   // runProdApp. Anders als prod existiert die db hier erst im Factory-deps
   // (createKumikoServer baut den Stack), darum als Factory: buildBootExtraContext
   // mit hasAuth:false (configResolver kommt schon aus cfgExtra), App-Werte

package/src/setup-test-stack-from-features.ts

@@ -2,7 +2,7 @@
 // Apps pass the same feature list as run-config (APP_FEATURES / buildAppFeatures).
 
 import { createConfigResolver } from "@cosmicdrift/kumiko-bundled-features/config";
-import { createTextContentApi } from "@cosmicdrift/kumiko-bundled-features/text-content";
+import { createTemplateResolverApi } from "@cosmicdrift/kumiko-bundled-features/template-resolver";
 import type { FeatureDefinition } from "@cosmicdrift/kumiko-framework/engine";
 import {
   setupTestStack,
@@ -14,7 +14,7 @@ import {
   composeFeatures,
 } from "@cosmicdrift/kumiko-server-runtime/compose-features";
 
-export type TestStackPreset = "config" | "text-content";
+export type TestStackPreset = "config" | "template-resolver";
 
 export type SetupTestStackFromFeaturesOptions = Omit<TestStackOptions, "features"> & {
   readonly includeBundled?: boolean;
@@ -37,8 +37,8 @@ export function mergeExtraContext(
       const configResolver = createConfigResolver();
       merged["configResolver"] = configResolver;
     }
-    if (presets.includes("text-content")) {
-      merged["textContent"] = createTextContentApi(deps.db);
+    if (presets.includes("template-resolver")) {
+      merged["templateResolver"] = createTemplateResolverApi(deps.db);
     }
 
     return merged;