@hubspot/cli 8.3.0-beta.1 → 8.4.0-beta.0

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;

package/commands/cms/theme/preview.js

@@ -4,12 +4,13 @@ import { commands } from '../../../lang/en.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
 import { spawnDevServer } from '../../../lib/theme/cmsDevServerProcess.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 import { previewPrompt, previewProjectPrompt, } from '../../../lib/prompts/previewPrompt.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { findProjectComponents } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 const command = 'preview [--src] [--dest]';
@@ -42,7 +43,7 @@ async function determineSrcAndDest(args) {
         dest = args.dest || previewPromptAnswers.dest;
         absoluteSrc = path.resolve(getCwd(), src);
         if (!dest || !validateSrcPath(absoluteSrc)) {
-            process.exit(EXIT_CODES.ERROR);
+            throw new Error(commands.cms.subcommands.theme.subcommands.preview.errors.invalidPath(src));
         }
     }
     else {
@@ -52,9 +53,8 @@ async function determineSrcAndDest(args) {
             const projectComponents = await findProjectComponents(projectDir);
             const themeComponents = projectComponents.filter(c => c.type === ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                uiLogger.error(commands.cms.subcommands.theme.subcommands.preview.errors
+                throw new Error(commands.cms.subcommands.theme.subcommands.preview.errors
                     .noThemeComponents);
-                process.exit(EXIT_CODES.ERROR);
             }
             const answer = await previewProjectPrompt(themeComponents);
             themeJsonPath = `${answer.themeComponentPath}/theme.json`;
@@ -67,9 +67,16 @@ async function determineSrcAndDest(args) {
     return { absoluteSrc, dest };
 }
 async function handler(args) {
-    const { derivedAccountId, noSsl, resetSession, port, generateFieldsTypes } = args;
-    const { absoluteSrc, dest } = await determineSrcAndDest(args);
-    trackCommandUsage('preview', {}, derivedAccountId);
+    const { derivedAccountId, noSsl, resetSession, port, generateFieldsTypes, exit, } = args;
+    let absoluteSrc;
+    let dest;
+    try {
+        ({ absoluteSrc, dest } = await determineSrcAndDest(args));
+    }
+    catch (error) {
+        logError(error);
+        return exit(EXIT_CODES.ERROR);
+    }
     // Spawn dev server in isolated subprocess to avoid React version conflicts
     // File listing and progress bars are handled within the subprocess
     await spawnDevServer({
@@ -80,6 +87,7 @@ async function handler(args) {
         generateFieldsTypes,
         resetSession: resetSession || false,
         dest,
+        exit,
     });
 }
 function themePreviewBuilder(yargs) {
@@ -120,7 +128,7 @@ const builder = makeYargsBuilder(themePreviewBuilder, command, describe, {
 const themePreviewCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('preview', handler),
     builder,
 };
 export default themePreviewCommand;

package/commands/cms/upload.js

@@ -13,10 +13,10 @@ import { getCmsPublishMode } from '../../lib/commonOpts.js';
 import { uploadPrompt } from '../../lib/prompts/uploadPrompt.js';
 import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
 import { validateCmsPublishMode } from '../../lib/validation.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getUploadableFileList } from '../../lib/upload.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';
 const command = 'upload [src] [dest]';
@@ -29,10 +29,10 @@ function logThemePreview(filePath, accountId) {
     }
 }
 async function handler(args) {
+    const { derivedAccountId, exit, addUsageMetadata } = args;
     if (!validateCmsPublishMode(args)) {
-        process.exit(EXIT_CODES.WARNING);
+        return exit(EXIT_CODES.WARNING);
     }
-    const { derivedAccountId } = args;
     const cmsPublishMode = getCmsPublishMode(args);
     const uploadPromptAnswers = await uploadPrompt(args);
     const src = args.src || uploadPromptAnswers.src;
@@ -74,11 +74,14 @@ async function handler(args) {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    addUsageMetadata({
+        mode: cmsPublishMode,
+        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.WARNING);
+        return exit(EXIT_CODES.WARNING);
     }
     if (stats.isFile()) {
         if (!isAllowedExtension(src) && !convertFields) {
@@ -94,14 +97,14 @@ async function handler(args) {
             uiLogger.success(commands.cms.subcommands.upload.success.fileUploaded(src, normalizedDest, derivedAccountId));
             logThemePreview(src, derivedAccountId);
         })
-            .catch(error => {
+            .catch(async (error) => {
             uiLogger.error(commands.cms.subcommands.upload.errors.uploadFailed(src, normalizedDest));
             logError(error, new ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
-            process.exit(EXIT_CODES.WARNING);
+            return exit(EXIT_CODES.WARNING);
         })
             .finally(() => {
             if (!convertFields)
@@ -140,22 +143,22 @@ async function handler(args) {
             fieldOptions: args.fieldOptions ?? undefined,
             saveOutput: args.saveOutput,
         }, filePaths)
-            .then(results => {
+            .then(async (results) => {
             if (!hasUploadErrors(results)) {
                 uiLogger.success(commands.cms.subcommands.upload.success.uploadComplete(dest));
                 logThemePreview(src, derivedAccountId);
             }
             else {
                 uiLogger.error(commands.cms.subcommands.upload.errors.someFilesFailed(dest));
-                process.exit(EXIT_CODES.WARNING);
+                return exit(EXIT_CODES.WARNING);
             }
         })
-            .catch(error => {
+            .catch(async (error) => {
             uiLogger.error(commands.cms.subcommands.upload.errors.uploadFailed(src, dest));
             logError(error, {
                 accountId: derivedAccountId,
             });
-            process.exit(EXIT_CODES.WARNING);
+            return exit(EXIT_CODES.WARNING);
         });
     }
 }
@@ -206,7 +209,7 @@ const builder = makeYargsBuilder(uploadBuilder, command, describe, {
 const uploadCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('upload', handler),
     builder,
 };
 export default uploadCommand;

package/commands/cms/watch.js

@@ -5,19 +5,19 @@ import { getCwd } from '@hubspot/local-dev-lib/path';
 import { getCmsPublishMode } from '../../lib/commonOpts.js';
 import { uploadPrompt } from '../../lib/prompts/uploadPrompt.js';
 import { validateCmsPublishMode } from '../../lib/validation.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { getUploadableFileList } from '../../lib/upload.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'watch [src] [dest]';
 const describe = commands.cms.subcommands.watch.describe;
 const handler = async (args) => {
-    const { remove, initialUpload, notify, derivedAccountId } = args;
+    const { remove, initialUpload, notify, derivedAccountId, exit, addUsageMetadata, } = args;
     if (!validateCmsPublishMode(args)) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const cmsPublishMode = getCmsPublishMode(args);
     const uploadPromptAnswers = await uploadPrompt(args);
@@ -43,7 +43,7 @@ const handler = async (args) => {
     if (initialUpload) {
         filesToUpload = await getUploadableFileList(absoluteSrcPath, args.convertFields);
     }
-    trackCommandUsage('watch', { mode: cmsPublishMode }, derivedAccountId);
+    addUsageMetadata({ mode: cmsPublishMode });
     const onUploadFolderError = (error) => {
         uiLogger.error(commands.cms.subcommands.watch.errors.folderFailed(src, dest, derivedAccountId));
         logError(error, {
@@ -126,7 +126,7 @@ const builder = makeYargsBuilder(watchBuilder, command, describe, {
 const watchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('watch', handler),
     builder,
 };
 export default watchCommand;

package/commands/cms/webpack/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.webpack.subcommands.create.describe;
 async function handler(args) {
-    const { dest, derivedAccountId } = args;
+    const { dest, exit, addUsageMetadata } = args;
     const assetType = 'webpack-serverless';
-    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 webpackCreateBuilder(yargs) {
@@ -53,6 +53,6 @@ const webpackCreateCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('create', handler),
 };
 export default webpackCreateCommand;

package/commands/completion.js

@@ -1,12 +1,10 @@
 import yargsParser from 'yargs-parser';
 import { commands } from '../lang/en.js';
-import { trackCommandUsage } from '../lib/usageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 const command = 'completion';
 const describe = commands.completion.describe;
-async function handler() {
-    await trackCommandUsage('completion');
-}
+async function handler() { }
 function completionBuilder(yargs) {
     const { help } = yargsParser(process.argv.slice(2));
     if (!help) {
@@ -21,7 +19,7 @@ const builder = makeYargsBuilder(completionBuilder, command, describe);
 const completionCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('completion', handler),
     builder,
 };
 export default completionCommand;

package/commands/config/migrate.js

@@ -1,26 +1,25 @@
 import fs from 'fs';
 import { localConfigFileExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { handleMigration, handleMerge } from '../../lib/configMigrate.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
 const describe = commands.config.subcommands.migrate.describe;
 const command = 'migrate';
 async function handler(args) {
-    const { derivedAccountId, config: configPath, force } = args;
-    trackCommandUsage('config-migrate', {}, derivedAccountId);
+    const { config: configPath, force, exit } = args;
     if (configPath && !fs.existsSync(configPath)) {
         uiLogger.error(commands.config.subcommands.migrate.errors.configNotFound(configPath));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const deprecatedConfigExists = localConfigFileExists();
     const globalConfigExists = globalConfigFileExists();
     if (!deprecatedConfigExists) {
         uiLogger.error(commands.config.subcommands.migrate.errors.noConfigToMigrate);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let success = false;
     try {
@@ -34,7 +33,7 @@ async function handler(args) {
     catch (error) {
         logError(error);
     }
-    process.exit(success ? EXIT_CODES.SUCCESS : EXIT_CODES.ERROR);
+    return exit(success ? EXIT_CODES.SUCCESS : EXIT_CODES.ERROR);
 }
 function configMigrateBuilder(yargs) {
     return yargs
@@ -64,7 +63,7 @@ const builder = makeYargsBuilder(configMigrateBuilder, command, commands.config.
 const configMigrateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('config-migrate', handler),
     builder,
 };
 export default configMigrateCommand;

package/commands/config/set.js

@@ -1,7 +1,7 @@
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { setDefaultCmsPublishMode, setHttpTimeout, setAllowUsageTracking, setAllowAutoUpdates, setAutoOpenBrowser, } from '../../lib/configOptions.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder, strictEnforceBoolean, } from '../../lib/yargsUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -47,8 +47,7 @@ async function handleConfigUpdate(accountId, args) {
     }
 }
 async function handler(args) {
-    const { derivedAccountId, allowAutoUpdates, allowUsageTracking, defaultCmsPublishMode, httpTimeout, autoOpenBrowser, } = args;
-    trackCommandUsage('config-set', {}, derivedAccountId);
+    const { derivedAccountId, allowAutoUpdates, allowUsageTracking, defaultCmsPublishMode, httpTimeout, autoOpenBrowser, exit, } = args;
     try {
         if (allowAutoUpdates !== undefined ||
             allowUsageTracking !== undefined ||
@@ -64,9 +63,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 configSetBuilder(yargs) {
     yargs
@@ -135,7 +134,7 @@ const builder = makeYargsBuilder(configSetBuilder, command, describe, {
 const configSetCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('config-set', handler),
     builder,
 };
 export default configSetCommand;

package/commands/customObject/create.js

@@ -4,18 +4,17 @@ import { inputPrompt } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
 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 { isObjectDefinition } from '../../lib/customObject.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create [name]';
 const describe = commands.customObject.subcommands.create.describe;
 async function handler(args) {
-    const { path, name: providedName, derivedAccountId } = args;
+    const { path, name: providedName, derivedAccountId, exit } = args;
     let definitionPath = path;
     let name = providedName;
-    trackCommandUsage('custom-object-batch-create', {}, derivedAccountId);
     if (!name) {
         name = await inputPrompt(commands.customObject.subcommands.create.inputName);
     }
@@ -26,7 +25,7 @@ async function handler(args) {
     const objectJson = checkAndConvertToJson(filePath);
     if (!isObjectDefinition(objectJson)) {
         uiLogger.error(commands.customObject.subcommands.create.errors.invalidObjectDefinition);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         await batchCreateObjects(derivedAccountId, name, objectJson);
@@ -58,7 +57,7 @@ const builder = makeYargsBuilder(customObjectCreateBuilder, command, describe, {
 const customObjectCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-batch-create', handler),
     builder,
 };
 export default customObjectCreateCommand;

package/commands/customObject/createSchema.js

@@ -5,21 +5,20 @@ import { createObjectSchema } from '@hubspot/local-dev-lib/api/customObjects';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 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 = 'create-schema';
 const describe = commands.customObject.subcommands.createSchema.describe;
 async function handler(args) {
-    const { path, derivedAccountId } = args;
-    trackCommandUsage('custom-object-schema-create', {}, derivedAccountId);
+    const { path, derivedAccountId, exit } = args;
     const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!isSchemaDefinition(schemaJson)) {
         uiLogger.error(commands.customObject.subcommands.createSchema.errors.invalidSchema);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         const { data } = await createObjectSchema(derivedAccountId, schemaJson);
@@ -49,7 +48,7 @@ const builder = makeYargsBuilder(schemaCreateBuilder, command, describe, {
 const createSchemaCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-create', handler),
     builder,
 };
 export default createSchemaCommand;

package/commands/customObject/deleteSchema.js

@@ -2,15 +2,14 @@ import { fetchObjectSchemas, deleteObjectSchema, } from '@hubspot/local-dev-lib/
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { confirmPrompt, listPrompt } from '../../lib/prompts/promptUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete-schema [name]';
 const describe = commands.customObject.subcommands.deleteSchema.describe;
 async function handler(args) {
-    const { name: providedName, force, derivedAccountId } = args;
-    trackCommandUsage('custom-object-schema-delete', {}, derivedAccountId);
+    const { name: providedName, force, derivedAccountId, exit } = args;
     let name;
     try {
         const { data: { results }, } = await fetchObjectSchemas(derivedAccountId);
@@ -25,7 +24,7 @@ async function handler(args) {
             (await confirmPrompt(commands.customObject.subcommands.deleteSchema.confirmDelete(name)));
         if (!shouldDelete) {
             uiLogger.info(commands.customObject.subcommands.deleteSchema.deleteCancelled(name));
-            return process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         await deleteObjectSchema(derivedAccountId, name);
         uiLogger.success(commands.customObject.subcommands.deleteSchema.success.delete(name));
@@ -63,7 +62,7 @@ const builder = makeYargsBuilder(schemaDeleteBuilder, command, describe, {
 const deleteSchemaCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-delete', handler),
     builder,
 };
 export default deleteSchemaCommand;

package/commands/customObject/fetchAllSchemas.js

@@ -1,16 +1,15 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { downloadSchemas, getResolvedPath, } from '@hubspot/local-dev-lib/customObjects';
 import { inputPrompt } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { logSchemas } from '../../lib/schema.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch-all-schemas [dest]';
 const describe = commands.customObject.subcommands.fetchAllSchemas.describe;
 async function handler(args) {
     const { derivedAccountId, dest: providedDest } = args;
-    trackCommandUsage('custom-object-schema-fetch-all', {}, derivedAccountId);
     try {
         const dest = providedDest ||
             (await inputPrompt(commands.customObject.subcommands.fetchAllSchemas.inputDest));
@@ -51,7 +50,7 @@ const builder = makeYargsBuilder(schemaFetchAllBuilder, command, describe, {
 const fetchAllSchemasCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-fetch-all', handler),
     builder,
 };
 export default fetchAllSchemasCommand;

package/commands/customObject/fetchSchema.js

@@ -2,15 +2,14 @@ import { fetchObjectSchemas } from '@hubspot/local-dev-lib/api/customObjects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { downloadSchema, getResolvedPath, } from '@hubspot/local-dev-lib/customObjects';
 import { inputPrompt, listPrompt } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch-schema [name] [dest]';
 const describe = commands.customObject.subcommands.fetchSchema.describe;
 async function handler(args) {
     const { name: providedName, dest: providedDest, derivedAccountId } = args;
-    trackCommandUsage('custom-object-schema-fetch', {}, derivedAccountId);
     let name;
     try {
         const { data: { results }, } = await fetchObjectSchemas(derivedAccountId);
@@ -61,7 +60,7 @@ const builder = makeYargsBuilder(schemaFetchBuilder, command, describe, {
 const fetchSchemaCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-fetch', handler),
     builder,
 };
 export default fetchSchemaCommand;

package/commands/customObject/listSchemas.js

@@ -1,14 +1,13 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { listSchemas } from '../../lib/schema.js';
 import { commands } from '../../lang/en.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'list-schemas';
 const describe = commands.customObject.subcommands.listSchemas.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('custom-object-schema-list', {}, derivedAccountId);
     try {
         await listSchemas(derivedAccountId);
     }
@@ -29,7 +28,7 @@ const builder = makeYargsBuilder(schemaListBuilder, command, describe, {
 const listSchemasCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-list', handler),
     builder,
 };
 export default listSchemasCommand;