Merge branch 'main' into fix/windows-pty-cmd-shims

Author: antfu

docs/content/1.guide/7.scoped-context.md

@@ -49,7 +49,7 @@ Bare names stay typed: `call('get-modules')` resolves to your [RPC registry](/gu
 
 `my.settings` is a persisted key-value store (alongside `my.rpc`), with two scopes:
 
-- **`project`**: per-checkout values, under the `workspace` storage dir.
+- **`project`**: per-checkout values, under the `project` storage dir.
 - **`global`**: per-user values, under the `global` storage dir.
 
 Both are file-backed and synced to the browser over the shared-state protocol; a `set` propagates to peers, surviving restarts.

packages/devframe/src/types/scope.ts

@@ -82,8 +82,8 @@ export interface DevframeSettingsStore<T extends Record<string, any> = Record<st
 /**
  * The two settings scopes available on a scoped context.
  *
- *   - `project`: per-workspace state, persisted under the host's
- *     `workspace` storage dir. Project-local settings.
+ *   - `project`: per-checkout state, persisted under the
+ *     `project` storage dir. Project-local settings.
  *   - `global`:  per-user state, persisted under the host's `global`
  *     storage dir. Machine-wide preferences.
  */

packages/hub-ui/src/client/state/keybindings.test.ts

@@ -1,7 +1,7 @@
 import type { DevframeCommandEntry, DevframeCommandKeybinding } from '@devframes/hub'
 import type { WhenContext } from 'devframe/utils/when'
 import { describe, expect, it } from 'vitest'
-import { collectAllKeybindings, filterCommandsByWhen, findCommandDeep, findKeybindingConflict, getShortcutRows, walkCommands } from './keybindings'
+import { collectAllKeybindings, filterCommandsByWhen, findCommandDeep, findKeybindingConflict, getShortcutRows, normalizeKeyEvent, walkCommands } from './keybindings'
 
 describe('findKeybindingConflict', () => {
   const commands: DevframeCommandEntry[] = [
@@ -259,3 +259,17 @@ describe('filterCommandsByWhen', () => {
     expect(filterCommandsByWhen(withWhen, whenContext)).toEqual([])
   })
 })
+
+describe('normalizeKeyEvent', () => {
+  // Chrome's native autofill dispatches `keydown` events without `key`
+  it('ignores key events without a key, like Chrome autofill', () => {
+    const event = { ctrlKey: false, metaKey: false, altKey: false, shiftKey: false } as KeyboardEvent
+    expect(() => normalizeKeyEvent(event)).not.toThrow()
+    expect(normalizeKeyEvent(event)).toBe('')
+  })
+
+  it('normalizes a regular shortcut', () => {
+    const event = { key: 'k', ctrlKey: false, metaKey: false, altKey: false, shiftKey: true } as KeyboardEvent
+    expect(normalizeKeyEvent(event)).toBe('Shift+K')
+  })
+})

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

@@ -30,7 +30,7 @@ export function normalizeKeyEvent(e: KeyboardEvent): string {
     parts.push('Shift')
 
   // Normalize key name
-  let key = e.key
+  let key = e.key ?? ''
   if (key.length === 1)
     key = key.toUpperCase()