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
fix: Make MCP authoring reliable across assets, styles, and embeds (#5932)
Oleg Isonen54aa7be145fb
diff --git a/apps/builder/app/builder/features/style-panel/shared/model.tsx b/apps/builder/app/builder/features/style-panel/shared/model.tsxindex 8b691866cf..f708b1ca1c 100644--- a/apps/builder/app/builder/features/style-panel/shared/model.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/model.tsx@@ -1,5 +1,5 @@import { useMemo, useRef } from "react";-import type { HtmlTags } from "html-tags";+import type { HtmlTags } from "@webstudio-is/html-data";import { computed, type ReadableAtom } from "nanostores";import { useStore } from "@nanostores/react";import { propertiesData } from "@webstudio-is/css-data";diff --git a/apps/builder/app/builder/shared/assets/asset-utils.test.ts b/apps/builder/app/builder/shared/assets/asset-utils.test.tsindex 899a0cbefa..fb3106317f 100644--- a/apps/builder/app/builder/shared/assets/asset-utils.test.ts+++ b/apps/builder/app/builder/shared/assets/asset-utils.test.ts@@ -6,14 +6,17 @@ import {uploadingFileDataToAsset,} from "./asset-utils";-test("distinguishes upload fingerprints for equal files with different names", async () => {+test("distinguishes upload fingerprints by filename and content", async () => {const first = new File([""], "first.md");- const second = new File([""], "second.md");+ const renamed = new File([""], "renamed.md");+ const changed = new File(["changed"], "first.md");const firstFingerprint = await getFileUploadFingerprint(first);- const secondFingerprint = await getFileUploadFingerprint(second);+ const renamedFingerprint = await getFileUploadFingerprint(renamed);+ const changedFingerprint = await getFileUploadFingerprint(changed);- expect(firstFingerprint).not.toBe(secondFingerprint);+ expect(firstFingerprint).not.toBe(renamedFingerprint);+ expect(firstFingerprint).not.toBe(changedFingerprint);});describe("getImageNameAndType", () => {diff --git a/apps/builder/app/builder/shared/assets/asset-utils.ts b/apps/builder/app/builder/shared/assets/asset-utils.tsindex 2294886182..333895604b 100644--- a/apps/builder/app/builder/shared/assets/asset-utils.ts+++ b/apps/builder/app/builder/shared/assets/asset-utils.ts@@ -13,6 +13,7 @@ import {getAssetUrl,} from "@webstudio-is/sdk";import type { UploadingFileData } from "~/shared/nano-states";+import { getContentHash } from "@webstudio-is/asset-uploader";export { getAssetUrl };@@ -55,18 +56,9 @@ const extractImageNameAndMimeTypeFromUrl = (url: URL) => {return [FALLBACK_URL_TYPE, `${nanoid()}.png`] as const;};-const bufferToHex = (buffer: ArrayBuffer) => {- const byteArray = new Uint8Array(buffer);- return Array.from(byteArray, (byte) =>- byte.toString(16).padStart(2, "0")- ).join("");-};-export const getSha256Hash = async (data: string) => {const encoder = new TextEncoder();- const dataBuffer = encoder.encode(data);- const hashBuffer = await crypto.subtle.digest("SHA-256", dataBuffer);- return bufferToHex(hashBuffer);+ return getContentHash(encoder.encode(data));};const readFileAsArrayBuffer = (file: File): Promise<ArrayBuffer> =>@@ -77,14 +69,16 @@ const readFileAsArrayBuffer = (file: File): Promise<ArrayBuffer> =>reader.readAsArrayBuffer(file);});-const getSha256HashOfFile = async (file: File) => {+export const getSha256HashOfFile = async (file: File) => {const arrayBuffer = await readFileAsArrayBuffer(file);- const hashBuffer = await crypto.subtle.digest("SHA-256", arrayBuffer);- return bufferToHex(hashBuffer);+ return getContentHash(arrayBuffer);};-export const getFileUploadFingerprint = async (file: File) =>- JSON.stringify([file.name, await getSha256HashOfFile(file)]);+export const getFileUploadFingerprint = async (+ file: File,+ contentHash?: string+) =>+ JSON.stringify([file.name, contentHash ?? (await getSha256HashOfFile(file))]);export const getMimeType = (file: File | URL) => {if (file instanceof File) {diff --git a/apps/builder/app/builder/shared/assets/types.ts b/apps/builder/app/builder/shared/assets/types.tsindex 28e0fe62c8..019d691ec6 100644--- a/apps/builder/app/builder/shared/assets/types.ts+++ b/apps/builder/app/builder/shared/assets/types.ts@@ -23,6 +23,7 @@ export type AssetContainer = UploadedAssetContainer | UploadingAssetContainer;export type AssetActionResponse = {uploadedAssets?: Array<Asset>;+ deduplicated?: boolean;deletedAssets?: Array<Asset>;errors?: string;};diff --git a/apps/builder/app/builder/shared/assets/upload-assets.test.ts b/apps/builder/app/builder/shared/assets/upload-assets.test.tsindex 14e957dc88..e969424aab 100644--- a/apps/builder/app/builder/shared/assets/upload-assets.test.ts+++ b/apps/builder/app/builder/shared/assets/upload-assets.test.ts@@ -18,7 +18,11 @@ describe("upload-assets", () => {test("requests upload tickets without client-supplied asset ids", async () => {request.mockResolvedValue(new Response(- JSON.stringify({ assetId: "server-asset-id", name: "upload-name" })+ JSON.stringify({+ assetId: "server-asset-id",+ name: "upload-name",+ deduplicated: false,+ })));@@ -33,6 +37,7 @@ describe("upload-assets", () => {).resolves.toEqual({assetId: "server-asset-id",name: "upload-name",+ deduplicated: false,});expect(request).toHaveBeenCalledOnce();@@ -45,13 +50,18 @@ describe("upload-assets", () => {expect(init.body.get("type")).toBe("image");expect(init.body.get("filename")).toBe("image.png");expect(init.body.get("displayFilename")).toBe("image");+ expect(init.body.get("contentHash")).toBeNull();expect(init.headers.get("x-auth-token")).toBe("token");});test("keeps the display name separate from the sanitized storage name", async () => {request.mockResolvedValue(new Response(- JSON.stringify({ assetId: "server-asset-id", name: "upload-name" })+ JSON.stringify({+ assetId: "server-asset-id",+ name: "upload-name",+ deduplicated: false,+ })));@@ -70,6 +80,38 @@ describe("upload-assets", () => {expect(init.body.get("displayFilename")).toBe("Campaign photo");});+ test("passes the existing browser content hash to the shared upload ticket", async () => {+ request.mockResolvedValue(+ new Response(+ JSON.stringify({+ assetId: "existing-asset-id",+ name: "existing-name",+ deduplicated: true,+ })+ )+ );++ await expect(+ createUploadTicket({+ authToken: "token",+ projectId: "project-id",+ fileOrUrl: new File(["content"], "image.png", {+ type: "image/png",+ }),+ contentHash: "a".repeat(64),+ assetType: "image",+ request,+ })+ ).resolves.toEqual({+ assetId: "existing-asset-id",+ name: "existing-name",+ deduplicated: true,+ });++ const [, init] = request.mock.calls[0] as [string, { body: FormData }];+ expect(init.body.get("contentHash")).toBe("a".repeat(64));+ });+test("reports non-error upload failures", async () => {request.mockRejectedValue("network down");const onCompleted = vi.fn();@@ -102,6 +144,60 @@ describe("upload-assets", () => {});});+ test("prepares one content hash for fingerprinting and server deduplication", async () => {+ const [fileData] = await getFilesData(+ "image",+ [new File(["hello"], "image.png", { type: "image/png" })],+ undefined,+ () => "blob:test"+ );++ const contentHash =+ "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824";+ expect(fileData).toMatchObject({+ source: "file",+ contentHash,+ fingerprintId: JSON.stringify(["image.png", contentHash]),+ });+ });++ test("preserves identical file content with different filenames", async () => {+ const filesData = await getFilesData(+ "image",+ [+ new File(["same"], "first.png", { type: "image/png" }),+ new File(["same"], "second.png", { type: "image/png" }),+ ],+ undefined,+ (file) => `blob:${file instanceof File ? file.name : "unknown"}`+ );+ const revokeObjectURL = vi.fn();++ const uniqueFilesData = getUniqueFilesData(filesData, revokeObjectURL);++ expect(uniqueFilesData.size).toBe(2);+ expect(revokeObjectURL).not.toHaveBeenCalled();+ });++ test("deduplicates identical content with the same filename", async () => {+ let objectUrlIndex = 0;+ const filesData = await getFilesData(+ "image",+ [+ new File(["same"], "image.png", { type: "image/png" }),+ new File(["same"], "image.png", { type: "image/png" }),+ ],+ undefined,+ () => `blob:${objectUrlIndex++}`+ );+ const revokeObjectURL = vi.fn();++ const uniqueFilesData = getUniqueFilesData(filesData, revokeObjectURL);++ expect(uniqueFilesData.size).toBe(1);+ expect(revokeObjectURL).toHaveBeenCalledWith("blob:1");+ });+test("releases object URLs discarded during deduplication", async () => {const url = new URL("https://example.com/image.png");const filesData = await getFilesData("image", [url, url]);diff --git a/apps/builder/app/builder/shared/assets/upload-assets.tsx b/apps/builder/app/builder/shared/assets/upload-assets.tsxindex 41e67d763b..6bf854af50 100644--- a/apps/builder/app/builder/shared/assets/upload-assets.tsx+++ b/apps/builder/app/builder/shared/assets/upload-assets.tsx@@ -1,7 +1,7 @@import warnOnce from "warn-once";import invariant from "tiny-invariant";import { getFileNameParts, type Asset } from "@webstudio-is/sdk";-import type { AssetType } from "@webstudio-is/asset-uploader";+import type { AssetType, UploadTicket } from "@webstudio-is/asset-uploader";import { Box, toast, css, theme } from "@webstudio-is/design-system";import { sanitizeS3Key } from "@webstudio-is/asset-uploader";import { Image, wsImageLoader } from "@webstudio-is/image";@@ -24,6 +24,7 @@ import {getFileUploadFingerprint,getMimeType,getSha256Hash,+ getSha256HashOfFile,} from "./asset-utils";const safeDeleteAssets = (assetIds: Asset["id"][], projectId: string) => {@@ -71,12 +72,17 @@ const safeSetAsset = (asset: Asset, projectId: string) => {const getFilesData = async <T extends File | URL>(type: AssetType,filesOrUrls: T[],- folderId?: string+ folderId?: string,+ createObjectURL = URL.createObjectURL): Promise<UploadingFileData[]> => {const filesData: UploadingFileData[] = [];for (const fileOrUrl of filesOrUrls) {if (fileOrUrl instanceof File) {- const fingerprintId = await getFileUploadFingerprint(fileOrUrl);+ const contentHash = await getSha256HashOfFile(fileOrUrl);+ const fingerprintId = await getFileUploadFingerprint(+ fileOrUrl,+ contentHash+ );filesData.push({source: "file" as const,assetId: "",@@ -84,7 +90,8 @@ const getFilesData = async <T extends File | URL>(uploadName: "",type,file: fileOrUrl,- objectURL: URL.createObjectURL(fileOrUrl),+ contentHash,+ objectURL: createObjectURL(fileOrUrl),folderId,});continue;@@ -265,21 +272,18 @@ const submitAssetUpload = async ({}};-type UploadTicket = {- assetId: Asset["id"];- name: string;-};-const createUploadTicket = async ({authToken,projectId,fileOrUrl,+ contentHash,assetType,request = fetch,}: {authToken: undefined | string;projectId: string;fileOrUrl: File | URL;+ contentHash?: string;assetType: AssetType;request?: typeof fetch;}): Promise<UploadTicket> => {@@ -287,6 +291,9 @@ const createUploadTicket = async ({const metaFormData = new FormData();metaFormData.append("projectId", projectId);metaFormData.append("type", assetType);+ if (contentHash !== undefined) {+ metaFormData.append("contentHash", contentHash);+ }const existingNames = new Set<string>();for (const asset of $assets.get().values()) {existingNames.add(formatAssetName(asset));@@ -478,11 +485,19 @@ export const uploadAssets = async <T extends File | URL>(projectId,fileOrUrl:fileData.source === "file" ? fileData.file : new URL(fileData.url),+ contentHash:+ fileData.source === "file" ? fileData.contentHash : undefined,assetType: fileData.type,});fileData.assetId = ticket.assetId;fileData.uploadName = ticket.name;uploadTickets.set(fileData.fingerprintId, ticket);+ if (ticket.deduplicated) {+ URL.revokeObjectURL(fileData.objectURL);+ safeSetAsset(ticket.asset, projectId);+ toast.info("Asset already exists");+ continue;+ }ticketedFilesData.push(fileData);} catch (error) {URL.revokeObjectURL(fileData.objectURL);diff --git a/apps/builder/app/builder/shared/instance-label.tsx b/apps/builder/app/builder/shared/instance-label.tsxindex be4d384f20..bf314577ef 100644--- a/apps/builder/app/builder/shared/instance-label.tsx+++ b/apps/builder/app/builder/shared/instance-label.tsx@@ -1,4 +1,4 @@-import type { HtmlTags } from "html-tags";+import type { HtmlTags } from "@webstudio-is/html-data";import { useStore } from "@nanostores/react";import {BlockquoteIcon,diff --git a/apps/builder/app/canvas/inflator.ts b/apps/builder/app/canvas/inflator.tsindex fb1c4d4ce6..74dcf03215 100644--- a/apps/builder/app/canvas/inflator.ts+++ b/apps/builder/app/canvas/inflator.ts@@ -1,4 +1,4 @@-import htmlTags, { voidHtmlTags, type HtmlTags } from "html-tags";+import { htmlTags, voidHtmlTags, type HtmlTags } from "@webstudio-is/html-data";import { inflatedAttribute, idAttribute } from "@webstudio-is/react-sdk";import { compareMedia, type StyleValue } from "@webstudio-is/css-engine";import { parseGridTemplateTrackList } from "@webstudio-is/css-data";diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsxindex 16f4e9eeca..6d02b5b8cf 100644--- a/apps/builder/app/routes/rest.assets.tsx+++ b/apps/builder/app/routes/rest.assets.tsx@@ -1,5 +1,8 @@import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";-import { createUploadTicket } from "@webstudio-is/asset-uploader/index.server";+import {+ createUploadTicket,+ isContentHash,+} from "@webstudio-is/asset-uploader/index.server";import isValidFilename from "valid-filename";import { createContext } from "~/shared/context.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";@@ -29,10 +32,12 @@ export const action = async (props: ActionFunctionArgs) => {const type = formData.get("type");const filename = formData.get("filename");const displayFilename = formData.get("displayFilename");+ const contentHash = formData.get("contentHash");if (typeof projectId !== "string" ||typeof type !== "string" ||typeof filename !== "string" ||+ (contentHash !== null && isContentHash(contentHash) === false) ||(displayFilename !== null &&(typeof displayFilename !== "string" ||isValidFilename(displayFilename) === false))@@ -45,6 +50,7 @@ export const action = async (props: ActionFunctionArgs) => {type,filename,displayFilename: displayFilename ?? undefined,+ contentHash: contentHash ?? undefined,},context);diff --git a/apps/builder/app/routes/rest.assets_.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsxindex 198637e63d..a9c2c9a742 100644--- a/apps/builder/app/routes/rest.assets_.$name.tsx+++ b/apps/builder/app/routes/rest.assets_.$name.tsx@@ -1,12 +1,20 @@import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";+import { arrayBuffer } from "node:stream/consumers";import {createUploadTicket,+ createSizeLimiter,+ assetDataOverride,+ getContentHash,uploadFile,type UploadErrorCleanup,} from "@webstudio-is/asset-uploader/index.server";import { isAssetFileName } from "@webstudio-is/protocol";+import type { Asset } from "@webstudio-is/sdk";import type { AssetActionResponse } from "~/builder/shared/assets";-import { createAssetClient } from "~/shared/asset-client";+import {+ createAssetClient,+ getMaxAssetUploadSize,+} from "~/shared/asset-client";import { createContext } from "~/shared/context.server";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";import { checkCsrf } from "~/services/csrf-session.server";@@ -26,12 +34,17 @@ const createAssetUploadResponse = async ({context,name,assetInfoFallback,+ assetInfoOverride,onUploadError,}: {body: ReadableStream<Uint8Array>;context: Awaited<ReturnType<typeof createContext>>;name: string;assetInfoFallback: AssetInfoFallback;+ assetInfoOverride?: {+ format?: string;+ meta?: Record<string, unknown>;+ };onUploadError?: UploadErrorCleanup;}) => {const asset = await uploadFile(@@ -40,13 +53,48 @@ const createAssetUploadResponse = async ({createAssetClient(),context,assetInfoFallback,+ assetInfoOverride,onUploadError);- return json({ uploadedAssets: [asset] } satisfies AssetActionResponse, {- headers: privateNoStoreResponseHeaders,- });+ return json(+ {+ uploadedAssets: [asset],+ deduplicated: false,+ } satisfies AssetActionResponse,+ {+ headers: privateNoStoreResponseHeaders,+ }+ );};+const createDeduplicatedAssetResponse = (asset: Asset) => {+ return json(+ {+ uploadedAssets: [asset],+ deduplicated: true,+ } satisfies AssetActionResponse,+ {+ headers: privateNoStoreResponseHeaders,+ }+ );+};++const createRequestBody = (data: Uint8Array) =>+ new Blob([data as Uint8Array<ArrayBuffer>]).stream();++const readRequestBody = async (+ body: ReadableStream<Uint8Array>,+ name: string+) =>+ new Uint8Array(+ await arrayBuffer(+ createSizeLimiter(+ getMaxAssetUploadSize(),+ name+ )(body as unknown as AsyncIterable<Uint8Array>)+ )+ );+const createApiUploadErrorCleanup =(assetId: string, projectId: string): UploadErrorCleanup =>async (name, context) => {@@ -81,6 +129,7 @@ export const action = async (props: ActionFunctionArgs) => {const folderId = url.searchParams.get("folderId") ?? undefined;const description =request.headers.get("x-webstudio-asset-description") ?? undefined;+ const rawAssetMeta = request.headers.get("x-webstudio-asset-meta");const rawAssetType = url.searchParams.get("type");const isApiUpload = projectId !== null || rawAssetType !== null;@@ -115,9 +164,15 @@ export const action = async (props: ActionFunctionArgs) => {: undefined,searchParams: url.searchParams,});+ const assetInfoOverride = assetDataOverride.parse({+ format: url.searchParams.get("format") ?? undefined,+ meta: rawAssetMeta === null ? undefined : JSON.parse(rawAssetMeta),+ });const context = await createContext(request);await assertApiProjectPermit(context, projectId, "build");+ const data = await readRequestBody(request.body, params.name);+ const force = url.searchParams.get("force") === "true";const ticket = await createUploadTicket({projectId,@@ -125,14 +180,19 @@ export const action = async (props: ActionFunctionArgs) => {filename: params.name,description,folderId,+ contentHash: force ? undefined : await getContentHash(data),},context);+ if (ticket.deduplicated) {+ return createDeduplicatedAssetResponse(ticket.asset);+ }return await createAssetUploadResponse({- body: request.body,+ body: createRequestBody(data),context,name: ticket.name,assetInfoFallback,+ assetInfoOverride,onUploadError: createApiUploadErrorCleanup(ticket.assetId, projectId),});}diff --git a/apps/builder/app/shared/asset-client.ts b/apps/builder/app/shared/asset-client.tsindex 0f00154d08..c16b020011 100644--- a/apps/builder/app/shared/asset-client.ts+++ b/apps/builder/app/shared/asset-client.ts@@ -8,8 +8,10 @@ import env from "~/env/env.server";export const fileUploadPath = "public/cgi/asset";+export const getMaxAssetUploadSize = () => maxSize.parse(env.MAX_UPLOAD_SIZE);+export const createAssetClient = () => {- const maxUploadSize = maxSize.parse(env.MAX_UPLOAD_SIZE);+ const maxUploadSize = getMaxAssetUploadSize();if (env.S3_ENDPOINT !== undefined &&env.S3_REGION !== undefined &&diff --git a/apps/builder/app/shared/copy-paste/copy-paste.test.ts b/apps/builder/app/shared/copy-paste/copy-paste.test.tsindex 9fe990624a..ff322c36bd 100644--- a/apps/builder/app/shared/copy-paste/copy-paste.test.ts+++ b/apps/builder/app/shared/copy-paste/copy-paste.test.ts@@ -2,7 +2,7 @@ import { afterEach, expect, test, vi } from "vitest";import { enableMapSet } from "immer";import { createDefaultPages } from "@webstudio-is/project-build";import { createEmptyWebstudioFragment } from "@webstudio-is/project-build/runtime";-import { coreMetas, type Instance } from "@webstudio-is/sdk";+import { coreMetas, ROOT_INSTANCE_ID, type Instance } from "@webstudio-is/sdk";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";import type { Project } from "@webstudio-is/project";import { initBuilderApi } from "../builder-api";@@ -91,7 +91,12 @@ const setupRootCssVariable = (property: `--${string}`, value: string) => {new Map([["root-local", { id: "root-local", type: "local" }]]));$styleSourceSelections.set(- new Map([["body-id", { instanceId: "body-id", values: ["root-local"] }]])+ new Map([+ [+ ROOT_INSTANCE_ID,+ { instanceId: ROOT_INSTANCE_ID, values: ["root-local"] },+ ],+ ]));$styles.set(new Map([diff --git a/apps/builder/app/shared/instance-utils/insert.ts b/apps/builder/app/shared/instance-utils/insert.tsindex a3a884001e..e6f839386c 100644--- a/apps/builder/app/shared/instance-utils/insert.ts+++ b/apps/builder/app/shared/instance-utils/insert.ts@@ -187,7 +187,7 @@ export const insertWebstudioFragmentAt = (id: "instances.insertFragment",input: {fragment,- conflictResolution,+ conflictResolution: conflictResolution ?? "theirs",contentMode: options?.contentMode,},});@@ -205,7 +205,7 @@ export const insertWebstudioFragmentAt = (input: {parentInstanceId: target.parentInstanceId,fragment,- conflictResolution,+ conflictResolution: conflictResolution ?? "theirs",contentMode: options?.contentMode,insertIndex: target.insertIndex,},diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.tsindex ca9b71faa1..be9b0c5f20 100644--- a/apps/builder/app/shared/nano-states/misc.ts+++ b/apps/builder/app/shared/nano-states/misc.ts@@ -135,6 +135,7 @@ export type UploadingFileData = Simplify<| {source: "file";file: File;+ contentHash?: string;}| {source: "url";diff --git a/apps/builder/app/shared/style-object-model.test.tsx b/apps/builder/app/shared/style-object-model.test.tsxindex f3f2f92e92..09b186612c 100644--- a/apps/builder/app/shared/style-object-model.test.tsx+++ b/apps/builder/app/shared/style-object-model.test.tsx@@ -1,6 +1,6 @@import type { JSX } from "react";import { describe, expect, test } from "vitest";-import type { HtmlTags } from "html-tags";+import type { HtmlTags } from "@webstudio-is/html-data";import {type Breakpoint,type Styles,diff --git a/apps/builder/app/shared/style-object-model.ts b/apps/builder/app/shared/style-object-model.tsindex 5462ab4f8c..1fa360454b 100644--- a/apps/builder/app/shared/style-object-model.ts+++ b/apps/builder/app/shared/style-object-model.ts@@ -1,5 +1,5 @@import { generate, walk, List, type CssNode } from "css-tree";-import type { HtmlTags } from "html-tags";+import type { HtmlTags } from "@webstudio-is/html-data";import {camelCaseProperty,cssTryParseValue,diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 3bfe08a424..6f3eabe9dc 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -151,7 +151,6 @@"@webstudio-is/tsconfig": "workspace:*","css.escape": "^1.5.1","fast-glob": "^3.3.2",- "html-tags": "^4.0.0","msw": "^2.13.2","playwright": "^1.50.1","react-router-dom": "^6.30.0",diff --git a/packages/asset-uploader/src/client.ts b/packages/asset-uploader/src/client.tsindex 197f74195d..f73dad1776 100644--- a/packages/asset-uploader/src/client.ts+++ b/packages/asset-uploader/src/client.ts@@ -1,4 +1,4 @@-import type { AssetData } from "./utils/get-asset-data";+import type { AssetData, AssetDataOverride } from "./utils/get-asset-data";export type AssetClient = {uploadFile: (@@ -7,6 +7,7 @@ export type AssetClient = {data: AsyncIterable<Uint8Array>,assetInfoFallback:| { width: number; height: number; format: string }- | undefined+ | undefined,+ assetDataOverride?: AssetDataOverride) => Promise<AssetData>;};diff --git a/packages/asset-uploader/src/clients/fs/fs.ts b/packages/asset-uploader/src/clients/fs/fs.tsindex 63ddccc78c..9e96273d97 100644--- a/packages/asset-uploader/src/clients/fs/fs.ts+++ b/packages/asset-uploader/src/clients/fs/fs.ts@@ -8,13 +8,14 @@ type FsClientOptions = {export const createFsClient = (options: FsClientOptions): AssetClient => {return {- uploadFile: (name, type, data) =>+ uploadFile: (name, type, data, _assetInfoFallback, assetDataOverride) =>uploadToFs({name,type,data,maxSize: options.maxUploadSize,fileDirectory: options.fileDirectory,+ assetDataOverride,}),};};diff --git a/packages/asset-uploader/src/clients/fs/upload.ts b/packages/asset-uploader/src/clients/fs/upload.tsindex d30e5846c6..9c955e1cc5 100644--- a/packages/asset-uploader/src/clients/fs/upload.ts+++ b/packages/asset-uploader/src/clients/fs/upload.ts@@ -1,7 +1,12 @@import { mkdir, writeFile } from "node:fs/promises";import { dirname, resolve } from "node:path";import { buffer } from "node:stream/consumers";-import { type AssetData, getAssetData } from "../../utils/get-asset-data";+import {+ applyAssetDataOverride,+ type AssetData,+ type AssetDataOverride,+ getAssetData,+} from "../../utils/get-asset-data";import { createSizeLimiter } from "../../utils/size-limiter";export const uploadToFs = async ({@@ -10,12 +15,14 @@ export const uploadToFs = async ({data: dataStream,maxSize,fileDirectory,+ assetDataOverride,}: {name: string;type: string;data: AsyncIterable<Uint8Array>;maxSize: number;fileDirectory: string;+ assetDataOverride?: AssetDataOverride;}): Promise<AssetData> => {const filepath = resolve(fileDirectory, name);@@ -23,18 +30,20 @@ export const uploadToFs = async ({const limitSize = createSizeLimiter(maxSize, name);const data = await buffer(limitSize(dataStream));- await writeFile(filepath, data);-- const assetData = await getAssetData({- type: type.startsWith("image")- ? "image"- : type === "font"- ? "font"- : "file",- size: data.byteLength,- data,- name,- });+ const assetData = applyAssetDataOverride(+ await getAssetData({+ type: type.startsWith("image")+ ? "image"+ : type === "font"+ ? "font"+ : "file",+ size: data.byteLength,+ data,+ name,+ }),+ assetDataOverride+ );+ await writeFile(filepath, data);return assetData;};diff --git a/packages/asset-uploader/src/clients/s3/s3.ts b/packages/asset-uploader/src/clients/s3/s3.tsindex e1f4a2c73a..bdf26dab2f 100644--- a/packages/asset-uploader/src/clients/s3/s3.ts+++ b/packages/asset-uploader/src/clients/s3/s3.ts@@ -30,7 +30,8 @@ export const createS3Client = (options: S3ClientOptions): AssetClient => {name,type,data,- assetInfoFallback+ assetInfoFallback,+ assetDataOverride) => {return uploadToS3({signer,@@ -42,6 +43,7 @@ export const createS3Client = (options: S3ClientOptions): AssetClient => {bucket: options.bucket,acl: options.acl,assetInfoFallback,+ assetDataOverride,});};diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex 3e377e44ae..f46f17a796 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -1,6 +1,11 @@import { arrayBuffer } from "node:stream/consumers";import type { SignatureV4 } from "@smithy/signature-v4";-import { type AssetData, getAssetData } from "../../utils/get-asset-data";+import {+ applyAssetDataOverride,+ type AssetData,+ type AssetDataOverride,+ getAssetData,+} from "../../utils/get-asset-data";import { createSizeLimiter } from "../../utils/size-limiter";import { extendedEncodeURIComponent } from "../../utils/sanitize-s3-key";import { getMimeTypeByFilename } from "@webstudio-is/sdk";@@ -15,6 +20,7 @@ export const uploadToS3 = async ({bucket,acl,assetInfoFallback,+ assetDataOverride,}: {signer: SignatureV4;name: string;@@ -27,6 +33,7 @@ export const uploadToS3 = async ({assetInfoFallback:| { width: number; height: number; format: string }| undefined;+ assetDataOverride?: AssetDataOverride;}): Promise<AssetData> => {const limitSize = createSizeLimiter(maxSize, name);@@ -44,6 +51,29 @@ export const uploadToS3 = async ({// Use proper MIME type based on file extension instead of generic type categoryconst contentType = getMimeTypeByFilename(name);+ const assetData = applyAssetDataOverride(+ type.startsWith("video") && assetInfoFallback !== undefined+ ? {+ size: data.byteLength,+ format: assetInfoFallback.format,+ meta: {+ width: assetInfoFallback.width,+ height: assetInfoFallback.height,+ },+ }+ : await getAssetData({+ type: type.startsWith("image")+ ? "image"+ : type === "font"+ ? "font"+ : "file",+ size: data.byteLength,+ data: new Uint8Array(data),+ name,+ }),+ assetDataOverride+ );+const s3Request = await signer.sign({method: "PUT",protocol: url.protocol,@@ -73,27 +103,5 @@ export const uploadToS3 = async ({throw Error(`Cannot upload file ${name}`);}- if (type.startsWith("video") && assetInfoFallback !== undefined) {- return {- size: data.byteLength,- format: assetInfoFallback?.format,- meta: {- width: assetInfoFallback?.width ?? 0,- height: assetInfoFallback?.height ?? 0,- },- };- }-- const assetData = await getAssetData({- type: type.startsWith("image")- ? "image"- : type === "font"- ? "font"- : "file",- size: data.byteLength,- data: new Uint8Array(data),- name,- });-return assetData;};diff --git a/packages/asset-uploader/src/content-hash.test.ts b/packages/asset-uploader/src/content-hash.test.tsnew file mode 100644index 0000000000..99fa54407f--- /dev/null+++ b/packages/asset-uploader/src/content-hash.test.ts@@ -0,0 +1,21 @@+import { describe, expect, test } from "vitest";+import { isContentHash } from "./content-hash";++describe("isContentHash", () => {+ test("accepts lowercase SHA-256 hashes", () => {+ expect(isContentHash("a".repeat(64))).toBe(true);+ });++ test.each([+ "a".repeat(63),+ "a".repeat(65),+ "A".repeat(64),+ "g".repeat(64),+ "sha256:" + "a".repeat(64),+ "",+ undefined,+ null,+ ])("rejects invalid content hash: %s", (value) => {+ expect(isContentHash(value)).toBe(false);+ });+});diff --git a/packages/asset-uploader/src/content-hash.ts b/packages/asset-uploader/src/content-hash.tsnew file mode 100644index 0000000000..119fa39b1e--- /dev/null+++ b/packages/asset-uploader/src/content-hash.ts@@ -0,0 +1,6 @@+export { getAssetContentHash as getContentHash } from "@webstudio-is/sdk";++const contentHashPattern = /^[a-f0-9]{64}$/;++export const isContentHash = (value: unknown): value is string =>+ typeof value === "string" && contentHashPattern.test(value);diff --git a/packages/asset-uploader/src/index.server.ts b/packages/asset-uploader/src/index.server.tsindex 490cc589ea..3d8f1db150 100644--- a/packages/asset-uploader/src/index.server.ts+++ b/packages/asset-uploader/src/index.server.ts@@ -1,4 +1,6 @@export * from "./db";+export * from "./content-hash";+export * from "./utils/size-limiter";export * from "./upload";export * from "./delete";export * from "./patch";@@ -7,3 +9,4 @@ export * from "./folder-persistence";export * from "./revision";export * from "./clients/fs/fs";export * from "./clients/s3/s3";+export { assetDataOverride } from "./utils/get-asset-data";diff --git a/packages/asset-uploader/src/index.ts b/packages/asset-uploader/src/index.tsindex feff34e0af..cf18684ddb 100644--- a/packages/asset-uploader/src/index.ts+++ b/packages/asset-uploader/src/index.ts@@ -1,5 +1,6 @@export * from "./types";export * from "./schema";export * from "./constants";+export * from "./content-hash";export * from "./utils/to-bytes";export * from "./utils/sanitize-s3-key";diff --git a/packages/asset-uploader/src/revision.ts b/packages/asset-uploader/src/revision.tsindex 9133957217..360147e804 100644--- a/packages/asset-uploader/src/revision.ts+++ b/packages/asset-uploader/src/revision.ts@@ -152,6 +152,7 @@ export const updateAssetContent = async (assetClient,context,undefined,+ undefined,async (name, { postgrest }) => {const deletedFile = await postgrest.client.from("File")diff --git a/packages/asset-uploader/src/types.ts b/packages/asset-uploader/src/types.tsindex 4cacf624e6..53466b3af6 100644--- a/packages/asset-uploader/src/types.ts+++ b/packages/asset-uploader/src/types.ts@@ -1 +1,12 @@+import type { Asset } from "@webstudio-is/sdk";+export type AssetType = "image" | "font" | "video" | "file";++type UploadTicketBase = {+ assetId: Asset["id"];+ name: string;+};++export type UploadTicket =+ | (UploadTicketBase & { deduplicated: false })+ | (UploadTicketBase & { deduplicated: true; asset: Asset });diff --git a/packages/asset-uploader/src/upload.test.ts b/packages/asset-uploader/src/upload.test.tsindex 4172199384..f5cbaa2016 100644--- a/packages/asset-uploader/src/upload.test.ts+++ b/packages/asset-uploader/src/upload.test.ts@@ -38,6 +38,11 @@ const ownershipHandler = db.get("Project", ({ request }) => {return json({ userId: "owner-1", workspaceId: null });});+const availableAssetCapacityHandlers = () => [+ db.head("Asset", () => empty({ headers: { "Content-Range": "*/0" } })),+ db.head("File", () => empty({ headers: { "Content-Range": "*/0" } })),+];+const assetPkeyError = ({assetId,projectId,@@ -50,7 +55,435 @@ const assetPkeyError = ({details: `Key (id, projectId)=(${assetId}, ${projectId}) already exists.`,});+const uploadedFile = {+ name: "existing.png",+ format: "png",+ size: 4,+ description: null,+ status: "UPLOADED",+ isDeleted: false,+ uploaderProjectId: "project-1",+ contentHash: "hash-1",+ meta: JSON.stringify({ width: 1, height: 1 }),+ createdAt: "2024-01-01T00:00:00.000Z",+ updatedAt: "2024-01-01T00:00:00.000Z",+};+describe("createUploadTicket", () => {+ test("reuses an uploaded asset with the same content and display name", async () => {+ let inserted = false;+ server.use(+ ownershipHandler,+ db.get("File", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("uploaderProjectId")).toBe("eq.project-1");+ expect(url.searchParams.get("contentHash")).toBe("eq.hash-1");+ return json([uploadedFile]);+ }),+ db.get("Asset", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("filename")).toBe("eq.existing");+ expect(url.searchParams.get("description")).toBe("is.null");+ expect(url.searchParams.get("folderId")).toBe("is.null");+ expect(url.searchParams.get("order")).toBe("id.asc");+ expect(url.searchParams.get("limit")).toBe("1");+ return json({+ id: "existing-asset",+ projectId: "project-1",+ filename: "existing",+ description: null,+ folderId: null,+ });+ }),+ db.post("File", () => {+ inserted = true;+ return empty({ status: 201 });+ })+ );++ await expect(+ createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "existing.png",+ contentHash: "hash-1",+ },+ createContext()+ )+ ).resolves.toMatchObject({+ assetId: "existing-asset",+ name: "existing.png",+ deduplicated: true,+ asset: { id: "existing-asset", name: "existing.png", type: "image" },+ });+ expect(inserted).toBe(false);+ });++ test("creates a distinct logical asset for a different display name", async () => {+ let insertedAsset: unknown;+ server.use(+ ownershipHandler,+ db.get("File", () =>+ json([{ ...uploadedFile, name: "first.md", format: "text/markdown" }])+ ),+ db.get("Asset", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("name")).toBe("eq.first.md");+ expect(url.searchParams.get("filename")).toBe("eq.second");+ expect(url.searchParams.get("description")).toBe("is.null");+ expect(url.searchParams.get("folderId")).toBe("is.null");+ return json(null);+ }),+ ...availableAssetCapacityHandlers(),+ db.post("Asset", async ({ request }) => {+ insertedAsset = await request.json();+ return empty({ status: 201 });+ })+ );++ const ticket = await createUploadTicket(+ {+ projectId: "project-1",+ type: "text/markdown",+ filename: "second.md",+ contentHash: "hash-1",+ },+ createContext()+ );++ expect(ticket).toMatchObject({+ name: "first.md",+ deduplicated: true,+ asset: { filename: "second" },+ });+ expect(insertedAsset).toMatchObject({+ id: ticket.assetId,+ projectId: "project-1",+ name: "first.md",+ filename: "second",+ });+ });++ test("does not reuse content stored with a different extension", async () => {+ let insertedFile: unknown;+ server.use(+ ownershipHandler,+ db.get("File", () =>+ json([{ ...uploadedFile, name: "first.md", format: "text/markdown" }])+ ),+ ...availableAssetCapacityHandlers(),+ db.post("File", async ({ request }) => {+ insertedFile = await request.json();+ return empty({ status: 201 });+ }),+ db.post("Asset", () => empty({ status: 201 }))+ );++ const ticket = await createUploadTicket(+ {+ projectId: "project-1",+ type: "text/plain",+ filename: "second.txt",+ contentHash: "hash-1",+ },+ createContext(),+ () => "second-asset"+ );++ expect(ticket).toMatchObject({+ assetId: "second-asset",+ name: expect.stringMatching(/^second_.+\.txt$/),+ deduplicated: false,+ });+ expect(insertedFile).toMatchObject({+ name: ticket.name,+ format: "text/plain",+ contentHash: "hash-1",+ });+ });++ test("creates a distinct logical asset for different metadata", async () => {+ let insertedAsset: unknown;+ server.use(+ ownershipHandler,+ db.get("File", () => json([uploadedFile])),+ db.get("Asset", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("name")).toBe("eq.existing.png");+ expect(url.searchParams.get("filename")).toBe("eq.existing");+ expect(url.searchParams.get("description")).toBe("eq.Campaign photo");+ expect(url.searchParams.get("folderId")).toBe("eq.campaign");+ return json(null);+ }),+ ...availableAssetCapacityHandlers(),+ db.post("Asset", async ({ request }) => {+ insertedAsset = await request.json();+ return empty({ status: 201 });+ })+ );++ const ticket = await createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "existing.png",+ description: "Campaign photo",+ folderId: "campaign",+ contentHash: "hash-1",+ },+ createContext()+ );++ expect(ticket).toMatchObject({+ name: "existing.png",+ deduplicated: true,+ asset: {+ filename: "existing",+ description: "Campaign photo",+ folderId: "campaign",+ },+ });+ expect(insertedAsset).toMatchObject({+ id: ticket.assetId,+ projectId: "project-1",+ name: "existing.png",+ filename: "existing",+ description: "Campaign photo",+ folderId: "campaign",+ });+ });++ test("restores a soft-deleted file with the same content hash", async () => {+ let restoredFile = false;+ let insertedAsset: unknown;+ server.use(+ ownershipHandler,+ db.get("File", ({ request }) => {+ const url = new URL(request.url);+ expect(url.searchParams.get("contentHash")).toBe("eq.hash-1");+ expect(url.searchParams.has("isDeleted")).toBe(false);+ return json([{ ...uploadedFile, isDeleted: true }]);+ }),+ db.get("Asset", () => json(null)),+ ...availableAssetCapacityHandlers(),+ db.patch("File", async ({ request }) => {+ expect(await request.json()).toEqual({ isDeleted: false });+ restoredFile = true;+ return empty({ status: 204 });+ }),+ db.post("Asset", async ({ request }) => {+ insertedAsset = await request.json();+ return empty({ status: 201 });+ })+ );++ const ticket = await createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "photo.png",+ contentHash: "hash-1",+ },+ createContext(),+ () => "new-asset"+ );++ expect(ticket).toMatchObject({+ assetId: expect.any(String),+ name: "existing.png",+ deduplicated: true,+ asset: { id: expect.any(String), name: "existing.png" },+ });+ if (ticket.deduplicated === false) {+ throw new Error("Expected a deduplicated upload ticket");+ }+ expect(ticket.assetId).toBe(ticket.asset.id);+ expect(restoredFile).toBe(true);+ expect(insertedAsset).toMatchObject({+ id: ticket.assetId,+ projectId: "project-1",+ name: "existing.png",+ filename: "photo",+ });+ });++ test("reuses an uploaded file without an asset", async () => {+ let insertedAsset = false;+ server.use(+ ownershipHandler,+ db.get("File", ({ request }) => {+ const url = new URL(request.url);+ if (url.searchParams.has("contentHash")) {+ return json([{ ...uploadedFile, name: "orphan.png" }]);+ }+ return json(null);+ }),+ db.get("Asset", () => json(null)),+ ...availableAssetCapacityHandlers(),+ db.post("Asset", () => {+ insertedAsset = true;+ return empty({ status: 201 });+ })+ );++ const ticket = await createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "photo.png",+ contentHash: "hash-1",+ },+ createContext(),+ () => "new-asset"+ );+ expect(ticket).toMatchObject({+ assetId: expect.any(String),+ name: "orphan.png",+ deduplicated: true,+ });+ expect(insertedAsset).toBe(true);+ });++ test("reuses the asset restored by a concurrent deduplicated upload", async () => {+ let assetReads = 0;+ let restoredAssetId = "";+ server.use(+ ownershipHandler,+ db.get("File", () => json([{ ...uploadedFile, isDeleted: true }])),+ db.get("Asset", () => {+ assetReads += 1;+ return assetReads === 1+ ? json(null)+ : json({+ id: restoredAssetId,+ projectId: "project-1",+ filename: "photo",+ description: null,+ folderId: null,+ });+ }),+ ...availableAssetCapacityHandlers(),+ db.post("Asset", async ({ request }) => {+ const asset = (await request.json()) as { id: string };+ restoredAssetId = asset.id;+ return json(+ assetPkeyError({+ assetId: restoredAssetId,+ projectId: "project-1",+ }),+ { status: 409 }+ );+ }),+ db.patch("File", () => empty({ status: 204 }))+ );++ await expect(+ createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "photo.png",+ contentHash: "hash-1",+ },+ createContext()+ )+ ).resolves.toMatchObject({+ assetId: expect.stringMatching(/^.{21}$/),+ name: "existing.png",+ deduplicated: true,+ });+ expect(assetReads).toBe(2);+ });++ test("enforces the asset limit before restoring deduplicated content", async () => {+ let insertedAsset = false;+ let restoredFile = false;+ server.use(+ ownershipHandler,+ db.get("File", () => json([{ ...uploadedFile, isDeleted: true }])),+ db.get("Asset", () => json(null)),+ db.head("Asset", () => empty({ headers: { "Content-Range": "*/350" } })),+ db.head("File", () => empty({ headers: { "Content-Range": "*/0" } })),+ db.post("Asset", () => {+ insertedAsset = true;+ return empty({ status: 201 });+ }),+ db.patch("File", () => {+ restoredFile = true;+ return empty({ status: 204 });+ })+ );++ await expect(+ createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "photo.png",+ contentHash: "hash-1",+ },+ createContext()+ )+ ).rejects.toThrow("The maximum number of assets per project is 350.");+ expect(insertedAsset).toBe(false);+ expect(restoredFile).toBe(false);+ });++ test("reuses the winning asset after a concurrent content hash insert", async () => {+ let contentHashReads = 0;+ server.use(+ ownershipHandler,+ db.get("File", ({ request }) => {+ const url = new URL(request.url);+ if (url.searchParams.has("contentHash")) {+ contentHashReads += 1;+ return contentHashReads === 1+ ? json([])+ : json([{ ...uploadedFile, name: "winner.png" }]);+ }+ return json(null);+ }),+ db.get("Asset", () =>+ json({+ id: "winner-asset",+ projectId: "project-1",+ filename: "photo",+ description: null,+ folderId: null,+ })+ ),+ db.head("Asset", () => empty({ headers: { "Content-Range": "*/0" } })),+ db.head("File", () => empty({ headers: { "Content-Range": "*/0" } })),+ db.post("File", () =>+ json(+ {+ code: "23505",+ message: "duplicate project content hash",+ },+ { status: 409 }+ )+ )+ );++ await expect(+ createUploadTicket(+ {+ projectId: "project-1",+ type: "image/png",+ filename: "photo.png",+ contentHash: "hash-1",+ },+ createContext()+ )+ ).resolves.toMatchObject({+ assetId: "winner-asset",+ name: "winner.png",+ deduplicated: true,+ asset: { id: "winner-asset", name: "winner.png" },+ });+ });+test("counts assets instead of uploaded files for the project limit", async () => {let insertedFile: unknown;@@ -416,6 +849,7 @@ describe("uploadFile", () => {},createContext(),undefined,+ undefined,async () => {customCleanupCalled = true;}@@ -427,6 +861,46 @@ describe("uploadFile", () => {expect(fileDeleted).toBe(false);});+ test("rejects content that does not match the upload ticket hash", async () => {+ let customCleanupCalled = false;+ let storageWriteCompleted = false;+ server.use(+ db.get("File", () =>+ json({+ ...uploadedFile,+ status: "UPLOADING",+ contentHash: "0".repeat(64),+ createdAt: new Date().toISOString(),+ })+ )+ );++ await expect(+ uploadFile(+ "existing.png",+ new Blob(["asset"]).stream(),+ {+ uploadFile: async (_name, _type, data) => {+ for await (const _chunk of data) {+ // Consume the upload stream as a real storage client would.+ }+ storageWriteCompleted = true;+ return { format: "png", size: 5, meta: {} };+ },+ },+ createContext(),+ undefined,+ undefined,+ async () => {+ customCleanupCalled = true;+ }+ )+ ).rejects.toThrow("does not match its upload ticket");++ expect(customCleanupCalled).toBe(true);+ expect(storageWriteCompleted).toBe(false);+ });+test("cleans up an uploaded file without an uploader project", async () => {let assetDeleted = false;let fileDeleted = false;diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.tsindex cf038232a5..f878f15620 100644--- a/packages/asset-uploader/src/upload.ts+++ b/packages/asset-uploader/src/upload.ts@@ -4,13 +4,21 @@ import {AuthorizationError,getProjectPlanFeatures,} from "@webstudio-is/trpc-interface/index.server";+import { createHash } from "node:crypto";import { nanoid } from "nanoid";-import { getFileNameParts, type Asset } from "@webstudio-is/sdk";+import {+ getFileExtension,+ getFileNameParts,+ type Asset,+} from "@webstudio-is/sdk";import type { Database } from "@webstudio-is/postgrest/index.server";import type { AssetClient } from "./client";+import type { AssetDataOverride } from "./utils/get-asset-data";import { createUniqueAssetFilename } from "./utils/get-unique-filename";import { sanitizeS3Key } from "./utils/sanitize-s3-key";import { formatAsset } from "./utils/format-asset";+import { assertPostgrestSuccess } from "./patch-utils";+import type { UploadTicket } from "./types";type UploadData = {projectId: string;@@ -19,15 +27,238 @@ type UploadData = {displayFilename?: string;description?: string;folderId?: string;+ contentHash?: string;+};++const UPLOADING_STALE_TIMEOUT = 1000 * 60 * 30; // 30 minutes+const maxCreateUploadTicketAttempts = 3;+const contentHashUploadPollInterval = 100;+const contentHashUploadPollAttempts = 50;++type AssetIdentity = {+ filename: string;+ description: string | null;+ folderId: string | null;+};++const getDeduplicatedAssetId = (+ projectId: string,+ name: string,+ identity: AssetIdentity+) =>+ createHash("sha256")+ .update(+ JSON.stringify([+ projectId,+ name,+ identity.filename,+ identity.description,+ identity.folderId,+ ])+ )+ .digest("base64url")+ .slice(0, 21);++const assertAssetCapacity = async (projectId: string, context: AppContext) => {+ const { maxAssetsPerProject } = await getProjectPlanFeatures(+ projectId,+ context+ );+ const assetCount = await context.postgrest.client+ .from("Asset")+ .select("id, file:File!inner(status)", { count: "exact", head: true })+ .eq("projectId", projectId)+ .eq("file.status", "UPLOADED");+ const uploadingCount = await context.postgrest.client+ .from("File")+ .select("*", { count: "exact", head: true })+ .eq("isDeleted", false)+ .eq("uploaderProjectId", projectId)+ .eq("status", "UPLOADING")+ .gt(+ "createdAt",+ new Date(Date.now() - UPLOADING_STALE_TIMEOUT).toISOString()+ );+ const count = (assetCount.count ?? 0) + (uploadingCount.count ?? 0);+ if (count >= maxAssetsPerProject) {+ throw new Error(+ `The maximum number of assets per project is ${maxAssetsPerProject}.`+ );+ }};-export type UploadTicket = {- assetId: Asset["id"];+const findAsset = async ({+ projectId,+ name,+ identity,+ context,+}: {+ projectId: string;name: string;+ identity?: AssetIdentity;+ context: AppContext;+}) => {+ let query = context.postgrest.client+ .from("Asset")+ .select("id, projectId, filename, description, folderId")+ .eq("projectId", projectId)+ .eq("name", name);+ if (identity !== undefined) {+ query = query.eq("filename", identity.filename);+ query =+ identity.description === null+ ? query.is("description", null)+ : query.eq("description", identity.description);+ query =+ identity.folderId === null+ ? query.is("folderId", null)+ : query.eq("folderId", identity.folderId);+ }+ const result = await query.order("id").limit(1).maybeSingle();+ if (result.error) {+ throw new Error(result.error.message);+ }+ return result.data ?? undefined;};-const UPLOADING_STALE_TIMEOUT = 1000 * 60 * 30; // 30 minutes-const maxCreateUploadTicketAttempts = 3;+const getContentDeduplicationExtension = (filename: string) =>+ getFileExtension(filename)?.toLowerCase() ?? "";++const findFileByContent = async ({+ projectId,+ contentHash,+ filename,+ context,+}: {+ projectId: string;+ contentHash: string;+ filename: string;+ context: AppContext;+}) => {+ const files = await context.postgrest.client+ .from("File")+ .select("*")+ .eq("uploaderProjectId", projectId)+ .eq("contentHash", contentHash);+ if (files.error) {+ throw new Error(files.error.message);+ }+ const extension = getContentDeduplicationExtension(filename);+ return files.data?.find(+ (file) => getContentDeduplicationExtension(file.name) === extension+ );+};++const findContentHashUploadTicket = async ({+ data,+ context,+}: {+ data: UploadData & { contentHash: string };+ context: AppContext;+}): Promise<UploadTicket | undefined> => {+ const {+ projectId,+ contentHash,+ filename,+ displayFilename = getFileNameParts(filename).basename,+ description,+ folderId,+ } = data;+ const assetIdentity: AssetIdentity = {+ filename: displayFilename,+ description: description ?? null,+ folderId: folderId ?? null,+ };+ for (let attempt = 0; attempt < contentHashUploadPollAttempts; attempt += 1) {+ const file = await findFileByContent({+ projectId,+ contentHash,+ filename,+ context,+ });+ if (file === undefined) {+ return;+ }+ if (file.status === "UPLOADED") {+ let asset = await findAsset({+ projectId,+ name: file.name,+ identity: assetIdentity,+ context,+ });+ if (asset === undefined) {+ await assertAssetCapacity(projectId, context);+ const restoredAsset = {+ id: getDeduplicatedAssetId(projectId, file.name, assetIdentity),+ projectId,+ ...assetIdentity,+ };+ const insertedAsset = await context.postgrest.client+ .from("Asset")+ .insert({ ...restoredAsset, name: file.name });+ if (insertedAsset.error?.code === "23505") {+ asset = await findAsset({+ projectId,+ name: file.name,+ identity: assetIdentity,+ context,+ });+ if (asset === undefined) {+ throw new Error("Concurrent deduplicated asset is missing.");+ }+ } else {+ assertPostgrestSuccess(insertedAsset);+ asset = restoredAsset;+ }+ }+ if (file.isDeleted) {+ const restoredFile = await context.postgrest.client+ .from("File")+ .update({ isDeleted: false })+ .eq("name", file.name)+ .eq("uploaderProjectId", projectId);+ assertPostgrestSuccess(restoredFile);+ }+ const formattedAsset = formatAsset({+ assetId: asset.id,+ projectId: asset.projectId,+ filename: asset.filename,+ description: asset.description,+ folderId: asset.folderId,+ file,+ });+ return {+ assetId: asset.id,+ name: file.name,+ deduplicated: true,+ asset: formattedAsset,+ };+ }+ if (+ new Date(file.createdAt).getTime() <+ Date.now() - UPLOADING_STALE_TIMEOUT+ ) {+ const deletedAsset = await context.postgrest.client+ .from("Asset")+ .delete()+ .eq("projectId", projectId)+ .eq("name", file.name);+ assertPostgrestSuccess(deletedAsset);+ const deletedFile = await context.postgrest.client+ .from("File")+ .delete()+ .eq("name", file.name);+ assertPostgrestSuccess(deletedFile);+ return;+ }+ await new Promise((resolve) =>+ setTimeout(resolve, contentHashUploadPollInterval)+ );+ }+ throw new Error(+ "An identical asset upload is still in progress. Retry after it completes."+ );+};export type UploadErrorCleanup = (name: string,@@ -59,6 +290,7 @@ export const createUploadTicket = async (displayFilename = getFileNameParts(filename).basename,description,folderId,+ contentHash,} = data;const sanitizedFilename = sanitizeS3Key(filename);const canEdit = await authorizeProject.hasProjectPermit(@@ -71,47 +303,18 @@ export const createUploadTicket = async ();}- const { maxAssetsPerProject } = await getProjectPlanFeatures(- projectId,- context- );-- /**- * sometimes for example on request timeout we don't know what happened to the "UPLOADING" asset,- * so we don't take into account assets with the "UPLOADING" status that were created more- * than UPLOADING_STALE_TIMEOUT milliseconds ago- **/-- const assetCount = await context.postgrest.client- .from("Asset")- .select("id, file:File!inner(status)", { count: "exact", head: true })- .eq("projectId", projectId)- .eq("file.status", "UPLOADED");-- const uploadingCount = await context.postgrest.client- .from("File")- .select("*", { count: "exact", head: true })- .eq("isDeleted", false)- .eq("uploaderProjectId", projectId)- .eq("status", "UPLOADING")- .gt(- "createdAt",- new Date(Date.now() - UPLOADING_STALE_TIMEOUT).toISOString()- );-- const count = (assetCount.count ?? 0) + (uploadingCount.count ?? 0);-- if (count >= maxAssetsPerProject) {- /**- * Here is right to write `Max ${maxAssetsPerProject}` but see the comment below,- * it's probable that the user can exceed the limit a little bit.- * So it can be a little bit strange that the limit is 5 but the user already has 7.- **/- throw new Error(- `The maximum number of assets per project is ${maxAssetsPerProject}.`- );+ if (contentHash !== undefined) {+ const existing = await findContentHashUploadTicket({+ data: { ...data, contentHash },+ context,+ });+ if (existing !== undefined) {+ return existing;+ }}+ await assertAssetCapacity(projectId, context);+/*** Create a temporary "UPLOADING" asset, so it can be counted in the next query* Assumptions:@@ -136,8 +339,18 @@ export const createUploadTicket = async (format: type,size: 0,uploaderProjectId: projectId,+ contentHash,});if (fileInsert.error) {+ if (fileInsert.error.code === "23505" && contentHash !== undefined) {+ const existing = await findContentHashUploadTicket({+ data: { ...data, contentHash },+ context,+ });+ if (existing !== undefined) {+ return existing;+ }+ }throw new Error(fileInsert.error.message);}@@ -160,7 +373,7 @@ export const createUploadTicket = async (throw new Error(assetInsert.error.message);}- return { assetId, name };+ return { assetId, name, deduplicated: false };}throw new Error("Unable to reserve asset upload.");@@ -174,6 +387,7 @@ export const uploadFileData = async (assetInfoFallback:| { width: number; height: number; format: string }| undefined,+ assetDataOverride?: AssetDataOverride,onUploadError?: UploadErrorCleanup): Promise<Database["public"]["Tables"]["File"]["Row"]> => {let file = await context.postgrest.client@@ -191,12 +405,29 @@ export const uploadFileData = async (}try {+ const expectedContentHash = file.data.contentHash ?? undefined;+ const contentHasher =+ expectedContentHash === undefined ? undefined : createHash("sha256");+ const uploadData = async function* () {+ for await (const chunk of data as unknown as AsyncIterable<Uint8Array>) {+ contentHasher?.update(chunk);+ yield chunk;+ }+ if (+ expectedContentHash !== undefined &&+ contentHasher?.digest("hex") !== expectedContentHash+ ) {+ throw new Error(+ "Uploaded asset content does not match its upload ticket."+ );+ }+ };const assetData = await client.uploadFile(name,file.data.format,- // global web streams types do not define ReadableStream as async iterable- data as unknown as AsyncIterable<Uint8Array>,- assetInfoFallback+ uploadData(),+ assetInfoFallback,+ assetDataOverride);const { meta, format, size } = assetData;file = await context.postgrest.client@@ -220,6 +451,44 @@ export const uploadFileData = async (}};+export const getUploadedAsset = async ({+ name,+ projectId,+ context,+ file: providedFile,+}: {+ name: string;+ projectId: string;+ context: AppContext;+ file?: Database["public"]["Tables"]["File"]["Row"];+}): Promise<Asset> => {+ let file = providedFile;+ if (file === undefined) {+ const result = await context.postgrest.client+ .from("File")+ .select("*")+ .eq("name", name)+ .eq("status", "UPLOADED")+ .single();+ if (result.error || result.data === null) {+ throw new Error(result.error?.message ?? "File not found");+ }+ file = result.data;+ }+ const asset = await findAsset({ projectId, name, context });+ if (asset === undefined) {+ throw new Error("Asset not found");+ }+ return formatAsset({+ assetId: asset.id,+ projectId: asset.projectId,+ filename: asset.filename,+ description: asset.description,+ folderId: asset.folderId,+ file,+ });+};+export const uploadFile = async (name: string,data: ReadableStream<Uint8Array>,@@ -228,6 +497,7 @@ export const uploadFile = async (assetInfoFallback:| { width: number; height: number; format: string }| undefined,+ assetDataOverride?: AssetDataOverride,onUploadError?: UploadErrorCleanup): Promise<Asset> => {const file = await uploadFileData(@@ -236,6 +506,7 @@ export const uploadFile = async (client,context,assetInfoFallback,+ assetDataOverride,onUploadError);try {@@ -243,24 +514,10 @@ export const uploadFile = async (if (typeof projectId !== "string") {throw Error("File uploader project is missing");}- const asset = await context.postgrest.client- .from("Asset")- .select("id, projectId, filename, description, folderId")- .eq("name", name)- .eq("projectId", projectId)- .single();- if (asset.error) {- throw asset.error;- }- if (asset.data === null) {- throw Error("Asset not found");- }- return formatAsset({- assetId: asset.data.id,- projectId: asset.data.projectId,- filename: asset.data.filename,- description: asset.data.description,- folderId: asset.data.folderId,+ return await getUploadedAsset({+ name,+ projectId,+ context,file,});} catch (error) {diff --git a/packages/asset-uploader/src/utils/font-data.test.ts b/packages/asset-uploader/src/utils/font-data.test.tsindex ecd1e568ab..881a94fb73 100644--- a/packages/asset-uploader/src/utils/font-data.test.ts+++ b/packages/asset-uploader/src/utils/font-data.test.ts@@ -53,6 +53,35 @@ describe("font-data", () => {weight: 500,});});+ test("prefers the font weight class", () => {+ expect(parseSubfamily("ExtraBold", 800)).toEqual({+ style: "normal",+ weight: 800,+ });+ expect(parseSubfamily("Regular", 650)).toEqual({+ style: "normal",+ weight: 650,+ });+ });+ test("matches specific aliases before shorter aliases", () => {+ expect(parseSubfamily("ExtraBold")).toEqual({+ style: "normal",+ weight: 800,+ });+ expect(parseSubfamily("Extra-Bold").weight).toBe(800);+ expect(parseSubfamily("Semi Bold Italic")).toEqual({+ style: "italic",+ weight: 600,+ });+ expect(parseSubfamily("Ultra Light")).toEqual({+ style: "normal",+ weight: 200,+ });+ });+ test("falls back when the weight class is invalid", () => {+ expect(parseSubfamily("Bold", 0).weight).toBe(700);+ expect(parseSubfamily("Regular", Number.NaN).weight).toBe(400);+ });});describe("normalizeFamily()", () => {diff --git a/packages/asset-uploader/src/utils/font-data.ts b/packages/asset-uploader/src/utils/font-data.tsindex 0e6f44ea3c..91253711da 100644--- a/packages/asset-uploader/src/utils/font-data.ts+++ b/packages/asset-uploader/src/utils/font-data.ts@@ -3,7 +3,6 @@ import {fontWeights,FONT_STYLES,type FontFormat,- type FontWeight,type VariationAxes,type FontStyle,} from "@webstudio-is/fonts";@@ -12,10 +11,24 @@ import { getFileNameParts } from "@webstudio-is/sdk";// same default fontkit uses internallyconst defaultLanguage = "en";+const normalizeWeightName = (value: string) =>+ value.toLowerCase().replaceAll(/[\s_-]+/g, "");++const fontWeightAliases = Object.entries(fontWeights)+ .flatMap(([weight, { names }]) =>+ names.map((name) => ({+ name: normalizeWeightName(name),+ weight: Number(weight),+ }))+ )+ .sort((left, right) => right.name.length - left.name.length);+export const parseSubfamily = (- subfamily: string+ subfamily: string,+ weightClass?: number): { style: FontStyle; weight: number } => {const subfamilyLow = subfamily.toLowerCase();+ const normalizedSubfamily = normalizeWeightName(subfamily);let style: FontStyle = "normal";for (const possibleStyle of FONT_STYLES) {if (subfamilyLow.includes(possibleStyle)) {@@ -23,14 +36,18 @@ export const parseSubfamily = (break;}}- let weight: FontWeight = "400";- for (weight in fontWeights) {- const { names } = fontWeights[weight];- if (names.some((name) => subfamilyLow.includes(name))) {- break;- }+ if (+ weightClass !== undefined &&+ Number.isInteger(weightClass) &&+ weightClass >= 1 &&+ weightClass <= 1000+ ) {+ return { style, weight: weightClass };}- return { style, weight: Number(weight) };+ const weight = fontWeightAliases.find(({ name }) =>+ normalizedSubfamily.includes(name)+ )?.weight;+ return { style, weight: weight ?? 400 };};const splitAndTrim = (string: string) =>@@ -96,7 +113,7 @@ export const getFontData = (data: Uint8Array, fileName: string): FontData => {return {format,family,- ...parseSubfamily(subfamily),+ ...parseSubfamily(subfamily, font["OS/2"]?.usWeightClass),};};diff --git a/packages/asset-uploader/src/utils/get-asset-data.test.ts b/packages/asset-uploader/src/utils/get-asset-data.test.tsnew file mode 100644index 0000000000..04cc3cc0fd--- /dev/null+++ b/packages/asset-uploader/src/utils/get-asset-data.test.ts@@ -0,0 +1,34 @@+import { describe, expect, test } from "vitest";+import { applyAssetDataOverride } from "./get-asset-data";++describe("asset data overrides", () => {+ test("merges partial font metadata over detected metadata", () => {+ expect(+ applyAssetDataOverride(+ {+ size: 100,+ format: "ttf",+ meta: { family: "Poppins", style: "normal", weight: 700 },+ },+ { meta: { weight: 800 } }+ )+ ).toEqual({+ size: 100,+ format: "ttf",+ meta: { family: "Poppins", style: "normal", weight: 800 },+ });+ });++ test("rejects overrides that make metadata invalid", () => {+ expect(() =>+ applyAssetDataOverride(+ {+ size: 100,+ format: "ttf",+ meta: { family: "Poppins", style: "normal", weight: 700 },+ },+ { meta: { weight: "heavy" } }+ )+ ).toThrow();+ });+});diff --git a/packages/asset-uploader/src/utils/get-asset-data.ts b/packages/asset-uploader/src/utils/get-asset-data.tsindex 8f266b7548..ff73146c57 100644--- a/packages/asset-uploader/src/utils/get-asset-data.ts+++ b/packages/asset-uploader/src/utils/get-asset-data.ts@@ -16,6 +16,31 @@ export const assetData: z.ZodType<AssetData> = z.object({meta: z.union([imageMeta, fontMeta, z.object({})]),});+export const assetDataOverride = z.object({+ format: z.string().optional(),+ meta: z.record(z.string(), z.unknown()).optional(),+});+export type AssetDataOverride = z.infer<typeof assetDataOverride>;++export const applyAssetDataOverride = (+ detected: AssetData,+ override?: AssetDataOverride+): AssetData => {+ const meta = { ...detected.meta, ...override?.meta };+ const parsedMeta =+ "family" in detected.meta+ ? fontMeta.parse(meta)+ : "width" in detected.meta && "height" in detected.meta+ ? imageMeta.parse(meta)+ : z.object({}).parse(meta);++ return {+ ...detected,+ format: override?.format ?? detected.format,+ meta: parsedMeta,+ };+};+type BaseAssetOptions = {size: number;data: Uint8Array;diff --git a/packages/cli/src/commands/api-command-metadata.test.ts b/packages/cli/src/commands/api-command-metadata.test.tsindex b5a3bea42a..ced5eb366f 100644--- a/packages/cli/src/commands/api-command-metadata.test.ts+++ b/packages/cli/src/commands/api-command-metadata.test.ts@@ -127,6 +127,22 @@ test("returns command-specific options when available", () => {);});+test("describes JSON as optional for human-readable permissions", () => {+ const yargs = { option: vi.fn().mockReturnThis() };+ const metadata = apiCommandMetadata.find(+ (item) => item.command === "permissions"+ );++ expect(metadata).toBeDefined();+ getApiCommandOptions(metadata!)(yargs as never);++ expect(yargs.option).toHaveBeenCalledWith("json", {+ type: "boolean",+ describe: "Print a machine-readable JSON response to stdout",+ default: false,+ });+});+test("parses redirect status as a string option", () => {const yargs = { option: vi.fn().mockReturnThis() };const metadata = apiCommandMetadata.find(diff --git a/packages/cli/src/commands/api-command-metadata.ts b/packages/cli/src/commands/api-command-metadata.tsindex a28da6be70..b5b2b0d5f4 100644--- a/packages/cli/src/commands/api-command-metadata.ts+++ b/packages/cli/src/commands/api-command-metadata.ts@@ -95,7 +95,7 @@ export const topLevelCliCommandMetadata = [command: "permissions",description:"Show API, role, publish, and domain capabilities for the configured share-link token",- examples: ["webstudio permissions --json"],+ examples: ["webstudio permissions", "webstudio permissions --json"],},...cliCommandGroupMetadata,{@@ -220,6 +220,7 @@ const apiCommandOptionsByCommand: Partial<"find-asset-usage": apiCommand.assetUsageCommandOptions,"replace-asset": apiCommand.replaceAssetCommandOptions,"delete-asset": apiCommand.deleteAssetCommandOptions,+ permissions: apiCommand.permissionsCommandOptions,};export const apiCommandMetadata = publicApiOperations.map((operation) => ({diff --git a/packages/cli/src/commands/api-command.test.ts b/packages/cli/src/commands/api-command.test.tsindex 91647c045b..434499dde0 100644--- a/packages/cli/src/commands/api-command.test.ts+++ b/packages/cli/src/commands/api-command.test.ts@@ -295,6 +295,52 @@ test("requires json output flag", async () => {);});+test("prints project permissions without json output", async () => {+ mockConfig();+ apiCalls.getProjectPermissions.mockResolvedValue({+ relation: "builders",+ permits: ["view", "edit", "build", "api"],+ canView: true,+ canEdit: true,+ canBuild: true,+ canUseApi: true,+ canPublish: false,+ canPublishProjectDomain: true,+ canPublishCustomDomains: false,+ canAdmin: false,+ });++ await apiCommand({ command: "permissions" }, dependencies);++ expect(console.info).toHaveBeenCalledWith("Project role: builders");+ expect(console.info).toHaveBeenCalledWith("Permits: view, edit, build, api");+ expect(console.info).toHaveBeenCalledWith("canView: yes");+ expect(console.info).toHaveBeenCalledWith("canEdit: yes");+ expect(console.info).toHaveBeenCalledWith("canBuild: yes");+ expect(console.info).toHaveBeenCalledWith("canUseApi: yes");+ expect(console.info).toHaveBeenCalledWith("canPublish: no");+ expect(console.info).toHaveBeenCalledWith("canPublishProjectDomain: yes");+ expect(console.info).toHaveBeenCalledWith("canPublishCustomDomains: no");+ expect(console.info).toHaveBeenCalledWith("canAdmin: no");+});++test("selects a previously linked project explicitly", async () => {+ readFile.mockResolvedValueOnce(+ JSON.stringify({+ "project-2": { origin: "https://example.com", token: "token-1" },+ })+ );++ await apiCommand(+ { command: "permissions", project: "project-2", json: true },+ dependencies+ );++ expect(apiCalls.getProjectPermissions).toHaveBeenCalledWith(+ expect.objectContaining({ projectId: "project-2" })+ );+});+test("explains mcp-only editing commands should use shortcut or single-op-call", async () => {mockConfig();@@ -1904,7 +1950,7 @@ test("deletes assets with confirmation", async () => {},call: apiCalls.deleteAssets,connection: {- assetIdsOrPrefixes: ["asset-id", "asset-prefix"],+ assetIds: ["asset-id", "asset-prefix"],force: true,},});diff --git a/packages/cli/src/commands/api-command.ts b/packages/cli/src/commands/api-command.tsindex 2b76524aea..a2a0c82b4a 100644--- a/packages/cli/src/commands/api-command.ts+++ b/packages/cli/src/commands/api-command.ts@@ -21,6 +21,7 @@ import {isMissingApiAccessError,} from "../error-codes";import { printJson } from "../json-output";+import { isPlainRecord } from "../type-utils";import {executeProjectSessionApiOperation,getProjectSessionMeta,@@ -69,8 +70,20 @@ export const apiCommandOptions = (yargs: CommonYargsArgv) =>type: "boolean",describe:"Refresh required local project namespaces from the remote project before running a local-capable command.",+ })+ .option("project", {+ type: "string",+ describe:+ "Use a previously linked project instead of the project linked to the current directory",});+export const permissionsCommandOptions = (yargs: CommonYargsArgv) =>+ apiCommandOptions(yargs).option("json", {+ type: "boolean",+ describe: "Print a machine-readable JSON response to stdout",+ default: false,+ });+const outputDetailCommandOptions = (yargs: CommonYargsArgv) =>yargs.option("cursor", {@@ -1287,6 +1300,7 @@ export const deleteAssetCommandOptions = (yargs: CommonYargsArgv) =>export type ApiCommandOptions = {command: ApiCommandName;+ project?: string;json?: boolean;include?: string[];version?: number;@@ -3086,7 +3100,7 @@ const apiCommandHandlers: Partial<Record<ApiCommandName, ApiCommandHandler>> = {"delete-asset": async (options, connection, dependencies) => {requireTrueOption(options.confirm, "--confirm");const input = {- assetIdsOrPrefixes: requireListOption(options.asset, "--asset"),+ assetIds: requireListOption(options.asset, "--asset"),force: options.force,};return runProjectSessionCommand(@@ -3098,6 +3112,26 @@ const apiCommandHandlers: Partial<Record<ApiCommandName, ApiCommandHandler>> = {},};+const printPermissions = (result: unknown) => {+ if (isPlainRecord(result) === false) {+ throw new Error("The server returned invalid project permissions.");+ }+ console.info(`Project role: ${String(result.relation ?? "unknown")}`);+ const permits = Array.isArray(result.permits)+ ? result.permits.filter(+ (permit): permit is string => typeof permit === "string"+ )+ : [];+ console.info(+ `Permits: ${permits.length === 0 ? "none" : permits.join(", ")}`+ );+ for (const [name, value] of Object.entries(result)) {+ if (name.startsWith("can") && typeof value === "boolean") {+ console.info(`${name}: ${value ? "yes" : "no"}`);+ }+ }+};+export const apiCommand = async (options: ApiCommandOptions,dependencies = defaultDependencies@@ -3105,11 +3139,19 @@ export const apiCommand = async (const start = Date.now();let projectId: string | undefined;try {- if (options.json !== true && options.command !== "audit") {+ if (+ options.json !== true &&+ options.command !== "audit" &&+ options.command !== "permissions"+ ) {throw new Error(`${options.command} currently requires --json.`);}- const connection = await resolveApiConnection(dependencies);+ const connection = await resolveApiConnection(+ dependencies,+ undefined,+ options.project+ );projectId = connection.projectId;const apiConnection = {...connection,@@ -3140,6 +3182,8 @@ export const apiCommand = async (: response;if (options.command === "audit" && options.json !== true) {printAuditReport(result);+ } else if (options.command === "permissions" && options.json !== true) {+ printPermissions(result);} else {printJson({ok: true,diff --git a/packages/css-data/package.json b/packages/css-data/package.jsonindex cde0c4c03e..01637ec4ee 100644--- a/packages/css-data/package.json+++ b/packages/css-data/package.json@@ -19,7 +19,6 @@"devDependencies": {"@webstudio-is/tsconfig": "workspace:*","esbuild": "^0.25.3",- "html-tags": "^4.0.0","mdn-data": "2.28.0","openai": "^3.2.1","p-retry": "^6.2.1",diff --git a/packages/fonts/src/font-weights.ts b/packages/fonts/src/font-weights.tsindex 20b66fdf2c..42f4365a01 100644--- a/packages/fonts/src/font-weights.ts+++ b/packages/fonts/src/font-weights.ts@@ -25,7 +25,7 @@ export const fontWeights = {},"700": {label: "Bold",- names: ["bold", "bold"],+ names: ["bold"],},"800": {label: "Extra Bold",diff --git a/packages/html-data/package.json b/packages/html-data/package.jsonindex 43bc877719..f313d2c337 100644--- a/packages/html-data/package.json+++ b/packages/html-data/package.json@@ -20,6 +20,9 @@"aria-query": "^5.3.2","parse5": "7.3.0"},+ "dependencies": {+ "html-tags": "^4.0.0"+ },"exports": {"webstudio": "./src/index.ts"},diff --git a/packages/html-data/src/index.ts b/packages/html-data/src/index.tsindex 0a0d396c6b..dc2c205153 100644--- a/packages/html-data/src/index.ts+++ b/packages/html-data/src/index.ts@@ -3,3 +3,5 @@ export * from "./__generated__/attributes";export * from "./__generated__/aria";export * from "./pseudo-classes";export { roles as ariaRoles } from "aria-query";+export { default as htmlTags, voidHtmlTags } from "html-tags";+export type { HtmlTags } from "html-tags";diff --git a/packages/http-client/package.json b/packages/http-client/package.jsonindex 49943b9516..9676c3bc50 100644--- a/packages/http-client/package.json+++ b/packages/http-client/package.json@@ -14,6 +14,7 @@"dependencies": {"@trpc/client": "^10.45.2","@webstudio-is/protocol": "workspace:*",+ "@webstudio-is/sdk": "workspace:*","@webstudio-is/trpc-interface": "workspace:*","tus-js-client": "^4.3.1"},diff --git a/packages/http-client/src/index.test.ts b/packages/http-client/src/index.test.tsindex 4446e32db4..8b94078425 100644--- a/packages/http-client/src/index.test.ts+++ b/packages/http-client/src/index.test.ts@@ -1154,6 +1154,41 @@ test("uploads assets as binary requests", async () => {);});+test("requests a forced asset upload and exposes deduplication", async () => {+ const asset = {+ id: "asset-1",+ projectId: "project-1",+ type: "file" as const,+ name: "document.txt",+ filename: "document",+ format: "txt",+ size: 5,+ meta: {},+ createdAt: "2024-01-01T00:00:00.000Z",+ };+ const fetch = vi+ .fn()+ .mockResolvedValue(+ new Response(+ JSON.stringify({ uploadedAssets: [asset], deduplicated: true }),+ { status: 200, headers: { "content-type": "application/json" } }+ )+ );+ vi.stubGlobal("fetch", fetch);++ const uploaded = await uploadAsset({+ origin: "https://apps.webstudio.is",+ authToken: "token",+ projectId: "project-1",+ upload: { asset, data: new Blob(["asset"]), force: true },+ });++ expect((fetch.mock.calls[0]?.[0] as URL).searchParams.get("force")).toBe(+ "true"+ );+ expect(uploaded[0]).toMatchObject({ deduplicated: true });+});+test("loads project bundle by build id without auth headers", async () => {const project = createPublishedProjectBundleFixture();const fetch = vi.fn().mockResolvedValue(@@ -1290,6 +1325,69 @@ test("keeps uploaded assets in input order", async () => {).resolves.toEqual([first, second]);});+test("serializes uploads with identical content", async () => {+ const first = createImageAssetFixture({ id: "first", name: "first.png" });+ const second = createImageAssetFixture({ id: "second", name: "second.png" });+ let activeUploads = 0;+ let maxActiveUploads = 0;+ const fetch = vi.fn(async (request: URL | RequestInfo) => {+ activeUploads += 1;+ maxActiveUploads = Math.max(maxActiveUploads, activeUploads);+ await new Promise((resolve) => setTimeout(resolve, 10));+ activeUploads -= 1;+ const name = decodeURIComponent(+ new URL(request.toString()).pathname.split("/").at(-1) ?? ""+ );+ return new Response(+ JSON.stringify({+ uploadedAssets: [name === "first.png" ? first : second],+ }),+ { headers: { "content-type": "application/json" } }+ );+ });+ vi.stubGlobal("fetch", fetch);++ await expect(+ uploadAssets({+ assets: [first, second],+ ...apiParams,+ readAssetData: async () => new Uint8Array([1, 2, 3]),+ })+ ).resolves.toEqual([first, second]);++ expect(maxActiveUploads).toBe(1);+});++test("retries local asset reads before reporting an upload failure", async () => {+ const asset = createImageAssetFixture({ name: "image.png" });+ let reads = 0;+ vi.stubGlobal(+ "fetch",+ vi.fn(+ async () =>+ new Response(JSON.stringify({ uploadedAssets: [asset] }), {+ headers: { "content-type": "application/json" },+ })+ )+ );++ await expect(+ uploadAssets({+ assets: [asset],+ ...apiParams,+ readAssetData: async () => {+ reads += 1;+ if (reads === 1) {+ throw new Error("Temporary read failure");+ }+ return new Uint8Array([1, 2, 3]);+ },+ })+ ).resolves.toEqual([asset]);++ expect(reads).toBe(2);+});+test("uploads project asset descriptors with local data readers", async () => {const uploadedAsset = createImageAssetFixture({ name: "image.png" });const fetch = vi.fn(@@ -1330,7 +1428,7 @@ test("uploads project asset descriptors with local data readers", async () => {})).resolves.toEqual({ uploaded: [uploadedAsset] });- const calls = fetch.mock.calls as unknown as Array<[URL]>;+ const calls = fetch.mock.calls as unknown as Array<[URL, RequestInit]>;expect(new URL(calls[0][0].toString()).searchParams.get("folderId")).toBe("campaign");@@ -1338,6 +1436,9 @@ test("uploads project asset descriptors with local data readers", async () => {const url = new URL(request.toString());expect(url.searchParams.has("assetId")).toBe(false);}+ expect(new Headers(calls[0][1].headers).get("x-webstudio-asset-meta")).toBe(+ JSON.stringify({ width: 10, height: 20 })+ );});test("updates asset content through the stable asset revision endpoint", async () => {diff --git a/packages/http-client/src/index.ts b/packages/http-client/src/index.tsindex a6d4f6b094..33430bc64a 100644--- a/packages/http-client/src/index.ts+++ b/packages/http-client/src/index.ts@@ -1,5 +1,6 @@import { createTRPCUntypedClient, httpBatchLink } from "@trpc/client";import { Upload } from "tus-js-client";+import { getAssetContentHash } from "@webstudio-is/sdk";import {apiClientHeader,apiClientVersionHeader,@@ -327,6 +328,7 @@ type AssetContentData = BinaryAssetData | string;type AssetUpload = {asset: Asset;data: BinaryAssetData;+ force?: boolean;};type AssetUploadDescriptor = {@@ -336,11 +338,16 @@ type AssetUploadDescriptor = {meta?: Record<string, unknown>;description?: string | null;folderId?: string;+ force?: boolean;};-type AssetUploadResult = { uploadedAssets?: Asset[] };+type UploadedAsset = Asset & { deduplicated?: boolean };+type AssetUploadResult = {+ uploadedAssets?: Asset[];+ deduplicated?: boolean;+};type AssetUploadBatchResult =- | { status: "fulfilled"; uploadedAssets: Asset[] }+ | { status: "fulfilled"; uploadedAssets: UploadedAsset[] }| { status: "rejected"; asset: Asset; error: unknown };const formatError = (error: unknown) =>@@ -354,12 +361,20 @@ const retryOnce = async <Result>(task: () => Promise<Result>) => {}};+const getBinaryAssetDataHash = async (data: BinaryAssetData) => {+ return getAssetContentHash(+ data instanceof Blob ? await data.arrayBuffer() : data+ );+};+const getAssetUploadUrl = ({asset,+ force,origin,projectId,}: {asset: Asset;+ force?: boolean;origin: string;projectId: string;}) => {@@ -376,8 +391,13 @@ const getAssetUploadUrl = ({if (asset.type === "image") {url.searchParams.set("width", String(asset.meta.width));url.searchParams.set("height", String(asset.meta.height));+ }+ if (asset.format !== undefined) {url.searchParams.set("format", asset.format);}+ if (force === true) {+ url.searchParams.set("force", "true");+ }return url;};@@ -390,6 +410,7 @@ export const uploadAsset = async (const response = await fetchJsonResponse(getAssetUploadUrl({asset: upload.asset,+ force: upload.force,origin,projectId,}),@@ -400,6 +421,7 @@ export const uploadAsset = async (...headers,"x-auth-token": authToken,"x-webstudio-asset-description": upload.asset.description ?? undefined,+ "x-webstudio-asset-meta": JSON.stringify(upload.asset.meta),"content-type": "application/octet-stream",}),}@@ -418,7 +440,12 @@ export const uploadAsset = async (throw new Error(result.errors);}return "uploadedAssets" in result && Array.isArray(result.uploadedAssets)- ? result.uploadedAssets+ ? result.deduplicated === true+ ? result.uploadedAssets.map((asset) => ({+ ...asset,+ deduplicated: true,+ }))+ : result.uploadedAssets: [];};@@ -426,27 +453,60 @@ export const uploadAssets = async (params: AuthProjectParams & {assets: Asset[];readAssetData: (asset: Asset) => Promise<BinaryAssetData>;+ force?: (asset: Asset) => boolean;}-): Promise<Asset[]> => {- const results: AssetUploadBatchResult[] = await Promise.all(- params.assets.map(async (asset) => {+): Promise<UploadedAsset[]> => {+ const results: AssetUploadBatchResult[] = Array(params.assets.length);+ const prepared = await Promise.all(+ params.assets.map(async (asset, index) => {try {- const uploadedAssets = await retryOnce(async () => {- const data = await params.readAssetData(asset);- return await uploadAsset({- authToken: params.authToken,- headers: params.headers,- origin: params.origin,- projectId: params.projectId,- upload: {- asset,- data,- },- });- });- return { status: "fulfilled", uploadedAssets };+ const data = await retryOnce(() => params.readAssetData(asset));+ const force = params.force?.(asset);+ return {+ asset,+ data,+ force,+ index,+ group:+ force === true+ ? `force:${index}`+ : await getBinaryAssetDataHash(data),+ };} catch (error) {- return { status: "rejected", asset, error };+ results[index] = { status: "rejected", asset, error };+ }+ })+ );+ const uploads = prepared.flatMap((upload) =>+ upload === undefined ? [] : [upload]+ );+ const groups = new Map<string, typeof uploads>();+ for (const upload of uploads) {+ const group = groups.get(upload.group) ?? [];+ group.push(upload);+ groups.set(upload.group, group);+ }+ await Promise.all(+ Array.from(groups.values(), async (uploads) => {+ for (const { asset, data, force, index } of uploads) {+ try {+ const uploadedAssets = await retryOnce(async () => {+ return await uploadAsset({+ authToken: params.authToken,+ headers: params.headers,+ origin: params.origin,+ projectId: params.projectId,+ upload: {+ asset,+ data,+ force,+ },+ });+ });+ results[index] = { status: "fulfilled", uploadedAssets };+ } catch (error) {+ results[index] = { status: "rejected", asset, error };+ }}}));@@ -537,6 +597,7 @@ export const uploadProjectAsset = async (projectId: params.projectId,assets: [asset],readAssetData: () => params.readAssetData(params.asset),+ force: () => params.asset.force === true,});return { uploaded };};@@ -565,6 +626,7 @@ export const uploadProjectAssets = async (}return params.readAssetData(descriptor);},+ force: (asset) => descriptorByName.get(asset.name)?.force === true,});return { uploaded };};diff --git a/packages/postgrest/src/__generated__/db-types.ts b/packages/postgrest/src/__generated__/db-types.tsindex 574e5f511f..04bf30c0e9 100644--- a/packages/postgrest/src/__generated__/db-types.ts+++ b/packages/postgrest/src/__generated__/db-types.ts@@ -218,8 +218,8 @@ export type Database = {lastTransactionId: string | null;marketplaceProduct: string;pages: string;- projectSettings: string;projectId: string;+ projectSettings: string;props: string;publishStatus: Database["public"]["Enums"]["PublishStatus"];resources: string;@@ -240,8 +240,8 @@ export type Database = {lastTransactionId?: string | null;marketplaceProduct?: string;pages: string;- projectSettings?: string;projectId: string;+ projectSettings?: string;props?: string;publishStatus?: Database["public"]["Enums"]["PublishStatus"];resources?: string;@@ -262,8 +262,8 @@ export type Database = {lastTransactionId?: string | null;marketplaceProduct?: string;pages?: string;- projectSettings?: string;projectId?: string;+ projectSettings?: string;props?: string;publishStatus?: Database["public"]["Enums"]["PublishStatus"];resources?: string;@@ -418,6 +418,7 @@ export type Database = {};File: {Row: {+ contentHash: string | null;createdAt: string;description: string | null;format: string;@@ -430,6 +431,7 @@ export type Database = {uploaderProjectId: string | null;};Insert: {+ contentHash?: string | null;createdAt?: string;description?: string | null;format: string;@@ -442,6 +444,7 @@ export type Database = {uploaderProjectId?: string | null;};Update: {+ contentHash?: string | null;createdAt?: string;description?: string | null;format?: string;@@ -1203,6 +1206,15 @@ export type Database = {Args: { from_build_id: string; project_id: string };Returns: string;};+ swap_asset_file: {+ Args: {+ asset_id: string;+ expected_name: string;+ project_id: string;+ replacement_name: string;+ };+ Returns: string;+ };};Enums: {AuthorizationRelation:diff --git a/packages/prisma-client/prisma/migrations/20260720000001_asset_content_hash/migration.sql b/packages/prisma-client/prisma/migrations/20260720000001_asset_content_hash/migration.sqlnew file mode 100644index 0000000000..85f60a95b0--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20260720000001_asset_content_hash/migration.sql@@ -0,0 +1,2 @@+ALTER TABLE "File"+ADD COLUMN IF NOT EXISTS "contentHash" VARCHAR(64);diff --git a/packages/prisma-client/prisma/migrations/20260720000002_asset_content_hash_index/migration.sql b/packages/prisma-client/prisma/migrations/20260720000002_asset_content_hash_index/migration.sqlnew file mode 100644index 0000000000..58312fb5ef--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20260720000002_asset_content_hash_index/migration.sql@@ -0,0 +1,14 @@+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS "File_uploaderProjectId_contentHash_extension_key"+ON "File"(+ "uploaderProjectId",+ "contentHash",+ (+ CASE+ WHEN strpos(reverse("name"), '.') IN (0, 1)+ OR length("name") - strpos(reverse("name"), '.') + 1 = 1+ THEN ''+ ELSE lower(reverse(split_part(reverse("name"), '.', 1)))+ END+ )+)+WHERE "contentHash" IS NOT NULL;diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex f18ee0f8d0..a8d853570f 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -35,6 +35,7 @@ model File {isDeleted Boolean @default(false)uploaderProject Project? @relation(fields: [uploaderProjectId], references: [id])uploaderProjectId String?+ contentHash String? @db.VarChar(64)assets Asset[]}diff --git a/packages/project-build/src/contracts/__generated__/runtime-operation-contracts.ts b/packages/project-build/src/contracts/__generated__/runtime-operation-contracts.tsindex 6da940e432..afc7f07272 100644--- a/packages/project-build/src/contracts/__generated__/runtime-operation-contracts.ts+++ b/packages/project-build/src/contracts/__generated__/runtime-operation-contracts.ts@@ -60540,7 +60540,23 @@ export const runtimeOperationContractData = [propertyNames: {type: "string",},- additionalProperties: {},+ additionalProperties: {+ anyOf: [+ {+ type: "string",+ },+ {+ type: "object",+ properties: {+ type: {+ type: "string",+ },+ },+ required: ["type"],+ additionalProperties: {},+ },+ ],+ },},declarations: {type: "array",@@ -60550,7 +60566,23 @@ export const runtimeOperationContractData = [property: {type: "string",},- value: {},+ value: {+ anyOf: [+ {+ type: "string",+ },+ {+ type: "object",+ properties: {+ type: {+ type: "string",+ },+ },+ required: ["type"],+ additionalProperties: {},+ },+ ],+ },breakpoint: {type: "string",},@@ -60558,7 +60590,7 @@ export const runtimeOperationContractData = [type: "string",},},- required: ["property"],+ required: ["property", "value"],},},},@@ -60865,7 +60897,23 @@ export const runtimeOperationContractData = [propertyNames: {type: "string",},- additionalProperties: {},+ additionalProperties: {+ anyOf: [+ {+ type: "string",+ },+ {+ type: "object",+ properties: {+ type: {+ type: "string",+ },+ },+ required: ["type"],+ additionalProperties: {},+ },+ ],+ },},declarations: {type: "array",@@ -60875,7 +60923,23 @@ export const runtimeOperationContractData = [property: {type: "string",},- value: {},+ value: {+ anyOf: [+ {+ type: "string",+ },+ {+ type: "object",+ properties: {+ type: {+ type: "string",+ },+ },+ required: ["type"],+ additionalProperties: {},+ },+ ],+ },breakpoint: {type: "string",},@@ -60883,7 +60947,7 @@ export const runtimeOperationContractData = [type: "string",},},- required: ["property"],+ required: ["property", "value"],},},},@@ -60948,7 +61012,23 @@ export const runtimeOperationContractData = [property: {type: "string",},- value: {},+ value: {+ anyOf: [+ {+ type: "string",+ },+ {+ type: "object",+ properties: {+ type: {+ type: "string",+ },+ },+ required: ["type"],+ additionalProperties: {},+ },+ ],+ },breakpoint: {type: "string",},@@ -60956,7 +61036,7 @@ export const runtimeOperationContractData = [type: "string",},},- required: ["property"],+ required: ["property", "value"],},},},@@ -64266,7 +64346,6 @@ export const runtimeOperationContractData = [additionalProperties: {},},readNamespaces: [- "pages","styles","styleSources","styleSourceSelections",@@ -67405,18 +67484,37 @@ export const runtimeOperationContractData = [inputSchema: {type: "object",properties: {+ assetIds: {+ minItems: 1,+ type: "array",+ items: {+ type: "string",+ minLength: 1,+ },+ },+ assetIdPrefixes: {+ minItems: 1,+ type: "array",+ items: {+ type: "string",+ minLength: 1,+ },+ },assetIdsOrPrefixes: {minItems: 1,type: "array",items: {type: "string",+ minLength: 1,},+ description:+ "Deprecated compatibility alias. Use assetIds for exact ids or assetIdPrefixes for prefixes.",},force: {type: "boolean",},},- required: ["assetIdsOrPrefixes"],+ required: [],},outputSchema: {type: "object",diff --git a/packages/project-build/src/mcp.ts b/packages/project-build/src/mcp.tsindex 7974c60966..48e6fa3dfb 100644--- a/packages/project-build/src/mcp.ts+++ b/packages/project-build/src/mcp.ts@@ -1571,6 +1571,16 @@ export const mcpArgumentExamples: Record<string, readonly unknown[]> = {},assetsDir: ".webstudio/assets",},+ {+ asset: {+ name: "hero.png",+ type: "image",+ format: "png",+ meta: { width: 1200, height: 630 },+ force: true,+ },+ assetsDir: ".webstudio/assets",+ },],"upload-assets": [{@@ -1866,7 +1876,10 @@ export const mcpArgumentExamples: Record<string, readonly unknown[]> = {],"list-assets": [{}, { verbose: true }],"replace-asset": [{ fromAssetId: "old-asset-id", toAssetId: "new-asset-id" }],- "delete-asset": [{ assetIdsOrPrefixes: ["asset-id"] }],+ "delete-asset": [+ { assetIds: ["asset-id"] },+ { assetIdPrefixes: ["generated-prefix"] },+ ],"set-image-descriptions": [{updates: [diff --git a/packages/project-build/src/runtime.ts b/packages/project-build/src/runtime.tsindex da7842ba6f..899367a47b 100644--- a/packages/project-build/src/runtime.ts+++ b/packages/project-build/src/runtime.ts@@ -19,6 +19,7 @@ export * from "./runtime/errors";export * from "./runtime/expression-validation";export * from "./runtime/fragment";export * from "./runtime/html";+export * from "./runtime/html-embed";export * from "./runtime/insert-target";export * from "./runtime/instance-path";export * from "./runtime/instance-duplicate";diff --git a/packages/project-build/src/runtime/assets.test.ts b/packages/project-build/src/runtime/assets.test.tsindex a4e442549e..86aefb2b48 100644--- a/packages/project-build/src/runtime/assets.test.ts+++ b/packages/project-build/src/runtime/assets.test.ts@@ -17,6 +17,7 @@ import type { BuilderState } from "../state/builder-state";import {addAsset,assetAddInput,+ assetDeleteInput,calculateUsagesByAssetId,createAssetDeletePayload,createAssetReplacementPayload,@@ -405,6 +406,13 @@ describe("asset runtime operations", () => {).toThrow("Assets are still referenced: asset");});+ test("rejects empty asset id prefixes", () => {+ expect(() => assetDeleteInput.parse({ assetIdPrefixes: [""] })).toThrow();+ expect(() =>+ assetDeleteInput.parse({ assetIdsOrPrefixes: [" "] })+ ).toThrow();+ });+test("builds asset delete mutations", () => {expect(deleteAssets(state, { assetIdsOrPrefixes: ["unused"] })@@ -416,6 +424,42 @@ describe("asset runtime operations", () => {],});});++ test("does not treat exact asset ids as prefixes", () => {+ expect(+ deleteAssets(+ {+ ...state,+ assets: new Map([+ ["unused", { ...state.assets.get("unused")!, id: "unused" }],+ [+ "unused-child",+ { ...state.assets.get("unused")!, id: "unused-child" },+ ],+ ]),+ },+ { assetIds: ["unused"] }+ ).result+ ).toEqual({ assetIds: ["unused"] });+ });++ test("deletes assets by an explicit prefix", () => {+ expect(+ deleteAssets(+ {+ ...state,+ assets: new Map([+ ["unused", { ...state.assets.get("unused")!, id: "unused" }],+ [+ "unused-child",+ { ...state.assets.get("unused")!, id: "unused-child" },+ ],+ ]),+ },+ { assetIdPrefixes: ["unused"] }+ ).result+ ).toEqual({ assetIds: ["unused", "unused-child"] });+ });});const createPages = ({meta = {},diff --git a/packages/project-build/src/runtime/assets.ts b/packages/project-build/src/runtime/assets.tsindex 86a7293e8d..8edf4905df 100644--- a/packages/project-build/src/runtime/assets.ts+++ b/packages/project-build/src/runtime/assets.ts@@ -68,10 +68,26 @@ export const assetReplaceInput = z.object({toAssetId: z.string(),});-export const assetDeleteInput = z.object({- assetIdsOrPrefixes: z.array(z.string()).min(1),- force: z.boolean().optional(),-});+export const assetDeleteInput = z+ .object({+ assetIds: z.array(z.string().trim().min(1)).min(1).optional(),+ assetIdPrefixes: z.array(z.string().trim().min(1)).min(1).optional(),+ assetIdsOrPrefixes: z+ .array(z.string().trim().min(1))+ .min(1)+ .describe(+ "Deprecated compatibility alias. Use assetIds for exact ids or assetIdPrefixes for prefixes."+ )+ .optional(),+ force: z.boolean().optional(),+ })+ .refine(+ ({ assetIds, assetIdPrefixes, assetIdsOrPrefixes }) =>+ assetIds !== undefined ||+ assetIdPrefixes !== undefined ||+ assetIdsOrPrefixes !== undefined,+ { message: "Provide assetIds or assetIdPrefixes" }+ );export const assetUpdateInput = z.object({assetId: z.string(),@@ -1097,10 +1113,15 @@ export const deleteAssets = (input: z.infer<typeof assetDeleteInput>) => {const assets = Array.from(getRequiredAssets(state).values());- const selectedAssets = assets.filter((asset) =>- input.assetIdsOrPrefixes.some(- (value) => asset.id === value || asset.id.startsWith(value)- )+ const assetIds = new Set(input.assetIds);+ const prefixes = [+ ...(input.assetIdPrefixes ?? []),+ ...(input.assetIdsOrPrefixes ?? []),+ ];+ const selectedAssets = assets.filter(+ (asset) =>+ assetIds.has(asset.id) ||+ prefixes.some((value) => asset.id === value || asset.id.startsWith(value)));if (selectedAssets.length === 0) {return createRuntimeMutation({diff --git a/packages/project-build/src/runtime/components.test.ts b/packages/project-build/src/runtime/components.test.tsindex a59fe23978..0b8d26c131 100644--- a/packages/project-build/src/runtime/components.test.ts+++ b/packages/project-build/src/runtime/components.test.ts@@ -576,6 +576,21 @@ test("inserts fragment into page template", async () => {);});+test("rejects invalid HtmlEmbed code from externally authored fragments", async () => {+ const parent = createParent();+ const fragment = await parseWebstudioJsxFragment(+ `<$.HtmlEmbed code={"<div><span></div>"} />`+ );++ expect(() =>+ insertFragment(+ createState(parent),+ { parentInstanceId: parent.id, fragment },+ { createId: createIdFactory() }+ )+ ).toThrow("Entered HTML has a validation error");+});+test("rejects tag when inserting non-element component", async () => {const parent = createParent();@@ -1002,6 +1017,37 @@ test("honors fragment token conflict resolution", async () => {);});+test("requires an explicit fragment token conflict resolution", async () => {+ const parent = createParent();+ const state = createState(parent);+ const existingFragment = await parseWebstudioJsxFragment(+ `<ws.element ws:tag="div" ws:tokens={[token("brand", css\`color: blue;\`)]} />`+ );+ for (const styleSource of existingFragment.styleSources) {+ state.styleSources.set(styleSource.id, styleSource);+ }+ for (const style of existingFragment.styles) {+ state.styles.set(getStyleDeclKey(style), style);+ }+ for (const breakpoint of existingFragment.breakpoints) {+ state.breakpoints.set(breakpoint.id, breakpoint);+ }+ const conflictingFragment = await parseWebstudioJsxFragment(+ `<ws.element ws:tag="div" ws:tokens={[token("brand", css\`color: red;\`)]} />`+ );++ expect(() =>+ insertFragment(+ state,+ {+ parentInstanceId: parent.id,+ fragment: conflictingFragment,+ },+ { createId: createIdFactory(), projectId: "project-id" }+ )+ ).toThrow(/explicit conflictResolution.*brand/);+});+test("inserts token-only fragments without a parent instance", async () => {const parent = createParent();const state = createState(parent);diff --git a/packages/project-build/src/runtime/components.ts b/packages/project-build/src/runtime/components.tsindex b754175fef..f83276f853 100644--- a/packages/project-build/src/runtime/components.ts+++ b/packages/project-build/src/runtime/components.ts@@ -46,7 +46,10 @@ import type { BuilderRuntimeContext } from "./context";import { isFragmentContentModeCopyableProp } from "./content-mode-copy-policy";import { findAvailableVariables } from "./data";import { addZodValidationIssue, throwBuilderRuntimeError } from "./errors";-import { insertWebstudioFragmentCopy } from "./fragment";+import {+ detectFragmentTokenConflicts,+ insertWebstudioFragmentCopy,+} from "./fragment";import {createInstanceAppendPayload,createInstanceChild,@@ -57,6 +60,7 @@ import { createRuntimeMutation, type BuilderRuntimeMutation } from "./mutation";import { getSlotFragmentDropTargetMutable } from "./slot";import type { ConflictResolution } from "./style-copy";import { findPageAndSelectorByInstanceId } from "./lookup";+import { validateFragmentHtmlEmbedCode } from "./html-embed";import { z } from "zod";const conflictResolutionInput = z.enum(["ours", "theirs", "merge"]);@@ -1039,6 +1043,24 @@ export const insertFragment = (input: z.infer<typeof insertFragmentInput>,context: BuilderRuntimeContext): BuilderRuntimeMutation<FragmentInsertResult> => {+ const htmlEmbedError = validateFragmentHtmlEmbedCode(input.fragment);+ if (htmlEmbedError !== undefined) {+ return throwBuilderRuntimeError("BAD_REQUEST", htmlEmbedError.message);+ }+ if (input.conflictResolution === undefined) {+ const conflicts = detectFragmentTokenConflicts({+ fragment: input.fragment,+ targetData: getRequiredComponentInsertState(state),+ });+ if (conflicts.length > 0) {+ return throwBuilderRuntimeError(+ "CONFLICT",+ `Design token conflicts require an explicit conflictResolution (ours, theirs, or merge): ${conflicts+ .map(({ tokenName }) => tokenName)+ .join(", ")}`+ );+ }+ }if (input.fragment.children.length === 0) {return createInsertTokenFragmentMutation({state,diff --git a/packages/project-build/src/runtime/design-token-import.test.ts b/packages/project-build/src/runtime/design-token-import.test.tsindex 4af5e69e18..af1b1f5640 100644--- a/packages/project-build/src/runtime/design-token-import.test.ts+++ b/packages/project-build/src/runtime/design-token-import.test.ts@@ -1,4 +1,5 @@import { describe, expect, test } from "vitest";+import { ROOT_INSTANCE_ID } from "@webstudio-is/sdk";import type { BuilderState } from "../state/builder-state";import { applyBuilderPatchTransactions } from "../state/patch";import {@@ -44,8 +45,8 @@ const setupRootStyleSource = (state: BuilderState) => {id: "root-local",type: "local",});- state.styleSourceSelections?.set("root", {- instanceId: "root",+ state.styleSourceSelections?.set(ROOT_INSTANCE_ID, {+ instanceId: ROOT_INSTANCE_ID,values: ["root-local"],});};diff --git a/packages/project-build/src/runtime/fragment.test.tsx b/packages/project-build/src/runtime/fragment.test.tsxindex cfb12f3d16..995c54a30e 100644--- a/packages/project-build/src/runtime/fragment.test.tsx+++ b/packages/project-build/src/runtime/fragment.test.tsx@@ -374,6 +374,26 @@ test("remap token selections in inserted slot content", () => {});});+test("preserves legacy HtmlEmbed code when copying internal fragments", () => {+ const data = renderData(<$.Body ws:id="bodyId"></$.Body>);+ const fragment = renderTemplate(<$.HtmlEmbed code="<div><span></div>" />);++ insertWebstudioFragmentCopy({+ data,+ fragment,+ availableVariables: [],+ projectId: "",+ });++ expect(Array.from(data.props.values())).toContainEqual(+ expect.objectContaining({+ name: "code",+ type: "string",+ value: "<div><span></div>",+ })+ );+});+test("insert instances with multiple roots", () => {const data = renderData(<$.Body ws:id="bodyId"></$.Body>);const fragment = renderTemplate(diff --git a/packages/project-build/src/runtime/html-embed.test.ts b/packages/project-build/src/runtime/html-embed.test.tsnew file mode 100644index 0000000000..a994fccb95--- /dev/null+++ b/packages/project-build/src/runtime/html-embed.test.ts@@ -0,0 +1,95 @@+import { describe, expect, test } from "vitest";+import { validateHtmlEmbedCode } from "./html-embed";++describe("validateHtmlEmbedCode", () => {+ test("accepts html that serializes without repairs", () => {+ expect(validateHtmlEmbedCode("<div><span>Label</span></div>")).toBe(+ undefined+ );+ });++ test("accepts self-closing svg elements", () => {+ expect(+ validateHtmlEmbedCode(+ '<svg xmlns="http://www.w3.org/2000/svg"><path /></svg>'+ )+ ).toBeUndefined();+ });++ test.each(["<input />", "<meta />"])(+ "accepts self-closing html void element: %s",+ (value) => {+ expect(validateHtmlEmbedCode(value)).toBeUndefined();+ }+ );++ test("accepts svg syntax that the html serializer normalizes", () => {+ expect(+ validateHtmlEmbedCode(+ '<svg viewBox="0 0 24 24"><linearGradient id="paint"><stop offset="0%" stop-color="#fff" /></linearGradient><path fill="url(#paint)" d="M0 0h24v24H0z" /></svg>'+ )+ ).toBeUndefined();+ });++ test("accepts parser-preserved comments, entities, and template content", () => {+ expect(+ validateHtmlEmbedCode(+ "<!-- note --><template><span>Tom & Jerry</span></template>"+ )+ ).toBeUndefined();+ });++ test("reports html parser errors with autofix output", () => {+ expect(+ validateHtmlEmbedCode('<section></section attribute="value">')+ ).toEqual({+ message: "Entered HTML has a validation error.",+ value: '<section></section attribute="value">',+ expected: "<section></section>",+ });+ });++ test("reports repaired html with autofix output", () => {+ expect(validateHtmlEmbedCode("<div><span></div>")).toEqual({+ message: "Entered HTML has a validation error.",+ value: "<div><span></div>",+ expected: "<div><span></span></div>",+ });+ });++ test("reports html moved outside of a table by the parser", () => {+ const value = "<table><div>moved</div></table>";+ expect(validateHtmlEmbedCode(value)).toEqual({+ message: "Entered HTML has a validation error.",+ value,+ expected: "<div>moved</div><table></table>",+ });+ });++ test("reports invalid select children rewritten by the parser", () => {+ const value = "<select><div>discarded</div></select>";+ expect(validateHtmlEmbedCode(value)).toEqual({+ message: "Entered HTML has a validation error.",+ value,+ expected: "<select>discarded</select>",+ });+ });++ test("reports an unclosed SVG child", () => {+ const value = "<svg><path></svg>";+ expect(validateHtmlEmbedCode(value)).toEqual({+ message: "Entered HTML has a validation error.",+ value,+ expected: "<svg><path></path></svg>",+ });+ });++ test("enforces the html embed size limit", () => {+ const value = "a".repeat(50_001);+ expect(validateHtmlEmbedCode(value)).toEqual({+ message: "The HTML Embed code exceeds 50000 character limit.",+ value,+ expected: "",+ });+ });+});diff --git a/packages/project-build/src/runtime/html-embed.ts b/packages/project-build/src/runtime/html-embed.tsnew file mode 100644index 0000000000..7461d3100c--- /dev/null+++ b/packages/project-build/src/runtime/html-embed.ts@@ -0,0 +1,180 @@+import {+ type DefaultTreeAdapterMap,+ defaultTreeAdapter,+ html,+ parseFragment,+ serialize,+ Tokenizer,+ type TokenHandler,+} from "parse5";+import type { WebstudioFragment } from "@webstudio-is/sdk";+import { voidHtmlTags } from "@webstudio-is/html-data";++export type HtmlEmbedCodeError = {+ message: string;+ value: string;+ expected?: string;+};++const htmlEmbedCodeMaxChars = 50_000;+const voidHtmlTagSet = new Set<string>(voidHtmlTags);++const isSelfClosingStartTag = (source: string) => {+ let isSelfClosing = false;+ const ignoreToken = () => {};+ const handler: TokenHandler = {+ onStartTag: (token) => {+ isSelfClosing = token.selfClosing;+ },+ onEndTag: ignoreToken,+ onComment: ignoreToken,+ onDoctype: ignoreToken,+ onCharacter: ignoreToken,+ onNullCharacter: ignoreToken,+ onWhitespaceCharacter: ignoreToken,+ onEof: ignoreToken,+ };+ new Tokenizer({}, handler).write(source, true);+ return isSelfClosing;+};++type SourceRange = { start: number; end: number };+type HtmlNode = DefaultTreeAdapterMap["childNode"];++const getChildNodes = (node: DefaultTreeAdapterMap["element"]) => {+ if (node.tagName === "template") {+ return defaultTreeAdapter.getTemplateContent(+ node as DefaultTreeAdapterMap["template"]+ ).childNodes;+ }+ return node.childNodes;+};++const isParserPreservedHtml = (+ source: string,+ root: DefaultTreeAdapterMap["documentFragment"]+) => {+ const ranges: SourceRange[] = [];++ const inspectChildren = (+ children: HtmlNode[],+ contentStart: number,+ contentEnd: number+ ) => {+ let previousEnd = contentStart;+ for (const child of children) {+ const location = defaultTreeAdapter.getNodeSourceCodeLocation(child);+ if (+ location === undefined ||+ location === null ||+ location.startOffset < previousEnd ||+ location.endOffset > contentEnd+ ) {+ return false;+ }+ previousEnd = location.endOffset;+ if (inspectNode(child) === false) {+ return false;+ }+ }+ return true;+ };++ const inspectNode = (node: HtmlNode): boolean => {+ const location = defaultTreeAdapter.getNodeSourceCodeLocation(node);+ if (location === undefined || location === null) {+ return false;+ }+ if (defaultTreeAdapter.isElementNode(node) === false) {+ ranges.push({ start: location.startOffset, end: location.endOffset });+ return true;+ }+ const { startTag, endTag } = location;+ if (startTag === undefined) {+ return false;+ }+ ranges.push({ start: startTag.startOffset, end: startTag.endOffset });+ if (endTag !== undefined) {+ ranges.push({ start: endTag.startOffset, end: endTag.endOffset });+ } else if (+ (node.namespaceURI !== html.NS.HTML ||+ voidHtmlTagSet.has(node.tagName) === false) &&+ isSelfClosingStartTag(+ source.slice(startTag.startOffset, startTag.endOffset)+ ) === false+ ) {+ return false;+ }+ return inspectChildren(+ getChildNodes(node),+ startTag.endOffset,+ endTag?.startOffset ?? location.endOffset+ );+ };++ if (inspectChildren(root.childNodes, 0, source.length) === false) {+ return false;+ }+ ranges.sort((left, right) => left.start - right.start);+ let consumedEnd = 0;+ for (const range of ranges) {+ if (range.start !== consumedEnd) {+ return false;+ }+ consumedEnd = range.end;+ }+ return consumedEnd === source.length;+};++export const validateHtmlEmbedCode = (+ value: string+): HtmlEmbedCodeError | undefined => {+ if (value.length > htmlEmbedCodeMaxChars) {+ return {+ message: `The HTML Embed code exceeds ${htmlEmbedCodeMaxChars} character limit.`,+ value,+ expected: "",+ };+ }++ const parseErrors: string[] = [];+ const parsed = parseFragment(value, {+ sourceCodeLocationInfo: true,+ onParseError: (error) => {+ parseErrors.push(error.code);+ },+ });+ const expected = serialize(parsed);++ if (parseErrors.length === 0 && isParserPreservedHtml(value, parsed)) {+ return;+ }++ return {+ message: "Entered HTML has a validation error.",+ value,+ expected,+ };+};++export const validateFragmentHtmlEmbedCode = (+ fragment: WebstudioFragment+): HtmlEmbedCodeError | undefined => {+ for (const instance of fragment.instances) {+ if (instance.component !== "HtmlEmbed") {+ continue;+ }+ const code = fragment.props.find(+ (prop) =>+ prop.instanceId === instance.id &&+ prop.name === "code" &&+ prop.type === "string"+ );+ if (code?.type === "string") {+ const error = validateHtmlEmbedCode(code.value);+ if (error !== undefined) {+ return error;+ }+ }+ }+};diff --git a/packages/project-build/src/runtime/html.test.tsx b/packages/project-build/src/runtime/html.test.tsxindex cfbedc8d38..403b3f50a4 100644--- a/packages/project-build/src/runtime/html.test.tsx+++ b/packages/project-build/src/runtime/html.test.tsx@@ -1,10 +1,7 @@import { expect, test, describe } from "vitest";import { $, css, renderTemplate, token, ws } from "@webstudio-is/template";import type { WebstudioFragment } from "@webstudio-is/sdk";-import {- generateFragmentFromHtml as _generateFragmentFromHtml,- validateHtmlEmbedCode,-} from "./html";+import { generateFragmentFromHtml as _generateFragmentFromHtml } from "./html";// Wrapper that strips skippedSelectors for tests that only compare fragment shapeconst generateFragmentFromHtml = (html: string) => {@@ -13,49 +10,6 @@ const generateFragmentFromHtml = (html: string) => {return fragment;};-describe("validateHtmlEmbedCode", () => {- test("accepts html that serializes without repairs", () => {- expect(validateHtmlEmbedCode("<div><span>Label</span></div>")).toBe(- undefined- );- });-- test("accepts self-closing svg elements", () => {- expect(- validateHtmlEmbedCode(- '<svg xmlns="http://www.w3.org/2000/svg"><path /></svg>'- )- ).toBeUndefined();- });-- test("reports html parser errors with autofix output", () => {- expect(- validateHtmlEmbedCode('<section></section attribute="value">')- ).toEqual({- message: "Entered HTML has a validation error.",- value: '<section></section attribute="value">',- expected: "<section></section>",- });- });-- test("reports repaired html with autofix output", () => {- expect(validateHtmlEmbedCode("<div><span></div>")).toEqual({- message: "Entered HTML has a validation error.",- value: "<div><span></div>",- expected: "<div><span></span></div>",- });- });-- test("enforces the html embed size limit", () => {- const value = "a".repeat(50_001);- expect(validateHtmlEmbedCode(value)).toEqual({- message: "The HTML Embed code exceeds 50000 character limit.",- value,- expected: "",- });- });-});-test("generate instances from html", () => {expect(generateFragmentFromHtml(`diff --git a/packages/project-build/src/runtime/html.ts b/packages/project-build/src/runtime/html.tsindex 2d83251398..7f9075c505 100644--- a/packages/project-build/src/runtime/html.ts+++ b/packages/project-build/src/runtime/html.ts@@ -2,7 +2,6 @@ import {type DefaultTreeAdapterMap,defaultTreeAdapter,parseFragment,- serialize,} from "parse5";import {type WebstudioFragment,@@ -40,54 +39,6 @@ type ElementNode = DefaultTreeAdapterMap["element"];const spaceRegex = /^\s*$/;const wsAttributePrefix = "data-ws-";-export type HtmlEmbedCodeError = {- message: string;- value: string;- expected?: string;-};--const htmlEmbedCodeMaxChars = 50_000;--const normalizeHtmlForComparison = (value: string) =>- value- .replaceAll(/\s/g, "")- .replaceAll('=""', "")- .replaceAll('xmlns="http://www.w3.org/2000/svg"', "")- .replaceAll(/<([a-zA-Z][\w:-]*)([^<>]*)\/>/g, "<$1$2></$1>");--export const validateHtmlEmbedCode = (- value: string-): HtmlEmbedCodeError | undefined => {- if (value.length > htmlEmbedCodeMaxChars) {- return {- message: `The HTML Embed code exceeds ${htmlEmbedCodeMaxChars} character limit.`,- value,- expected: "",- };- }-- const parseErrors: string[] = [];- const parsed = parseFragment(value, {- onParseError: (error) => {- parseErrors.push(error.code);- },- });- const expected = serialize(parsed);-- if (- parseErrors.length === 0 &&- normalizeHtmlForComparison(expected) === normalizeHtmlForComparison(value)- ) {- return;- }-- return {- message: "Entered HTML has a validation error.",- value,- expected,- };-};-const getAttributeType = (attribute: (typeof ariaAttributes)[number]): "string" | "boolean" | "number" => {diff --git a/packages/project-build/src/runtime/instance-duplicate.test.ts b/packages/project-build/src/runtime/instance-duplicate.test.tsindex e8c0b762b3..36278a4571 100644--- a/packages/project-build/src/runtime/instance-duplicate.test.ts+++ b/packages/project-build/src/runtime/instance-duplicate.test.ts@@ -104,6 +104,37 @@ test("duplicates an instance after itself", () => {]);});+test("preserves legacy HtmlEmbed code when duplicating an instance", () => {+ const data = createData();+ data.instances.set("source", {+ ...createInstance("source"),+ component: "HtmlEmbed",+ });+ data.props.set("legacy-code", {+ id: "legacy-code",+ instanceId: "source",+ name: "code",+ type: "string",+ value: "<div><span></div>",+ });++ duplicateInstanceAfterItselfMutable({+ data,+ sourceInstanceId: "source",+ parentInstanceId: "parent",+ projectId: "project-id",+ createId: () => "source-copy",+ });++ expect(Array.from(data.props.values())).toContainEqual(+ expect.objectContaining({+ instanceId: "source-copy",+ name: "code",+ value: "<div><span></div>",+ })+ );+});+test("removes copied grid placement when source is auto-placed", () => {const data = createData();const gridPlacement = createStyleDecl("source-local", "gridColumnStart", {diff --git a/packages/project-build/src/runtime/page-copy.test.tsx b/packages/project-build/src/runtime/page-copy.test.tsxindex 94e1a7c11f..2e1adfed31 100644--- a/packages/project-build/src/runtime/page-copy.test.tsx+++ b/packages/project-build/src/runtime/page-copy.test.tsx@@ -408,6 +408,72 @@ describe("insert page copy", () => {});});+ test("preserves legacy HtmlEmbed code when duplicating a page", () => {+ const data = getWebstudioDataStub({+ instances: toMap<Instance>([+ {+ type: "instance",+ id: "bodyId",+ component: "Body",+ children: [{ type: "id", value: "embedId" }],+ },+ {+ type: "instance",+ id: "embedId",+ component: "HtmlEmbed",+ children: [],+ },+ ]),+ props: toMap<Prop>([+ {+ id: "legacy-code",+ instanceId: "embedId",+ name: "code",+ type: "string",+ value: "<div><span></div>",+ },+ ]),+ pages: migratePages({+ meta: {},+ homePage: {+ id: "pageId",+ name: "Home",+ path: "",+ title: `"Home"`,+ meta: {},+ rootInstanceId: "bodyId",+ },+ pages: [],+ folders: [createRootFolder(["pageId"])],+ }),+ });++ const mutation = duplicatePage(+ data,+ {+ projectId: "projectId",+ pageId: "pageId",+ name: "Copy",+ path: "/copy",+ },+ { createId: nanoid }+ );++ expect(mutation.payload).toContainEqual({+ namespace: "props",+ patches: expect.arrayContaining([+ expect.objectContaining({+ op: "add",+ value: expect.objectContaining({+ name: "code",+ type: "string",+ value: "<div><span></div>",+ }),+ }),+ ]),+ });+ });+test("runtime duplicate atomically substitutes copied page text and variables", () => {const data = getWebstudioDataStub({instances: toMap<Instance>([diff --git a/packages/project-build/src/runtime/props.ts b/packages/project-build/src/runtime/props.tsindex 6f28e49b3d..a90861e0ec 100644--- a/packages/project-build/src/runtime/props.ts+++ b/packages/project-build/src/runtime/props.ts@@ -14,7 +14,7 @@ import {getExpressionErrors,} from "./expression-validation";import { runtimeGeneratedIdInput } from "./generated-id-input";-import { validateHtmlEmbedCode } from "./html";+import { validateHtmlEmbedCode } from "./html-embed";import { createRuntimeMutation } from "./mutation";import { isDynamicPropType } from "./accessibility-analysis";diff --git a/packages/project-build/src/runtime/registry.ts b/packages/project-build/src/runtime/registry.tsindex 26a0347825..a754cfae7e 100644--- a/packages/project-build/src/runtime/registry.ts+++ b/packages/project-build/src/runtime/registry.ts@@ -1602,7 +1602,7 @@ export const builderRuntimeOperations = ["cssVariables.define",api("define-css-variable", "defineCssVariables"),mutationContract({- readNamespaces: ["pages", ...styleNamespaces, "breakpoints"],+ readNamespaces: [...styleNamespaces, "breakpoints"],writeNamespaces: ["styles", "styleSources", "styleSourceSelections"],}),styles.cssVariableDefineInput,diff --git a/packages/project-build/src/runtime/slot.test.ts b/packages/project-build/src/runtime/slot.test.tsindex da5f967389..90482f3fda 100644--- a/packages/project-build/src/runtime/slot.test.ts+++ b/packages/project-build/src/runtime/slot.test.ts@@ -1,8 +1,9 @@import { describe, expect, test } from "vitest";-import type { Instance } from "@webstudio-is/sdk";+import type { Instance, WebstudioData } from "@webstudio-is/sdk";import { applyBuilderPatchTransactions } from "../state/patch";import {attachSharedSlot,+ detachSharedSlotChildrenMutable,extractSharedSlot,findClosestSlot,getDirectSharedSlotChildBoundary,@@ -181,6 +182,61 @@ describe("runtime slot utilities", () => {]);});+ test("preserves legacy HtmlEmbed code when detaching shared content", () => {+ const data: Omit<WebstudioData, "pages"> = {+ instances: new Map([+ [+ "first-slot",+ instance("first-slot", "Slot", [{ type: "id", value: "fragment" }]),+ ],+ [+ "second-slot",+ instance("second-slot", "Slot", [{ type: "id", value: "fragment" }]),+ ],+ [+ "fragment",+ instance("fragment", "Fragment", [{ type: "id", value: "embed" }]),+ ],+ ["embed", instance("embed", "HtmlEmbed")],+ ]),+ props: new Map([+ [+ "legacy-code",+ {+ id: "legacy-code",+ instanceId: "embed",+ name: "code",+ type: "string",+ value: "<div><span></div>",+ },+ ],+ ]),+ assets: new Map(),+ breakpoints: new Map(),+ dataSources: new Map(),+ resources: new Map(),+ styles: new Map(),+ styleSources: new Map(),+ styleSourceSelections: new Map(),+ };+ const ids = ["fragment-copy", "embed-copy", "code-copy"];++ detachSharedSlotChildrenMutable({+ data,+ slotId: "first-slot",+ projectId: "project-id",+ createId: () => ids.shift() ?? "unexpected",+ });++ expect(Array.from(data.props.values())).toContainEqual(+ expect.objectContaining({+ instanceId: "embed-copy",+ name: "code",+ value: "<div><span></div>",+ })+ );+ });+test("explains the required selector order when the parent is invalid", () => {const instances = new Map([["body", instance("body", "Body", [{ type: "id", value: "section" }])],diff --git a/packages/project-build/src/runtime/style-copy.test.ts b/packages/project-build/src/runtime/style-copy.test.tsindex e6dd29c5a4..006f45bdd4 100644--- a/packages/project-build/src/runtime/style-copy.test.ts+++ b/packages/project-build/src/runtime/style-copy.test.ts@@ -115,9 +115,54 @@ describe("token conflict helpers", () => {},]);});++ test("detects conflicting tokens within the incoming fragment", () => {+ expect(+ detectTokenConflicts({+ fragmentStyleSources: [+ token("first", "Primary"),+ token("second", "Primary"),+ ],+ fragmentStyles: [+ style("first", "base", "color", red),+ style("second", "base", "color", blue),+ ],+ existingStyleSources: new Map(),+ existingStyles: new Map(),+ breakpoints: baseBreakpoints,+ mergedBreakpointIds: new Map(),+ })+ ).toMatchObject([{ tokenName: "Primary", fragmentTokenId: "second" }]);+ });});describe("style source insertion", () => {+ test("reuses identical tokens planned in the same fragment", () => {+ const inserted = insertStyleSources({+ fragmentStyleSources: [+ token("first", "Primary"),+ token("second", "Primary"),+ ],+ fragmentStyles: [+ style("first", "base", "color", red),+ style("second", "base", "color", red),+ ],+ existingStyleSources: new Map(),+ existingStyles: new Map(),+ breakpoints: baseBreakpoints,+ mergedBreakpointIds: new Map(),+ createId: () => "created",+ });++ expect(inserted.styleSourceIdMap).toEqual(+ new Map([+ ["first", "created"],+ ["second", "created"],+ ])+ );+ expect(inserted.updatedStyleSources.size).toBe(1);+ });+test("reuses matching tokens and suffixes conflicting incoming tokens", () => {const reused = insertStyleSources({fragmentStyleSources: [token("incoming", "Primary")],diff --git a/packages/project-build/src/runtime/style-copy.ts b/packages/project-build/src/runtime/style-copy.tsindex 47c218fc98..fbb2e2c3fa 100644--- a/packages/project-build/src/runtime/style-copy.ts+++ b/packages/project-build/src/runtime/style-copy.ts@@ -131,8 +131,8 @@ export const detectTokenConflicts = ({mergedBreakpointIds: Map<Breakpoint["id"], Breakpoint["id"]>;}): TokenConflict[] => {const conflicts: TokenConflict[] = [];- const existingTokens = Array.from(existingStyleSources.values());- const existingStylesArray = Array.from(existingStyles.values());+ const comparedTokens = Array.from(existingStyleSources.values());+ const comparedStyles = Array.from(existingStyles.values());for (const styleSource of fragmentStyleSources) {if (styleSource.type !== "token") {@@ -144,15 +144,15 @@ export const detectTokenConflicts = ({tokenStyles: fragmentStyles.filter((decl) => decl.styleSourceId === styleSource.id),- existingTokens,- existingStyles: existingStylesArray,+ existingTokens: comparedTokens,+ existingStyles: comparedStyles,breakpoints,mergedBreakpointIds,});if (result.hasConflict) {// Find the first existing token with the same name for display purposes- const existingToken = existingTokens.find(+ const existingToken = comparedTokens.find((token) => token.type === "token" && token.name === styleSource.name);if (existingToken && existingToken.type === "token") {@@ -163,6 +163,16 @@ export const detectTokenConflicts = ({existingToken,});}+ continue;+ }++ if (result.matchingToken === undefined) {+ comparedTokens.push(styleSource);+ comparedStyles.push(+ ...fragmentStyles.filter(+ (declaration) => declaration.styleSourceId === styleSource.id+ )+ );}}@@ -225,6 +235,23 @@ export const insertStyleSources = ({const styleSourceIds = new Set<StyleSource["id"]>();const styleSourceIdMap = new Map<StyleSource["id"], StyleSource["id"]>(); // old id -> new idconst updatedStyleSources = new Map(existingStyleSources);+ const comparedStyles = new Map(existingStyles);++ const trackIncomingStyles = (fromId: string, toId: string) => {+ for (const declaration of fragmentStyles) {+ if (declaration.styleSourceId !== fromId) {+ continue;+ }+ const tracked = {+ ...declaration,+ styleSourceId: toId,+ breakpointId:+ mergedBreakpointIds.get(declaration.breakpointId) ??+ declaration.breakpointId,+ };+ comparedStyles.set(getStyleDeclKey(tracked), tracked);+ }+ };for (const styleSource of fragmentStyleSources) {if (styleSource.type === "local") {@@ -246,7 +273,7 @@ export const insertStyleSources = ({(decl) => decl.styleSourceId === originalFragmentTokenId),existingTokens: tokensWithSameName,- existingStyles: Array.from(existingStyles.values()),+ existingStyles: Array.from(comparedStyles.values()),breakpoints,mergedBreakpointIds,});@@ -280,6 +307,7 @@ export const insertStyleSources = ({// Mark the existing token for style insertion// This will allow the fragment styles to be added/mergedstyleSourceIds.add(originalFragmentTokenId);+ trackIncomingStyles(originalFragmentTokenId, existingToken.id);continue;} else {// Default: add counter suffix@@ -297,6 +325,7 @@ export const insertStyleSources = ({styleSourceIds.add(originalFragmentTokenId);updatedStyleSources.set(newTokenId, newStyleSource);styleSourceIdMap.set(originalFragmentTokenId, newTokenId);+ trackIncomingStyles(originalFragmentTokenId, newTokenId);// Add to tracking mapsconst tokensWithNewName = existingTokensByName.get(newName) ?? [];@@ -312,6 +341,7 @@ export const insertStyleSources = ({styleSourceIds.add(originalFragmentTokenId);updatedStyleSources.set(newTokenId, newStyleSource);styleSourceIdMap.set(originalFragmentTokenId, newTokenId);+ trackIncomingStyles(originalFragmentTokenId, newTokenId);// Add to tracking mapsconst tokensWithName = existingTokensByName.get(styleSource.name) ?? [];diff --git a/packages/project-build/src/runtime/styles.test.ts b/packages/project-build/src/runtime/styles.test.tsindex fbdf66a629..36f84a3196 100644--- a/packages/project-build/src/runtime/styles.test.ts+++ b/packages/project-build/src/runtime/styles.test.ts@@ -1279,6 +1279,34 @@ describe("runtime style operations", () => {]);});+ test("parses CSS strings when creating design tokens", () => {+ const mutation = createDesignTokens(+ {+ breakpoints: runtimeBreakpoints,+ styles: new Map(),+ styleSources: new Map(),+ styleSourceSelections: new Map(),+ },+ { tokens: [{ name: "Primary", styles: { fontSize: "24px" } }] },+ { createId }+ );++ expect(mutation.payload).toContainEqual({+ namespace: "styles",+ patches: [+ {+ op: "add",+ path: ["new-id:desktop:fontSize:"],+ value: createStyleDecl("new-id", "desktop", "fontSize", {+ type: "unit",+ value: 24,+ unit: "px",+ }),+ },+ ],+ });+ });+test("creates and attaches design tokens atomically", () => {const mutation = createAttachedDesignTokens({@@ -1653,28 +1681,10 @@ describe("runtime style operations", () => {]);});- test("define css variables uses the project base breakpoint", () => {+ test("defines css variables on the project root at the base breakpoint", () => {const mutation = defineCssVariables({breakpoints: runtimeBreakpoints,- pages: {- homePageId: "home",- rootFolderId: "root",- pages: new Map([- [- "home",- {- id: "home",- name: "Home",- title: "",- rootInstanceId: "root",- meta: {},- path: "",- },- ],- ]),- folders: new Map(),- },styles: new Map(),styleSources: new Map(),styleSourceSelections: new Map(),@@ -1683,7 +1693,23 @@ describe("runtime style operations", () => {{ createId });- expect(mutation.result.names).toEqual(["--color"]);+ expect(mutation.result).toEqual({+ names: ["--color"],+ scope: ROOT_INSTANCE_ID,+ });+ expect(mutation.payload).toContainEqual({+ namespace: "styleSourceSelections",+ patches: [+ {+ op: "add",+ path: [ROOT_INSTANCE_ID],+ value: {+ instanceId: ROOT_INSTANCE_ID,+ values: ["new-id"],+ },+ },+ ],+ });expect(mutation.payload).toContainEqual({namespace: "styles",patches: [diff --git a/packages/project-build/src/runtime/styles.ts b/packages/project-build/src/runtime/styles.tsindex 3e80d716b3..6c711f40a3 100644--- a/packages/project-build/src/runtime/styles.ts+++ b/packages/project-build/src/runtime/styles.ts@@ -1,8 +1,17 @@import { z } from "zod";import { nanoid } from "nanoid";import deepEqual from "fast-deep-equal";-import { camelCaseProperty, validateSelector } from "@webstudio-is/css-data";-import { styleValue, toValue, type StyleValue } from "@webstudio-is/css-engine";+import {+ camelCaseProperty,+ parseCssValue,+ validateSelector,+} from "@webstudio-is/css-data";+import {+ hyphenateProperty,+ styleValue,+ toValue,+ type StyleValue,+} from "@webstudio-is/css-engine";import {getStyleDeclKey,ROOT_INSTANCE_ID,@@ -25,11 +34,7 @@ import {type PaginatedOutputInput,} from "./output";import type { BuilderState } from "../state/builder-state";-import {- findSerializedPageByInput,- getHomePageRootInstanceId,- getSerializedPages,-} from "./pages";+import { findSerializedPageByInput, getSerializedPages } from "./pages";import { getInstanceDepths } from "./instances";import { throwBuilderRuntimeError } from "./errors";import { runtimeGeneratedIdInput } from "./generated-id-input";@@ -264,19 +269,12 @@ const withValidatedBreakpoint = <Input extends { breakpoint?: string }>(export const getCssVariableRootTarget = (state: Pick<BuilderState,- "breakpoints" | "pages" | "styleSources" | "styleSourceSelections"+ "breakpoints" | "styleSources" | "styleSourceSelections">,breakpoint?: string) => {- const rootInstanceId =- state.pages === undefined- ? undefined- : getHomePageRootInstanceId(state.pages);- if (rootInstanceId === undefined) {- return throwBuilderRuntimeError("NOT_FOUND", "Home page not found");- }return {- rootInstanceId,+ rootInstanceId: ROOT_INSTANCE_ID,breakpointId: withValidatedBreakpoint({ breakpoint }, state.breakpoints).breakpoint,styleSourceId:@@ -286,7 +284,7 @@ export const getCssVariableRootTarget = (: getLocalStyleSourceId({styleSources: state.styleSources,styleSourceSelection:- state.styleSourceSelections.get(rootInstanceId),+ state.styleSourceSelections.get(ROOT_INSTANCE_ID),}),};};@@ -1161,18 +1159,23 @@ export const serializeCssVariables = ({};};+const designTokenStyleValueInput = z.union([+ z.string(),+ z.object({ type: z.string() }).passthrough(),+]);+export const designTokenStyleInput = z.object({property: z.string(),- value: z.unknown(),+ value: designTokenStyleValueInput,breakpoint: z.string().optional(),state: styleStateInput.optional(),});-type DesignTokenStyleInput = z.input<typeof designTokenStyleInput>;+type DesignTokenStyleInput = z.infer<typeof designTokenStyleInput>;export const designTokenCreateInput = z.object({tokenId: runtimeGeneratedIdInput,name: z.string().min(1),- styles: z.record(z.string(), z.unknown()).optional(),+ styles: z.record(z.string(), designTokenStyleValueInput).optional(),declarations: z.array(designTokenStyleInput).optional(),});@@ -1309,14 +1312,26 @@ export const validateStyleSourceName = ({};export const createDesignTokenStyleInputs = (input: {- styles?: Record<string, unknown>;+ styles?: Record<string, z.infer<typeof designTokenStyleValueInput>>;declarations?: DesignTokenStyleInput[];-}): DesignTokenStyleInput[] => [+}): Array<Omit<DesignTokenStyleInput, "value"> & { value: StyleValue }> => [...Object.entries(input.styles ?? {}).map(([property, value]) => ({property,- value,+ value:+ typeof value === "string"+ ? parseCssValue(hyphenateProperty(property), value)+ : styleValue.parse(value),+ })),+ ...(input.declarations ?? []).map((declaration) => ({+ ...declaration,+ value:+ typeof declaration.value === "string"+ ? parseCssValue(+ hyphenateProperty(declaration.property),+ declaration.value+ )+ : styleValue.parse(declaration.value),})),- ...(input.declarations ?? []),];export const getLocalStyleSourceId = ({@@ -3428,11 +3443,7 @@ export const listCssVariables = (export const defineCssVariables = (state: Pick<BuilderState,- | "breakpoints"- | "pages"- | "styles"- | "styleSources"- | "styleSourceSelections"+ "breakpoints" | "styles" | "styleSources" | "styleSourceSelections">,input: z.infer<typeof cssVariableDefineInput>,context: { createId: () => string }@@ -3467,7 +3478,7 @@ export const defineCssVariables = (}return createRuntimeMutation({payload: resultPayload.payload,- result: { names: Object.keys(input.vars) },+ result: { names: Object.keys(input.vars), scope: ROOT_INSTANCE_ID },invalidatesNamespaces: ["styles", "styleSources", "styleSourceSelections"],});};diff --git a/packages/protocol/src/builder-api/local-operation-inputs.ts b/packages/protocol/src/builder-api/local-operation-inputs.tsindex 60783608c1..f77c9aa362 100644--- a/packages/protocol/src/builder-api/local-operation-inputs.ts+++ b/packages/protocol/src/builder-api/local-operation-inputs.ts@@ -9,6 +9,7 @@ const assetUploadDescriptor = z.object({format: z.string().optional(),description: z.string().optional(),folderId: z.string().min(1).optional(),+ force: z.boolean().optional(),meta: z.record(z.string(), z.unknown()).optional(),});diff --git a/packages/protocol/src/builder-api/operations.test.ts b/packages/protocol/src/builder-api/operations.test.tsindex 6226dc16c9..6f684b49c5 100644--- a/packages/protocol/src/builder-api/operations.test.ts+++ b/packages/protocol/src/builder-api/operations.test.ts@@ -304,6 +304,8 @@ describe("public api operation catalog", () => {expect(JSON.stringify(upload.inputSchema)).toContain('"folderId"');expect(JSON.stringify(uploadMany.inputSchema)).toContain('"folderId"');+ expect(JSON.stringify(upload.inputSchema)).toContain('"force"');+ expect(JSON.stringify(uploadMany.inputSchema)).toContain('"force"');});test("keeps operation lookup and tRPC path lookup strict", () => {diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.jsonindex 7019571c07..22df562b54 100644--- a/packages/react-sdk/package.json+++ b/packages/react-sdk/package.json@@ -36,7 +36,6 @@"@webstudio-is/image": "workspace:*","@webstudio-is/sdk": "workspace:*","change-case": "^5.4.4",- "html-tags": "^4.0.0","nanoid": "^5.1.5"},"exports": {diff --git a/packages/sdk/src/assets.test.ts b/packages/sdk/src/assets.test.tsindex c2c46f2ca9..b1eaaf06ff 100644--- a/packages/sdk/src/assets.test.ts+++ b/packages/sdk/src/assets.test.ts@@ -24,10 +24,19 @@ import {formatAssetName,getFileExtension,getFileNameParts,+ getAssetContentHash,isTextFileAsset,parseAssetName,} from "./assets";+test("hashes asset content with SHA-256", async () => {+ await expect(+ getAssetContentHash(new TextEncoder().encode("hello"))+ ).resolves.toBe(+ "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824"+ );+});+describe("getFileExtension", () => {test.each([["file.md", "md"],diff --git a/packages/sdk/src/assets.ts b/packages/sdk/src/assets.tsindex 8b66bb1d5d..c9ed1df040 100644--- a/packages/sdk/src/assets.ts+++ b/packages/sdk/src/assets.ts@@ -46,6 +46,15 @@ export const getFileNameParts = (fileName: string) => {};};+export const getAssetContentHash = async (+ data: ArrayBuffer | ArrayBufferView<ArrayBuffer>+) => {+ const digest = await crypto.subtle.digest("SHA-256", data);+ return Array.from(new Uint8Array(digest), (byte) =>+ byte.toString(16).padStart(2, "0")+ ).join("");+};+export type ParsedAssetName = {basename: string;hash: string;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 6c44a21ff4..f32717331b 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -480,9 +480,6 @@ importers:fast-glob:specifier: ^3.3.2version: 3.3.2- html-tags:- specifier: ^4.0.0- version: 4.0.0msw:specifier: ^2.13.2version: 2.13.2(@types/[email protected])([email protected])@@ -1395,9 +1392,6 @@ importers:esbuild:specifier: ^0.25.3version: 0.25.3- html-tags:- specifier: ^4.0.0- version: 4.0.0mdn-data:specifier: 2.28.0version: 2.28.0@@ -1735,6 +1729,10 @@ importers:version: 5.8.2packages/html-data:+ dependencies:+ html-tags:+ specifier: ^4.0.0+ version: 4.0.0devDependencies:'@emotion/hash':specifier: ^0.9.2@@ -1766,6 +1764,9 @@ importers:'@webstudio-is/protocol':specifier: workspace:*version: link:../protocol+ '@webstudio-is/sdk':+ specifier: workspace:*+ version: link:../sdk'@webstudio-is/trpc-interface':specifier: workspace:*version: link:../trpc-interface@@ -2156,9 +2157,6 @@ importers:change-case:specifier: ^5.4.4version: 5.4.4- html-tags:- specifier: ^4.0.0- version: 4.0.0nanoid:specifier: ^5.1.5version: 5.1.5