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: forbid empty expressions (#3078)

Bogdan Chadkin4f2d805e649e
diff --git a/packages/sdk/src/expression.test.ts b/packages/sdk/src/expression.test.ts
index bb1cced09c..c542006079 100644
--- a/packages/sdk/src/expression.test.ts
+++ b/packages/sdk/src/expression.test.ts
@@ -18,8 +18,13 @@ describe("lint expression", () => {
message,
});
- test("supports empty expression", () => {
- expect(lintExpression({ expression: `` })).toEqual([]);
+ test("forbid empty expression", () => {
+ expect(lintExpression({ expression: `` })).toEqual([
+ error(0, 0, `Expression cannot be empty`),
+ ]);
+ expect(lintExpression({ expression: ` ` })).toEqual([
+ error(0, 0, `Expression cannot be empty`),
+ ]);
});
test("output parse error as diagnostic", () => {
@@ -305,6 +310,16 @@ describe("transpile expression", () => {
})
).toEqual(`{ ...name }`);
});
+
+ test("output more readable syntax error", () => {
+ let errorString = "";
+ try {
+ transpileExpression({ expression: `` });
+ } catch (error) {
+ errorString = (error as Error).message;
+ }
+ expect(errorString).toEqual(`Unexpected token (1:0) in ""`);
+ });
});
test("encode/decode variable names", () => {
diff --git a/packages/sdk/src/expression.ts b/packages/sdk/src/expression.ts
index 661a3292fe..55fb821eb2 100644
--- a/packages/sdk/src/expression.ts
+++ b/packages/sdk/src/expression.ts
@@ -36,6 +36,12 @@ export const lintExpression = ({
};
// allow empty expression
if (expression.trim().length === 0) {
+ diagnostics.push({
+ from: 0,
+ to: 0,
+ severity: "error",
+ message: "Expression cannot be empty",
+ });
return diagnostics;
}
try {
@@ -181,7 +187,14 @@ export const transpileExpression = ({
assignee: boolean
) => string | undefined | void;
}) => {
- const root = parseExpressionAt(expression, 0, { ecmaVersion: "latest" });
+ let root;
+ try {
+ root = parseExpressionAt(expression, 0, { ecmaVersion: "latest" });
+ } catch (error) {
+ const message = (error as Error).message;
+ // throw new error to trace error in our code instead of acorn
+ throw Error(`${message} in ${JSON.stringify(expression)}`);
+ }
const replacements: [start: number, end: number, fragment: string][] = [];
const replaceIdentifier = (node: Identifier, assignee: boolean) => {
const newName = replaceVariable?.(node.name, assignee);