@webstudio-is/http-client 0.22.0 → 0.24.0

package/lib/cjs/index.cjs

@@ -32,22 +32,15 @@ const loadProject = async ({
   apiUrl,
   projectId
 }) => {
-  try {
-    if (apiUrl === void 0) {
-      throw new Error("Webstudio API URL is required.");
-    }
-    const baseUrl = new URL(apiUrl);
-    const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
-    const projectResponse = await (0, import_isomorphic_fetch.default)(projectUrl);
-    const project = await projectResponse.json();
-    if (!projectResponse.ok) {
-      throw new Error(project);
-    }
-    return project;
-  } catch (error) {
-    if (error instanceof Error) {
-      return error.message;
-    }
-    throw error;
+  if (apiUrl === void 0) {
+    throw new Error("Webstudio API URL is required.");
   }
+  const baseUrl = new URL(apiUrl);
+  const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
+  const projectResponse = await (0, import_isomorphic_fetch.default)(projectUrl);
+  if (projectResponse.ok) {
+    return await projectResponse.json();
+  }
+  const message = await projectResponse.text();
+  throw new Error(message.slice(0, 1e3));
 };

package/lib/index.js

@@ -3,24 +3,17 @@ const loadProject = async ({
   apiUrl,
   projectId
 }) => {
-  try {
-    if (apiUrl === void 0) {
-      throw new Error("Webstudio API URL is required.");
-    }
-    const baseUrl = new URL(apiUrl);
-    const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
-    const projectResponse = await fetch(projectUrl);
-    const project = await projectResponse.json();
-    if (!projectResponse.ok) {
-      throw new Error(project);
-    }
-    return project;
-  } catch (error) {
-    if (error instanceof Error) {
-      return error.message;
-    }
-    throw error;
+  if (apiUrl === void 0) {
+    throw new Error("Webstudio API URL is required.");
   }
+  const baseUrl = new URL(apiUrl);
+  const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
+  const projectResponse = await fetch(projectUrl);
+  if (projectResponse.ok) {
+    return await projectResponse.json();
+  }
+  const message = await projectResponse.text();
+  throw new Error(message.slice(0, 1e3));
 };
 export {
   loadProject

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/http-client",
-  "version": "0.22.0",
+  "version": "0.24.0",
   "description": "Webstudio HTTP Client",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -11,8 +11,8 @@
     "jest": "^29.3.1",
     "typescript": "4.7.4",
     "@webstudio-is/jest-config": "^1.0.2",
-    "@webstudio-is/prisma-client": "^0.22.0",
-    "@webstudio-is/project": "^0.22.0",
+    "@webstudio-is/prisma-client": "^0.24.0",
+    "@webstudio-is/project": "^0.24.0",
     "@webstudio-is/scripts": "^0.0.0",
     "@webstudio-is/tsconfig": "^1.0.1"
   },

package/src/index.ts

@@ -7,23 +7,20 @@ export const loadProject = async ({
 }: {
   apiUrl: string;
   projectId: string;
-}): Promise<Array<CanvasData> | string> => {
-  try {
-    if (apiUrl === undefined) {
-      throw new Error("Webstudio API URL is required.");
-    }
-    const baseUrl = new URL(apiUrl);
-    const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
-    const projectResponse = await fetch(projectUrl);
-    const project = await projectResponse.json();
-    if (!projectResponse.ok) {
-      throw new Error(project);
-    }
-    return project;
-  } catch (error) {
-    if (error instanceof Error) {
-      return error.message;
-    }
-    throw error;
+}): Promise<Array<CanvasData>> => {
+  if (apiUrl === undefined) {
+    throw new Error("Webstudio API URL is required.");
   }
+  const baseUrl = new URL(apiUrl);
+  const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
+  const projectResponse = await fetch(projectUrl);
+
+  if (projectResponse.ok) {
+    return await projectResponse.json();
+  }
+
+  // In the case where the status code is not 2xx,
+  // we don't know what to do with the response other than just show an error message.
+  const message = await projectResponse.text();
+  throw new Error(message.slice(0, 1000));
 };