@hubspot/local-dev-lib 1.13.0 → 2.0.0

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;

package/lib/fileMapper.js

@@ -11,12 +11,11 @@ const p_queue_1 = __importDefault(require("p-queue"));
 const path_2 = require("./path");
 const logger_1 = require("./logger");
 const fileMapper_1 = require("../api/fileMapper");
-const standardErrors_1 = require("../errors/standardErrors");
 const extensions_1 = require("../constants/extensions");
 const files_1 = require("../constants/files");
-const fileSystemErrors_1 = require("../errors/fileSystemErrors");
-const apiErrors_1 = require("../errors/apiErrors");
+const errors_1 = require("../errors");
 const lang_1 = require("../utils/lang");
+const FileSystemError_1 = require("../models/FileSystemError");
 const i18nKey = 'lib.fileMapper';
 const queue = new p_queue_1.default({
     concurrency: 10,
@@ -77,9 +76,9 @@ function validateFileMapperNode(node) {
     catch (err) {
         json = node;
     }
-    (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.invalidNode`, {
+    throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidNode`, {
         json: JSON.stringify(json),
-    });
+    }));
 }
 function getTypeDataFromPath(src) {
     const isModule = isPathToModule(src);
@@ -125,10 +124,10 @@ async function writeUtimes(accountId, filepath, node) {
         await fs_extra_1.default.utimes(filepath, atime, mtime);
     }
     catch (err) {
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath,
             accountId,
-            write: true,
+            operation: 'write',
         });
     }
 }
@@ -151,15 +150,9 @@ async function fetchAndWriteFileStream(accountId, srcPath, filepath, mode, optio
         return;
     }
     if (!(0, path_2.isAllowedExtension)(srcPath, Array.from(extensions_1.JSR_ALLOWED_EXTENSIONS))) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.invalidFileType`, { srcPath });
-    }
-    let node;
-    try {
-        node = await (0, fileMapper_1.fetchFileStream)(accountId, srcPath, filepath, getFileMapperQueryValues(mode, options));
-    }
-    catch (err) {
-        (0, standardErrors_1.throwError)(err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidFileType`, { srcPath }));
     }
+    const node = await (0, fileMapper_1.fetchFileStream)(accountId, srcPath, filepath, getFileMapperQueryValues(mode, options));
     await writeUtimes(accountId, filepath, node);
 }
 // Writes an individual file or folder (not recursive).  If file source is missing, the
@@ -188,21 +181,20 @@ async function writeFileMapperNode(accountId, filepath, node, mode, options = {}
         }));
     }
     catch (err) {
-        (0, fileSystemErrors_1.throwFileSystemError)(err, {
+        throw new FileSystemError_1.FileSystemError({ cause: err }, {
             filepath: localFilepath,
             accountId,
-            write: true,
+            operation: 'write',
         });
-        return false;
     }
     return true;
 }
 async function downloadFile(accountId, src, destPath, mode, options = {}) {
     const { isFile, isHubspot } = getTypeDataFromPath(src);
+    if (!isFile) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidRequest`, { src }));
+    }
     try {
-        if (!isFile) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.invalidRequest`, { src });
-        }
         const dest = path_1.default.resolve(destPath);
         const cwd = (0, path_2.getCwd)();
         let filepath;
@@ -232,24 +224,24 @@ async function downloadFile(accountId, src, destPath, mode, options = {}) {
     }
     catch (err) {
         const error = err;
-        if (isHubspot && (0, apiErrors_1.isTimeoutError)(error)) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.assetTimeout`, {}, error);
+        if (isHubspot && (0, errors_1.isTimeoutError)(error)) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.assetTimeout`), { cause: error });
         }
         else {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.failedToFetchFile`, { src, dest: destPath }, error);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.failedToFetchFile`, { src, dest: destPath }), { cause: error });
         }
     }
 }
 async function fetchFolderFromApi(accountId, src, mode, options = {}) {
     const { isRoot, isFolder, isHubspot } = getTypeDataFromPath(src);
     if (!isFolder) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.invalidFetchFolderRequest`, {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.invalidFetchFolderRequest`, {
             src,
-        });
+        }));
     }
     const srcPath = isRoot ? '@root' : src;
     const queryValues = getFileMapperQueryValues(mode, options);
-    const node = isHubspot
+    const { data: node } = isHubspot
         ? await (0, fileMapper_1.downloadDefault)(accountId, srcPath, queryValues)
         : await (0, fileMapper_1.download)(accountId, srcPath, queryValues);
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.folderFetch`, { src, accountId }));
@@ -289,16 +281,17 @@ async function downloadFolder(accountId, src, destPath, mode, options = {}) {
             }));
         }
         else {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.incompleteFetch`, { src });
+            // TODO: Fix this exception. It is triggering the catch block so this error is being rewritten
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.incompleteFetch`, { src }));
         }
     }
     catch (err) {
         const error = err;
-        if ((0, apiErrors_1.isTimeoutError)(error)) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.assetTimeout`, {}, error);
+        if ((0, errors_1.isTimeoutError)(error)) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.assetTimeout`), { cause: error });
         }
         else {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.failedToFetchFolder`, { src, dest: destPath }, err);
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.failedToFetchFolder`, { src, dest: destPath }), { cause: err });
         }
     }
 }

package/lib/fs.js

@@ -7,7 +7,7 @@ exports.walk = exports.flattenAndRemoveSymlinks = exports.getFileInfoAsync = voi
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const files_1 = require("../constants/files");
-const standardErrors_1 = require("../errors/standardErrors");
+const FileSystemError_1 = require("../models/FileSystemError");
 function getFileInfoAsync(dir, file) {
     return new Promise((resolve, reject) => {
         const filepath = path_1.default.join(dir, file);
@@ -65,7 +65,7 @@ async function walk(dir) {
         .then(processFiles)
         .then(flattenAndRemoveSymlinks)
         .catch(err => {
-        (0, standardErrors_1.throwError)(err);
+        throw new FileSystemError_1.FileSystemError({ cause: err });
     });
 }
 exports.walk = walk;

package/lib/github.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.listGithubRepoContents = exports.downloadGithubRepoContents = exports.fetchGitHubRepoContentFromDownloadUrl = exports.cloneGithubRepo = exports.fetchReleaseData = exports.fetchFileFromRepository = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const standardErrors_1 = require("../errors/standardErrors");
 const archive_1 = require("./archive");
 const logger_1 = require("./logger");
 const github_1 = require("../api/github");
 const lang_1 = require("../utils/lang");
+const errors_1 = require("../errors");
 const i18nKey = 'lib.github';
 async function fetchFileFromRepository(repoPath, filePath, ref) {
     try {
@@ -21,7 +21,9 @@ async function fetchFileFromRepository(repoPath, filePath, ref) {
         return data;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.fetchFileFromRepository.errors.fetchFail`, {}, err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.fetchFileFromRepository.errors.fetchFail`), {
+            cause: err,
+        });
     }
 }
 exports.fetchFileFromRepository = fetchFileFromRepository;
@@ -38,7 +40,9 @@ async function fetchReleaseData(repoPath, tag) {
         return data;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.fetchReleaseData.errors.fetchFail`, { tag: tag || 'latest' }, err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.fetchReleaseData.errors.fetchFail`, {
+            tag: tag || 'latest',
+        }), { cause: err });
     }
 }
 exports.fetchReleaseData = fetchReleaseData;
@@ -65,7 +69,9 @@ async function downloadGithubRepoZip(repoPath, isRelease = false, options = {})
         return data;
     }
     catch (err) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.downloadGithubRepoZip.errors.fetchFail`, {}, err);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoZip.errors.fetchFail`), {
+            cause: err,
+        });
     }
 }
 async function cloneGithubRepo(repoPath, dest, options = {}) {
@@ -95,7 +101,7 @@ async function fetchGitHubRepoContentFromDownloadUrl(dest, downloadUrl) {
     else {
         fileContents = resp.data;
     }
-    await fs_extra_1.default.outputFileSync(dest, fileContents);
+    fs_extra_1.default.outputFileSync(dest, fileContents);
 }
 exports.fetchGitHubRepoContentFromDownloadUrl = fetchGitHubRepoContentFromDownloadUrl;
 // Writes files from a public repository to the destination folder
@@ -131,15 +137,12 @@ async function downloadGithubRepoContents(repoPath, contentPath, dest, ref, filt
         await Promise.all(contentPromises);
     }
     catch (e) {
-        const error = e;
-        if (error?.error?.message) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.downloadGithubRepoContents.errors.fetchFail`, {
-                errorMessage: error.error.message,
-            }, error);
-        }
-        else {
-            (0, standardErrors_1.throwError)(error);
+        if ((0, errors_1.isSystemError)(e) && e?.error?.message) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoContents.errors.fetchFail`, {
+                errorMessage: e.error.message,
+            }), { cause: e });
         }
+        throw e;
     }
 }
 exports.downloadGithubRepoContents = downloadGithubRepoContents;
@@ -153,15 +156,12 @@ async function listGithubRepoContents(repoPath, contentPath, fileFilter) {
         return filteredFiles;
     }
     catch (e) {
-        const error = e;
-        if (error?.response?.data?.message) {
-            (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.downloadGithubRepoContents.errors.fetchFail`, {
-                errorMessage: error.response.data.message,
-            });
-        }
-        else {
-            (0, standardErrors_1.throwError)(error);
+        if ((0, errors_1.isHubSpotHttpError)(e) && e.data.message) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.downloadGithubRepoContents.errors.fetchFail`, {
+                errorMessage: e.data.message,
+            }));
         }
+        throw e;
     }
 }
 exports.listGithubRepoContents = listGithubRepoContents;

package/lib/gitignore.js

@@ -8,7 +8,7 @@ const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
 const git_1 = require("../utils/git");
 const config_1 = require("../constants/config");
-const standardErrors_1 = require("../errors/standardErrors");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.gitignore';
 const GITIGNORE_FILE = '.gitignore';
 function checkAndAddConfigToGitignore(configPath) {
@@ -26,7 +26,7 @@ function checkAndAddConfigToGitignore(configPath) {
         (0, fs_extra_1.writeFileSync)(gitignoreFilePath, updatedContents);
     }
     catch (e) {
-        (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.errors.configIgnore`, {}, e);
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.configIgnore`), { cause: e });
     }
 }
 exports.checkAndAddConfigToGitignore = checkAndAddConfigToGitignore;

package/lib/hubdb.d.ts

@@ -1,4 +1,5 @@
-import { Row } from '../types/Hubdb';
+import { AxiosResponse } from 'axios';
+import { Row, Table } from '../types/Hubdb';
 export declare function addRowsToHubDbTable(accountId: number, tableId: string, rows?: Array<Row>): Promise<{
     tableId: string;
     rowCount: number;
@@ -7,7 +8,7 @@ export declare function createHubDbTable(accountId: number, src: string): Promis
     tableId: string;
     rowCount: number;
 }>;
-export declare function updateHubDbTable(accountId: number, tableId: string, src: string): Promise<unknown>;
+export declare function updateHubDbTable(accountId: number, tableId: string, src: string): Promise<AxiosResponse<Table, any>>;
 export declare function downloadHubDbTable(accountId: number, tableId: string, dest: string): Promise<{
     filePath: string;
 }>;