@webstudio-is/http-client 0.264.0 → 0.266.0

package/lib/index.js

@@ -1,46 +1,32 @@
 // src/index.ts
-var getLatestBuildUsingProjectId = async (params) => {
-  const { origin, projectId, authToken } = params;
+import { createTRPCUntypedClient, httpBatchLink } from "@trpc/client";
+var createTrpcClient = (origin, headers) => {
   const { sourceOrigin } = parseBuilderUrl(origin);
-  const url = new URL(sourceOrigin);
-  url.pathname = `/rest/buildId/${projectId}`;
-  const headers = new Headers();
-  headers.set("x-auth-token", authToken);
-  const response = await fetch(url.href, { headers });
-  if (response.ok) {
-    return await response.json();
-  }
-  const message = await response.text();
-  throw new Error(message.slice(0, 1e3));
+  const url = new URL("/trpc", sourceOrigin);
+  return createTRPCUntypedClient({
+    links: [
+      httpBatchLink({
+        url: url.href,
+        headers
+      })
+    ]
+  });
 };
 var loadProjectDataByBuildId = async (params) => {
-  const { sourceOrigin } = parseBuilderUrl(params.origin);
-  const url = new URL(sourceOrigin);
-  url.pathname = `/rest/build/${params.buildId}`;
-  const headers = new Headers();
-  if ("seviceToken" in params) {
-    headers.set("Authorization", params.seviceToken);
-  } else {
-    headers.set("x-auth-token", params.authToken);
-  }
-  const response = await fetch(url.href, {
-    headers
+  const headers = "seviceToken" in params ? { Authorization: params.seviceToken } : { "x-auth-token": params.authToken };
+  return await createTrpcClient(params.origin, {
+    ...params.headers,
+    ...headers
+  }).query("build.loadProjectDataByBuildId", {
+    buildId: params.buildId
   });
-  if (response.ok) {
-    return await response.json();
-  }
-  const message = await response.text();
-  throw new Error(message.slice(0, 1e3));
 };
 var loadProjectDataByProjectId = async (params) => {
-  const result = await getLatestBuildUsingProjectId(params);
-  if (result.buildId === null) {
-    throw new Error(`The project is not published yet`);
-  }
-  return await loadProjectDataByBuildId({
-    buildId: result.buildId,
-    origin: params.origin,
-    authToken: params.authToken
+  return await createTrpcClient(params.origin, {
+    ...params.headers,
+    "x-auth-token": params.authToken
+  }).query("build.loadProjectDataByProjectId", {
+    projectId: params.projectId
   });
 };
 var buildProjectDomainPrefix = "p-";

package/lib/types/index.d.ts

@@ -1,4 +1,5 @@
-import type { Asset, Breakpoint, DataSource, Deployment, Instance, Page, Pages, Prop, Resource, StyleDecl, StyleDeclKey, StyleSource, StyleSourceSelection } from "@webstudio-is/sdk";
+import type { Asset, Breakpoint, DataSource, Deployment, Instance, Page, Prop, Resource, StyleDecl, StyleDeclKey, StyleSource, StyleSourceSelection } from "@webstudio-is/sdk";
+import type { SerializedPages } from "@webstudio-is/project-migrations/pages";
 export type Data = {
     page: Page;
     pages: Array<Page>;
@@ -8,7 +9,7 @@ export type Data = {
         version: number;
         createdAt: string;
         updatedAt: string;
-        pages: Pages;
+        pages: SerializedPages;
         breakpoints: [Breakpoint["id"], Breakpoint][];
         styles: [StyleDeclKey, StyleDecl][];
         styleSources: [StyleSource["id"], StyleSource][];
@@ -25,6 +26,7 @@ export type Data = {
 export declare const loadProjectDataByBuildId: (params: {
     buildId: string;
     origin: string;
+    headers?: Record<string, string | undefined>;
 } & ({
     seviceToken: string;
 } | {
@@ -34,6 +36,7 @@ export declare const loadProjectDataByProjectId: (params: {
     projectId: string;
     origin: string;
     authToken: string;
+    headers?: Record<string, string | undefined>;
 }) => Promise<Data>;
 export declare const parseBuilderUrl: (urlStr: string) => {
     projectId: undefined;

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@webstudio-is/http-client",
-  "version": "0.264.0",
+  "version": "0.266.0",
   "description": "Webstudio HTTP Client",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
   "type": "module",
   "dependencies": {
-    "@webstudio-is/sdk": "0.264.0"
+    "@trpc/client": "^10.45.2",
+    "@webstudio-is/sdk": "0.266.0",
+    "@webstudio-is/project-migrations": "0.266.0"
   },
   "devDependencies": {
     "vitest": "^3.1.2",