Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

fix(mcp): support expressions in browser_evaluate (#39979)

Yury Semikhatsky9c069597ff7c
diff --git a/packages/playwright-core/src/tools/backend/evaluate.ts b/packages/playwright-core/src/tools/backend/evaluate.ts
index 9e41bc9be4..0881ac3b65 100644
--- a/packages/playwright-core/src/tools/backend/evaluate.ts
+++ b/packages/playwright-core/src/tools/backend/evaluate.ts
@@ -41,21 +41,35 @@ const evaluate = defineTabTool({
handle: async (tab, params, response) => {
let locator: Awaited<ReturnType<Tab['refLocator']>> | undefined;
- if (!params.function.includes('=>'))
- params.function = `() => (${params.function})`;
- if (params.ref) {
+ const expression = params.function;
+ if (params.ref)
locator = await tab.refLocator({ ref: params.ref, selector: params.selector, element: params.element || 'element' });
- response.addCode(`await page.${locator.resolved}.evaluate(${escapeWithQuotes(params.function)});`);
- } else {
- response.addCode(`await page.evaluate(${escapeWithQuotes(params.function)});`);
- }
await tab.waitForCompletion(async () => {
- // eslint-disable-next-line no-restricted-syntax
- const func = new Function() as any;
- func.toString = () => params.function;
- const result = locator?.locator ? await locator?.locator.evaluate(func) : await tab.page.evaluate(func);
- const text = JSON.stringify(result, null, 2) || 'undefined';
+ let evalResult: { result: unknown, isFunction: boolean };
+ if (locator?.locator) {
+ evalResult = await locator.locator.evaluate(async (element, expr) => {
+ const value = eval(`(${expr})`);
+ const isFunction = typeof value === 'function';
+ const result = await (isFunction ? value(element) : value);
+ return { result, isFunction };
+ }, expression);
+ } else {
+ evalResult = await tab.page.evaluate(async expr => {
+ const value = eval(`(${expr})`);
+ const isFunction = typeof value === 'function';
+ const result = await (isFunction ? value() : value);
+ return { result, isFunction };
+ }, expression);
+ }
+
+ const codeExpression = evalResult.isFunction ? expression : `() => (${expression})`;
+ if (locator)
+ response.addCode(`await page.${locator.resolved}.evaluate(${escapeWithQuotes(codeExpression)});`);
+ else
+ response.addCode(`await page.evaluate(${escapeWithQuotes(codeExpression)});`);
+
+ const text = JSON.stringify(evalResult.result, null, 2) ?? 'undefined';
await response.addResult('Evaluation result', text, { prefix: 'result', ext: 'json', suggestedFilename: params.filename });
});
},
diff --git a/tests/mcp/evaluate.spec.ts b/tests/mcp/evaluate.spec.ts
index cb12bb868d..3c0b7a5b60 100644
--- a/tests/mcp/evaluate.spec.ts
+++ b/tests/mcp/evaluate.spec.ts
@@ -76,6 +76,65 @@ test('browser_evaluate object', async ({ client, server }) => {
});
});
+test('browser_evaluate expression', async ({ client, server }) => {
+ expect(await client.callTool({
+ name: 'browser_navigate',
+ arguments: { url: server.HELLO_WORLD },
+ })).toHaveResponse({
+ page: expect.stringContaining(`- Page Title: Title`),
+ });
+
+ expect(await client.callTool({
+ name: 'browser_evaluate',
+ arguments: {
+ function: '(1+1)',
+ },
+ })).toHaveResponse({
+ result: `2`,
+ code: `await page.evaluate('() => ((1+1))');`,
+ });
+
+ expect(await client.callTool({
+ name: 'browser_evaluate',
+ arguments: {
+ function: '[1,2,3].map(x => x*2)',
+ },
+ })).toHaveResponse({
+ result: `[\n 2,\n 4,\n 6\n]`,
+ code: `await page.evaluate('() => ([1,2,3].map(x => x*2))');`,
+ });
+
+ expect(await client.callTool({
+ name: 'browser_evaluate',
+ arguments: {
+ function: 'function foo() { return 1; }',
+ },
+ })).toHaveResponse({
+ result: `1`,
+ code: `await page.evaluate('function foo() { return 1; }');`,
+ });
+
+ expect(await client.callTool({
+ name: 'browser_evaluate',
+ arguments: {
+ function: 'async () => 42',
+ },
+ })).toHaveResponse({
+ result: `42`,
+ code: `await page.evaluate('async () => 42');`,
+ });
+
+ expect(await client.callTool({
+ name: 'browser_evaluate',
+ arguments: {
+ function: 'Promise.resolve(42)',
+ },
+ })).toHaveResponse({
+ result: `42`,
+ code: `await page.evaluate('() => (Promise.resolve(42))');`,
+ });
+});
+
test('browser_evaluate (error)', async ({ client, server }) => {
expect(await client.callTool({
name: 'browser_navigate',