@hubspot/local-dev-lib 1.13.1 → 2.0.1

package/lib/archive.js

@@ -8,10 +8,9 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = require("path");
 const os_1 = require("os");
 const extract_zip_1 = __importDefault(require("extract-zip"));
-const fileSystemErrors_1 = require("../errors/fileSystemErrors");
-const standardErrors_1 = require("../errors/standardErrors");
 const logger_1 = require("./logger");
 const lang_1 = require("../utils/lang");
+const FileSystemError_1 = require("../models/FileSystemError");
 const i18nKey = 'lib.archive';
 async function extractZip(name, zip, hideLogs = false) {
     const result = { extractDir: '', tmpDir: '' };
@@ -31,15 +30,16 @@ async function extractZip(name, zip, hideLogs = false) {
     }
     catch (err) {
         if (tmpZipPath || result.tmpDir) {
-            (0, fileSystemErrors_1.throwFileSystemError)(err, {
+            throw new FileSystemError_1.FileSystemError({ cause: err }, {
                 filepath: tmpZipPath || result.tmpDir,
-                write: true,
+                operation: 'write',
             });
         }
         else {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.extractZip.errors.write`, {}, err);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.extractZip.errors.write`), {
+                cause: err,
+            });
         }
-        return result;
     }
     // Extract zip
     try {
@@ -48,7 +48,9 @@ async function extractZip(name, zip, hideLogs = false) {
         result.extractDir = tmpExtractPath;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.extractZip.errors.extract`, {}, err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.extractZip.errors.extract`), {
+            cause: err,
+        });
     }
     logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.extractZip.success`));
     return result;
@@ -81,12 +83,11 @@ async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true,
     }
     catch (err) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.error`, { dest }));
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath: dest,
-            write: true,
+            operation: 'write',
         });
     }
-    return false;
 }
 async function cleanupTempDir(tmpDir) {
     if (!tmpDir)

package/lib/cms/functions.d.ts

@@ -1,2 +1,8 @@
-import { FunctionInfo, FunctionOptions } from '../../types/Functions';
+import { FunctionConfig, FunctionConfigInfo, FunctionInfo, FunctionOptions } from '../../types/Functions';
+export declare function isObjectOrFunction(value: object): boolean;
+export declare function createEndpoint(endpointMethod: string, filename: string): {
+    method: string;
+    file: string;
+};
+export declare function createConfig({ endpointPath, endpointMethod, functionFile, }: FunctionConfigInfo): FunctionConfig;
 export declare function createFunction(functionInfo: FunctionInfo, dest: string, options?: FunctionOptions): Promise<void>;

package/lib/cms/functions.js

@@ -3,27 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFunction = void 0;
+exports.createFunction = exports.createConfig = exports.createEndpoint = exports.isObjectOrFunction = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
 const path_2 = require("../path");
 const github_1 = require("../github");
 const logger_1 = require("../logger");
-const standardErrors_1 = require("../../errors/standardErrors");
-const fileSystemErrors_1 = require("../../errors/fileSystemErrors");
 const lang_1 = require("../../utils/lang");
+const FileSystemError_1 = require("../../models/FileSystemError");
 const i18nKey = 'lib.cms.functions';
 function isObjectOrFunction(value) {
     const type = typeof value;
     return value != null && (type === 'object' || type === 'function');
 }
+exports.isObjectOrFunction = isObjectOrFunction;
 function createEndpoint(endpointMethod, filename) {
     return {
         method: endpointMethod || 'GET',
         file: filename,
     };
 }
+exports.createEndpoint = createEndpoint;
 function createConfig({ endpointPath, endpointMethod, functionFile, }) {
     return {
         runtime: 'nodejs18.x',
@@ -35,6 +36,7 @@ function createConfig({ endpointPath, endpointMethod, functionFile, }) {
         },
     };
 }
+exports.createConfig = createConfig;
 function writeConfig(configFilePath, config) {
     const configJson = JSON.stringify(config, null, '  ');
     fs_extra_1.default.writeFileSync(configFilePath, configJson);
@@ -48,9 +50,9 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.unableToReadFile`, {
             configFilePath,
         }));
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath: configFilePath,
-            read: true,
+            operation: 'read',
         });
     }
     let config;
@@ -61,20 +63,22 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.invalidJSON`, {
             configFilePath,
         }));
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath: configFilePath,
-            read: true,
+            operation: 'read',
         });
     }
     if (!isObjectOrFunction(config)) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.updateExistingConfig.errors.configIsNotObjectError`, { configFilePath });
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.errors.configIsNotObjectError`, {
+            configFilePath,
+        }));
     }
     if (config.endpoints) {
         if (config.endpoints[endpointPath]) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.updateExistingConfig.errors.endpointAreadyExistsError`, {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.errors.endpointAreadyExistsError`, {
                 configFilePath,
                 endpointPath,
-            });
+            }));
         }
         else {
             config.endpoints[endpointPath] = createEndpoint(endpointMethod, functionFile);
@@ -92,9 +96,9 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.couldNotUpdateFile`, {
             configFilePath,
         }));
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath: configFilePath,
-            write: true,
+            operation: 'read',
         });
     }
 }
@@ -106,9 +110,9 @@ async function createFunction(functionInfo, dest, options = {}) {
         nocase: true,
     });
     if (ancestorFunctionsConfig) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createFunction.errors.nestedConfigError`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createFunction.errors.nestedConfigError`, {
             ancestorConfigPath: path_1.default.dirname(ancestorFunctionsConfig),
-        });
+        }));
     }
     const folderName = functionsFolder.endsWith('.functions')
         ? functionsFolder
@@ -129,9 +133,9 @@ async function createFunction(functionInfo, dest, options = {}) {
     const functionFilePath = path_1.default.join(destPath, functionFile);
     const configFilePath = path_1.default.join(destPath, 'serverless.json');
     if (!allowExistingFile && fs_extra_1.default.existsSync(functionFilePath)) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createFunction.errors.jsFileConflictError`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createFunction.errors.jsFileConflictError`, {
             functionFilePath,
-        });
+        }));
     }
     await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', 'functions/sample-function.js', functionFilePath);
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdFunctionFile`, {
@@ -160,9 +164,9 @@ async function createFunction(functionInfo, dest, options = {}) {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.createFunction.failedToCreateFile`, {
                 configFilePath,
             }));
-            (0, fileSystemErrors_1.throwFileSystemError)(err, {
+            throw new FileSystemError_1.FileSystemError({ cause: err }, {
                 filepath: configFilePath,
-                write: true,
+                operation: 'write',
             });
         }
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdConfigFile`, {

package/lib/cms/handleFieldsJS.js

@@ -11,7 +11,6 @@ const child_process_1 = require("child_process");
 const escapeRegExp_1 = require("../escapeRegExp");
 const modules_1 = require("../../utils/cms/modules");
 const logger_1 = require("../logger");
-const standardErrors_1 = require("../../errors/standardErrors");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.handleFieldsJs';
 class FieldsJs {
@@ -69,7 +68,7 @@ class FieldsJs {
                 }));
             });
         }).catch((e) => {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.convertFieldsJs.errors.errorConverting`, { filePath }, e);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.convertFieldsJs.errors.errorConverting`, { filePath }), { cause: e });
         });
     }
     /**
@@ -79,9 +78,9 @@ class FieldsJs {
      */
     saveOutput() {
         if (!this.outputPath || !fs_extra_1.default.existsSync(this.outputPath)) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.saveOutput.errors.saveFailed`, {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.saveOutput.errors.saveFailed`, {
                 path: this.filePath,
-            });
+            }));
         }
         const relativePath = path_1.default.relative(this.rootWriteDir, path_1.default.dirname(this.outputPath));
         const savePath = path_1.default.join(this.projectDir, relativePath, 'fields.output.json');
@@ -89,7 +88,7 @@ class FieldsJs {
             fs_extra_1.default.copyFileSync(this.outputPath, savePath);
         }
         catch (err) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.saveOutput.errors.saveFailed`, { path: savePath }, err);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.saveOutput.errors.saveFailed`, { path: savePath }), { cause: err });
         }
     }
     /**
@@ -131,7 +130,9 @@ function createTmpDirSync(prefix) {
         tmpDir = fs_extra_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), prefix));
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createTmpDirSync.errors.writeFailed`, {}, err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createTmpDirSync.errors.writeFailed`), {
+            cause: err,
+        });
     }
     return tmpDir;
 }
@@ -140,7 +141,7 @@ exports.createTmpDirSync = createTmpDirSync;
 function cleanupTmpDirSync(tmpDir) {
     fs_extra_1.default.rm(tmpDir, { recursive: true }, err => {
         if (err) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.cleanupTmpDirSync.errors.deleteFailed`, {}, err);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.cleanupTmpDirSync.errors.deleteFailed`), { cause: err });
         }
     });
 }

package/lib/cms/modules.js

@@ -9,7 +9,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_2 = require("../path");
 const fs_1 = require("../fs");
 const github_1 = require("../github");
-const standardErrors_1 = require("../../errors/standardErrors");
 const logger_1 = require("../logger");
 const modules_1 = require("../../utils/cms/modules");
 const lang_1 = require("../../utils/lang");
@@ -98,10 +97,10 @@ const updateFileContents = async (file, metaData, getInternalVersion) => {
     }
     catch (error) {
         const { message } = error;
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createModule.errors.fileUpdateFailure`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createModule.errors.fileUpdateFailure`, {
             path: file,
             errorMessage: message,
-        });
+        }));
     }
 };
 async function createModule(moduleDefinition, name, dest, getInternalVersion, options = {
@@ -126,9 +125,9 @@ async function createModule(moduleDefinition, name, dest, getInternalVersion, op
         ? path_1.default.join(dest, folderName)
         : path_1.default.join(dest, `${name}`);
     if (!options.allowExistingDir && fs_extra_1.default.existsSync(destPath)) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createModule.errors.pathExists`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createModule.errors.pathExists`, {
             path: destPath,
-        });
+        }));
     }
     else {
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createModule.creatingPath`, {

package/lib/cms/processFieldsJs.js

@@ -9,7 +9,6 @@ const fs_1 = __importDefault(require("fs"));
 const semver_1 = __importDefault(require("semver"));
 const url_1 = require("url");
 const path_2 = require("../path");
-const standardErrors_1 = require("../../errors/standardErrors");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.processFieldsJs';
 const { dirName, fieldOptions, filePath, writeDir } = process.env;
@@ -25,21 +24,23 @@ console.info((0, lang_1.i18n)(`${i18nKey}.converting`, {
  * This function has optional return type of Promise<Array> | Array. In order to have uniform handling,
  * we wrap the return value of the function in a Promise.resolve(), and then process.
  */
-const fieldsPromise = dynamicImport(filePath).catch(e => (0, standardErrors_1.throwError)(e));
+const fieldsPromise = dynamicImport(filePath).catch(e => {
+    throw e;
+});
 fieldsPromise.then(fieldsFunc => {
     const fieldsFuncType = typeof fieldsFunc;
     if (fieldsFuncType !== 'function') {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.notFunction`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.notFunction`, {
             path: filePath,
             returned: fieldsFuncType,
-        });
+        }));
     }
     return Promise.resolve(fieldsFunc(fieldOptions)).then(fields => {
         if (!Array.isArray(fields)) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.notArray`, {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.notArray`, {
                 path: filePath,
                 returned: typeof fields,
-            });
+            }));
         }
         const finalPath = path_1.default.join(writeDir, '/fields.json');
         return fieldsArrayToJson(fields).then(json => {
@@ -89,7 +90,7 @@ async function dynamicImport(filePath) {
     }
     else {
         if ((0, path_2.getExt)(filePath) == 'mjs') {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.invalidMjsFile`);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidMjsFile`));
         }
         return require(filePath);
     }

package/lib/cms/templates.js

@@ -7,7 +7,6 @@ exports.TEMPLATE_TYPES = exports.createTemplate = exports.isCodedFile = exports.
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const github_1 = require("../github");
-const standardErrors_1 = require("../../errors/standardErrors");
 const logger_1 = require("../logger");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.templates';
@@ -52,9 +51,9 @@ async function createTemplate(name, dest, type = 'page-template', options = { al
     const filename = name.endsWith('.html') ? name : `${name}.html`;
     const filePath = path_1.default.join(dest, filename);
     if (!options.allowExisting && fs_extra_1.default.existsSync(filePath)) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.createTemplate.errors.pathExists`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.createTemplate.errors.pathExists`, {
             path: filePath,
-        });
+        }));
     }
     logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingPath`, { path: dest }));
     fs_extra_1.default.mkdirp(dest);

package/lib/cms/uploadFolder.js

@@ -12,11 +12,11 @@ const fileMapper_2 = require("../../api/fileMapper");
 const modules_1 = require("../../utils/cms/modules");
 const escapeRegExp_1 = require("../escapeRegExp");
 const path_2 = require("../path");
-const standardErrors_1 = require("../../errors/standardErrors");
-const apiErrors_1 = require("../../errors/apiErrors");
+const errors_1 = require("../../errors");
 const logger_1 = require("../logger");
 const files_1 = require("../../constants/files");
 const lang_1 = require("../../utils/lang");
+const HubSpotHttpError_1 = require("../../models/HubSpotHttpError");
 const i18nKey = 'lib.cms.uploadFolder';
 const queue = new p_queue_1.default({
     concurrency: 10,
@@ -86,17 +86,21 @@ const defaultUploadSuccessCallback = (file, destPath) => logger_1.logger.log((0,
 }));
 const defaultUploadFirstErrorCallback = (file, destPath, error) => {
     logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.failed`, { file, destPath }));
-    if (error.response && error.response.data) {
-        logger_1.logger.debug(error.response.data);
+    if ((0, errors_1.isHubSpotHttpError)(error)) {
+        logger_1.logger.debug(error.data);
     }
-    else {
+    else if (error instanceof Error) {
         logger_1.logger.debug(error.message);
     }
 };
 const defaultUploadRetryCallback = (file, destPath) => logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.retry`, { file, destPath }));
 const defaultUploadFinalErrorCallback = (accountId, file, destPath, error) => {
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.retryFailed`, { file, destPath }));
-    (0, apiErrors_1.throwApiUploadError)(error, {
+    const retryFailed = (0, lang_1.i18n)(`${i18nKey}.uploadFolder.retryFailed`, {
+        file,
+        destPath,
+    });
+    logger_1.logger.debug(retryFailed);
+    throw new HubSpotHttpError_1.HubSpotHttpError(retryFailed, { cause: error }, {
         accountId,
         request: destPath,
         payload: file,
@@ -140,11 +144,10 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
                 _onSuccessCallback(originalFilePath, destPath);
             }
             catch (err) {
-                const error = err;
-                if ((0, standardErrors_1.isFatalError)(error)) {
-                    throw error;
+                if ((0, errors_1.isAuthError)(err)) {
+                    throw err;
                 }
-                _onFirstErrorCallback(file, destPath, error);
+                _onFirstErrorCallback(file, destPath, err);
                 failures.push({
                     file,
                     destPath,
@@ -169,9 +172,8 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
                     file,
                 };
             }
-            catch (err) {
-                const error = err;
-                if ((0, standardErrors_1.isFatalError)(error)) {
+            catch (error) {
+                if ((0, errors_1.isAuthError)(error)) {
                     throw error;
                 }
                 _onFinalErrorCallback(accountId, file, destPath, error);

package/lib/cms/validate.js

@@ -26,7 +26,7 @@ async function lint(accountId, filepath, callback) {
             }
             return result;
         }
-        const validation = await (0, validateHubl_1.validateHubl)(accountId, source);
+        const { data: validation } = await (0, validateHubl_1.validateHubl)(accountId, source);
         const result = {
             file,
             validation,

package/lib/cms/watch.js

@@ -8,7 +8,6 @@ const path_1 = __importDefault(require("path"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const p_queue_1 = __importDefault(require("p-queue"));
 const debounce_1 = __importDefault(require("debounce"));
-const apiErrors_1 = require("../../errors/apiErrors");
 const handleFieldsJS_1 = require("./handleFieldsJS");
 const uploadFolder_1 = require("./uploadFolder");
 const ignoreRules_1 = require("../ignoreRules");
@@ -20,6 +19,8 @@ const notify_1 = require("../notify");
 const themes_1 = require("./themes");
 const logger_1 = require("../logger");
 const lang_1 = require("../../utils/lang");
+const HubSpotHttpError_1 = require("../../models/HubSpotHttpError");
+const errors_1 = require("../../errors");
 const i18nKey = 'lib.cms.watch';
 const queue = new p_queue_1.default({
     concurrency: 10,
@@ -36,11 +37,14 @@ function _notifyOfThemePreview(filePath, accountId) {
 }
 const notifyOfThemePreview = (0, debounce_1.default)(_notifyOfThemePreview, 1000);
 const defaultOnUploadFileError = (file, dest, accountId) => (error) => {
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFailed`, {
+    const uploadFailedMessage = (0, lang_1.i18n)(`${i18nKey}.uploadFailed`, {
         file,
         dest,
-    }));
-    (0, apiErrors_1.throwApiUploadError)(error, {
+    });
+    logger_1.logger.debug(uploadFailedMessage);
+    throw new HubSpotHttpError_1.HubSpotHttpError(uploadFailedMessage, {
+        cause: error,
+    }, {
         accountId,
         request: dest,
         payload: file,
@@ -98,14 +102,17 @@ async function deleteRemoteFile(accountId, filePath, remoteFilePath) {
             logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.deleteSuccess`, { remoteFilePath }));
             notifyOfThemePreview(filePath, accountId);
         })
-            .catch((error) => {
+            .catch(error => {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.deleteFailed`, {
                 remoteFilePath,
             }));
-            (0, apiErrors_1.throwApiError)(error, {
-                accountId,
-                request: remoteFilePath,
-            });
+            if ((0, errors_1.isHubSpotHttpError)(error)) {
+                error.updateContext({
+                    accountId,
+                    request: remoteFilePath,
+                });
+            }
+            throw error;
         });
     });
 }

package/lib/customObjects.js

@@ -9,7 +9,6 @@ const path_1 = __importDefault(require("path"));
 const prettier_1 = __importDefault(require("prettier"));
 const path_2 = require("../lib/path");
 const customObjects_1 = require("../api/customObjects");
-const apiErrors_1 = require("../errors/apiErrors");
 function getResolvedPath(dest, name) {
     if (name)
         return path_1.default.resolve((0, path_2.getCwd)(), dest || '', `${name}.json`);
@@ -24,13 +23,8 @@ async function writeSchemaToDisk(schema, dest) {
 }
 exports.writeSchemaToDisk = writeSchemaToDisk;
 async function downloadSchemas(accountId, dest) {
-    let response;
-    try {
-        response = await (0, customObjects_1.fetchObjectSchemas)(accountId);
-    }
-    catch (err) {
-        (0, apiErrors_1.throwApiError)(err);
-    }
+    const axiosResponse = await (0, customObjects_1.fetchObjectSchemas)(accountId);
+    const response = axiosResponse.data;
     if (response.results.length) {
         for (const schema of response.results) {
             await writeSchemaToDisk(schema, dest);
@@ -40,13 +34,8 @@ async function downloadSchemas(accountId, dest) {
 }
 exports.downloadSchemas = downloadSchemas;
 async function downloadSchema(accountId, schemaObjectType, dest) {
-    let response;
-    try {
-        response = await (0, customObjects_1.fetchObjectSchema)(accountId, schemaObjectType);
-    }
-    catch (err) {
-        (0, apiErrors_1.throwApiError)(err);
-    }
+    const axiosResponse = await (0, customObjects_1.fetchObjectSchema)(accountId, schemaObjectType);
+    const response = axiosResponse.data;
     await writeSchemaToDisk(response, dest);
     return response;
 }

package/lib/fileManager.js

@@ -11,13 +11,12 @@ const fileManager_1 = require("../api/fileManager");
 const fs_1 = require("./fs");
 const logger_1 = require("./logger");
 const ignoreRules_1 = require("./ignoreRules");
-const http_1 = __importDefault(require("../http"));
+const http_1 = require("../http");
 const escapeRegExp_1 = require("./escapeRegExp");
 const path_2 = require("./path");
-const apiErrors_1 = require("../errors/apiErrors");
-const standardErrors_1 = require("../errors/standardErrors");
-const fileSystemErrors_1 = require("../errors/fileSystemErrors");
 const lang_1 = require("../utils/lang");
+const errors_1 = require("../errors");
+const FileSystemError_1 = require("../models/FileSystemError");
 const i18nKey = 'lib.fileManager';
 async function uploadFolder(accountId, src, dest) {
     const regex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(src)}`);
@@ -38,13 +37,17 @@ async function uploadFolder(accountId, src, dest) {
             logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.uploadSuccess`, { file, destPath }));
         }
         catch (err) {
-            if ((0, standardErrors_1.isFatalError)(err)) {
-                (0, standardErrors_1.throwError)(err);
+            if ((0, errors_1.isHubSpotHttpError)(err)) {
+                err.updateContext({
+                    filepath: file,
+                    dest: destPath,
+                });
+                throw err;
             }
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.uploadFailed`, {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.uploadFailed`, {
                 file,
                 destPath,
-            });
+            }));
         }
     }
 }
@@ -65,7 +68,7 @@ async function downloadFile(accountId, file, dest, overwrite) {
     if (await skipExisting(overwrite || false, destPath)) {
         return;
     }
-    await http_1.default.getOctetStream(accountId, {
+    await http_1.http.getOctetStream(accountId, {
         baseURL: file.url,
         url: '',
     }, destPath);
@@ -76,7 +79,7 @@ async function fetchAllPagedFiles(accountId, folderId, includeArchived) {
     let count = 0;
     let offset = 0;
     while (totalFiles === null || count < totalFiles) {
-        const response = await (0, fileManager_1.fetchFiles)(accountId, folderId, offset, includeArchived);
+        const { data: response } = await (0, fileManager_1.fetchFiles)(accountId, folderId, offset, includeArchived);
         if (totalFiles === null) {
             totalFiles = response.total_count;
         }
@@ -91,10 +94,10 @@ async function fetchFolderContents(accountId, folder, dest, overwrite, includeAr
         await fs_extra_1.default.ensureDir(dest);
     }
     catch (err) {
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             dest,
             accountId,
-            write: true,
+            operation: 'write',
         });
     }
     const files = await fetchAllPagedFiles(accountId, folder.id, includeArchived);
@@ -105,7 +108,7 @@ async function fetchFolderContents(accountId, folder, dest, overwrite, includeAr
     for (const file of files) {
         await downloadFile(accountId, file, dest, overwrite);
     }
-    const { objects: folders } = await (0, fileManager_1.fetchFolders)(accountId, folder.id);
+    const { data: { objects: folders }, } = await (0, fileManager_1.fetchFolders)(accountId, folder.id);
     for (const folder of folders) {
         const nestedFolder = path_1.default.join(dest, folder.name);
         await fetchFolderContents(accountId, folder, nestedFolder, overwrite, includeArchived);
@@ -134,10 +137,10 @@ async function downloadFolder(accountId, src, dest, folder, overwrite, includeAr
 // Download a single file and write to local file system.
 async function downloadSingleFile(accountId, src, dest, file, overwrite, includeArchived) {
     if (!includeArchived && file.archived) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.archivedFile`, { src });
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.archivedFile`, { src }));
     }
     if (file.hidden) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.hiddenFile`, { src });
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.hiddenFile`, { src }));
     }
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.fetchFileStarted`, {
         src,
@@ -159,7 +162,7 @@ async function downloadFileOrFolder(accountId, src, dest, overwrite, includeArch
             await downloadFolder(accountId, src, dest, rootFolder, overwrite, includeArchived);
         }
         else {
-            const { file, folder } = await (0, fileManager_1.fetchStat)(accountId, src);
+            const { data: { file, folder }, } = await (0, fileManager_1.fetchStat)(accountId, src);
             if (file) {
                 await downloadSingleFile(accountId, src, dest, file, overwrite, includeArchived);
             }
@@ -169,15 +172,13 @@ async function downloadFileOrFolder(accountId, src, dest, overwrite, includeArch
         }
     }
     catch (err) {
-        const error = err;
-        if (error.isAxiosError) {
-            (0, apiErrors_1.throwApiError)(err, {
+        if ((0, errors_1.isAuthError)(err)) {
+            err.updateContext({
                 request: src,
                 accountId,
             });
         }
-        else
-            (0, standardErrors_1.throwError)(error);
+        throw err;
     }
 }
 exports.downloadFileOrFolder = downloadFileOrFolder;