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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Support effectful expression arguments (#1967)
Bogdan Chadkin09d2b7715134
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 76f2675d35..b4b39da42f 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -68,9 +68,9 @@ const temporaryInstances: Instances = new Map([]);const executeEffectfulExpressionWithDecodedVariables: typeof executeEffectfulExpression =- (code, values) => {+ (code, args, values) => {return decodeVariablesMap(- executeEffectfulExpression(code, encodeVariablesMap(values))+ executeEffectfulExpression(code, args, encodeVariablesMap(values)));};diff --git a/packages/project-build/src/schema/props.ts b/packages/project-build/src/schema/props.tsindex dcc52a0a3e..1c964b39c8 100644--- a/packages/project-build/src/schema/props.ts+++ b/packages/project-build/src/schema/props.ts@@ -58,6 +58,7 @@ export const Prop = z.union([value: z.array(z.object({type: z.literal("execute"),+ args: z.array(z.string()),code: z.string(),})),diff --git a/packages/react-sdk/src/context.tsx b/packages/react-sdk/src/context.tsxindex 71e8ee20cc..dc9c29f255 100644--- a/packages/react-sdk/src/context.tsx+++ b/packages/react-sdk/src/context.tsx@@ -41,6 +41,7 @@ export const ReactSdkContext = createContext<dataSourceValuesStore: ReadableAtom<DataSourceValues>;executeEffectfulExpression: (expression: string,+ args: DataSourceValues,values: DataSourceValues) => DataSourceValues;setDataSourceValues: (newValues: DataSourceValues) => void;diff --git a/packages/react-sdk/src/embed-template.test.ts b/packages/react-sdk/src/embed-template.test.tsindex ad6d87d724..1f9365771d 100644--- a/packages/react-sdk/src/embed-template.test.ts+++ b/packages/react-sdk/src/embed-template.test.ts@@ -407,6 +407,17 @@ test("generate data for embedding from action props", () => {name: "onClick",value: [{ type: "execute", code: `boxState = 'success'` }],},+ {+ type: "action",+ name: "onChange",+ value: [+ {+ type: "execute",+ args: ["value"],+ code: `boxState = value`,+ },+ ],+ },],children: [],},@@ -442,10 +453,24 @@ test("generate data for embedding from action props", () => {value: [{type: "execute",+ args: [],code: expect.stringMatching(/\$ws\$dataSource\$\w+ = 'success'/),},],},+ {+ id: expectString,+ instanceId: expectString,+ type: "action",+ name: "onChange",+ value: [+ {+ type: "execute",+ args: ["value"],+ code: expect.stringMatching(/\$ws\$dataSource\$\w+ = value/),+ },+ ],+ },],dataSources: [{diff --git a/packages/react-sdk/src/embed-template.ts b/packages/react-sdk/src/embed-template.tsindex 10ceacb571..781cf7ee35 100644--- a/packages/react-sdk/src/embed-template.ts+++ b/packages/react-sdk/src/embed-template.ts@@ -66,6 +66,7 @@ const EmbedTemplateProp = z.union([value: z.array(z.object({type: z.literal("execute"),+ args: z.optional(z.array(z.string())),code: z.string(),})),@@ -144,12 +145,18 @@ const createInstancesFromTemplate = (type: "action",name: prop.name,value: prop.value.map((value) => {+ const args = value.args ?? [];return {type: "execute",+ args,// replace all references with variable namescode: validateExpression(value.code, {effectful: true,transformIdentifier: (ref) => {+ // bypass arguments without changes+ if (args.includes(ref)) {+ return ref;+ }const id = dataSourceByRef.get(ref)?.id ?? ref;return encodeDataSourceVariable(id);},diff --git a/packages/react-sdk/src/expression.test.ts b/packages/react-sdk/src/expression.test.tsindex fcda7a7906..12525ee446 100644--- a/packages/react-sdk/src/expression.test.ts+++ b/packages/react-sdk/src/expression.test.ts@@ -187,7 +187,11 @@ test("encode/decode variable names", () => {test("generate effectful expression", () => {expect(- generateEffectfulExpression(`var0 = var0 + var1`, new Set(["var0", "var1"]))+ generateEffectfulExpression(+ `var0 = var0 + var1`,+ new Set(),+ new Set(["var0", "var1"])+ )).toMatchInlineSnapshot(`"let var0 = _variables.get('var0');let var1 = _variables.get('var1');@@ -198,7 +202,11 @@ test("generate effectful expression", () => {`);expect(- generateEffectfulExpression(`var0 = var1 + 1`, new Set(["var0", "var1"]))+ generateEffectfulExpression(+ `var0 = var1 + 1`,+ new Set(),+ new Set(["var0", "var1"])+ )).toMatchInlineSnapshot(`"let var1 = _variables.get('var1');let var0;@@ -213,6 +221,7 @@ test("add only used variables in effectful expression", () => {expect(generateEffectfulExpression(`var0 = var1 + 1`,+ new Set(),new Set(["var0", "var1", "var2"]))).toMatchInlineSnapshot(`@@ -225,10 +234,34 @@ test("add only used variables in effectful expression", () => {`);});-test("forbid not allowed variables in effectful expression", () => {+test("support effectful expression arguments", () => {+ expect(+ generateEffectfulExpression(+ `var0 = arg0 + 1`,+ new Set(["arg0"]),+ new Set(["var0"])+ )+ ).toMatchInlineSnapshot(`+ "let arg0 = _args.get('arg0');+ let var0;+ var0 = arg0 + 1;+ return new Map([+ ['var0', var0],+ ]);"+ `);+});++test("forbid not allowed variables or arguments in effectful expression", () => {expect(() => {- generateEffectfulExpression(`var0 = var0 + var1`, new Set(["var0"]));+ generateEffectfulExpression(+ `var0 = var0 + var1`,+ new Set(),+ new Set(["var0"])+ );}).toThrowError(/Unknown dependency "var1"/);+ expect(() => {+ generateEffectfulExpression(`var0 = arg0`, new Set(), new Set(["var0"]));+ }).toThrowError(/Unknown dependency "arg0"/);});test("execute effectful expression", () => {@@ -236,9 +269,13 @@ test("execute effectful expression", () => {["var0", 2],["var1", 3],]);- expect(executeEffectfulExpression(`var0 = var0 + var1`, variables)).toEqual(- new Map([["var0", 5]])- );+ expect(+ executeEffectfulExpression(`var0 = var0 + var1`, new Map(), variables)+ ).toEqual(new Map([["var0", 5]]));++ expect(+ executeEffectfulExpression(`arg0 = 5`, new Map([["arg0", 0]]), new Map())+ ).toEqual(new Map());});test("compute expressions dependencies", () => {diff --git a/packages/react-sdk/src/expression.ts b/packages/react-sdk/src/expression.tsindex d1aa465cae..869c0a8524 100644--- a/packages/react-sdk/src/expression.ts+++ b/packages/react-sdk/src/expression.ts@@ -252,6 +252,7 @@ export const executeComputingExpressions = (export const generateEffectfulExpression = (code: string,+ args: Set<string>,allowedVariables: Set<string>) => {const inputVariables = new Set<string>();@@ -259,6 +260,9 @@ export const generateEffectfulExpression = (validateExpression(code, {effectful: true,transformIdentifier: (identifier, assignee) => {+ if (args.has(identifier)) {+ return identifier;+ }if (allowedVariables.has(identifier)) {if (assignee) {outputVariables.add(identifier);@@ -274,6 +278,9 @@ export const generateEffectfulExpression = (// generate code computing all expressionslet generatedCode = "";+ for (const id of args) {+ generatedCode += `let ${id} = _args.get('${id}');\n`;+ }for (const id of inputVariables) {generatedCode += `let ${id} = _variables.get('${id}');\n`;}@@ -296,14 +303,16 @@ export const generateEffectfulExpression = (export const executeEffectfulExpression = (code: string,+ args: Map<string, unknown>,variables: Map<string, unknown>) => {const generatedCode = generateEffectfulExpression(code,+ new Set(args.keys()),new Set(variables.keys()));- const executeFn = new Function("_variables", generatedCode);- const values = executeFn(variables) as Map<string, unknown>;+ const executeFn = new Function("_variables", "_args", generatedCode);+ const values = executeFn(variables, args) as Map<string, unknown>;return values;};diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.tsindex fabe8c7c0d..a5dbed1bdf 100644--- a/packages/react-sdk/src/props.ts+++ b/packages/react-sdk/src/props.ts@@ -55,15 +55,20 @@ export const useInstanceProps = (instanceId: Instance["id"]) => {continue;}if (prop.type === "action") {- instancePropsObject[prop.name] = () => {+ instancePropsObject[prop.name] = (...args: unknown[]) => {// prevent all actions in canvas modeif (renderer === "canvas") {return;}for (const value of prop.value) {if (value.type === "execute") {+ const argsMap = new Map<string, unknown>();+ for (const [i, name] of value.args.entries()) {+ argsMap.set(name, args[i]);+ }const newValues = executeEffectfulExpression(value.code,+ argsMap,dataSourceValues);setDataSourceValues(newValues);diff --git a/packages/react-sdk/src/tree/create-elements-tree.tsx b/packages/react-sdk/src/tree/create-elements-tree.tsxindex 499905727c..45746cfdbe 100644--- a/packages/react-sdk/src/tree/create-elements-tree.tsx+++ b/packages/react-sdk/src/tree/create-elements-tree.tsx@@ -40,6 +40,7 @@ export const createElementsTree = ({pagesStore: ReadableAtom<Pages>;executeEffectfulExpression: (expression: string,+ args: DataSourceValues,values: DataSourceValues) => DataSourceValues;dataSourceValuesStore: ReadableAtom<DataSourceValues>;