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.

refactor: load compact data into builder (#3922)

Bogdan Chadkinffccbf38b0f0
diff --git a/apps/builder/app/routes/rest.data.$projectId.ts b/apps/builder/app/routes/rest.data.$projectId.ts
index fd3c5c6ba5..c44344ca73 100644
--- a/apps/builder/app/routes/rest.data.$projectId.ts
+++ b/apps/builder/app/routes/rest.data.$projectId.ts
@@ -1,6 +1,6 @@
import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
import { db } from "@webstudio-is/project/index.server";
-import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";
+import { loadDevBuildByProjectId } from "@webstudio-is/project-build/index.server";
import { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";
import { createContext } from "~/shared/context.server";
@@ -16,10 +16,10 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
if (project.userId === null) {
throw new Error("Project must have project userId defined");
}
- const devBuild = await loadBuildByProjectId(context, project.id);
+ const build = await loadDevBuildByProjectId(context, project.id);
const assets = await loadAssetsByProject(project.id, context);
return {
- build: devBuild,
+ ...build,
assets,
};
};
diff --git a/apps/builder/app/shared/builder-data.ts b/apps/builder/app/shared/builder-data.ts
index d39a7da6f7..8382e4f9ed 100644
--- a/apps/builder/app/shared/builder-data.ts
+++ b/apps/builder/app/shared/builder-data.ts
@@ -1,5 +1,6 @@
-import type { Asset, WebstudioData } from "@webstudio-is/sdk";
-import type { Build, MarketplaceProduct } from "@webstudio-is/project-build";
+import { getStyleDeclKey, type WebstudioData } from "@webstudio-is/sdk";
+import type { MarketplaceProduct } from "@webstudio-is/project-build";
+import type { loader } from "~/routes/rest.data.$projectId";
import {
$assets,
$breakpoints,
@@ -53,6 +54,9 @@ export const setBuilderData = (data: BuilderData) => {
$marketplaceProduct.set(data.marketplaceProduct);
};
+const getPair = <Item extends { id: string }>(item: Item) =>
+ [item.id, item] as const;
+
export const loadBuilderData = async ({
projectId,
signal,
@@ -68,25 +72,22 @@ export const loadBuilderData = async ({
}
const response = await fetch(url, { signal });
if (response.ok) {
- const data = (await response.json()) as {
- assets: Asset[];
- build: Build;
- marketplaceProduct: undefined | MarketplaceProduct;
- };
- const { assets, build } = data;
+ const data: Awaited<ReturnType<typeof loader>> = await response.json();
return {
- version: build.version,
- assets: new Map(assets.map((asset) => [asset.id, asset])),
- instances: new Map(build.instances),
- dataSources: new Map(build.dataSources),
- resources: new Map(build.resources),
- props: new Map(build.props),
- pages: build.pages,
- styleSources: new Map(build.styleSources),
- styleSourceSelections: new Map(build.styleSourceSelections),
- breakpoints: new Map(build.breakpoints),
- styles: new Map(build.styles),
- marketplaceProduct: build.marketplaceProduct,
+ version: data.version,
+ assets: new Map(data.assets.map(getPair)),
+ instances: new Map(data.instances.map(getPair)),
+ dataSources: new Map(data.dataSources.map(getPair)),
+ resources: new Map(data.resources.map(getPair)),
+ props: new Map(data.props.map(getPair)),
+ pages: data.pages,
+ breakpoints: new Map(data.breakpoints.map(getPair)),
+ styleSources: new Map(data.styleSources.map(getPair)),
+ styleSourceSelections: new Map(
+ data.styleSourceSelections.map((item) => [item.instanceId, item])
+ ),
+ styles: new Map(data.styles.map((item) => [getStyleDeclKey(item), item])),
+ marketplaceProduct: data.marketplaceProduct,
} satisfies BuilderData & { version: number };
}
throw Error("Unable to load builder data");
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index ab0c9727bf..9770e827d0 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -17,6 +17,8 @@ import {
type Breakpoint,
Pages,
initialBreakpoints,
+ StyleSourceSelection,
+ StyleDecl,
} from "@webstudio-is/sdk";
import type { Data } from "@webstudio-is/http-client";
import type { Build } from "../types";
@@ -27,6 +29,9 @@ import { parsePages, serializePages } from "./pages";
import { createDefaultPages } from "../shared/pages-utils";
import type { MarketplaceProduct } from "../shared//marketplace";
+const parseCompactData = <Item>(serialized: string) =>
+ JSON.parse(serialized) as Item[];
+
export const parseData = <Type extends { id: string }>(
string: string
): Map<Type["id"], Type> => {
@@ -87,6 +92,37 @@ const parseBuild = async (
}
};
+const parseCompactBuild = async (
+ build: Database["public"]["Tables"]["Build"]["Row"]
+) => {
+ try {
+ return {
+ id: build.id,
+ projectId: build.projectId,
+ version: build.version,
+ createdAt: build.createdAt,
+ updatedAt: build.updatedAt,
+ pages: parseConfig<Pages>(build.pages),
+ breakpoints: parseCompactData<Breakpoint>(build.breakpoints),
+ styles: parseCompactData<StyleDecl>(build.styles),
+ styleSources: parseCompactData<StyleSource>(build.styleSources),
+ styleSourceSelections: parseCompactData<StyleSourceSelection>(
+ build.styleSourceSelections
+ ),
+ props: parseCompactData<Prop>(build.props),
+ dataSources: parseCompactData<DataSource>(build.dataSources),
+ resources: parseCompactData<Resource>(build.resources),
+ instances: parseCompactData<Instance>(build.instances),
+ deployment: parseDeployment(build.deployment),
+ marketplaceProduct: parseConfig<MarketplaceProduct>(
+ build.marketplaceProduct
+ ),
+ };
+ } finally {
+ // empty block
+ }
+};
+
export const loadRawBuildById = async (
context: AppContext,
id: Build["id"]
@@ -131,22 +167,36 @@ export const loadBuildIdAndVersionByProjectId = async (
return build.data;
};
-export const loadBuildByProjectId = async (
+const loadRawBuildByProjectId = async (
context: AppContext,
projectId: Build["projectId"]
-): Promise<Build> => {
+) => {
const build = await context.postgrest.client
.from("Build")
.select("*")
.eq("projectId", projectId)
.is("deployment", null)
.single();
-
if (build.error) {
throw build.error;
}
+ return build.data;
+};
- return parseBuild(build.data);
+export const loadBuildByProjectId = async (
+ context: AppContext,
+ projectId: Build["projectId"]
+): Promise<Build> => {
+ const build = await loadRawBuildByProjectId(context, projectId);
+ return parseBuild(build);
+};
+
+export const loadDevBuildByProjectId = async (
+ context: AppContext,
+ projectId: Build["projectId"]
+) => {
+ const build = await loadRawBuildByProjectId(context, projectId);
+ return parseCompactBuild(build);
};
export const loadApprovedProdBuildByProjectId = async (