@webstudio-is/sdk 0.229.0 → 0.231.0

package/lib/index.js

@@ -1905,6 +1905,19 @@ var systemParameter = {
   type: "parameter",
   name: "system"
 };
+var allowedStringMethods = /* @__PURE__ */ new Set([
+  "toLowerCase",
+  "replace",
+  "split",
+  "at",
+  "endsWith",
+  "includes",
+  "startsWith",
+  "toUpperCase",
+  "toLocaleLowerCase",
+  "toLocaleUpperCase"
+]);
+var allowedArrayMethods = /* @__PURE__ */ new Set(["at", "includes", "join", "slice"]);
 var lintExpression = ({
   expression,
   availableVariables = /* @__PURE__ */ new Set(),
@@ -1990,7 +2003,25 @@ var lintExpression = ({
       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"),
+      CallExpression(node) {
+        let calleeName;
+        if (node.callee.type === "MemberExpression") {
+          if (node.callee.property.type === "Identifier") {
+            const methodName = node.callee.property.name;
+            if (allowedStringMethods.has(methodName) || allowedArrayMethods.has(methodName)) {
+              return;
+            }
+            calleeName = methodName;
+          }
+        } else if (node.callee.type === "Identifier") {
+          calleeName = node.callee.name;
+        }
+        if (calleeName) {
+          addMessage(`"${calleeName}" function is not supported`)(node);
+        } else {
+          addMessage("Functions are not supported")(node);
+        }
+      },
       NewExpression: addMessage("Classes are not supported"),
       SequenceExpression: addMessage(`Only single expression is supported`),
       ArrowFunctionExpression: addMessage("Functions are not supported"),
@@ -2104,6 +2135,17 @@ var transpileExpression = ({
         const dotIndex = expression.indexOf("[", node.object.end);
         replacements.push([dotIndex, dotIndex, "?."]);
       }
+    },
+    CallExpression(node) {
+      if (executable === false || node.optional) {
+        return;
+      }
+      if (node.callee.type === "MemberExpression") {
+        const openParenIndex = expression.indexOf("(", node.callee.end);
+        if (openParenIndex !== -1) {
+          replacements.push([openParenIndex, openParenIndex, "?."]);
+        }
+      }
     }
   });
   replacements.sort(([leftStart], [rightStart]) => rightStart - leftStart);
@@ -2895,6 +2937,8 @@ export {
   WebstudioFragment,
   WsComponentMeta,
   addFontRules,
+  allowedArrayMethods,
+  allowedStringMethods,
   animationActionSchema,
   animationKeyframeSchema,
   blockComponent,

package/lib/runtime.js

@@ -41,11 +41,16 @@ var sitemapResourceUrl = `/${LOCAL_RESOURCE_PREFIX}/sitemap.xml`;
 var loadResource = async (customFetch, resourceRequest) => {
   try {
     const { method, searchParams, headers, body } = resourceRequest;
-    const url = new URL(resourceRequest.url.trim());
-    if (searchParams) {
-      for (const { name, value } of searchParams) {
-        url.searchParams.append(name, serializeValue(value));
+    let href = resourceRequest.url;
+    try {
+      const url = new URL(resourceRequest.url.trim());
+      if (searchParams) {
+        for (const { name, value } of searchParams) {
+          url.searchParams.append(name, serializeValue(value));
+        }
       }
+      href = url.href;
+    } catch {
     }
     const requestHeaders = new Headers(
       headers.map(({ name, value }) => [
@@ -60,7 +65,7 @@ var loadResource = async (customFetch, resourceRequest) => {
     if (method !== "get" && body !== void 0) {
       requestInit.body = serializeValue(body);
     }
-    const response = await customFetch(url.href, requestInit);
+    const response = await customFetch(href, requestInit);
     let data = await response.text();
     try {
       data = JSON.parse(data);
@@ -68,7 +73,7 @@ var loadResource = async (customFetch, resourceRequest) => {
     }
     if (!response.ok) {
       console.error(
-        `Failed to load resource: ${url} - ${response.status}: ${JSON.stringify(data).slice(0, 300)}`
+        `Failed to load resource: ${href} - ${response.status}: ${JSON.stringify(data).slice(0, 300)}`
       );
     }
     return {

package/lib/types/expression.d.ts

@@ -9,6 +9,8 @@ export type Diagnostic = {
     severity: "error" | "hint" | "info" | "warning";
     message: string;
 };
+export declare const allowedStringMethods: Set<string>;
+export declare const allowedArrayMethods: Set<string>;
 export declare const lintExpression: ({ expression, availableVariables, allowAssignment, }: {
     expression: string;
     availableVariables?: Set<Identifier["name"]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/sdk",
-  "version": "0.229.0",
+  "version": "0.231.0",
   "description": "Webstudio project data schema",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -41,15 +41,15 @@
     "reserved-identifiers": "^1.0.0",
     "type-fest": "^4.37.0",
     "zod": "^3.24.2",
-    "@webstudio-is/css-engine": "0.229.0",
-    "@webstudio-is/fonts": "0.229.0",
-    "@webstudio-is/icons": "0.229.0"
+    "@webstudio-is/css-engine": "0.231.0",
+    "@webstudio-is/fonts": "0.231.0",
+    "@webstudio-is/icons": "0.231.0"
   },
   "devDependencies": {
     "html-tags": "^4.0.0",
     "vitest": "^3.1.2",
-    "@webstudio-is/template": "0.229.0",
     "@webstudio-is/css-data": "0.0.0",
+    "@webstudio-is/template": "0.231.0",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {