@workbench-kit/shell-react 0.0.2-prototype.0.2.6 → 0.0.2-prototype.0.2.8

package/src/{workbench-command-palette.ts → workbench/command-palette.ts}

@@ -1,208 +1,208 @@
-import type { CommandDefinition } from '@workbench-kit/platform';
-import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
-import type {
-  WorkbenchShellCommandActivity,
-  WorkbenchShellCommandContext,
-} from '@workbench-kit/react/workbench';
-import type { ExtensionCommandFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
-
-export const WORKBENCH_COMMAND_PALETTE_SHORTCUT = 'Ctrl+Shift+P';
-export const WORKBENCH_QUICK_ACCESS_SHORTCUT = 'Ctrl+P';
-
-type ExtensionCommand = ReturnType<ExtensionRegistry['commands']['getCommands']>[number];
-
-function resolveCommandValue<TContext, TValue>(
-  value: CommandDefinition<TContext>[keyof CommandDefinition<TContext>],
-  context: TContext,
-): TValue | undefined {
-  if (value === undefined) {
-    return undefined;
-  }
-
-  if (typeof value === 'function') {
-    return (value as (ctx: TContext) => TValue)(context);
-  }
-
-  return value as TValue;
-}
-
-export function formatWorkbenchCommandIcon(icon: string | undefined): string | undefined {
-  if (!icon) {
-    return undefined;
-  }
-
-  return icon.startsWith('codicon-') ? icon : `codicon-${icon}`;
-}
-
-export function resolveExtensionCommandIcon(icon: ExtensionCommand['icon']): string | undefined {
-  if (typeof icon === 'function') {
-    return formatWorkbenchCommandIcon(icon(undefined as void));
-  }
-
-  return formatWorkbenchCommandIcon(icon);
-}
-
-export function resolveShellCommandActivities(
-  extensionRegistry: ExtensionRegistry,
-): WorkbenchShellCommandActivity[] {
-  const activities = extensionRegistry.activities.getActivities();
-  if (activities.length > 0) {
-    return activities
-      .map((activity) => ({
-        icon: formatWorkbenchCommandIcon(activity.icon),
-        id: activity.viewContainerId,
-        label: `Show ${activity.title}`,
-      }))
-      .sort((left, right) => left.label.localeCompare(right.label));
-  }
-
-  const viewContainerIds = new Set(
-    extensionRegistry.views.getViews().map((view) => view.containerId),
-  );
-
-  return [...viewContainerIds].map((containerId) => {
-    const container = extensionRegistry.views.getViewContainer(containerId);
-    const firstView = extensionRegistry.views.getViews(containerId)[0];
-
-    return {
-      icon: formatWorkbenchCommandIcon(container?.icon ?? 'files'),
-      id: containerId,
-      label: `Show ${container?.title ?? firstView?.name ?? containerId}`,
-    };
-  });
-}
-
-export function shellCommandDefinitionToDescriptor<TContext>(
-  command: CommandDefinition<TContext>,
-  context: TContext,
-): WorkbenchCommandDescriptor {
-  const label =
-    resolveCommandValue<TContext, string>(command.label, context) ?? command.title ?? command.id;
-  const disabled = command.isEnabled ? !command.isEnabled(context) : false;
-
-  return {
-    category: command.category ?? 'View',
-    icon: formatWorkbenchCommandIcon(resolveCommandValue(command.icon, context)),
-    id: command.id,
-    label,
-    shortcut: resolveCommandValue(command.shortcut, context),
-    disabled,
-  };
-}
-
-export function extensionCommandToDescriptor(
-  command: ExtensionCommand,
-  feature?: ExtensionCommandFeatureSpec | undefined,
-): WorkbenchCommandDescriptor {
-  const metadata = {
-    argsSchema: feature?.argsSchema,
-    chat: feature?.chat,
-    requiresApproval: feature?.requiresApproval,
-  };
-
-  return {
-    category: command.category ?? feature?.category,
-    danger: feature?.danger,
-    description: feature?.description,
-    icon: resolveExtensionCommandIcon(command.icon),
-    id: command.id,
-    keywords: feature
-      ? [feature.command, feature.title].filter((value) => value !== command.id)
-      : undefined,
-    label: command.title ?? feature?.title ?? command.id,
-    metadata:
-      metadata.argsSchema || metadata.chat || metadata.requiresApproval !== undefined
-        ? metadata
-        : undefined,
-  };
-}
-
-export function collectExtensionCommandFeaturesById(
-  extensionRegistry: ExtensionRegistry,
-): ReadonlyMap<string, ExtensionCommandFeatureSpec> {
-  return new Map(
-    extensionRegistry
-      .getFeatureSpecs()
-      .flatMap((feature) => feature.commands.map((command) => [command.id, command] as const)),
-  );
-}
-
-export function mergeWorkbenchCommandDescriptors(
-  ...groups: readonly WorkbenchCommandDescriptor[][]
-): WorkbenchCommandDescriptor[] {
-  const seen = new Set<string>();
-
-  return groups.flat().filter((command) => {
-    if (seen.has(command.id)) {
-      return false;
-    }
-
-    seen.add(command.id);
-    return true;
-  });
-}
-
-export function buildWorkbenchPaletteCommands({
-  additionalCommands = [],
-  extensionCommandFeaturesById,
-  extensionCommands,
-  shellCommands,
-  shellContext,
-}: {
-  additionalCommands?: readonly WorkbenchCommandDescriptor[];
-  extensionCommandFeaturesById?: ReadonlyMap<string, ExtensionCommandFeatureSpec> | undefined;
-  extensionCommands: readonly ExtensionCommand[];
-  shellCommands: readonly CommandDefinition<WorkbenchShellCommandContext>[];
-  shellContext: WorkbenchShellCommandContext;
-}): WorkbenchCommandDescriptor[] {
-  const shellDescriptors = shellCommands.map((command) =>
-    shellCommandDefinitionToDescriptor(command, shellContext),
-  );
-  const contributedDescriptors = extensionCommands.map((command) =>
-    extensionCommandToDescriptor(command, extensionCommandFeaturesById?.get(command.id)),
-  );
-
-  return mergeWorkbenchCommandDescriptors(shellDescriptors, contributedDescriptors, [
-    ...additionalCommands,
-  ]);
-}
-
-export function matchesWorkbenchCommandPaletteShortcut(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-) {
-  const key = event.key.toLowerCase();
-
-  if (key !== 'p') {
-    return false;
-  }
-
-  if (!(event.ctrlKey || event.metaKey) || !event.shiftKey || event.altKey) {
-    return false;
-  }
-
-  return true;
-}
-
-export function matchesWorkbenchQuickAccessShortcut(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-) {
-  const key = event.key.toLowerCase();
-
-  if (key !== 'p') {
-    return false;
-  }
-
-  if (!(event.ctrlKey || event.metaKey) || event.shiftKey || event.altKey) {
-    return false;
-  }
-
-  return true;
-}
-
-export function getWorkbenchCommandPaletteShortcutLabel() {
-  return WORKBENCH_COMMAND_PALETTE_SHORTCUT;
-}
-
-export function getWorkbenchQuickAccessShortcutLabel() {
-  return WORKBENCH_QUICK_ACCESS_SHORTCUT;
-}
+import type { CommandDefinition } from '@workbench-kit/platform';
+import type { WorkbenchCommandDescriptor } from '@workbench-kit/react/workbench';
+import type {
+  WorkbenchShellCommandActivity,
+  WorkbenchShellCommandContext,
+} from '@workbench-kit/react/workbench';
+import type { ExtensionCommandFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
+
+export const WORKBENCH_COMMAND_PALETTE_SHORTCUT = 'Ctrl+Shift+P';
+export const WORKBENCH_QUICK_ACCESS_SHORTCUT = 'Ctrl+P';
+
+type ExtensionCommand = ReturnType<ExtensionRegistry['commands']['getCommands']>[number];
+
+function resolveCommandValue<TContext, TValue>(
+  value: CommandDefinition<TContext>[keyof CommandDefinition<TContext>],
+  context: TContext,
+): TValue | undefined {
+  if (value === undefined) {
+    return undefined;
+  }
+
+  if (typeof value === 'function') {
+    return (value as (ctx: TContext) => TValue)(context);
+  }
+
+  return value as TValue;
+}
+
+export function formatWorkbenchCommandIcon(icon: string | undefined): string | undefined {
+  if (!icon) {
+    return undefined;
+  }
+
+  return icon.startsWith('codicon-') ? icon : `codicon-${icon}`;
+}
+
+export function resolveExtensionCommandIcon(icon: ExtensionCommand['icon']): string | undefined {
+  if (typeof icon === 'function') {
+    return formatWorkbenchCommandIcon(icon(undefined as void));
+  }
+
+  return formatWorkbenchCommandIcon(icon);
+}
+
+export function resolveShellCommandActivities(
+  extensionRegistry: ExtensionRegistry,
+): WorkbenchShellCommandActivity[] {
+  const activities = extensionRegistry.activities.getActivities();
+  if (activities.length > 0) {
+    return activities
+      .map((activity) => ({
+        icon: formatWorkbenchCommandIcon(activity.icon),
+        id: activity.viewContainerId,
+        label: `Show ${activity.title}`,
+      }))
+      .sort((left, right) => left.label.localeCompare(right.label));
+  }
+
+  const viewContainerIds = new Set(
+    extensionRegistry.views.getViews().map((view) => view.containerId),
+  );
+
+  return [...viewContainerIds].map((containerId) => {
+    const container = extensionRegistry.views.getViewContainer(containerId);
+    const firstView = extensionRegistry.views.getViews(containerId)[0];
+
+    return {
+      icon: formatWorkbenchCommandIcon(container?.icon ?? 'files'),
+      id: containerId,
+      label: `Show ${container?.title ?? firstView?.name ?? containerId}`,
+    };
+  });
+}
+
+export function shellCommandDefinitionToDescriptor<TContext>(
+  command: CommandDefinition<TContext>,
+  context: TContext,
+): WorkbenchCommandDescriptor {
+  const label =
+    resolveCommandValue<TContext, string>(command.label, context) ?? command.title ?? command.id;
+  const disabled = command.isEnabled ? !command.isEnabled(context) : false;
+
+  return {
+    category: command.category ?? 'View',
+    icon: formatWorkbenchCommandIcon(resolveCommandValue(command.icon, context)),
+    id: command.id,
+    label,
+    shortcut: resolveCommandValue(command.shortcut, context),
+    disabled,
+  };
+}
+
+export function extensionCommandToDescriptor(
+  command: ExtensionCommand,
+  feature?: ExtensionCommandFeatureSpec | undefined,
+): WorkbenchCommandDescriptor {
+  const metadata = {
+    argsSchema: feature?.argsSchema,
+    chat: feature?.chat,
+    requiresApproval: feature?.requiresApproval,
+  };
+
+  return {
+    category: command.category ?? feature?.category,
+    danger: feature?.danger,
+    description: feature?.description,
+    icon: resolveExtensionCommandIcon(command.icon),
+    id: command.id,
+    keywords: feature
+      ? [feature.command, feature.title].filter((value) => value !== command.id)
+      : undefined,
+    label: command.title ?? feature?.title ?? command.id,
+    metadata:
+      metadata.argsSchema || metadata.chat || metadata.requiresApproval !== undefined
+        ? metadata
+        : undefined,
+  };
+}
+
+export function collectExtensionCommandFeaturesById(
+  extensionRegistry: ExtensionRegistry,
+): ReadonlyMap<string, ExtensionCommandFeatureSpec> {
+  return new Map(
+    extensionRegistry
+      .getFeatureSpecs()
+      .flatMap((feature) => feature.commands.map((command) => [command.id, command] as const)),
+  );
+}
+
+export function mergeWorkbenchCommandDescriptors(
+  ...groups: readonly WorkbenchCommandDescriptor[][]
+): WorkbenchCommandDescriptor[] {
+  const seen = new Set<string>();
+
+  return groups.flat().filter((command) => {
+    if (seen.has(command.id)) {
+      return false;
+    }
+
+    seen.add(command.id);
+    return true;
+  });
+}
+
+export function buildWorkbenchPaletteCommands({
+  additionalCommands = [],
+  extensionCommandFeaturesById,
+  extensionCommands,
+  shellCommands,
+  shellContext,
+}: {
+  additionalCommands?: readonly WorkbenchCommandDescriptor[];
+  extensionCommandFeaturesById?: ReadonlyMap<string, ExtensionCommandFeatureSpec> | undefined;
+  extensionCommands: readonly ExtensionCommand[];
+  shellCommands: readonly CommandDefinition<WorkbenchShellCommandContext>[];
+  shellContext: WorkbenchShellCommandContext;
+}): WorkbenchCommandDescriptor[] {
+  const shellDescriptors = shellCommands.map((command) =>
+    shellCommandDefinitionToDescriptor(command, shellContext),
+  );
+  const contributedDescriptors = extensionCommands.map((command) =>
+    extensionCommandToDescriptor(command, extensionCommandFeaturesById?.get(command.id)),
+  );
+
+  return mergeWorkbenchCommandDescriptors(shellDescriptors, contributedDescriptors, [
+    ...additionalCommands,
+  ]);
+}
+
+export function matchesWorkbenchCommandPaletteShortcut(
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+) {
+  const key = event.key.toLowerCase();
+
+  if (key !== 'p') {
+    return false;
+  }
+
+  if (!(event.ctrlKey || event.metaKey) || !event.shiftKey || event.altKey) {
+    return false;
+  }
+
+  return true;
+}
+
+export function matchesWorkbenchQuickAccessShortcut(
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+) {
+  const key = event.key.toLowerCase();
+
+  if (key !== 'p') {
+    return false;
+  }
+
+  if (!(event.ctrlKey || event.metaKey) || event.shiftKey || event.altKey) {
+    return false;
+  }
+
+  return true;
+}
+
+export function getWorkbenchCommandPaletteShortcutLabel() {
+  return WORKBENCH_COMMAND_PALETTE_SHORTCUT;
+}
+
+export function getWorkbenchQuickAccessShortcutLabel() {
+  return WORKBENCH_QUICK_ACCESS_SHORTCUT;
+}

package/src/{workbench-keybinding-bridge.ts → workbench/keybinding-bridge.ts}

@@ -1,54 +1,54 @@
-import type { ContextKeyValue, KeybindingRegistry } from '@workbench-kit/platform';
-import { resolveKeybindingWithOverrides, type KeybindingDefinition } from '@workbench-kit/platform';
-
-function normalizeKeyToken(token: string): string {
-  const key = token.trim().toLowerCase();
-  if (key === 'del') return 'delete';
-  if (key === 'esc') return 'escape';
-  if (key === 'return') return 'enter';
-  if (key === 'spacebar' || key === 'space') return 'space';
-  return key.length === 1 ? key : key;
-}
-
-export function normalizeKeybindingKeyFromEvent(
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-): string {
-  const parts: string[] = [];
-
-  if (event.ctrlKey || event.metaKey) {
-    parts.push('ctrl');
-  }
-  if (event.altKey) {
-    parts.push('alt');
-  }
-  if (event.shiftKey) {
-    parts.push('shift');
-  }
-
-  parts.push(normalizeKeyToken(event.key));
-  return parts.join('+');
-}
-
-export function resolveExtensionKeybindingCommand(
-  registry: KeybindingRegistry,
-  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
-  contextKeys: Readonly<Record<string, ContextKeyValue>> = {},
-  overrides: readonly KeybindingDefinition[] = [],
-) {
-  const key = normalizeKeybindingKeyFromEvent(event);
-
-  if (overrides.length > 0) {
-    const match = resolveKeybindingWithOverrides(
-      registry.getKeybindings(),
-      overrides,
-      key,
-      contextKeys,
-    );
-    if (match) {
-      return match;
-    }
-  }
-
-  const matches = registry.resolveKeybindings(key, contextKeys);
-  return matches[0];
-}
+import type { ContextKeyValue, KeybindingRegistry } from '@workbench-kit/platform';
+import { resolveKeybindingWithOverrides, type KeybindingDefinition } from '@workbench-kit/platform';
+
+function normalizeKeyToken(token: string): string {
+  const key = token.trim().toLowerCase();
+  if (key === 'del') return 'delete';
+  if (key === 'esc') return 'escape';
+  if (key === 'return') return 'enter';
+  if (key === 'spacebar' || key === 'space') return 'space';
+  return key.length === 1 ? key : key;
+}
+
+export function normalizeKeybindingKeyFromEvent(
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+): string {
+  const parts: string[] = [];
+
+  if (event.ctrlKey || event.metaKey) {
+    parts.push('ctrl');
+  }
+  if (event.altKey) {
+    parts.push('alt');
+  }
+  if (event.shiftKey) {
+    parts.push('shift');
+  }
+
+  parts.push(normalizeKeyToken(event.key));
+  return parts.join('+');
+}
+
+export function resolveExtensionKeybindingCommand(
+  registry: KeybindingRegistry,
+  event: Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'key' | 'metaKey' | 'shiftKey'>,
+  contextKeys: Readonly<Record<string, ContextKeyValue>> = {},
+  overrides: readonly KeybindingDefinition[] = [],
+) {
+  const key = normalizeKeybindingKeyFromEvent(event);
+
+  if (overrides.length > 0) {
+    const match = resolveKeybindingWithOverrides(
+      registry.getKeybindings(),
+      overrides,
+      key,
+      contextKeys,
+    );
+    if (match) {
+      return match;
+    }
+  }
+
+  const matches = registry.resolveKeybindings(key, contextKeys);
+  return matches[0];
+}