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

package/src/{use-command-management.ts → management/use-command-management.ts}

@@ -1,191 +1,191 @@
-import { useEffect, useMemo, useReducer, useState } from 'react';
-import type { ExtensionCommandFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
-import {
-  buildCommandManagementGroups,
-  countCommandManagementEntries,
-  type CommandManagementRunState,
-} from '@workbench-kit/react/workbench/management';
-import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
-
-import { useWorkbench } from './provider.js';
-import {
-  collectExtensionCommandFeaturesById,
-  resolveShellCommandActivities,
-} from './workbench-command-palette.js';
-
-export function useCommandManagementModel() {
-  const { executeCommand, extensionRegistry } = useWorkbench();
-  const [lastRun, setLastRun] = useState<CommandManagementRunState | undefined>();
-  const [refreshToken, refreshRegistry] = useReducer((count: number) => count + 1, 0);
-
-  useEffect(() => {
-    const commandDisposable = extensionRegistry.commands.onDidRegisterCommand(() => {
-      refreshRegistry();
-    });
-
-    return () => {
-      commandDisposable.dispose();
-    };
-  }, [extensionRegistry]);
-
-  const groups = useMemo(
-    () => buildCommandManagementModelGroups(extensionRegistry, refreshToken),
-    [extensionRegistry, refreshToken],
-  );
-
-  const totalCount = countCommandManagementEntries(groups);
-
-  const runCommand = async (commandId: string) => {
-    setLastRun({
-      commandId,
-      status: 'running',
-      timestamp: Date.now(),
-    });
-
-    try {
-      await executeCommand(commandId);
-      setLastRun({
-        commandId,
-        status: 'success',
-        timestamp: Date.now(),
-      });
-    } catch (error) {
-      setLastRun({
-        commandId,
-        message: error instanceof Error ? error.message : 'Command failed.',
-        status: 'error',
-        timestamp: Date.now(),
-      });
-    }
-  };
-
-  return {
-    groups,
-    lastRun,
-    refreshRegistry,
-    runCommand,
-    totalCount,
-  };
-}
-
-export function buildCommandManagementModelGroups(
-  extensionRegistry: ExtensionRegistry,
-  _refreshToken = 0,
-) {
-  const shellCommands = createWorkbenchShellCommands({
-    activities: resolveShellCommandActivities(extensionRegistry),
-    includeSettings: true,
-    includeSidebarToggle: true,
-  });
-  const shellCommandIds = new Set(shellCommands.map((command) => command.id));
-  const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
-
-  return buildCommandManagementGroups({
-    extensionCommands: collectExtensionCommandEntries(
-      extensionRegistry,
-      shellCommandIds,
-      commandFeaturesById,
-    ),
-    keybindingsByCommandId: collectKeybindingsByCommandId(extensionRegistry),
-    menuSurfacesByCommandId: collectMenuSurfacesByCommandId(extensionRegistry),
-    shellCommands: shellCommands.map((command) => ({
-      category: command.category ?? 'Workbench',
-      handler:
-        extensionRegistry.commands.getCommand(command.id)?.handler ??
-        command.handler ??
-        command.run,
-      id: command.id,
-      label: typeof command.label === 'string' ? command.label : (command.title ?? command.id),
-    })),
-  });
-}
-
-function collectExtensionCommandEntries(
-  extensionRegistry: ExtensionRegistry,
-  skippedCommandIds: ReadonlySet<string>,
-  commandFeaturesById: ReadonlyMap<string, ExtensionCommandFeatureSpec>,
-) {
-  const entries: Array<{
-    category?: string | undefined;
-    description?: string | undefined;
-    extensionId: string;
-    extensionLabel: string;
-    handler?: unknown;
-    id: string;
-    label: string;
-  }> = [];
-  const seen = new Set<string>();
-
-  for (const feature of extensionRegistry.getFeatureSpecs()) {
-    const extensionLabel = feature.displayName;
-
-    for (const contribution of feature.commands) {
-      const command = extensionRegistry.commands.getCommand(contribution.id);
-      if (!command || seen.has(contribution.id) || skippedCommandIds.has(contribution.id)) {
-        continue;
-      }
-
-      seen.add(contribution.id);
-      entries.push({
-        category: command.category ?? contribution.category,
-        description: contribution.description,
-        extensionId: feature.id,
-        extensionLabel,
-        handler: command.handler,
-        id: command.id,
-        label: command.title ?? contribution.title ?? command.id,
-      });
-    }
-  }
-
-  for (const command of extensionRegistry.commands.getCommands()) {
-    if (seen.has(command.id) || skippedCommandIds.has(command.id)) {
-      continue;
-    }
-
-    entries.push({
-      category: command.category,
-      description: commandFeaturesById.get(command.id)?.description,
-      extensionId: 'runtime',
-      extensionLabel: 'Runtime',
-      handler: command.handler,
-      id: command.id,
-      label: command.title ?? command.id,
-    });
-  }
-
-  return entries;
-}
-
-function collectKeybindingsByCommandId(extensionRegistry: ExtensionRegistry) {
-  const keybindingsByCommandId: Record<string, string> = {};
-
-  for (const keybinding of extensionRegistry.keybindings.getKeybindings()) {
-    if (!keybindingsByCommandId[keybinding.command]) {
-      keybindingsByCommandId[keybinding.command] = keybinding.key;
-    }
-  }
-
-  return keybindingsByCommandId;
-}
-
-function collectMenuSurfacesByCommandId(extensionRegistry: ExtensionRegistry) {
-  const menuSurfacesByCommandId = new Map<string, Set<string>>();
-
-  for (const menuItem of extensionRegistry.menus.getMenuItems()) {
-    if (!menuItem.menu || !menuItem.command) {
-      continue;
-    }
-
-    const surfaces = menuSurfacesByCommandId.get(menuItem.command) ?? new Set<string>();
-    surfaces.add(menuItem.menu);
-    menuSurfacesByCommandId.set(menuItem.command, surfaces);
-  }
-
-  return Object.fromEntries(
-    [...menuSurfacesByCommandId.entries()].map(([commandId, surfaces]) => [
-      commandId,
-      [...surfaces].sort(),
-    ]),
-  );
-}
+import { useEffect, useMemo, useReducer, useState } from 'react';
+import type { ExtensionCommandFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
+import {
+  buildCommandManagementGroups,
+  countCommandManagementEntries,
+  type CommandManagementRunState,
+} from '@workbench-kit/react/workbench/management';
+import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
+
+import { useWorkbench } from '../shell/provider.js';
+import {
+  collectExtensionCommandFeaturesById,
+  resolveShellCommandActivities,
+} from '../workbench/command-palette.js';
+
+export function useCommandManagementModel() {
+  const { executeCommand, extensionRegistry } = useWorkbench();
+  const [lastRun, setLastRun] = useState<CommandManagementRunState | undefined>();
+  const [refreshToken, refreshRegistry] = useReducer((count: number) => count + 1, 0);
+
+  useEffect(() => {
+    const commandDisposable = extensionRegistry.commands.onDidRegisterCommand(() => {
+      refreshRegistry();
+    });
+
+    return () => {
+      commandDisposable.dispose();
+    };
+  }, [extensionRegistry]);
+
+  const groups = useMemo(
+    () => buildCommandManagementModelGroups(extensionRegistry, refreshToken),
+    [extensionRegistry, refreshToken],
+  );
+
+  const totalCount = countCommandManagementEntries(groups);
+
+  const runCommand = async (commandId: string) => {
+    setLastRun({
+      commandId,
+      status: 'running',
+      timestamp: Date.now(),
+    });
+
+    try {
+      await executeCommand(commandId);
+      setLastRun({
+        commandId,
+        status: 'success',
+        timestamp: Date.now(),
+      });
+    } catch (error) {
+      setLastRun({
+        commandId,
+        message: error instanceof Error ? error.message : 'Command failed.',
+        status: 'error',
+        timestamp: Date.now(),
+      });
+    }
+  };
+
+  return {
+    groups,
+    lastRun,
+    refreshRegistry,
+    runCommand,
+    totalCount,
+  };
+}
+
+export function buildCommandManagementModelGroups(
+  extensionRegistry: ExtensionRegistry,
+  _refreshToken = 0,
+) {
+  const shellCommands = createWorkbenchShellCommands({
+    activities: resolveShellCommandActivities(extensionRegistry),
+    includeSettings: true,
+    includeSidebarToggle: true,
+  });
+  const shellCommandIds = new Set(shellCommands.map((command) => command.id));
+  const commandFeaturesById = collectExtensionCommandFeaturesById(extensionRegistry);
+
+  return buildCommandManagementGroups({
+    extensionCommands: collectExtensionCommandEntries(
+      extensionRegistry,
+      shellCommandIds,
+      commandFeaturesById,
+    ),
+    keybindingsByCommandId: collectKeybindingsByCommandId(extensionRegistry),
+    menuSurfacesByCommandId: collectMenuSurfacesByCommandId(extensionRegistry),
+    shellCommands: shellCommands.map((command) => ({
+      category: command.category ?? 'Workbench',
+      handler:
+        extensionRegistry.commands.getCommand(command.id)?.handler ??
+        command.handler ??
+        command.run,
+      id: command.id,
+      label: typeof command.label === 'string' ? command.label : (command.title ?? command.id),
+    })),
+  });
+}
+
+function collectExtensionCommandEntries(
+  extensionRegistry: ExtensionRegistry,
+  skippedCommandIds: ReadonlySet<string>,
+  commandFeaturesById: ReadonlyMap<string, ExtensionCommandFeatureSpec>,
+) {
+  const entries: Array<{
+    category?: string | undefined;
+    description?: string | undefined;
+    extensionId: string;
+    extensionLabel: string;
+    handler?: unknown;
+    id: string;
+    label: string;
+  }> = [];
+  const seen = new Set<string>();
+
+  for (const feature of extensionRegistry.getFeatureSpecs()) {
+    const extensionLabel = feature.displayName;
+
+    for (const contribution of feature.commands) {
+      const command = extensionRegistry.commands.getCommand(contribution.id);
+      if (!command || seen.has(contribution.id) || skippedCommandIds.has(contribution.id)) {
+        continue;
+      }
+
+      seen.add(contribution.id);
+      entries.push({
+        category: command.category ?? contribution.category,
+        description: contribution.description,
+        extensionId: feature.id,
+        extensionLabel,
+        handler: command.handler,
+        id: command.id,
+        label: command.title ?? contribution.title ?? command.id,
+      });
+    }
+  }
+
+  for (const command of extensionRegistry.commands.getCommands()) {
+    if (seen.has(command.id) || skippedCommandIds.has(command.id)) {
+      continue;
+    }
+
+    entries.push({
+      category: command.category,
+      description: commandFeaturesById.get(command.id)?.description,
+      extensionId: 'runtime',
+      extensionLabel: 'Runtime',
+      handler: command.handler,
+      id: command.id,
+      label: command.title ?? command.id,
+    });
+  }
+
+  return entries;
+}
+
+function collectKeybindingsByCommandId(extensionRegistry: ExtensionRegistry) {
+  const keybindingsByCommandId: Record<string, string> = {};
+
+  for (const keybinding of extensionRegistry.keybindings.getKeybindings()) {
+    if (!keybindingsByCommandId[keybinding.command]) {
+      keybindingsByCommandId[keybinding.command] = keybinding.key;
+    }
+  }
+
+  return keybindingsByCommandId;
+}
+
+function collectMenuSurfacesByCommandId(extensionRegistry: ExtensionRegistry) {
+  const menuSurfacesByCommandId = new Map<string, Set<string>>();
+
+  for (const menuItem of extensionRegistry.menus.getMenuItems()) {
+    if (!menuItem.menu || !menuItem.command) {
+      continue;
+    }
+
+    const surfaces = menuSurfacesByCommandId.get(menuItem.command) ?? new Set<string>();
+    surfaces.add(menuItem.menu);
+    menuSurfacesByCommandId.set(menuItem.command, surfaces);
+  }
+
+  return Object.fromEntries(
+    [...menuSurfacesByCommandId.entries()].map(([commandId, surfaces]) => [
+      commandId,
+      [...surfaces].sort(),
+    ]),
+  );
+}

package/src/{use-keybinding-management.ts → management/use-keybinding-management.ts}

@@ -1,130 +1,130 @@
-import { useMemo } from 'react';
-import {
-  buildKeybindingManagementEntries,
-  type KeybindingDefinition,
-} from '@workbench-kit/platform';
-import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
-import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
-
-import { useWorkbench } from './provider.js';
-import { resolveShellCommandActivities } from './workbench-command-palette.js';
-
-export function useKeybindingManagementModel() {
-  const {
-    extensionRegistry,
-    keybindingOverrides,
-    resetCommandKeybindingOverride,
-    setCommandKeybindingOverride,
-  } = useWorkbench();
-
-  const defaults = useMemo(
-    () => extensionRegistry.keybindings.getKeybindings(),
-    [extensionRegistry, keybindingOverrides.length],
-  );
-
-  const entries = useMemo(
-    () =>
-      buildKeybindingManagementEntries({
-        commands: collectKeybindingManagementCommands(extensionRegistry),
-        defaults,
-        overrides: keybindingOverrides,
-      }),
-    [defaults, extensionRegistry, keybindingOverrides],
-  );
-
-  const overrideCount = keybindingOverrides.length;
-
-  const setKeybinding = (commandId: string, key: string | undefined) => {
-    const defaultKey = defaults.find((binding) => binding.command === commandId)?.key;
-    if (!key || key === defaultKey) {
-      resetCommandKeybindingOverride(commandId);
-      return;
-    }
-
-    setCommandKeybindingOverride(commandId, key);
-  };
-
-  return {
-    entries,
-    overrideCount,
-    resetKeybinding: resetCommandKeybindingOverride,
-    setKeybinding,
-  };
-}
-
-function collectKeybindingManagementCommands(extensionRegistry: ExtensionRegistry) {
-  const commands: Array<{
-    category?: string | undefined;
-    id: string;
-    label: string;
-    sourceLabel?: string | undefined;
-  }> = [];
-  const seen = new Set<string>();
-  const shellCommands = createWorkbenchShellCommands({
-    activities: resolveShellCommandActivities(extensionRegistry),
-    includeSettings: true,
-    includeSidebarToggle: true,
-  });
-  const shellCommandIds = new Set(shellCommands.map((command) => command.id));
-
-  for (const extension of extensionRegistry.getExtensions()) {
-    const extensionLabel = extension.manifest.displayName ?? extension.manifest.id;
-
-    for (const contribution of extension.manifest.contributes?.commands ?? []) {
-      const command = extensionRegistry.commands.getCommand(contribution.command);
-      if (!command || seen.has(contribution.command) || shellCommandIds.has(contribution.command)) {
-        continue;
-      }
-
-      seen.add(contribution.command);
-      commands.push({
-        category: command.category ?? contribution.category,
-        id: command.id,
-        label: command.title ?? contribution.title ?? command.id,
-        sourceLabel: extensionLabel,
-      });
-    }
-  }
-
-  for (const command of extensionRegistry.commands.getCommands()) {
-    if (seen.has(command.id) || shellCommandIds.has(command.id)) {
-      continue;
-    }
-
-    commands.push({
-      category: command.category,
-      id: command.id,
-      label: command.title ?? command.id,
-      sourceLabel: 'Runtime',
-    });
-  }
-
-  for (const command of shellCommands) {
-    if (seen.has(command.id)) {
-      continue;
-    }
-
-    const label =
-      typeof command.label === 'function'
-        ? command.id
-        : typeof command.label === 'string'
-          ? command.label
-          : command.id;
-
-    seen.add(command.id);
-    commands.push({
-      category: 'Workbench',
-      id: command.id,
-      label,
-      sourceLabel: 'Workbench Shell',
-    });
-  }
-
-  return commands;
-}
-
-export function toKeybindingOverrideDefinitions(
-  overrides: readonly KeybindingDefinition[],
-): KeybindingDefinition[] {
-  return overrides.map((binding) => ({ ...binding }));
-}
+import { useMemo } from 'react';
+import {
+  buildKeybindingManagementEntries,
+  type KeybindingDefinition,
+} from '@workbench-kit/platform';
+import { createWorkbenchShellCommands } from '@workbench-kit/react/workbench';
+import type { ExtensionRegistry } from '@workbench-kit/workbench-core';
+
+import { useWorkbench } from '../shell/provider.js';
+import { resolveShellCommandActivities } from '../workbench/command-palette.js';
+
+export function useKeybindingManagementModel() {
+  const {
+    extensionRegistry,
+    keybindingOverrides,
+    resetCommandKeybindingOverride,
+    setCommandKeybindingOverride,
+  } = useWorkbench();
+
+  const defaults = useMemo(
+    () => extensionRegistry.keybindings.getKeybindings(),
+    [extensionRegistry, keybindingOverrides.length],
+  );
+
+  const entries = useMemo(
+    () =>
+      buildKeybindingManagementEntries({
+        commands: collectKeybindingManagementCommands(extensionRegistry),
+        defaults,
+        overrides: keybindingOverrides,
+      }),
+    [defaults, extensionRegistry, keybindingOverrides],
+  );
+
+  const overrideCount = keybindingOverrides.length;
+
+  const setKeybinding = (commandId: string, key: string | undefined) => {
+    const defaultKey = defaults.find((binding) => binding.command === commandId)?.key;
+    if (!key || key === defaultKey) {
+      resetCommandKeybindingOverride(commandId);
+      return;
+    }
+
+    setCommandKeybindingOverride(commandId, key);
+  };
+
+  return {
+    entries,
+    overrideCount,
+    resetKeybinding: resetCommandKeybindingOverride,
+    setKeybinding,
+  };
+}
+
+function collectKeybindingManagementCommands(extensionRegistry: ExtensionRegistry) {
+  const commands: Array<{
+    category?: string | undefined;
+    id: string;
+    label: string;
+    sourceLabel?: string | undefined;
+  }> = [];
+  const seen = new Set<string>();
+  const shellCommands = createWorkbenchShellCommands({
+    activities: resolveShellCommandActivities(extensionRegistry),
+    includeSettings: true,
+    includeSidebarToggle: true,
+  });
+  const shellCommandIds = new Set(shellCommands.map((command) => command.id));
+
+  for (const extension of extensionRegistry.getExtensions()) {
+    const extensionLabel = extension.manifest.displayName ?? extension.manifest.id;
+
+    for (const contribution of extension.manifest.contributes?.commands ?? []) {
+      const command = extensionRegistry.commands.getCommand(contribution.command);
+      if (!command || seen.has(contribution.command) || shellCommandIds.has(contribution.command)) {
+        continue;
+      }
+
+      seen.add(contribution.command);
+      commands.push({
+        category: command.category ?? contribution.category,
+        id: command.id,
+        label: command.title ?? contribution.title ?? command.id,
+        sourceLabel: extensionLabel,
+      });
+    }
+  }
+
+  for (const command of extensionRegistry.commands.getCommands()) {
+    if (seen.has(command.id) || shellCommandIds.has(command.id)) {
+      continue;
+    }
+
+    commands.push({
+      category: command.category,
+      id: command.id,
+      label: command.title ?? command.id,
+      sourceLabel: 'Runtime',
+    });
+  }
+
+  for (const command of shellCommands) {
+    if (seen.has(command.id)) {
+      continue;
+    }
+
+    const label =
+      typeof command.label === 'function'
+        ? command.id
+        : typeof command.label === 'string'
+          ? command.label
+          : command.id;
+
+    seen.add(command.id);
+    commands.push({
+      category: 'Workbench',
+      id: command.id,
+      label,
+      sourceLabel: 'Workbench Shell',
+    });
+  }
+
+  return commands;
+}
+
+export function toKeybindingOverrideDefinitions(
+  overrides: readonly KeybindingDefinition[],
+): KeybindingDefinition[] {
+  return overrides.map((binding) => ({ ...binding }));
+}