chore: update fields

Author: antfu

packages/hub-ui/src/client/components/views/ViewIframe.vue

@@ -252,7 +252,7 @@ onMounted(() => {
   const panelSession = props.context.panel.session
   watchEffect(() => {
     if (props.context.docks.selectedId === props.entry.id)
-      panelSession.route = currentUrl.value
+      panelSession.selectedDockRoute = currentUrl.value
   })
 
   // Listen for iframe load events

packages/hub-ui/src/client/state/context.ts

@@ -83,22 +83,27 @@ export async function createDocksContext(
   // the live session state. Re-applied once the RPC becomes trusted so a reload
   // lands back on the same dock — see the restore effect near the end.
   const restoreIntent = {
-    open: sessionStore.value.open,
-    selectedId: sessionStore.value.selectedId,
-    route: sessionStore.value.route,
+    ...sessionStore.value,
   }
 
-  // `selectedId` is backed by the session store so the current selection both
+  // `selectedDockId` is backed by the session store so the current selection both
   // drives the UI and persists across reloads through one source of truth.
-  const selectedId = computed<string | null>({
-    get: () => sessionStore.value.selectedId,
+  const selectedDockId = computed<string | null>({
+    get: () => sessionStore.value.selectedDockId,
     set: (id) => {
-      sessionStore.value.selectedId = id
+      sessionStore.value.selectedDockId = id
     },
   })
+  const selectedDockRoute = computed<string | null>({
+    get: () => sessionStore.value.selectedDockRoute,
+    set: (route) => {
+      sessionStore.value.selectedDockRoute = route
+    },
+  })
+
   const selected = computed(
-    () => entries.value.find(entry => entry.id === selectedId.value)
-      ?? BUILTIN_ENTRIES.find(entry => entry.id === selectedId.value)
+    () => entries.value.find(entry => entry.id === selectedDockId.value)
+      ?? BUILTIN_ENTRIES.find(entry => entry.id === selectedDockId.value)
       ?? null,
   )
 
@@ -142,8 +147,8 @@ export async function createDocksContext(
         // Clearing the selection when the active member vanishes matches the
         // hub reconcile behavior for a removed selected entry (shared-iframe
         // soft-nav §7.5).
-        if (selectedId.value === entry.id)
-          selectedId.value = null
+        if (selectedDockId.value === entry.id)
+          selectedDockId.value = null
       },
     }
   }
@@ -179,7 +184,7 @@ export async function createDocksContext(
     clientType,
     dockOpen: sessionStore.value.open,
     paletteOpen: commandsContext?.paletteOpen ?? false,
-    dockSelectedId: selectedId.value ?? '',
+    dockSelectedId: selectedDockId.value ?? '',
     popupOpen: isDockPopupOpen.value,
   })
 
@@ -195,13 +200,13 @@ export async function createDocksContext(
 
   const switchEntry = async (id: string | null = null) => {
     if (id == null) {
-      selectedId.value = null
+      selectedDockId.value = null
       sessionStore.value.open = false
-      sessionStore.value.route = null
+      sessionStore.value.selectedDockRoute = null
       return true
     }
     if (id === '~client-auth-notice') {
-      selectedId.value = id
+      selectedDockId.value = id
       sessionStore.value.open = true
       return true
     }
@@ -268,18 +273,18 @@ export async function createDocksContext(
     if (entry.type === 'iframe' && entry.frameId && !entry.subTabs)
       frameNavCurrentMember.set(entry.frameId, entry.id)
 
-    selectedId.value = entry.id
+    selectedDockId.value = entry.id
     sessionStore.value.open = true
     // Only an iframe dock owns an address-bar route; ViewIframe keeps
     // `session.route` current for it. Clear it for anything else so a stale
     // route from a previous iframe isn't persisted against a non-iframe dock.
     if (entry.type !== 'iframe')
-      sessionStore.value.route = null
+      sessionStore.value.selectedDockRoute = null
     return true
   }
 
   const toggleEntry = async (id: string) => {
-    if (selectedId.value === id)
+    if (selectedDockId.value === id)
       return switchEntry(null)
     return switchEntry(id)
   }
@@ -415,7 +420,7 @@ export async function createDocksContext(
       keybindings: [{ key: 'Escape' }],
       action: () => {
         sessionStore.value.open = false
-        selectedId.value = null
+        selectedDockId.value = null
       },
     },
     {
@@ -533,9 +538,9 @@ export async function createDocksContext(
   // One-shot boot route (see `DocksPanelContext.consumeBootRoute`): the persisted
   // address-bar URL is handed back to exactly the iframe dock that was selected
   // before the reload, once.
-  let bootRoute: string | null = restoreIntent.selectedId != null ? restoreIntent.route : null
+  let bootRoute: string | null = restoreIntent.selectedDockId != null ? restoreIntent.selectedDockRoute : null
   const consumeBootRoute = (id: string): string | null => {
-    if (bootRoute != null && id === restoreIntent.selectedId) {
+    if (bootRoute != null && id === restoreIntent.selectedDockId) {
       const route = bootRoute
       bootRoute = null
       return route
@@ -553,7 +558,8 @@ export async function createDocksContext(
       consumeBootRoute,
     },
     docks: {
-      selectedId,
+      selectedId: selectedDockId,
+      selectedRoute: selectedDockRoute,
       selected,
       entries,
       entryToStateMap: markRaw(dockEntryStateMap),
@@ -604,8 +610,8 @@ export async function createDocksContext(
   // open. `switchEntry` reads `session.route` back through `consumeBootRoute`
   // when the restored iframe boots.
   const applyRestore = (): void => {
-    if (restoreIntent.open && restoreIntent.selectedId != null)
-      void switchEntry(restoreIntent.selectedId)
+    if (restoreIntent.open && restoreIntent.selectedDockId != null)
+      void switchEntry(restoreIntent.selectedDockId)
   }
   if (rpc.isTrusted) {
     applyRestore()

packages/hub-ui/src/client/state/docks.ts

@@ -28,7 +28,7 @@ export function DEFAULT_DOCK_SESSION_STORE(): DockSessionStorage {
   return {
     open: false,
     selectedId: null,
-    route: null,
+    selectedDockRoute: null,
   }
 }
 

packages/hub/src/client/docks.ts

@@ -33,13 +33,13 @@ export interface DockSessionStorage {
   /** Whether the dock panel is open. */
   open: boolean
   /** The currently selected dock entry id, or `null` when nothing is open. */
-  selectedId: string | null
+  selectedDockId: string | null
   /**
    * The live address-bar URL of the selected iframe dock, restored as that
    * iframe's boot `src` on the next load so the deep-linked route survives a
    * reload. `null` when the selected dock has no iframe route to remember.
    */
-  route: string | null
+  selectedDockRoute: string | null
 }
 
 export type DockClientType = 'embedded' | 'standalone'
@@ -117,18 +117,19 @@ export interface DocksPanelContext {
   isResizing: boolean
   readonly isVertical: boolean
   /**
-   * Claim the persisted {@link DockSessionStorage.route boot route} for a dock
+   * Claim the persisted {@link DockSessionStorage.selectedDockRoute boot route} for a dock
    * id, once. Returns the saved address-bar URL only for the dock that was
    * selected before the last reload — and only on the first call for it — so a
    * restored iframe boots deep-linked while a later switch to a different dock
-   * (whose live route isn't reflected in {@link DockSessionStorage.route} yet)
+   * (whose live route isn't reflected in {@link DockSessionStorage.selectedDockRoute} yet)
    * doesn't reuse the stale value. Returns `null` otherwise.
    */
   consumeBootRoute?: (id: string) => string | null
 }
 
 export interface DocksEntriesContext {
   selectedId: string | null
+  selectedRoute: string | null
   readonly selected: DevframeDockEntry | null
   entries: DevframeDockEntry[]
   entryToStateMap: Map<string, DockEntryState>

packages/hub/src/client/host.ts

@@ -332,7 +332,7 @@ export async function createDevframeClientHost(
     docks.groupedEntries = groupByCategory(entries, categoryOrder)
     if (selectedId && !entryToStateMap.has(selectedId)) {
       selectedId = null
-      panel.session.selectedId = null
+      panel.session.selectedDockId = null
     }
   }
 
@@ -397,7 +397,7 @@ export async function createDevframeClientHost(
     selectedId = next
     // Mirror onto the session context so a persisting host and the when-clause
     // context see the current selection.
-    panel.session.selectedId = next
+    panel.session.selectedDockId = next
     if (previous)
       entryToStateMap.get(previous)?.events.emit('entry:deactivated')
     if (next)
@@ -526,8 +526,8 @@ function createPanelContext(clientType: DockClientType): DocksPanelContext {
   const session: DocksPanelContext['session'] = {
     // A standalone runtime owns the page, so its "panel" is always open.
     open: clientType === 'standalone',
-    selectedId: null,
-    route: null,
+    selectedDockId: null,
+    selectedDockRoute: null,
   }
   return {
     store,

tests/__snapshots__/tsnapi/devframe/constants.snapshot.d.ts

@@ -13,6 +13,7 @@ export declare const DEVFRAME_CONNECTION_META_FILENAME: string;
 export declare const DEVFRAME_DOCK_IMPORTS_FILENAME: string;
 export declare const DEVFRAME_MCP_ROUTE: string;
 export declare const DEVFRAME_OTP_URL_PARAM: string;
+export declare const DEVFRAME_REMOTE_ASSETS_ERROR_MESSAGE_TYPE: string;
 export declare const DEVFRAME_RPC_DUMP_DIRNAME: string;
 export declare const DEVFRAME_RPC_DUMP_MANIFEST_FILENAME: string;
 export declare const DEVFRAME_SSE_ROUTE: string;

tests/__snapshots__/tsnapi/devframe/constants.snapshot.js

@@ -13,6 +13,7 @@ export var DEVFRAME_CONNECTION_META_FILENAME /* const */
 export var DEVFRAME_DOCK_IMPORTS_FILENAME /* const */
 export var DEVFRAME_MCP_ROUTE /* const */
 export var DEVFRAME_OTP_URL_PARAM /* const */
+export var DEVFRAME_REMOTE_ASSETS_ERROR_MESSAGE_TYPE /* const */
 export var DEVFRAME_RPC_DUMP_DIRNAME /* const */
 export var DEVFRAME_RPC_DUMP_MANIFEST_FILENAME /* const */
 export var DEVFRAME_SSE_ROUTE /* const */

tests/__snapshots__/tsnapi/devframe/index.snapshot.d.ts

@@ -356,10 +356,16 @@ export interface RemoteAssets {
   version: string;
   path?: string;
   provider?: RemoteAssetsProvider;
-  resolveFrom?: string;
+  resolveFrom?: string | null;
   fetch?: typeof globalThis.fetch;
   offline?: boolean;
 }
+export interface RemoteAssetsErrorMessage {
+  type: 'devframe:remote-assets-error';
+  package: string;
+  version: string;
+  reason: string;
+}
 export interface RemoteAssetsProviderCustom {
   fileUrl: (_: string, _: string, _: string) => string;
   listFiles?: (_: string, _: string, _: typeof globalThis.fetch) => Promise<string[]>;

tests/__snapshots__/tsnapi/devframe/types.snapshot.d.ts

@@ -56,6 +56,7 @@ export { EventsMap }
 export { EventUnsubscribe }
 export { McpRouteOptions }
 export { RemoteAssets }
+export { RemoteAssetsErrorMessage }
 export { RemoteAssetsProvider }
 export { RemoteAssetsProviderCustom }
 export { RemoteAssetsStore }