@hubspot/cli 7.4.8 → 7.4.9-beta.0

package/commands/logs.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { outputLogs } = require('../lib/ui/serverlessFunctionLogs');
-const { getFunctionLogs, getLatestFunctionLog, } = require('@hubspot/local-dev-lib/api/functions');
-const { tailLogs } = require('../lib/serverlessLogs');
-const { i18n } = require('../lib/lang');
-const { promptUser } = require('../lib/prompts/promptUtils');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
+const usageTracking_1 = require("../lib/usageTracking");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const serverlessFunctionLogs_1 = require("../lib/ui/serverlessFunctionLogs");
+const functions_1 = require("@hubspot/local-dev-lib/api/functions");
+const serverlessLogs_1 = require("../lib/serverlessLogs");
+const lang_1 = require("../lib/lang");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const yargsUtils_1 = require("../lib/yargsUtils");
 const handleLogsError = (e, accountId, functionPath) => {
-    if (isHubSpotHttpError(e) && (e.status === 404 || e.status == 400)) {
-        logger.error(i18n(`commands.logs.errors.noLogsFound`, {
+    if ((0, index_1.isHubSpotHttpError)(e) && (e.status === 404 || e.status == 400)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.logs.errors.noLogsFound`, {
             accountId,
             functionPath,
         }));
@@ -21,101 +20,111 @@ const handleLogsError = (e, accountId, functionPath) => {
 };
 const endpointLog = async (accountId, functionPath, options) => {
     const { limit, latest, follow, compact } = options;
-    const requestOptions = {
+    const requestParams = {
         limit,
         latest,
         follow,
-        compact,
         endpoint: functionPath,
     };
-    logger.debug(i18n(`commands.logs.gettingLogs`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.logs.gettingLogs`, {
         latest,
         functionPath,
     }));
     let logsResp;
     if (follow) {
-        const tailCall = after => getFunctionLogs(accountId, functionPath, { after });
+        const tailCall = (after) => (0, functions_1.getFunctionLogs)(accountId, functionPath, { after });
         const fetchLatest = () => {
             try {
-                return getLatestFunctionLog(accountId, functionPath);
+                return (0, functions_1.getLatestFunctionLog)(accountId, functionPath);
             }
             catch (e) {
                 handleLogsError(e, accountId, functionPath);
+                return Promise.reject(e);
             }
         };
-        await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
+        await (0, serverlessLogs_1.tailLogs)(accountId, functionPath, fetchLatest, tailCall, compact);
     }
     else if (latest) {
         try {
-            const { data } = await getLatestFunctionLog(accountId, functionPath);
+            const { data } = await (0, functions_1.getLatestFunctionLog)(accountId, functionPath);
             logsResp = data;
         }
         catch (e) {
             handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     else {
         try {
-            const { data } = await getFunctionLogs(accountId, functionPath, requestOptions);
+            const { data } = await (0, functions_1.getFunctionLogs)(accountId, functionPath, requestParams);
             logsResp = data;
         }
         catch (e) {
             handleLogsError(e, accountId, functionPath);
-            process.exit(EXIT_CODES.ERROR);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     if (logsResp) {
-        return outputLogs(logsResp, requestOptions);
+        return (0, serverlessFunctionLogs_1.outputLogs)(logsResp, { compact });
     }
 };
-exports.command = 'logs [endpoint]';
-exports.describe = i18n(`commands.logs.describe`);
-exports.handler = async (options) => {
+const command = 'logs [endpoint]';
+const describe = (0, lang_1.i18n)(`commands.logs.describe`);
+const handler = async (options) => {
     const { endpoint: endpointArgValue, latest, derivedAccountId } = options;
-    trackCommandUsage('logs', { latest }, derivedAccountId);
-    const { endpointPromptValue } = await promptUser({
+    (0, usageTracking_1.trackCommandUsage)('logs', latest ? { action: 'latest' } : {}, derivedAccountId);
+    const { endpointPromptValue } = await (0, promptUtils_1.promptUser)({
         name: 'endpointPromptValue',
-        message: i18n(`commands.logs.endpointPrompt`),
+        message: (0, lang_1.i18n)(`commands.logs.endpointPrompt`),
         when: !endpointArgValue,
     });
-    endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
+    await endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
 };
-exports.builder = yargs => {
+function logsBuilder(yargs) {
     yargs.positional('endpoint', {
-        describe: i18n(`commands.logs.positionals.endpoint.describe`),
+        describe: (0, lang_1.i18n)(`commands.logs.positionals.endpoint.describe`),
         type: 'string',
     });
     yargs
         .options({
         latest: {
             alias: 'l',
-            describe: i18n(`commands.logs.options.latest.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.latest.describe`),
             type: 'boolean',
         },
         compact: {
-            describe: i18n(`commands.logs.options.compact.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.compact.describe`),
             type: 'boolean',
         },
         follow: {
             alias: ['f'],
-            describe: i18n(`commands.logs.options.follow.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.follow.describe`),
             type: 'boolean',
         },
         limit: {
-            describe: i18n(`commands.logs.options.limit.describe`),
+            describe: (0, lang_1.i18n)(`commands.logs.options.limit.describe`),
             type: 'number',
         },
     })
         .conflicts('follow', 'limit');
     yargs.example([
-        ['$0 logs my-endpoint', i18n(`commands.logs.examples.default`)],
-        ['$0 logs my-endpoint --limit=10', i18n(`commands.logs.examples.limit`)],
-        ['$0 logs my-endpoint --follow', i18n(`commands.logs.examples.follow`)],
+        ['$0 logs my-endpoint', (0, lang_1.i18n)(`commands.logs.examples.default`)],
+        ['$0 logs my-endpoint --limit=10', (0, lang_1.i18n)(`commands.logs.examples.limit`)],
+        ['$0 logs my-endpoint --follow', (0, lang_1.i18n)(`commands.logs.examples.follow`)],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(logsBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const logsCommand = {
+    command,
+    describe,
+    builder,
+    handler,
 };
+exports.default = logsCommand;
+module.exports = logsCommand;

package/commands/module/marketplace-validate.d.ts

@@ -1 +1,6 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type MarketplaceValidateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    src: string;
+};
+declare const marketplaceValidateCommand: YargsCommandModule<unknown, MarketplaceValidateArgs>;
+export default marketplaceValidateCommand;

package/commands/module/marketplace-validate.js

@@ -1,38 +1,50 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
-const { i18n } = require('../../lib/lang');
-exports.command = 'marketplace-validate <src>';
-exports.describe = i18n(`commands.module.subcommands.marketplaceValidate.describe`);
-exports.handler = async (options) => {
-    const { src, derivedAccountId } = options;
-    trackCommandUsage('validate', null, derivedAccountId);
-    SpinniesManager.init();
-    SpinniesManager.add('marketplaceValidation', {
-        text: i18n(`commands.module.subcommands.marketplaceValidate.logs.validatingModule`, {
+const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
+const usageTracking_1 = require("../../lib/usageTracking");
+const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
+const lang_1 = require("../../lib/lang");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'marketplace-validate <src>';
+const describe = (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.describe`);
+async function handler(args) {
+    const { src, derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('validate', undefined, derivedAccountId);
+    SpinniesManager_1.default.init();
+    SpinniesManager_1.default.add('marketplaceValidation', {
+        text: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.logs.validatingModule`, {
             path: src,
         }),
     });
     const assetType = 'MODULE';
-    const validationId = await kickOffValidation(derivedAccountId, assetType, src);
-    await pollForValidationFinish(derivedAccountId, validationId);
-    SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
-    processValidationErrors('commands.module.subcommands.marketplaceValidate', validationResults);
-    displayValidationResults('commands.module.subcommands.marketplaceValidate', validationResults);
-    process.exit();
-};
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
+    const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, src);
+    await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
+    SpinniesManager_1.default.remove('marketplaceValidation');
+    const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
+    (0, marketplaceValidate_1.processValidationErrors)('commands.module.subcommands.marketplaceValidate', validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)('commands.module.subcommands.marketplaceValidate', validationResults);
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function marketplaceValidateBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n(`commands.module.subcommands.marketplaceValidate.positionals.src.describe`),
+        describe: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.positionals.src.describe`),
         type: 'string',
     });
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(marketplaceValidateBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const marketplaceValidateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = marketplaceValidateCommand;

package/commands/module.d.ts

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

package/commands/module.js

@@ -1,14 +1,26 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const marketplaceValidate = require('./module/marketplace-validate');
-const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
-exports.command = 'module';
-exports.describe = false;
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addGlobalOptions(yargs);
-    yargs.command(marketplaceValidate).demandCommand(1, '');
+const marketplace_validate_1 = __importDefault(require("./module/marketplace-validate"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'module';
+const describe = undefined;
+function moduleBuilder(yargs) {
+    yargs.command(marketplace_validate_1.default).demandCommand(1, '');
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(moduleBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const moduleCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
 };
+exports.default = moduleCommand;
+module.exports = moduleCommand;

package/commands/project/dev/unifiedFlow.js

@@ -17,11 +17,13 @@ const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists
 const helpers_1 = require("../../../lib/projects/localDev/helpers");
 const projectDevTargetAccountPrompt_1 = require("../../../lib/prompts/projectDevTargetAccountPrompt");
 const SpinniesManager_1 = __importDefault(require("../../../lib/ui/SpinniesManager"));
-const LocalDevManagerV2_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevManagerV2"));
+const LocalDevProcess_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevProcess"));
+const LocalDevWatcher_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevWatcher"));
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
 const lang_1 = require("../../../lib/lang");
+// import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer';
 async function unifiedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
     logger_1.logger.log('Unified Apps Local Dev');
     const targetProjectAccountId = args.derivedAccountId;
@@ -94,8 +96,9 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         project = await (0, helpers_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, false, false);
         deployedBuild = await (0, helpers_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId, true);
     }
-    const LocalDev = new LocalDevManagerV2_1.default({
-        projectNodes,
+    // End setup, start local dev process
+    const localDevProcess = new LocalDevProcess_1.default({
+        initialProjectNodes: projectNodes,
         debug: args.debug,
         deployedBuild,
         isGithubLinked,
@@ -106,6 +109,26 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         projectId: project.id,
         env,
     });
-    await LocalDev.start();
-    (0, process_1.handleExit)(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));
+    await localDevProcess.start();
+    const watcher = new LocalDevWatcher_1.default(localDevProcess);
+    watcher.start();
+    // const websocketServer = new LocalDevWebsocketServer(
+    //   localDevProcess,
+    //   args.debug
+    // );
+    // await websocketServer.start();
+    (0, process_1.handleKeypress)(async (key) => {
+        if ((key.ctrl && key.name === 'c') || key.name === 'q') {
+            await Promise.all([
+                localDevProcess.stop(),
+                watcher.stop(),
+                // websocketServer.shutdown(),
+            ]);
+        }
+    });
+    (0, process_1.handleExit)(({ isSIGHUP }) => {
+        localDevProcess.stop(!isSIGHUP);
+        watcher.stop();
+        // websocketServer.shutdown();
+    });
 }

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;