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: drop boilerplaty parse/serialize (#2784)
Bogdan Chadkin7263136d4c5c
diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.tsindex b98fc94c33..db1584739b 100644--- a/apps/builder/app/routes/rest.patch.ts+++ b/apps/builder/app/routes/rest.patch.ts@@ -4,33 +4,29 @@ import type { SyncItem } from "immerhin";import { prisma } from "@webstudio-is/prisma-client";import {Breakpoints,+ Breakpoint,Instances,+ Instance,Pages,Props,+ Prop,DataSources,+ DataSource,StyleSourceSelections,StyleSources,+ StyleSource,Styles,Resources,+ Resource,} from "@webstudio-is/sdk";import type { Build } from "@webstudio-is/project-build";import {parsePages,- parseInstances,parseStyleSourceSelections,- parseStyleSources,parseStyles,- parseProps,- parseBreakpoints,- parseDataSources,serializePages,- serializeBreakpoints,- serializeInstances,- serializeProps,- serializeStyleSources,serializeStyleSourceSelections,serializeStyles,- serializeDataSources,parseData,serializeData,} from "@webstudio-is/project-build/index.server";@@ -130,7 +126,7 @@ export const action = async ({ request }: ActionArgs) => {if (namespace === "instances") {const instances =- buildData.instances ?? parseInstances(build.instances);+ buildData.instances ?? parseData<Instance>(build.instances);buildData.instances = applyPatches(instances, patches);continue;}@@ -148,7 +144,8 @@ export const action = async ({ request }: ActionArgs) => {if (namespace === "styleSources") {const styleSources =- buildData.styleSources ?? parseStyleSources(build.styleSources);+ buildData.styleSources ??+ parseData<StyleSource>(build.styleSources);buildData.styleSources = applyPatches(styleSources, patches);continue;}@@ -165,27 +162,28 @@ export const action = async ({ request }: ActionArgs) => {}if (namespace === "props") {- const props = buildData.props ?? parseProps(build.props);+ const props = buildData.props ?? parseData<Prop>(build.props);buildData.props = applyPatches(props, patches);continue;}if (namespace === "dataSources") {const dataSources =- buildData.dataSources ?? parseDataSources(build.dataSources);+ buildData.dataSources ?? parseData<DataSource>(build.dataSources);buildData.dataSources = applyPatches(dataSources, patches);continue;}if (namespace === "resources") {- const resources = buildData.resources ?? parseData(build.resources);+ const resources =+ buildData.resources ?? parseData<Resource>(build.resources);buildData.resources = applyPatches(resources, patches);continue;}if (namespace === "breakpoints") {const breakpoints =- buildData.breakpoints ?? parseBreakpoints(build.breakpoints);+ buildData.breakpoints ?? parseData<Breakpoint>(build.breakpoints);buildData.breakpoints = applyPatches(breakpoints, patches);continue;}@@ -215,35 +213,35 @@ export const action = async ({ request }: ActionArgs) => {}if (buildData.breakpoints) {- dbBuildData.breakpoints = serializeBreakpoints(+ dbBuildData.breakpoints = serializeData<Breakpoint>(Breakpoints.parse(buildData.breakpoints));}if (buildData.instances) {- dbBuildData.instances = serializeInstances(+ dbBuildData.instances = serializeData<Instance>(Instances.parse(buildData.instances));}if (buildData.props) {- dbBuildData.props = serializeProps(Props.parse(buildData.props));+ dbBuildData.props = serializeData<Prop>(Props.parse(buildData.props));}if (buildData.dataSources) {- dbBuildData.dataSources = serializeDataSources(+ dbBuildData.dataSources = serializeData<DataSource>(DataSources.parse(buildData.dataSources));}if (buildData.resources) {- dbBuildData.resources = serializeData(+ dbBuildData.resources = serializeData<Resource>(Resources.parse(buildData.resources));}if (buildData.styleSources) {- dbBuildData.styleSources = serializeStyleSources(+ dbBuildData.styleSources = serializeData<StyleSource>(StyleSources.parse(buildData.styleSources));}diff --git a/packages/project-build/src/db/__DEPRECATED__/breakpoints.ts b/packages/project-build/src/db/__DEPRECATED__/breakpoints.tsdeleted file mode 100644index a30785a877..0000000000--- a/packages/project-build/src/db/__DEPRECATED__/breakpoints.ts+++ /dev/null@@ -1,33 +0,0 @@-// DEPRECATED: use parseData and serializeData from build.ts-import { nanoid } from "nanoid";-import {- type Breakpoint,- type Breakpoints,- initialBreakpoints,-} from "@webstudio-is/sdk";--export const parseBreakpoints = (breakpointsString: string): Breakpoints => {- const breakpointssList = JSON.parse(breakpointsString) as Breakpoint[];- return new Map(breakpointssList.map((item) => [item.id, item]));-};--export const serializeBreakpoints = (breakpointssMap: Breakpoints) => {- const breakpointssList: Breakpoint[] = Array.from(breakpointssMap.values());- return JSON.stringify(breakpointssList);-};--export const createInitialBreakpoints = (): [- Breakpoint["id"],- Breakpoint,-][] => {- return initialBreakpoints.map((breakpoint) => {- const id = nanoid();- return [- id,- {- ...breakpoint,- id,- },- ];- });-};diff --git a/packages/project-build/src/db/__DEPRECATED__/data-sources.ts b/packages/project-build/src/db/__DEPRECATED__/data-sources.tsdeleted file mode 100644index 25aa483b26..0000000000--- a/packages/project-build/src/db/__DEPRECATED__/data-sources.ts+++ /dev/null@@ -1,14 +0,0 @@-// DEPRECATED: use parseData and serializeData from build.ts-import type { DataSource, DataSources } from "@webstudio-is/sdk";--export const parseDataSources = (dataSourcesString: string): DataSources => {- const dataSourcesList = JSON.parse(dataSourcesString) as DataSource[];- return new Map(- dataSourcesList.map((dataSource) => [dataSource.id, dataSource])- );-};--export const serializeDataSources = (dataSources: DataSources) => {- const dataSourcesList: DataSource[] = Array.from(dataSources.values());- return JSON.stringify(dataSourcesList);-};diff --git a/packages/project-build/src/db/__DEPRECATED__/instances.ts b/packages/project-build/src/db/__DEPRECATED__/instances.tsdeleted file mode 100644index b4ff0621c1..0000000000--- a/packages/project-build/src/db/__DEPRECATED__/instances.ts+++ /dev/null@@ -1,12 +0,0 @@-// DEPRECATED: use parseData and serializeData from build.ts-import { Instances, Instance } from "@webstudio-is/sdk";--export const parseInstances = (instancesString: string): Instances => {- const instancesList = JSON.parse(instancesString) as Instance[];- return new Map(instancesList.map((prop) => [prop.id, prop]));-};--export const serializeInstances = (instances: Instances) => {- const instancesList: Instance[] = Array.from(instances.values());- return JSON.stringify(instancesList);-};diff --git a/packages/project-build/src/db/__DEPRECATED__/props.ts b/packages/project-build/src/db/__DEPRECATED__/props.tsdeleted file mode 100644index a415c3ea05..0000000000--- a/packages/project-build/src/db/__DEPRECATED__/props.ts+++ /dev/null@@ -1,12 +0,0 @@-// DEPRECATED: use parseData and serializeData from build.ts-import { Props, Prop } from "@webstudio-is/sdk";--export const parseProps = (propsString: string): Props => {- const propsList = JSON.parse(propsString) as Prop[];- return new Map(propsList.map((prop) => [prop.id, prop]));-};--export const serializeProps = (props: Props) => {- const propsList: Prop[] = Array.from(props.values());- return JSON.stringify(propsList);-};diff --git a/packages/project-build/src/db/__DEPRECATED__/style-sources.ts b/packages/project-build/src/db/__DEPRECATED__/style-sources.tsdeleted file mode 100644index 5c1eb46bfa..0000000000--- a/packages/project-build/src/db/__DEPRECATED__/style-sources.ts+++ /dev/null@@ -1,12 +0,0 @@-// DEPRECATED: use parseData and serializeData from build.ts-import type { StyleSource, StyleSources } from "@webstudio-is/sdk";--export const parseStyleSources = (styleSourceString: string): StyleSources => {- const styleSourcesList = JSON.parse(styleSourceString) as StyleSource[];- return new Map(styleSourcesList.map((item) => [item.id, item]));-};--export const serializeStyleSources = (styleSourcesMap: StyleSources) => {- const styleSourcesList: StyleSource[] = Array.from(styleSourcesMap.values());- return JSON.stringify(styleSourcesList);-};diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex acd10e0540..23f10e8fd2 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -11,22 +11,23 @@ import {authorizeProject,type AppContext,} from "@webstudio-is/trpc-interface/index.server";-import type { Build } from "../types";-import { Pages, type Deployment, Resource } from "@webstudio-is/sdk";import {- createInitialBreakpoints,- parseBreakpoints,- serializeBreakpoints,-} from "./__DEPRECATED__/breakpoints";+ type Deployment,+ type Resource,+ type StyleSource,+ type Prop,+ type DataSource,+ type Instance,+ type Breakpoint,+ Pages,+ initialBreakpoints,+} from "@webstudio-is/sdk";+import type { Data } from "@webstudio-is/http-client";+import type { Build } from "../types";import { parseStyles } from "./styles";-import { parseStyleSources } from "./__DEPRECATED__/style-sources";import { parseStyleSourceSelections } from "./style-source-selections";-import { parseProps } from "./__DEPRECATED__/props";-import { parseDataSources } from "./__DEPRECATED__/data-sources";-import { parseInstances, serializeInstances } from "./__DEPRECATED__/instances";import { parseDeployment, serializeDeployment } from "./deployment";-import type { Data } from "@webstudio-is/http-client";-import { parsePages, serializePages } from "./__DEPRECATED__/pages";+import { parsePages, serializePages } from "./pages";import { createDefaultPages } from "../shared/pages-utils";export const parseData = <Type extends { id: string }>(@@ -48,16 +49,10 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {console.time("parseBuild");try {const pages = parsePages(build.pages);- const breakpoints = Array.from(parseBreakpoints(build.breakpoints));const styles = Array.from(parseStyles(build.styles));- const styleSources = Array.from(parseStyleSources(build.styleSources));const styleSourceSelections = Array.from(parseStyleSourceSelections(build.styleSourceSelections));- const props = Array.from(parseProps(build.props));- const dataSources = Array.from(parseDataSources(build.dataSources));- const instances = Array.from(parseInstances(build.instances));-const deployment = parseDeployment(build.deployment);const result: Build = {@@ -67,14 +62,14 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {createdAt: build.createdAt.toISOString(),updatedAt: build.updatedAt.toISOString(),pages,- breakpoints,+ breakpoints: Array.from(parseData<Breakpoint>(build.breakpoints)),styles,- styleSources,+ styleSources: Array.from(parseData<StyleSource>(build.styleSources)),styleSourceSelections,- props,- dataSources,+ props: Array.from(parseData<Prop>(build.props)),+ dataSources: Array.from(parseData<DataSource>(build.dataSources)),resources: Array.from(parseData<Resource>(build.resources)),- instances,+ instances: Array.from(parseData<Instance>(build.instances)),deployment,} satisfies Data["build"];@@ -128,6 +123,19 @@ const createNewPageInstances = (): Build["instances"] => {];};+const createInitialBreakpoints = (): [Breakpoint["id"], Breakpoint][] => {+ return initialBreakpoints.map((breakpoint) => {+ const id = nanoid();+ return [+ id,+ {+ ...breakpoint,+ id,+ },+ ];+ });+};+/** We create "dev" build in two cases:* 1. when we create a new project@@ -158,8 +166,10 @@ export const createBuild = async (data: {projectId: props.projectId,pages: serializePages(defaultPages),- breakpoints: serializeBreakpoints(new Map(createInitialBreakpoints())),- instances: serializeInstances(new Map(newInstances)),+ breakpoints: serializeData<Breakpoint>(+ new Map(createInitialBreakpoints())+ ),+ instances: serializeData<Instance>(new Map(newInstances)),},});};diff --git a/packages/project-build/src/db/__DEPRECATED__/pages.ts b/packages/project-build/src/db/pages.tssimilarity index 100%rename from packages/project-build/src/db/__DEPRECATED__/pages.tsrename to packages/project-build/src/db/pages.tsdiff --git a/packages/project-build/src/index.server.ts b/packages/project-build/src/index.server.tsindex f147a2cec6..ce1e7e0568 100644--- a/packages/project-build/src/index.server.ts+++ b/packages/project-build/src/index.server.ts@@ -1,9 +1,4 @@export * from "./db/build";-export * from "./db/__DEPRECATED__/pages";-export * from "./db/__DEPRECATED__/breakpoints";+export * from "./db/pages";export * from "./db/styles";-export * from "./db/__DEPRECATED__/style-sources";-export * from "./db/__DEPRECATED__/instances";-export * from "./db/__DEPRECATED__/props";export * from "./db/style-source-selections";-export * from "./db/__DEPRECATED__/data-sources";