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.

Migrate styles to style sources variant (#917)

Bogdan Chadkin118e07aeb02c
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsx
index 951ce6cd71..5850dcc508 100644
--- a/apps/designer/app/canvas/canvas.tsx
+++ b/apps/designer/app/canvas/canvas.tsx
@@ -131,7 +131,7 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {
useSetProps(data.tree.props);
// inject props store to sdk
setPropsByInstanceIdStore(propsByInstanceIdStore);
- useSetStyles(data.tree.styles);
+ useSetStyles(data.build.styles);
useSetStyleSources(data.build.styleSources);
useSetStyleSourceSelections(data.tree.styleSourceSelections);
useSetRootInstance(data.tree.root);
diff --git a/apps/designer/app/designer/features/style-panel/shared/style-info.test.ts b/apps/designer/app/designer/features/style-panel/shared/style-info.test.ts
index 7e1c76917e..e6e492e6ed 100644
--- a/apps/designer/app/designer/features/style-panel/shared/style-info.test.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/style-info.test.ts
@@ -40,32 +40,32 @@ const cascadingStylesByInstanceId = new Map<Instance["id"], Styles>();
cascadingStylesByInstanceId.set(selectedInstanceId, [
{
breakpointId: "1",
- instanceId: selectedInstanceId,
+ styleSourceId: "styleSourceId",
property: "width",
value: { type: "unit", value: 100, unit: "px" },
},
{
breakpointId: "1",
- instanceId: selectedInstanceId,
+ styleSourceId: "styleSourceId",
property: "height",
value: { type: "unit", value: 50, unit: "px" },
},
{
breakpointId: "2",
- instanceId: selectedInstanceId,
+ styleSourceId: "styleSourceId",
property: "width",
value: { type: "unit", value: 200, unit: "px" },
},
{
breakpointId: "3",
- instanceId: selectedInstanceId,
+ styleSourceId: "styleSourceId",
// should not be computed because current breakpoint
property: "height",
value: { type: "unit", value: 150, unit: "px" },
},
{
breakpointId: "4",
- instanceId: selectedInstanceId,
+ styleSourceId: "styleSourceId",
property: "width",
value: { type: "unit", value: 400, unit: "px" },
},
@@ -97,7 +97,7 @@ inheritingStylesByInstanceId.set("1", [
// should be inherited even from another breakpoint
{
breakpointId: "1",
- instanceId: "1",
+ styleSourceId: "styleSourceId1",
property: "fontSize",
value: { type: "unit", value: 20, unit: "px" },
},
@@ -106,14 +106,14 @@ inheritingStylesByInstanceId.set("2", [
// should not be inherited because width is not inheritable
{
breakpointId: "3",
- instanceId: "2",
+ styleSourceId: "styleSourceId2",
property: "width",
value: { type: "unit", value: 100, unit: "px" },
},
// should be inherited from selected breakpoint
{
breakpointId: "3",
- instanceId: "2",
+ styleSourceId: "styleSourceId2",
property: "fontWeight",
value: { type: "keyword", value: "600" },
},
@@ -122,7 +122,7 @@ inheritingStylesByInstanceId.set("3", [
// should not show selected style as inherited
{
breakpointId: "3",
- instanceId: "3",
+ styleSourceId: "styleSourceId3",
property: "fontWeight",
value: { type: "keyword", value: "500" },
},
diff --git a/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts b/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
index 3214887aca..29dd69b47a 100644
--- a/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/use-style-data.ts
@@ -1,5 +1,6 @@
-import { useCallback } from "react";
-import ObjectID from "bson-objectid";
+import { useCallback, useMemo } from "react";
+import { useStore } from "@nanostores/react";
+import ObjectId from "bson-objectid";
import store from "immerhin";
import warnOnce from "warn-once";
import type { Instance, Tree } from "@webstudio-is/project-build";
@@ -7,6 +8,7 @@ import type { StyleUpdates } from "@webstudio-is/project";
import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
import { type Publish } from "~/shared/pubsub";
import {
+ styleSourceSelectionsIndexStore,
styleSourceSelectionsStore,
styleSourcesStore,
stylesStore,
@@ -19,6 +21,7 @@ import {
// @todo: must be removed, now it's only for compatibility with existing code
import { parseCssValue } from "./parse-css-value";
import { useStyleInfo } from "./style-info";
+import { shallowComputed } from "~/shared/store-utils";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -59,6 +62,22 @@ export const useStyleData = ({
publish,
}: UseStyleData) => {
const [selectedBreakpoint] = useSelectedBreakpoint();
+ const instanceStyleSourcesStore = useMemo(() => {
+ return shallowComputed(
+ [styleSourceSelectionsIndexStore],
+ (styleSourceSelectionsIndex) => {
+ return (
+ styleSourceSelectionsIndex.styleSourcesByInstanceId.get(
+ selectedInstance.id
+ ) ?? []
+ );
+ }
+ );
+ }, [selectedInstance.id]);
+ const instanceStyleSources = useStore(instanceStyleSourcesStore);
+ const localStyleSource = instanceStyleSources.find(
+ (styleSource) => styleSource.type === "local"
+ );
const currentStyle = useStyleInfo();
@@ -85,23 +104,23 @@ export const useStyleData = ({
(styleSourceSelections, styleSources, styles) => {
const instanceId = selectedInstance.id;
const breakpointId = selectedBreakpoint.id;
-
+ const styleSourceId = localStyleSource?.id ?? ObjectId().toString();
// crate style source and its selection on currently selected instance
- const matchedStyleSourceSelection = styleSourceSelections.find(
- (styleSourceSelection) =>
- styleSourceSelection.instanceId === instanceId
- );
- if (matchedStyleSourceSelection === undefined) {
- const styleSourceId = ObjectID.toString();
+ if (localStyleSource === undefined) {
styleSources.push({
type: "local",
id: styleSourceId,
treeId,
});
- styleSourceSelections.push({
- instanceId,
- values: [styleSourceId],
- });
+ replaceByOrAppendMutable(
+ styleSourceSelections,
+ {
+ instanceId,
+ values: [styleSourceId],
+ },
+ (styleSourceSelection) =>
+ styleSourceSelection.instanceId === instanceId
+ );
}
for (const update of updates) {
@@ -110,12 +129,12 @@ export const useStyleData = ({
styles,
{
breakpointId,
- instanceId,
+ styleSourceId,
property: update.property,
value: update.value,
},
(item) =>
- item.instanceId === instanceId &&
+ item.styleSourceId === styleSourceId &&
item.breakpointId === breakpointId &&
item.property === update.property
);
@@ -125,7 +144,7 @@ export const useStyleData = ({
removeByMutable(
styles,
(item) =>
- item.instanceId === instanceId &&
+ item.styleSourceId === styleSourceId &&
item.breakpointId === breakpointId &&
item.property === update.property
);
@@ -134,7 +153,7 @@ export const useStyleData = ({
}
);
},
- [publish, selectedBreakpoint, selectedInstance, treeId]
+ [publish, selectedBreakpoint, selectedInstance, localStyleSource, treeId]
);
// @deprecated should not be called
diff --git a/apps/designer/app/routes/rest/patch.ts b/apps/designer/app/routes/rest/patch.ts
index 995d94b570..55466c4197 100644
--- a/apps/designer/app/routes/rest/patch.ts
+++ b/apps/designer/app/routes/rest/patch.ts
@@ -37,13 +37,19 @@ export const action = async ({ request }: ActionArgs) => {
if (namespace === "root") {
await projectDb.tree.patch({ treeId, projectId }, patches, context);
} else if (namespace === "styleSourceSelections") {
- // @todo enable when styles migrated to style sources
- continue;
+ await projectDb.styleSourceSelections.patch(
+ { treeId, projectId },
+ patches,
+ context
+ );
} else if (namespace === "styleSources") {
- // @todo enable when styles migrated to style sources
- continue;
+ await projectDb.styleSources.patch(
+ { buildId, projectId },
+ patches,
+ context
+ );
} else if (namespace === "styles") {
- await projectDb.styles.patch({ treeId, projectId }, patches, context);
+ await projectDb.styles.patch({ buildId, projectId }, patches, context);
} else if (namespace === "props") {
await projectDb.props.patch({ treeId, projectId }, patches, context);
} else if (namespace === "breakpoints") {
diff --git a/apps/designer/app/shared/copy-paste/copy-paste-instance.ts b/apps/designer/app/shared/copy-paste/copy-paste-instance.ts
index c7392bc73c..182bc7c05f 100644
--- a/apps/designer/app/shared/copy-paste/copy-paste-instance.ts
+++ b/apps/designer/app/shared/copy-paste/copy-paste-instance.ts
@@ -77,8 +77,7 @@ const copyInstanceData = (targetInstanceId: string) => {
clonedInstanceIds,
clonedStyleSourceIds
);
- // @todo migrate to style source variant
- const clonedStyles = cloneStyles(stylesStore.get(), clonedInstanceIds);
+ const clonedStyles = cloneStyles(stylesStore.get(), clonedStyleSourceIds);
return {
instance: clonedInstance,
diff --git a/apps/designer/app/shared/instance-utils.ts b/apps/designer/app/shared/instance-utils.ts
index f4adfa30c4..1a07a6f87e 100644
--- a/apps/designer/app/shared/instance-utils.ts
+++ b/apps/designer/app/shared/instance-utils.ts
@@ -53,9 +53,8 @@ export const deleteInstance = (targetInstanceId: Instance["id"]) => {
removeByMutable(styleSources, (styleSource) =>
subtreeLocalStyleSourceIds.has(styleSource.id)
);
- // @todo migrate to style source variant
removeByMutable(styles, (styleDecl) =>
- subtreeIds.has(styleDecl.instanceId)
+ subtreeLocalStyleSourceIds.has(styleDecl.styleSourceId)
);
selectedInstanceIdStore.set(parentInstance.id);
diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.ts
index 4c260962ec..8c2a69584a 100644
--- a/apps/designer/app/shared/nano-states/nano-states.ts
+++ b/apps/designer/app/shared/nano-states/nano-states.ts
@@ -5,6 +5,7 @@ import type {
Instance,
Props,
Styles,
+ StyleSource,
StyleSources,
StyleSourceSelections,
} from "@webstudio-is/project-build";
@@ -84,30 +85,6 @@ export const useInstanceProps = (instanceId: undefined | Instance["id"]) => {
};
export const stylesStore = atom<Styles>([]);
-/**
- * Indexed styles data is recomputed on every styles update
- * Compumer should use shallow-equal to check all items in the list
- * are the same to avoid unnecessary rerenders
- *
- * Potential optimization can be maintaining the index as separate state
- * though will require to move away from running immer patches on array
- * of styles
- */
-export const stylesIndexStore = computed(stylesStore, (styles) => {
- const stylesByInstanceId = new Map<Instance["id"], Styles>();
- for (const stylesItem of styles) {
- const { instanceId } = stylesItem;
- let instanceStyles = stylesByInstanceId.get(instanceId);
- if (instanceStyles === undefined) {
- instanceStyles = [];
- stylesByInstanceId.set(instanceId, instanceStyles);
- }
- instanceStyles.push(stylesItem);
- }
- return {
- stylesByInstanceId,
- };
-});
export const useSetStyles = (styles: Styles) => {
useSyncInitializeOnce(() => {
@@ -128,6 +105,19 @@ export const useInstanceStyles = (instanceId: undefined | Instance["id"]) => {
};
export const styleSourcesStore = atom<StyleSources>([]);
+export const styleSourcesIndexStore = computed(
+ styleSourcesStore,
+ (styleSources) => {
+ const styleSourcesById = new Map<StyleSource["id"], StyleSource>();
+ for (const styleSource of styleSources) {
+ styleSourcesById.set(styleSource.id, styleSource);
+ }
+ return {
+ styleSourcesById,
+ };
+ }
+);
+
export const useSetStyleSources = (styleSources: StyleSources) => {
useSyncInitializeOnce(() => {
styleSourcesStore.set(styleSources);
@@ -143,6 +133,69 @@ export const useSetStyleSourceSelections = (
});
};
+export const styleSourceSelectionsIndexStore = computed(
+ [styleSourceSelectionsStore, styleSourcesIndexStore],
+ (styleSourceSelections, styleSourcesIndex) => {
+ const { styleSourcesById } = styleSourcesIndex;
+ const styleSourcesByInstanceId = new Map<Instance["id"], StyleSource[]>();
+ for (const { instanceId, values } of styleSourceSelections) {
+ const styleSources: StyleSources = [];
+ for (const styleSourceId of values) {
+ const styleSource = styleSourcesById.get(styleSourceId);
+ if (styleSource === undefined) {
+ continue;
+ }
+ styleSources.push(styleSource);
+ }
+ styleSourcesByInstanceId.set(instanceId, styleSources);
+ }
+ return {
+ styleSourcesByInstanceId,
+ };
+ }
+);
+
+/**
+ * Indexed styles data is recomputed on every styles update
+ * Compumer should use shallow-equal to check all items in the list
+ * are the same to avoid unnecessary rerenders
+ *
+ * Potential optimization can be maintaining the index as separate state
+ * though will require to move away from running immer patches on array
+ * of styles
+ */
+export const stylesIndexStore = computed(
+ [stylesStore, styleSourceSelectionsStore],
+ (styles, styleSourceSelections) => {
+ const stylesByStyleSourceId = new Map<StyleSource["id"], Styles>();
+ for (const stylesItem of styles) {
+ const { styleSourceId } = stylesItem;
+ let styleSourceStyles = stylesByStyleSourceId.get(styleSourceId);
+ if (styleSourceStyles === undefined) {
+ styleSourceStyles = [];
+ stylesByStyleSourceId.set(styleSourceId, styleSourceStyles);
+ }
+ styleSourceStyles.push(stylesItem);
+ }
+
+ const stylesByInstanceId = new Map<Instance["id"], Styles>();
+ for (const { instanceId, values } of styleSourceSelections) {
+ const instanceStyles: Styles = [];
+ for (const styleSourceId of values) {
+ const styleSourceStyles = stylesByStyleSourceId.get(styleSourceId);
+ if (styleSourceStyles) {
+ instanceStyles.push(...styleSourceStyles);
+ }
+ }
+ stylesByInstanceId.set(instanceId, instanceStyles);
+ }
+
+ return {
+ stylesByInstanceId,
+ };
+ }
+);
+
export const breakpointsContainer = atom<Breakpoint[]>([]);
export const useBreakpoints = () => useValue(breakpointsContainer);
export const useSetBreakpoints = (breakpoints: Breakpoint[]) => {
diff --git a/apps/designer/app/shared/tree-utils.test.ts b/apps/designer/app/shared/tree-utils.test.ts
index cd3223cc71..98a6ab8870 100644
--- a/apps/designer/app/shared/tree-utils.test.ts
+++ b/apps/designer/app/shared/tree-utils.test.ts
@@ -65,9 +65,9 @@ const createStyleSourceSelection = (
};
};
-const createStyleDecl = (instanceId: string): StylesItem => {
+const createStyleDecl = (styleSourceId: string): StylesItem => {
return {
- instanceId,
+ styleSourceId,
breakpointId: "breakpointId",
property: "width",
value: {
@@ -204,22 +204,22 @@ test("clone style source selections with applied instance ids and style source i
]);
});
-test("clone styles with appled new instance ids", () => {
+test("clone styles with appled new style source ids", () => {
const styles = [
- createStyleDecl("instance1"),
- createStyleDecl("instance2"),
- createStyleDecl("instance1"),
- createStyleDecl("instance3"),
- createStyleDecl("instance1"),
- createStyleDecl("instance3"),
+ createStyleDecl("styleSource1"),
+ createStyleDecl("styleSource2"),
+ createStyleDecl("styleSource1"),
+ createStyleDecl("styleSource3"),
+ createStyleDecl("styleSource1"),
+ createStyleDecl("styleSource3"),
];
- const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>();
- clonedInstanceIds.set("instance2", "newInstance2");
- clonedInstanceIds.set("instance3", "newInstance3");
- expect(cloneStyles(styles, clonedInstanceIds)).toEqual([
- createStyleDecl("newInstance2"),
- createStyleDecl("newInstance3"),
- createStyleDecl("newInstance3"),
+ const clonedStyleSourceIds = new Map<StyleSource["id"], StyleSource["id"]>();
+ clonedStyleSourceIds.set("styleSource2", "newStyleSource2");
+ clonedStyleSourceIds.set("styleSource3", "newStyleSource3");
+ expect(cloneStyles(styles, clonedStyleSourceIds)).toEqual([
+ createStyleDecl("newStyleSource2"),
+ createStyleDecl("newStyleSource3"),
+ createStyleDecl("newStyleSource3"),
]);
});
diff --git a/apps/designer/app/shared/tree-utils.ts b/apps/designer/app/shared/tree-utils.ts
index 3f0ff30645..5e1896aad3 100644
--- a/apps/designer/app/shared/tree-utils.ts
+++ b/apps/designer/app/shared/tree-utils.ts
@@ -134,20 +134,19 @@ export const cloneStyleSourceSelections = (
return clonedStyleSourceSelections;
};
-// @todo migrate to style source variant
export const cloneStyles = (
styles: Styles,
- clonedInstanceIds: Map<Instance["id"], Instance["id"]>
+ clonedStyleSourceIds: Map<Instance["id"], Instance["id"]>
) => {
const clonedStyles: Styles = [];
for (const styleDecl of styles) {
- const instanceId = clonedInstanceIds.get(styleDecl.instanceId);
- if (instanceId === undefined) {
+ const styleSourceId = clonedStyleSourceIds.get(styleDecl.styleSourceId);
+ if (styleSourceId === undefined) {
continue;
}
clonedStyles.push({
...styleDecl,
- instanceId,
+ styleSourceId,
});
}
return clonedStyles;
diff --git a/packages/project-build/src/schema/styles.ts b/packages/project-build/src/schema/styles.ts
index c3586e775c..5c68b454fa 100644
--- a/packages/project-build/src/schema/styles.ts
+++ b/packages/project-build/src/schema/styles.ts
@@ -25,7 +25,7 @@ export const StoredStyles = z.array(StoredStylesItem);
export type StoredStyles = z.infer<typeof StoredStyles>;
export const StylesItem = z.object({
- instanceId: z.string(),
+ styleSourceId: z.string(),
breakpointId: z.string(),
// @todo can't figure out how to make property to be enum
property: z.string() as z.ZodType<StyleProperty>,
@@ -37,17 +37,3 @@ export type StylesItem = z.infer<typeof StylesItem>;
export const Styles = z.array(StylesItem);
export type Styles = z.infer<typeof Styles>;
-
-export const NewStylesItem = z.object({
- styleSourceId: z.string(),
- breakpointId: z.string(),
- // @todo can't figure out how to make property to be enum
- property: z.string() as z.ZodType<StyleProperty>,
- value: z.union([ImageValue, SharedStyleValue]),
-});
-
-export type NewStylesItem = z.infer<typeof NewStylesItem>;
-
-export const NewStyles = z.array(NewStylesItem);
-
-export type NewStyles = z.infer<typeof NewStyles>;
diff --git a/packages/project-build/src/types.ts b/packages/project-build/src/types.ts
index 6e7e6192a0..64d07ac163 100644
--- a/packages/project-build/src/types.ts
+++ b/packages/project-build/src/types.ts
@@ -1,7 +1,6 @@
import type { Instance } from "./schema/instances";
import type { Props } from "./schema/props";
import type { StyleSourceSelections } from "./schema/style-sources";
-import type { Styles } from "./schema/styles";
export type Tree = {
id: string;
@@ -9,6 +8,5 @@ export type Tree = {
buildId: string;
root: Instance;
props: Props;
- styles: Styles;
styleSourceSelections: StyleSourceSelections;
};
diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.ts
index cc47276702..f8c3ff4705 100644
--- a/packages/project/src/db/build.ts
+++ b/packages/project/src/db/build.ts
@@ -9,7 +9,7 @@ import { StyleSources } from "@webstudio-is/project-build";
import * as db from ".";
import { Build, Page, Pages } from "./schema";
import * as pagesUtils from "../shared/pages";
-import { parseNewStyles } from "./styles";
+import { parseStyles, serializeStyles } from "./styles";
export const parseBuild = async (build: DbBuild): Promise<Build> => {
const pages = Pages.parse(JSON.parse(build.pages));
@@ -17,7 +17,7 @@ export const parseBuild = async (build: DbBuild): Promise<Build> => {
...build,
createdAt: build.createdAt.toISOString(),
pages,
- styles: await parseNewStyles(build.styles),
+ styles: await parseStyles(build.styles),
styleSources: StyleSources.parse(JSON.parse(build.styleSources)),
};
};
@@ -262,6 +262,8 @@ export async function create(
data: {
projectId,
pages: JSON.stringify([]),
+ styles: serializeStyles(sourceBuild?.styles ?? []),
+ styleSources: JSON.stringify(sourceBuild?.styleSources ?? []),
isDev: env === "dev",
isProd: env === "prod",
},
diff --git a/packages/project/src/db/schema.ts b/packages/project/src/db/schema.ts
index 5da010be09..956920105a 100644
--- a/packages/project/src/db/schema.ts
+++ b/packages/project/src/db/schema.ts
@@ -1,6 +1,6 @@
import { z, type ZodType } from "zod";
import { Project } from "@webstudio-is/prisma-client";
-import type { NewStyles, StyleSources } from "@webstudio-is/project-build";
+import type { Styles, StyleSources } from "@webstudio-is/project-build";
import type { Data } from "@webstudio-is/react-sdk";
export type { Project };
@@ -78,7 +78,7 @@ export type Build = {
isDev: boolean;
isProd: boolean;
pages: Pages;
- styles: NewStyles;
+ styles: Styles;
styleSources: StyleSources;
};
diff --git a/packages/project/src/db/style-source-selections.ts b/packages/project/src/db/style-source-selections.ts
index 13b1f71415..bd66d9d11e 100644
--- a/packages/project/src/db/style-source-selections.ts
+++ b/packages/project/src/db/style-source-selections.ts
@@ -4,7 +4,7 @@ import {
authorizeProject,
type AppContext,
} from "@webstudio-is/trpc-interface/server";
-import { StyleSources, type Tree } from "@webstudio-is/project-build";
+import { StyleSourceSelections, type Tree } from "@webstudio-is/project-build";
import type { Project } from "./schema";
export const patch = async (
@@ -28,11 +28,11 @@ export const patch = async (
return;
}
- const styleSourceSelections = StyleSources.parse(
+ const styleSourceSelections = StyleSourceSelections.parse(
JSON.parse(tree.styleSelections)
);
- const patchedStyleSourceSelections = StyleSources.parse(
+ const patchedStyleSourceSelections = StyleSourceSelections.parse(
applyPatches(styleSourceSelections, patches)
);
diff --git a/packages/project/src/db/styles.ts b/packages/project/src/db/styles.ts
index 4eaea5ef53..2a1ffb9a28 100644
--- a/packages/project/src/db/styles.ts
+++ b/packages/project/src/db/styles.ts
@@ -1,20 +1,10 @@
import warnOnce from "warn-once";
-import ObjectId from "bson-objectid";
import { type Patch, applyPatches } from "immer";
import { prisma } from "@webstudio-is/prisma-client";
import type { Asset } from "@webstudio-is/asset-uploader";
import { formatAsset } from "@webstudio-is/asset-uploader/server";
-import {
- type Instance,
- StoredStyles,
- Styles,
- type StyleSource,
- StyleSources,
- StyleSourceSelections,
- type Tree,
- NewStyles,
-} from "@webstudio-is/project-build";
-import type { Project } from "./schema";
+import { StoredStyles, Styles } from "@webstudio-is/project-build";
+import type { Build, Project } from "./schema";
import {
authorizeProject,
type AppContext,
@@ -48,7 +38,7 @@ const parseValue = (
return styleValue;
};
-export const parseNewStyles = async (stylesString: string) => {
+export const parseStyles = async (stylesString: string) => {
const storedStyles = StoredStyles.parse(JSON.parse(stylesString));
const assetIds: string[] = [];
@@ -75,7 +65,7 @@ export const parseNewStyles = async (stylesString: string) => {
assetsMap.set(asset.id, formatAsset(asset));
}
- const styles: NewStyles = storedStyles.map((styleDecl) => {
+ const styles: Styles = storedStyles.map((styleDecl) => {
return {
styleSourceId: styleDecl.styleSourceId,
breakpointId: styleDecl.breakpointId,
@@ -87,83 +77,6 @@ export const parseNewStyles = async (stylesString: string) => {
return styles;
};
-export const parseStyles = async (
- treeId: string,
- stylesString: string,
- styleSourcesString: string,
- styleSourceSelectionsString: string
-) => {
- const styleSources = StyleSources.parse(JSON.parse(styleSourcesString));
- const styleSourceSelections = StyleSourceSelections.parse(
- JSON.parse(styleSourceSelectionsString)
- );
- const storedStyles = StoredStyles.parse(JSON.parse(stylesString));
-
- const instanceIdByStyleSourceId = new Map<
- StyleSource["id"],
- Instance["id"]
- >();
- const currentTreeStyleSources = new Set<StyleSource["id"]>();
-
- for (const styleSource of styleSources) {
- if (styleSource.type === "local" && styleSource.treeId === treeId) {
- currentTreeStyleSources.add(styleSource.id);
- }
- }
-
- for (const stylesSourceSelection of styleSourceSelections) {
- for (const styleSourceId of stylesSourceSelection.values) {
- instanceIdByStyleSourceId.set(
- styleSourceId,
- stylesSourceSelection.instanceId
- );
- }
- }
-
- const assetIds: string[] = [];
- for (const { value: styleValue } of storedStyles) {
- if (styleValue.type === "image") {
- for (const item of styleValue.value) {
- if (item.type === "asset") {
- assetIds.push(item.value);
- }
- }
- }
- }
-
- // Load all assets
- const assets = await prisma.asset.findMany({
- where: {
- id: {
- in: assetIds,
- },
- },
- });
- const assetsMap = new Map<string, Asset>();
- for (const asset of assets) {
- assetsMap.set(asset.id, formatAsset(asset));
- }
-
- const styles: Styles = storedStyles.flatMap((styleDecl) => {
- if (currentTreeStyleSources.has(styleDecl.styleSourceId) === false) {
- return [];
- }
- const instanceId = instanceIdByStyleSourceId.get(styleDecl.styleSourceId);
- if (instanceId === undefined) {
- return [];
- }
- const clientStyle = {
- breakpointId: styleDecl.breakpointId,
- instanceId,
- property: styleDecl.property,
- value: parseValue(styleDecl.value, assetsMap),
- };
- return [clientStyle];
- });
-
- return styles;
-};
-
/**
* prepare value to store in db
*/
@@ -181,89 +94,11 @@ const serializeValue = (styleValue: Styles[number]["value"]) => {
return styleValue;
};
-export const convertToStoredStyles = (
- treeId: string,
- styles: Styles,
- styleSources: StyleSources,
- styleSourceSelections: StyleSourceSelections
-): StoredStyles => {
- const styleSourceIdByInstanceId = new Map<
- Instance["id"],
- StyleSource["id"]
- >();
-
- for (const stylesSourceSelection of styleSourceSelections) {
- for (const styleSourceId of stylesSourceSelection.values) {
- styleSourceIdByInstanceId.set(
- stylesSourceSelection.instanceId,
- styleSourceId
- );
- }
- }
-
+export const serializeStyles = (styles: Styles) => {
const storedStyles: StoredStyles = styles.map((styleDecl) => {
- const { instanceId } = styleDecl;
- let styleSourceId = styleSourceIdByInstanceId.get(instanceId);
- if (styleSourceId === undefined) {
- styleSourceId = ObjectId().toString();
- styleSourceSelections.push({
- instanceId,
- values: [styleSourceId],
- });
- styleSources.push({
- type: "local",
- id: styleSourceId,
- treeId,
- });
- }
return {
breakpointId: styleDecl.breakpointId,
- styleSourceId,
- property: styleDecl.property,
- value: serializeValue(styleDecl.value),
- };
- });
- return storedStyles;
-};
-
-export const serializeStyles = (
- treeId: string,
- styles: Styles,
- styleSources: StyleSources,
- styleSourceSelections: StyleSourceSelections
-) => {
- const styleSourceIdByInstanceId = new Map<
- Instance["id"],
- StyleSource["id"]
- >();
-
- for (const stylesSourceSelection of styleSourceSelections) {
- for (const styleSourceId of stylesSourceSelection.values) {
- styleSourceIdByInstanceId.set(
- stylesSourceSelection.instanceId,
- styleSourceId
- );
- }
- }
-
- const storedStyles: StoredStyles = styles.map((styleDecl) => {
- const { instanceId } = styleDecl;
- let styleSourceId = styleSourceIdByInstanceId.get(instanceId);
- if (styleSourceId === undefined) {
- styleSourceId = ObjectId().toString();
- styleSourceSelections.push({
- instanceId,
- values: [styleSourceId],
- });
- styleSources.push({
- type: "local",
- id: styleSourceId,
- treeId,
- });
- }
- return {
- breakpointId: styleDecl.breakpointId,
- styleSourceId,
+ styleSourceId: styleDecl.styleSourceId,
property: styleDecl.property,
value: serializeValue(styleDecl.value),
};
@@ -272,7 +107,7 @@ export const serializeStyles = (
};
export const patch = async (
- { treeId, projectId }: { treeId: Tree["id"]; projectId: Project["id"] },
+ { buildId, projectId }: { buildId: Build["id"]; projectId: Project["id"] },
patches: Array<Patch>,
context: AppContext
) => {
@@ -285,69 +120,22 @@ export const patch = async (
throw new Error("You don't have edit access to this project");
}
- const tree = await prisma.tree.findUnique({
- where: { id: treeId },
- });
- if (tree === null) {
- return;
- }
-
const build = await prisma.build.findUnique({
- where: { id: tree.buildId },
+ where: { id: buildId },
});
if (build === null) {
- return null;
+ return;
}
- const storedStyles = StoredStyles.parse(JSON.parse(build.styles));
- const styleSources = StyleSources.parse(JSON.parse(build.styleSources));
- const styleSourceSelections = StyleSourceSelections.parse(
- JSON.parse(tree.styleSelections)
- );
-
// these styles are filtered by treeId
- const treeStyles = await parseStyles(
- treeId,
- build.styles,
- build.styleSources,
- tree.styleSelections
- );
+ const styles = await parseStyles(build.styles);
- const patchedTreeStyles = Styles.parse(applyPatches(treeStyles, patches));
-
- const currentTreeStyleSources = new Set<StyleSource["id"]>();
- for (const styleSource of styleSources) {
- if (styleSource.type === "local" && styleSource.treeId === treeId) {
- currentTreeStyleSources.add(styleSource.id);
- }
- }
-
- // exclude all current tree styles and append patched styles to the end
- const patchedStoredStyles = storedStyles.filter(
- (styleDecl) =>
- currentTreeStyleSources.has(styleDecl.styleSourceId) === false
- );
- patchedStoredStyles.push(
- ...convertToStoredStyles(
- treeId,
- patchedTreeStyles,
- styleSources,
- styleSourceSelections
- )
- );
+ const patchedStyles = Styles.parse(applyPatches(styles, patches));
await prisma.build.update({
data: {
- styles: JSON.stringify(patchedStoredStyles),
- styleSources: JSON.stringify(styleSources),
+ styles: JSON.stringify(patchedStyles),
},
where: { id: build.id },
});
-
- await prisma.tree.update({
- data: {
- styleSelections: JSON.stringify(styleSourceSelections),
- },
- where: { id: treeId },
- });
};
diff --git a/packages/project/src/db/tree.ts b/packages/project/src/db/tree.ts
index d94b8e91cc..f1db038828 100644
--- a/packages/project/src/db/tree.ts
+++ b/packages/project/src/db/tree.ts
@@ -7,12 +7,9 @@ import {
Instance,
Instances,
StyleSourceSelections,
- StyleSources,
- StoredStyles,
} from "@webstudio-is/project-build";
import { prisma, type Prisma } from "@webstudio-is/prisma-client";
import { utils } from "../index";
-import { convertToStoredStyles, parseStyles } from "./styles";
import { parseProps, serializeProps } from "./props";
import type { Project } from "./schema";
import {
@@ -56,7 +53,6 @@ export const createTree = ({
buildId,
root,
props: [],
- styles: [],
styleSourceSelections: [],
};
};
@@ -71,37 +67,8 @@ export const create = async (
const newTreeId = uuid();
- const build = await client.build.findUnique({
- where: {
- id: treeData.buildId,
- },
- });
-
- if (build === null) {
- throw Error(`Build ${treeData.buildId} not found`);
- }
-
- const storedStyles = StoredStyles.parse(JSON.parse(build.styles));
- const styleSources = StyleSources.parse(JSON.parse(build.styleSources));
- const styleSourceSelections: StyleSourceSelections = [];
- storedStyles.push(
- ...convertToStoredStyles(
- newTreeId,
- treeData.styles,
- styleSources,
- styleSourceSelections
- )
- );
-
- await client.build.update({
- where: {
- id: treeData.buildId,
- },
- data: {
- styles: JSON.stringify(storedStyles),
- styleSources: JSON.stringify(styleSources),
- },
- });
+ const styleSourceSelections: StyleSourceSelections =
+ treeData.styleSourceSelections;
return await client.tree.create({
data: {
@@ -156,23 +123,10 @@ export const loadById = async (
return null;
}
- const build = await client.build.findUnique({
- where: { id: tree.buildId },
- });
- if (build === null) {
- return null;
- }
-
const instances = Instances.parse(JSON.parse(tree.instances));
const root = Instance.parse(denormalizeTree(instances));
const props = await parseProps(tree.props);
- const styles = await parseStyles(
- treeId,
- build.styles,
- build.styleSources,
- tree.styleSelections
- );
const styleSourceSelections = StyleSourceSelections.parse(
JSON.parse(tree.styleSelections)
@@ -182,7 +136,6 @@ export const loadById = async (
...tree,
root,
props,
- styles,
styleSourceSelections,
};
};
diff --git a/packages/project/src/shared/styles/style-rules.test.ts b/packages/project/src/shared/styles/style-rules.test.ts
index 014470800a..5c7df346da 100644
--- a/packages/project/src/shared/styles/style-rules.test.ts
+++ b/packages/project/src/shared/styles/style-rules.test.ts
@@ -1,12 +1,12 @@
import { test, expect } from "@jest/globals";
import type {
- NewStyles,
+ Styles,
StyleSourceSelections,
} from "@webstudio-is/project-build";
import { getStyleRules } from "./style-rules";
test("compute styles from different style sources", () => {
- const styles: NewStyles = [
+ const styles: Styles = [
{
breakpointId: "a",
styleSourceId: "styleSource1",
diff --git a/packages/project/src/shared/styles/style-rules.ts b/packages/project/src/shared/styles/style-rules.ts
index 0fe11292ce..f5a4276ceb 100644
--- a/packages/project/src/shared/styles/style-rules.ts
+++ b/packages/project/src/shared/styles/style-rules.ts
@@ -1,6 +1,6 @@
import type { Breakpoint, Style } from "@webstudio-is/css-data";
import type {
- NewStyles,
+ Styles,
StyleSource,
StyleSourceSelections,
} from "@webstudio-is/project-build";
@@ -16,13 +16,13 @@ type StyleRule = {
* and group by instance and breakpoint
*/
export const getStyleRules = (
- styles?: NewStyles,
+ styles?: Styles,
styleSourceSelections?: StyleSourceSelections
) => {
if (styles === undefined || styleSourceSelections === undefined) {
return [];
}
- const stylesByStyleSourceId = new Map<StyleSource["id"], NewStyles>();
+ const stylesByStyleSourceId = new Map<StyleSource["id"], Styles>();
for (const styleDecl of styles) {
const { styleSourceId } = styleDecl;
let styleSourceStyles = stylesByStyleSourceId.get(styleSourceId);