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

package/commands/upload.js

@@ -12,17 +12,17 @@ const { ApiErrorContext, logError } = require('../lib/errorHandlers/index');
 const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getThemePreviewUrl, getThemeJSONPath, } = require('@hubspot/local-dev-lib/cms/themes');
-const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addModeOptions, addUseEnvironmentOptions, getAccountId, getMode, } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { cleanUploadPrompt } = require('../lib/prompts/cleanUploadPrompt');
-const { validateCmsPublishMode, loadAndValidateOptions, } = require('../lib/validation');
+const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getUploadableFileList } = require('../lib/upload');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { FieldsJs, isConvertableFieldJs, cleanupTmpDirSync, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-exports.command = 'upload [src] [dest]';
+exports.command = 'upload [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 const logThemePreview = (filePath, accountId) => {
     const previewUrl = getThemePreviewUrl(filePath, accountId);
@@ -35,11 +35,11 @@ const logThemePreview = (filePath, accountId) => {
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    if (!validateCmsPublishMode(options)) {
+    if (!validateMode(options)) {
         process.exit(EXIT_CODES.WARNING);
     }
-    const { derivedAccountId } = options;
-    const cmsPublishMode = getCmsPublishMode(options);
+    const accountId = getAccountId(options);
+    const mode = getMode(options);
     const uploadPromptAnswers = await uploadPrompt(options);
     const src = options.src || uploadPromptAnswers.src;
     const saveOutput = options.saveOutput;
@@ -82,7 +82,7 @@ exports.handler = async (options) => {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    trackCommandUsage('upload', { mode, type: stats.isFile() ? 'file' : 'folder' }, accountId);
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => logger.error(message));
@@ -101,14 +101,14 @@ exports.handler = async (options) => {
             }));
             return;
         }
-        upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode, options))
+        upload(accountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(mode, options))
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.fileUploaded`, {
-                accountId: derivedAccountId,
+                accountId,
                 dest: normalizedDest,
                 src,
             }));
-            logThemePreview(src, derivedAccountId);
+            logThemePreview(src, accountId);
         })
             .catch(error => {
             logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
@@ -116,7 +116,7 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, new ApiErrorContext({
-                accountId: derivedAccountId,
+                accountId,
                 request: normalizedDest,
                 payload: src,
             }));
@@ -133,7 +133,7 @@ exports.handler = async (options) => {
     }
     else {
         logger.log(i18n(`${i18nKey}.uploading`, {
-            accountId: derivedAccountId,
+            accountId,
             dest,
             src,
         }));
@@ -143,33 +143,30 @@ exports.handler = async (options) => {
             //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
             let cleanUpload = options.force;
             if (!options.force) {
-                cleanUpload = await cleanUploadPrompt(derivedAccountId, dest);
+                cleanUpload = await cleanUploadPrompt(accountId, dest);
             }
             if (cleanUpload) {
                 try {
-                    await deleteFile(derivedAccountId, dest);
-                    logger.log(i18n(`${i18nKey}.cleaning`, {
-                        accountId: derivedAccountId,
-                        filePath: dest,
-                    }));
+                    await deleteFile(accountId, dest);
+                    logger.log(i18n(`${i18nKey}.cleaning`, { accountId, filePath: dest }));
                 }
                 catch (error) {
                     logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
-                        accountId: derivedAccountId,
+                        accountId,
                         path: dest,
                     }));
                 }
             }
         }
-        uploadFolder(derivedAccountId, absoluteSrcPath, dest, {
-            cmsPublishMode,
+        uploadFolder(accountId, absoluteSrcPath, dest, {
+            mode,
         }, options, filePaths)
             .then(results => {
             if (!hasUploadErrors(results)) {
                 logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
                     dest,
                 }));
-                logThemePreview(src, derivedAccountId);
+                logThemePreview(src, accountId);
             }
             else {
                 logger.error(i18n(`${i18nKey}.errors.someFilesFailed`, {
@@ -184,13 +181,17 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, {
-                accountId: derivedAccountId,
+                accountId,
             });
             process.exit(EXIT_CODES.WARNING);
         });
     }
 };
 exports.builder = yargs => {
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addModeOptions(yargs, { write: true });
+    addUseEnvironmentOptions(yargs);
     yargs.positional('src', {
         describe: i18n(`${i18nKey}.positionals.src.describe`),
         type: 'string',
@@ -225,10 +226,5 @@ exports.builder = yargs => {
         type: 'boolean',
         default: false,
     });
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addCmsPublishModeOptions(yargs, { write: true });
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/watch.js

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