@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/commands/app/secret/delete.js

@@ -1,21 +1,20 @@
 import { deleteAppSecret, fetchAppSecrets, } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { commands } from '../../../lang/en.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 { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'delete [name]';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.delete.describe, false);
 async function handler(args) {
-    const { derivedAccountId, force } = args;
-    trackCommandUsage('app-secret-delete', {}, derivedAccountId);
+    const { derivedAccountId, force, exit } = args;
     const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let appSecretToDelete = args.name;
     if (!appSecretToDelete) {
@@ -28,11 +27,11 @@ async function handler(args) {
         }
         catch (err) {
             logError(err);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (appSecrets.length === 0) {
             uiLogger.error(commands.app.subcommands.secret.subcommands.delete.errors.noSecrets);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         appSecretToDelete = await listPrompt(commands.app.subcommands.secret.subcommands.delete.selectSecret, { choices: appSecrets });
     }
@@ -42,7 +41,7 @@ async function handler(args) {
         }));
     if (!confirmDelete) {
         uiLogger.log(commands.app.subcommands.secret.subcommands.delete.deleteCanceled);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     try {
         await deleteAppSecret(derivedAccountId, appSecretApp.id, appSecretToDelete);
@@ -51,9 +50,9 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function deleteAppSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -80,7 +79,7 @@ const builder = makeYargsBuilder(deleteAppSecretBuilder, command, describe, {
 const deleteAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('app-secret-delete', handler),
     builder,
 };
 export default deleteAppSecretCommand;

package/commands/app/secret/list.js

@@ -1,8 +1,8 @@
 import { fetchAppSecrets } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -10,11 +10,10 @@ import { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'list';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.list.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('app-secret-list', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let appSecrets = [];
     try {
@@ -25,7 +24,7 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (appSecrets.length === 0) {
         uiLogger.log('');
@@ -38,7 +37,7 @@ async function handler(args) {
             uiLogger.log(`- ${secret}`);
         });
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function listAppSecretBuilder(yargs) {
     yargs.option('app', {
@@ -57,7 +56,7 @@ const builder = makeYargsBuilder(listAppSecretBuilder, command, describe, {
 const listAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('app-secret-list', handler),
     builder,
 };
 export default listAppSecretCommand;

package/commands/app/secret/update.js

@@ -1,22 +1,21 @@
 import { fetchAppSecrets, updateAppSecret, } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { secretValuePrompt } from '../../../lib/prompts/secretPrompt.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { commands } from '../../../lang/en.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 { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'update [name]';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.update.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('app-secret-update', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
     if (!appSecretApp) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let appSecretToUpdate = args.name;
     if (!appSecretToUpdate) {
@@ -29,11 +28,11 @@ async function handler(args) {
         }
         catch (err) {
             logError(err);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (appSecrets.length === 0) {
             uiLogger.error(commands.app.subcommands.secret.subcommands.update.errors.noSecrets);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         appSecretToUpdate = await listPrompt(commands.app.subcommands.secret.subcommands.update.selectSecret, { choices: appSecrets });
     }
@@ -45,9 +44,9 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function updateAppSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -70,7 +69,7 @@ const builder = makeYargsBuilder(updateAppSecretBuilder, command, describe, {
 const updateAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('app-secret-update', handler),
     builder,
 };
 export default updateAppSecretCommand;

package/commands/auth.js

@@ -11,11 +11,13 @@ import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
 import { setAsDefaultAccountPrompt } from '../lib/prompts/setAsDefaultAccountPrompt.js';
 import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { trackAuthAction, trackCommandUsage } from '../lib/usageTracking.js';
+import { trackAuthAction } from '../lib/usageTracking.js';
 import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../lib/ui/index.js';
 import { logError } from '../lib/errorHandlers/index.js';
+import { isPromptExitError } from '../lib/errors/PromptExitError.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { commands } from '../lang/en.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -32,7 +34,7 @@ const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUT
 const command = 'auth';
 const describe = commands.auth.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, disableTracking, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, disableTracking, exit, } = args;
     let parsedUserProvidedAccountId;
     try {
         if (userProvidedAccount) {
@@ -41,7 +43,7 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.auth.errors.invalidAccountIdProvided);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
@@ -53,10 +55,9 @@ async function handler(args) {
     }
     if (!configFlagValue && globalConfigFileExists()) {
         uiLogger.error(commands.auth.errors.globalConfigFileExists('hs account auth'));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
-        trackCommandUsage('auth');
         trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
     let configData;
@@ -86,22 +87,25 @@ async function handler(args) {
             }
             catch (e) {
                 logError(e);
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            const { personalAccessKey } = providedPersonalAccessKey
-                ? { personalAccessKey: providedPersonalAccessKey }
-                : await personalAccessKeyPrompt({
-                    env,
-                    account: parsedUserProvidedAccountId,
-                });
             try {
+                const { personalAccessKey } = providedPersonalAccessKey
+                    ? { personalAccessKey: providedPersonalAccessKey }
+                    : await personalAccessKeyPrompt({
+                        env,
+                        account: parsedUserProvidedAccountId,
+                    });
                 token = await getAccessToken(personalAccessKey, env);
                 defaultName = token.hubName ? toKebabCase(token.hubName) : undefined;
                 updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env);
             }
             catch (e) {
+                if (isPromptExitError(e)) {
+                    throw e;
+                }
                 logError(e);
             }
             if (!updatedConfig) {
@@ -124,7 +128,7 @@ async function handler(args) {
     }
     if (!successAuthMethod && !disableTracking) {
         await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const nameFromConfigData = configData && 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
@@ -140,7 +144,7 @@ async function handler(args) {
     if (!disableTracking) {
         await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function authBuilder(yargs) {
     yargs.options({
@@ -180,7 +184,7 @@ const builder = makeYargsBuilder(authBuilder, command, commands.auth.verboseDesc
 const authCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('auth', handler),
     builder,
 };
 export default authCommand;

package/commands/cms/app/create.js

@@ -1,23 +1,24 @@
 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 { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import assets from '../../../lib/cmsAssets/index.js';
 const APP_ASSET_TYPES = ['api-sample', 'app', 'react-app', 'vue-app'];
 const command = 'create <type> [name] [dest]';
 const describe = commands.cms.subcommands.app.subcommands.create.describe;
 async function handler(args) {
-    const { derivedAccountId, name, internal: getInternalVersion, type, dest, } = args;
+    const { name, internal: getInternalVersion, type, dest, exit, addUsageMetadata, } = args;
     const assetType = type.toLowerCase();
     if (!assetType || !APP_ASSET_TYPES.includes(assetType)) {
         uiLogger.error(commands.cms.subcommands.app.subcommands.create.errors.unsupportedAssetType(assetType, APP_ASSET_TYPES.filter(t => !assets[t].hidden).join(', ')));
         return;
     }
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    addUsageMetadata({ assetType });
     const asset = assets[assetType];
     const argsToPass = {
         commandArgs: args,
@@ -43,8 +44,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 appCreateBuilder(yargs) {
@@ -76,6 +80,6 @@ const appCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default appCreateCommand;

package/commands/cms/convertFields.js

@@ -10,14 +10,16 @@ import { FieldsJs, isConvertableFieldJs, } from '@hubspot/local-dev-lib/cms/hand
 import { trackConvertFieldsUsage } from '../../lib/usageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'convert-fields';
 const describe = commands.convertFields.describe;
-function invalidPath(src) {
+function invalidPath(src, exit) {
     uiLogger.error(commands.convertFields.errors.invalidPath(src));
-    process.exit(EXIT_CODES.ERROR);
+    return exit(EXIT_CODES.ERROR);
 }
 async function handler(args) {
+    const { exit } = args;
     let stats;
     let projectRoot;
     let src;
@@ -29,17 +31,15 @@ async function handler(args) {
             : path.dirname(getCwd());
         stats = fs.statSync(src);
         if (!stats.isFile() && !stats.isDirectory()) {
-            invalidPath(args.src);
-            return;
+            return invalidPath(args.src, exit);
         }
     }
     catch (e) {
-        invalidPath(args.src);
+        return invalidPath(args.src, exit);
     }
     trackConvertFieldsUsage('process');
     if (!src || !stats || !projectRoot) {
-        invalidPath(args.src);
-        return;
+        return invalidPath(args.src, exit);
     }
     if (stats.isFile()) {
         const fieldsJs = await new FieldsJs(projectRoot, src, undefined, args.fieldOptions).init();
@@ -91,7 +91,7 @@ const builder = makeYargsBuilder(convertFieldsBuilder, command, describe);
 const convertFieldsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('convert-fields', handler),
     builder,
 };
 export default convertFieldsCommand;

package/commands/cms/delete.js

@@ -1,14 +1,13 @@
 import { deleteFile } from '@hubspot/local-dev-lib/api/fileMapper';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'delete <path>';
 const describe = commands.cms.subcommands.delete.describe;
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
-    trackCommandUsage('delete', undefined, derivedAccountId);
     try {
         await deleteFile(derivedAccountId, hsPath);
         uiLogger.log(commands.cms.subcommands.delete.deleted(hsPath, derivedAccountId));
@@ -37,7 +36,7 @@ const builder = makeYargsBuilder(cmsDeleteBuilder, command, describe, {
 const cmsDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('delete', handler),
     builder,
 };
 export default cmsDeleteCommand;

package/commands/cms/fetch.js

@@ -2,8 +2,8 @@ import { downloadFileOrFolder } from '@hubspot/local-dev-lib/fileMapper';
 import { addCmsPublishModeOptions, addOverwriteOptions, getCmsPublishMode, } from '../../lib/commonOpts.js';
 import { resolveLocalPath } from '../../lib/filesystem.js';
 import { validateCmsPublishMode } from '../../lib/validation.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
@@ -12,16 +12,16 @@ const command = 'fetch <src> [dest]';
 const describe = commands.cms.subcommands.fetch.describe;
 async function handler(options) {
     const { src, dest } = options;
+    const { derivedAccountId, exit, addUsageMetadata } = options;
     if (!validateCmsPublishMode(options)) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (typeof src !== 'string') {
         uiLogger.error(commands.cms.subcommands.fetch.errors.sourceRequired);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    const { derivedAccountId } = options;
     const cmsPublishMode = getCmsPublishMode(options);
-    trackCommandUsage('fetch', { mode: cmsPublishMode }, derivedAccountId);
+    addUsageMetadata({ mode: cmsPublishMode });
     const { assetVersion, staging, overwrite } = options;
     try {
         // Fetch and write file/folder with increased timeout for large themes.
@@ -34,7 +34,7 @@ async function handler(options) {
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 const fetchBuilder = (yargs) => {
@@ -74,7 +74,7 @@ const builder = makeYargsBuilder(fetchBuilder, command, describe, {
 const fetchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('fetch', handler),
     builder,
 };
 export default fetchCommand;

package/commands/cms/function/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 { HTTP_METHODS } 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.function.subcommands.create.describe;
 async function handler(args) {
-    const { derivedAccountId, name, dest } = args;
+    const { name, dest, exit, addUsageMetadata } = args;
     const assetType = 'function';
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    addUsageMetadata({ assetType });
     const asset = assets[assetType];
     const argsToPass = {
         commandArgs: args,
@@ -36,8 +37,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 functionCreateBuilder(yargs) {
@@ -79,6 +83,6 @@ const functionCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default functionCreateCommand;

package/commands/cms/function/deploy.js

@@ -2,12 +2,12 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import { buildPackage, getBuildStatus, } from '@hubspot/local-dev-lib/api/functions';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
 import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { poll } from '../../../lib/polling.js';
 import { outputBuildLog } from '../../../lib/serverlessLogs.js';
 import { commands } from '../../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 function isFunctionBuildError(e) {
     return (typeof e === 'object' && e !== null && 'status' in e && e.status === 'ERROR');
@@ -17,7 +17,6 @@ const describe = undefined; // Hidden command
 async function handler(args) {
     const { path: functionPath, derivedAccountId } = args;
     const splitFunctionPath = functionPath.split('.');
-    trackCommandUsage('function-deploy', undefined, derivedAccountId);
     if (!splitFunctionPath.length ||
         splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
         uiLogger.error(commands.cms.subcommands.function.subcommands.deploy.errors.notFunctionsFolder(functionPath));
@@ -83,7 +82,7 @@ const builder = makeYargsBuilder(functionDeployBuilder, command, describe, {
 const functionDeployCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('function-deploy', handler),
     builder,
 };
 export default functionDeployCommand;

package/commands/cms/function/list.js

@@ -2,21 +2,25 @@ import moment from 'moment';
 import { getRoutes } from '@hubspot/local-dev-lib/api/functions';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { commands } from '../../../lang/en.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 command = ['list', 'ls'];
 const describe = commands.cms.subcommands.function.subcommands.list.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('function-list', undefined, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     uiLogger.debug(commands.cms.subcommands.function.subcommands.list.debug.gettingFunctions);
-    const { data: routesResp } = await getRoutes(derivedAccountId).catch(async (e) => {
+    let routesResp;
+    try {
+        const { data } = await getRoutes(derivedAccountId);
+        routesResp = data;
+    }
+    catch (e) {
         logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
-        process.exit(EXIT_CODES.SUCCESS);
-    });
+        return exit(EXIT_CODES.SUCCESS);
+    }
     if (!routesResp.objects.length) {
         return uiLogger.info(commands.cms.subcommands.function.subcommands.list.info.noFunctions);
     }
@@ -53,7 +57,7 @@ const builder = makeYargsBuilder(functionListBuilder, command, describe, {
 const functionListCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('function-list', handler),
     builder,
 };
 export default functionListCommand;

package/commands/cms/function/logs.js

@@ -1,10 +1,10 @@
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { outputLogs } from '../../../lib/ui/serverlessFunctionLogs.js';
 import { getFunctionLogs, getLatestFunctionLog, } from '@hubspot/local-dev-lib/api/functions';
 import { tailLogs } from '../../../lib/serverlessLogs.js';
 import { promptUser } from '../../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+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';
@@ -13,7 +13,7 @@ const handleLogsError = (e, accountId, functionPath) => {
         uiLogger.error(commands.cms.subcommands.function.subcommands.logs.errors.noLogsFound(functionPath, accountId));
     }
 };
-const endpointLog = async (accountId, functionPath, options) => {
+const endpointLog = async (accountId, functionPath, options, exit) => {
     const { limit, latest, follow, compact } = options;
     const requestParams = {
         limit,
@@ -35,26 +35,15 @@ const endpointLog = async (accountId, functionPath, options) => {
             }
         };
         await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
+        return exit(EXIT_CODES.SUCCESS);
     }
     else if (latest) {
-        try {
-            const { data } = await getLatestFunctionLog(accountId, functionPath);
-            logsResp = data;
-        }
-        catch (e) {
-            handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
-        }
+        const { data } = await getLatestFunctionLog(accountId, functionPath);
+        logsResp = data;
     }
     else {
-        try {
-            const { data } = await getFunctionLogs(accountId, functionPath, requestParams);
-            logsResp = data;
-        }
-        catch (e) {
-            handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
-        }
+        const { data } = await getFunctionLogs(accountId, functionPath, requestParams);
+        logsResp = data;
     }
     if (logsResp) {
         return outputLogs(logsResp, { compact });
@@ -63,14 +52,20 @@ const endpointLog = async (accountId, functionPath, options) => {
 const command = 'logs [endpoint]';
 const describe = commands.cms.subcommands.function.subcommands.logs.describe;
 const handler = async (options) => {
-    const { endpoint: endpointArgValue, latest, derivedAccountId } = options;
-    trackCommandUsage('logs', latest ? { action: 'latest' } : {}, derivedAccountId);
+    const { endpoint: endpointArgValue, latest, derivedAccountId, exit, addUsageMetadata, } = options;
+    addUsageMetadata(latest ? { action: 'latest' } : {});
     const { endpointPromptValue } = await promptUser({
         name: 'endpointPromptValue',
         message: commands.cms.subcommands.function.subcommands.logs.endpointPrompt,
         when: !endpointArgValue,
     });
-    await endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
+    try {
+        await endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options, exit);
+    }
+    catch (e) {
+        handleLogsError(e, derivedAccountId, endpointArgValue || endpointPromptValue);
+        return exit(EXIT_CODES.ERROR);
+    }
 };
 function logsBuilder(yargs) {
     yargs.positional('endpoint', {
@@ -130,6 +125,6 @@ const logsCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('logs', handler),
 };
 export default logsCommand;