@cosmicdrift/kumiko-renderer-web 0.157.2 → 0.158.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-renderer-web",
-  "version": "0.157.2",
+  "version": "0.158.2",
   "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.157.2",
-    "@cosmicdrift/kumiko-headless": "0.157.2",
-    "@cosmicdrift/kumiko-renderer": "0.157.2",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.158.2",
+    "@cosmicdrift/kumiko-headless": "0.158.2",
+    "@cosmicdrift/kumiko-renderer": "0.158.2",
     "@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

@@ -61,6 +61,7 @@ const baseSchema: FeatureSchema = {
   featureName: "tasks",
   entities: { task: taskEntity },
   screens: [editScreen, listScreen],
+  navs: [{ id: "task-edit", label: "tasks:nav.task-edit", screen: "tasks:screen:task-edit" }],
 };
 
 // createKumikoApp ruft createRoot(...).render(...) direkt auf — React 18+
@@ -181,6 +182,7 @@ describe("createKumikoApp", () => {
       featureName: "tasks",
       entities: { task: taskEntity },
       screens: [{ ...listScreen, access: { openToAll: true } }],
+      navs: [{ id: "task-list", label: "tasks:nav.task-list", screen: "tasks:screen:task-list" }],
     };
     const schema: AppSchema = { features: [restrictedFeature, openFeature] };
     await mountApp({ schema, dispatcher: makeDispatcher() });
@@ -230,6 +232,9 @@ describe("createKumikoApp", () => {
           columns: [{ field: "color", renderer: { react: { __component: "Swatch" } } }],
         },
       ],
+      navs: [
+        { id: "color-list", label: "tasks:nav.color-list", screen: "tasks:screen:color-list" },
+      ],
     };
 
     mountRoot();
@@ -283,6 +288,9 @@ describe("createKumikoApp", () => {
       featureName: "tasks",
       entities: { task: colorEntity },
       screens: [colorListScreen],
+      navs: [
+        { id: "color-list", label: "tasks:nav.color-list", screen: "tasks:screen:color-list" },
+      ],
     };
     const dispatcher = createMockDispatcher({
       query: (async () => ({
@@ -328,6 +336,13 @@ describe("createKumikoApp", () => {
       featureName: "cap-counter",
       entities: {},
       screens: [dashboardScreen],
+      navs: [
+        {
+          id: "overview",
+          label: "cap-counter:nav.cap-list",
+          screen: "cap-counter:screen:overview",
+        },
+      ],
       translations: {
         "cap-counter:nav.cap-list": { de: "Limits", en: "Caps" },
       },
@@ -371,6 +386,13 @@ describe("createKumikoApp", () => {
       featureName: "cap-counter",
       entities: {},
       screens: [dashboardScreen],
+      navs: [
+        {
+          id: "overview",
+          label: "cap-counter:nav.cap-list",
+          screen: "cap-counter:screen:overview",
+        },
+      ],
       translations: {
         "cap-counter:nav.cap-list": { de: "Limits", en: "Caps" },
       },

package/src/app/__tests__/first-open-screen-qn.test.ts

@@ -0,0 +1,66 @@
+import { describe, expect, test } from "bun:test";
+import type { CustomScreenDefinition } from "@cosmicdrift/kumiko-framework/ui-types";
+import type { FeatureSchema } from "@cosmicdrift/kumiko-renderer";
+import { firstOpenScreenQn } from "../create-app";
+
+function feature(
+  overrides: Partial<FeatureSchema> & { readonly featureName: string },
+): FeatureSchema {
+  return { entities: {}, screens: [], ...overrides };
+}
+
+function customScreen(
+  overrides: Partial<CustomScreenDefinition> & { readonly id: string },
+): CustomScreenDefinition {
+  return { type: "custom", renderer: {}, ...overrides };
+}
+
+describe("firstOpenScreenQn", () => {
+  test("picks an open screen that is placed in nav", () => {
+    const features: readonly FeatureSchema[] = [
+      feature({
+        featureName: "shop",
+        screens: [customScreen({ id: "catalog" })],
+        navs: [{ id: "catalog", label: "shop:nav.catalog", screen: "shop:screen:catalog" }],
+      }),
+    ];
+    expect(firstOpenScreenQn(features)).toBe("shop:screen:catalog");
+  });
+
+  test("skips a dormant open screen that has no nav entry (#1258)", () => {
+    const features: readonly FeatureSchema[] = [
+      feature({
+        featureName: "auth-mfa",
+        screens: [customScreen({ id: "auth-mfa-enable", access: { openToAll: true } })],
+        // No nav entry — this is auth-mfa's dormant custom-screen convention.
+      }),
+      feature({
+        featureName: "shop",
+        screens: [customScreen({ id: "catalog" })],
+        navs: [{ id: "catalog", label: "shop:nav.catalog", screen: "shop:screen:catalog" }],
+      }),
+    ];
+    expect(firstOpenScreenQn(features)).toBe("shop:screen:catalog");
+  });
+
+  test("skips role-restricted screens even when placed in nav", () => {
+    const features: readonly FeatureSchema[] = [
+      feature({
+        featureName: "admin",
+        screens: [customScreen({ id: "dashboard", access: { roles: ["Admin"] } })],
+        navs: [{ id: "dashboard", label: "admin:nav.dashboard", screen: "admin:screen:dashboard" }],
+      }),
+    ];
+    expect(firstOpenScreenQn(features)).toBeUndefined();
+  });
+
+  test("returns undefined when no screen is both open and nav-placed", () => {
+    const features: readonly FeatureSchema[] = [
+      feature({
+        featureName: "auth-mfa",
+        screens: [customScreen({ id: "auth-mfa-enable", access: { openToAll: true } })],
+      }),
+    ];
+    expect(firstOpenScreenQn(features)).toBeUndefined();
+  });
+});

package/src/app/create-app.tsx

@@ -135,10 +135,30 @@ function readInjectedSchema(): AppSchema | FeatureSchema | undefined {
 // ein role-restricted Screen (z.B. bundled user/tenant, SystemAdmin-only)
 // darf hier nie gewinnen, sonst landet jeder Nicht-Admin auf einem
 // Access-Denied-Screen (#1176).
-function firstOpenScreenQn(features: readonly FeatureSchema[]): string | undefined {
+// Also requires the screen be reachable via r.nav, otherwise a dormant
+// `type: "custom"` screen a feature only registers for manual app-side
+// placement (e.g. auth-mfa's enable screen) can win by declaration order
+// alone, landing every app without an explicit `screenQn` on a screen
+// nobody wired a component for (#1258).
+export function firstOpenScreenQn(features: readonly FeatureSchema[]): string | undefined {
+  // NavDefinition.screen carries two shapes in practice: most bundled
+  // features author it pre-qualified ("tenant:screen:members"), but the
+  // config settings-hub generator emits the bare short id. Index both
+  // forms so nav-reachability doesn't depend on which convention a given
+  // feature happens to use.
+  const navScreenQns = new Set<string>();
+  for (const f of features) {
+    for (const n of f.navs ?? []) {
+      if (n.screen === undefined) continue;
+      navScreenQns.add(n.screen);
+      navScreenQns.add(qualifyScreenId(f.featureName, n.screen));
+    }
+  }
   for (const feature of features) {
     const openScreen = feature.screens.find(
-      (s) => s.access === undefined || "openToAll" in s.access,
+      (s) =>
+        (s.access === undefined || "openToAll" in s.access) &&
+        navScreenQns.has(qualifyScreenId(feature.featureName, s.id)),
     );
     if (openScreen !== undefined) return qualifyScreenId(feature.featureName, openScreen.id);
   }