@hubspot/cli 7.5.4-experimental.0 → 7.5.4

package/commands/remove.js

@@ -1,43 +1,45 @@
 "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");
-const i18nKey = 'commands.remove';
-exports.command = 'remove <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const en_1 = require("../lang/en");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("../lib/ui/logger");
+const command = 'remove <path>';
+const describe = en_1.commands.remove.describe;
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('remove', undefined, derivedAccountId);
     try {
         await (0, fileMapper_1.deleteFile)(derivedAccountId, hsPath);
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.deleted`, { accountId: derivedAccountId, path: hsPath }));
+        logger_1.uiLogger.log(en_1.commands.remove.deleted(hsPath, derivedAccountId));
     }
     catch (error) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.deleteFailed`, {
-            accountId: derivedAccountId,
-            path: hsPath,
-        }));
+        logger_1.uiLogger.error(en_1.commands.remove.errors.deleteFailed(hsPath, derivedAccountId));
         (0, index_1.logError)(error, new index_1.ApiErrorContext({
             accountId: derivedAccountId,
             request: hsPath,
         }));
     }
 }
-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)(`${i18nKey}.positionals.path.describe`),
+        describe: en_1.commands.remove.positionals.path,
         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;

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,9 +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");
-const i18nKey = 'commands.sandbox.subcommands.create';
-exports.command = 'create';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.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);
@@ -31,7 +27,7 @@ async function handler(args) {
     (0, usageTracking_1.trackCommandUsage)('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccountConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
             accountId: derivedAccountId,
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
@@ -40,7 +36,7 @@ async function handler(args) {
     // 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)(`${i18nKey}.failure.invalidAccountType`, {
+        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]],
             accountName: accountConfig.name || '',
         }));
@@ -53,7 +49,7 @@ async function handler(args) {
             typePrompt = await (0, sandboxesPrompt_1.sandboxTypePrompt)();
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.type`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -86,7 +82,7 @@ async function handler(args) {
             namePrompt = await (0, accountNamePrompt_1.hubspotAccountNamePrompt)({ accountType: sandboxType });
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.name`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -111,7 +107,7 @@ async function handler(args) {
         const sandboxAccountConfig = (0, config_1.getAccountConfig)(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountConfig`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
                 accountId: result.sandbox.sandboxHubId,
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -147,29 +143,39 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function builder(yargs) {
+function sandboxCreateBuilder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.force.describe`),
     });
     yargs.option('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.name.describe`),
         type: 'string',
     });
     yargs.option('type', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.type.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.type.describe`),
         choices: Object.keys(sandboxes_1.SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
             '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (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,9 +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");
-const i18nKey = 'commands.sandbox.subcommands.delete';
-exports.command = 'delete';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.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);
@@ -33,12 +29,12 @@ async function handler(args) {
         else {
             // Account is required, throw error if force flag is present and no account is specified
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccount`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noAccount`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccounts`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccounts`, {
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -46,7 +42,7 @@ async function handler(args) {
     }
     const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
     if (!sandboxAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountId`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const isDefaultAccount = sandboxAccountId === (0, config_1.getAccountId)();
@@ -61,7 +57,7 @@ async function handler(args) {
             else if (!force) {
                 const parentAccountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)(true);
                 if (!parentAccountPrompt) {
-                    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                    logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                         authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                     }));
                     process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -69,7 +65,7 @@ async function handler(args) {
                 parentAccountId = (0, config_1.getAccountId)(parentAccountPrompt.account);
             }
             else {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                     authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                 }));
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -80,7 +76,7 @@ async function handler(args) {
     const command = `hs auth ${(0, config_1.getEnv)(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
     if (parentAccountId && !(0, config_1.getAccountId)(parentAccountId)) {
         logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentPortalAvailable`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentPortalAvailable`, {
             parentAccountId,
             url,
             command,
@@ -88,11 +84,11 @@ async function handler(args) {
         logger_1.logger.log('');
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.deleting`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.debug.deleting`, {
         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
     }));
     if (isDefaultAccount) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.defaultAccountWarning`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.defaultAccountWarning`, {
             account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
         }));
         logger_1.logger.log('');
@@ -103,7 +99,7 @@ async function handler(args) {
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: (0, lang_1.i18n)(`${i18nKey}.confirm`, {
+                    message: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.confirm`, {
                         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                     }),
                 },
@@ -114,8 +110,8 @@ async function handler(args) {
         }
         await (0, sandboxHubs_1.deleteSandbox)(parentAccountId, sandboxAccountId);
         const deleteKey = isDefaultAccount
-            ? `${i18nKey}.success.deleteDefault`
-            : `${i18nKey}.success.delete`;
+            ? `commands.sandbox.subcommands.delete.success.deleteDefault`
+            : `commands.sandbox.subcommands.delete.success.delete`;
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
             account: providedAccountId || accountPrompt.account,
@@ -139,7 +135,7 @@ async function handler(args) {
             // Intercept invalid key error
             // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidKey`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidKey`, {
                 account: (0, ui_1.uiAccountDescription)(parentAccountId),
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -150,7 +146,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidUser`, {
                 accountName: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                 parentAccountName: (0, ui_1.uiAccountDescription)(parentAccountId),
             }));
@@ -162,7 +158,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.failure.objectNotFound`, {
+            logger_1.logger.warn((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.objectNotFound`, {
                 account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
             }));
             logger_1.logger.log('');
@@ -183,25 +179,35 @@ 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)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.account.describe`),
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.force.describe`),
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (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,50 +1,24 @@
 "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"));
-const i18nKey = 'commands.sandbox';
-exports.command = ['sandbox', 'sandboxes'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.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;

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;

package/commands/secret/addSecret.js

@@ -1,21 +1,17 @@
 "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 secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const ui_1 = require("../../lib/ui");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
-const i18nKey = 'commands.secret.subcommands.add';
-exports.command = 'add [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'add [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.add.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -27,7 +23,7 @@ async function handler(args) {
         }
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.alreadyExists`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.alreadyExists`, {
                 secretName,
                 command: (0, ui_2.uiCommandReference)('hs secret update'),
             }));
@@ -35,13 +31,13 @@ async function handler(args) {
         }
         const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
         await (0, secrets_1.addSecret)(derivedAccountId, secretName, secretValue);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.add`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.add.success.add`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.add`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.add`, {
             secretName: secretName || '',
         }));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
@@ -50,13 +46,23 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function addSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.add.positionals.name.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(addSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const addSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = addSecretCommand;

package/commands/secret/deleteSecret.d.ts

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