@webstudio-is/css-data 0.53.0 → 0.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/css-data",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "description": "CSS Data",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -13,9 +13,8 @@
     "tsx": "^3.12.6",
     "typescript": "5.0.3",
     "zod": "^3.19.1",
-    "@webstudio-is/asset-uploader": "^0.53.0",
-    "@webstudio-is/tsconfig": "^1.0.1",
-    "@webstudio-is/scripts": "^0.0.0"
+    "@webstudio-is/scripts": "^0.0.0",
+    "@webstudio-is/tsconfig": "^1.0.3"
   },
   "peerDependencies": {
     "zod": "^3.19.1"

package/src/schema.ts

@@ -1,7 +1,6 @@
 import { units } from "./__generated__/units";
 import type { properties } from "./__generated__/properties";
 import { z } from "zod";
-import { ImageAsset } from "@webstudio-is/asset-uploader";
 
 type Properties = typeof properties & {
   [custom: CustomProperty]: {
@@ -74,7 +73,12 @@ export type RgbValue = z.infer<typeof RgbValue>;
 
 export const ImageValue = z.object({
   type: z.literal("image"),
-  value: z.object({ type: z.literal("asset"), value: ImageAsset }),
+  value: z.union([
+    z.object({ type: z.literal("asset"), value: z.string() }),
+    // url is not stored in db and only used by css-engine transformValue
+    // to prepare image value for rendering
+    z.object({ type: z.literal("url"), url: z.string() }),
+  ]),
   // For the builder we want to be able to hide images
   hidden: z.boolean().optional(),
 });
@@ -140,11 +144,9 @@ export const validStaticValueTypes = [
   "tuple",
 ] as const;
 
-/**
- * Shared zod types with DB types.
- * ImageValue in DB has a different type
- */
-const SharedStaticStyleValue = z.union([
+const ValidStaticStyleValue = z.union([
+  ImageValue,
+  LayersValue,
   UnitValue,
   KeywordValue,
   FontFamilyValue,
@@ -153,12 +155,6 @@ const SharedStaticStyleValue = z.union([
   TupleValue,
 ]);
 
-const ValidStaticStyleValue = z.union([
-  ImageValue,
-  LayersValue,
-  SharedStaticStyleValue,
-]);
-
 export type ValidStaticStyleValue = z.infer<typeof ValidStaticStyleValue>;
 
 const VarValue = z.object({
@@ -168,23 +164,13 @@ const VarValue = z.object({
 });
 export type VarValue = z.infer<typeof VarValue>;
 
-const StyleValue = z.union([
+export const StyleValue = z.union([
   ValidStaticStyleValue,
   InvalidValue,
   UnsetValue,
   VarValue,
 ]);
 
-/**
- * Shared types with DB types
- */
-export const SharedStyleValue = z.union([
-  SharedStaticStyleValue,
-  InvalidValue,
-  UnsetValue,
-  VarValue,
-]);
-
 export type StyleValue = z.infer<typeof StyleValue>;
 
 const Style = z.record(z.string(), StyleValue);