@hubspot/local-dev-lib 1.2.0 → 1.3.0

package/lib/cms/watch.d.ts

@@ -13,5 +13,5 @@ type WatchOptions = {
     filePaths?: Array<string>;
 };
 type ErrorHandler = (error: AxiosError) => void;
-export declare function watch(accountId: number, src: string, dest: string, { mode, remove, disableInitial, notify, commandOptions, filePaths, }: WatchOptions, postInitialUploadCallback?: ((result: Array<UploadFolderResults>) => void) | null, onUploadFolderError?: ErrorHandler, onQueueAddError?: ErrorHandler): chokidar.FSWatcher;
+export declare function watch(accountId: number, src: string, dest: string, { mode, remove, disableInitial, notify, commandOptions, filePaths, }: WatchOptions, postInitialUploadCallback?: ((result: Array<UploadFolderResults>) => void) | null, onUploadFolderError?: ErrorHandler, onQueueAddError?: ErrorHandler, onUploadFileError?: (file: string, dest: string, accountId: number) => ErrorHandler): chokidar.FSWatcher;
 export {};

package/lib/cms/watch.js

@@ -35,7 +35,18 @@ function _notifyOfThemePreview(filePath, accountId) {
     }));
 }
 const notifyOfThemePreview = (0, debounce_1.default)(_notifyOfThemePreview, 1000);
-async function uploadFile(accountId, file, dest, options, mode = null) {
+const defaultOnUploadFileError = (file, dest, accountId) => (error) => {
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFailed`, {
+        file,
+        dest,
+    }));
+    (0, apiErrors_1.throwApiUploadError)(error, {
+        accountId,
+        request: dest,
+        payload: file,
+    });
+};
+async function uploadFile(accountId, file, dest, options, mode = null, onUploadFileError = defaultOnUploadFileError) {
     const src = options.src;
     const absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), file);
     const themeJsonPath = (0, themes_1.getThemeJSONPath)(absoluteSrcPath);
@@ -71,17 +82,7 @@ async function uploadFile(accountId, file, dest, options, mode = null) {
             .catch(() => {
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFailed`, { file, dest }));
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadRetry`, { file, dest }));
-            return (0, fileMapper_2.upload)(accountId, file, dest, apiOptions).catch((error) => {
-                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFailed`, {
-                    file,
-                    dest,
-                }));
-                (0, apiErrors_1.throwApiUploadError)(error, {
-                    accountId,
-                    request: dest,
-                    payload: file,
-                });
-            });
+            return (0, fileMapper_2.upload)(accountId, file, dest, apiOptions).catch(onUploadFileError(file, dest, accountId));
         });
     });
 }
@@ -108,7 +109,7 @@ async function deleteRemoteFile(accountId, filePath, remoteFilePath) {
         });
     });
 }
-function watch(accountId, src, dest, { mode, remove, disableInitial, notify, commandOptions, filePaths, }, postInitialUploadCallback = null, onUploadFolderError, onQueueAddError) {
+function watch(accountId, src, dest, { mode, remove, disableInitial, notify, commandOptions, filePaths, }, postInitialUploadCallback = null, onUploadFolderError, onQueueAddError, onUploadFileError) {
     const regex = new RegExp(`^${(0, escapeRegExp_1.escapeRegExp)(src)}`);
     if (notify) {
         (0, ignoreRules_1.ignoreFile)(notify);
@@ -145,7 +146,7 @@ function watch(accountId, src, dest, { mode, remove, disableInitial, notify, com
         const uploadPromise = uploadFile(accountId, filePath, destPath, {
             src,
             commandOptions,
-        }, mode);
+        }, mode, onUploadFileError);
         (0, notify_1.triggerNotify)(notify, 'Added', filePath, uploadPromise);
     });
     if (remove) {
@@ -185,7 +186,7 @@ function watch(accountId, src, dest, { mode, remove, disableInitial, notify, com
         const uploadPromise = uploadFile(accountId, filePath, destPath, {
             src,
             commandOptions,
-        }, mode);
+        }, mode, onUploadFileError);
         (0, notify_1.triggerNotify)(notify, 'Changed', filePath, uploadPromise);
     });
     return watcher;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {