@hubspot/cli 6.4.0-beta.1 → 7.0.0-experimental.0

package/commands/watch.js

@@ -6,25 +6,24 @@ const path = require('path');
 const { watch } = require('@hubspot/local-dev-lib/cms/watch');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addConfigOptions, addAccountOptions, addModeOptions, addUseEnvironmentOptions, getAccountId, getMode, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { validateMode, loadAndValidateOptions } = require('../lib/validation');
+const { validateCmsPublishMode, loadAndValidateOptions, } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
 const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
 const i18nKey = 'commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-exports.command = 'watch [--src] [--dest]';
+exports.command = 'watch [src] [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { remove, initialUpload, disableInitial, notify } = options;
+    const { remove, initialUpload, disableInitial, notify, derivedAccountId, } = options;
     await loadAndValidateOptions(options);
-    if (!validateMode(options)) {
+    if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.ERROR);
     }
-    const accountId = getAccountId(options);
-    const mode = getMode(options);
+    const cmsPublishMode = getCmsPublishMode(options);
     const uploadPromptAnswers = await uploadPrompt(options);
     const src = options.src || uploadPromptAnswers.src;
     const dest = options.dest || uploadPromptAnswers.dest;
@@ -59,33 +58,33 @@ exports.handler = async (options) => {
     if (initialUpload) {
         filesToUpload = await getUploadableFileList(absoluteSrcPath, options.convertFields);
     }
-    trackCommandUsage('watch', { mode }, accountId);
+    trackCommandUsage('watch', { mode: cmsPublishMode }, derivedAccountId);
     const postInitialUploadCallback = null;
     const onUploadFolderError = error => {
         logger.error(i18n(`${i18nKey}.errors.folderFailed`, {
             src,
             dest,
-            accountId,
+            accountId: derivedAccountId,
         }));
         logError(error, {
-            accountId,
+            accountId: derivedAccountId,
         });
     };
     const onQueueAddError = null;
-    const onUploadFileError = (file, dest, accountId) => error => {
+    const onUploadFileError = (file, dest, derivedAccountId) => error => {
         logger.error(i18n(`${i18nKey}.errors.fileFailed`, {
             file,
             dest,
-            accountId,
+            accountId: derivedAccountId,
         }));
         logError(error, new ApiErrorContext({
-            accountId,
+            accountId: derivedAccountId,
             request: dest,
             payload: file,
         }));
     };
-    watch(accountId, absoluteSrcPath, dest, {
-        mode,
+    watch(derivedAccountId, absoluteSrcPath, dest, {
+        cmsPublishMode,
         remove,
         disableInitial: initialUpload ? false : true,
         notify,
@@ -94,10 +93,6 @@ exports.handler = async (options) => {
     }, postInitialUploadCallback, onUploadFolderError, onQueueAddError, onUploadFileError);
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addModeOptions(yargs, { write: true });
-    addUseEnvironmentOptions(yargs);
     yargs.positional('src', {
         describe: i18n(`${i18nKey}.positionals.src.describe`),
         type: 'string',
@@ -143,5 +138,10 @@ exports.builder = yargs => {
         type: 'boolean',
         default: false,
     });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addCmsPublishModeOptions(yargs, { write: true });
+    addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };