@webstudio-is/sdk 0.200.0 → 0.202.0

package/lib/core-templates.js

@@ -52,8 +52,7 @@ var collectionComponent = "ws:collection";
 var collectionMeta = {
   type: "container",
   label: "Collection",
-  icon: ListViewIcon,
-  stylable: false
+  icon: ListViewIcon
 };
 var collectionPropsMeta = {
   props: {
@@ -70,6 +69,8 @@ var descendantMeta = {
   type: "control",
   label: "Descendant",
   icon: PaintBrushIcon,
+  // @todo infer possible presets
+  presetStyle: {},
   constraints: {
     relation: "parent",
     component: { $in: ["HtmlEmbed", "MarkdownEmbed"] }
@@ -108,7 +109,6 @@ var blockTemplateComponent = "ws:block-template";
 var blockTemplateMeta = {
   type: "container",
   icon: AddTemplateInstanceIcon,
-  stylable: false,
   constraints: {
     relation: "parent",
     component: { $eq: blockComponent }
@@ -130,8 +130,7 @@ var blockMeta = {
       relation: "child",
       component: { $eq: blockTemplateComponent }
     }
-  ],
-  stylable: false
+  ]
 };
 var blockPropsMeta = {
   props: {}

package/lib/index.js

@@ -218,20 +218,20 @@ var DataSource = z4.union([
   z4.object({
     type: z4.literal("variable"),
     id: DataSourceId,
-    scopeInstanceId: z4.optional(z4.string()),
+    scopeInstanceId: z4.string(),
     name: z4.string(),
     value: DataSourceVariableValue
   }),
   z4.object({
     type: z4.literal("parameter"),
     id: DataSourceId,
-    scopeInstanceId: z4.optional(z4.string()),
+    scopeInstanceId: z4.string(),
     name: z4.string()
   }),
   z4.object({
     type: z4.literal("resource"),
     id: DataSourceId,
-    scopeInstanceId: z4.optional(z4.string()),
+    scopeInstanceId: z4.string(),
     name: z4.string(),
     resourceId: z4.string()
   })
@@ -428,6 +428,7 @@ var Styles = z10.map(z10.string(), StyleDecl);
 import { z as z11 } from "zod";
 var Templates = z11.enum([
   "vanilla",
+  "docker",
   "vercel",
   "netlify-functions",
   "netlify-edge-functions",
@@ -763,7 +764,6 @@ var WsComponentMeta = z15.object({
   // important to automatically enumerate collections without
   // naming every item manually
   indexWithinAncestor: z15.optional(z15.string()),
-  stylable: z15.optional(z15.boolean()),
   label: z15.optional(z15.string()),
   description: z15.string().optional(),
   icon: z15.string(),
@@ -821,8 +821,7 @@ var collectionComponent = "ws:collection";
 var collectionMeta = {
   type: "container",
   label: "Collection",
-  icon: ListViewIcon,
-  stylable: false
+  icon: ListViewIcon
 };
 var collectionPropsMeta = {
   props: {
@@ -839,6 +838,8 @@ var descendantMeta = {
   type: "control",
   label: "Descendant",
   icon: PaintBrushIcon,
+  // @todo infer possible presets
+  presetStyle: {},
   constraints: {
     relation: "parent",
     component: { $in: ["HtmlEmbed", "MarkdownEmbed"] }
@@ -877,7 +878,6 @@ var blockTemplateComponent = "ws:block-template";
 var blockTemplateMeta = {
   type: "container",
   icon: AddTemplateInstanceIcon,
-  stylable: false,
   constraints: {
     relation: "parent",
     component: { $eq: blockComponent }
@@ -899,8 +899,7 @@ var blockMeta = {
       relation: "child",
       component: { $eq: blockTemplateComponent }
     }
-  ],
-  stylable: false
+  ]
 };
 var blockPropsMeta = {
   props: {}
@@ -976,13 +975,13 @@ var lintExpression = ({
   allowAssignment = false
 }) => {
   const diagnostics = [];
-  const addError = (message) => {
+  const addMessage = (message, severity = "error") => {
     return (node) => {
       diagnostics.push({
         // tune error position after wrapping expression with parentheses
         from: node.start - 1,
         to: node.end - 1,
-        severity: "error",
+        severity,
         message
       });
     };
@@ -1005,7 +1004,10 @@ var lintExpression = ({
     simple(root, {
       Identifier(node) {
         if (availableVariables.has(node.name) === false) {
-          addError(`"${node.name}" is not defined in the scope`)(node);
+          addMessage(
+            `"${node.name}" is not defined in the scope`,
+            "warning"
+          )(node);
         }
       },
       Literal() {
@@ -1032,13 +1034,16 @@ var lintExpression = ({
       },
       AssignmentExpression(node) {
         if (allowAssignment === false) {
-          addError("Assignment is supported only inside actions")(node);
+          addMessage("Assignment is supported only inside actions")(node);
           return;
         }
         simple(node.left, {
           Identifier(node2) {
             if (availableVariables.has(node2.name) === false) {
-              addError(`"${node2.name}" is not defined in the scope`)(node2);
+              addMessage(
+                `"${node2.name}" is not defined in the scope`,
+                "warning"
+              )(node2);
             }
           }
         });
@@ -1046,18 +1051,18 @@ var lintExpression = ({
       // parser forbids to yield inside module
       YieldExpression() {
       },
-      ThisExpression: addError(`"this" keyword is not supported`),
-      FunctionExpression: addError("Functions are not supported"),
-      UpdateExpression: addError("Increment and decrement are not supported"),
-      CallExpression: addError("Functions are not supported"),
-      NewExpression: addError("Classes are not supported"),
-      SequenceExpression: addError(`Only single expression is supported`),
-      ArrowFunctionExpression: addError("Functions are not supported"),
-      TaggedTemplateExpression: addError("Tagged template is not supported"),
-      ClassExpression: addError("Classes are not supported"),
-      MetaProperty: addError("Imports are not supported"),
-      AwaitExpression: addError(`"await" keyword is not supported`),
-      ImportExpression: addError("Imports are not supported")
+      ThisExpression: addMessage(`"this" keyword is not supported`),
+      FunctionExpression: addMessage("Functions are not supported"),
+      UpdateExpression: addMessage("Increment and decrement are not supported"),
+      CallExpression: addMessage("Functions are not supported"),
+      NewExpression: addMessage("Classes are not supported"),
+      SequenceExpression: addMessage(`Only single expression is supported`),
+      ArrowFunctionExpression: addMessage("Functions are not supported"),
+      TaggedTemplateExpression: addMessage("Tagged template is not supported"),
+      ClassExpression: addMessage("Classes are not supported"),
+      MetaProperty: addMessage("Imports are not supported"),
+      AwaitExpression: addMessage(`"await" keyword is not supported`),
+      ImportExpression: addMessage("Imports are not supported")
     });
   } catch (error) {
     const castedError = error;
@@ -1242,6 +1247,7 @@ var generateExpression = ({
         usedDataSources?.set(dep.id, dep);
         return scope.getName(dep.id, dep.name);
       }
+      return "undefined";
     }
   });
 };
@@ -1738,10 +1744,12 @@ export {
   corePropsMetas,
   createScope,
   decodeDataSourceVariable,
+  decodeDataSourceVariable as decodeDataVariableId,
   defaultStates,
   descendantComponent,
   documentTypes,
   encodeDataSourceVariable,
+  encodeDataSourceVariable as encodeDataVariableId,
   executeExpression,
   findPageByIdOrPath,
   findParentFolderByChildId,

package/lib/types/expression.d.ts

@@ -43,11 +43,16 @@ export declare const parseObjectExpression: (expression: string) => Map<string,
  */
 export declare const generateObjectExpression: (map: Map<string, string>) => string;
 export declare const encodeDataSourceVariable: (id: string) => string;
+export { encodeDataSourceVariable as encodeDataVariableId };
 export declare const decodeDataSourceVariable: (name: string) => string | undefined;
+export { decodeDataSourceVariable as decodeDataVariableId };
 export declare const generateExpression: ({ expression, dataSources, usedDataSources, scope, }: {
     expression: string;
     dataSources: DataSources;
     usedDataSources: DataSources;
     scope: Scope;
 }) => string;
+/**
+ * edge case utility for "statoc" expression without variables
+ */
 export declare const executeExpression: (expression: undefined | string) => any;

package/lib/types/schema/component-meta.d.ts

@@ -869,7 +869,6 @@ export declare const WsComponentMeta: z.ZodObject<{
         } | undefined;
     }>, "many">]>>;
     indexWithinAncestor: z.ZodOptional<z.ZodString>;
-    stylable: z.ZodOptional<z.ZodBoolean>;
     label: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodString>;
     icon: z.ZodString;
@@ -1494,7 +1493,6 @@ export declare const WsComponentMeta: z.ZodObject<{
         } | undefined;
     }[] | undefined;
     indexWithinAncestor?: string | undefined;
-    stylable?: boolean | undefined;
     label?: string | undefined;
     description?: string | undefined;
     presetStyle?: Record<string, {
@@ -1821,7 +1819,6 @@ export declare const WsComponentMeta: z.ZodObject<{
         } | undefined;
     }[] | undefined;
     indexWithinAncestor?: string | undefined;
-    stylable?: boolean | undefined;
     label?: string | undefined;
     description?: string | undefined;
     presetStyle?: Record<string, {

package/lib/types/schema/data-sources.d.ts

@@ -48,7 +48,7 @@ export declare const DataSourceVariableValue: z.ZodUnion<[z.ZodObject<{
 export declare const DataSource: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"variable">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
     value: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"number">;
@@ -116,7 +116,7 @@ export declare const DataSource: z.ZodUnion<[z.ZodObject<{
     type: "variable";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }, {
     value: {
         value: number;
@@ -137,46 +137,46 @@ export declare const DataSource: z.ZodUnion<[z.ZodObject<{
     type: "variable";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"parameter">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     type: "parameter";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }, {
     type: "parameter";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"resource">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
     resourceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     type: "resource";
     name: string;
     id: string;
+    scopeInstanceId: string;
     resourceId: string;
-    scopeInstanceId?: string | undefined;
 }, {
     type: "resource";
     name: string;
     id: string;
+    scopeInstanceId: string;
     resourceId: string;
-    scopeInstanceId?: string | undefined;
 }>]>;
 export type DataSource = z.infer<typeof DataSource>;
 export declare const DataSources: z.ZodMap<z.ZodString, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"variable">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
     value: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"number">;
@@ -244,7 +244,7 @@ export declare const DataSources: z.ZodMap<z.ZodString, z.ZodUnion<[z.ZodObject<
     type: "variable";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }, {
     value: {
         value: number;
@@ -265,39 +265,39 @@ export declare const DataSources: z.ZodMap<z.ZodString, z.ZodUnion<[z.ZodObject<
     type: "variable";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"parameter">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     type: "parameter";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }, {
     type: "parameter";
     name: string;
     id: string;
-    scopeInstanceId?: string | undefined;
+    scopeInstanceId: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"resource">;
     id: z.ZodString;
-    scopeInstanceId: z.ZodOptional<z.ZodString>;
+    scopeInstanceId: z.ZodString;
     name: z.ZodString;
     resourceId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     type: "resource";
     name: string;
     id: string;
+    scopeInstanceId: string;
     resourceId: string;
-    scopeInstanceId?: string | undefined;
 }, {
     type: "resource";
     name: string;
     id: string;
+    scopeInstanceId: string;
     resourceId: string;
-    scopeInstanceId?: string | undefined;
 }>]>>;
 export type DataSources = z.infer<typeof DataSources>;

package/lib/types/schema/deployment.d.ts

@@ -1,21 +1,21 @@
 import { z } from "zod";
-export declare const Templates: z.ZodEnum<["vanilla", "vercel", "netlify-functions", "netlify-edge-functions", "ssg", "ssg-netlify", "ssg-vercel"]>;
+export declare const Templates: z.ZodEnum<["vanilla", "docker", "vercel", "netlify-functions", "netlify-edge-functions", "ssg", "ssg-netlify", "ssg-vercel"]>;
 export type Templates = z.infer<typeof Templates>;
 export declare const Deployment: z.ZodUnion<[z.ZodObject<{
     destination: z.ZodLiteral<"static">;
     name: z.ZodString;
     assetsDomain: z.ZodString;
-    templates: z.ZodArray<z.ZodEnum<["vanilla", "vercel", "netlify-functions", "netlify-edge-functions", "ssg", "ssg-netlify", "ssg-vercel"]>, "many">;
+    templates: z.ZodArray<z.ZodEnum<["vanilla", "docker", "vercel", "netlify-functions", "netlify-edge-functions", "ssg", "ssg-netlify", "ssg-vercel"]>, "many">;
 }, "strip", z.ZodTypeAny, {
     name: string;
     destination: "static";
     assetsDomain: string;
-    templates: ("vanilla" | "vercel" | "netlify-functions" | "netlify-edge-functions" | "ssg" | "ssg-netlify" | "ssg-vercel")[];
+    templates: ("vanilla" | "docker" | "vercel" | "netlify-functions" | "netlify-edge-functions" | "ssg" | "ssg-netlify" | "ssg-vercel")[];
 }, {
     name: string;
     destination: "static";
     assetsDomain: string;
-    templates: ("vanilla" | "vercel" | "netlify-functions" | "netlify-edge-functions" | "ssg" | "ssg-netlify" | "ssg-vercel")[];
+    templates: ("vanilla" | "docker" | "vercel" | "netlify-functions" | "netlify-edge-functions" | "ssg" | "ssg-netlify" | "ssg-vercel")[];
 }>, z.ZodObject<{
     destination: z.ZodOptional<z.ZodLiteral<"saas">>;
     domains: z.ZodArray<z.ZodString, "many">;

package/lib/types/schema/webstudio.d.ts

@@ -287,7 +287,7 @@ export declare const WebstudioFragment: z.ZodObject<{
     dataSources: z.ZodArray<z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"variable">;
         id: z.ZodString;
-        scopeInstanceId: z.ZodOptional<z.ZodString>;
+        scopeInstanceId: z.ZodString;
         name: z.ZodString;
         value: z.ZodUnion<[z.ZodObject<{
             type: z.ZodLiteral<"number">;
@@ -355,7 +355,7 @@ export declare const WebstudioFragment: z.ZodObject<{
         type: "variable";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     }, {
         value: {
             value: number;
@@ -376,40 +376,40 @@ export declare const WebstudioFragment: z.ZodObject<{
         type: "variable";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"parameter">;
         id: z.ZodString;
-        scopeInstanceId: z.ZodOptional<z.ZodString>;
+        scopeInstanceId: z.ZodString;
         name: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         type: "parameter";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     }, {
         type: "parameter";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"resource">;
         id: z.ZodString;
-        scopeInstanceId: z.ZodOptional<z.ZodString>;
+        scopeInstanceId: z.ZodString;
         name: z.ZodString;
         resourceId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         type: "resource";
         name: string;
         id: string;
+        scopeInstanceId: string;
         resourceId: string;
-        scopeInstanceId?: string | undefined;
     }, {
         type: "resource";
         name: string;
         id: string;
+        scopeInstanceId: string;
         resourceId: string;
-        scopeInstanceId?: string | undefined;
     }>]>, "many">;
     resources: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
@@ -1803,18 +1803,18 @@ export declare const WebstudioFragment: z.ZodObject<{
         type: "variable";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     } | {
         type: "parameter";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     } | {
         type: "resource";
         name: string;
         id: string;
+        scopeInstanceId: string;
         resourceId: string;
-        scopeInstanceId?: string | undefined;
     })[];
     resources: {
         name: string;
@@ -2310,18 +2310,18 @@ export declare const WebstudioFragment: z.ZodObject<{
         type: "variable";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     } | {
         type: "parameter";
         name: string;
         id: string;
-        scopeInstanceId?: string | undefined;
+        scopeInstanceId: string;
     } | {
         type: "resource";
         name: string;
         id: string;
+        scopeInstanceId: string;
         resourceId: string;
-        scopeInstanceId?: string | undefined;
     })[];
     resources: {
         name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/sdk",
-  "version": "0.200.0",
+  "version": "0.202.0",
   "description": "Webstudio project data schema",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -39,16 +39,16 @@
     "reserved-identifiers": "^1.0.0",
     "type-fest": "^4.32.0",
     "zod": "^3.22.4",
-    "@webstudio-is/css-engine": "0.200.0",
-    "@webstudio-is/icons": "0.200.0",
-    "@webstudio-is/fonts": "0.200.0"
+    "@webstudio-is/css-engine": "0.202.0",
+    "@webstudio-is/icons": "0.202.0",
+    "@webstudio-is/fonts": "0.202.0"
   },
   "devDependencies": {
     "html-tags": "^4.0.0",
     "vitest": "^3.0.2",
-    "@webstudio-is/template": "0.200.0",
     "@webstudio-is/css-data": "0.0.0",
-    "@webstudio-is/tsconfig": "1.0.7"
+    "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/template": "0.202.0"
   },
   "scripts": {
     "typecheck": "tsc",