@superblocksteam/sdk 0.0.23 → 1.0.2

package/dist/client.d.ts

@@ -4,13 +4,27 @@ export interface UploadFile {
     filename: string;
     ContentType: string;
 }
+export interface ApplicationWrapper {
+    application: Record<string, any>;
+    page: Record<string, any>;
+    apis: Record<string, any>[];
+}
 export declare function fetchApplication({ applicationId, token, superblocksBaseUrl, viewMode, injectedHeaders, }: {
     applicationId: string;
     token: string;
     superblocksBaseUrl: string;
     viewMode: ViewMode;
     injectedHeaders: Record<string, string>;
-}): Promise<any>;
+}): Promise<ApplicationWrapper | undefined>;
+export declare function fetchApplicationWithComponents({ applicationId, token, superblocksBaseUrl, viewMode, injectedHeaders, }: {
+    applicationId: string;
+    token: string;
+    superblocksBaseUrl: string;
+    viewMode: ViewMode;
+    injectedHeaders: Record<string, string>;
+}): Promise<(ApplicationWrapper & {
+    componentFiles: any;
+}) | undefined>;
 export declare function fetchApplications(token: string, superblocksBaseUrl: string, injectedHeaders?: Record<string, string>): Promise<any>;
 export declare function fetchApi(apiId: string, token: string, superblocksBaseUrl: string, viewMode: ViewMode): Promise<any>;
 export declare function fetchApis(token: string, superblocksBaseUrl: string): Promise<any>;

package/dist/client.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplication = void 0;
+exports.fetchCurrentUser = exports.uploadComponents = exports.registerComponents = exports.fetchApis = exports.fetchApi = exports.fetchApplications = exports.fetchApplicationWithComponents = exports.fetchApplication = void 0;
 const fs = require("fs");
 const util_1 = require("@superblocksteam/util");
-const util_2 = require("@superblocksteam/util");
 const axios_1 = require("axios");
 const FormData = require("form-data");
 const lodash_1 = require("lodash");
@@ -13,7 +12,7 @@ const SUPERBLOCKS_MAX_FILE_SIZE_MB = 10;
 const CLI_VERSION_HEADER = "x-superblocks-cli-version";
 const SUPERBLOCKS_URL_HEADER = "x-superblocks-url";
 async function fetchApplication({ applicationId, token, superblocksBaseUrl, viewMode, injectedHeaders = {}, }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b;
     const serverURL = new URL(`api/v2/applications/${applicationId}?viewMode=${viewMode}`, superblocksBaseUrl);
     let serverResponse;
     try {
@@ -29,13 +28,31 @@ async function fetchApplication({ applicationId, token, superblocksBaseUrl, view
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e) && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
-            throw new Error(`Application ${applicationId} was not found`);
+            throw new util_1.NotFoundError(`Application ${applicationId} was not found`);
         }
         throw new Error("Could not fetch application");
     }
+    return (_b = serverResponse === null || serverResponse === void 0 ? void 0 : serverResponse.data) === null || _b === void 0 ? void 0 : _b.data;
+}
+exports.fetchApplication = fetchApplication;
+async function fetchApplicationWithComponents({ applicationId, token, superblocksBaseUrl, viewMode, injectedHeaders = {}, }) {
+    var _a, _b, _c;
+    const applicationWrapper = await fetchApplication({
+        applicationId,
+        token,
+        superblocksBaseUrl,
+        viewMode,
+        injectedHeaders,
+    });
+    if ((0, lodash_1.isEmpty)(applicationWrapper)) {
+        return;
+    }
     // if there are no custom components, just return here without trying to initialize them using bucketeer
-    if ((0, lodash_1.isEmpty)((_e = (_d = (_c = (_b = serverResponse === null || serverResponse === void 0 ? void 0 : serverResponse.data) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.application) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.registeredComponents)) {
-        return serverResponse.data.data;
+    if ((0, lodash_1.isEmpty)((_b = (_a = applicationWrapper.application) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.registeredComponents)) {
+        return {
+            ...applicationWrapper,
+            componentFiles: null,
+        };
     }
     // TODO(jason) update this with commit ID once we enable fetching by commit
     const commitId = "latest";
@@ -57,13 +74,13 @@ async function fetchApplication({ applicationId, token, superblocksBaseUrl, view
         return response.data;
     }
     catch (e) {
-        if (axios_1.default.isAxiosError(e) && ((_f = e.response) === null || _f === void 0 ? void 0 : _f.status) === 404) {
-            throw new Error(`Application ${applicationId} was not found`);
+        if (axios_1.default.isAxiosError(e) && ((_c = e.response) === null || _c === void 0 ? void 0 : _c.status) === 404) {
+            throw new util_1.NotFoundError(`Application ${applicationId} was not found`);
         }
         throw new Error("Could not fetch application");
     }
 }
-exports.fetchApplication = fetchApplication;
+exports.fetchApplicationWithComponents = fetchApplicationWithComponents;
 async function fetchApplications(token, superblocksBaseUrl, injectedHeaders = {}) {
     try {
         const config = {
@@ -97,7 +114,7 @@ async function fetchApi(apiId, token, superblocksBaseUrl, viewMode) {
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e) && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
-            throw new Error(`Api ${apiId} was not found`);
+            throw new util_1.NotFoundError(`Api ${apiId} was not found`);
         }
         throw new Error("Could not fetch api");
     }
@@ -123,7 +140,7 @@ exports.fetchApis = fetchApis;
 async function registerComponents(applicationId, componentConfigs, token, superblocksBaseUrl, injectedHeaders) {
     var _a, _b, _c, _d, _e, _f, _g;
     try {
-        const [rootSettings] = await (0, util_2.getSuperblocksMonorepoConfigJson)(true);
+        const [rootSettings] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
         const config = {
             method: "put",
             url: new URL(`${BASE_SERVER_URL}/public/application/${applicationId}/components`, superblocksBaseUrl).toString(),
@@ -147,7 +164,7 @@ async function registerComponents(applicationId, componentConfigs, token, superb
 }
 exports.registerComponents = registerComponents;
 async function uploadComponents({ applicationId, componentConfigs, files, token, superblocksBaseUrl, }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     superblocksBaseUrl = superblocksBaseUrl.replace(/\/$/, "");
     const bucketeerBaseUrl = (0, util_1.getBucketeerUrlFromSuperblocksUrl)(superblocksBaseUrl);
     // parse files to source and bundled files based on path
@@ -190,7 +207,7 @@ You can reduce your component bundle size by uploading static assets to a separa
     }
     const formHeaders = formData.getHeaders();
     try {
-        const [rootSettings] = await (0, util_2.getSuperblocksMonorepoConfigJson)(true);
+        const [rootSettings] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
         const config = {
             headers: {
                 Authorization: "Bearer " + token,
@@ -207,13 +224,20 @@ You can reduce your component bundle size by uploading static assets to a separa
         if (e instanceof axios_1.AxiosError && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 413) {
             throw new Error(`Could not upload application components, file size limit exceeded`);
         }
-        else if (e instanceof axios_1.AxiosError) {
-            const message = (_e = (_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) !== null && _e !== void 0 ? _e : (_f = e.response) === null || _f === void 0 ? void 0 : _f.data;
-            throw new Error(`Could not upload application components
-${message !== null && message !== void 0 ? message : (_g = e.response) === null || _g === void 0 ? void 0 : _g.statusText}`);
+        else {
+            let message;
+            if (e instanceof axios_1.AxiosError) {
+                message =
+                    (_g = (_e = (_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) !== null && _e !== void 0 ? _e : (_f = e.response) === null || _f === void 0 ? void 0 : _f.data) !== null && _g !== void 0 ? _g : (_h = e.response) === null || _h === void 0 ? void 0 : _h.statusText;
+            }
+            else {
+                message = e.message;
+            }
+            if (typeof message !== "string") {
+                message = JSON.stringify(message, null, 2);
+            }
+            throw new Error(`Could not upload application components\n${message}`);
         }
-        throw new Error(`Could not upload application components
-${e.message}`);
     }
 }
 exports.uploadComponents = uploadComponents;

package/dist/sdk.d.ts

@@ -7,7 +7,14 @@ export declare class SuperblocksSdk {
         applicationId: string;
         headers?: Record<string, string>;
         viewMode?: ViewMode;
-    }): Promise<any>;
+    }): Promise<import("./client").ApplicationWrapper | undefined>;
+    fetchApplicationWithComponents({ applicationId, headers, viewMode, }: {
+        applicationId: string;
+        headers?: Record<string, string>;
+        viewMode?: ViewMode;
+    }): Promise<(import("./client").ApplicationWrapper & {
+        componentFiles: any;
+    }) | undefined>;
     fetchApplications(headers?: Record<string, string>): Promise<any>;
     fetchApi(apiId: string, viewMode?: ViewMode): Promise<any>;
     fetchApis(): Promise<any>;

package/dist/sdk.js

@@ -18,6 +18,15 @@ class SuperblocksSdk {
             injectedHeaders: headers,
         });
     }
+    async fetchApplicationWithComponents({ applicationId, headers = {}, viewMode = "export-live", }) {
+        return (0, client_1.fetchApplicationWithComponents)({
+            applicationId,
+            token: this.token,
+            superblocksBaseUrl: this.superblocksBaseUrl,
+            viewMode,
+            injectedHeaders: headers,
+        });
+    }
     async fetchApplications(headers) {
         return (0, client_1.fetchApplications)(this.token, this.superblocksBaseUrl, headers);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "0.0.23",
+  "version": "1.0.2",
   "description": "Superblocks JS SDK",
   "main": "./dist/index.js",
   "exports": {
@@ -24,13 +24,13 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
-    "eslint": "^8.45.0",
+    "eslint": "^8.48.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "prettier": "^2.8.8",
     "typescript": "^5.1.3"
   },
   "dependencies": {
-    "@superblocksteam/util": "0.0.23",
+    "@superblocksteam/util": "1.0.2",
     "axios": "^1.3.5"
   },
   "homepage": "https://www.superblocks.com",

package/src/client.ts

@@ -2,11 +2,12 @@ import * as fs from "fs";
 import {
   ComponentEvent,
   getBucketeerUrlFromSuperblocksUrl,
+  getSuperblocksMonorepoConfigJson,
   getContentType,
   COMPONENT_EVENT_HEADER,
+  NotFoundError,
 } from "@superblocksteam/util";
-import { getSuperblocksMonorepoConfigJson } from "@superblocksteam/util";
-import axios, { AxiosError } from "axios";
+import axios, { AxiosError, AxiosRequestConfig } from "axios";
 import * as FormData from "form-data";
 import { isEmpty } from "lodash";
 
@@ -26,6 +27,14 @@ export interface UploadFile {
   ContentType: string;
 }
 
+export interface ApplicationWrapper {
+  application: Record<string, any>;
+  page: Record<string, any>;
+  apis: Record<string, any>[];
+}
+
+type ResponseWithMeta<T> = { responseMeta: unknown; data: T };
+
 export async function fetchApplication({
   applicationId,
   token,
@@ -38,7 +47,7 @@ export async function fetchApplication({
   superblocksBaseUrl: string;
   viewMode: ViewMode;
   injectedHeaders: Record<string, string>;
-}) {
+}): Promise<ApplicationWrapper | undefined> {
   const serverURL = new URL(
     `api/v2/applications/${applicationId}?viewMode=${viewMode}`,
     superblocksBaseUrl
@@ -46,7 +55,7 @@ export async function fetchApplication({
   let serverResponse;
 
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: serverURL.toString(),
       headers: {
@@ -54,21 +63,48 @@ export async function fetchApplication({
         ...injectedHeaders,
       },
     };
-    serverResponse = await axios(config);
+    serverResponse = await axios<ResponseWithMeta<ApplicationWrapper>>(config);
   } catch (e) {
     if (axios.isAxiosError(e) && e.response?.status === 404) {
-      throw new Error(`Application ${applicationId} was not found`);
+      throw new NotFoundError(`Application ${applicationId} was not found`);
     }
     throw new Error("Could not fetch application");
   }
 
+  return serverResponse?.data?.data;
+}
+
+export async function fetchApplicationWithComponents({
+  applicationId,
+  token,
+  superblocksBaseUrl,
+  viewMode,
+  injectedHeaders = {},
+}: {
+  applicationId: string;
+  token: string;
+  superblocksBaseUrl: string;
+  viewMode: ViewMode;
+  injectedHeaders: Record<string, string>;
+}): Promise<(ApplicationWrapper & { componentFiles: any }) | undefined> {
+  const applicationWrapper = await fetchApplication({
+    applicationId,
+    token,
+    superblocksBaseUrl,
+    viewMode,
+    injectedHeaders,
+  });
+
+  if (isEmpty(applicationWrapper)) {
+    return;
+  }
+
   // if there are no custom components, just return here without trying to initialize them using bucketeer
-  if (
-    isEmpty(
-      serverResponse?.data?.data?.application?.settings?.registeredComponents
-    )
-  ) {
-    return serverResponse.data.data;
+  if (isEmpty(applicationWrapper.application?.settings?.registeredComponents)) {
+    return {
+      ...applicationWrapper,
+      componentFiles: null,
+    };
   }
 
   // TODO(jason) update this with commit ID once we enable fetching by commit
@@ -84,7 +120,7 @@ export async function fetchApplication({
   ).toString();
 
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: componentFileURL,
       headers: {
@@ -97,7 +133,7 @@ export async function fetchApplication({
     return response.data;
   } catch (e) {
     if (axios.isAxiosError(e) && e.response?.status === 404) {
-      throw new Error(`Application ${applicationId} was not found`);
+      throw new NotFoundError(`Application ${applicationId} was not found`);
     }
     throw new Error("Could not fetch application");
   }
@@ -109,7 +145,7 @@ export async function fetchApplications(
   injectedHeaders: Record<string, string> = {}
 ) {
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: new URL(`/api/v2/applications`, superblocksBaseUrl).toString(),
       headers: {
@@ -131,7 +167,7 @@ export async function fetchApi(
   viewMode: ViewMode
 ) {
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: new URL(
         `/api/v3/apis/${apiId}?viewMode=${viewMode}`,
@@ -145,7 +181,7 @@ export async function fetchApi(
     return response.data.data;
   } catch (e) {
     if (axios.isAxiosError(e) && e.response?.status === 404) {
-      throw new Error(`Api ${apiId} was not found`);
+      throw new NotFoundError(`Api ${apiId} was not found`);
     }
     throw new Error("Could not fetch api");
   }
@@ -153,7 +189,7 @@ export async function fetchApi(
 
 export async function fetchApis(token: string, superblocksBaseUrl: string) {
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: new URL(`/api/v3/apis`, superblocksBaseUrl).toString(),
       headers: {
@@ -176,7 +212,7 @@ export async function registerComponents(
 ) {
   try {
     const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "put",
       url: new URL(
         `${BASE_SERVER_URL}/public/application/${applicationId}/components`,
@@ -280,7 +316,7 @@ You can reduce your component bundle size by uploading static assets to a separa
 
   try {
     const [rootSettings] = await getSuperblocksMonorepoConfigJson(true);
-    const config = {
+    const config: AxiosRequestConfig = {
       headers: {
         Authorization: "Bearer " + token,
         [CLI_VERSION_HEADER]: rootSettings.metadata.cliVersion,
@@ -298,14 +334,19 @@ You can reduce your component bundle size by uploading static assets to a separa
       throw new Error(
         `Could not upload application components, file size limit exceeded`
       );
-    } else if (e instanceof AxiosError) {
-      const message =
-        (e.response?.data?.responseMeta?.message as string) ?? e.response?.data;
-      throw new Error(`Could not upload application components
-${message ?? e.response?.statusText}`);
+    } else {
+      let message: any;
+      if (e instanceof AxiosError) {
+        message =
+          e.response?.data?.responseMeta?.message ?? e.response?.data ?? e.response?.statusText;
+      } else {
+        message = e.message;
+      }
+      if (typeof message !== "string") {
+        message = JSON.stringify(message, null, 2);
+      }
+      throw new Error(`Could not upload application components\n${message}`);
     }
-    throw new Error(`Could not upload application components
-${e.message as string}`);
   }
 }
 
@@ -314,7 +355,7 @@ export async function fetchCurrentUser(
   superblocksBaseUrl: string
 ) {
   try {
-    const config = {
+    const config: AxiosRequestConfig = {
       method: "get",
       url: new URL(`/api/v1/users/me`, superblocksBaseUrl).toString(),
       headers: {

package/src/sdk.ts

@@ -1,7 +1,8 @@
 import {
   fetchApi,
   fetchApis,
-  fetchApplication as fetchApplicationClient,
+  fetchApplication,
+  fetchApplicationWithComponents,
   fetchApplications,
   registerComponents,
   uploadComponents,
@@ -27,7 +28,25 @@ export class SuperblocksSdk {
     headers?: Record<string, string>;
     viewMode?: ViewMode;
   }) {
-    return fetchApplicationClient({
+    return fetchApplication({
+      applicationId,
+      token: this.token,
+      superblocksBaseUrl: this.superblocksBaseUrl,
+      viewMode,
+      injectedHeaders: headers,
+    });
+  }
+
+  async fetchApplicationWithComponents({
+    applicationId,
+    headers = {},
+    viewMode = "export-live",
+  }: {
+    applicationId: string;
+    headers?: Record<string, string>;
+    viewMode?: ViewMode;
+  }) {
+    return fetchApplicationWithComponents({
       applicationId,
       token: this.token,
       superblocksBaseUrl: this.superblocksBaseUrl,