@cosmicdrift/kumiko-renderer-web 0.147.3 → 0.148.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer-web",
-  "version": "0.147.3",
+  "version": "0.148.0",
   "description": "Web-platform bindings for @cosmicdrift/kumiko-renderer. HTML default-primitives, browser history-based navigation, EventSource-backed live events, and a one-call createKumikoApp that mounts the whole stack via react-dom.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -16,9 +16,9 @@
     "./styles.css": "./src/styles.css"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.147.3",
-    "@cosmicdrift/kumiko-headless": "0.147.3",
-    "@cosmicdrift/kumiko-renderer": "0.147.3",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.148.0",
+    "@cosmicdrift/kumiko-headless": "0.148.0",
+    "@cosmicdrift/kumiko-renderer": "0.148.0",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-label": "^2.1.8",

package/src/__tests__/create-app.test.tsx

@@ -1,11 +1,13 @@
 import { afterAll, afterEach, describe, expect, spyOn, test } from "bun:test";
 import type {
+  DashboardScreenDefinition,
   EntityDefinition,
   EntityEditScreenDefinition,
   EntityListScreenDefinition,
 } from "@cosmicdrift/kumiko-framework/ui-types";
 import type { Dispatcher } from "@cosmicdrift/kumiko-headless";
 import type { ColumnRendererProps, FeatureSchema, NavApi } from "@cosmicdrift/kumiko-renderer";
+import { createStaticLocaleResolver } from "@cosmicdrift/kumiko-renderer";
 import { act, screen, waitFor } from "@testing-library/react";
 import type { ReactNode } from "react";
 import type { ClientFeatureDefinition } from "../app/client-plugin";
@@ -252,6 +254,99 @@ describe("createKumikoApp", () => {
     expect(screen.getByTestId("ca-swatch-field").textContent).toBe("color");
   });
 
+  test("schema.translations (r.translations, #1059) resolves nav/dashboard labels without any clientFeatures duplication", async () => {
+    // Mirrors cap-counter's real shape: a feature that declares r.translations
+    // for its own nav label but ships NO web/i18n.ts / clientFeatures entry at
+    // all. Before #1059 this label rendered as the raw i18n key forever.
+    const dashboardScreen: DashboardScreenDefinition = {
+      id: "overview",
+      type: "dashboard",
+      panels: [
+        {
+          kind: "stat",
+          id: "cap-list",
+          label: "cap-counter:nav.cap-list",
+          query: "cap-counter:query:stat",
+          valueField: "value",
+        },
+      ],
+    };
+    const schema: FeatureSchema = {
+      featureName: "cap-counter",
+      entities: {},
+      screens: [dashboardScreen],
+      translations: {
+        "cap-counter:nav.cap-list": { de: "Limits", en: "Caps" },
+      },
+    };
+    const dispatcher = createMockDispatcher({
+      query: (async () => ({
+        isSuccess: true,
+        data: { value: "3" },
+      })) as unknown as Dispatcher["query"],
+    });
+
+    mountRoot();
+    await mountApp({
+      schema,
+      dispatcher,
+      locale: createStaticLocaleResolver({ locale: "en" }),
+    });
+
+    await waitFor(() => expect(screen.getByText("Caps")).toBeTruthy());
+    expect(screen.queryByText("cap-counter:nav.cap-list")).toBeNull();
+  });
+
+  test("clientFeatures.translations still overrides schema.translations for the same key (precedence)", async () => {
+    // App-Override muss auch gegen ein framework-eigenes Label gewinnen —
+    // sonst kann eine App ein bundled-feature-Label nicht mehr anpassen,
+    // sobald #1059 dessen r.translations automatisch mitliefert.
+    const dashboardScreen: DashboardScreenDefinition = {
+      id: "overview",
+      type: "dashboard",
+      panels: [
+        {
+          kind: "stat",
+          id: "cap-list",
+          label: "cap-counter:nav.cap-list",
+          query: "cap-counter:query:stat",
+          valueField: "value",
+        },
+      ],
+    };
+    const schema: FeatureSchema = {
+      featureName: "cap-counter",
+      entities: {},
+      screens: [dashboardScreen],
+      translations: {
+        "cap-counter:nav.cap-list": { de: "Limits", en: "Caps" },
+      },
+    };
+    const dispatcher = createMockDispatcher({
+      query: (async () => ({
+        isSuccess: true,
+        data: { value: "3" },
+      })) as unknown as Dispatcher["query"],
+    });
+    const override: ClientFeatureDefinition = {
+      name: "cap-counter-app-override",
+      translations: {
+        en: { "cap-counter:nav.cap-list": "Quota" },
+      },
+    };
+
+    mountRoot();
+    await mountApp({
+      schema,
+      dispatcher,
+      clientFeatures: [override],
+      locale: createStaticLocaleResolver({ locale: "en" }),
+    });
+
+    await waitFor(() => expect(screen.getByText("Quota")).toBeTruthy());
+    expect(screen.queryByText("Caps")).toBeNull();
+  });
+
   test("navAdapter override: eigener Router steuert den aktiven Screen", async () => {
     // Beweist den Nav-Seam: der Default-Adapter liest location.pathname,
     // dieser Memory-Adapter hardcoded die Route. Wenn swap funktioniert,

package/src/app/create-app.tsx

@@ -20,13 +20,16 @@ import {
   kumikoDefaultTranslations,
   LiveEventsProvider,
   LocaleProvider,
+  mergeTranslations,
   type NavApi,
   NavProvider,
   PrimitivesProvider,
   type PrimitivesRegistry,
   qualifyScreenId,
   TokensProvider,
+  type TranslationsByLocale,
   toAppSchema,
+  translationsByLocaleFromKeys,
   useNav,
 } from "@cosmicdrift/kumiko-renderer";
 import { type ComponentType, type ReactNode, useMemo } from "react";
@@ -177,12 +180,24 @@ export function createKumikoApp(options: CreateKumikoAppOptions = {}): { readonl
   const clientFeatures = options.clientFeatures ?? [];
   const providers = clientFeatures.flatMap((f) => f.providers ?? []);
   const gates = clientFeatures.flatMap((f) => f.gates ?? []);
-  // Framework-Default-Bundle als ALLERLETZTER Fallback — App-Resolver +
-  // clientFeatures.translations haben Vorrang. Apps können einzelne
-  // kumiko.*-Keys via clientFeatures.translations überschreiben (z.B.
-  // "kumiko.actions.save" → "Sichern" für ein bestimmtes Feature).
+  // Precedence in fallbackBundles (Array-Order = Priorität, höchste zuerst):
+  //   1. clientFeatures.translations — App-Overrides gewinnen immer, auch
+  //      gegen framework-eigene Labels.
+  //   2. schemaTranslations — server-authored r.translations, von
+  //      buildAppSchema verbatim projiziert (#1059). Ohne dieses Bundle
+  //      resolven Nav-/Screen-Labels nur, wenn eine App sie ZUSÄTZLICH in
+  //      web/i18n.ts dupliziert — die meisten bundled-features taten das
+  //      nie, Labels rendern dann als rohe i18n-Keys.
+  //   3. kumikoDefaultTranslations — Framework-Defaults, ALLERLETZTER
+  //      Fallback.
+  const schemaTranslations = app.features.reduce<TranslationsByLocale>(
+    (acc, f) =>
+      f.translations ? mergeTranslations(acc, translationsByLocaleFromKeys(f.translations)) : acc,
+    {},
+  );
   const fallbackBundles = [
     ...clientFeatures.flatMap((f) => (f.translations !== undefined ? [f.translations] : [])),
+    schemaTranslations,
     kumikoDefaultTranslations,
   ];
   // Custom-Screen-Components-Map mergen: spätere Features überschreiben