@hubspot/cli 7.6.0-beta.5 → 7.6.0-beta.7

package/commands/sandbox/__tests__/delete.test.js

@@ -1,36 +1,31 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const yargs_1 = __importDefault(require("yargs"));
-const commonOpts_1 = require("../../../lib/commonOpts");
-const delete_1 = __importDefault(require("../delete"));
+import yargs from 'yargs';
+import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } from '../../../lib/commonOpts.js';
+import sandboxDeleteCommand from '../delete.js';
 vi.mock('../../../lib/commonOpts');
 describe('commands/sandbox/delete', () => {
-    const yargsMock = yargs_1.default;
+    const yargsMock = yargs;
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(delete_1.default.command).toEqual('delete');
+            expect(sandboxDeleteCommand.command).toEqual('delete');
         });
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(delete_1.default.describe).toBeDefined();
+            expect(sandboxDeleteCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
         it('should support the correct options', () => {
-            delete_1.default.builder(yargsMock);
+            sandboxDeleteCommand.builder(yargsMock);
             expect(yargsMock.example).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addTestingOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addTestingOptions).toHaveBeenCalledWith(yargsMock);
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addAccountOptions).toHaveBeenCalledWith(yargsMock);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addConfigOptions).toHaveBeenCalledWith(yargsMock);
-            expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
-            expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addTestingOptions).toHaveBeenCalledTimes(1);
+            expect(addTestingOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addAccountOptions).toHaveBeenCalledTimes(1);
+            expect(addAccountOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addConfigOptions).toHaveBeenCalledTimes(1);
+            expect(addConfigOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargsMock);
         });
     });
 });

package/commands/sandbox/create.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
-type SandboxCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type SandboxCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
     name?: string;
     force?: boolean;
     type?: string;

package/commands/sandbox/create.js

@@ -1,171 +1,184 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("@hubspot/local-dev-lib/config");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const index_1 = require("@hubspot/local-dev-lib/errors/index");
-const urls_1 = require("@hubspot/local-dev-lib/urls");
-const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const environment_1 = require("@hubspot/local-dev-lib/environment");
-const lang_1 = require("../../lib/lang");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const ui_1 = require("../../lib/ui");
-const sandboxes_1 = require("../../lib/sandboxes");
-const usageTracking_1 = require("../../lib/usageTracking");
-const sandboxesPrompt_1 = require("../../lib/prompts/sandboxesPrompt");
-const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const sandboxSync_1 = require("../../lib/sandboxSync");
-const index_2 = require("../../lib/errorHandlers/index");
-const buildAccount_1 = require("../../lib/buildAccount");
-const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import { getAccountConfig, getEnv } from '@hubspot/local-dev-lib/config';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
+import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
+import { getValidEnv } from '@hubspot/local-dev-lib/environment';
+import { i18n } from '../../lib/lang.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { uiFeatureHighlight, uiBetaTag, uiCommandReference, } from '../../lib/ui/index.js';
+import { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, 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 { syncSandbox } from '../../lib/sandboxSync.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { buildSandbox, buildV2Sandbox } from '../../lib/buildAccount.js';
+import { hubspotAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { hasFeature } from '../../lib/hasFeature.js';
+import { FEATURES } from '../../lib/constants.js';
 const command = 'create';
-const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.create.describe`), false);
+const describe = uiBetaTag(i18n(`commands.sandbox.subcommands.create.describe`), false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
-    const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
-    (0, usageTracking_1.trackCommandUsage)('sandbox-create', {}, derivedAccountId);
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
+    trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
+        logger.error(i18n(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
             accountId: derivedAccountId,
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
+            authCommand: uiCommandReference('hs auth'),
         }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
     // Default account is not a production portal
     if (accountConfig.accountType &&
-        accountConfig.accountType !== config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
-            accountType: config_2.HUBSPOT_ACCOUNT_TYPE_STRINGS[config_2.HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
+        accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
+        logger.error(i18n(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
+            accountType: HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
             accountName: accountConfig.name || '',
         }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
     let typePrompt;
     let namePrompt;
-    if ((type && !(type.toLowerCase() in sandboxes_1.SANDBOX_TYPE_MAP)) || !type) {
+    if ((type && !(type.toLowerCase() in SANDBOX_TYPE_MAP)) || !type) {
         if (!force) {
-            typePrompt = await (0, sandboxesPrompt_1.sandboxTypePrompt)();
+            typePrompt = await sandboxTypePrompt();
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxType = type
-        ? sandboxes_1.SANDBOX_TYPE_MAP[type.toLowerCase()]
+        ? SANDBOX_TYPE_MAP[type.toLowerCase()]
         : typePrompt.type;
     // Check usage limits and exit if parent portal has no available sandboxes for the selected type
     try {
-        await (0, sandboxes_1.validateSandboxUsageLimits)(accountConfig, sandboxType, env);
+        await validateSandboxUsageLimits(accountConfig, sandboxType, env);
     }
     catch (err) {
-        if ((0, index_1.isMissingScopeError)(err)) {
-            logger_1.logger.error((0, lang_1.i18n)('lib.sandbox.create.failure.scopes.message', {
+        if (isMissingScopeError(err)) {
+            logger.error(i18n('lib.sandbox.create.failure.scopes.message', {
                 accountName: accountConfig.name || derivedAccountId,
             }));
-            const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
+            const websiteOrigin = getHubSpotWebsiteOrigin(env);
             const url = `${websiteOrigin}/personal-access-key/${derivedAccountId}`;
-            logger_1.logger.info((0, lang_1.i18n)('lib.sandbox.create.failure.scopes.instructions', {
+            logger.info(i18n('lib.sandbox.create.failure.scopes.instructions', {
                 accountName: accountConfig.name || derivedAccountId,
                 url,
             }));
         }
         else {
-            (0, index_2.logError)(err);
+            logError(err);
         }
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
     if (!name) {
         if (!force) {
-            namePrompt = await (0, accountNamePrompt_1.hubspotAccountNamePrompt)({ accountType: sandboxType });
+            namePrompt = await hubspotAccountNamePrompt({ accountType: sandboxType });
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+            process.exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxName = name || namePrompt.name;
+    const sandboxName = name || (namePrompt && namePrompt.name);
+    if (!sandboxName) {
+        logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+        process.exit(EXIT_CODES.ERROR);
+    }
     let contactRecordsSyncPromptResult = false;
     if (!force) {
-        const isStandardSandbox = sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+        const isStandardSandbox = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
         // Prompt to sync contact records for standard sandboxes only
         if (isStandardSandbox) {
-            const { contactRecordsSyncPrompt } = await (0, promptUtils_1.promptUser)([
+            const { contactRecordsSyncPrompt } = await promptUser([
                 {
                     name: 'contactRecordsSyncPrompt',
                     type: 'confirm',
-                    message: (0, lang_1.i18n)('lib.sandbox.sync.confirm.syncContactRecords.standard'),
+                    message: i18n('lib.sandbox.sync.confirm.syncContactRecords.standard'),
                 },
             ]);
             contactRecordsSyncPromptResult = contactRecordsSyncPrompt;
         }
     }
+    // Check if parent portal is ungated for v2 sandboxes
+    const isUngatedForV2Cli = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2_CLI);
+    const isUngatedForV2Sandboxes = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2);
+    const canCreateV2Sandbox = isUngatedForV2Sandboxes && isUngatedForV2Cli;
     try {
-        const result = await (0, buildAccount_1.buildSandbox)(sandboxName, accountConfig, sandboxType, env, force);
-        const sandboxAccountConfig = (0, config_1.getAccountConfig)(result.sandbox.sandboxHubId);
+        let result;
+        if (canCreateV2Sandbox) {
+            result = await buildV2Sandbox(sandboxName, accountConfig, sandboxType, contactRecordsSyncPromptResult, env, force);
+        }
+        else {
+            result = await buildSandbox(sandboxName, accountConfig, sandboxType, env, force);
+        }
+        const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
+            logger.error(i18n(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
                 accountId: result.sandbox.sandboxHubId,
-                authCommand: (0, ui_1.uiCommandReference)('hs auth'),
+                authCommand: uiCommandReference('hs auth'),
             }));
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
-        // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
-        async function handleSyncSandbox(syncTasks) {
-            await (0, sandboxSync_1.syncSandbox)(sandboxAccountConfig, accountConfig, env, syncTasks);
-        }
-        try {
-            let availableSyncTasks = await (0, sandboxes_1.getAvailableSyncTypes)(accountConfig, sandboxAccountConfig);
-            if (!contactRecordsSyncPromptResult) {
-                availableSyncTasks = availableSyncTasks.filter(t => t.type !== sandboxes_1.SYNC_TYPES.OBJECT_RECORDS);
+        if (result && !canCreateV2Sandbox) {
+            // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
+            try {
+                let availableSyncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
+                if (!contactRecordsSyncPromptResult) {
+                    availableSyncTasks = availableSyncTasks.filter(t => t.type !== SYNC_TYPES.OBJECT_RECORDS);
+                }
+                await syncSandbox(sandboxAccountConfig, accountConfig, env, availableSyncTasks);
+            }
+            catch (err) {
+                logError(err);
+                throw err;
             }
-            await handleSyncSandbox(availableSyncTasks);
-        }
-        catch (err) {
-            (0, index_2.logError)(err);
-            throw err;
         }
         const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
-        if (sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+        if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
             highlightItems.push('projectDevCommand');
         }
         else {
             highlightItems.push('projectUploadCommand');
         }
-        (0, ui_1.uiFeatureHighlight)(highlightItems);
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        uiFeatureHighlight(highlightItems);
+        process.exit(EXIT_CODES.SUCCESS);
     }
     catch (error) {
         // Errors are logged in util functions
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
 }
 function sandboxCreateBuilder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.force.describe`),
+        describe: i18n(`commands.sandbox.subcommands.create.options.force.describe`),
     });
     yargs.option('name', {
-        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.name.describe`),
+        describe: i18n(`commands.sandbox.subcommands.create.options.name.describe`),
         type: 'string',
     });
     yargs.option('type', {
-        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.type.describe`),
-        choices: Object.keys(sandboxes_1.SANDBOX_TYPE_MAP),
+        describe: i18n(`commands.sandbox.subcommands.create.options.type.describe`),
+        choices: Object.keys(SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
             '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            (0, lang_1.i18n)(`commands.sandbox.subcommands.create.examples.default`),
+            i18n(`commands.sandbox.subcommands.create.examples.default`),
         ],
     ]);
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(sandboxCreateBuilder, command, describe, {
+const builder = makeYargsBuilder(sandboxCreateBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -178,4 +191,4 @@ const sandboxCreateCommand = {
     handler,
     builder,
 };
-exports.default = sandboxCreateCommand;
+export default sandboxCreateCommand;

package/commands/sandbox/delete.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs.js';
 type SandboxDeleteArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
     account?: string;
     force?: boolean;