@webstudio-is/sdk 0.182.0 → 0.185.0

package/lib/__generated__/normalize.css.js

@@ -43,28 +43,16 @@ var ol = div;
 var p = div;
 var span = div;
 var html = [
+  { property: "display", value: { type: "keyword", value: "grid" } },
+  { property: "minHeight", value: { type: "unit", unit: "%", value: 100 } },
   {
-    property: "lineHeight",
-    value: { type: "unit", unit: "number", value: 1.15 }
-  },
-  {
-    property: "textSizeAdjust",
-    value: { type: "unit", unit: "%", value: 100 }
-  },
-  { property: "tabSize", value: { type: "unit", unit: "number", value: 4 } },
-  { property: "boxSizing", value: { type: "keyword", value: "border-box" } },
-  { property: "borderTopWidth", value: { type: "unit", unit: "px", value: 1 } },
-  {
-    property: "borderRightWidth",
-    value: { type: "unit", unit: "px", value: 1 }
-  },
-  {
-    property: "borderBottomWidth",
-    value: { type: "unit", unit: "px", value: 1 }
+    property: "fontFamily",
+    value: { type: "fontFamily", value: ["Arial", "Roboto", "sans-serif"] }
   },
+  { property: "fontSize", value: { type: "unit", unit: "px", value: 16 } },
   {
-    property: "borderLeftWidth",
-    value: { type: "unit", unit: "px", value: 1 }
+    property: "lineHeight",
+    value: { type: "unit", unit: "number", value: 1.2 }
   }
 ];
 var body = [
@@ -78,15 +66,6 @@ var body = [
     value: { type: "unit", unit: "number", value: 0 }
   },
   { property: "marginLeft", value: { type: "unit", unit: "number", value: 0 } },
-  {
-    property: "fontFamily",
-    value: { type: "fontFamily", value: ["Arial", "Roboto", "sans-serif"] }
-  },
-  { property: "fontSize", value: { type: "unit", unit: "px", value: 16 } },
-  {
-    property: "lineHeight",
-    value: { type: "unit", unit: "number", value: 1.2 }
-  },
   { property: "boxSizing", value: { type: "keyword", value: "border-box" } },
   { property: "borderTopWidth", value: { type: "unit", unit: "px", value: 1 } },
   {

package/lib/index.js

@@ -461,6 +461,7 @@ var WebstudioFragment = z12.object({
 });
 
 // src/instances-utils.ts
+var ROOT_INSTANCE_ID = ":root";
 var traverseInstances = (instances, instanceId, callback) => {
   const instance = instances.get(instanceId);
   if (instance === void 0) {
@@ -477,14 +478,14 @@ var traverseInstances = (instances, instanceId, callback) => {
   }
 };
 var findTreeInstanceIds = (instances, rootInstanceId) => {
-  const ids = /* @__PURE__ */ new Set();
+  const ids = /* @__PURE__ */ new Set([rootInstanceId]);
   traverseInstances(instances, rootInstanceId, (instance) => {
     ids.add(instance.id);
   });
   return ids;
 };
 var findTreeInstanceIdsExcludingSlotDescendants = (instances, rootInstanceId) => {
-  const ids = /* @__PURE__ */ new Set();
+  const ids = /* @__PURE__ */ new Set([rootInstanceId]);
   traverseInstances(instances, rootInstanceId, (instance) => {
     ids.add(instance.id);
     if (instance.component === "Slot") {
@@ -543,7 +544,7 @@ var lintExpression = ({
     simple(root, {
       Identifier(node) {
         if (availableVariables.has(node.name) === false) {
-          addError(`"${node.name}" is not available in the scope`)(node);
+          addError(`"${node.name}" is not defined in the scope`)(node);
         }
       },
       Literal() {
@@ -576,7 +577,7 @@ var lintExpression = ({
         simple(node.left, {
           Identifier(node2) {
             if (availableVariables.has(node2.name) === false) {
-              addError(`"${node2.name}" is not available in the scope`)(node2);
+              addError(`"${node2.name}" is not defined in the scope`)(node2);
             }
           }
         });
@@ -645,20 +646,20 @@ var isLiteralExpression = (expression) => {
   }
 };
 var getExpressionIdentifiers = (expression) => {
-  const identifiers = /* @__PURE__ */ new Set();
+  const identifiers2 = /* @__PURE__ */ new Set();
   try {
     const root = parseExpressionAt(expression, 0, { ecmaVersion: "latest" });
     simple(root, {
-      Identifier: (node) => identifiers.add(node.name),
+      Identifier: (node) => identifiers2.add(node.name),
       AssignmentExpression(node) {
         simple(node.left, {
-          Identifier: (node2) => identifiers.add(node2.name)
+          Identifier: (node2) => identifiers2.add(node2.name)
         });
       }
     });
   } catch {
   }
-  return identifiers;
+  return identifiers2;
 };
 var transpileExpression = ({
   expression,
@@ -857,6 +858,9 @@ var getStaticSiteMapXml = (pages, updatedAt) => {
 };
 
 // src/scope.ts
+import reservedIdentifiers from "reserved-identifiers";
+var identifiers = reservedIdentifiers({ includeGlobalProperties: true });
+var isReserved = (identifier) => identifiers.has(identifier);
 var normalizeJsName = (name) => {
   name = name.replaceAll(/[^\w$]/g, "");
   if (name.length === 0) {
@@ -865,6 +869,9 @@ var normalizeJsName = (name) => {
   if (/[A-Za-z_$]/.test(name[0]) === false) {
     name = `_${name}`;
   }
+  if (isReserved(name)) {
+    return `${name}_`;
+  }
   return name;
 };
 var createScope = (occupiedIdentifiers = [], normalizeName = normalizeJsName, separator = "_") => {
@@ -914,12 +921,15 @@ var loadResource = async (customFetch, resourceRequest) => {
   }
   try {
     const response = await customFetch(url.trim(), requestInit);
-    let data;
-    if (response.ok && // accept json by default and when specified explicitly
-    (response.headers.has("content-type") === false || response.headers.get("content-type")?.includes("application/json"))) {
-      data = await response.json();
-    } else {
-      data = await response.text();
+    let data = await response.text();
+    try {
+      data = JSON.parse(data);
+    } catch {
+    }
+    if (!response.ok) {
+      console.error(
+        `Failed to load resource: ${url} - ${response.status}: ${JSON.stringify(data).slice(0, 300)}`
+      );
     }
     return {
       ok: response.ok,
@@ -928,6 +938,7 @@ var loadResource = async (customFetch, resourceRequest) => {
       statusText: response.statusText
     };
   } catch (error) {
+    console.error(error);
     const message = error.message;
     return {
       ok: false,
@@ -1315,6 +1326,7 @@ export {
   Prop,
   Props,
   ROOT_FOLDER_ID,
+  ROOT_INSTANCE_ID,
   Resource,
   ResourceRequest,
   Resources,

package/lib/types/instances-utils.d.ts

@@ -1,4 +1,5 @@
 import type { Instance, Instances } from "./schema/instances";
+export declare const ROOT_INSTANCE_ID = ":root";
 export declare const findTreeInstanceIds: (instances: Instances, rootInstanceId: Instance["id"]) => Set<string>;
 export declare const findTreeInstanceIdsExcludingSlotDescendants: (instances: Instances, rootInstanceId: Instance["id"]) => Set<string>;
 export declare const parseComponentName: (componentName: string) => readonly [string | undefined, string];

package/lib/types/resource-loader.d.ts

@@ -1,14 +1,24 @@
 import type { ResourceRequest } from "./schema/resources";
 export declare const loadResource: (customFetch: typeof fetch, resourceRequest: ResourceRequest) => Promise<{
     ok: boolean;
-    data: any;
+    data: string;
+    status: number;
+    statusText: string;
+} | {
+    ok: boolean;
+    data: undefined;
     status: number;
     statusText: string;
 }>;
 export declare const loadResources: (customFetch: typeof fetch, requests: Map<string, ResourceRequest>) => Promise<{
     [k: string]: {
         ok: boolean;
-        data: any;
+        data: string;
+        status: number;
+        statusText: string;
+    } | {
+        ok: boolean;
+        data: undefined;
         status: number;
         statusText: string;
     };

package/lib/types/resource-loader.test.d.ts

@@ -0,0 +1 @@
+export {};