fix: add parenthesis to JS values in interpolateFunction (#10426)

This commit is contained in:
jrandolf 2023-06-20 16:26:10 +02:00 committed by GitHub
parent c16a4a7276
commit fbdcc0d646
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 1 deletions

View File

@ -82,7 +82,10 @@ export const interpolateFunction = <T extends (...args: never[]) => unknown>(
for (const [name, jsValue] of Object.entries(replacements)) {
value = value.replace(
new RegExp(`PLACEHOLDER\\(\\s*(?:'${name}'|"${name}")\\s*\\)`, 'g'),
jsValue
// Wrapping this ensures tersers that accidently inline PLACEHOLDER calls
// are still valid. Without, we may get calls like ()=>{...}() which is
// not valid.
`(${jsValue})`
);
}
return createFunction(value) as unknown as T;

43
test/src/function.spec.ts Normal file
View File

@ -0,0 +1,43 @@
/**
* Copyright 2018 Google Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import expect from 'expect';
import {interpolateFunction} from 'puppeteer-core/internal/util/Function.js';
describe('Function', function () {
describe('interpolateFunction', function () {
it('should work', async () => {
const test = interpolateFunction(
() => {
const test = PLACEHOLDER('test') as () => number;
return test();
},
{test: `() => 5`}
);
expect(test()).toBe(5);
});
it('should work inlined', async () => {
const test = interpolateFunction(
() => {
// Note the parenthesis will be removed by the typescript compiler.
return (PLACEHOLDER('test') as () => number)();
},
{test: `() => 5`}
);
expect(test()).toBe(5);
});
});
});