@superblocksteam/sdk 1.1.1 → 1.2.0

package/dist/client.d.ts

@@ -1,4 +1,10 @@
 export type ViewMode = "export-deployed" | "export-latest" | "export-live";
+export declare class BranchNotCheckedOutError extends Error {
+    constructor(message: string);
+}
+export declare class CommitAlreadyExistsError extends Error {
+    constructor(message: string);
+}
 export interface UploadFile {
     name: string;
     filename: string;
@@ -63,5 +69,5 @@ export declare function pushApplication({ applicationId, token, superblocksBaseU
     superblocksBaseUrl: string;
     branch: string;
     injectedHeaders: Record<string, string>;
-    applicationConfig: ApplicationWrapper;
+    applicationConfig: PushApplicationWithCommitConfig;
 }): Promise<ApplicationWrapper | undefined>;

package/dist/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pushApplication = exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplicationWithComponents = exports.fetchApplicationBranches = exports.fetchApplication = void 0;
+exports.pushApplication = exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplicationWithComponents = exports.fetchApplicationBranches = exports.fetchApplication = exports.CommitAlreadyExistsError = exports.BranchNotCheckedOutError = void 0;
 const fs = require("fs");
 const util_1 = require("@superblocksteam/util");
 const axios_1 = require("axios");
@@ -11,6 +11,20 @@ const BASE_BUCKETEER_URL = "api/v1";
 const SUPERBLOCKS_MAX_FILE_SIZE_MB = 10;
 const CLI_VERSION_HEADER = "x-superblocks-cli-version";
 const SUPERBLOCKS_URL_HEADER = "x-superblocks-url";
+class BranchNotCheckedOutError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "BranchNotCheckedOutError";
+    }
+}
+exports.BranchNotCheckedOutError = BranchNotCheckedOutError;
+class CommitAlreadyExistsError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "CommitAlreadyExistsError";
+    }
+}
+exports.CommitAlreadyExistsError = CommitAlreadyExistsError;
 async function fetchApplication({ applicationId, branch, token, superblocksBaseUrl, viewMode, injectedHeaders = {}, }) {
     var _a, _b;
     const serverURL = new URL(`api/v2/applications/${applicationId}/branches/${branch}?viewMode=${viewMode}`, superblocksBaseUrl);
@@ -254,7 +268,10 @@ You can reduce your component bundle size by uploading static assets to a separa
         else {
             let message;
             if (e instanceof axios_1.AxiosError) {
-                message = ((_d = (_c = (_b = e.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.responseMeta) === null || _d === void 0 ? void 0 : _d.message) || ((_e = e.response) === null || _e === void 0 ? void 0 : _e.data) || ((_f = e.response) === null || _f === void 0 ? void 0 : _f.statusText);
+                message =
+                    ((_d = (_c = (_b = e.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.responseMeta) === null || _d === void 0 ? void 0 : _d.message) ||
+                        ((_e = e.response) === null || _e === void 0 ? void 0 : _e.data) ||
+                        ((_f = e.response) === null || _f === void 0 ? void 0 : _f.statusText);
             }
             else {
                 message = e.message;
@@ -286,7 +303,7 @@ async function fetchCurrentUser(token, superblocksBaseUrl) {
 }
 exports.fetchCurrentUser = fetchCurrentUser;
 async function pushApplication({ applicationId, token, superblocksBaseUrl, applicationConfig, branch, injectedHeaders = {}, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const [rootSettings] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
     const serverURL = new URL(`${BASE_SERVER_URL}/public/applications/${applicationId}/branches/${encodeURIComponent(branch)}/push`, superblocksBaseUrl);
     let serverResponse;
@@ -305,11 +322,18 @@ async function pushApplication({ applicationId, token, superblocksBaseUrl, appli
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
-            const message = (_f = (_d = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : JSON.stringify((_e = e.response) === null || _e === void 0 ? void 0 : _e.data)) !== null && _f !== void 0 ? _f : (_g = e.response) === null || _g === void 0 ? void 0 : _g.statusText;
+            const respCode = (_d = (_c = (_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.responseMeta) === null || _c === void 0 ? void 0 : _c.status) !== null && _d !== void 0 ? _d : (_e = e.response) === null || _e === void 0 ? void 0 : _e.status;
+            if (respCode === 405) {
+                throw new BranchNotCheckedOutError(`Branch ${branch} is not checked out`);
+            }
+            else if (respCode === 409) {
+                throw new CommitAlreadyExistsError(`Commit ${applicationConfig.commitId} already exists`);
+            }
+            const message = (_l = (_j = (_h = (_g = (_f = e.response) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.responseMeta) === null || _h === void 0 ? void 0 : _h.message) !== null && _j !== void 0 ? _j : JSON.stringify((_k = e.response) === null || _k === void 0 ? void 0 : _k.data)) !== null && _l !== void 0 ? _l : (_m = e.response) === null || _m === void 0 ? void 0 : _m.statusText;
             throw new Error(`Could not push application ${message ? "\n" + message : ""}`);
         }
         throw new Error(`Could not push application ${e.message ? "\n" + e.message : ""}`);
     }
-    return (_h = serverResponse === null || serverResponse === void 0 ? void 0 : serverResponse.data) === null || _h === void 0 ? void 0 : _h.data;
+    return (_o = serverResponse === null || serverResponse === void 0 ? void 0 : serverResponse.data) === null || _o === void 0 ? void 0 : _o.data;
 }
 exports.pushApplication = pushApplication;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Superblocks JS SDK",
   "main": "./dist/index.js",
   "exports": {
@@ -30,7 +30,7 @@
     "typescript": "^5.1.3"
   },
   "dependencies": {
-    "@superblocksteam/util": "1.1.1",
+    "@superblocksteam/util": "1.2.0",
     "axios": "^1.3.5"
   },
   "homepage": "https://www.superblocks.com",

package/src/client.ts

@@ -21,6 +21,20 @@ const SUPERBLOCKS_URL_HEADER = "x-superblocks-url";
 
 export type ViewMode = "export-deployed" | "export-latest" | "export-live";
 
+export class BranchNotCheckedOutError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "BranchNotCheckedOutError";
+  }
+}
+
+export class CommitAlreadyExistsError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "CommitAlreadyExistsError";
+  }
+}
+
 export interface UploadFile {
   name: string;
   filename: string;
@@ -398,7 +412,10 @@ You can reduce your component bundle size by uploading static assets to a separa
     } else {
       let message: string;
       if (e instanceof AxiosError) {
-        message = e.response?.data?.responseMeta?.message || e.response?.data || e.response?.statusText;
+        message =
+          e.response?.data?.responseMeta?.message ||
+          e.response?.data ||
+          e.response?.statusText;
       } else {
         message = e.message as string;
       }
@@ -443,7 +460,7 @@ export async function pushApplication({
   superblocksBaseUrl: string;
   branch: string;
   injectedHeaders: Record<string, string>;
-  applicationConfig: ApplicationWrapper;
+  applicationConfig: PushApplicationWithCommitConfig;
 }): Promise<ApplicationWrapper | undefined> {
   const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
   const serverURL = new URL(
@@ -468,6 +485,17 @@ export async function pushApplication({
     serverResponse = await axios<ResponseWithMeta<ApplicationWrapper>>(config);
   } catch (e) {
     if (axios.isAxiosError(e)) {
+      const respCode =
+        e.response?.data?.responseMeta?.status ?? e.response?.status;
+      if (respCode === 405) {
+        throw new BranchNotCheckedOutError(
+          `Branch ${branch} is not checked out`
+        );
+      } else if (respCode === 409) {
+        throw new CommitAlreadyExistsError(
+          `Commit ${applicationConfig.commitId} already exists`
+        );
+      }
       const message: string =
         (e.response?.data?.responseMeta?.message as string) ??
         JSON.stringify(e.response?.data) ??