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.

Move assets schema into sdk package (#2220)

Bogdan Chadkinf5882256b8d5
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 953999ceeb..b748174ba8 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect } from "react";
import { useUnmount } from "react-use";
import { TooltipProvider } from "@radix-ui/react-tooltip";
import { type Publish, usePublish } from "~/shared/pubsub";
+import type { Asset } from "@webstudio-is/sdk";
import type { Build } from "@webstudio-is/project-build";
import type { Project } from "@webstudio-is/project";
import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";
@@ -41,7 +42,6 @@ import {
import { type Settings, useClientSettings } from "./shared/client-settings";
import { getBuildUrl } from "~/shared/router-utils";
import { useCopyPaste } from "~/shared/copy-paste";
-import type { Asset } from "@webstudio-is/asset-uploader";
import { BlockingAlerts } from "./features/blocking-alerts";
import { useStore } from "@nanostores/react";
import { useSyncPageUrl } from "~/shared/pages";
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
index 2d9ddcd331..09c4d574be 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
@@ -1,4 +1,8 @@
import { useState } from "react";
+import type { Instance, Prop } from "@webstudio-is/project-build";
+import type { PropMeta } from "@webstudio-is/react-sdk";
+import { textVariants } from "@webstudio-is/design-system";
+import type { Asset } from "@webstudio-is/sdk";
import { PropsSection } from "./props-section";
import { usePropsLogic } from "./use-props-logic";
import {
@@ -10,10 +14,6 @@ import {
selectedPageIdStore,
} from "~/shared/nano-states";
import { setMockEnv } from "~/shared/env";
-import type { Instance, Prop } from "@webstudio-is/project-build";
-import type { PropMeta } from "@webstudio-is/react-sdk";
-import { textVariants } from "@webstudio-is/design-system";
-import type { Asset } from "@webstudio-is/asset-uploader";
// eslint-disable-next-line import/no-internal-modules
import catPath from "./props-panel.stories.assets/cat.jpg";
@@ -360,14 +360,14 @@ const startingProps: Prop[] = [
instanceId,
name: "addedUrlAttachment",
type: "asset",
- value: Array.from(assetsStore.get().keys() ?? [])[0] ?? "",
+ value: (Array.from(assetsStore.get().keys())[0] as string) ?? "",
},
{
id: unique(),
instanceId,
name: "addedFile",
type: "asset",
- value: Array.from(assetsStore.get().keys() ?? [])[0] ?? "",
+ value: (Array.from(assetsStore.get().keys())[0] as string) ?? "",
},
];
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index 1c0fbe5686..1de16cee98 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -8,7 +8,7 @@ import {
import equal from "fast-deep-equal";
import type { PropMeta } from "@webstudio-is/react-sdk";
import type { Prop } from "@webstudio-is/project-build";
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
import { SubtractIcon } from "@webstudio-is/icons";
import {
SmallIconButton,
diff --git a/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.ts b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.ts
index 885f93e726..8354c3e4f1 100644
--- a/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.ts
+++ b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.test.ts
@@ -1,5 +1,5 @@
import { describe, test, expect } from "@jest/globals";
-import type { FontAsset } from "@webstudio-is/asset-uploader";
+import type { FontAsset } from "@webstudio-is/sdk";
import { isSupportedFontWeight } from "./is-supported-font-weight";
const createServerAsset = (meta: FontAsset["meta"]): FontAsset => ({
diff --git a/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.ts b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.ts
index 29e610e297..8935f80c4f 100644
--- a/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.ts
+++ b/apps/builder/app/builder/features/style-panel/controls/font-weight/is-supported-font-weight.ts
@@ -1,4 +1,4 @@
-import type { FontAsset } from "@webstudio-is/asset-uploader";
+import type { FontAsset } from "@webstudio-is/sdk";
export const isSupportedFontWeight = (
asset: FontAsset,
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
index 334f9414eb..1f5d444056 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
@@ -1,5 +1,5 @@
import { useStore } from "@nanostores/react";
-import type { Assets } from "@webstudio-is/asset-uploader";
+import type { Assets } from "@webstudio-is/sdk";
import {
Image as WebstudioImage,
createImageLoader,
diff --git a/apps/builder/app/builder/shared/assets/types.ts b/apps/builder/app/builder/shared/assets/types.ts
index 8342fc63dc..8649ef3c58 100644
--- a/apps/builder/app/builder/shared/assets/types.ts
+++ b/apps/builder/app/builder/shared/assets/types.ts
@@ -1,4 +1,4 @@
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
type PreviewAsset = Pick<
Asset,
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index 48ba94bbf9..8346fceb2a 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -2,7 +2,8 @@ import { useMemo } from "react";
import { useStore } from "@nanostores/react";
import warnOnce from "warn-once";
import store from "immerhin";
-import { type AssetType, type Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
+import type { AssetType } from "@webstudio-is/asset-uploader";
import { toast } from "@webstudio-is/design-system";
import { sanitizeS3Key } from "@webstudio-is/asset-uploader";
import { restAssetsUploadPath, restAssetsPath } from "~/shared/router-utils";
diff --git a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx
index c5305058a2..682d5d89a1 100644
--- a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx
@@ -8,10 +8,10 @@ import {
DeprecatedPopoverHeader,
} from "@webstudio-is/design-system";
import { GearIcon, gearIconCssVars } from "@webstudio-is/icons";
-import { ImageInfo } from "./image-info";
import { cssVars } from "@webstudio-is/css-vars";
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
import { theme } from "@webstudio-is/design-system";
+import { ImageInfo } from "./image-info";
const triggerVisibilityVar = cssVars.define("trigger-visibility");
diff --git a/apps/builder/app/builder/shared/image-manager/image-info.tsx b/apps/builder/app/builder/shared/image-manager/image-info.tsx
index e0dff61fbf..c0b2581ea2 100644
--- a/apps/builder/app/builder/shared/image-manager/image-info.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image-info.tsx
@@ -1,4 +1,6 @@
+import prettyBytes from "pretty-bytes";
import {
+ theme,
Box,
Flex,
Grid,
@@ -6,17 +8,15 @@ import {
Button,
Tooltip,
} from "@webstudio-is/design-system";
-import { getFormattedAspectRatio } from "./utils";
import {
CloudIcon,
AspectRatioIcon,
SizeIcon,
TrashIcon,
} from "@webstudio-is/icons";
-import prettyBytes from "pretty-bytes";
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
import { Filename } from "./filename";
-import { theme } from "@webstudio-is/design-system";
+import { getFormattedAspectRatio } from "./utils";
import { useAuthPermit } from "~/shared/nano-states";
type ImageInfoProps = {
diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
index 0479a8bd0b..5cf3f4389c 100644
--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
@@ -1,9 +1,15 @@
import { useState, useMemo } from "react";
+import { matchSorter } from "match-sorter";
import {
deprecatedFindNextListIndex,
Grid,
theme,
} from "@webstudio-is/design-system";
+import type { ImageAsset } from "@webstudio-is/sdk";
+import {
+ acceptToMimePatterns,
+ doesAssetMatchMimePatterns,
+} from "@webstudio-is/asset-uploader";
import {
AssetsShell,
type AssetContainer,
@@ -12,12 +18,6 @@ import {
deleteAssets,
} from "../assets";
import { ImageThumbnail } from "./image-thumbnail";
-import { matchSorter } from "match-sorter";
-import {
- acceptToMimePatterns,
- doesAssetMatchMimePatterns,
- type ImageAsset,
-} from "@webstudio-is/asset-uploader";
const useLogic = ({
onChange,
diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.ts
index 6fd4308967..eff30cb94e 100644
--- a/apps/builder/app/canvas/shared/styles.ts
+++ b/apps/builder/app/canvas/shared/styles.ts
@@ -2,7 +2,7 @@ import { useContext, useEffect, useMemo } from "react";
import { useIsomorphicLayoutEffect } from "react-use";
import { computed } from "nanostores";
import { useStore } from "@nanostores/react";
-import type { Assets } from "@webstudio-is/asset-uploader";
+import type { Assets } from "@webstudio-is/sdk";
import {
collapsedAttribute,
idAttribute,
diff --git a/apps/builder/app/routes/rest.assets.$name.tsx b/apps/builder/app/routes/rest.assets.$name.tsx
index 2baa6e838d..13ea36c517 100644
--- a/apps/builder/app/routes/rest.assets.$name.tsx
+++ b/apps/builder/app/routes/rest.assets.$name.tsx
@@ -1,5 +1,5 @@
import type { ActionArgs } from "@remix-run/node";
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
import { uploadFile } from "@webstudio-is/asset-uploader/index.server";
import type { ActionData } from "~/builder/shared/assets";
import { sentryException } from "~/shared/sentry";
diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsx
index 3f3c7ebbc9..33ab8bf53d 100644
--- a/apps/builder/app/routes/rest.assets.tsx
+++ b/apps/builder/app/routes/rest.assets.tsx
@@ -1,5 +1,6 @@
import type { ActionArgs, LoaderArgs } from "@remix-run/node";
-import { MaxAssets, type Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
+import { MaxAssets } from "@webstudio-is/asset-uploader";
import {
loadAssetsByProject,
createUploadName,
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 5f8b916980..3a9f0037a6 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -14,7 +14,7 @@ import {
StyleSourceSelection,
StyleSourceSelections,
} from "@webstudio-is/project-build";
-import { Asset } from "@webstudio-is/asset-uploader";
+import { Asset } from "@webstudio-is/sdk";
import {
encodeDataSourceVariable,
validateExpression,
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index f81d6c4647..11e0327f2e 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -3,7 +3,7 @@ import { atom, computed, type WritableAtom } from "nanostores";
import { useStore } from "@nanostores/react";
import { nanoid } from "nanoid";
import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
-import type { Asset, Assets } from "@webstudio-is/asset-uploader";
+import type { Asset, Assets } from "@webstudio-is/sdk";
import type { ItemDropTarget, Placement } from "@webstudio-is/design-system";
import type {
Breakpoint,
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 6852b3ac41..501dc63c11 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -58,6 +58,7 @@
"@webstudio-is/sdk-components-react": "workspace:^",
"@webstudio-is/sdk-components-react-radix": "workspace:^",
"@webstudio-is/sdk-components-react-remix": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
"colord": "^2.9.3",
"date-fns": "^2.30.0",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 9867464c2d..b857d06117 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -18,6 +18,7 @@
"@smithy/signature-v4": "^2.0.2",
"@webstudio-is/fonts": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
"immer": "^10.0.2",
"nanoid": "^4.0.2",
diff --git a/packages/asset-uploader/src/db/load.ts b/packages/asset-uploader/src/db/load.ts
index bccb56dc68..ace3b20474 100644
--- a/packages/asset-uploader/src/db/load.ts
+++ b/packages/asset-uploader/src/db/load.ts
@@ -4,7 +4,7 @@ import {
type AppContext,
AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
-import type { Asset } from "../schema";
+import type { Asset } from "@webstudio-is/sdk";
import { formatAsset } from "../utils/format-asset";
export const loadAssetsByProject = async (
diff --git a/packages/asset-uploader/src/delete.ts b/packages/asset-uploader/src/delete.ts
index 011b7ba85a..c329bb483c 100644
--- a/packages/asset-uploader/src/delete.ts
+++ b/packages/asset-uploader/src/delete.ts
@@ -4,7 +4,7 @@ import {
type AppContext,
AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
-import type { Asset } from "./schema";
+import type { Asset } from "@webstudio-is/sdk";
export const deleteAssets = async (
props: {
diff --git a/packages/asset-uploader/src/patch.ts b/packages/asset-uploader/src/patch.ts
index 02ad74f2b3..d94e0bdfca 100644
--- a/packages/asset-uploader/src/patch.ts
+++ b/packages/asset-uploader/src/patch.ts
@@ -4,7 +4,7 @@ import {
type AppContext,
authorizeProject,
} from "@webstudio-is/trpc-interface/index.server";
-import { type Asset, Assets } from "./schema";
+import { type Asset, Assets } from "@webstudio-is/sdk";
import { deleteAssets } from "./delete";
import { loadAssetsByProject } from "./db/load";
diff --git a/packages/asset-uploader/src/schema.ts b/packages/asset-uploader/src/schema.ts
index 812f1b9baa..ad49b7fc0a 100644
--- a/packages/asset-uploader/src/schema.ts
+++ b/packages/asset-uploader/src/schema.ts
@@ -1,14 +1,7 @@
import { z } from "zod";
-import { FontFormat, FontMeta } from "@webstudio-is/fonts";
import { MAX_UPLOAD_SIZE } from "./constants";
import { toBytes } from "./utils/to-bytes";
-export const ImageMeta = z.object({
- width: z.number(),
- height: z.number(),
-});
-export type ImageMeta = z.infer<typeof ImageMeta>;
-
export const MaxSize = z
.string()
.default(MAX_UPLOAD_SIZE)
@@ -16,34 +9,3 @@ export const MaxSize = z
.transform(toBytes);
export const MaxAssets = z.string().default("50").transform(Number.parseFloat);
-
-const AssetId = z.string();
-
-const BaseAsset = z.object({
- id: AssetId,
- projectId: z.string(),
- format: z.string(),
- size: z.number(),
- name: z.string(),
- description: z.union([z.string(), z.null()]),
- createdAt: z.string(),
-});
-
-export const FontAsset = BaseAsset.omit({ format: true }).extend({
- format: FontFormat,
- meta: FontMeta,
- type: z.literal("font"),
-});
-export type FontAsset = z.infer<typeof FontAsset>;
-
-export const ImageAsset = BaseAsset.extend({
- meta: ImageMeta,
- type: z.literal("image"),
-});
-export type ImageAsset = z.infer<typeof ImageAsset>;
-
-export const Asset = z.union([FontAsset, ImageAsset]);
-export type Asset = z.infer<typeof Asset>;
-
-export const Assets = z.map(AssetId, Asset);
-export type Assets = z.infer<typeof Assets>;
diff --git a/packages/asset-uploader/src/utils/format-asset.ts b/packages/asset-uploader/src/utils/format-asset.ts
index f564dfe8f8..9dcdac976f 100644
--- a/packages/asset-uploader/src/utils/format-asset.ts
+++ b/packages/asset-uploader/src/utils/format-asset.ts
@@ -1,7 +1,6 @@
import type { File as DbFile } from "@webstudio-is/prisma-client";
-import { type FontFormat, FONT_FORMATS } from "@webstudio-is/fonts";
-import { FontMeta } from "@webstudio-is/fonts";
-import { type Asset, ImageMeta } from "../schema";
+import { type FontFormat, FontMeta, FONT_FORMATS } from "@webstudio-is/fonts";
+import { type Asset, ImageMeta } from "@webstudio-is/sdk";
export const formatAsset = ({
assetId,
diff --git a/packages/asset-uploader/src/utils/get-asset-data.ts b/packages/asset-uploader/src/utils/get-asset-data.ts
index bb423bb697..5ca3c5e5a2 100644
--- a/packages/asset-uploader/src/utils/get-asset-data.ts
+++ b/packages/asset-uploader/src/utils/get-asset-data.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
import sharp from "sharp";
import { FontMeta } from "@webstudio-is/fonts";
import { getFontData } from "@webstudio-is/fonts/index.server";
-import { ImageMeta } from "../schema";
+import { ImageMeta } from "@webstudio-is/sdk";
export const AssetData = z.object({
size: z.number(),
diff --git a/packages/asset-uploader/src/utils/mime.ts b/packages/asset-uploader/src/utils/mime.ts
index 3899c08ba3..6fe495215e 100644
--- a/packages/asset-uploader/src/utils/mime.ts
+++ b/packages/asset-uploader/src/utils/mime.ts
@@ -2,7 +2,7 @@
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#accept
import warnOnce from "warn-once";
-import type { Asset } from "../schema";
+import type { Asset } from "@webstudio-is/sdk";
type SetType<T> = T extends Set<infer U> ? U : never;
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3634338932..14e16a0a5b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -14,7 +14,6 @@
},
"license": "MIT",
"dependencies": {
- "@webstudio-is/asset-uploader": "workspace:^",
"@webstudio-is/http-client": "workspace:^",
"@webstudio-is/image": "workspace:^",
"@webstudio-is/project-build": "workspace:^",
@@ -22,6 +21,7 @@
"@webstudio-is/sdk-components-react": "workspace:^",
"@webstudio-is/sdk-components-react-radix": "workspace:^",
"@webstudio-is/sdk-components-react-remix": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"env-paths": "^3.0.0",
"ora": "^7.0.1",
"p-limit": "^4.0.0",
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index 5593bbfa1e..e776e5ab41 100644
--- a/packages/cli/src/prebuild.ts
+++ b/packages/cli/src/prebuild.ts
@@ -17,10 +17,10 @@ import {
type Page,
DataSource,
} from "@webstudio-is/project-build";
+import type { Asset, FontAsset } from "@webstudio-is/sdk";
import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";
import * as remixComponentMetas from "@webstudio-is/sdk-components-react-remix/metas";
import * as radixComponentMetas from "@webstudio-is/sdk-components-react-radix/metas";
-import type { Asset, FontAsset } from "@webstudio-is/asset-uploader";
import pLimit from "p-limit";
import ora from "ora";
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 226bad6e47..27ebcc3fa0 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -37,11 +37,11 @@
"dependencies": {
"@jsep-plugin/assignment": "^1.2.1",
"@nanostores/react": "^0.7.1",
- "@webstudio-is/asset-uploader": "workspace:^",
"@webstudio-is/css-data": "workspace:^",
"@webstudio-is/css-engine": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
"@webstudio-is/project-build": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"html-tags": "^3.3.1",
"jsep": "^1.3.8",
"nanoevents": "^8.0.0",
diff --git a/packages/react-sdk/src/context.tsx b/packages/react-sdk/src/context.tsx
index 8e66b1cef5..d8abce2461 100644
--- a/packages/react-sdk/src/context.tsx
+++ b/packages/react-sdk/src/context.tsx
@@ -1,6 +1,6 @@
import { type ReadableAtom, atom } from "nanostores";
import { createContext } from "react";
-import type { Assets } from "@webstudio-is/asset-uploader";
+import type { Assets } from "@webstudio-is/sdk";
import type { DataSource, Instance, Prop } from "@webstudio-is/project-build";
import type { Pages, PropsByInstanceId } from "./props";
import type { IndexesWithinAncestors } from "./instance-utils";
diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.ts
index e67aa5f9e0..6dfed30166 100644
--- a/packages/react-sdk/src/css/css.ts
+++ b/packages/react-sdk/src/css/css.ts
@@ -1,5 +1,5 @@
import { createCssEngine, type TransformValue } from "@webstudio-is/css-engine";
-import type { Asset, Assets } from "@webstudio-is/asset-uploader";
+import type { Asset, Assets } from "@webstudio-is/sdk";
import type { Build } from "@webstudio-is/project-build";
import type { WsComponentMeta } from "../components/component-meta";
import { idAttribute } from "../tree";
diff --git a/packages/react-sdk/src/css/global-rules.ts b/packages/react-sdk/src/css/global-rules.ts
index 0f4ba420b3..2cf23c4195 100644
--- a/packages/react-sdk/src/css/global-rules.ts
+++ b/packages/react-sdk/src/css/global-rules.ts
@@ -1,5 +1,5 @@
import type { CssEngine } from "@webstudio-is/css-engine";
-import type { Assets, FontAsset } from "@webstudio-is/asset-uploader";
+import type { Assets, FontAsset } from "@webstudio-is/sdk";
import { getFontFaces } from "@webstudio-is/fonts";
export const addGlobalRules = (
diff --git a/packages/react-sdk/src/props.test.ts b/packages/react-sdk/src/props.test.ts
index 8fb6fbae76..fa542e8079 100644
--- a/packages/react-sdk/src/props.test.ts
+++ b/packages/react-sdk/src/props.test.ts
@@ -1,7 +1,7 @@
import { describe, test, expect } from "@jest/globals";
import { resolveUrlProp, type Pages, type PropsByInstanceId } from "./props";
import type { Page, Prop } from "@webstudio-is/project-build";
-import type { Asset, Assets } from "@webstudio-is/asset-uploader";
+import type { Asset, Assets } from "@webstudio-is/sdk";
const unique = () => Math.random().toString();
diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.ts
index 9e5411f904..83ccbb2f4e 100644
--- a/packages/react-sdk/src/props.ts
+++ b/packages/react-sdk/src/props.ts
@@ -2,7 +2,7 @@ import { useContext, useMemo } from "react";
import { computed } from "nanostores";
import { useStore } from "@nanostores/react";
import type { Instance, Page, Prop, Props } from "@webstudio-is/project-build";
-import type { Asset, Assets } from "@webstudio-is/asset-uploader";
+import type { Asset, Assets } from "@webstudio-is/sdk";
import { ReactSdkContext } from "./context";
import { idAttribute, indexAttribute } from "./tree/webstudio-component";
diff --git a/packages/react-sdk/src/tree/create-elements-tree.tsx b/packages/react-sdk/src/tree/create-elements-tree.tsx
index e099a81172..40df5ea9bb 100644
--- a/packages/react-sdk/src/tree/create-elements-tree.tsx
+++ b/packages/react-sdk/src/tree/create-elements-tree.tsx
@@ -5,7 +5,7 @@ import {
type ReactNode,
} from "react";
import type { ReadableAtom } from "nanostores";
-import type { Assets } from "@webstudio-is/asset-uploader";
+import type { Assets } from "@webstudio-is/sdk";
import type { Instance, Instances } from "@webstudio-is/project-build";
import type { Components } from "../components/components-utils";
import {
diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.ts
index ddca8b1b6c..d3dd90b8ab 100644
--- a/packages/react-sdk/src/tree/root.ts
+++ b/packages/react-sdk/src/tree/root.ts
@@ -12,7 +12,7 @@ import {
type WritableAtom,
} from "nanostores";
import { type Build, type Page } from "@webstudio-is/project-build";
-import type { Asset } from "@webstudio-is/asset-uploader";
+import type { Asset } from "@webstudio-is/sdk";
import { createElementsTree } from "./create-elements-tree";
import {
WebstudioComponent,
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
new file mode 100644
index 0000000000..1cc798b99d
--- /dev/null
+++ b/packages/sdk/package.json
@@ -0,0 +1,36 @@
+{
+ "name": "@webstudio-is/sdk",
+ "version": "0.91.0",
+ "description": "Webstudio site data schema",
+ "author": "Webstudio <[email protected]>",
+ "homepage": "https://webstudio.is",
+ "license": "AGPL-3.0-or-later",
+ "type": "module",
+ "exports": {
+ "source": "./src/index.ts",
+ "types": "./lib/types/index.d.ts",
+ "import": "./lib/index.js",
+ "require": "./lib/cjs/index.js"
+ },
+ "files": [
+ "lib/*",
+ "src/*",
+ "!*.test.*"
+ ],
+ "sideEffects": false,
+ "scripts": {
+ "typecheck": "tsc",
+ "checks": "pnpm typecheck",
+ "dev": "build-package --watch",
+ "build": "build-package",
+ "dts": "tsc --project tsconfig.dts.json"
+ },
+ "dependencies": {
+ "@webstudio-is/fonts": "workspace:^",
+ "zod": "^3.21.4"
+ },
+ "devDependencies": {
+ "@webstudio-is/scripts": "workspace:^",
+ "@webstudio-is/tsconfig": "workspace:^"
+ }
+}
diff --git a/packages/sdk/src/assets.ts b/packages/sdk/src/assets.ts
new file mode 100644
index 0000000000..150bc87469
--- /dev/null
+++ b/packages/sdk/src/assets.ts
@@ -0,0 +1,41 @@
+import { z } from "zod";
+import { FontFormat, FontMeta } from "@webstudio-is/fonts";
+
+const AssetId = z.string();
+
+const baseAsset = {
+ id: AssetId,
+ projectId: z.string(),
+ size: z.number(),
+ name: z.string(),
+ description: z.union([z.string(), z.null()]),
+ createdAt: z.string(),
+};
+
+export const FontAsset = z.object({
+ ...baseAsset,
+ format: FontFormat,
+ meta: FontMeta,
+ type: z.literal("font"),
+});
+export type FontAsset = z.infer<typeof FontAsset>;
+
+export const ImageMeta = z.object({
+ width: z.number(),
+ height: z.number(),
+});
+export type ImageMeta = z.infer<typeof ImageMeta>;
+
+export const ImageAsset = z.object({
+ ...baseAsset,
+ format: z.string(),
+ meta: ImageMeta,
+ type: z.literal("image"),
+});
+export type ImageAsset = z.infer<typeof ImageAsset>;
+
+export const Asset = z.union([FontAsset, ImageAsset]);
+export type Asset = z.infer<typeof Asset>;
+
+export const Assets = z.map(AssetId, Asset);
+export type Assets = z.infer<typeof Assets>;
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
new file mode 100644
index 0000000000..4ccdc7c5c5
--- /dev/null
+++ b/packages/sdk/src/index.ts
@@ -0,0 +1 @@
+export * from "./assets";
diff --git a/packages/sdk/tsconfig.dts.json b/packages/sdk/tsconfig.dts.json
new file mode 100644
index 0000000000..e84928fb3a
--- /dev/null
+++ b/packages/sdk/tsconfig.dts.json
@@ -0,0 +1,7 @@
+{
+ "extends": "./tsconfig.json",
+ "include": ["src"],
+ "compilerOptions": {
+ "declarationDir": "lib/types"
+ }
+}
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
new file mode 100644
index 0000000000..d2e5040f8f
--- /dev/null
+++ b/packages/sdk/tsconfig.json
@@ -0,0 +1,3 @@
+{
+ "extends": "@webstudio-is/tsconfig/base.json"
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 99d6bb19e7..e86c6961c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,6 +162,9 @@ importers:
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../../packages/react-sdk
+ '@webstudio-is/sdk':
+ specifier: workspace:^
+ version: link:../../packages/sdk
'@webstudio-is/sdk-components-react':
specifier: workspace:^
version: link:../../packages/sdk-components-react
@@ -367,6 +370,9 @@ importers:
'@webstudio-is/prisma-client':
specifier: workspace:^
version: link:../prisma-client
+ '@webstudio-is/sdk':
+ specifier: workspace:^
+ version: link:../sdk
'@webstudio-is/trpc-interface':
specifier: workspace:^
version: link:../trpc-interface
@@ -435,9 +441,6 @@ importers:
packages/cli:
dependencies:
- '@webstudio-is/asset-uploader':
- specifier: workspace:^
- version: link:../asset-uploader
'@webstudio-is/http-client':
specifier: workspace:^
version: link:../http-client
@@ -450,6 +453,9 @@ importers:
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../react-sdk
+ '@webstudio-is/sdk':
+ specifier: workspace:^
+ version: link:../sdk
'@webstudio-is/sdk-components-react':
specifier: workspace:^
version: link:../sdk-components-react
@@ -1227,9 +1233,6 @@ importers:
'@nanostores/react':
specifier: ^0.7.1
- '@webstudio-is/asset-uploader':
- specifier: workspace:^
- version: link:../asset-uploader
'@webstudio-is/css-data':
specifier: workspace:^
version: link:../css-data
@@ -1242,6 +1245,9 @@ importers:
'@webstudio-is/project-build':
specifier: workspace:^
version: link:../project-build
+ '@webstudio-is/sdk':
+ specifier: workspace:^
+ version: link:../sdk
html-tags:
specifier: ^3.3.1
version: 3.3.1
@@ -1326,6 +1332,22 @@ importers:
specifier: 5.1.6
version: 5.1.6
+ packages/sdk:
+ dependencies:
+ '@webstudio-is/fonts':
+ specifier: workspace:^
+ version: link:../fonts
+ zod:
+ specifier: ^3.21.4
+ version: 3.21.4
+ devDependencies:
+ '@webstudio-is/scripts':
+ specifier: workspace:^
+ version: link:../scripts
+ '@webstudio-is/tsconfig':
+ specifier: workspace:^
+ version: link:../tsconfig
+
packages/sdk-components-react:
dependencies:
'@react-aria/utils':