@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/{secrets → secret}/updateSecret.js

@@ -1,28 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const exitCodes_1 = require("../../lib/enums/exitCodes");
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
-const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { updateSecret, fetchSecrets, } = require('@hubspot/local-dev-lib/api/secrets');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
-const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { secretValuePrompt, secretListPrompt, } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.secrets.subcommands.update';
-exports.command = 'update <name>';
+const i18nKey = 'commands.secret.subcommands.update';
+exports.command = 'update [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name: secretName } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-update', null, accountId);
+    const { name, derivedAccountId } = options;
+    let secretName = name;
+    trackCommandUsage('secrets-update', null, derivedAccountId);
     try {
+        const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
+        if (secretName && !secrets.includes(secretName)) {
+            logger.error(i18n(`${i18nKey}.errors.noSecret`, { secretName }));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        if (!secretName) {
+            const { secretToModify } = await secretListPrompt(secrets, i18n(`${i18nKey}.selectSecret`));
+            secretName = secretToModify;
+        }
         const { secretValue } = await secretValuePrompt();
-        await updateSecret(accountId, secretName, secretValue);
+        await updateSecret(derivedAccountId, secretName, secretValue);
         logger.success(i18n(`${i18nKey}.success.update`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
             secretName,
         }));
         logger.log(i18n(`${i18nKey}.success.updateExplanation`));
@@ -33,7 +41,7 @@ exports.handler = async (options) => {
         }));
         logError(err, new ApiErrorContext({
             request: 'update secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/secret.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const { addGlobalOptions } = require('../lib/commonOpts');
+const addSecretCommand = require('./secret/addSecret');
+const listSecretsCommand = require('./secret/listSecrets');
+const deleteSecretCommand = require('./secret/deleteSecret');
+const updateSecretCommand = require('./secret/updateSecret');
+const { i18n } = require('../lib/lang');
+const i18nKey = 'commands.secret';
+exports.command = ['secret', 'secrets'];
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.builder = yargs => {
+    addGlobalOptions(yargs);
+    yargs
+        .command(listSecretsCommand)
+        .command(addSecretCommand)
+        .command(updateSecretCommand)
+        .command(deleteSecretCommand)
+        .demandCommand(1, '');
+    return yargs;
+};

package/commands/theme/generate-selectors.js

@@ -16,17 +16,17 @@ const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
 const i18nKey = 'commands.theme.subcommands.generateSelectors';
-exports.command = 'generate-selectors <themePath>';
+exports.command = 'generate-selectors <path>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = options => {
-    const { themePath } = options;
-    const fieldsJsonPath = findFieldsJsonPath(themePath);
+    const { path } = options;
+    const fieldsJsonPath = findFieldsJsonPath(path);
     if (!fieldsJsonPath) {
         logger.error(i18n(`${i18nKey}.errors.fieldsNotFound`));
         process.exit(EXIT_CODES.ERROR);
     }
     let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath));
-    let cssString = combineThemeCss(themePath);
+    let cssString = combineThemeCss(path);
     /**
      * Creates map of HubL variable names to theme field paths
      */
@@ -135,16 +135,16 @@ exports.handler = options => {
         fieldsJson = generateInheritedSelectors(fieldsJson, fieldsJson);
     }
     const selectorsMap = generateSelectorsMap(fieldsJson);
-    const selectorsPath = `${themePath}/editor-preview.json`;
+    const selectorsPath = `${path}/editor-preview.json`;
     fs.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
     logger.success(i18n(`${i18nKey}.success`, {
-        themePath,
+        themePath: path,
         selectorsPath,
     }));
 };
 exports.builder = yargs => {
-    yargs.positional('themePath', {
-        describe: i18n(`${i18nKey}.positionals.themePath.describe`),
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/theme/marketplace-validate.js

@@ -2,30 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
-exports.command = 'marketplace-validate <src>';
+exports.command = 'marketplace-validate <path>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('validate', null, accountId);
+    const { path, derivedAccountId } = options;
+    trackCommandUsage('validate', null, derivedAccountId);
     SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: i18n(`${i18nKey}.logs.validatingTheme`, {
-            path: src,
+            path,
         }),
     });
     const assetType = 'THEME';
-    const validationId = await kickOffValidation(accountId, assetType, src);
-    await pollForValidationFinish(accountId, validationId);
+    const validationId = await kickOffValidation(derivedAccountId, assetType, path);
+    await pollForValidationFinish(derivedAccountId, validationId);
     SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(accountId, validationId);
+    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
     processValidationErrors(i18nKey, validationResults);
     displayValidationResults(i18nKey, validationResults);
     process.exit();
@@ -34,8 +31,8 @@ exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);
-    yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/theme/preview.js

@@ -5,11 +5,10 @@ const fs = require('fs');
 const path = require('path');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addAccountOptions, addConfigOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions } = require('../../lib/commonOpts');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { getUploadableFileList } = require('../../lib/upload');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { previewPrompt, previewProjectPrompt, } = require('../../lib/prompts/previewPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { FILE_UPLOAD_RESULT_TYPES, } = require('@hubspot/local-dev-lib/constants/files');
@@ -18,7 +17,7 @@ const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
 const { handleExit, handleKeypress } = require('../../lib/process');
 const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
 const { getProjectConfig } = require('../../lib/projects');
-const { findProjectComponents, COMPONENT_TYPES, } = require('../../lib/projectStructure');
+const { findProjectComponents, COMPONENT_TYPES, } = require('../../lib/projects/structure');
 const { preview } = require('@hubspot/theme-preview-dev-server');
 const { hasFeature } = require('../../lib/hasFeature');
 const i18nKey = 'commands.theme.subcommands.preview';
@@ -90,9 +89,7 @@ const determineSrcAndDest = async (options) => {
     return { absoluteSrc, dest };
 };
 exports.handler = async (options) => {
-    const { notify, noSsl, resetSession, port, generateFieldsTypes } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
+    const { derivedAccountId, notify, noSsl, resetSession, port, generateFieldsTypes, } = options;
     const { absoluteSrc, dest } = await determineSrcAndDest(options);
     const filePaths = await getUploadableFileList(absoluteSrc, false);
     const startProgressBar = numFiles => {
@@ -134,7 +131,7 @@ exports.handler = async (options) => {
                     if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
                         logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
                         logError(result.error, new ApiErrorContext({
-                            accountId,
+                            accountId: derivedAccountId,
                             request: dest,
                             payload: result.file,
                         }));
@@ -144,7 +141,7 @@ exports.handler = async (options) => {
         };
         return uploadOptions;
     };
-    trackCommandUsage('preview', accountId);
+    trackCommandUsage('preview', derivedAccountId);
     let createUnifiedDevServer;
     try {
         require.resolve('@hubspot/cms-dev-server');
@@ -154,7 +151,7 @@ exports.handler = async (options) => {
     catch (e) {
         logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
     }
-    const isUngatedForUnified = await hasFeature(accountId, 'cms:react:unifiedThemePreview');
+    const isUngatedForUnified = await hasFeature(derivedAccountId, 'cms:react:unifiedThemePreview');
     if (isUngatedForUnified && createUnifiedDevServer) {
         if (port) {
             process.env['PORT'] = port;
@@ -168,7 +165,7 @@ exports.handler = async (options) => {
         });
     }
     else {
-        preview(accountId, absoluteSrc, dest, {
+        preview(derivedAccountId, absoluteSrc, dest, {
             notify,
             filePaths,
             noSsl,

package/commands/theme.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const marketplaceValidate = require('./theme/marketplace-validate');
 const generateSelectors = require('./theme/generate-selectors');
 const previewCommand = require('./theme/preview');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.theme';
-exports.command = 'theme';
+exports.command = ['theme', 'themes'];
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
+    addGlobalOptions(yargs);
     yargs
         .command(previewCommand)
         .command(marketplaceValidate)

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, addModeOptions, addUseEnvironmentOptions, getAccountId, getMode, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { cleanUploadPrompt } = require('../lib/prompts/cleanUploadPrompt');
-const { validateMode, loadAndValidateOptions } = require('../lib/validation');
+const { confirmPrompt } = require('../lib/prompts/promptUtils');
+const { validateCmsPublishMode } = 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);
@@ -34,12 +34,11 @@ const logThemePreview = (filePath, accountId) => {
     }
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    if (!validateMode(options)) {
+    if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.WARNING);
     }
-    const accountId = getAccountId(options);
-    const mode = getMode(options);
+    const { derivedAccountId } = options;
+    const cmsPublishMode = getCmsPublishMode(options);
     const uploadPromptAnswers = await uploadPrompt(options);
     const src = options.src || uploadPromptAnswers.src;
     const saveOutput = options.saveOutput;
@@ -82,7 +81,7 @@ exports.handler = async (options) => {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('upload', { mode, type: stats.isFile() ? 'file' : 'folder' }, accountId);
+    trackCommandUsage('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => logger.error(message));
@@ -101,14 +100,14 @@ exports.handler = async (options) => {
             }));
             return;
         }
-        upload(accountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(mode, options))
+        upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode, options))
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.fileUploaded`, {
-                accountId,
+                accountId: derivedAccountId,
                 dest: normalizedDest,
                 src,
             }));
-            logThemePreview(src, accountId);
+            logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
             logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
@@ -116,7 +115,7 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, new ApiErrorContext({
-                accountId,
+                accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
@@ -133,7 +132,7 @@ exports.handler = async (options) => {
     }
     else {
         logger.log(i18n(`${i18nKey}.uploading`, {
-            accountId,
+            accountId: derivedAccountId,
             dest,
             src,
         }));
@@ -143,30 +142,36 @@ 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(accountId, dest);
+                cleanUpload = await confirmPrompt(i18n(`${i18nKey}.confirmCleanUpload`, {
+                    accountId: derivedAccountId,
+                    path: dest,
+                }), { defaultAnswer: false });
             }
             if (cleanUpload) {
                 try {
-                    await deleteFile(accountId, dest);
-                    logger.log(i18n(`${i18nKey}.cleaning`, { accountId, filePath: dest }));
+                    await deleteFile(derivedAccountId, dest);
+                    logger.log(i18n(`${i18nKey}.cleaning`, {
+                        accountId: derivedAccountId,
+                        filePath: dest,
+                    }));
                 }
                 catch (error) {
                     logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
-                        accountId,
+                        accountId: derivedAccountId,
                         path: dest,
                     }));
                 }
             }
         }
-        uploadFolder(accountId, absoluteSrcPath, dest, {
-            mode,
+        uploadFolder(derivedAccountId, absoluteSrcPath, dest, {
+            cmsPublishMode,
         }, options, filePaths)
             .then(results => {
             if (!hasUploadErrors(results)) {
                 logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
                     dest,
                 }));
-                logThemePreview(src, accountId);
+                logThemePreview(src, derivedAccountId);
             }
             else {
                 logger.error(i18n(`${i18nKey}.errors.someFilesFailed`, {
@@ -181,17 +186,13 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, {
-                accountId,
+                accountId: derivedAccountId,
             });
             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',
@@ -226,5 +227,10 @@ 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,25 +6,23 @@ 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 } = 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;
-    await loadAndValidateOptions(options);
-    if (!validateMode(options)) {
+    const { remove, initialUpload, disableInitial, notify, derivedAccountId } = 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 +57,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 +92,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 +137,10 @@ exports.builder = yargs => {
         type: 'boolean',
         default: false,
     });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addCmsPublishModeOptions(yargs, { write: true });
+    addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };