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
Scope data sources to instances (#1885)
Bogdan Chadkin1d0967e9272a
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex 055254c289..cc623b5d9b 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -275,8 +275,16 @@ export const deleteInstance = (instanceSelector: InstanceSelector) => {styleSourceSelectionsStore,styleSourcesStore,stylesStore,+ dataSourcesStore,],- (instances, props, styleSourceSelections, styleSources, styles) => {+ (+ instances,+ props,+ styleSourceSelections,+ styleSources,+ styles,+ dataSources+ ) => {let targetInstanceId = instanceSelector[0];const parentInstanceId = instanceSelector[1];const grandparentInstanceId = instanceSelector[2];@@ -318,12 +326,20 @@ export const deleteInstance = (instanceSelector: InstanceSelector) => {for (const instanceId of instanceIds) {instances.delete(instanceId);}- // delete props and styles of deleted instance and its descendants+ // delete props, data sources and styles of deleted instance and its descendantsfor (const prop of props.values()) {if (instanceIds.has(prop.instanceId)) {props.delete(prop.id);}}+ for (const dataSource of dataSources.values()) {+ if (+ dataSource.scopeInstanceId !== undefined &&+ instanceIds.has(dataSource.scopeInstanceId)+ ) {+ dataSources.delete(dataSource.id);+ }+ }for (const instanceId of instanceIds) {styleSourceSelections.delete(instanceId);}diff --git a/packages/project-build/src/schema/data-sources.ts b/packages/project-build/src/schema/data-sources.tsindex 41947ac07f..f5ed1ee55f 100644--- a/packages/project-build/src/schema/data-sources.ts+++ b/packages/project-build/src/schema/data-sources.ts@@ -26,12 +26,14 @@ export const DataSource = z.union([z.object({type: z.literal("variable"),id: DataSourceId,+ scopeInstanceId: z.optional(z.string()),name: z.string(),value: DataSourceVariableValue,}),z.object({type: z.literal("expression"),id: DataSourceId,+ scopeInstanceId: z.optional(z.string()),name: z.string(),code: z.string(),}),diff --git a/packages/react-sdk/src/embed-template.test.ts b/packages/react-sdk/src/embed-template.test.tsindex c5b75a4f5e..56f6ce1161 100644--- a/packages/react-sdk/src/embed-template.test.ts+++ b/packages/react-sdk/src/embed-template.test.ts@@ -281,6 +281,7 @@ test("generate data for embedding from props bound to data source variables", (){type: "variable",id: expectString,+ scopeInstanceId: expectString,name: "showOtherBoxDataSource",value: {type: "boolean",@@ -363,6 +364,7 @@ test("generate data for embedding from props bound to data source expressions",{type: "variable",id: expectString,+ scopeInstanceId: expectString,name: "boxState",value: {type: "string",@@ -372,6 +374,7 @@ test("generate data for embedding from props bound to data source expressions",{type: "expression",id: expectString,+ scopeInstanceId: expectString,name: "boxStateSuccess",code: expect.stringMatching(/\$ws\$dataSource\$\w+ === 'success'/),},diff --git a/packages/react-sdk/src/embed-template.ts b/packages/react-sdk/src/embed-template.tsindex f1b47a7761..30ce2b4afe 100644--- a/packages/react-sdk/src/embed-template.ts+++ b/packages/react-sdk/src/embed-template.ts@@ -136,6 +136,8 @@ const createInstancesFromTemplate = (dataSource = {type: "variable",id,+ // the first instance where data source is appeared in becomes its scope+ scopeInstanceId: instanceId,name: dataSourceRef.name,value: rest,};@@ -144,6 +146,7 @@ const createInstancesFromTemplate = (dataSource = {type: "expression",id,+ scopeInstanceId: instanceId,name: dataSourceRef.name,code: dataSourceRef.code,};diff --git a/packages/react-sdk/src/expression.test.ts b/packages/react-sdk/src/expression.test.tsindex 34d7f8caa6..f680e433c6 100644--- a/packages/react-sdk/src/expression.test.ts+++ b/packages/react-sdk/src/expression.test.ts@@ -37,6 +37,12 @@ test("forbid call expressions", () => {}).toThrowError(/Cannot call "this.fn1"/);});+test("forbid ternary", () => {+ expect(() => {+ validateExpression("var1 ? var2 : var3");+ }).toThrowError(/Ternary operator is not supported/);+});+test("forbid multiple expressions", () => {expect(() => {validateExpression("a b");diff --git a/packages/react-sdk/src/expression.ts b/packages/react-sdk/src/expression.tsindex 9d9ddff19d..4586df559d 100644--- a/packages/react-sdk/src/expression.ts+++ b/packages/react-sdk/src/expression.ts@@ -93,11 +93,13 @@ const generateCode = (}return "this";}+ if (node.type === "ConditionalExpression") {+ throw Error("Ternary operator is not supported");+ }if (node.type === "Compound") {throw Error("Cannot use multiple expressions");}- // plugin is not added- node.type satisfies "ConditionalExpression";+ node satisfies never;return "";};diff --git a/packages/sdk-size-test/package.json b/packages/sdk-size-test/package.jsonindex a75c40dd19..5280582ed5 100644--- a/packages/sdk-size-test/package.json+++ b/packages/sdk-size-test/package.json@@ -15,7 +15,7 @@},{"path": "functions/*.js",- "limit": "229 kB",+ "limit": "230 kB","gzip": false}],