@hubspot/cli 8.3.0 → 8.4.0-beta.0

package/commands/customObject/updateSchema.js

@@ -6,21 +6,20 @@ import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { checkAndConvertToJson } from '../../lib/validation.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isSchemaDefinition } from '../../lib/customObject.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update-schema [name]';
 const describe = commands.customObject.subcommands.updateSchema.describe;
 async function handler(args) {
-    const { path, name: providedName, derivedAccountId } = args;
-    trackCommandUsage('custom-object-schema-update', {}, derivedAccountId);
+    const { path, name: providedName, derivedAccountId, exit } = args;
     const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!isSchemaDefinition(schemaJson)) {
         uiLogger.error(commands.customObject.subcommands.updateSchema.errors.invalidSchema);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let name = providedName;
     try {
@@ -64,7 +63,7 @@ const builder = makeYargsBuilder(schemaUpdateBuilder, command, describe, {
 const updateSchemaCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-update', handler),
     builder,
 };
 export default updateSchemaCommand;

package/commands/doctor.js

@@ -1,9 +1,10 @@
 import path from 'path';
 import fs from 'fs';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
+import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
 import { Doctor } from '../lib/doctor/Doctor.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { removeAnsiCodes } from '../lib/ui/removeAnsiCodes.js';
@@ -12,9 +13,8 @@ import { getErrorMessage } from '../lib/errorHandlers/index.js';
 const command = 'doctor';
 const describe = commands.doctor.describe;
 const handler = async (args) => {
-    const { outputDir } = args;
+    const { outputDir, exit } = args;
     const doctor = new Doctor();
-    trackCommandUsage(command, undefined, doctor.accountId || undefined);
     const output = await doctor.diagnose();
     const totalCount = (output?.errorCount || 0) + (output?.warningCount || 0);
     if (totalCount > 0) {
@@ -26,9 +26,9 @@ const handler = async (args) => {
         }
         else {
             uiLogger.error(commands.doctor.errors.generatingDiagnosis);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
-        return process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     let outputDirPath = outputDir;
     if (!path.isAbsolute(outputDirPath)) {
@@ -47,9 +47,9 @@ const handler = async (args) => {
     }
     catch (e) {
         uiLogger.error(commands.doctor.errors.unableToWriteOutputFile(outputFile, getErrorMessage(e)));
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    return process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 };
 function doctorBuilder(yargs) {
     yargs.option('output-dir', {
@@ -64,7 +64,7 @@ const builder = makeYargsBuilder(doctorBuilder, command, describe, {
 const doctorCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('doctor', handler),
     builder,
 };
 export default doctorCommand;

package/commands/feedback.js

@@ -1,5 +1,6 @@
 import open from 'open';
 import { confirmPrompt } from '../lib/prompts/promptUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { commands } from '../lang/en.js';
@@ -7,15 +8,16 @@ import { uiLogger } from '../lib/ui/logger.js';
 import { FEEDBACK_URL } from '../lib/constants.js';
 const command = 'feedback';
 const describe = commands.project.feedback.describe;
-async function handler() {
+async function handler(args) {
+    const { exit } = args;
     const shouldOpen = await confirmPrompt(commands.project.feedback.openPrompt);
     if (!shouldOpen) {
         uiLogger.log(commands.project.feedback.error(FEEDBACK_URL));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     open(FEEDBACK_URL, { url: true });
     uiLogger.success(commands.project.feedback.success(FEEDBACK_URL));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function feedbackBuilder(yargs) {
     return yargs;
@@ -26,7 +28,7 @@ const builder = makeYargsBuilder(feedbackBuilder, command, describe, {
 const feedbackCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('feedback', handler),
     builder,
 };
 export default feedbackCommand;

package/commands/filemanager/fetch.js

@@ -1,29 +1,28 @@
 import { downloadFileOrFolder } from '@hubspot/local-dev-lib/fileManager';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { resolveLocalPath } from '../../lib/filesystem.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { addOverwriteOptions } from '../../lib/commonOpts.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch <src> [dest]';
 const describe = commands.filemanager.subcommands.fetch.describe;
 async function handler(args) {
-    const { src, includeArchived, derivedAccountId, overwrite } = args;
+    const { src, includeArchived, derivedAccountId, overwrite, exit } = args;
     if (typeof src !== 'string') {
         uiLogger.error(commands.filemanager.subcommands.fetch.errors.sourceRequired);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const dest = resolveLocalPath(args.dest);
-    trackCommandUsage('filemanager-fetch', {}, derivedAccountId);
     try {
         // Fetch and write file/folder.
         await downloadFileOrFolder(derivedAccountId, src, dest, overwrite, includeArchived || false);
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function fileManagerFetchBuilder(yargs) {
@@ -52,7 +51,7 @@ const builder = makeYargsBuilder(fileManagerFetchBuilder, command, describe, {
 const fileManagerFetchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('filemanager-fetch', handler),
     builder,
 };
 export default fileManagerFetchCommand;

package/commands/filemanager/upload.js

@@ -7,14 +7,14 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { validateSrcAndDestPaths } from '@hubspot/local-dev-lib/cms/modules';
 import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
 import { ApiErrorContext, 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';
 const command = 'upload <src> <dest>';
 const describe = commands.filemanager.subcommands.upload.describe;
 async function handler(args) {
-    const { src, dest, derivedAccountId } = args;
+    const { src, dest, derivedAccountId, addUsageMetadata, exit } = args;
     const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {
@@ -33,11 +33,11 @@ async function handler(args) {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    addUsageMetadata({ type: stats.isFile() ? 'file' : 'folder' });
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => uiLogger.error(message));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (stats.isFile()) {
         if (shouldIgnoreFile(absoluteSrcPath)) {
@@ -91,7 +91,7 @@ const builder = makeYargsBuilder(fileManagerUploadBuilder, command, describe, {
 const fileManagerUploadCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('filemanager-upload', handler),
     builder,
 };
 export default fileManagerUploadCommand;

package/commands/getStarted.js

@@ -13,8 +13,9 @@ import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPromp
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
+import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { isV2Project } from '../lib/projects/platformVersion.js';
 import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
@@ -26,9 +27,8 @@ import { runGetStartedV2 } from '../lib/getStarted/getStartedV2.js';
 const command = 'get-started';
 const describe = commands.getStarted.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
+    const { derivedAccountId, exit } = args;
     const env = getConfigAccountEnvironment(derivedAccountId);
-    await trackCommandUsage('get-started', {}, derivedAccountId);
     const accountName = uiAccountDescription(derivedAccountId);
     if (args.v2) {
         try {
@@ -37,13 +37,11 @@ async function handler(args) {
                 name: args.name,
                 dest: args.dest,
             });
-            process.exit(EXIT_CODES.SUCCESS);
-            return;
+            return exit(EXIT_CODES.SUCCESS);
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
-            return;
+            return exit(EXIT_CODES.ERROR);
         }
     }
     uiInfoSection(commands.getStarted.startTitle, () => {
@@ -92,7 +90,7 @@ async function handler(args) {
                 openLink(derivedAccountId, 'design-manager');
             }
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     else {
         uiLogger.log(' ');
@@ -110,7 +108,7 @@ async function handler(args) {
             }, derivedAccountId);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         // 4. Clone the project template from GitHub
         try {
@@ -131,7 +129,7 @@ async function handler(args) {
             debugError(err);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.failedToDownloadProject);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
         const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
@@ -177,7 +175,7 @@ async function handler(args) {
                     }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
                 try {
                     validateProjectConfig(newProjectConfig, newProjectDir);
@@ -191,7 +189,7 @@ async function handler(args) {
                         }, derivedAccountId);
                         uiLogger.log(' ');
                         uiLogger.error(error.message);
-                        process.exit(EXIT_CODES.ERROR);
+                        return exit(EXIT_CODES.ERROR);
                     }
                     throw error;
                 }
@@ -268,13 +266,13 @@ async function handler(args) {
                 uiLogger.log(' ');
                 uiLogger.error(commands.getStarted.errors.uploadFailed);
                 debugError(err);
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
         else {
             uiLogger.log(' ');
             uiFeatureHighlight(['projectUploadCommand', 'projectDevCommand']);
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
     }
     // Track successful completion of get-started command
@@ -282,7 +280,7 @@ async function handler(args) {
         successful: true,
         step: 'command-completed',
     }, derivedAccountId);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function getStartedBuilder(yargs) {
     yargs.options({
@@ -316,7 +314,7 @@ const builder = makeYargsBuilder(getStartedBuilder, command, commands.getStarted
 const getStartedCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('get-started', handler),
     builder,
 };
 export default getStartedCommand;

package/commands/hubdb/clear.js

@@ -1,17 +1,16 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../lib/errors/PromptExitError.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { clearHubDbTableRows } from '@hubspot/local-dev-lib/hubdb';
 import { publishTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.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';
 const command = 'clear [table-id]';
 const describe = commands.hubdb.subcommands.clear.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-clear', {}, derivedAccountId);
     try {
         const { tableId } = 'tableId' in args
             ? args
@@ -30,8 +29,8 @@ async function handler(args) {
         }
     }
     catch (e) {
-        if (e instanceof PromptExitError) {
-            process.exit(e.exitCode);
+        if (isPromptExitError(e)) {
+            throw e;
         }
         logError(e);
     }
@@ -52,7 +51,7 @@ const builder = makeYargsBuilder(hubdbClearBuilder, command, describe, {
 const hubdbClearCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('hubdb-clear', handler),
     builder,
 };
 export default hubdbClearCommand;

package/commands/hubdb/create.js

@@ -5,9 +5,9 @@ import { getCwd, untildify, isValidPath } from '@hubspot/local-dev-lib/path';
 import { createHubDbTable } from '@hubspot/local-dev-lib/hubdb';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { checkAndConvertToJson } from '../../lib/validation.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';
 const command = 'create';
 const describe = commands.hubdb.subcommands.create.describe;
@@ -33,8 +33,7 @@ function selectPathPrompt(options) {
     ]);
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-create', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     let filePath;
     try {
         filePath =
@@ -42,7 +41,7 @@ async function handler(args) {
                 ? path.resolve(getCwd(), args.path)
                 : path.resolve(getCwd(), (await selectPathPrompt(args)).path);
         if (!checkAndConvertToJson(filePath)) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const table = await createHubDbTable(derivedAccountId, path.resolve(getCwd(), filePath));
         uiLogger.success(commands.hubdb.subcommands.create.success.create(table.tableId, derivedAccountId, table.rowCount));
@@ -68,7 +67,7 @@ const builder = makeYargsBuilder(hubdbCreateBuilder, command, describe, {
 const hubdbCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('hubdb-create', handler),
     builder,
 };
 export default hubdbCreateCommand;

package/commands/hubdb/delete.js

@@ -1,18 +1,17 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../lib/errors/PromptExitError.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { deleteTable } from '@hubspot/local-dev-lib/api/hubdb';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { commands } from '../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [table-id]';
 const describe = commands.hubdb.subcommands.delete.describe;
 async function handler(args) {
-    const { force, derivedAccountId } = args;
-    trackCommandUsage('hubdb-delete', {}, derivedAccountId);
+    const { force, derivedAccountId, exit } = args;
     try {
         const { tableId } = 'tableId' in args && args.tableId
             ? args
@@ -27,16 +26,16 @@ async function handler(args) {
                 message: commands.hubdb.subcommands.delete.shouldDeleteTable(tableId),
             });
             if (!shouldDeleteTable) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         await deleteTable(derivedAccountId, tableId);
         uiLogger.success(commands.hubdb.subcommands.delete.success.delete(tableId, derivedAccountId));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
-        if (e instanceof PromptExitError) {
-            process.exit(e.exitCode);
+        if (isPromptExitError(e)) {
+            throw e;
         }
         uiLogger.error(commands.hubdb.subcommands.delete.errors.delete(args.tableId || ''));
         logError(e);
@@ -62,7 +61,7 @@ const builder = makeYargsBuilder(hubdbDeleteBuilder, command, describe, {
 const hubdbDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('hubdb-delete', handler),
     builder,
 };
 export default hubdbDeleteCommand;

package/commands/hubdb/fetch.js

@@ -1,16 +1,15 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../lib/errors/PromptExitError.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { downloadHubDbTable } from '@hubspot/local-dev-lib/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.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';
 const command = 'fetch [table-id] [dest]';
 const describe = commands.hubdb.subcommands.fetch.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-fetch', {}, derivedAccountId);
     try {
         const promptAnswers = await selectHubDBTablePrompt({
             accountId: derivedAccountId,
@@ -23,8 +22,8 @@ async function handler(args) {
         uiLogger.success(commands.hubdb.subcommands.fetch.success.fetch(tableId, filePath));
     }
     catch (e) {
-        if (e instanceof PromptExitError) {
-            process.exit(e.exitCode);
+        if (isPromptExitError(e)) {
+            throw e;
         }
         logError(e);
     }
@@ -49,7 +48,7 @@ const builder = makeYargsBuilder(hubdbFetchBuilder, command, describe, {
 const hubdbFetchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('hubdb-fetch', handler),
     builder,
 };
 export default hubdbFetchCommand;

package/commands/hubdb/list.js

@@ -1,23 +1,17 @@
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { renderTable } from '../../ui/render.js';
 import { getBaseHubSpotUrlForAccount } from '../../lib/projects/urls.js';
 const command = ['list', 'ls'];
 const describe = commands.hubdb.subcommands.list.describe;
 async function getTableData(accountId) {
-    try {
-        const response = await fetchTables(accountId);
-        return response.data;
-    }
-    catch (err) {
-        logError(err);
-        process.exit(EXIT_CODES.ERROR);
-    }
+    const response = await fetchTables(accountId);
+    return response.data;
 }
 // stripping the types and unnecessary fields so this data can be turned into a UI table
 function mapTablesToUI(tables) {
@@ -30,9 +24,17 @@ function mapTablesToUI(tables) {
     ]);
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-list', {}, derivedAccountId);
-    const { results: tables, total } = await getTableData(derivedAccountId);
+    const { derivedAccountId, exit } = args;
+    let tableData;
+    try {
+        tableData = await getTableData(derivedAccountId);
+    }
+    catch (err) {
+        logError(err);
+        return exit(EXIT_CODES.ERROR);
+        return;
+    }
+    const { results: tables, total } = tableData;
     const tableUIData = mapTablesToUI(tables);
     const tableHeader = [
         commands.hubdb.subcommands.list.labels.id,
@@ -58,7 +60,7 @@ async function handler(args) {
     else {
         uiLogger.log(commands.hubdb.subcommands.list.noTables(derivedAccountId));
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function hubdbListBuilder(yargs) {
     yargs.example([['$0 hubdb list']]);
@@ -73,7 +75,7 @@ const builder = makeYargsBuilder(hubdbListBuilder, command, describe, {
 const hubdbListCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('hubdb-list', handler),
     builder,
 };
 export default hubdbListCommand;

package/commands/init.js

@@ -12,14 +12,15 @@ import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { handleExit } from '../lib/process.js';
 import { debugError, logError } from '../lib/errorHandlers/index.js';
-import { PromptExitError } from '../lib/errors/PromptExitError.js';
-import { trackCommandUsage, trackAuthAction } from '../lib/usageTracking.js';
+import { isPromptExitError } from '../lib/errors/PromptExitError.js';
+import { trackAuthAction } from '../lib/usageTracking.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { OAUTH_FLOW, personalAccessKeyPrompt, } from '../lib/prompts/personalAccessKeyPrompt.js';
 import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
 import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiCommandReference, uiFeatureHighlight } from '../lib/ui/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { commands } from '../lang/en.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -62,7 +63,7 @@ async function oauthConfigCreationFlow(env) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        throw e;
     }
     return oauthAccount;
 }
@@ -73,7 +74,7 @@ const AUTH_TYPE_NAMES = {
 const command = 'init';
 const describe = commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, userProvidedAccount, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, userProvidedAccount, exit, addUsageMetadata, } = args;
     let parsedUserProvidedAccountId;
     try {
         if (userProvidedAccount) {
@@ -82,7 +83,7 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.init.errors.invalidAccountIdProvided);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
@@ -94,22 +95,18 @@ async function handler(args) {
     }
     catch (err) { }
     setCLILogLevel(args);
-    if (!disableTracking) {
-        trackCommandUsage('init', {
-            authType,
-        });
-    }
+    addUsageMetadata({ authType });
     const env = args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     // Only check for global config if user is not providing a custom config path
     if (!configFlagValue && globalConfigFileExists()) {
         uiLogger.error(commands.init.errors.globalConfigFileExists);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Check if the specific config file path already exists
     if (existingConfigPath && existsSync(existingConfigPath)) {
         uiLogger.error(commands.init.errors.configFileExists(existingConfigPath));
         uiLogger.info(commands.init.logs.updateConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
         await trackAuthAction('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
@@ -148,17 +145,17 @@ async function handler(args) {
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
-        if (err instanceof PromptExitError) {
-            process.exit(err.exitCode);
+        if (isPromptExitError(err)) {
+            throw err;
         }
         logError(err);
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function initBuilder(yargs) {
@@ -194,7 +191,7 @@ const builder = makeYargsBuilder(initBuilder, command, commands.init.verboseDesc
 const initCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('init', handler),
     builder,
 };
 export default initCommand;