@hubspot/cli 7.7.1-experimental.0 → 7.7.2-experimental.0

package/commands/upload.js

@@ -9,7 +9,6 @@ const uploadFolder_1 = require("@hubspot/local-dev-lib/cms/uploadFolder");
 const fileMapper_1 = require("@hubspot/local-dev-lib/fileMapper");
 const fileMapper_2 = require("@hubspot/local-dev-lib/api/fileMapper");
 const path_2 = require("@hubspot/local-dev-lib/path");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const modules_1 = require("@hubspot/local-dev-lib/cms/modules");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
 const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
@@ -21,18 +20,17 @@ const promptUtils_1 = require("../lib/prompts/promptUtils");
 const validation_1 = require("../lib/validation");
 const usageTracking_1 = require("../lib/usageTracking");
 const upload_1 = require("../lib/upload");
-const lang_1 = require("../lib/lang");
+const en_1 = require("../lang/en");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("../lib/ui/logger");
 const command = 'upload [src] [dest]';
-const describe = (0, lang_1.i18n)('commands.upload.describe');
+const describe = en_1.commands.upload.describe;
 function logThemePreview(filePath, accountId) {
     const previewUrl = (0, themes_1.getThemePreviewUrl)(filePath, accountId);
     // Only log if we are actually in a theme
     if (previewUrl) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.upload.previewUrl', {
-            previewUrl,
-        }));
+        logger_1.uiLogger.log(en_1.commands.upload.previewUrl(previewUrl));
     }
 }
 async function handler(args) {
@@ -47,7 +45,7 @@ async function handler(args) {
     let dest = args.dest || uploadPromptAnswers.dest;
     let absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
     if (!dest) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.destinationRequired'));
+        logger_1.uiLogger.error(en_1.commands.upload.errors.destinationRequired);
         return;
     }
     // Check for theme.json file and determine the root path for the project based on it if it exists
@@ -72,52 +70,37 @@ async function handler(args) {
     try {
         stats = fs_1.default.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
-                path: src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
-            path: src,
-        }));
+        logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
         return;
     }
     const normalizedDest = (0, path_2.convertToUnixPath)(dest);
     (0, usageTracking_1.trackCommandUsage)('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
     const srcDestIssues = await (0, modules_1.validateSrcAndDestPaths)({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger_1.logger.error(message));
+        srcDestIssues.forEach(({ message }) => logger_1.uiLogger.error(message));
         process.exit(exitCodes_1.EXIT_CODES.WARNING);
     }
     if (stats.isFile()) {
         if (!(0, path_2.isAllowedExtension)(src) && !convertFields) {
-            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
-                path: src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.invalidPath(src));
             return;
         }
         if ((0, ignoreRules_1.shouldIgnoreFile)(absoluteSrcPath)) {
-            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.fileIgnored', {
-                path: src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.fileIgnored(src));
             return;
         }
         (0, fileMapper_2.upload)(derivedAccountId, absoluteSrcPath, normalizedDest, (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode))
             .then(() => {
-            logger_1.logger.success((0, lang_1.i18n)('commands.upload.success.fileUploaded', {
-                accountId: derivedAccountId,
-                dest: normalizedDest,
-                src,
-            }));
+            logger_1.uiLogger.success(en_1.commands.upload.success.fileUploaded(src, normalizedDest, derivedAccountId));
             logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
-            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.uploadFailed', {
-                dest: normalizedDest,
-                src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, normalizedDest));
             (0, index_1.logError)(error, new index_1.ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
@@ -137,35 +120,22 @@ async function handler(args) {
         });
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)('commands.upload.uploading', {
-            accountId: derivedAccountId,
-            dest,
-            src,
-        }));
+        logger_1.uiLogger.log(en_1.commands.upload.uploading(src, dest, derivedAccountId));
         // Generate the first-pass file list in here, and pass to uploadFolder.
         const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields ?? false);
         if (args.clean) {
             //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
             let cleanUpload = args.force;
             if (!args.force) {
-                cleanUpload = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)('commands.upload.confirmCleanUpload', {
-                    accountId: derivedAccountId,
-                    path: dest,
-                }), { defaultAnswer: false });
+                cleanUpload = await (0, promptUtils_1.confirmPrompt)(en_1.commands.upload.confirmCleanUpload(dest, derivedAccountId), { defaultAnswer: false });
             }
             if (cleanUpload) {
                 try {
                     await (0, fileMapper_2.deleteFile)(derivedAccountId, dest);
-                    logger_1.logger.log((0, lang_1.i18n)('commands.upload.cleaning', {
-                        accountId: derivedAccountId,
-                        filePath: dest,
-                    }));
+                    logger_1.uiLogger.log(en_1.commands.upload.cleaning(dest, derivedAccountId));
                 }
                 catch (error) {
-                    logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.deleteFailed', {
-                        accountId: derivedAccountId,
-                        path: dest,
-                    }));
+                    logger_1.uiLogger.error(en_1.commands.upload.errors.deleteFailed(dest, derivedAccountId));
                 }
             }
         }
@@ -177,23 +147,16 @@ async function handler(args) {
         }, filePaths)
             .then(results => {
             if (!(0, uploadFolder_1.hasUploadErrors)(results)) {
-                logger_1.logger.success((0, lang_1.i18n)('commands.upload.success.uploadComplete', {
-                    dest,
-                }));
+                logger_1.uiLogger.success(en_1.commands.upload.success.uploadComplete(dest));
                 logThemePreview(src, derivedAccountId);
             }
             else {
-                logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.someFilesFailed', {
-                    dest,
-                }));
+                logger_1.uiLogger.error(en_1.commands.upload.errors.someFilesFailed(dest));
                 process.exit(exitCodes_1.EXIT_CODES.WARNING);
             }
         })
             .catch(error => {
-            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.uploadFailed', {
-                dest,
-                src,
-            }));
+            logger_1.uiLogger.error(en_1.commands.upload.errors.uploadFailed(src, dest));
             (0, index_1.logError)(error, {
                 accountId: derivedAccountId,
             });
@@ -203,36 +166,36 @@ async function handler(args) {
 }
 function uploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: (0, lang_1.i18n)('commands.upload.positionals.src.describe'),
+        describe: en_1.commands.upload.positionals.src,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)('commands.upload.positionals.dest.describe'),
+        describe: en_1.commands.upload.positionals.dest,
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: (0, lang_1.i18n)('commands.upload.options.options.describe'),
+        describe: en_1.commands.upload.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('saveOutput', {
-        describe: (0, lang_1.i18n)('commands.upload.options.saveOutput.describe'),
+        describe: en_1.commands.upload.options.saveOutput,
         type: 'boolean',
         default: false,
     });
     yargs.option('convertFields', {
-        describe: (0, lang_1.i18n)('commands.upload.options.convertFields.describe'),
+        describe: en_1.commands.upload.options.convertFields,
         type: 'boolean',
         default: false,
     });
     yargs.option('clean', {
-        describe: (0, lang_1.i18n)('commands.upload.options.clean.describe'),
+        describe: en_1.commands.upload.options.clean,
         type: 'boolean',
         default: false,
     });
     yargs.option('force', {
-        describe: (0, lang_1.i18n)('commands.upload.options.force.describe'),
+        describe: en_1.commands.upload.options.force,
         type: 'boolean',
         default: false,
     });

package/commands/watch.js

@@ -7,18 +7,18 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const watch_1 = require("@hubspot/local-dev-lib/cms/watch");
 const path_2 = require("@hubspot/local-dev-lib/path");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const commonOpts_1 = require("../lib/commonOpts");
 const uploadPrompt_1 = require("../lib/prompts/uploadPrompt");
 const validation_1 = require("../lib/validation");
 const usageTracking_1 = require("../lib/usageTracking");
-const lang_1 = require("../lib/lang");
+const en_1 = require("../lang/en");
 const upload_1 = require("../lib/upload");
 const errorHandlers_1 = require("../lib/errorHandlers");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("../lib/ui/logger");
 const command = 'watch [src] [dest]';
-const describe = (0, lang_1.i18n)(`commands.watch.describe`);
+const describe = en_1.commands.watch.describe;
 const handler = async (args) => {
     const { remove, initialUpload, disableInitial, notify, derivedAccountId } = args;
     if (!(0, validation_1.validateCmsPublishMode)(args)) {
@@ -32,50 +32,38 @@ const handler = async (args) => {
     try {
         const stats = fs_1.default.statSync(absoluteSrcPath);
         if (!stats.isDirectory()) {
-            logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.invalidPath`, {
-                path: src,
-            }));
+            logger_1.uiLogger.log(en_1.commands.watch.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.invalidPath`, {
-            path: src,
-        }));
+        logger_1.uiLogger.log(en_1.commands.watch.errors.invalidPath(src));
         return;
     }
     if (!dest) {
-        logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.destinationRequired`));
+        logger_1.uiLogger.log(en_1.commands.watch.errors.destinationRequired);
         return;
     }
     let filesToUpload = [];
     if (disableInitial) {
-        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.disableInitial`));
+        logger_1.uiLogger.info(en_1.commands.watch.warnings.disableInitial);
     }
     else if (!initialUpload) {
-        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.notUploaded`, { path: src }));
-        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.initialUpload`));
+        logger_1.uiLogger.info(en_1.commands.watch.warnings.notUploaded(src));
+        logger_1.uiLogger.info(en_1.commands.watch.warnings.initialUpload);
     }
     if (initialUpload) {
         filesToUpload = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields);
     }
     (0, usageTracking_1.trackCommandUsage)('watch', { mode: cmsPublishMode }, derivedAccountId);
     const onUploadFolderError = (error) => {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.watch.errors.folderFailed`, {
-            src,
-            dest,
-            accountId: derivedAccountId,
-        }));
+        logger_1.uiLogger.error(en_1.commands.watch.errors.folderFailed(src, dest, derivedAccountId));
         (0, errorHandlers_1.logError)(error, {
             accountId: derivedAccountId,
         });
     };
     const onUploadFileError = (file, destPath, accountId) => (error) => {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.watch.errors.fileFailed`, {
-            file,
-            dest: destPath,
-            accountId,
-        }));
+        logger_1.uiLogger.error(en_1.commands.watch.errors.fileFailed(file, destPath, accountId));
         (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({
             accountId,
             request: destPath,
@@ -93,47 +81,47 @@ const handler = async (args) => {
 };
 function watchBuilder(yargs) {
     yargs.positional('src', {
-        describe: (0, lang_1.i18n)(`commands.watch.positionals.src.describe`),
+        describe: en_1.commands.watch.positionals.src,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)(`commands.watch.positionals.dest.describe`),
+        describe: en_1.commands.watch.positionals.dest,
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: (0, lang_1.i18n)(`commands.watch.options.options.describe`),
+        describe: en_1.commands.watch.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('remove', {
         alias: 'r',
-        describe: (0, lang_1.i18n)(`commands.watch.options.remove.describe`),
+        describe: en_1.commands.watch.options.remove,
         type: 'boolean',
     });
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: (0, lang_1.i18n)(`commands.watch.options.initialUpload.describe`),
+        describe: en_1.commands.watch.options.initialUpload,
         type: 'boolean',
     });
     yargs.option('disable-initial', {
-        describe: (0, lang_1.i18n)(`commands.watch.options.disableInitial.describe`),
+        describe: en_1.commands.watch.options.disableInitial,
         type: 'boolean',
         hidden: true,
     });
     yargs.option('notify', {
         alias: 'n',
-        describe: (0, lang_1.i18n)(`commands.watch.options.notify.describe`),
+        describe: en_1.commands.watch.options.notify,
         type: 'string',
         requiresArg: true,
     });
     yargs.option('convertFields', {
-        describe: (0, lang_1.i18n)(`commands.watch.options.convertFields.describe`),
+        describe: en_1.commands.watch.options.convertFields,
         type: 'boolean',
         default: false,
     });
     yargs.option('saveOutput', {
-        describe: (0, lang_1.i18n)(`commands.watch.options.saveOutput.describe`),
+        describe: en_1.commands.watch.options.saveOutput,
         type: 'boolean',
         default: false,
     });