Merge branch 'main' into claude/issue-11101-lazy-spec-validation

Author: huangyiirene

.changeset/10867-app-wizard-saves-spec-app.md

@@ -8,11 +8,11 @@
 
 fix(types,plugin-designer)!: the Studio app wizard saves a document the platform accepts, and an edit keeps the stored `accentColor` (objectui#10867)
 
-⚠️ **BREAKING (authoring)**, marked `minor` under this repository's version-alignment rule (a `major` in the fixed group would move all of it off the `@objectstack` major). Two published `@object-ui/types` members narrow: a navigation separator no longer takes a `label`, and `AppWizardDraft.layout` is removed. A TypeScript literal that writes either no longer compiles. `NavigationItem` is now a union type alias, not an interface. So code that reads `label` off an unnarrowed `NavigationItem` into a `string` slot (its type is now `string | undefined`) also stops compiling, as does code that spreads an entry-only key onto one, and an `interface` that `extends NavigationItem` or augments it (extend `NavigationEntryItem` instead). `objectui validate` now refuses a separator `label` too: the zod mirror's `NavigationItemSchema` refuses every key on a separator that the spec's separator does not declare. The four `appDesigner` layout keys also leave the published `@object-ui/i18n` packs and `DESIGNER_DEFAULT_TRANSLATIONS`, so an application that calls `t()` with one of them now renders the raw key (unless the call passes a `defaultValue`).
+⚠️ **BREAKING (authoring)**, marked `minor` under this repository's version-alignment rule (a `major` in the fixed group would move all of it off the `@objectstack` major). Two published `@object-ui/types` members narrow: a navigation separator no longer takes a `label`, and `AppWizardDraft.layout` is removed. A TypeScript literal that writes either no longer compiles. `NavigationItem` is now a union type alias, not an interface. So code that reads `label` off an unnarrowed `NavigationItem` into a `string` slot (its type is now `string | undefined`; objectui#11299, in the same release, widens it to the spec's `I18nLabel` or `undefined`, see `.changeset/11299-types-nav-label-locale-map.md`) also stops compiling, as does code that spreads an entry-only key onto one, and an `interface` that `extends NavigationItem` or augments it (extend `NavigationEntryItem` instead). `objectui validate` now refuses a separator `label` too: the zod mirror's `NavigationItemSchema` refuses every key on a separator that the spec's separator does not declare. The four `appDesigner` layout keys also leave the published `@object-ui/i18n` packs and `DESIGNER_DEFAULT_TRANSLATIONS`, so an application that calls `t()` with one of them now renders the raw key (unless the call passes a `defaultValue`).
 
 **Clause-②: yes (narrowing)** — the separator arm of `NavigationItem` loses `label`, and `AppWizardDraft` loses `layout`.
 
-- **A separator carries only `type`, `id` and `order`.** `@objectstack/spec`'s separator branch declares exactly those keys, and its `AppSchema` refuses anything else. `NavigationItem` required a `label` on every item, so the wizard's "Add separator" wrote `{ id, type: 'separator', label: '' }`, and the console's create-app and edit-app saves were refused with `422 INVALID_METADATA` (`unrecognized_keys` `['label']` at `navigation.N`). `NavigationItem` is now a union of two arms, discriminated by `type`. `NavigationEntryItem` holds every other nav type and keeps its required `label`. `NavigationSeparatorItem` admits `type`, `id` and `order`, and every other entry key is `?: never` on it. Both arms are exported. Reading an entry-only key off an unnarrowed item still compiles, but its type now includes `undefined` (a `label` is `string | undefined`), so passing it where a `string` is required does not. Narrow on `item.type === 'separator'` before relying on `label`. `menuItemToNavigationItem` maps a legacy separator to `{ id, type: 'separator' }` and drops its label. `spec-derived-unions.test.ts` no longer pins the separator `label` as a blocker. It asserts, at both spec tiers, that the separator arm admits the spec separator's keys and no others.
+- **A separator carries only `type`, `id` and `order`.** `@objectstack/spec`'s separator branch declares exactly those keys, and its `AppSchema` refuses anything else. `NavigationItem` required a `label` on every item, so the wizard's "Add separator" wrote `{ id, type: 'separator', label: '' }`, and the console's create-app and edit-app saves were refused with `422 INVALID_METADATA` (`unrecognized_keys` `['label']` at `navigation.N`). `NavigationItem` is now a union of two arms, discriminated by `type`. `NavigationEntryItem` holds every other nav type and keeps its required `label`. `NavigationSeparatorItem` admits `type`, `id` and `order`, and every other entry key is `?: never` on it. Both arms are exported. Reading an entry-only key off an unnarrowed item still compiles, but its type now includes `undefined` (a `label` is `string | undefined`; objectui#11299, in the same release, makes it the spec's `I18nLabel` or `undefined`, see `.changeset/11299-types-nav-label-locale-map.md`), so passing it where a `string` is required does not. Narrow on `item.type === 'separator'` before relying on `label`. `menuItemToNavigationItem` maps a legacy separator to `{ id, type: 'separator' }` and drops its label. `spec-derived-unions.test.ts` no longer pins the separator `label` as a blocker. It asserts, at both spec tiers, that the separator arm admits the spec separator's keys and no others.
 - **`@object-ui/plugin-designer`: the wizard and `NavigationDesigner` write a separator as `{ id, type }`.** `NavigationDesigner` no longer writes a `label` onto a new separator, and its label, icon and visibility patchers skip one.
 - **`@object-ui/layout` narrows on the separator arm; nothing it renders changes.** `resolveNavItemLabel` answers `''` for every separator. A stored separator carrying a non-empty `label`, which `menuItemToNavigationItem` produced before this change, used to resolve to that label. No renderer asks it for a separator's label. The mobile bottom nav's leaf list, which already skipped separators, is now typed as entries.
 - **`@object-ui/app-shell` narrows the same way; nothing it renders changes.** `useNavPins` registers a favorite only for an entry and leaves a separator as it is, and the Studio sidebar's navigation walk passes a separator through unchanged.

.changeset/11201-nav-label-verbatim.md

@@ -13,8 +13,11 @@ shows the current, localized label of what the entry opens.
   **To fix such an entry:** clear its label so it inherits the target's localized label, or set the
   text you want shown. Stored navigation is not converted, and no notice is sent.
 - An entry label written as an inline locale map (`{ en: 'Accounts', 'zh-CN': '客户' }`) used to
-  render as empty text. It now renders the map's text. The sidebar is not told the viewer's locale,
-  so it reads the `en` entry, then `default`, then any entry, as it already does for an area label.
+  render as empty text. It now renders the map's text. objectui#11201 did not tell the sidebar the
+  viewer's locale, so it read the `en` entry, then `default`, then any entry; objectui#11299, in the
+  same release, gives the sidebar the viewer's locale (`.changeset/11299-layout-nav-label-locale.md`).
 - `NavigationRenderer`'s `resolveObjectLabel`, `resolveDashboardLabel` and `resolveViewLabel` props,
-  and the matching arguments of `resolveNavItemLabel`, are no longer read. They are still accepted,
-  so no caller breaks. An unlabelled entry's localized text comes from `resolveTargetLabel`.
+  and the matching arguments of `resolveNavItemLabel`, are no longer read. objectui#11201 still
+  accepted them, so no caller broke; objectui#11299, in the same release, removes them
+  (`.changeset/11299-layout-nav-label-locale.md`). An unlabelled entry's localized text comes from
+  `resolveTargetLabel`.

.changeset/11299-app-shell-nav-label-locale.md

@@ -0,0 +1,13 @@
+---
+'@object-ui/app-shell': patch
+---
+
+fix(app-shell): a navigation label written as an inline locale map shows in the viewer's language across the console (objectui#11299)
+
+An app navigation entry whose `label` is an inline locale map
+(`{ en: 'Accounts', 'zh-CN': '客户' }`) showed its `en` text to every viewer. The
+console now passes its active UI language — the one the sidebar already shows area
+labels in — to every surface that names a navigation entry: the sidebar (app and home
+navigation), the `nav:menu` page block, the command palette and the search results
+page. A viewer reading Chinese sees `客户`, and the palette and search match it by that
+text. Plain-string labels and unlabelled entries are unchanged.

.changeset/11299-layout-nav-label-locale.md

@@ -0,0 +1,28 @@
+---
+'@object-ui/layout': minor
+---
+
+feat(layout): a navigation label written as an inline locale map renders in the viewer's locale; three inert resolver props retire (objectui#11299)
+
+**Breaking for a consumer that passes the retired props or calls `resolveNavItemLabel` with six arguments** — a compile error, never a silent change of what renders.
+
+- **New: `NavigationRenderer`'s optional `locale` prop**, and a trailing `locale`
+  argument on `resolveNavItemLabel`. A present entry label written as an inline locale
+  map (`{ en: 'Accounts', 'zh-CN': '客户' }`) renders the entry for that locale, through
+  the spec's own `resolveI18nLabel`; when the map has no entry for it, that resolver's
+  fallback order applies. objectui#11201 rendered such a map's `en` entry for every
+  viewer; pass the viewer's language as `locale` to show theirs. Without `locale` the
+  map still reads its `en` entry. A plain-string label and an absent label are
+  unaffected.
+- **Retired: `NavigationRenderer`'s `resolveObjectLabel`, `resolveDashboardLabel` and
+  `resolveViewLabel` props.** objectui#11201 stopped reading them and kept them as
+  no-ops; they are removed now. Delete them from your `NavigationRenderer` call. An
+  unlabelled entry's localized text comes from `resolveTargetLabel`, as before.
+- **Changed signature: `resolveNavItemLabel(item, t?, targetLabel?, locale?)`.** The
+  2nd, 4th and 5th arguments (the same three resolvers) are gone. A call written
+  `resolveNavItemLabel(item, undefined, t, undefined, undefined, targetLabel)` becomes
+  `resolveNavItemLabel(item, t, targetLabel, locale)`.
+
+Marked `minor`, not `major`: this repository's fixed release group follows the
+`@objectstack` major, so a breaking change of its own is declared `minor` with the
+break spelled out here.

.changeset/11299-plugin-designer-nav-label-call.md

@@ -0,0 +1,16 @@
+---
+'@object-ui/plugin-designer': patch
+---
+
+chore(plugin-designer): follow `@object-ui/layout`'s and `@object-ui/types`' navigation label changes (objectui#11299)
+
+- `@object-ui/layout` removed the three unused resolver arguments of
+  `resolveNavItemLabel`, so the app creation wizard's preview of an unlabelled
+  navigation entry now calls it as `resolveNavItemLabel(item, undefined, targetLabel)`.
+- `@object-ui/types` now types a navigation entry's `label` as the spec's `I18nLabel`
+  (a string or an inline locale map), so the navigation designer's inline rename reads
+  the label through a helper that takes both: a string, and objectui's keyed
+  reference, start the draft as before, and an inline locale map starts it empty, as it
+  already did.
+
+What either component shows is unchanged.

.changeset/11299-types-nav-label-locale-map.md

@@ -0,0 +1,23 @@
+---
+'@object-ui/types': minor
+---
+
+fix(types): a navigation entry's `label` accepts an inline locale map, as the spec does (objectui#11299)
+
+`@objectstack/spec` declares a navigation entry's `label` as `I18nLabel`: a plain
+string, or an inline locale map such as `{ en: 'Accounts', 'zh-CN': '客户' }`. The
+platform's save door accepts the map, but `objectui validate` refused it with
+"expected string, received object", because this package declared the label as a
+string.
+
+- `NavigationItemSchema` now takes the spec's `I18nLabelSchema` by reference for an
+  entry's `label`, so `objectui validate` and the platform judge a nav label alike:
+  a map the spec accepts passes, and a map the spec refuses (a keyed
+  `{ key, defaultValue }` reference, a non-string entry, a key that is not a locale
+  tag) is refused here too.
+- `NavigationEntryItem.label` is typed as the spec's `I18nLabel`. Code that reads
+  `item.label` directly now sees `string | InlineLocaleMap`; resolve it through
+  `resolveNavItemLabel` from `@object-ui/layout` (which also handles an absent
+  label) rather than treating it as a string.
+- An empty string label is still refused, as before: omit the key to inherit the
+  target's label.

.changeset/11330-runner-retired-version-footer.md

@@ -0,0 +1,16 @@
+---
+'@object-ui/runner': patch
+---
+
+fix(runner): the sidebar no longer reads the app's retired `version` key
+
+`version` is a retired key on `@objectstack/spec`'s app schema: the spec
+refuses any value there at parse, so no valid app document carries one. The
+runner's sidebar still drew a "vVERSION" footer from it, a read that could only
+ever render nothing on valid metadata. It is removed.
+
+The read also stopped compiling against objectstack `main`, where a retired
+key's TypeScript type became a branded `[REMOVED]` mark instead of `undefined`,
+and a mark is not something React can render. Removing it is part of what turns
+the `Spec Main Shape Gate` green again, without moving the `@objectstack/spec`
+pin (objectui#11330).

packages/app-shell/src/chrome/CommandPalette.navLabelInherits-9868.test.tsx

@@ -27,13 +27,19 @@
  *  - a label-less dashboard and a label-less view entry show their targets'
  *    CURRENT metadata labels, and a rename shows on the next render;
  *  - CONTROL: an authored label renders verbatim.
+ *
+ * objectui#11299: an entry label written as an inline locale map is shown — and
+ * searched — in the viewer's language, the `useObjectTranslation().language`
+ * the palette hands `resolveNavItemLabel` as its `locale`, under a real
+ * `I18nProvider` in that language.
  */
 
 import * as React from 'react';
 import { describe, it, expect, vi, afterEach } from 'vitest';
 import { render, cleanup } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { MetadataCtx } from '@object-ui/react';
+import { createI18n, I18nProvider } from '@object-ui/i18n';
 
 vi.mock('@object-ui/auth', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
@@ -53,6 +59,8 @@ const APP = {
     { id: 'nav_board', type: 'object', objectName: 'customer', viewName: 'board' },
     // Control: an authored label.
     { id: 'nav_home', type: 'page', pageName: 'home', label: 'Team Home' },
+    // objectui#11299: a present label written as an inline locale map.
+    { id: 'nav_contacts', type: 'object', objectName: 'contact', label: { en: 'Contacts', 'zh-CN': '联系人' } },
   ],
 };
 
@@ -135,3 +143,26 @@ describe('objectui#9868 — the ⌘K palette names a label-less nav entry like t
     expect(home?.value.toLowerCase()).toContain('team home');
   });
 });
+
+describe('objectui#11299 — the ⌘K palette names a map-labelled entry in the viewer’s language', () => {
+  const inLanguage = (language: string) => (
+    <I18nProvider instance={createI18n({ defaultLanguage: language, detectBrowserLanguage: false })} persistLanguage={false}>
+      {tree(metadata('Board', 'Sales Overview'))}
+    </I18nProvider>
+  );
+
+  it('under zh-CN the row shows, and is searched by, its zh-CN text', () => {
+    render(inLanguage('zh-CN'));
+    if (!document.querySelector('[cmdk-input]')) throw new Error('the palette did not open');
+    const contacts = rows('object').find((r) => r.value.includes('contact'));
+    expect(contacts?.text).toBe('联系人');
+    expect(contacts?.value).toContain('联系人');
+    expect(contacts?.value).not.toContain('Contacts');
+  });
+
+  it('under en the same row shows its en text', () => {
+    render(inLanguage('en'));
+    if (!document.querySelector('[cmdk-input]')) throw new Error('the palette did not open');
+    expect(rows('object').find((r) => r.value.includes('contact'))?.text).toBe('Contacts');
+  });
+});

packages/app-shell/src/chrome/CommandPalette.tsx

@@ -60,14 +60,15 @@ export function CommandPalette({ apps, activeApp, objects, onAppChange, dataSour
   const { appName } = useParams();
   const { setTheme } = useTheme();
   const { evaluator } = useExpressionContext();
-  const { t } = useObjectTranslation();
+  const { t, language } = useObjectTranslation();
   // A nav entry's text, the way the sidebar and `nav:menu` name it: an entry
   // with NO `label` shows its target's current label, else its target's machine
   // name (objectui#9868 — `NavigationSyncEffect` writes such entries). A present
-  // label resolves exactly as `resolveKeyedI18nLabel(item.label, t)` did here.
+  // label renders as authored — an inline locale map in the viewer's `language`,
+  // the locale the sidebar passes (objectui#11299).
   const targetLabel = useNavTargetLabel();
   const navLabel = (item: NavigationItem) =>
-    resolveNavItemLabel(item, undefined, t, undefined, undefined, targetLabel);
+    resolveNavItemLabel(item, t, targetLabel, language);
 
   // The ⌘K / Ctrl+K accelerator and the open-state source of truth now live in
   // CommandPaletteProvider so the keyboard shortcut, the header button, and the

packages/app-shell/src/hooks/__tests__/useNavigationSync.standardEntryLocalizes-11201.test.tsx

@@ -20,8 +20,8 @@
  *   1. the writer — `NavigationSyncEffect`, the console's one caller of the
  *      sync — stores the new dashboard's entry with NO `label` key;
  *   2. that STORED entry, handed to the sidebar's `NavigationRenderer` wired as
- *      `UnifiedSidebar` wires it (the convention resolvers from
- *      `useObjectLabel` plus `useNavTargetLabel`), under a real `I18nProvider`
+ *      `UnifiedSidebar` wires it (`useNavTargetLabel` plus the active
+ *      `language` as `locale`, objectui#11299), under a real `I18nProvider`
  *      carrying the app's zh-CN translation bundle the way the console loads
  *      it, shows the dashboard's label in each language.
  *
@@ -47,7 +47,7 @@ import {
   I18nProvider,
   isSpecTranslationData,
   transformSpecTranslations,
-  useObjectLabel,
+  useObjectTranslation,
 } from '@object-ui/i18n';
 import { NavigationSyncEffect } from '../useNavigationSync';
 import { useNavTargetLabel } from '../useNavTargetLabel';
@@ -126,18 +126,16 @@ function i18nIn(language: string) {
 
 /** The sidebar surface, wired the way `UnifiedSidebar` wires `NavigationRenderer`. */
 function Sidebar({ items }: { items: NavigationItem[] }) {
-  const { objectLabel, dashboardLabel, viewLabel } = useObjectLabel();
+  const { language } = useObjectTranslation();
   const resolveTargetLabel = useNavTargetLabel();
   return (
     <SidebarProvider defaultOpen>
       <nav aria-label="Sidebar">
         <NavigationRenderer
           items={items}
           basePath="/apps/crm"
-          resolveObjectLabel={(objectName, fallback) => objectLabel({ name: objectName, label: fallback })}
-          resolveDashboardLabel={(dashboardName, fallback) => dashboardLabel({ name: dashboardName, label: fallback })}
-          resolveViewLabel={(objectName, viewName, fallback) => viewLabel(objectName, viewName, fallback)}
           resolveTargetLabel={resolveTargetLabel}
+          locale={language}
         />
       </nav>
     </SidebarProvider>