@hubspot/cli 7.5.11-experimental.0 → 7.7.0-experimental.0

package/commands/project/profile/delete.js

@@ -0,0 +1,123 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
+const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const usageTracking_1 = require("../../../lib/usageTracking");
+const config_1 = require("../../../lib/projects/config");
+const ui_1 = require("../../../lib/ui");
+const logger_1 = require("../../../lib/ui/logger");
+const exitCodes_1 = require("../../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const en_1 = require("../../../lang/en");
+const promptUtils_1 = require("../../../lib/prompts/promptUtils");
+const validation_1 = require("../../../lib/validation");
+const errorHandlers_1 = require("../../../lib/errorHandlers");
+const command = 'delete [name]';
+const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.profile.delete.describe, false);
+async function handler(args) {
+    const { derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('project-profile-delete', undefined, derivedAccountId);
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+    if (!projectConfig || !projectDir) {
+        logger_1.uiLogger.error(en_1.commands.project.profile.delete.errors.noProjectConfig);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const projectSourceDir = path_1.default.join(projectDir, projectConfig.srcDir);
+    let profileName = undefined;
+    if (args.name) {
+        profileName = args.name;
+        const profileFilename = (0, project_parsing_lib_1.getHsProfileFilename)(profileName);
+        if (!(0, validation_1.fileExists)(path_1.default.join(projectSourceDir, profileFilename))) {
+            logger_1.uiLogger.error(en_1.commands.project.profile.delete.errors.noProfileFound(profileFilename));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+    }
+    else {
+        const existingProfiles = await (0, project_parsing_lib_1.getAllHsProfiles)(projectSourceDir);
+        if (existingProfiles.length === 0) {
+            logger_1.uiLogger.error(en_1.commands.project.profile.delete.errors.noProfilesFound);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        const promptResponse = await (0, promptUtils_1.listPrompt)(en_1.commands.project.profile.delete.prompts.deleteProfilePrompt, {
+            choices: existingProfiles.map(profile => ({
+                name: (0, project_parsing_lib_1.getHsProfileFilename)(profile),
+                value: profile,
+            })),
+        });
+        if (promptResponse) {
+            profileName = promptResponse;
+        }
+        logger_1.uiLogger.log('');
+    }
+    // This should never happen
+    if (!profileName) {
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    let targetAccountId;
+    try {
+        const profileToDelete = (0, project_parsing_lib_1.loadHsProfileFile)(projectSourceDir, profileName);
+        targetAccountId = profileToDelete?.accountId;
+    }
+    catch (err) {
+        logger_1.uiLogger.debug(en_1.commands.project.profile.delete.debug.failedToLoadProfile(profileName));
+    }
+    if (targetAccountId) {
+        let projectExists = false;
+        try {
+            const fetchProjectResponse = await (0, projects_1.fetchProject)(targetAccountId, projectConfig.name);
+            projectExists = !!fetchProjectResponse.data;
+        }
+        catch (err) {
+            (0, errorHandlers_1.debugError)(err);
+        }
+        if (projectExists) {
+            const confirmResponse = await (0, promptUtils_1.confirmPrompt)(en_1.commands.project.profile.delete.prompts.deleteProjectPrompt(targetAccountId), {
+                defaultAnswer: false,
+            });
+            if (confirmResponse) {
+                await (0, projects_2.deleteProject)(targetAccountId, projectConfig.name);
+                logger_1.uiLogger.log(en_1.commands.project.profile.delete.logs.deletedProject(targetAccountId));
+            }
+            else {
+                logger_1.uiLogger.log(en_1.commands.project.profile.delete.logs.didNotDeleteProject(targetAccountId));
+            }
+            logger_1.uiLogger.log('');
+        }
+    }
+    const profileFilename = (0, project_parsing_lib_1.getHsProfileFilename)(profileName);
+    try {
+        fs_1.default.unlinkSync(path_1.default.join(projectSourceDir, profileFilename));
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.project.profile.delete.errors.failedToDeleteProfile(profileFilename));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    logger_1.uiLogger.log(en_1.commands.project.profile.delete.logs.profileDeleted(profileFilename));
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function projectProfileDeleteBuilder(yargs) {
+    yargs.positional('name', {
+        describe: en_1.commands.project.profile.delete.positionals.name,
+        type: 'string',
+    });
+    yargs.example([
+        ['$0 project profile delete qa', en_1.commands.project.profile.delete.example],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectProfileDeleteBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const projectProfileDeleteCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = projectProfileDeleteCommand;

package/commands/project/profile.d.ts

@@ -0,0 +1,3 @@
+import { YargsCommandModuleBucket } from '../../types/Yargs';
+declare const projectProfileCommand: YargsCommandModuleBucket;
+export default projectProfileCommand;

package/commands/project/profile.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ui_1 = require("../../lib/ui");
+const add_1 = __importDefault(require("./profile/add"));
+const delete_1 = __importDefault(require("./profile/delete"));
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const en_1 = require("../../lang/en");
+const command = ['profile', 'profiles'];
+const describe = undefined; // uiBetaTag(commands.project.profile.describe, false);
+const verboseDescribe = (0, ui_1.uiBetaTag)(en_1.commands.project.profile.verboseDescribe, false);
+function projectProfileBuilder(yargs) {
+    yargs.command(add_1.default).command(delete_1.default).demandCommand(1, '');
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectProfileBuilder, command, verboseDescribe);
+const projectProfileCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = projectProfileCommand;

package/commands/project/upload.d.ts

@@ -4,6 +4,7 @@ type ProjectUploadArgs = CommonArgs & {
     message: string;
     m: string;
     skipValidation: boolean;
+    profile?: string;
 };
 declare const projectUploadCommand: YargsCommandModule<unknown, ProjectUploadArgs>;
 export default projectUploadCommand;

package/commands/project/upload.js

@@ -19,18 +19,40 @@ const constants_1 = require("../../lib/constants");
 const index_2 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const projectProfiles_1 = require("../../lib/projectProfiles");
 const command = 'upload';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.upload.describe`), false);
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, skipValidation } = args;
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
-    const accountType = accountConfig && accountConfig.accountType;
+    const { forceCreate, message, derivedAccountId, providedAccountId, skipValidation, } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
-    (0, usageTracking_1.trackCommandUsage)('project-upload', { type: accountType }, derivedAccountId);
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
+    let targetAccountId = providedAccountId;
+    if (!targetAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        if (args.profile) {
+            (0, projectProfiles_1.logProfileHeader)(args.profile);
+            const profile = (0, projectProfiles_1.loadProfile)(projectConfig, projectDir, args.profile);
+            if (!profile) {
+                (0, ui_1.uiLine)();
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+            targetAccountId = profile.accountId;
+            (0, projectProfiles_1.logProfileFooter)(profile, true);
+        }
+        else {
+            // A profile must be specified if this project has profiles configured
+            await (0, projectProfiles_1.exitIfUsingProfiles)(projectConfig, projectDir);
+        }
+    }
+    if (!targetAccountId) {
+        // The user is not using profiles, so we can use the derived accountId
+        targetAccountId = derivedAccountId;
+    }
+    const accountConfig = (0, config_1.getAccountConfig)(targetAccountId);
+    const accountType = accountConfig && accountConfig.accountType;
+    (0, usageTracking_1.trackCommandUsage)('project-upload', { type: accountType }, targetAccountId);
     try {
         const { result, uploadError } = await (0, upload_1.handleProjectUpload)({
-            accountId: derivedAccountId,
+            accountId: targetAccountId,
             projectConfig,
             projectDir: projectDir,
             callbackFunc: buildAndDeploy_2.pollProjectBuildAndDeploy,
@@ -39,6 +61,7 @@ async function handler(args) {
             isUploadCommand: true,
             sendIR: (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion),
             skipValidation,
+            profile: args.profile,
         });
         if (uploadError) {
             if ((0, index_1.isSpecifiedError)(uploadError, {
@@ -50,7 +73,7 @@ async function handler(args) {
             }
             else {
                 (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
-                    accountId: derivedAccountId,
+                    accountId: targetAccountId,
                     request: 'project upload',
                 }));
             }
@@ -64,13 +87,13 @@ async function handler(args) {
                 deployCommand: (0, ui_1.uiCommandReference)(`hs project deploy --build=${result.buildId}`),
             }));
             (0, ui_2.logFeedbackMessage)(result.buildId);
-            await (0, buildAndDeploy_2.displayWarnLogs)(derivedAccountId, projectConfig.name, result.buildId);
+            await (0, buildAndDeploy_2.displayWarnLogs)(targetAccountId, projectConfig.name, result.buildId);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     }
     catch (e) {
         (0, index_2.logError)(e, new index_2.ApiErrorContext({
-            accountId: derivedAccountId,
+            accountId: targetAccountId,
             request: 'project upload',
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -95,7 +118,14 @@ function projectUploadBuilder(yargs) {
             hidden: true,
             default: false,
         },
+        profile: {
+            type: 'string',
+            alias: 'p',
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.upload.options.profile.describe`),
+            hidden: true,
+        },
     });
+    yargs.conflicts('profile', 'account');
     yargs.example([
         [
             '$0 project upload',

package/commands/project/validate.d.ts

@@ -0,0 +1,4 @@
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectValidateArgs = CommonArgs;
+declare const projectValidateCommand: YargsCommandModule<unknown, ProjectValidateArgs>;
+export default projectValidateCommand;

package/commands/project/validate.js

@@ -0,0 +1,53 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+const project_parsing_lib_2 = require("@hubspot/project-parsing-lib");
+const ui_1 = require("../../lib/ui");
+const config_1 = require("../../lib/projects/config");
+const lang_1 = require("../../lib/lang");
+const index_1 = require("../../lib/errorHandlers/index");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
+const command = 'validate';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.validate.describe`), false);
+async function handler(args) {
+    const { derivedAccountId } = args;
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+    (0, config_1.validateProjectConfig)(projectConfig, projectDir);
+    try {
+        await (0, project_parsing_lib_2.translate)({
+            projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
+            platformVersion: projectConfig.platformVersion,
+            accountId: derivedAccountId,
+        });
+        logger_1.uiLogger.success('Project validated successfully. No Errors');
+    }
+    catch (e) {
+        if ((0, project_parsing_lib_1.isTranslationError)(e)) {
+            logger_1.uiLogger.error(e.toString());
+        }
+        else {
+            (0, index_1.logError)(e);
+        }
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function projectValidateBuilder(yargs) {
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectValidateBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const projectValidateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = projectValidateCommand;

package/commands/project.js

@@ -19,6 +19,8 @@ const migrate_1 = __importDefault(require("./project/migrate"));
 const migrateApp_1 = __importDefault(require("./project/migrateApp"));
 const cloneApp_1 = __importDefault(require("./project/cloneApp"));
 const installDeps_1 = __importDefault(require("./project/installDeps"));
+const profile_1 = __importDefault(require("./project/profile"));
+const validate_1 = __importDefault(require("./project/validate"));
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = ['project', 'projects'];
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.describe`), false);
@@ -38,6 +40,8 @@ function projectBuilder(yargs) {
         .command(migrate_1.default)
         .command(cloneApp_1.default)
         .command(installDeps_1.default)
+        .command(profile_1.default)
+        .command(validate_1.default)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/remove.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../types/Yargs';
-export declare const command = "remove <path>";
-export declare const describe: string;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs';
 type RemoveArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & {
     path: string;
 };
-export declare function handler(args: ArgumentsCamelCase<RemoveArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<RemoveArgs>;
-export {};
+declare const cmsRemoveCommand: YargsCommandModule<unknown, RemoveArgs>;
+export default cmsRemoveCommand;

package/commands/remove.js

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const fileMapper_1 = require("@hubspot/local-dev-lib/api/fileMapper");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("../lib/errorHandlers/index");
-const commonOpts_1 = require("../lib/commonOpts");
 const usageTracking_1 = require("../lib/usageTracking");
 const lang_1 = require("../lib/lang");
-exports.command = 'remove <path>';
-exports.describe = (0, lang_1.i18n)(`commands.remove.describe`);
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'remove <path>';
+const describe = (0, lang_1.i18n)(`commands.remove.describe`);
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('remove', undefined, derivedAccountId);
@@ -32,14 +29,25 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+function cmsRemoveBuilder(yargs) {
     yargs.positional('path', {
         describe: (0, lang_1.i18n)(`commands.remove.positionals.path.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(cmsRemoveBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const cmsRemoveCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = cmsRemoveCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = cmsRemoveCommand;

package/commands/sandbox/create.d.ts

@@ -1,13 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs } from '../../types/Yargs';
-export declare const command = "create";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs;
-type SandboxCreateArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
+type SandboxCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
     name?: string;
     force?: boolean;
     type?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<SandboxCreateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SandboxCreateArgs>;
-export {};
+declare const sandboxCreateCommand: YargsCommandModule<unknown, SandboxCreateArgs>;
+export default sandboxCreateCommand;

package/commands/sandbox/create.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 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 commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_1 = require("../../lib/ui");
@@ -21,8 +17,9 @@ 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");
-exports.command = 'create';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.create.describe`), false);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.create.describe`), false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -146,7 +143,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function builder(yargs) {
+function sandboxCreateBuilder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
@@ -166,9 +163,19 @@ function builder(yargs) {
             (0, lang_1.i18n)(`commands.sandbox.subcommands.create.examples.default`),
         ],
     ]);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(sandboxCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useTestingOptions: true,
+});
+const sandboxCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = sandboxCreateCommand;

package/commands/sandbox/delete.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs } from '../../types/Yargs';
-export declare const command = "delete";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs;
-type SandboxDeleteArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, TestingArgs, YargsCommandModule } from '../../types/Yargs';
+type SandboxDeleteArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & TestingArgs & {
     account?: string;
     force?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<SandboxDeleteArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<SandboxDeleteArgs>;
-export {};
+declare const sandboxDeleteCommand: YargsCommandModule<unknown, SandboxDeleteArgs>;
+export default sandboxDeleteCommand;

package/commands/sandbox/delete.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
@@ -10,7 +7,6 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
 const environment_1 = require("@hubspot/local-dev-lib/environment");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const index_2 = require("../../lib/errorHandlers/index");
 const lang_1 = require("../../lib/lang");
@@ -19,8 +15,9 @@ const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const ui_1 = require("../../lib/ui");
-exports.command = 'delete';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'delete';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
 async function handler(args) {
     const { providedAccountId, force } = args;
     (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
@@ -182,7 +179,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function builder(yargs) {
+function sandboxDeleteBuilder(yargs) {
     yargs.option('account', {
         describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.account.describe`),
         type: 'string',
@@ -198,9 +195,19 @@ function builder(yargs) {
             (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.examples.default`),
         ],
     ]);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(sandboxDeleteBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useTestingOptions: true,
+});
+const sandboxDeleteCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = sandboxDeleteCommand;

package/commands/sandbox.d.ts

@@ -1,4 +1,3 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const sandboxCommand: YargsCommandModuleBucket;
+export default sandboxCommand;

package/commands/sandbox.js

@@ -1,49 +1,26 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.builder = builder;
-const commonOpts_1 = require("../lib/commonOpts");
 const lang_1 = require("../lib/lang");
 const ui_1 = require("../lib/ui");
-const create = __importStar(require("./sandbox/create"));
-const del = __importStar(require("./sandbox/delete"));
-exports.command = ['sandbox', 'sandboxes'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.describe`), false);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
-    yargs.command(create).command(del).demandCommand(1, '');
+const create_1 = __importDefault(require("./sandbox/create"));
+const delete_1 = __importDefault(require("./sandbox/delete"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['sandbox', 'sandboxes'];
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.describe`), false);
+function sandboxBuilder(yargs) {
+    yargs.command(create_1.default).command(delete_1.default).demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(sandboxBuilder, command, describe);
+const sandboxCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = sandboxCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = sandboxCommand;

package/commands/secret/addSecret.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "add [name]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type AddSecretArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type AddSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AddSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AddSecretArgs>;
-export {};
+declare const addSecretCommand: YargsCommandModule<unknown, AddSecretArgs>;
+export default addSecretCommand;