Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: validate unexpected closing paren in expressions (#4803)

Bogdan Chadkin5546301aebdb
diff --git a/packages/sdk/src/expression.test.ts b/packages/sdk/src/expression.test.ts
index 97e2710d01..862ddcdbd5 100644
--- a/packages/sdk/src/expression.test.ts
+++ b/packages/sdk/src/expression.test.ts
@@ -40,6 +40,9 @@ describe("lint expression", () => {
expect(lintExpression({ expression: `a + ` })).toEqual([
error(4, 4, "Unexpected token"),
]);
+ expect(lintExpression({ expression: `"string" + a)` })).toEqual([
+ error(13, 13, "Unexpected token"),
+ ]);
});
test("restrict expression syntax", () => {
diff --git a/packages/sdk/src/expression.ts b/packages/sdk/src/expression.ts
index f2e09d951c..40b596d41c 100644
--- a/packages/sdk/src/expression.ts
+++ b/packages/sdk/src/expression.ts
@@ -1,4 +1,9 @@
-import { type Expression, type Identifier, parseExpressionAt } from "acorn";
+import {
+ type Expression,
+ type Identifier,
+ parse,
+ parseExpressionAt,
+} from "acorn";
import { simple } from "acorn-walk";
import type { DataSources } from "./schema/data-sources";
import type { Scope } from "./scope";
@@ -51,8 +56,7 @@ export const lintExpression = ({
try {
// wrap expression with parentheses to force acorn parse whole expression
// instead of just first valid part
- // https://github.com/acornjs/acorn/tree/master/acorn
- const root = parseExpressionAt(`(${expression})`, 0, {
+ const root = parse(`(${expression})`, {
ecmaVersion: "latest",
// support parsing import to forbid explicitly
sourceType: "module",