@hubspot/cli 7.4.9-experimental.0 → 7.5.0-beta.0

package/commands/function/server.js

@@ -1,57 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logger } = require('@hubspot/local-dev-lib/logger');
+const usageTracking_1 = require("../../lib/usageTracking");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+// This package is not typed, so we need to use require
 const { start: startTestServer } = require('@hubspot/serverless-dev-runtime');
-const { i18n } = require('../../lib/lang');
-exports.command = 'server <path>';
-exports.describe = false;
-exports.handler = async (options) => {
-    const { path: functionPath, derivedAccountId } = options;
-    trackCommandUsage('functions-server', null, derivedAccountId);
-    logger.debug(i18n('commands.function.subcommands.server.debug.startingServer', {
+const lang_1 = require("../../lib/lang");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'server <path>';
+const describe = undefined;
+async function handler(args) {
+    const { path: functionPath, derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('functions-server', undefined, derivedAccountId);
+    logger_1.logger.debug((0, lang_1.i18n)('commands.function.subcommands.server.debug.startingServer', {
         functionPath,
     }));
     startTestServer({
         accountId: derivedAccountId,
-        ...options,
+        ...args,
     });
-};
-exports.builder = yargs => {
+}
+function functionServerBuilder(yargs) {
     yargs.positional('path', {
-        describe: i18n('commands.function.subcommands.server.positionals.path.describe'),
-        type: 'string',
-    });
-    yargs.option('port', {
-        describe: i18n('commands.function.subcommands.server.options.port.describe'),
+        describe: (0, lang_1.i18n)('commands.function.subcommands.server.positionals.path.describe'),
         type: 'string',
-        default: 5432,
-    });
-    yargs.option('contact', {
-        describe: i18n('commands.function.subcommands.server.options.contact.describe'),
-        type: 'boolean',
-        default: true,
-    });
-    yargs.option('watch', {
-        describe: i18n('commands.function.subcommands.server.options.watch.describe'),
-        type: 'boolean',
-        default: true,
     });
-    yargs.option('log-output', {
-        describe: i18n('commands.function.subcommands.server.options.logOutput.describe'),
-        type: 'boolean',
-        default: false,
+    yargs.options({
+        port: {
+            describe: (0, lang_1.i18n)('commands.function.subcommands.server.options.port.describe'),
+            type: 'string',
+            default: 5432,
+        },
+        contact: {
+            describe: (0, lang_1.i18n)('commands.function.subcommands.server.options.contact.describe'),
+            type: 'boolean',
+            default: true,
+        },
+        watch: {
+            describe: (0, lang_1.i18n)('commands.function.subcommands.server.options.watch.describe'),
+            type: 'boolean',
+            default: true,
+        },
+        'log-output': {
+            describe: (0, lang_1.i18n)('commands.function.subcommands.server.options.logOutput.describe'),
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([
         [
             '$0 functions server ./tmp/myFunctionFolder.functions',
-            i18n('commands.function.subcommands.server.examples.default'),
+            (0, lang_1.i18n)('commands.function.subcommands.server.examples.default'),
         ],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(functionServerBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const functionServerCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = functionServerCommand;

package/commands/function.d.ts

@@ -1 +1,5 @@
-export {};
+import { YargsCommandModuleBucket } from '../types/Yargs';
+export declare const command: string[];
+export declare const describe: string;
+declare const functionCommand: YargsCommandModuleBucket;
+export default functionCommand;

package/commands/function.js

@@ -1,16 +1,29 @@
 "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 { addGlobalOptions } = require('../lib/commonOpts');
-const list = require('./function/list');
-const deploy = require('./function/deploy');
-const server = require('./function/server');
-const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.function';
+exports.describe = exports.command = void 0;
+const list_1 = __importDefault(require("./function/list"));
+const deploy_1 = __importDefault(require("./function/deploy"));
+const server_1 = __importDefault(require("./function/server"));
+const lang_1 = require("../lib/lang");
+const yargsUtils_1 = require("../lib/yargsUtils");
 exports.command = ['function', 'functions'];
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addGlobalOptions(yargs);
-    yargs.command(list).command(deploy).command(server).demandCommand(1, '');
+exports.describe = (0, lang_1.i18n)(`commands.function.describe`);
+function functionBuilder(yargs) {
+    yargs.command(list_1.default).command(deploy_1.default).command(server_1.default).demandCommand(1, '');
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(functionBuilder, exports.command, exports.describe, {
+    useGlobalOptions: true,
+});
+const functionCommand = {
+    command: exports.command,
+    describe: exports.describe,
+    builder,
+    handler: () => { },
 };
+exports.default = functionCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = functionCommand;

package/commands/hubdb/clear.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "clear [table-id]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type HubdbClearArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type HubdbClearArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     tableId?: number;
     dest?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<HubdbClearArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<HubdbClearArgs>;
-export {};
+declare const hubdbClearCommand: YargsCommandModule<unknown, HubdbClearArgs>;
+export default hubdbClearCommand;

package/commands/hubdb/clear.js

@@ -1,19 +1,15 @@
 "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("../../lib/errorHandlers/index");
 const hubdb_1 = require("@hubspot/local-dev-lib/hubdb");
 const hubdb_2 = require("@hubspot/local-dev-lib/api/hubdb");
 const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTablePrompt");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.clear';
-exports.command = 'clear [table-id]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'clear [table-id]';
+const describe = (0, lang_1.i18n)('commands.hubdb.subcommands.clear.describe');
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-clear', {}, derivedAccountId);
@@ -26,18 +22,18 @@ async function handler(args) {
             });
         const { deletedRowCount } = await (0, hubdb_1.clearHubDbTableRows)(derivedAccountId, tableId);
         if (deletedRowCount > 0) {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.removedRows`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.removedRows', {
                 deletedRowCount,
                 tableId,
             }));
             const { data: { rowCount }, } = await (0, hubdb_2.publishTable)(derivedAccountId, tableId);
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.rowCount`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.rowCount', {
                 rowCount,
                 tableId,
             }));
         }
         else {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.emptyTable`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.emptyTable', {
                 tableId,
             }));
         }
@@ -46,13 +42,23 @@ async function handler(args) {
         (0, index_1.logError)(e);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function hubdbClearBuilder(yargs) {
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.clear.positionals.tableId.describe'),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbClearBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const hubdbClearCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = hubdbClearCommand;

package/commands/hubdb/create.d.ts

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

package/commands/hubdb/create.js

@@ -3,9 +3,6 @@ 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.handler = handler;
-exports.builder = builder;
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("../../lib/errorHandlers/index");
@@ -14,24 +11,23 @@ const hubdb_1 = require("@hubspot/local-dev-lib/hubdb");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const validation_1 = require("../../lib/validation");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.hubdb.subcommands.create';
-exports.command = 'create';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create';
+const describe = (0, lang_1.i18n)(`commands.hubdb.subcommands.create.describe`);
 function selectPathPrompt(options) {
     return (0, promptUtils_1.promptUser)([
         {
             name: 'path',
-            message: (0, lang_1.i18n)(`${i18nKey}.enterPath`),
+            message: (0, lang_1.i18n)(`commands.hubdb.subcommands.create.enterPath`),
             when: !options.path,
             validate: (input) => {
                 if (!input) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.pathRequired`);
+                    return (0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.pathRequired`);
                 }
                 if (!(0, path_2.isValidPath)(input)) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidCharacters`);
+                    return (0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.invalidCharacters`);
                 }
                 return true;
             },
@@ -54,26 +50,36 @@ async function handler(args) {
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const table = await (0, hubdb_1.createHubDbTable)(derivedAccountId, path_1.default.resolve((0, path_2.getCwd)(), filePath));
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.create`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.hubdb.subcommands.create.success.create`, {
             accountId: derivedAccountId,
             rowCount: table.rowCount,
             tableId: table.tableId,
         }));
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.create`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.create`, {
             filePath: filePath || '',
         }));
         (0, index_1.logError)(e);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function hubdbCreateBuilder(yargs) {
     yargs.options('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.path.describe`),
+        describe: (0, lang_1.i18n)(`commands.hubdb.subcommands.create.options.path.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const hubdbCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = hubdbCreateCommand;

package/commands/hubdb/delete.d.ts

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

package/commands/hubdb/delete.js

@@ -1,20 +1,16 @@
 "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("../../lib/errorHandlers/index");
 const hubdb_1 = require("@hubspot/local-dev-lib/api/hubdb");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTablePrompt");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.delete';
-exports.command = 'delete [table-id]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'delete [table-id]';
+const describe = (0, lang_1.i18n)('commands.hubdb.subcommands.delete.describe');
 async function handler(args) {
     const { force, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-delete', {}, derivedAccountId);
@@ -29,37 +25,49 @@ async function handler(args) {
             const { shouldDeleteTable } = await (0, promptUtils_1.promptUser)({
                 name: 'shouldDeleteTable',
                 type: 'confirm',
-                message: (0, lang_1.i18n)(`${i18nKey}.shouldDeleteTable`, { tableId }),
+                message: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.shouldDeleteTable', {
+                    tableId,
+                }),
             });
             if (!shouldDeleteTable) {
                 process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
             }
         }
         await (0, hubdb_1.deleteTable)(derivedAccountId, tableId);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.delete`, {
+        logger_1.logger.success((0, lang_1.i18n)('commands.hubdb.subcommands.delete.success.delete', {
             accountId: derivedAccountId,
             tableId,
         }));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.delete`, {
+        logger_1.logger.error((0, lang_1.i18n)('commands.hubdb.subcommands.delete.errors.delete', {
             tableId: args.tableId || '',
         }));
         (0, index_1.logError)(e);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function hubdbDeleteBuilder(yargs) {
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.positionals.tableId.describe'),
         type: 'string',
     });
     yargs.option('force', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.options.force.describe'),
         type: 'boolean',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbDeleteBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const hubdbDeleteCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = hubdbDeleteCommand;

package/commands/hubdb/fetch.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "fetch [table-id] [dest]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type HubdbFetchArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type HubdbFetchArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     tableId?: number;
     dest?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<HubdbFetchArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<HubdbFetchArgs>;
-export {};
+declare const hubdbFetchCommand: YargsCommandModule<unknown, HubdbFetchArgs>;
+export default hubdbFetchCommand;

package/commands/hubdb/fetch.js

@@ -1,18 +1,14 @@
 "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("../../lib/errorHandlers/index");
 const hubdb_1 = require("@hubspot/local-dev-lib/hubdb");
 const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTablePrompt");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.fetch';
-exports.command = 'fetch [table-id] [dest]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'fetch [table-id] [dest]';
+const describe = (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.describe');
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-fetch', {}, derivedAccountId);
@@ -25,7 +21,7 @@ async function handler(args) {
         const tableId = args.tableId || promptAnswers.tableId;
         const dest = args.dest || promptAnswers.dest;
         const { filePath } = await (0, hubdb_1.downloadHubDbTable)(derivedAccountId, tableId, dest);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.fetch`, {
+        logger_1.logger.success((0, lang_1.i18n)('commands.hubdb.subcommands.fetch.success.fetch', {
             path: filePath,
             tableId,
         }));
@@ -34,17 +30,27 @@ async function handler(args) {
         (0, index_1.logError)(e);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function hubdbFetchBuilder(yargs) {
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.positionals.tableId.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.dest.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.positionals.dest.describe'),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbFetchBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const hubdbFetchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = hubdbFetchCommand;

package/commands/hubdb.d.ts

@@ -1,4 +1,5 @@
-import { Argv } from 'yargs';
+import { YargsCommandModuleBucket } from '../types/Yargs';
 export declare const command = "hubdb";
 export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+declare const hubdbCommand: YargsCommandModuleBucket;
+export default hubdbCommand;

package/commands/hubdb.js

@@ -1,56 +1,33 @@
 "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 createCommand = __importStar(require("./hubdb/create"));
-const fetchCommand = __importStar(require("./hubdb/fetch"));
-const deleteCommand = __importStar(require("./hubdb/delete"));
-const clearCommand = __importStar(require("./hubdb/clear"));
+const create_1 = __importDefault(require("./hubdb/create"));
+const fetch_1 = __importDefault(require("./hubdb/fetch"));
+const delete_1 = __importDefault(require("./hubdb/delete"));
+const clear_1 = __importDefault(require("./hubdb/clear"));
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.hubdb';
+const yargsUtils_1 = require("../lib/yargsUtils");
 exports.command = 'hubdb';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+exports.describe = (0, lang_1.i18n)('commands.hubdb.describe');
+function hubdbBuilder(yargs) {
     yargs
-        .command(clearCommand)
-        .command(createCommand)
-        .command(fetchCommand)
-        .command(deleteCommand)
+        .command(clear_1.default)
+        .command(create_1.default)
+        .command(fetch_1.default)
+        .command(delete_1.default)
         .demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbBuilder, exports.command, exports.describe);
+const hubdbCommand = {
+    command: exports.command,
+    describe: exports.describe,
+    builder,
+    handler: () => { },
+};
+exports.default = hubdbCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = hubdbCommand;

package/commands/init.d.ts

@@ -1,12 +1,8 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
-import { ConfigArgs, CommonArgs, TestingArgs, AccountArgs } from '../types/Yargs';
-export declare const command = "init";
-export declare const describe: string;
+import { ConfigArgs, CommonArgs, TestingArgs, AccountArgs, YargsCommandModule } from '../types/Yargs';
 type InitArgs = CommonArgs & ConfigArgs & TestingArgs & AccountArgs & {
     authType?: string;
     'disable-tracking'?: boolean;
     'use-hidden-config'?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<InitArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<InitArgs>>;
-export {};
+declare const initCommand: YargsCommandModule<unknown, InitArgs>;
+export default initCommand;