@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/commands/cms/function/server.js

@@ -1,14 +1,13 @@
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 // This package is not typed, so we need to use require
 import { start as startTestServer } from '@hubspot/serverless-dev-runtime';
 import { commands } from '../../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'server <path>';
 const describe = undefined;
 async function handler(args) {
     const { path: functionPath, derivedAccountId } = args;
-    trackCommandUsage('functions-server', undefined, derivedAccountId);
     uiLogger.debug(commands.cms.subcommands.function.subcommands.server.debug.startingServer(functionPath));
     startTestServer({
         accountId: derivedAccountId,
@@ -63,7 +62,7 @@ const builder = makeYargsBuilder(functionServerBuilder, command, describe, {
 const functionServerCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('functions-server', handler),
     builder,
 };
 export default functionServerCommand;

package/commands/cms/getReactModule.js

@@ -5,15 +5,14 @@ import { retrieveDefaultModule } from '@hubspot/local-dev-lib/cms/modules';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'get-react-module [name] [dest]';
 const describe = commands.cms.subcommands.getReactModule.describe;
 async function handler(args) {
-    const { name, dest } = args;
-    trackCommandUsage('get-react-modules');
+    const { name, dest, exit } = args;
     let moduleToRetrieve = name;
     if (!moduleToRetrieve) {
         let availableModules;
@@ -24,7 +23,7 @@ async function handler(args) {
             logError(e);
         }
         if (!availableModules) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const moduleChoice = await listPrompt(commands.cms.subcommands.getReactModule.selectModulePrompt, {
             choices: availableModules.map(module => module.name),
@@ -36,7 +35,7 @@ async function handler(args) {
         : path.join(getCwd(), `${moduleToRetrieve}`);
     if (fs.existsSync(destPath)) {
         uiLogger.error(commands.cms.subcommands.getReactModule.errors.pathExists(destPath));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         await retrieveDefaultModule(moduleToRetrieve, destPath);
@@ -50,9 +49,9 @@ async function handler(args) {
         else {
             logError(e);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function cmsGetReactModuleBuilder(yargs) {
     yargs.positional('name', {
@@ -71,7 +70,7 @@ const builder = makeYargsBuilder(cmsGetReactModuleBuilder, command, describe, {
 const cmsGetReactModuleCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('get-react-module', handler),
     builder,
 };
 export default cmsGetReactModuleCommand;

package/commands/cms/lighthouseScore.js

@@ -7,6 +7,7 @@ import { requestLighthouseScore, getLighthouseScoreStatus, getLighthouseScore, }
 import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../../lib/constants.js';
 import { uiLink } from '../../lib/ui/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { renderTable } from '../../ui/render.js';
 const DEFAULT_TABLE_HEADER = [
@@ -32,21 +33,15 @@ const command = 'lighthouse-score [--theme]';
 const describe = undefined;
 async function selectTheme(accountId) {
     let themes = [];
-    try {
-        const { data: result } = await fetchThemes(accountId, {
-            limit: 500,
-            sorting: 'MOST_USED',
-        });
-        if (result && result.objects) {
-            themes = result.objects
-                .map(({ theme }) => theme.path)
-                .filter(themePath => !themePath.startsWith(HUBSPOT_FOLDER) &&
-                !themePath.startsWith(MARKETPLACE_FOLDER));
-        }
-    }
-    catch (err) {
-        uiLogger.error(commands.cms.subcommands.lighthouseScore.errors.failedToFetchThemes);
-        process.exit(EXIT_CODES.ERROR);
+    const { data: result } = await fetchThemes(accountId, {
+        limit: 500,
+        sorting: 'MOST_USED',
+    });
+    if (result && result.objects) {
+        themes = result.objects
+            .map(({ theme }) => theme.path)
+            .filter(themePath => !themePath.startsWith(HUBSPOT_FOLDER) &&
+            !themePath.startsWith(MARKETPLACE_FOLDER));
     }
     const { theme: selectedTheme } = await promptUser([
         {
@@ -59,7 +54,7 @@ async function selectTheme(accountId) {
     return selectedTheme;
 }
 async function handler(args) {
-    const { target, verbose, theme, derivedAccountId } = args;
+    const { target, verbose, theme, derivedAccountId, exit } = args;
     const includeDesktopScore = target === 'desktop' || !verbose;
     const includeMobileScore = target === 'mobile' || !verbose;
     let themeToCheck = theme;
@@ -76,11 +71,17 @@ async function handler(args) {
         }
         if (!isValidTheme) {
             uiLogger.error(commands.cms.subcommands.lighthouseScore.errors.themeNotFound(themeToCheck));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else {
-        themeToCheck = await selectTheme(derivedAccountId);
+        try {
+            themeToCheck = await selectTheme(derivedAccountId);
+        }
+        catch (err) {
+            uiLogger.error(commands.cms.subcommands.lighthouseScore.errors.failedToFetchThemes);
+            return exit(EXIT_CODES.ERROR);
+        }
         uiLogger.log('');
     }
     // Kick off the scoring
@@ -96,7 +97,7 @@ async function handler(args) {
     }
     if (!requestResult || !requestResult.mobileId || !requestResult.desktopId) {
         uiLogger.error(commands.cms.subcommands.lighthouseScore.errors.failedToGetLighthouseScore);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Poll till scoring is finished
     try {
@@ -129,7 +130,7 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.debug(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Fetch the scoring results
     let desktopScoreResult;
@@ -164,14 +165,14 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.cms.subcommands.lighthouseScore.errors.failedToGetLighthouseScore);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (verbose) {
         const scoreResult = target === 'desktop' ? desktopScoreResult : mobileScoreResult;
         if (!verboseViewAverageScoreResult || !scoreResult) {
             uiLogger.error(commands.cms.subcommands.lighthouseScore.errors
                 .failedToGetLighthouseScore);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         uiLogger.log(commands.cms.subcommands.lighthouseScore.info.themeToCheckTitle(themeToCheck, target));
         const scores = verboseViewAverageScoreResult.scores
@@ -240,7 +241,7 @@ async function handler(args) {
     }
     uiLogger.log('');
     uiLogger.log(commands.cms.subcommands.lighthouseScore.info.poweredByLink);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function cmslighthouseScoreBuilder(yargs) {
     yargs.option('theme', {
@@ -275,7 +276,7 @@ const builder = makeYargsBuilder(cmslighthouseScoreBuilder, command, describe, {
 const cmslighthouseScoreCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('lighthouse-score', handler),
     builder,
 };
 export default cmslighthouseScoreCommand;

package/commands/cms/lint.js

@@ -1,9 +1,9 @@
 import { lint } from '@hubspot/local-dev-lib/cms/validate';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { resolveLocalPath } from '../../lib/filesystem.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'lint <path>';
@@ -42,10 +42,9 @@ function printHublValidationResult({ file, validation }) {
     return count;
 }
 async function handler(args) {
-    const { path: lintPath, derivedAccountId } = args;
+    const { path: lintPath, derivedAccountId, exit } = args;
     const localPath = resolveLocalPath(lintPath);
     const groupName = commands.cms.subcommands.lint.groupName(localPath);
-    trackCommandUsage('lint', undefined, derivedAccountId);
     uiLogger.group(groupName);
     let count = 0;
     try {
@@ -56,7 +55,7 @@ async function handler(args) {
     catch (err) {
         uiLogger.groupEnd();
         logError(err, { accountId: derivedAccountId });
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.groupEnd();
     uiLogger.log(commands.cms.subcommands.lint.issuesFound(count));
@@ -77,7 +76,7 @@ const builder = makeYargsBuilder(lintBuilder, command, describe, {
 const lintCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('lint', handler),
     builder,
 };
 export default lintCommand;

package/commands/cms/list.js

@@ -1,10 +1,10 @@
 import chalk from 'chalk';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { isPathFolder } from '../../lib/filesystem.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { getDirectoryContentsByPath } from '@hubspot/local-dev-lib/api/fileMapper';
 import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../../lib/constants.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
@@ -37,10 +37,9 @@ function sortContents(a, b) {
 const command = ['list [path]', 'ls [path]'];
 const describe = commands.cms.subcommands.list.describe;
 async function handler(args) {
-    const { path, derivedAccountId } = args;
+    const { path, derivedAccountId, exit } = args;
     const directoryPath = path || '/';
     let contentsResp;
-    trackCommandUsage('list', undefined, derivedAccountId);
     uiLogger.debug(commands.cms.subcommands.list.gettingPathContents(directoryPath));
     try {
         const { data } = await getDirectoryContentsByPath(derivedAccountId, directoryPath);
@@ -48,7 +47,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!contentsResp.folder) {
         uiLogger.info(commands.cms.subcommands.list.noFilesFoundAtPath(directoryPath));
@@ -67,7 +66,7 @@ async function handler(args) {
         .sort(sortContents)
         .join('\n');
     uiLogger.log(folderContentsOutput);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function cmsListBuilder(yargs) {
     yargs.positional('path', {
@@ -90,7 +89,7 @@ const builder = makeYargsBuilder(cmsListBuilder, command, describe, {
 const cmsListCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('list', handler),
     builder,
 };
 export default cmsListCommand;

package/commands/cms/module/create.js

@@ -1,19 +1,20 @@
 import fs from 'fs-extra';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { resolveLocalPath } from '../../../lib/filesystem.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { CONTENT_TYPES } from '../../../types/Cms.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import assets from '../../../lib/cmsAssets/index.js';
 const command = 'create <name> [dest]';
 const describe = commands.cms.subcommands.module.subcommands.create.describe;
 async function handler(args) {
-    const { derivedAccountId, name, dest } = args;
+    const { name, dest, exit, addUsageMetadata } = args;
     const assetType = 'module';
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    addUsageMetadata({ assetType });
     const asset = assets[assetType];
     const argsToPass = {
         commandArgs: args,
@@ -38,8 +39,11 @@ async function handler(args) {
         await asset.execute(argsToPass);
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function moduleCreateBuilder(yargs) {
@@ -79,6 +83,6 @@ const moduleCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default moduleCreateCommand;

package/commands/cms/module/marketplace-validate.js

@@ -1,15 +1,14 @@
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
 import { commands } from '../../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'marketplace-validate <src>';
 const describe = commands.cms.subcommands.module.subcommands.marketplaceValidate.describe;
 async function handler(args) {
-    const { src, derivedAccountId } = args;
-    trackCommandUsage('validate', undefined, derivedAccountId);
+    const { src, derivedAccountId, exit } = args;
     SpinniesManager.add('marketplaceValidation', {
         text: commands.cms.subcommands.module.subcommands.marketplaceValidate.logs.validatingModule(src),
     });
@@ -21,7 +20,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     SpinniesManager.remove('marketplaceValidation');
     let validationResults;
@@ -30,15 +29,15 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const hasErrors = hasProcessValidationErrors(commands.cms.subcommands.module.subcommands.marketplaceValidate.errors
         .invalidPath, validationResults);
     if (hasErrors) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     displayValidationResults(commands.cms.subcommands.module.subcommands.marketplaceValidate.results, validationResults);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function marketplaceValidateBuilder(yargs) {
     yargs.positional('src', {
@@ -56,7 +55,7 @@ const builder = makeYargsBuilder(marketplaceValidateBuilder, command, describe,
 const marketplaceValidateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('validate', handler),
     builder,
 };
 export default marketplaceValidateCommand;

package/commands/cms/mv.js

@@ -1,8 +1,8 @@
 import { moveFile } from '@hubspot/local-dev-lib/api/fileMapper';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { isPathFolder } from '../../lib/filesystem.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
@@ -17,7 +17,6 @@ const command = 'mv <srcPath> <destPath>';
 const describe = commands.cms.subcommands.mv.describe;
 async function handler(args) {
     const { srcPath, destPath, derivedAccountId } = args;
-    trackCommandUsage('mv', undefined, derivedAccountId);
     try {
         await moveFile(derivedAccountId, srcPath, getCorrectedDestPath(srcPath, destPath));
         uiLogger.success(commands.cms.subcommands.mv.move(srcPath, destPath, derivedAccountId));
@@ -54,7 +53,7 @@ const builder = makeYargsBuilder(cmsMvBuilder, command, describe, {
 const cmsMvCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('mv', handler),
     builder,
 };
 export default cmsMvCommand;

package/commands/cms/template/create.js

@@ -1,19 +1,20 @@
 import fs from 'fs-extra';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { resolveLocalPath } from '../../../lib/filesystem.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
-import { TEMPLATE_TYPES, } from '../../../types/Cms.js';
+import { TEMPLATE_TYPES } from '../../../types/Cms.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import assets from '../../../lib/cmsAssets/index.js';
 const command = 'create <name> [dest]';
 const describe = commands.cms.subcommands.template.subcommands.create.describe;
 async function handler(args) {
-    const { derivedAccountId, name, dest } = args;
+    const { name, dest, exit, addUsageMetadata } = args;
     const assetType = 'template';
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    addUsageMetadata({ assetType });
     const asset = assets[assetType];
     const argsToPass = {
         commandArgs: args,
@@ -39,8 +40,11 @@ async function handler(args) {
         await asset.execute(argsToPass);
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function templateCreateBuilder(yargs) {
@@ -67,6 +71,6 @@ const templateCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default templateCreateCommand;

package/commands/cms/theme/create.js

@@ -1,18 +1,18 @@
 import fs from 'fs-extra';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { resolveLocalPath } from '../../../lib/filesystem.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import assets from '../../../lib/cmsAssets/index.js';
 const command = 'create [dest]';
 const describe = commands.cms.subcommands.theme.subcommands.create.describe;
 async function handler(args) {
-    const { derivedAccountId, dest } = args;
+    const { dest, exit, addUsageMetadata } = args;
     const assetType = 'website-theme';
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    addUsageMetadata({ assetType });
     const asset = assets[assetType];
     const argsToPass = {
         commandArgs: args,
@@ -35,7 +35,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function themeCreateBuilder(yargs) {
@@ -53,6 +53,6 @@ const themeCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default themeCreateCommand;

package/commands/cms/theme/generate-selectors.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import { commands } from '../../../lang/en.js';
 import { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } from '../../../lib/generateSelectors.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
@@ -16,12 +17,12 @@ const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
 const command = 'generate-selectors <path>';
 const describe = commands.cms.subcommands.theme.subcommands.generateSelectors.describe;
 async function handler(args) {
-    const { path } = args;
+    const { path, exit } = args;
     const fieldsJsonPath = findFieldsJsonPath(path);
     if (!fieldsJsonPath) {
         uiLogger.error(commands.cms.subcommands.theme.subcommands.generateSelectors.errors
             .fieldsNotFound);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let fieldsJson = JSON.parse(fs.readFileSync(fieldsJsonPath, 'utf-8'));
     let cssString = combineThemeCss(path) ?? '';
@@ -132,7 +133,7 @@ async function handler(args) {
     if (!Object.keys(finalMap).length) {
         uiLogger.error(commands.cms.subcommands.theme.subcommands.generateSelectors.errors
             .noSelectorsFound);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     Object.keys(finalMap).forEach(themeFieldKey => {
         const fieldKey = themeFieldKey.split('.');
@@ -165,7 +166,7 @@ const builder = makeYargsBuilder(themeSelectorBuilder, command, describe, {
 const themeSelectorsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('generate-selectors', handler),
     builder,
 };
 export default themeSelectorsCommand;

package/commands/cms/theme/marketplace-validate.js

@@ -1,15 +1,14 @@
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
 import { commands } from '../../../lang/en.js';
-import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'marketplace-validate <path>';
 const describe = commands.cms.subcommands.theme.subcommands.marketplaceValidate.describe;
 async function handler(args) {
-    const { path, derivedAccountId } = args;
-    trackCommandUsage('validate', {}, derivedAccountId);
+    const { path, derivedAccountId, exit } = args;
     SpinniesManager.add('marketplaceValidation', {
         text: commands.cms.subcommands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
     });
@@ -21,7 +20,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     SpinniesManager.remove('marketplaceValidation');
     let validationResults;
@@ -30,15 +29,15 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const hasErrors = hasProcessValidationErrors(commands.cms.subcommands.theme.subcommands.marketplaceValidate.errors
         .invalidPath, validationResults);
     if (hasErrors) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     displayValidationResults(commands.cms.subcommands.theme.subcommands.marketplaceValidate.results, validationResults);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function themeValidateBuilder(yargs) {
     yargs.positional('path', {
@@ -58,7 +57,7 @@ const builder = makeYargsBuilder(themeValidateBuilder, command, describe, {
 const themeValidateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('validate', handler),
     builder,
 };
 export default themeValidateCommand;