@hubspot/cli 8.0.11-experimental.0 → 8.0.11-experimental.2

package/commands/project/updateDeps.js

@@ -1,23 +1,23 @@
 import { updatePackages, getProjectPackageJsonLocations, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update-deps [packages..]';
 const describe = commands.project.updateDeps.help.describe;
 async function handler(args) {
-    const { derivedAccountId, packages } = args;
+    const { packages, exit } = args;
     try {
-        trackCommandUsage('project-update-deps', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.updateDeps.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
@@ -50,8 +50,11 @@ async function handler(args) {
         });
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectUpdateDepsBuilder(yargs) {
@@ -74,7 +77,7 @@ const builder = makeYargsBuilder(projectUpdateDepsBuilder, command, describe, {
 const projectUpdateDepsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-update-deps', handler),
     builder,
 };
 export default projectUpdateDepsCommand;

package/commands/project/upload.js

@@ -2,8 +2,7 @@ import chalk from 'chalk';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
@@ -13,11 +12,13 @@ import { commands } from '../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } 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';
+import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 const command = 'upload';
 const describe = commands.project.upload.describe;
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile: profileOption, useEnv: useEnvOption, exit, addUsageMetadata, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
     try {
@@ -25,34 +26,47 @@ async function handler(args) {
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (!projectDir) {
+        uiLogger.error(commands.project.upload.errors.noProjectConfig);
+        return exit(EXIT_CODES.ERROR);
     }
     let targetAccountId;
-    try {
-        if (isV2Project(projectConfig.platformVersion)) {
-            targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
+    let profileName = args.profile;
+    if (!isLegacyProject(projectConfig?.platformVersion)) {
+        try {
+            const profileNamePromptResult = await projectProfilePrompt(projectDir, projectConfig, profileOption, !!useEnvOption);
+            if (profileNamePromptResult) {
+                profileName = profileNamePromptResult;
+                const profile = await loadAndValidateProfile(projectConfig, projectDir, profileName);
+                targetAccountId = profile.accountId;
+            }
+        }
+        catch (error) {
+            logError(error);
+            return exit(EXIT_CODES.ERROR);
         }
-    }
-    catch (err) {
-        logError(err);
-        process.exit(EXIT_CODES.ERROR);
     }
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getConfigAccountById(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType, assetType: projectConfig.platformVersion }, targetAccountId);
+    addUsageMetadata({
+        type: accountType,
+        assetType: projectConfig.platformVersion,
+    });
     try {
         const { result, uploadError } = await handleProjectUpload({
             accountId: targetAccountId,
             projectConfig,
-            projectDir: projectDir,
+            projectDir,
             callbackFunc: pollProjectBuildAndDeploy,
             uploadMessage: message,
             forceCreate,
             isUploadCommand: true,
-            sendIR: isV2Project(projectConfig.platformVersion),
+            sendIR: !isLegacyProject(projectConfig.platformVersion),
             skipValidation,
-            profile: args.profile,
+            profile: profileName,
         });
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
@@ -68,7 +82,7 @@ async function handler(args) {
                     request: 'project upload',
                 }));
             }
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
             uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
@@ -88,12 +102,12 @@ async function handler(args) {
             accountId: targetAccountId,
             request: 'project upload',
         }));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (formatOutputAsJson) {
         uiLogger.json(jsonOutput);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectUploadBuilder(yargs) {
     yargs.options({
@@ -139,7 +153,7 @@ const builder = makeYargsBuilder(projectUploadBuilder, command, describe, {
 const projectUploadCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-upload', handler),
     builder,
 };
 export default projectUploadCommand;

package/commands/project/validate.js

@@ -1,10 +1,10 @@
 import path from 'path';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
@@ -15,25 +15,25 @@ import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 const command = 'validate';
 const describe = commands.project.validate.describe;
 async function handler(args) {
-    const { derivedAccountId, profile } = args;
+    const { derivedAccountId, profile, exit, addUsageMetadata } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-validate', { type: accountType }, derivedAccountId);
+    addUsageMetadata({ type: accountType });
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.validate.mustBeRanWithinAProject);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    if (!isV2Project(projectConfig?.platformVersion)) {
+    if (isLegacyProject(projectConfig.platformVersion)) {
         uiLogger.error(commands.project.validate.badVersion);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         validateProjectConfig(projectConfig, projectDir);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let validationSucceeded = true;
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
@@ -100,17 +100,17 @@ async function handler(args) {
         }
     }
     if (!validationSucceeded) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.project.validate.success(projectConfig.name));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectValidateBuilder(yargs) {
     yargs.options({
@@ -150,7 +150,7 @@ const builder = makeYargsBuilder(projectValidateBuilder, command, describe, {
 const projectValidateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-validate', handler),
     builder,
 };
 export default projectValidateCommand;

package/commands/project/watch.js

@@ -1,21 +1,22 @@
 import { cancelStagedBuild, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { commands } from '../../lang/en.js';
 import { createWatcher } from '../../lib/projects/watch.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { pollBuildStatus, pollDeployStatus, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { handleKeypress, handleExit } from '../../lib/process.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiDeprecatedTag } from '../../lib/ui/index.js';
 const command = 'watch';
-const describe = commands.project.watch.describe;
+const describe = uiDeprecatedTag(commands.project.watch.describe, false);
 async function handleBuildStatus(accountId, projectName, buildId) {
     const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
@@ -23,28 +24,28 @@ async function handleBuildStatus(accountId, projectName, buildId) {
     }
     logFeedbackMessage(buildId);
 }
-function handleUserInput(accountId, projectName, currentBuildId) {
+function handleUserInput(accountId, projectName, currentBuildId, exit) {
     const onTerminate = async () => {
         uiLogger.log(commands.project.watch.logs.processExited);
         if (currentBuildId) {
             try {
                 await cancelStagedBuild(accountId, projectName);
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
             catch (err) {
                 if (isSpecifiedError(err, {
                     subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
                 })) {
-                    process.exit(EXIT_CODES.SUCCESS);
+                    return exit(EXIT_CODES.SUCCESS);
                 }
                 else {
                     logError(err, new ApiErrorContext({ accountId }));
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
             }
         }
         else {
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
     };
     handleExit(onTerminate);
@@ -55,23 +56,22 @@ function handleUserInput(accountId, projectName, currentBuildId) {
     });
 }
 async function handler(args) {
-    const { initialUpload, derivedAccountId } = args;
-    trackCommandUsage('project-watch', undefined, derivedAccountId);
+    const { initialUpload, derivedAccountId, exit } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    if (isV2Project(projectConfig.platformVersion)) {
-        uiLogger.error(projectConfig.platformVersion);
-        return process.exit(EXIT_CODES.ERROR);
+    if (!isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.watch.errors.v2ApiError(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         validateProjectConfig(projectConfig, projectDir);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
@@ -79,14 +79,14 @@ async function handler(args) {
         const handleWatchTermination = (error) => {
             if (error) {
                 logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             else {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         };
         const startWatching = async () => {
-            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput, handleWatchTermination);
+            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, (accountId, projectName, buildId) => handleUserInput(accountId, projectName, buildId, exit), handleWatchTermination);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
@@ -98,7 +98,7 @@ async function handler(args) {
                 isUploadCommand: false,
             });
             if (projectNotFound) {
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             if (uploadError) {
                 if (isSpecifiedError(uploadError, {
@@ -114,7 +114,7 @@ async function handler(args) {
                         request: 'project upload',
                     }));
                 }
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
         else {
@@ -123,7 +123,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectWatchBuilder(yargs) {
@@ -146,7 +146,7 @@ const builder = makeYargsBuilder(projectWatchBuilder, command, describe, {
 const projectWatchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-watch', handler),
     builder,
 };
 export default projectWatchCommand;

package/commands/project.js

@@ -18,9 +18,10 @@ import profile from './project/profile.js';
 import projectValidate from './project/validate.js';
 import list from './project/list.js';
 import info from './project/info.js';
+import deleteProject from './project/delete.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { getProjectConfig } from '../lib/projects/config.js';
-import { isUnsupportedPlatformVersion, LATEST_SUPPORTED_PLATFORM_VERSION, } from '../lib/projects/platformVersion.js';
+import { isSupportedPlatformVersion, LATEST_SUPPORTED_PLATFORM_VERSION, } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../lib/ui/logger.js';
 import { debugError } from '../lib/errorHandlers/index.js';
 const command = ['project', 'projects'];
@@ -30,8 +31,11 @@ const describe = commands.project.describe;
 async function validatePlatformVersion() {
     try {
         const { projectConfig } = await getProjectConfig();
-        if (isUnsupportedPlatformVersion(projectConfig?.platformVersion)) {
-            uiLogger.warn(lib.projects.platformVersion.unsupported(pkg.version, LATEST_SUPPORTED_PLATFORM_VERSION, projectConfig?.platformVersion));
+        // Only warn if a platform version is explicitly set but not supported
+        // Don't warn if the platform version is missing/undefined
+        if (projectConfig?.platformVersion &&
+            !isSupportedPlatformVersion(projectConfig.platformVersion)) {
+            uiLogger.warn(lib.projects.platformVersion.unsupported(pkg.version, LATEST_SUPPORTED_PLATFORM_VERSION, projectConfig.platformVersion));
             uiLogger.log('');
         }
     }
@@ -45,6 +49,7 @@ function projectBuilder(yargs) {
     yargs
         .command(create)
         .command(add)
+        .command(deleteProject)
         .command(watch)
         .command(list)
         .command(info)

package/commands/sandbox/create.js

@@ -7,30 +7,29 @@ import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
 import { SANDBOX_TYPE_MAP, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { sandboxTypePrompt } from '../../lib/prompts/sandboxesPrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { buildV2Sandbox } from '../../lib/buildAccount.js';
 import { hubspotAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create';
 const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
-    const { name, type, force, derivedAccountId } = args;
+    const { name, type, force, derivedAccountId, exit } = args;
     const accountConfig = getConfigAccountById(derivedAccountId);
     const env = getConfigAccountEnvironment(derivedAccountId);
-    trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.noAccountConfig(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.invalidAccountType(HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]], accountConfig.name || ''));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let typePrompt;
     let namePrompt;
@@ -40,7 +39,7 @@ async function handler(args) {
         }
         else {
             uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.type);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxType = type
@@ -64,7 +63,7 @@ async function handler(args) {
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!name) {
         if (!force) {
@@ -72,14 +71,15 @@ async function handler(args) {
         }
         else {
             uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxName = name || (namePrompt && namePrompt.name);
-    if (!sandboxName) {
+    const maybeSandboxName = name || (namePrompt && namePrompt.name);
+    if (!maybeSandboxName) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
+    const sandboxName = maybeSandboxName;
     let contactRecordsSyncPromptResult = false;
     if (!force) {
         const isStandardSandbox = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
@@ -101,7 +101,7 @@ async function handler(args) {
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
             uiLogger.error(commands.sandbox.subcommands.create.failure.noSandboxAccountConfig(result.sandbox.sandboxHubId));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
         if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
@@ -111,11 +111,11 @@ async function handler(args) {
             highlightItems.push('projectUploadCommand');
         }
         uiFeatureHighlight(highlightItems);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (error) {
         // Errors are logged in util functions
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function sandboxCreateBuilder(yargs) {
@@ -150,7 +150,7 @@ const builder = makeYargsBuilder(sandboxCreateBuilder, command, describe, {
 const sandboxCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('sandbox-create', handler),
     builder,
 };
 export default sandboxCreateCommand;

package/commands/sandbox/delete.js

@@ -4,7 +4,6 @@ import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { getConfigAccountEnvironment, removeAccountFromConfig, setConfigAccountAsDefault, getAllConfigAccounts, getConfigAccountIfExists, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { logError, debugError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { deleteSandboxPrompt } from '../../lib/prompts/sandboxesPrompt.js';
@@ -12,12 +11,12 @@ import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { uiAuthCommandReference, uiBetaTag } from '../../lib/ui/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete';
 const describe = uiBetaTag(commands.sandbox.subcommands.delete.describe, false);
 async function handler(args) {
-    const { userProvidedAccount, derivedAccountId, force } = args;
-    trackCommandUsage('sandbox-delete', {}, derivedAccountId);
+    const { userProvidedAccount, force, exit } = args;
     let accountPrompt;
     if (!userProvidedAccount) {
         if (!force) {
@@ -27,19 +26,19 @@ async function handler(args) {
             // Account is required, throw error if force flag is present and no account is specified
             uiLogger.log('');
             uiLogger.error(commands.sandbox.subcommands.delete.failure.noAccount);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
             uiLogger.log('');
             uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccounts);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     const accountIdentifier = userProvidedAccount || accountPrompt.account;
     const sandboxAccount = getConfigAccountIfExists(accountIdentifier);
     if (!sandboxAccount) {
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const sandboxAccountId = sandboxAccount.accountId;
     const defaultAccount = getConfigDefaultAccountIfExists();
@@ -56,14 +55,14 @@ async function handler(args) {
                 const parentAccountPrompt = await deleteSandboxPrompt(true);
                 if (!parentAccountPrompt) {
                     uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
                 const parentAccount = getConfigAccountIfExists(parentAccountPrompt.account);
                 parentAccountId = parentAccount?.accountId;
             }
             else {
                 uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
     }
@@ -76,7 +75,7 @@ async function handler(args) {
         uiLogger.log('');
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
         uiLogger.log('');
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.debug(commands.sandbox.subcommands.delete.debug.deleting(sandboxAccountId));
     if (isDefaultAccount) {
@@ -93,7 +92,7 @@ async function handler(args) {
                 },
             ]);
             if (!confirmed) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         await deleteSandbox(parentAccountId, sandboxAccountId);
@@ -111,7 +110,7 @@ async function handler(args) {
             // If force is specified, skip prompt and set the parent account id as the default account
             setConfigAccountAsDefault(parentAccountId);
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
         debugError(err);
@@ -147,12 +146,12 @@ async function handler(args) {
                 // If force is specified, skip prompt and set the parent account id as the default account
                 setConfigAccountAsDefault(parentAccountId);
             }
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function sandboxDeleteBuilder(yargs) {
@@ -183,7 +182,7 @@ const builder = makeYargsBuilder(sandboxDeleteBuilder, command, describe, {
 const sandboxDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('sandbox-delete', handler),
     builder,
 };
 export default sandboxDeleteCommand;