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
Simplify asset data (#1561)
Bogdan Chadkind952c1bf0ab5
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex 93141618d7..3ee7876af3 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -2,11 +2,7 @@ import { useMemo } from "react";import { useStore } from "@nanostores/react";import warnOnce from "warn-once";import store from "immerhin";-import {- type AssetType,- type Asset,- idsFormDataFieldName,-} from "@webstudio-is/asset-uploader";+import { type AssetType, type Asset } from "@webstudio-is/asset-uploader";import { toast } from "@webstudio-is/design-system";import { sanitizeS3Key } from "@webstudio-is/asset-uploader";import { restAssetsUploadPath, restAssetsPath } from "~/shared/router-utils";@@ -178,8 +174,6 @@ export const useUploadAsset = () => {(data) => {const formData = new FormData();formData.append(type, file, data.name);- formData.append("projectId", projectId);- formData.append(idsFormDataFieldName, id);submitUpload<UploadData>(formData,{diff --git a/packages/asset-uploader/src/clients/fs/upload.ts b/packages/asset-uploader/src/clients/fs/upload.tsindex 2b25e87183..2381e4e38f 100644--- a/packages/asset-uploader/src/clients/fs/upload.ts+++ b/packages/asset-uploader/src/clients/fs/upload.ts@@ -1,17 +1,13 @@import { z } from "zod";import {unstable_parseMultipartFormData as parseMultipartFormData,- unstable_composeUploadHandlers as composeUploadHandlers,- unstable_createMemoryUploadHandler as createMemoryUploadHandler,unstable_createFileUploadHandler as createFileUploadHandler,NodeOnDiskFile,} from "@remix-run/node";import { Location } from "@webstudio-is/prisma-client";import { AssetData, getAssetData } from "../../utils/get-asset-data";-import { idsFormDataFieldName } from "../../schema";const AssetsFromFs = z.array(z.instanceof(NodeOnDiskFile));-const Ids = z.array(z.string().uuid());/*** Do not change. Upload code assumes its 1.@@ -33,15 +29,7 @@ export const uploadToFs = async ({file: ({ filename }) => filename,});- const formData = await parseMultipartFormData(- request,- composeUploadHandlers(- uploadHandler,- createMemoryUploadHandler({- filter: ({ name }) => name === idsFormDataFieldName,- })- )- );+ const formData = await parseMultipartFormData(request, uploadHandler);const formDataImages = AssetsFromFs.parse(formData.getAll("image"));const formDataFonts = AssetsFromFs.parse(formData.getAll("font"));@@ -49,13 +37,10 @@ export const uploadToFs = async ({0,MAX_FILES_PER_REQUEST);- const ids = Ids.parse(formData.getAll(idsFormDataFieldName));- const assets = formDataAll.map(async (asset, index) =>+ const assets = formDataAll.map(async (asset) =>getAssetData({- id: ids[index],type: formDataFonts.includes(asset) ? "font" : "image",- name: asset.name,size: asset.size,data: new Uint8Array(await asset.arrayBuffer()),location: Location.FS,diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex c25cc09284..5e7ed40b54 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -2,8 +2,6 @@ import { z } from "zod";import {type UploadHandlerPart,unstable_parseMultipartFormData as parseMultipartFormData,- unstable_composeUploadHandlers as composeUploadHandlers,- unstable_createMemoryUploadHandler as createMemoryUploadHandler,MaxPartSizeExceededError,} from "@remix-run/node";import type { PutObjectCommandInput, S3Client } from "@aws-sdk/client-s3";@@ -11,14 +9,11 @@ import { Upload } from "@aws-sdk/lib-storage";import { Location } from "@webstudio-is/prisma-client";import { toUint8Array } from "../../utils/to-uint8-array";import { getAssetData, AssetData } from "../../utils/get-asset-data";-import { idsFormDataFieldName } from "../../schema";const AssetsUploadedSuccess = z.object({Location: z.string(),});-const Ids = z.array(z.string().uuid());-/*** Do not change. Upload code assumes its 1.*/@@ -41,28 +36,22 @@ export const uploadToS3 = async ({const formData = await parseMultipartFormData(request,- composeUploadHandlers(- (file: UploadHandlerPart) =>- uploadHandler({- file,- maxSize,- bucket,- acl,- }),- createMemoryUploadHandler({- filter: ({ name }) => name === idsFormDataFieldName,+ (file: UploadHandlerPart) =>+ uploadHandler({+ file,+ maxSize,+ bucket,+ acl,})- ));const imagesFormData = formData.getAll("image") as Array<string>;const fontsFormData = formData.getAll("font") as Array<string>;- const ids = Ids.parse(formData.getAll(idsFormDataFieldName));const assetsData = [...imagesFormData, ...fontsFormData].slice(0, MAX_FILES_PER_REQUEST)- .map((dataString, index) => {- return AssetData.parse({ ...JSON.parse(dataString), id: ids[index] });+ .map((dataString) => {+ return AssetData.parse(JSON.parse(dataString));});return assetsData[0];@@ -136,35 +125,12 @@ const createUploadHandler = (maxFiles: number, client: S3Client) => {? ("image" as const): ("font" as const);- const baseAssetOptions = {- name: uniqueFilename,+ const assetData = await getAssetData({+ type,size: data.byteLength,data,location: Location.REMOTE,- };- let assetOptions;-- if (type === "image") {- assetOptions = {- // Id will be set later- id: "",- type,- ...baseAssetOptions,- };- } else if (type === "font") {- assetOptions = {- // Id will be set later- id: "",- type,- ...baseAssetOptions,- };- }-- if (assetOptions === undefined) {- throw new Error("Asset type not supported");- }-- const assetData = await getAssetData(assetOptions);+ });return JSON.stringify(assetData);};diff --git a/packages/asset-uploader/src/schema.ts b/packages/asset-uploader/src/schema.tsindex fee4adf30a..de660a1eaa 100644--- a/packages/asset-uploader/src/schema.ts+++ b/packages/asset-uploader/src/schema.ts@@ -49,8 +49,6 @@ export type ImageAsset = z.infer<typeof ImageAsset>;export const Asset = z.union([FontAsset, ImageAsset]);export type Asset = z.infer<typeof Asset>;-export const idsFormDataFieldName = "ids";-// undefined is necessary to represent uploading state// to be able to upload data while preserving orderexport const Assets = z.map(AssetId, z.union([z.undefined(), Asset]));diff --git a/packages/asset-uploader/src/utils/get-asset-data.ts b/packages/asset-uploader/src/utils/get-asset-data.tsindex df19e1c0f9..e88d0782bb 100644--- a/packages/asset-uploader/src/utils/get-asset-data.ts+++ b/packages/asset-uploader/src/utils/get-asset-data.ts@@ -4,31 +4,16 @@ import { FontMeta } from "@webstudio-is/fonts";import { getFontData } from "@webstudio-is/fonts/index.server";import { Location, ImageMeta } from "../schema";-const BaseData = z.object({- id: z.string(),- name: z.string(),+export const AssetData = z.object({size: z.number(),location: Location,format: z.string(),+ meta: z.union([ImageMeta, FontMeta]),});-const ImageData = BaseData.extend({- type: z.literal("image"),- meta: ImageMeta,-});--const FontData = BaseData.extend({- type: z.literal("font"),- meta: FontMeta,-});--export const AssetData = z.union([ImageData, FontData]);-export type AssetData = z.infer<typeof AssetData>;type BaseAssetOptions = {- id: string;- name: string;size: number;data: Uint8Array;location: Location;@@ -43,11 +28,6 @@ type AssetOptions =export const getAssetData = async (options: AssetOptions): Promise<AssetData> => {- const baseData = {- name: options.name,- size: options.size,- location: options.location,- };if (options.type === "image") {const sharpImage = sharp(options.data);const { width, height, format } = await sharpImage.metadata();@@ -59,9 +39,8 @@ export const getAssetData = async (}return {- ...baseData,- id: options.id,- type: options.type,+ size: options.size,+ location: options.location,format,meta: { width, height },};@@ -70,9 +49,8 @@ export const getAssetData = async (const { format, ...meta } = getFontData(options.data);return {- id: options.id,- type: options.type,- ...baseData,+ size: options.size,+ location: options.location,format,meta,};