@webstudio-is/http-client 0.83.0 → 0.84.0

package/lib/cjs/index.js

@@ -18,22 +18,38 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  loadProject: () => loadProject
+  getLatestBuildUsingProjectId: () => getLatestBuildUsingProjectId,
+  loadProjectDataById: () => loadProjectDataById
 });
 module.exports = __toCommonJS(src_exports);
-const loadProject = async ({
-  apiUrl,
-  projectId
-}) => {
-  if (apiUrl === void 0) {
-    throw new Error("Webstudio API URL is required.");
+const loadProjectDataById = async (params) => {
+  const result = await getLatestBuildUsingProjectId(params);
+  if (result === null) {
+    throw new Error(``);
   }
-  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 url = new URL(params.host);
+  url.pathname = `/rest/build/${result.buildId}`;
+  if (params.authToken) {
+    url.searchParams.append("authToken", params.authToken);
   }
-  const message = await projectResponse.text();
+  const response = await fetch(url.href);
+  if (response.ok) {
+    return await response.json();
+  }
+  const message = await response.text();
+  throw new Error(message.slice(0, 1e3));
+};
+const getLatestBuildUsingProjectId = async (params) => {
+  const { host, projectId, authToken } = params;
+  const url = new URL(host);
+  url.pathname = `/rest/buildId/${projectId}`;
+  if (authToken) {
+    url.searchParams.append("authToken", authToken);
+  }
+  const response = await fetch(url.href);
+  if (response.ok) {
+    return await response.json();
+  }
+  const message = await response.text();
   throw new Error(message.slice(0, 1e3));
 };

package/lib/index.js

@@ -1,19 +1,35 @@
-const loadProject = async ({
-  apiUrl,
-  projectId
-}) => {
-  if (apiUrl === void 0) {
-    throw new Error("Webstudio API URL is required.");
+const loadProjectDataById = async (params) => {
+  const result = await getLatestBuildUsingProjectId(params);
+  if (result === null) {
+    throw new Error(``);
   }
-  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 url = new URL(params.host);
+  url.pathname = `/rest/build/${result.buildId}`;
+  if (params.authToken) {
+    url.searchParams.append("authToken", params.authToken);
   }
-  const message = await projectResponse.text();
+  const response = await fetch(url.href);
+  if (response.ok) {
+    return await response.json();
+  }
+  const message = await response.text();
+  throw new Error(message.slice(0, 1e3));
+};
+const getLatestBuildUsingProjectId = async (params) => {
+  const { host, projectId, authToken } = params;
+  const url = new URL(host);
+  url.pathname = `/rest/buildId/${projectId}`;
+  if (authToken) {
+    url.searchParams.append("authToken", authToken);
+  }
+  const response = await fetch(url.href);
+  if (response.ok) {
+    return await response.json();
+  }
+  const message = await response.text();
   throw new Error(message.slice(0, 1e3));
 };
 export {
-  loadProject
+  getLatestBuildUsingProjectId,
+  loadProjectDataById
 };

package/lib/types/index.d.ts

@@ -1,5 +1,15 @@
 import type { Data } from "@webstudio-is/react-sdk";
-export declare const loadProject: ({ apiUrl, projectId, }: {
-    apiUrl: string;
+interface DefaultArgs {
+    host: string;
+    authToken?: string;
+}
+type ResourceFactory<T, K> = (params: DefaultArgs & T) => Promise<K>;
+export declare const loadProjectDataById: ResourceFactory<{
     projectId: string;
-}) => Promise<Array<Data>>;
+}, Data>;
+export declare const getLatestBuildUsingProjectId: ResourceFactory<{
+    projectId: string;
+}, {
+    buildId: string;
+}>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/http-client",
-  "version": "0.83.0",
+  "version": "0.84.0",
   "description": "Webstudio HTTP Client",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -9,11 +9,11 @@
     "@jest/globals": "^29.6.2",
     "jest": "^29.6.2",
     "typescript": "5.1.6",
-    "@webstudio-is/jest-config": "^1.0.6",
-    "@webstudio-is/prisma-client": "^0.83.0",
-    "@webstudio-is/react-sdk": "^0.83.0",
+    "@webstudio-is/jest-config": "^1.0.7",
+    "@webstudio-is/prisma-client": "^0.84.0",
+    "@webstudio-is/react-sdk": "^0.84.0",
     "@webstudio-is/scripts": "^0.0.0",
-    "@webstudio-is/tsconfig": "^1.0.6"
+    "@webstudio-is/tsconfig": "^1.0.7"
   },
   "exports": {
     "source": "./src/index.ts",

package/src/index.test.ts

@@ -1,44 +1,45 @@
 import { describe, test, expect } from "@jest/globals";
-import { loadProject } from "./index";
+import { loadProjectDataById } from "./index";
 
 const existingProjectId = "675e8af3-48fa-4b18-9ebf-fd2b128865e2";
 const notPublishedProjectId = "7ec397c6-b3d0-4967-9073-9d83623fcf8e";
 const onlyHomeProjectId = "36d6c16f-04a0-45d4-ab1d-aa0ab61eb5b6";
 const morePagesProjectId = existingProjectId;
 
-const apiUrl = "http://localhost:3000";
+const host = "http://localhost:3000";
 
 describe("getProjectDetails", () => {
   test("include pages", async () => {
-    const response = await loadProject({
-      apiUrl,
+    const response = await loadProjectDataById({
+      host,
       projectId: morePagesProjectId,
     });
+
     if (typeof response === "object") {
-      return expect(response.length > 1).toBeTruthy();
+      return expect(response.pages.length).toBeTruthy();
     }
     throw new Error("Unexpected response");
   });
   test("does not include pages", async () => {
-    const response = await loadProject({
-      apiUrl,
+    const response = await loadProjectDataById({
+      host,
       projectId: onlyHomeProjectId,
     });
     if (typeof response === "object") {
-      return expect(response.length === 1).toBeTruthy();
+      return expect(response.pages.length === 1).toBeTruthy();
     }
     throw new Error("Unexpected response");
   });
   test("loads existing project", async () => {
-    const response = await loadProject({
-      apiUrl,
+    const response = await loadProjectDataById({
+      host,
       projectId: existingProjectId,
     });
     expect(response).toBeTruthy();
   });
   test("loads not published project", async () => {
-    const response = await loadProject({
-      apiUrl,
+    const response = await loadProjectDataById({
+      host,
       projectId: notPublishedProjectId,
     });
     if (response instanceof Error) {

package/src/index.ts

@@ -1,25 +1,53 @@
 import type { Data } from "@webstudio-is/react-sdk";
 
-export const loadProject = async ({
-  apiUrl,
-  projectId,
-}: {
-  apiUrl: string;
-  projectId: string;
-}): Promise<Array<Data>> => {
-  if (apiUrl === undefined) {
-    throw new Error("Webstudio API URL is required.");
+interface DefaultArgs {
+  host: string;
+  authToken?: string;
+}
+
+type ResourceFactory<T, K> = (params: DefaultArgs & T) => Promise<K>;
+
+export const loadProjectDataById: ResourceFactory<
+  { projectId: string },
+  Data
+> = async (params) => {
+  const result = await getLatestBuildUsingProjectId(params);
+  if (result === null) {
+    throw new Error(``);
+  }
+
+  const url = new URL(params.host);
+  url.pathname = `/rest/build/${result.buildId}`;
+  if (params.authToken) {
+    url.searchParams.append("authToken", params.authToken);
+  }
+
+  const response = await fetch(url.href);
+
+  if (response.ok) {
+    return await response.json();
+  }
+
+  const message = await response.text();
+  throw new Error(message.slice(0, 1000));
+};
+
+export const getLatestBuildUsingProjectId: ResourceFactory<
+  { projectId: string },
+  { buildId: string }
+> = async (params) => {
+  const { host, projectId, authToken } = params;
+  const url = new URL(host);
+  url.pathname = `/rest/buildId/${projectId}`;
+  if (authToken) {
+    url.searchParams.append("authToken", authToken);
   }
-  const baseUrl = new URL(apiUrl);
-  const projectUrl = new URL(`/rest/project/${projectId}`, baseUrl);
-  const projectResponse = await fetch(projectUrl);
+  const response = await fetch(url.href);
 
-  if (projectResponse.ok) {
-    return await projectResponse.json();
+  if (response.ok) {
+    return await response.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();
+  const message = await response.text();
   throw new Error(message.slice(0, 1000));
 };