@webstudio-is/sdk 0.0.0-4f7bf18 → 0.0.0-5844e28

package/lib/index.js

@@ -88,7 +88,10 @@ var HomePage = z2.object({
   ...commonPageFields,
   path: HomePagePath
 });
-var PagePath = z2.string().refine((path) => path !== "", "Can't be empty").refine((path) => path !== "/", "Can't be just a /").refine((path) => path === "" || path.startsWith("/"), "Must start with a /").refine((path) => path.endsWith("/") === false, "Can't end with a /").refine((path) => path.includes("//") === false, "Can't contain repeating /").refine(
+var PagePath = z2.string().refine((path) => path !== "", "Can't be empty").refine((path) => path !== "/", "Can't be just a /").refine(
+  (path) => path === "" || path.startsWith("/"),
+  "Must start with a / or a full URL e.g. https://website.org"
+).refine((path) => path.endsWith("/") === false, "Can't end with a /").refine((path) => path.includes("//") === false, "Can't contain repeating /").refine(
   (path) => /^[-_a-z0-9*:?\\/.]*$/.test(path),
   "Only a-z, 0-9, -, _, /, :, ?, . and * are allowed"
 ).refine(
@@ -428,9 +431,10 @@ 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",
+  "vercel-legacy",
+  "netlify",
   "ssg",
   "ssg-netlify",
   "ssg-vercel"
@@ -966,7 +970,10 @@ var parseComponentName = (componentName) => {
 };
 
 // src/expression.ts
-import { parseExpressionAt } from "acorn";
+import {
+  parse,
+  parseExpressionAt
+} from "acorn";
 import { simple } from "acorn-walk";
 var lintExpression = ({
   expression,
@@ -974,13 +981,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
       });
     };
@@ -995,7 +1002,7 @@ var lintExpression = ({
     return diagnostics;
   }
   try {
-    const root = parseExpressionAt(`(${expression})`, 0, {
+    const root = parse(`(${expression})`, {
       ecmaVersion: "latest",
       // support parsing import to forbid explicitly
       sourceType: "module"
@@ -1003,7 +1010,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() {
@@ -1030,13 +1040,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);
             }
           }
         });
@@ -1044,18 +1057,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;
@@ -1240,6 +1253,7 @@ var generateExpression = ({
         usedDataSources?.set(dep.id, dep);
         return scope.getName(dep.id, dep.name);
       }
+      return "undefined";
     }
   });
 };
@@ -1736,10 +1750,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/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", "vercel-legacy", "netlify", "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", "vercel-legacy", "netlify", "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" | "vercel-legacy" | "netlify" | "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" | "vercel-legacy" | "netlify" | "ssg" | "ssg-netlify" | "ssg-vercel")[];
 }>, z.ZodObject<{
     destination: z.ZodOptional<z.ZodLiteral<"saas">>;
     domains: z.ZodArray<z.ZodString, "many">;

package/package.json

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