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
refactor: compute props contextually (#2628)
Bogdan Chadkin3cfa10ae2220
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex aacd8635df..4954f5bae4 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -16,10 +16,12 @@ import {} from "@webstudio-is/design-system";import { decodeDataSourceVariable } from "@webstudio-is/react-sdk";import {+ $propValuesByInstanceSelector,dataSourceVariablesStore,dataSourcesStore,propsIndexStore,propsStore,+ selectedInstanceSelectorStore,} from "~/shared/nano-states";import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";import {@@ -102,7 +104,7 @@ const renderProperty = (// fix the issue with changing type while binding expression// old prop value is getting preserved in useLocalValue and saved into variable// to reproduce try to edit body id prop and then bind json variable to it- <Fragment key={prop?.type ?? ""}>+ <Fragment key={(prop?.type ?? "") + propName}>{renderControl({key: propName,instanceId,@@ -207,6 +209,20 @@ export const PropsSection = (props: PropsSectionProps) => {);};+const getPropTypeAndValue = (value: unknown) => {+ if (typeof value === "boolean") {+ return { type: "boolean", value } as const;+ }+ if (typeof value === "number") {+ return { type: "number", value } as const;+ }+ if (typeof value === "string") {+ return { type: "string", value } as const;+ }+ // fallback to json+ return { type: "json", value } as const;+};+export const PropsSectionContainer = ({selectedInstance: instance,}: {@@ -216,10 +232,29 @@ export const PropsSectionContainer = ({selectedInstance: instance,});const { propsByInstanceId } = useStore(propsIndexStore);+ const propValuesByInstanceSelector = useStore($propValuesByInstanceSelector);+ const instanceSelector = useStore(selectedInstanceSelectorStore);+ const propValues = propValuesByInstanceSelector.get(+ JSON.stringify(instanceSelector)+ );const logic = usePropsLogic({instance,- props: propsByInstanceId.get(instance.id) ?? [],++ // compute expression prop values before rendering props section+ // to always show already computed values+ props:+ propsByInstanceId.get(instance.id)?.map((prop) => {+ if (prop.type !== "expression") {+ return prop;+ }+ const propValue = propValues?.get(prop.name);+ if (propValue === undefined) {+ return prop;+ }+ return { ...prop, ...getPropTypeAndValue(propValue) };+ }) ?? [],+updateProp: (update) => {const props = propsStore.get();const prop = props.get(update.id);@@ -257,6 +292,7 @@ export const PropsSectionContainer = ({});}},+deleteProp: (propId) => {serverSyncStore.createTransaction([propsStore], (props) => {props.delete(propId);diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.tsindex 096d84045c..d314d6f9c0 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts@@ -3,11 +3,7 @@ import type { Instance, Prop } from "@webstudio-is/sdk";import { type PropMeta, showAttribute } from "@webstudio-is/react-sdk";import type { PropValue } from "../shared";import { useStore } from "@nanostores/react";-import {- computeExpression,- dataSourcesLogicStore,- registeredComponentPropsMetasStore,-} from "~/shared/nano-states";+import { registeredComponentPropsMetasStore } from "~/shared/nano-states";type PropOrName = { prop?: Prop; propName: string };export type PropAndMeta = { prop?: Prop; propName: string; meta: PropMeta };@@ -131,20 +127,6 @@ const systemPropsMeta: { name: string; meta: PropMeta }[] = [},];-const getPropTypeAndValue = (value: unknown) => {- if (typeof value === "boolean") {- return { type: "boolean", value } as const;- }- if (typeof value === "number") {- return { type: "number", value } as const;- }- if (typeof value === "string") {- return { type: "string", value } as const;- }- // fallback to json- return { type: "json", value } as const;-};-/** usePropsLogic expects that key={instanceId} is used on the ancestor component */export const usePropsLogic = ({instance,@@ -155,29 +137,12 @@ export const usePropsLogic = ({const meta = useStore(registeredComponentPropsMetasStore).get(instance.component);- const dataSourcesLogic = useStore(dataSourcesLogicStore);if (meta === undefined) {throw new Error(`Could not get meta for component "${instance.component}"`);}- const savedProps = props.flatMap((prop): Prop[] => {- if (prop.type === "expression") {- // convert expression prop to value prop- const dataSourceValue = computeExpression(prop.value, dataSourcesLogic);- return [- {- id: prop.id,- instanceId: prop.instanceId,- name: prop.name,- required: prop.required,- // infer type from value- ...getPropTypeAndValue(dataSourceValue),- },- ];- }- return [prop];- });+ const savedProps = props;// we will delete items from these maps as we categorize the propsconst unprocessedSaved = new Map(savedProps.map((prop) => [prop.name, prop]));@@ -230,6 +195,11 @@ export const usePropsLogic = ({const addedProps: PropAndMeta[] = [];for (const prop of Array.from(unprocessedSaved.values()).reverse()) {+ // ignore parameter props+ if (prop.type === "parameter") {+ continue;+ }+let known = getAndDelete(unprocessedKnown, prop.name);// @todo:diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 9f028a6f71..42fdf673af 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -1,13 +1,10 @@import { useMemo, useEffect, useState } from "react";import { useStore } from "@nanostores/react";-import { computed } from "nanostores";-import type { Instances, Page } from "@webstudio-is/sdk";+import type { Instances } from "@webstudio-is/sdk";import {type Params,type Components,createElementsTree,- normalizeProps,- getPropsByInstanceId,} from "@webstudio-is/react-sdk";import * as baseComponents from "@webstudio-is/sdk-components-react";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";@@ -24,7 +21,6 @@ import { registerContainers, useCanvasStore } from "~/shared/sync";import { useManageDesignModeStyles, GlobalStyles } from "./shared/styles";import {WebstudioComponentCanvas,- WebstudioComponentContext,WebstudioComponentPreview,} from "./features/webstudio-component";import {@@ -35,7 +31,6 @@ import {registerComponentLibrary,registeredComponentsStore,subscribeComponentHooks,- propsStore,$isPreviewMode,} from "~/shared/nano-states";import { useDragAndDrop } from "./shared/use-drag-drop";@@ -51,6 +46,7 @@ import { subscribeInterceptedEvents } from "./interceptor";import type { ImageLoader } from "@webstudio-is/image";import { subscribeCommands } from "~/canvas/shared/commands";import { updateCollaborativeInstanceRect } from "./collaborative-instance";+import { $params } from "./stores";registerContainers();@@ -74,62 +70,24 @@ const useElementsTree = (});}- const pagesMapStore = useMemo(- () =>- computed(pagesStore, (pages): Map<string, Page> => {- if (pages === undefined) {- return new Map();- }- return new Map(- [pages.homePage, ...pages.pages].map((page) => [page.id, page])- );- }),- []- );-- const propsByInstanceIdStore = useMemo(() => {- return computed(- [propsStore, assetsStore, pagesMapStore],- (props, assets, pages) => {- if (pages === undefined) {- return new Map();- }- const normalizedProps = normalizeProps({- props: Array.from(props.values()),- assetBaseUrl: params.assetBaseUrl,- assets,- pages,- });- return getPropsByInstanceId(- new Map(normalizedProps.map((prop) => [prop.id, prop]))- );- }- );- }, [params.assetBaseUrl, pagesMapStore]);-return useMemo(() => {- return (- <WebstudioComponentContext.Provider value={{ propsByInstanceIdStore }}>- {createElementsTree({- renderer: isPreviewMode ? "preview" : "canvas",- imageBaseUrl: params.imageBaseUrl,- assetBaseUrl: params.assetBaseUrl,- imageLoader,- instances,- rootInstanceId,- Component: isPreviewMode- ? WebstudioComponentPreview- : WebstudioComponentCanvas,- components,- })}- </WebstudioComponentContext.Provider>- );+ return createElementsTree({+ renderer: isPreviewMode ? "preview" : "canvas",+ imageBaseUrl: params.imageBaseUrl,+ assetBaseUrl: params.assetBaseUrl,+ imageLoader,+ instances,+ rootInstanceId,+ Component: isPreviewMode+ ? WebstudioComponentPreview+ : WebstudioComponentCanvas,+ components,+ });}, [params,instances,rootInstanceId,components,- propsByInstanceIdStore,isPreviewMode,imageLoader,]);@@ -184,6 +142,11 @@ export const Canvas = ({});});+ useMount(() => {+ // required to compute asset and page props for rendering+ $params.set(params);+ });+useEffect(subscribeComponentHooks, []);useEffect(subscribeCommands, []);diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 9b3209023e..2f20c6f3f7 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -4,29 +4,26 @@ import {type ForwardedRef,useRef,useLayoutEffect,- useContext,useMemo,- createContext,} from "react";import { Suspense, lazy } from "react";-import { computed, type Atom, atom } from "nanostores";+import { computed } from "nanostores";import { useStore } from "@nanostores/react";import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";import { mergeRefs } from "@react-aria/utils";import type { Instance, Instances, Prop } from "@webstudio-is/sdk";import { findTreeInstanceIds } from "@webstudio-is/sdk";import {+ type WebstudioComponentProps,idAttribute,componentAttribute,showAttribute,selectorIdAttribute,indexAttribute,getIndexesWithinAncestors,- type WebstudioComponentProps,} from "@webstudio-is/react-sdk";import {- computeExpression,- dataSourcesLogicStore,+ $propValuesByInstanceSelector,instancesStore,registeredComponentMetasStore,selectedInstanceRenderStateStore,@@ -137,52 +134,29 @@ const $indexesWithinAncestors = computed(});-export const WebstudioComponentContext = createContext<{- propsByInstanceIdStore: Atom<Map<Instance["id"], Prop[]>>;-}>({- propsByInstanceIdStore: atom(new Map()),-});--const useInstanceProps = (instanceId: Instance["id"]) => {- const { propsByInstanceIdStore } = useContext(WebstudioComponentContext);+const useInstanceProps = (instanceSelector: InstanceSelector) => {+ const instanceSelectorKey = JSON.stringify(instanceSelector);+ const [instanceId] = instanceSelector;const instancePropsObjectStore = useMemo(() => {return computed(- [propsByInstanceIdStore, dataSourcesLogicStore, $indexesWithinAncestors],- (propsByInstanceId, dataSourcesLogic, indexesWithinAncestors) => {+ [$propValuesByInstanceSelector, $indexesWithinAncestors],+ (propValuesByInstanceSelector, indexesWithinAncestors) => {const instancePropsObject: Record<Prop["name"], unknown> = {};const index = indexesWithinAncestors.get(instanceId);if (index !== undefined) {instancePropsObject[indexAttribute] = index.toString();}- const instanceProps = propsByInstanceId.get(instanceId);- if (instanceProps === undefined) {- return instancePropsObject;- }- for (const prop of instanceProps) {- // asset and page are normalized to string- if (prop.type === "asset" || prop.type === "page") {- continue;+ const instanceProps =+ propValuesByInstanceSelector.get(instanceSelectorKey);+ if (instanceProps) {+ for (const [name, value] of instanceProps) {+ instancePropsObject[name] = value;}- if (prop.type === "expression") {- const value = computeExpression(prop.value, dataSourcesLogic);- if (value !== undefined) {- instancePropsObject[prop.name] = value;- }- continue;- }- if (prop.type === "action") {- const action = dataSourcesLogic.get(prop.id);- if (typeof action === "function") {- instancePropsObject[prop.name] = action;- }- continue;- }- instancePropsObject[prop.name] = prop.value;}return instancePropsObject;});- }, [propsByInstanceIdStore, instanceId]);+ }, [instanceSelectorKey, instanceId]);const instancePropsObject = useStore(instancePropsObjectStore);return instancePropsObject;};@@ -261,9 +235,8 @@ export const WebstudioComponentCanvas = forwardRef<textEditingInstanceSelectorStore);- const { [showAttribute]: show = true, ...instanceProps } = useInstanceProps(- instance.id- );+ const { [showAttribute]: show = true, ...instanceProps } =+ useInstanceProps(instanceSelector);/*** Prevents edited element from having a size of 0 on the first render.@@ -378,9 +351,8 @@ export const WebstudioComponentPreview = forwardRef<>(({ instance, instanceSelector, children, components, ...restProps }, ref) => {const instanceStyles = useInstanceStyles(instance.id);useCssRules({ instanceId: instance.id, instanceStyles });- const { [showAttribute]: show = true, ...instanceProps } = useInstanceProps(- instance.id- );+ const { [showAttribute]: show = true, ...instanceProps } =+ useInstanceProps(instanceSelector);const props = {...mergeProps(restProps, instanceProps, "merge"),[idAttribute]: instance.id,diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.tsindex 96fda33403..4213f08c3b 100644--- a/apps/builder/app/canvas/instance-selected.ts+++ b/apps/builder/app/canvas/instance-selected.ts@@ -9,10 +9,8 @@ import {selectedInstanceRenderStateStore,stylesIndexStore,instancesStore,- propsStore,- dataSourcesLogicStore,selectedInstanceSelectorStore,- dataSourceVariablesStore,+ $propValuesByInstanceSelector,} from "~/shared/nano-states";import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import {@@ -227,12 +225,8 @@ const subscribeSelectedInstance = (const unsubscribeStylesIndexStore = stylesIndexStore.subscribe(update);const unsubscribeInstancesStore = instancesStore.subscribe(update);- const unsubscribePropsStore = propsStore.subscribe(update);- const unsubscribeDataSourcesLogicStore =- dataSourcesLogicStore.subscribe(update);-- const unsubscribeDataSourceVariablesStore =- dataSourceVariablesStore.subscribe(update);+ const unsubscribePropValuesStore =+ $propValuesByInstanceSelector.subscribe(update);const unsubscribeIsResizingCanvas = isResizingCanvasStore.subscribe((isResizing) => {@@ -275,9 +269,7 @@ const subscribeSelectedInstance = (unsubscribeWindowResize();unsubscribeStylesIndexStore();unsubscribeInstancesStore();- unsubscribePropsStore();- unsubscribeDataSourcesLogicStore();- unsubscribeDataSourceVariablesStore();+ unsubscribePropValuesStore();};};diff --git a/apps/builder/app/canvas/stores.ts b/apps/builder/app/canvas/stores.tsindex 0d1ee11d2b..3b572d204c 100644--- a/apps/builder/app/canvas/stores.ts+++ b/apps/builder/app/canvas/stores.ts@@ -1,5 +1,6 @@import { atom } from "nanostores";import type { Instance, StyleDecl } from "@webstudio-is/sdk";+import type { Params } from "@webstudio-is/react-sdk";export const $ephemeralStyles = atom<Array<{@@ -10,3 +11,5 @@ export const $ephemeralStyles = atom<value: StyleDecl["value"];}>>([]);++export const $params = atom<undefined | Params>();diff --git a/apps/builder/app/shared/array-utils.test.ts b/apps/builder/app/shared/array-utils.test.tsindex b8442a88b4..90fc11cb3f 100644--- a/apps/builder/app/shared/array-utils.test.ts+++ b/apps/builder/app/shared/array-utils.test.ts@@ -2,6 +2,7 @@ import { expect, test } from "@jest/globals";import {getMapValuesBy,getMapValuesByKeysSet,+ groupBy,removeByMutable,} from "./array-utils";@@ -62,3 +63,12 @@ test("getMapValuesBy", () => {getMapValuesBy(map, (value) => value.includes("3") || value.includes("5"))).toEqual(["value3", "value5"]);});++test("groupBy", () => {+ expect(groupBy([1, 2, 3, 4, 5], (item) => item % 2)).toEqual(+ new Map([+ [0, [2, 4]],+ [1, [1, 3, 5]],+ ])+ );+});diff --git a/apps/builder/app/shared/array-utils.ts b/apps/builder/app/shared/array-utils.tsindex e1a34f32b7..982e0493eb 100644--- a/apps/builder/app/shared/array-utils.ts+++ b/apps/builder/app/shared/array-utils.ts@@ -38,3 +38,21 @@ export const getMapValuesBy = <Key, Value>(}return values;};++// @todo replace with builtin Map.groupBy when support+export const groupBy = <Item, Key>(+ array: Item[] | IterableIterator<Item>,+ getKey: (item: Item) => Key+) => {+ const groups = new Map<Key, Item[]>();+ for (const item of array) {+ const key = getKey(item);+ let group = groups.get(key);+ if (group === undefined) {+ group = [];+ groups.set(key, group);+ }+ group.push(item);+ }+ return groups;+};diff --git a/apps/builder/app/shared/nano-states/index.ts b/apps/builder/app/shared/nano-states/index.tsindex 546810d68b..c863c4c25a 100644--- a/apps/builder/app/shared/nano-states/index.ts+++ b/apps/builder/app/shared/nano-states/index.ts@@ -1,6 +1,7 @@export * from "./nano-states";export * from "./breakpoints";export * from "./instances";+export * from "./props";export * from "./canvas";export * from "./pages";export * from "./components";diff --git a/apps/builder/app/shared/nano-states/instances.ts b/apps/builder/app/shared/nano-states/instances.tsindex 503c6a5d38..3d1dfec1c3 100644--- a/apps/builder/app/shared/nano-states/instances.ts+++ b/apps/builder/app/shared/nano-states/instances.ts@@ -15,6 +15,7 @@ export const textEditingInstanceSelectorStore = atom<>();export const instancesStore = atom<Instances>(new Map());+export const $instances = instancesStore;export const selectedInstanceStore = computed([instancesStore, selectedInstanceSelectorStore],diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex b20cf58fad..8c3218fe81 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -4,24 +4,19 @@ import { useStore } from "@nanostores/react";import { nanoid } from "nanoid";import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";import type { ItemDropTarget, Placement } from "@webstudio-is/design-system";-import {- createScope,- type Assets,- type DataSource,- type DataSources,- type Instance,- type Prop,- type Props,- type StyleDecl,- type Styles,- type StyleSource,- type StyleSources,- type StyleSourceSelections,+import type {+ Assets,+ DataSource,+ DataSources,+ Instance,+ Prop,+ Props,+ StyleDecl,+ Styles,+ StyleSource,+ StyleSources,+ StyleSourceSelections,} from "@webstudio-is/sdk";-import {- encodeDataSourceVariable,- generateDataSources,-} from "@webstudio-is/react-sdk";import type { Style } from "@webstudio-is/css-engine";import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";import { shallowComputed } from "../store-utils";@@ -47,11 +42,14 @@ export const rootInstanceStore = computed();export const dataSourcesStore = atom<DataSources>(new Map());+export const $dataSources = dataSourcesStore;export const dataSourceVariablesStore = atom<Map<DataSource["id"], unknown>>(new Map());+export const $dataSourceVariables = dataSourceVariablesStore;export const propsStore = atom<Props>(new Map());+export const $props = propsStore;export const propsIndexStore = computed(propsStore, (props) => {const propsByInstanceId = new Map<Instance["id"], Prop[]>();for (const prop of props.values()) {@@ -68,76 +66,6 @@ export const propsIndexStore = computed(propsStore, (props) => {};});-// result of executing generated code-// includes variables, computed expressions and action callbacks-export const dataSourcesLogicStore = computed(- [dataSourcesStore, dataSourceVariablesStore, propsStore],- (dataSources, dataSourceVariables, props) => {- const { variables, body, output } = generateDataSources({- scope: createScope(["_getVariable", "_setVariable", "_output"]),- dataSources,- props,- });- let generatedCode = "";- for (const [dataSourceId, variable] of variables) {- const { valueName, setterName } = variable;- const initialValue = JSON.stringify(variable.initialValue);- generatedCode += `let ${valueName} = _getVariable("${dataSourceId}") ?? ${initialValue};\n`;- generatedCode += `let ${setterName} = (value) => _setVariable("${dataSourceId}", value);\n`;- }- generatedCode += body;- generatedCode += `let _output = new Map();\n`;- for (const [dataSourceId, variableName] of output) {- generatedCode += `_output.set('${dataSourceId}', ${variableName})\n`;- }- generatedCode += `return _output\n`;-- try {- const executeFn = new Function(- "_getVariable",- "_setVariable",- generatedCode- );- const getVariable = (id: string) => {- return dataSourceVariables.get(id);- };- const setVariable = (id: string, value: unknown) => {- const dataSourceVariables = new Map(dataSourceVariablesStore.get());- dataSourceVariables.set(id, value);- dataSourceVariablesStore.set(dataSourceVariables);- };- return executeFn(getVariable, setVariable);- } catch (error) {- // eslint-disable-next-line no-console- console.error(error);- }- return new Map();- }-);--export const computeExpression = (- expression: string,- variables: Map<DataSource["id"], unknown>-) => {- let code = "";- for (const [id, value] of variables) {- // @todo pass dedicated map of variables without actions- // skip actions- if (typeof value === "function") {- continue;- }- const identifier = encodeDataSourceVariable(id);- code += `const ${identifier} = ${JSON.stringify(value)};\n`;- }- code += `return (${expression})`;- try {- const result = new Function(code)();- return result;- } catch {- // empty block- }-};-export const stylesStore = atom<Styles>(new Map());export const useInstanceStyles = (instanceId: undefined | Instance["id"]) => {@@ -211,6 +139,7 @@ export const stylesIndexStore = computed();export const assetsStore = atom<Assets>(new Map());+export const $assets = assetsStore;export const selectedInstanceBrowserStyleStore = atom<undefined | Style>();diff --git a/apps/builder/app/shared/nano-states/pages.ts b/apps/builder/app/shared/nano-states/pages.tsindex b703801275..270c20533e 100644--- a/apps/builder/app/shared/nano-states/pages.ts+++ b/apps/builder/app/shared/nano-states/pages.ts@@ -2,8 +2,10 @@ import { atom, computed } from "nanostores";import type { Page, Pages } from "@webstudio-is/sdk";export const pagesStore = atom<undefined | Pages>(undefined);+export const $pages = pagesStore;export const selectedPageIdStore = atom<undefined | Page["id"]>(undefined);+export const $selectedPageId = selectedPageIdStore;export const selectedPageHashStore = atom<string>("");export const selectedPageStore = computed(@@ -18,3 +20,4 @@ export const selectedPageStore = computed(return pages.pages.find((page) => page.id === selectedPageId);});+export const $selectedPage = selectedPageStore;diff --git a/apps/builder/app/shared/nano-states/props.test.ts b/apps/builder/app/shared/nano-states/props.test.tsnew file mode 100644index 0000000000..44fe72d2e3--- /dev/null+++ b/apps/builder/app/shared/nano-states/props.test.ts@@ -0,0 +1,254 @@+import { expect, test } from "@jest/globals";+import { cleanStores } from "nanostores";+import type { Instance, Page } from "@webstudio-is/sdk";+import { $instances } from "./instances";+import { $propValuesByInstanceSelector } from "./props";+import { $pages, $selectedPageId } from "./pages";+import {+ $assets,+ $dataSourceVariables,+ $dataSources,+ $props,+} from "./nano-states";+import { $params } from "~/canvas/stores";++const getIdValuePair = <T extends { id: string }>(item: T) =>+ [item.id, item] as const;++const toMap = <T extends { id: string }>(list: T[]) =>+ new Map(list.map(getIdValuePair));++const setBoxInstance = (id: Instance["id"]) => {+ $instances.set(+ toMap([{ id, type: "instance", component: "Box", children: [] }])+ );+};++const selectPageRoot = (rootInstanceId: Instance["id"]) => {+ $pages.set({+ homePage: { id: "pageId", rootInstanceId, path: "/my-page" } as Page,+ pages: [],+ });+ $selectedPageId.set("pageId");+};++test("collect prop values", () => {+ setBoxInstance("box");+ selectPageRoot("box");+ $dataSources.set(new Map());+ $props.set(+ toMap([+ {+ id: "prop1",+ name: "first",+ instanceId: "box",+ type: "number",+ value: 0,+ },+ {+ id: "prop2",+ name: "second",+ instanceId: "box",+ type: "json",+ value: { name: "John" },+ },+ ])+ );+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(+ new Map<string, unknown>([+ ["first", 0],+ ["second", { name: "John" }],+ ])+ );++ cleanStores($propValuesByInstanceSelector);+});++test("compute expression prop values", () => {+ setBoxInstance("box");+ selectPageRoot("box");+ $dataSources.set(+ toMap([+ {+ id: "var1",+ type: "variable",+ name: "",+ value: { type: "number", value: 1 },+ },+ {+ id: "var2",+ type: "variable",+ name: "",+ value: { type: "string", value: "Hello" },+ },+ ])+ );+ $props.set(+ toMap([+ {+ id: "prop1",+ name: "first",+ instanceId: "box",+ type: "expression",+ value: `$ws$dataSource$var1 + 2`,+ },+ {+ id: "prop2",+ name: "second",+ instanceId: "box",+ type: "expression",+ value: `$ws$dataSource$var2 + ' World!'`,+ },+ ])+ );+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(+ new Map<string, unknown>([+ ["first", 3],+ ["second", "Hello World!"],+ ])+ );++ $dataSourceVariables.set(new Map([["var1", 4]]));+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(+ new Map<string, unknown>([+ ["first", 6],+ ["second", "Hello World!"],+ ])+ );++ cleanStores($propValuesByInstanceSelector);+});++test("generate action prop callbacks", () => {+ setBoxInstance("box");+ selectPageRoot("box");+ $dataSources.set(+ toMap([+ {+ id: "var",+ type: "variable",+ name: "",+ value: { type: "number", value: 1 },+ },+ ])+ );+ $props.set(+ toMap([+ {+ id: "valueId",+ name: "value",+ instanceId: "box",+ type: "expression",+ value: `$ws$dataSource$var`,+ },+ {+ id: "actionId",+ name: "onChange",+ instanceId: "box",+ type: "action",+ value: [+ {+ type: "execute",+ args: [],+ code: `$ws$dataSource$var = $ws$dataSource$var + 1`,+ },+ ],+ },+ ])+ );+ const values1 = $propValuesByInstanceSelector+ .get()+ .get(JSON.stringify(["box"]));+ expect(values1?.get("value")).toEqual(1);++ (values1?.get("onChange") as () => void)();+ const values2 = $propValuesByInstanceSelector+ .get()+ .get(JSON.stringify(["box"]));+ expect(values2?.get("value")).toEqual(2);++ cleanStores($propValuesByInstanceSelector);+});++test("resolve asset prop values when params is provided", () => {+ setBoxInstance("box");+ selectPageRoot("box");+ $dataSources.set(new Map());+ $params.set(undefined);+ $assets.set(+ toMap([+ {+ id: "assetId",+ type: "image",+ name: "my-file.jpg",+ format: "jpeg",+ size: 0,+ projectId: "",+ createdAt: "",+ meta: { width: 0, height: 0 },+ description: "",+ },+ ])+ );+ $props.set(+ toMap([+ {+ id: "propId",+ name: "myAsset",+ instanceId: "box",+ type: "asset",+ value: "assetId",+ },+ ])+ );+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(new Map());++ $params.set({+ assetBaseUrl: "/asset/",+ imageBaseUrl: "/image/",+ });+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(new Map<string, unknown>([["myAsset", "/asset/my-file.jpg"]]));++ cleanStores($propValuesByInstanceSelector);+});++test("resolve page prop values when params is provided", () => {+ setBoxInstance("box");+ selectPageRoot("box");+ $params.set(undefined);+ $dataSources.set(new Map());+ $props.set(+ toMap([+ {+ id: "propId",+ name: "myPage",+ instanceId: "box",+ type: "page",+ value: "pageId",+ },+ ])+ );+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(new Map());++ $params.set({+ assetBaseUrl: "/asset/",+ imageBaseUrl: "/image/",+ });+ expect(+ $propValuesByInstanceSelector.get().get(JSON.stringify(["box"]))+ ).toEqual(new Map<string, unknown>([["myPage", "/my-page"]]));++ cleanStores($propValuesByInstanceSelector);+});diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.tsnew file mode 100644index 0000000000..c9ce5336c7--- /dev/null+++ b/apps/builder/app/shared/nano-states/props.ts@@ -0,0 +1,201 @@+import { computed } from "nanostores";+import {+ createScope,+ type DataSource,+ type Instance,+ type Page,+ type Prop,+} from "@webstudio-is/sdk";+import {+ encodeDataSourceVariable,+ generateDataSources,+ normalizeProps,+} from "@webstudio-is/react-sdk";+import { $instances } from "./instances";+import {+ $dataSourceVariables,+ $dataSources,+ $props,+ $assets,+} from "./nano-states";+import { $selectedPage, $pages } from "./pages";+import { groupBy } from "../array-utils";+import type { InstanceSelector } from "../tree-utils";+import { $params } from "~/canvas/stores";++// result of executing generated code+// includes variables, computed expressions and action callbacks+const $dataSourcesLogic = computed(+ [$dataSources, $dataSourceVariables, $props],+ (dataSources, dataSourceVariables, props) => {+ const { variables, body, output } = generateDataSources({+ scope: createScope(["_getVariable", "_setVariable", "_output"]),+ dataSources,+ props,+ });+ let generatedCode = "";+ for (const [dataSourceId, variable] of variables) {+ const { valueName, setterName } = variable;+ const initialValue = JSON.stringify(variable.initialValue);+ generatedCode += `let ${valueName} = _getVariable("${dataSourceId}") ?? ${initialValue};\n`;+ generatedCode += `let ${setterName} = (value) => _setVariable("${dataSourceId}", value);\n`;+ }+ generatedCode += body;+ generatedCode += `let _output = new Map();\n`;+ for (const [dataSourceId, variableName] of output) {+ generatedCode += `_output.set('${dataSourceId}', ${variableName})\n`;+ }+ generatedCode += `return _output\n`;++ try {+ const executeFn = new Function(+ "_getVariable",+ "_setVariable",+ generatedCode+ );+ const getVariable = (id: string) => {+ return dataSourceVariables.get(id);+ };+ const setVariable = (id: string, value: unknown) => {+ const dataSourceVariables = new Map($dataSourceVariables.get());+ dataSourceVariables.set(id, value);+ $dataSourceVariables.set(dataSourceVariables);+ };+ return executeFn(getVariable, setVariable);+ } catch (error) {+ // eslint-disable-next-line no-console+ console.error(error);+ }+ return new Map();+ }+);++const computeExpression = (+ expression: string,+ variables: Map<DataSource["id"], unknown>+) => {+ let code = "";+ for (const [id, value] of variables) {+ // @todo pass dedicated map of variables without actions+ // skip actions+ if (typeof value === "function") {+ continue;+ }+ const identifier = encodeDataSourceVariable(id);+ code += `const ${identifier} = ${JSON.stringify(value)};\n`;+ }+ code += `return (${expression})`;+ try {+ const result = new Function(code)();+ return result;+ } catch {+ // empty block+ }+};++const $pagesMap = computed($pages, (pages): Map<string, Page> => {+ if (pages === undefined) {+ return new Map();+ }+ return new Map(+ [pages.homePage, ...pages.pages].map((page) => [page.id, page])+ );+});++/**+ * compute prop values within context of instance ancestors+ * like a dry-run of rendering and accessing react contexts deep in the tree+ * essential to support collections which provide different values in each item+ * for same variables+ */+export const $propValuesByInstanceSelector = computed(+ [+ $instances,+ $props,+ $selectedPage,+ $dataSourcesLogic,+ $params,+ $pagesMap,+ $assets,+ ],+ (instances, props, page, dataSourcesLogic, params, pages, assets) => {+ const values = new Map<string, unknown>(dataSourcesLogic);++ // collect props and group by instances+ const propsByInstanceId = groupBy(+ props.values(),+ (prop) => prop.instanceId+ );++ // traverse instances tree and compute props within each instance+ const propValuesByInstanceSelector = new Map<+ Instance["id"],+ Map<Prop["name"], unknown>+ >();+ if (page === undefined) {+ return propValuesByInstanceSelector;+ }+ const traverseInstances = (instanceSelector: InstanceSelector) => {+ const [instanceId] = instanceSelector;+ const instance = instances.get(instanceId);+ if (instance === undefined) {+ return;+ }++ const propValues = new Map<Prop["name"], unknown>();+ let props = propsByInstanceId.get(instanceId);+ // @todo store parameters to update with core components later+ const parameters = new Map<Prop["name"], DataSource["id"]>();+ if (props) {+ // ignore asset and page props when params is not provided+ // important to resolve only in canvas+ if (params) {+ props = normalizeProps({+ props,+ assetBaseUrl: params.assetBaseUrl,+ assets,+ pages,+ });+ }+ for (const prop of props) {+ // at this point asset and page either already converted to string+ // or can be ignored+ if (prop.type === "asset" || prop.type === "page") {+ continue;+ }+ if (prop.type === "expression") {+ const value = computeExpression(prop.value, values);+ if (value !== undefined) {+ propValues.set(prop.name, value);+ }+ continue;+ }+ if (prop.type === "action") {+ const action = values.get(prop.id);+ if (typeof action === "function") {+ propValues.set(prop.name, action);+ }+ continue;+ }+ if (prop.type === "parameter") {+ parameters.set(prop.name, prop.value);+ continue;+ }+ propValues.set(prop.name, prop.value);+ }+ }++ propValuesByInstanceSelector.set(+ JSON.stringify(instanceSelector),+ propValues+ );+ for (const child of instance.children) {+ if (child.type === "id") {+ traverseInstances([child.value, ...instanceSelector]);+ }+ }+ };+ traverseInstances([page.rootInstanceId]);+ return propValuesByInstanceSelector;+ }+);diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.tsindex ad666f0e2e..fb48bfbf23 100644--- a/packages/react-sdk/src/props.ts+++ b/packages/react-sdk/src/props.ts@@ -1,6 +1,4 @@-import type { Instance, Page, Prop, Props, Assets } from "@webstudio-is/sdk";--export type PropsByInstanceId = Map<Instance["id"], Prop[]>;+import type { Page, Prop, Assets } from "@webstudio-is/sdk";export type Pages = Map<Page["id"], Page>;@@ -73,19 +71,6 @@ export const normalizeProps = ({return newProps;};-export const getPropsByInstanceId = (props: Props) => {- const propsByInstanceId: PropsByInstanceId = new Map();- for (const prop of props.values()) {- let instanceProps = propsByInstanceId.get(prop.instanceId);- if (instanceProps === undefined) {- instanceProps = [];- propsByInstanceId.set(prop.instanceId, instanceProps);- }- instanceProps.push(prop);- }- return propsByInstanceId;-};-export const idAttribute = "data-ws-id" as const;export const selectorIdAttribute = "data-ws-selector" as const;export const componentAttribute = "data-ws-component" as const;