@webstudio-is/react-sdk 0.112.0 → 0.113.0

package/lib/index.js

@@ -777,27 +777,15 @@ var EmbedTemplateText = z2.object({
   type: z2.literal("text"),
   value: z2.string()
 });
-var EmbedTemplateDataSource = z2.union([
-  z2.object({
-    type: z2.literal("variable"),
-    initialValue: z2.union([
-      z2.string(),
-      z2.number(),
-      z2.boolean(),
-      z2.array(z2.string())
-    ])
-  }),
-  z2.object({
-    type: z2.literal("expression"),
-    code: z2.string()
-  })
-]);
+var EmbedTemplateVariable = z2.object({
+  initialValue: z2.union([
+    z2.string(),
+    z2.number(),
+    z2.boolean(),
+    z2.array(z2.string())
+  ])
+});
 var EmbedTemplateProp = z2.union([
-  z2.object({
-    type: z2.literal("dataSource"),
-    name: z2.string(),
-    dataSourceName: z2.string()
-  }),
   z2.object({
     type: z2.literal("number"),
     name: z2.string(),
@@ -818,6 +806,11 @@ var EmbedTemplateProp = z2.union([
     name: z2.string(),
     value: z2.array(z2.string())
   }),
+  z2.object({
+    type: z2.literal("expression"),
+    name: z2.string(),
+    code: z2.string()
+  }),
   z2.object({
     type: z2.literal("action"),
     name: z2.string(),
@@ -842,7 +835,7 @@ var EmbedTemplateInstance = z2.lazy(
     type: z2.literal("instance"),
     component: z2.string(),
     label: z2.optional(z2.string()),
-    dataSources: z2.optional(z2.record(z2.string(), EmbedTemplateDataSource)),
+    variables: z2.optional(z2.record(z2.string(), EmbedTemplateVariable)),
     props: z2.optional(z2.array(EmbedTemplateProp)),
     tokens: z2.optional(z2.array(z2.string())),
     styles: z2.optional(z2.array(EmbedTemplateStyleDecl)),
@@ -852,7 +845,7 @@ var EmbedTemplateInstance = z2.lazy(
 var WsEmbedTemplate = z2.lazy(
   () => z2.array(z2.union([EmbedTemplateInstance, EmbedTemplateText]))
 );
-var getDataSourceValue = (value) => {
+var getVariablValue = (value) => {
   if (typeof value === "string") {
     return { type: "string", value };
   }
@@ -873,40 +866,47 @@ var createInstancesFromTemplate = (treeTemplate, instances, props, dataSourceByR
   for (const item of treeTemplate) {
     if (item.type === "instance") {
       const instanceId = generateId();
-      if (item.dataSources) {
-        for (const [name, dataSource] of Object.entries(item.dataSources)) {
+      if (item.variables) {
+        for (const [name, variable] of Object.entries(item.variables)) {
           if (dataSourceByRef.has(name)) {
             throw Error(`${name} data source already defined`);
           }
-          if (dataSource.type === "variable") {
-            dataSourceByRef.set(name, {
-              type: "variable",
-              id: generateId(),
-              scopeInstanceId: instanceId,
-              name,
-              value: getDataSourceValue(dataSource.initialValue)
-            });
-          }
-          if (dataSource.type === "expression") {
-            dataSourceByRef.set(name, {
+          dataSourceByRef.set(name, {
+            type: "variable",
+            id: generateId(),
+            scopeInstanceId: instanceId,
+            name,
+            value: getVariablValue(variable.initialValue)
+          });
+        }
+      }
+      if (item.props) {
+        for (const prop of item.props) {
+          const propId = generateId();
+          if (prop.type === "expression") {
+            const dataSource = {
               type: "expression",
               id: generateId(),
               scopeInstanceId: instanceId,
-              name,
+              name: "expression",
               // replace all references with variable names
-              code: validateExpression(dataSource.code, {
+              code: validateExpression(prop.code, {
                 transformIdentifier: (ref) => {
                   const id = dataSourceByRef.get(ref)?.id ?? ref;
                   return encodeDataSourceVariable(id);
                 }
               })
+            };
+            dataSourceByRef.set(propId, dataSource);
+            props.push({
+              id: propId,
+              instanceId,
+              type: "dataSource",
+              name: prop.name,
+              value: dataSource.id
             });
+            continue;
           }
-        }
-      }
-      if (item.props) {
-        for (const prop of item.props) {
-          const propId = generateId();
           if (prop.type === "action") {
             props.push({
               id: propId,
@@ -934,20 +934,6 @@ var createInstancesFromTemplate = (treeTemplate, instances, props, dataSourceByR
             });
             continue;
           }
-          if (prop.type === "dataSource") {
-            const dataSource = dataSourceByRef.get(prop.dataSourceName);
-            if (dataSource === void 0) {
-              throw Error(`${prop.dataSourceName} data source is not defined`);
-            }
-            props.push({
-              id: propId,
-              instanceId,
-              type: "dataSource",
-              name: prop.name,
-              value: dataSource.id
-            });
-            continue;
-          }
           props.push({ id: propId, instanceId, ...prop });
         }
       }

package/lib/types/embed-template.d.ts

@@ -14,39 +14,15 @@ declare const EmbedTemplateText: z.ZodObject<{
     type: "text";
 }>;
 type EmbedTemplateText = z.infer<typeof EmbedTemplateText>;
-declare const EmbedTemplateDataSource: z.ZodUnion<[z.ZodObject<{
-    type: z.ZodLiteral<"variable">;
+declare const EmbedTemplateVariable: z.ZodObject<{
     initialValue: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodArray<z.ZodString, "many">]>;
 }, "strip", z.ZodTypeAny, {
-    type: "variable";
     initialValue: (string | number | boolean | string[]) & (string | number | boolean | string[] | undefined);
 }, {
-    type: "variable";
     initialValue: (string | number | boolean | string[]) & (string | number | boolean | string[] | undefined);
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"expression">;
-    code: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    code: string;
-    type: "expression";
-}, {
-    code: string;
-    type: "expression";
-}>]>;
-type EmbedTemplateDataSource = z.infer<typeof EmbedTemplateDataSource>;
+}>;
+type EmbedTemplateVariable = z.infer<typeof EmbedTemplateVariable>;
 export declare const EmbedTemplateProp: z.ZodUnion<[z.ZodObject<{
-    type: z.ZodLiteral<"dataSource">;
-    name: z.ZodString;
-    dataSourceName: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    type: "dataSource";
-    name: string;
-    dataSourceName: string;
-}, {
-    type: "dataSource";
-    name: string;
-    dataSourceName: string;
-}>, z.ZodObject<{
     type: z.ZodLiteral<"number">;
     name: z.ZodString;
     value: z.ZodNumber;
@@ -94,6 +70,18 @@ export declare const EmbedTemplateProp: z.ZodUnion<[z.ZodObject<{
     value: string[];
     type: "string[]";
     name: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"expression">;
+    name: z.ZodString;
+    code: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    code: string;
+    type: "expression";
+    name: string;
+}, {
+    code: string;
+    type: "expression";
+    name: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"action">;
     name: z.ZodString;
@@ -2175,7 +2163,7 @@ export type EmbedTemplateInstance = {
     type: "instance";
     component: string;
     label?: string;
-    dataSources?: Record<string, EmbedTemplateDataSource>;
+    variables?: Record<string, EmbedTemplateVariable>;
     props?: EmbedTemplateProp[];
     tokens?: string[];
     styles?: EmbedTemplateStyleDecl[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/react-sdk",
-  "version": "0.112.0",
+  "version": "0.113.0",
   "description": "Webstudio JavaScript / TypeScript API",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -32,10 +32,10 @@
     "jsep": "^1.3.8",
     "nanoid": "^5.0.1",
     "title-case": "^4.1.0",
-    "@webstudio-is/css-engine": "0.112.0",
-    "@webstudio-is/fonts": "0.112.0",
-    "@webstudio-is/image": "0.112.0",
-    "@webstudio-is/sdk": "0.112.0"
+    "@webstudio-is/css-engine": "0.113.0",
+    "@webstudio-is/fonts": "0.113.0",
+    "@webstudio-is/image": "0.113.0",
+    "@webstudio-is/sdk": "0.113.0"
   },
   "exports": {
     ".": {