@hubspot/local-dev-lib 0.2.3 → 0.3.0

package/lang/en.json

@@ -57,6 +57,11 @@
                 "errors": {
                     "fetchFail": "Failed to fetch contents: {{ errorMessage }}"
                 }
+            },
+            "listGitHubRepoContents": {
+                "errors": {
+                    "fetchFail": "Failed to fetch contents: {{ errorMessage }}"
+                }
             }
         },
         "hubdb": {
@@ -71,16 +76,6 @@
                 "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}"
             }
         },
-        "sandboxes": {
-            "errors": {
-                "createSandbox": "There was an error creating your sandbox.",
-                "deleteSandbox": "There was an error deleting your sandbox.",
-                "getSandboxUsageLimits": "There was an error fetching sandbox usage limits.",
-                "initiateSync": "There was an error initiating the sandbox sync.",
-                "fetchTaskStatus": "There was an error fetching the task status while syncing sandboxes.",
-                "fetchTypes": "There was an error fetching sandbox types."
-            }
-        },
         "cms": {
             "modules": {
                 "createModule": {
@@ -92,6 +87,11 @@
                         "fileReadFailure": "Failed to read file at {{ path }}",
                         "failedToWrite": "failed to write to file at {{ path }}"
                     }
+                },
+                "retrieveDefaultModule": {
+                    "errors": {
+                        "pathExists": "Folder already exists at \"{{ path }}\""
+                    }
                 }
             },
             "functions": {

package/lang/lang/en.json

@@ -57,6 +57,11 @@
         "errors": {
           "fetchFail": "Failed to fetch contents: {{ errorMessage }}"
         }
+      },
+      "listGitHubRepoContents": {
+        "errors": {
+          "fetchFail": "Failed to fetch contents: {{ errorMessage }}"
+        }
       }
     },
     "hubdb": {
@@ -71,16 +76,6 @@
         "invalidPersonalAccessKey": "Error while retrieving new access token: {{ errorMessage }}"
       }
     },
-    "sandboxes": {
-      "errors": {
-        "createSandbox": "There was an error creating your sandbox.",
-        "deleteSandbox": "There was an error deleting your sandbox.",
-        "getSandboxUsageLimits": "There was an error fetching sandbox usage limits.",
-        "initiateSync": "There was an error initiating the sandbox sync.",
-        "fetchTaskStatus": "There was an error fetching the task status while syncing sandboxes.",
-        "fetchTypes": "There was an error fetching sandbox types."
-      }
-    },
     "cms": {
       "modules": {
         "createModule": {
@@ -92,6 +87,11 @@
             "fileReadFailure": "Failed to read file at {{ path }}",
             "failedToWrite": "failed to write to file at {{ path }}"
           }
+        },
+        "retrieveDefaultModule": {
+          "errors": {
+            "pathExists": "Folder already exists at \"{{ path }}\""
+          }
         }
       },
       "functions": {

package/lib/archive.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
-import { LogCallbacksArg } from '../types/LogCallbacks';
-declare const archiveCallbackKeys: readonly ["init", "copy"];
 type CopySourceToDestOptions = {
     sourceDir?: string;
     includesRootDir?: boolean;
 };
-export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir }?: CopySourceToDestOptions, logCallbacks?: LogCallbacksArg<typeof archiveCallbackKeys>): Promise<boolean>;
+export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir }?: CopySourceToDestOptions): Promise<boolean>;
 export {};

package/lib/archive.js

@@ -10,14 +10,13 @@ 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("../utils/logger");
+const logger_1 = require("./logging/logger");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.archive';
-const archiveCallbackKeys = ['init', 'copy'];
-async function extractZip(name, zip, logCallbacks) {
-    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+async function extractZip(name, zip) {
     const result = { extractDir: '', tmpDir: '' };
     const TMP_FOLDER_PREFIX = `hubspot-temp-${name}-`;
-    logger('init', `${i18nKey}.extractZip.init`);
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.extractZip.init`));
     // Write zip to disk
     let tmpZipPath = '';
     try {
@@ -49,19 +48,18 @@ async function extractZip(name, zip, logCallbacks) {
     catch (err) {
         (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.extractZip.errors.extract`, {}, err);
     }
-    (0, logger_1.debug)(`${i18nKey}.extractZip.success`);
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.extractZip.success`));
     return result;
 }
-async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true } = {}, logCallbacks) {
+async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true } = {}) {
     try {
-        const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
-        logger('copy', `${i18nKey}.copySourceToDest.init`);
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.init`));
         const srcDirPath = [src];
         if (includesRootDir) {
             const files = await fs_extra_1.default.readdir(src);
             const rootDir = files[0];
             if (!rootDir) {
-                (0, logger_1.debug)(`${i18nKey}.copySourceToDest.sourceEmpty`);
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.sourceEmpty`));
                 // Create the dest path if it doesn't already exist
                 fs_extra_1.default.ensureDir(dest);
                 // No root found so nothing to copy
@@ -74,11 +72,11 @@ async function copySourceToDest(src, dest, { sourceDir, includesRootDir = true }
         }
         const projectSrcDir = (0, path_1.join)(...srcDirPath);
         await fs_extra_1.default.copy(projectSrcDir, dest);
-        (0, logger_1.debug)(`${i18nKey}.copySourceToDest.success`);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.success`));
         return true;
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.copySourceToDest.error`, { dest });
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.copySourceToDest.error`, { dest }));
         (0, fileSystemErrors_1.throwFileSystemError)(err, {
             filepath: dest,
             write: true,
@@ -93,18 +91,18 @@ function cleanupTempDir(tmpDir) {
         fs_extra_1.default.remove(tmpDir);
     }
     catch (e) {
-        (0, logger_1.debug)(`${i18nKey}.cleanupTempDir.error`, { tmpDir });
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.cleanupTempDir.error`, { tmpDir }));
     }
 }
-async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir } = {}, logCallbacks) {
+async function extractZipArchive(zip, name, dest, { sourceDir, includesRootDir } = {}) {
     let success = false;
     if (zip) {
-        const { extractDir, tmpDir } = await extractZip(name, zip, logCallbacks);
+        const { extractDir, tmpDir } = await extractZip(name, zip);
         if (extractDir !== null) {
             success = await copySourceToDest(extractDir, dest, {
                 sourceDir,
                 includesRootDir,
-            }, logCallbacks);
+            });
         }
         cleanupTempDir(tmpDir);
     }

package/lib/cms/functions.d.ts

@@ -1,5 +1,3 @@
-import { LogCallbacksArg } from '../../types/LogCallbacks';
-declare const createFunctionCallbackKeys: readonly ["destPathAlreadyExists", "createdDest", "createdFunctionFile", "createdConfigFile", "success"];
 type FunctionInfo = {
     functionsFolder: string;
     filename: string;
@@ -9,5 +7,5 @@ type FunctionInfo = {
 type FunctionOptions = {
     allowExistingFile?: boolean;
 };
-export declare function createFunction(functionInfo: FunctionInfo, dest: string, options?: FunctionOptions, logCallbacks?: LogCallbacksArg<typeof createFunctionCallbackKeys>): Promise<void>;
+export declare function createFunction(functionInfo: FunctionInfo, dest: string, options?: FunctionOptions): Promise<void>;
 export {};

package/lib/cms/functions.js

@@ -9,17 +9,11 @@ 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("../../utils/logger");
+const logger_1 = require("../logging/logger");
 const standardErrors_1 = require("../../errors/standardErrors");
 const fileSystemErrors_1 = require("../../errors/fileSystemErrors");
+const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.functions';
-const createFunctionCallbackKeys = [
-    'destPathAlreadyExists',
-    'createdDest',
-    'createdFunctionFile',
-    'createdConfigFile',
-    'success',
-];
 function isObjectOrFunction(value) {
     const type = typeof value;
     return value != null && (type === 'object' || type === 'function');
@@ -51,9 +45,9 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         configString = fs_extra_1.default.readFileSync(configFilePath).toString();
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.updateExistingConfig.unableToReadFile`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.unableToReadFile`, {
             configFilePath,
-        });
+        }));
         (0, fileSystemErrors_1.throwFileSystemError)(err, {
             filepath: configFilePath,
             read: true,
@@ -64,9 +58,9 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         config = JSON.parse(configString);
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.updateExistingConfig.invalidJSON`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.invalidJSON`, {
             configFilePath,
-        });
+        }));
         (0, fileSystemErrors_1.throwFileSystemError)(err, {
             filepath: configFilePath,
             read: true,
@@ -95,17 +89,16 @@ function updateExistingConfig(configFilePath, { endpointPath, endpointMethod, fu
         writeConfig(configFilePath, config);
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.updateExistingConfig.couldNotUpdateFile`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateExistingConfig.couldNotUpdateFile`, {
             configFilePath,
-        });
+        }));
         (0, fileSystemErrors_1.throwFileSystemError)(err, {
             filepath: configFilePath,
             write: true,
         });
     }
 }
-async function createFunction(functionInfo, dest, options = {}, logCallbacks) {
-    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+async function createFunction(functionInfo, dest, options = {}) {
     const { functionsFolder, filename, endpointPath, endpointMethod } = functionInfo;
     const allowExistingFile = options.allowExistingFile || false;
     const ancestorFunctionsConfig = (0, findup_sync_1.default)('serverless.json', {
@@ -123,15 +116,15 @@ async function createFunction(functionInfo, dest, options = {}, logCallbacks) {
     const functionFile = filename.endsWith('.js') ? filename : `${filename}.js`;
     const destPath = path_1.default.join(dest, folderName);
     if (fs_extra_1.default.existsSync(destPath)) {
-        logger('destPathAlreadyExists', `${i18nKey}.createFunction.destPathAlreadyExists`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.destPathAlreadyExists`, {
             path: destPath,
-        });
+        }));
     }
     else {
         fs_extra_1.default.mkdirp(destPath);
-        logger('createdDest', `${i18nKey}.createFunction.createdDest`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdDest`, {
             path: destPath,
-        });
+        }));
     }
     const functionFilePath = path_1.default.join(destPath, functionFile);
     const configFilePath = path_1.default.join(destPath, 'serverless.json');
@@ -141,22 +134,22 @@ async function createFunction(functionInfo, dest, options = {}, logCallbacks) {
         });
     }
     await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', 'functions/sample-function.js', functionFilePath);
-    logger('createdFunctionFile', `${i18nKey}.createFunction.createdFunctionFile`, {
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdFunctionFile`, {
         path: functionFilePath,
-    });
+    }));
     if (fs_extra_1.default.existsSync(configFilePath)) {
         updateExistingConfig(configFilePath, {
             endpointPath,
             endpointMethod,
             functionFile,
         });
-        logger('createdFunctionFile', `${i18nKey}.createFunction.createdFunctionFile`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdFunctionFile`, {
             path: functionFilePath,
-        });
-        logger('success', `${i18nKey}.createFunction.success`, {
+        }));
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.success`, {
             endpointPath: endpointPath,
             folderName,
-        });
+        }));
     }
     else {
         const config = createConfig({ endpointPath, endpointMethod, functionFile });
@@ -164,21 +157,21 @@ async function createFunction(functionInfo, dest, options = {}, logCallbacks) {
             writeConfig(configFilePath, config);
         }
         catch (err) {
-            (0, logger_1.debug)(`${i18nKey}.createFunction.failedToCreateFile`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.createFunction.failedToCreateFile`, {
                 configFilePath,
-            });
+            }));
             (0, fileSystemErrors_1.throwFileSystemError)(err, {
                 filepath: configFilePath,
                 write: true,
             });
         }
-        logger('createdConfigFile', `${i18nKey}.createFunction.createdConfigFile`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdConfigFile`, {
             path: configFilePath,
-        });
-        logger('success', `${i18nKey}.createFunction.success`, {
+        }));
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.success`, {
             endpointPath: endpointPath,
             folderName,
-        });
+        }));
     }
 }
 exports.createFunction = createFunction;

package/lib/cms/handleFieldsJS.js

@@ -10,8 +10,9 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const escapeRegExp_1 = require("../../utils/escapeRegExp");
 const modules_1 = require("../../utils/cms/modules");
-const logger_1 = require("../../utils/logger");
+const logger_1 = require("../logging/logger");
 const standardErrors_1 = require("../../errors/standardErrors");
+const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.handleFieldsJs';
 class FieldsJs {
     projectDir;
@@ -51,9 +52,9 @@ class FieldsJs {
                     writeDir,
                 },
             });
-            (0, logger_1.debug)(`${i18nKey}.convertFieldsJs.creating`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.convertFieldsJs.creating`, {
                 pid: convertFieldsProcess.pid || '',
-            });
+            }));
             convertFieldsProcess.on('message', function (message) {
                 if (message.action === 'ERROR') {
                     reject(message.message);
@@ -63,9 +64,9 @@ class FieldsJs {
                 }
             });
             convertFieldsProcess.on('close', () => {
-                (0, logger_1.debug)(`${i18nKey}.convertFieldsJs.terminating`, {
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.convertFieldsJs.terminating`, {
                     pid: convertFieldsProcess.pid || '',
-                });
+                }));
             });
         }).catch((e) => {
             (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.convertFieldsJs.errors.errorConverting`, { filePath }, e);

package/lib/cms/modules.d.ts

@@ -1,6 +1,4 @@
-import { LogCallbacksArg } from '../../types/LogCallbacks';
 import { PathInput } from '../../types/Modules';
-declare const createModuleCallbackKeys: readonly ["creatingPath", "creatingModule"];
 export declare const ValidationIds: {
     SRC_REQUIRED: string;
     DEST_REQUIRED: string;
@@ -21,5 +19,6 @@ type ModuleDefinition = {
 };
 export declare function createModule(moduleDefinition: ModuleDefinition, name: string, dest: string, getInternalVersion: boolean, options?: {
     allowExistingDir: boolean;
-}, logCallbacks?: LogCallbacksArg<typeof createModuleCallbackKeys>): Promise<void>;
+}): Promise<void>;
+export declare function retrieveDefaultModule(name: string | undefined, dest: string): Promise<import("../../types/Github").GithubRepoFile[] | undefined>;
 export {};

package/lib/cms/modules.js

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createModule = exports.validateSrcAndDestPaths = exports.ValidationIds = void 0;
+exports.retrieveDefaultModule = exports.createModule = exports.validateSrcAndDestPaths = exports.ValidationIds = void 0;
 const path_1 = __importDefault(require("path"));
 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("../../utils/logger");
+const logger_1 = require("../logging/logger");
 const modules_1 = require("../../utils/cms/modules");
+const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.modules';
-const createModuleCallbackKeys = ['creatingPath', 'creatingModule'];
 // Ids for testing
 exports.ValidationIds = {
     SRC_REQUIRED: 'SRC_REQUIRED',
@@ -116,8 +116,7 @@ const transformFileContents = (file, metaData, getInternalVersion) => {
 };
 async function createModule(moduleDefinition, name, dest, getInternalVersion, options = {
     allowExistingDir: false,
-}, logCallbacks) {
-    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
+}) {
     const { reactType: isReactModule } = moduleDefinition;
     const folderName = name.endsWith('.module') ? name : `${name}.module`;
     const destPath = !isReactModule
@@ -129,14 +128,14 @@ async function createModule(moduleDefinition, name, dest, getInternalVersion, op
         });
     }
     else {
-        logger('creatingPath', `${i18nKey}.createModule.creatingPath`, {
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createModule.creatingPath`, {
             path: destPath,
-        });
+        }));
         fs_extra_1.default.ensureDirSync(destPath);
     }
-    logger('creatingModule', `${i18nKey}.createModule.creatingModule`, {
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createModule.creatingModule`, {
         path: destPath,
-    });
+    }));
     // Write module meta
     const writeModuleMeta = ({ moduleLabel, contentTypes, global, reactType }, dest) => {
         const metaData = {
@@ -194,3 +193,11 @@ async function createModule(moduleDefinition, name, dest, getInternalVersion, op
     }
 }
 exports.createModule = createModule;
+async function retrieveDefaultModule(name, dest) {
+    if (!name) {
+        const defaultReactModules = await (0, github_1.listGithubRepoContents)('HubSpot/cms-sample-assets', 'modules/', 'dir');
+        return defaultReactModules;
+    }
+    await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', `modules/${name}`, dest);
+}
+exports.retrieveDefaultModule = retrieveDefaultModule;

package/lib/cms/templates.d.ts

@@ -1,5 +1,3 @@
-import { LogCallbacksArg } from '../../types/LogCallbacks';
-declare const templatesCallbackKeys: readonly ["creatingFile"];
 export declare const ANNOTATION_KEYS: {
     isAvailableForNewContent: string;
     templateType: string;
@@ -21,5 +19,5 @@ declare const ASSET_PATHS: {
 };
 export declare function createTemplate(name: string, dest: string, type?: keyof typeof ASSET_PATHS, options?: {
     allowExisting: boolean;
-}, logCallbacks?: LogCallbacksArg<typeof templatesCallbackKeys>): Promise<void>;
+}): Promise<void>;
 export {};

package/lib/cms/templates.js

@@ -8,9 +8,9 @@ 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("../../utils/logger");
+const logger_1 = require("../logging/logger");
+const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.templates';
-const templatesCallbackKeys = ['creatingFile'];
 // Matches the .html file extension, excluding module.html
 const TEMPLATE_EXTENSION_REGEX = new RegExp(/(?<!module)\.html$/);
 // Matches an annotation value, ending at space, newline, or end of string
@@ -47,7 +47,7 @@ const ASSET_PATHS = {
     'search-template': 'templates/search-template.html',
     section: 'templates/section.html',
 };
-async function createTemplate(name, dest, type = 'page-template', options = { allowExisting: false }, logCallbacks) {
+async function createTemplate(name, dest, type = 'page-template', options = { allowExisting: false }) {
     const assetPath = ASSET_PATHS[type];
     const filename = name.endsWith('.html') ? name : `${name}.html`;
     const filePath = path_1.default.join(dest, filename);
@@ -56,12 +56,11 @@ async function createTemplate(name, dest, type = 'page-template', options = { al
             path: filePath,
         });
     }
-    (0, logger_1.debug)(`${i18nKey}.createTemplate.creatingPath`, { path: dest });
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingPath`, { path: dest }));
     fs_extra_1.default.mkdirp(dest);
-    const logger = (0, logger_1.makeTypedLogger)(logCallbacks);
-    logger('creatingFile', `${i18nKey}.createTemplate.creatingFile`, {
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingFile`, {
         path: filePath,
-    });
+    }));
     await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', assetPath, filePath);
 }
 exports.createTemplate = createTemplate;

package/lib/cms/uploadFolder.d.ts

@@ -1,9 +1,7 @@
 import { FieldsJs } from './handleFieldsJS';
 import { FileMapperInputOptions } from '../../types/Files';
-import { LogCallbacksArg } from '../../types/LogCallbacks';
 import { UploadFolderResults } from '../../types/Files';
 import { Mode } from '../../types/Files';
-declare const uploadFolderCallbackKeys: readonly ["success"];
 type CommandOptions = {
     convertFields?: boolean;
     fieldOptions?: string;
@@ -13,6 +11,6 @@ type FilePathsByType = {
     [key: string]: Array<string>;
 };
 export declare function getFilesByType(filePaths: Array<string>, projectDir: string, rootWriteDir: string | null, commandOptions: CommandOptions): Promise<[FilePathsByType, Array<FieldsJs>]>;
-export declare function uploadFolder(accountId: number, src: string, dest: string, fileMapperOptions: FileMapperInputOptions, commandOptions?: CommandOptions, filePaths?: Array<string>, mode?: Mode | null, logCallbacks?: LogCallbacksArg<typeof uploadFolderCallbackKeys>): Promise<Array<UploadFolderResults>>;
+export declare function uploadFolder(accountId: number, src: string, dest: string, fileMapperOptions: FileMapperInputOptions, commandOptions?: CommandOptions, filePaths?: Array<string>, mode?: Mode | null): Promise<Array<UploadFolderResults>>;
 export declare function hasUploadErrors(results: Array<UploadFolderResults>): boolean;
 export {};

package/lib/cms/uploadFolder.js

@@ -11,14 +11,13 @@ const fileMapper_1 = require("../fileMapper");
 const fileMapper_2 = require("../../api/fileMapper");
 const modules_1 = require("../../utils/cms/modules");
 const escapeRegExp_1 = require("../../utils/escapeRegExp");
-const logger_1 = require("../../utils/logger");
 const path_2 = require("../path");
 const standardErrors_1 = require("../../errors/standardErrors");
 const apiErrors_1 = require("../../errors/apiErrors");
-const logger_2 = require("../../utils/logger");
+const logger_1 = require("../logging/logger");
 const files_1 = require("../../constants/files");
+const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.uploadFolder';
-const uploadFolderCallbackKeys = ['success'];
 const queue = new p_queue_1.default({
     concurrency: 10,
 });
@@ -77,8 +76,7 @@ async function getFilesByType(filePaths, projectDir, rootWriteDir, commandOption
     return [filePathsByType, fieldsJsObjects];
 }
 exports.getFilesByType = getFilesByType;
-async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOptions = {}, filePaths = [], mode = null, logCallbacks) {
-    const logger = (0, logger_2.makeTypedLogger)(logCallbacks);
+async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOptions = {}, filePaths = [], mode = null) {
     const { saveOutput, convertFields } = commandOptions;
     const tmpDir = convertFields
         ? (0, handleFieldsJS_1.createTmpDirSync)('hubspot-temp-fieldsjs-output-')
@@ -105,28 +103,28 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
         const relativePath = file.replace(fieldsJsFileInfo ? tmpDirRegex : regex, '');
         const destPath = (0, path_2.convertToUnixPath)(path_1.default.join(dest, relativePath));
         return async () => {
-            (0, logger_1.debug)(`${i18nKey}.uploadFolder.attempt`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.attempt`, {
                 file: originalFilePath || '',
                 destPath,
-            });
+            }));
             try {
                 await (0, fileMapper_2.upload)(accountId, file, destPath, apiOptions);
-                logger('success', `${i18nKey}.uploadFolder.success`, {
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.uploadFolder.success`, {
                     file: originalFilePath || '',
                     destPath,
-                });
+                }));
             }
             catch (err) {
                 const error = err;
                 if ((0, standardErrors_1.isFatalError)(error)) {
                     throw error;
                 }
-                (0, logger_1.debug)(`${i18nKey}.uploadFolder.failed`, { file, destPath });
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.failed`, { file, destPath }));
                 if (error.response && error.response.data) {
-                    console.debug(error.response.data);
+                    logger_1.logger.debug(error.response.data);
                 }
                 else {
-                    console.debug(error.message);
+                    logger_1.logger.debug(error.message);
                 }
                 failures.push({
                     file,
@@ -142,13 +140,13 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
     const results = await queue
         .addAll(failures.map(({ file, destPath }) => {
         return async () => {
-            (0, logger_1.debug)(`${i18nKey}.uploadFolder.retry`, { file, destPath });
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.retry`, { file, destPath }));
             try {
                 await (0, fileMapper_2.upload)(accountId, file, destPath, apiOptions);
-                logger('success', `${i18nKey}.uploadFolder.success`, {
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.uploadFolder.success`, {
                     file,
                     destPath,
-                });
+                }));
                 return {
                     resultType: files_1.FILE_UPLOAD_RESULT_TYPES.SUCCESS,
                     error: null,
@@ -156,7 +154,7 @@ async function uploadFolder(accountId, src, dest, fileMapperOptions, commandOpti
                 };
             }
             catch (err) {
-                (0, logger_1.debug)(`${i18nKey}.uploadFolder.retryFailed`, { file, destPath });
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadFolder.retryFailed`, { file, destPath }));
                 const error = err;
                 if ((0, standardErrors_1.isFatalError)(error)) {
                     throw error;

package/lib/cms/watch.d.ts

@@ -1,10 +1,7 @@
 import chokidar from 'chokidar';
 import { AxiosError } from 'axios';
-import { LogCallbacksArg } from '../../types/LogCallbacks';
 import { Mode } from '../../types/Files';
 import { UploadFolderResults } from '../../types/Files';
-declare const watchCallbackKeys: readonly ["notifyOfThemePreview", "uploadSuccess", "deleteSuccess", "folderUploadSuccess", "ready", "deleteSuccessWithType"];
-type WatchLogCallbacks = LogCallbacksArg<typeof watchCallbackKeys>;
 type WatchOptions = {
     mode?: Mode;
     remove?: boolean;
@@ -16,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, logCallbacks?: WatchLogCallbacks): 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): chokidar.FSWatcher;
 export {};