fix: remove cast

Author: OrKoN

src/tools/input.ts

@@ -6,7 +6,7 @@
 
 import type {McpContext, TextSnapshotNode} from '../McpContext.js';
 import {zod} from '../third_party/index.js';
-import type {ElementHandle, KeyInput} from '../third_party/index.js';
+import type {ElementHandle} from '../third_party/index.js';
 import {parseKey} from '../utils/keyboard.js';
 
 import {ToolCategory} from './categories.js';
@@ -288,15 +288,15 @@ export const pressKey = defineTool({
   },
   handler: async (request, response, context) => {
     const page = context.getSelectedPage();
-    const tokens = parseKey(request.params.key) as KeyInput[];
+    const tokens = parseKey(request.params.key);
     const [key, ...modifiers] = tokens;
 
     await context.waitForEventsAfterAction(async () => {
-      for (let i = modifiers.length - 1; i >= 0; i--) {
-        await page.keyboard.down(modifiers[i]);
+      for (const modifier of modifiers) {
+        await page.keyboard.down(modifier);
       }
       await page.keyboard.press(key);
-      for (const modifier of modifiers) {
+      for (const modifier of modifiers.toReversed()) {
         await page.keyboard.up(modifier);
       }
     });

src/utils/keyboard.ts

@@ -5,6 +5,7 @@
  */
 import type {KeyInput} from '../third_party';
 
+// See the KeyInput type for the list of supported keys.
 const validKeys = new Set([
   '0',
   '1',
@@ -273,7 +274,7 @@ function throwIfInvalidKey(key: string): KeyInput {
 }
 
 /**
- * Returns the key, followed by modifiers.
+ * Returns the primary key, followed by modifiers in original order.
  */
 export function parseKey(keyInput: string): [KeyInput, ...KeyInput[]] {
   let key = '';
@@ -287,7 +288,9 @@ export function parseKey(keyInput: string): [KeyInput, ...KeyInput[]] {
       key += ch;
     }
   }
-  if (key) result.push(throwIfInvalidKey(key));
+  if (key) {
+    result.push(throwIfInvalidKey(key));
+  }
 
   if (result.length === 0) {
     throw new Error(`Key ${keyInput} could not be parsed.`);
@@ -297,5 +300,5 @@ export function parseKey(keyInput: string): [KeyInput, ...KeyInput[]] {
     throw new Error(`Key ${keyInput} contains duplicate keys.`);
   }
 
-  return result.reverse() as [KeyInput, ...KeyInput[]];
+  return [result.at(-1), ...result.slice(0, -1)] as [KeyInput, ...KeyInput[]];
 }

tests/tools/input.test.ts

@@ -438,6 +438,11 @@ describe('input', () => {
     it('parses keys', () => {
       assert.deepStrictEqual(parseKey('Shift+A'), ['A', 'Shift']);
       assert.deepStrictEqual(parseKey('Shift++'), ['+', 'Shift']);
+      assert.deepStrictEqual(parseKey('Control+Shift++'), [
+        '+',
+        'Control',
+        'Shift',
+      ]);
       assert.deepStrictEqual(parseKey('Shift'), ['Shift']);
       assert.deepStrictEqual(parseKey('KeyA'), ['KeyA']);
     });