@hubspot/cli 7.4.8 → 7.4.9-beta.1

package/commands/function/deploy.d.ts

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

package/commands/function/deploy.js

@@ -1,91 +1,111 @@
 "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 { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-const { uiAccountDescription } = require('../../lib/ui');
-const { poll } = require('../../lib/polling');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { buildPackage, getBuildStatus, } = require('@hubspot/local-dev-lib/api/functions');
-const { outputBuildLog } = require('../../lib/serverlessLogs');
-const { i18n } = require('../../lib/lang');
-const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
-exports.command = 'deploy <path>';
-exports.describe = false;
-exports.handler = async (options) => {
-    const { path: functionPath, derivedAccountId } = options;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const functions_1 = require("@hubspot/local-dev-lib/api/functions");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
+const usageTracking_1 = require("../../lib/usageTracking");
+const index_2 = require("../../lib/errorHandlers/index");
+const ui_1 = require("../../lib/ui");
+const polling_1 = require("../../lib/polling");
+const serverlessLogs_1 = require("../../lib/serverlessLogs");
+const lang_1 = require("../../lib/lang");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+function isFunctionBuildError(e) {
+    return (typeof e === 'object' && e !== null && 'status' in e && e.status === 'ERROR');
+}
+const command = 'deploy <path>';
+const describe = undefined;
+async function handler(args) {
+    const { path: functionPath, derivedAccountId } = args;
     const splitFunctionPath = functionPath.split('.');
-    trackCommandUsage('functions-deploy', null, derivedAccountId);
+    (0, usageTracking_1.trackCommandUsage)('function-deploy', undefined, derivedAccountId);
     if (!splitFunctionPath.length ||
         splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
-        logger.error(i18n('commands.function.subcommands.deploy.errors.notFunctionsFolder', {
+        logger_1.logger.error((0, lang_1.i18n)('commands.function.subcommands.deploy.errors.notFunctionsFolder', {
             functionPath,
         }));
         return;
     }
-    logger.debug(i18n('commands.function.subcommands.deploy.debug.startingBuildAndDeploy', {
+    logger_1.logger.debug((0, lang_1.i18n)('commands.function.subcommands.deploy.debug.startingBuildAndDeploy', {
         functionPath,
     }));
-    SpinniesManager.init();
-    SpinniesManager.add('loading', {
-        text: i18n('commands.function.subcommands.deploy.loading', {
-            account: uiAccountDescription(derivedAccountId),
+    SpinniesManager_1.default.init();
+    SpinniesManager_1.default.add('loading', {
+        text: (0, lang_1.i18n)('commands.function.subcommands.deploy.loading', {
+            account: (0, ui_1.uiAccountDescription)(derivedAccountId),
             functionPath,
         }),
     });
     try {
-        const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
-        const successResp = await poll(() => getBuildStatus(derivedAccountId, buildId));
-        const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
-        SpinniesManager.succeed('loading');
-        await outputBuildLog(successResp.cdnUrl);
-        logger.success(i18n('commands.function.subcommands.deploy.success.deployed', {
-            accountId: derivedAccountId,
-            buildTimeSeconds,
-            functionPath,
-        }));
+        const { data: buildId } = await (0, functions_1.buildPackage)(derivedAccountId, functionPath);
+        const successResp = await (0, polling_1.poll)(() => (0, functions_1.getBuildStatus)(derivedAccountId, Number(buildId)));
+        if (successResp) {
+            const buildTimeSeconds = successResp.buildTime
+                ? (successResp.buildTime / 1000).toFixed(2)
+                : 0;
+            SpinniesManager_1.default.succeed('loading');
+            if (successResp.cdnUrl) {
+                await (0, serverlessLogs_1.outputBuildLog)(successResp.cdnUrl);
+            }
+            logger_1.logger.success((0, lang_1.i18n)('commands.function.subcommands.deploy.success.deployed', {
+                accountId: derivedAccountId,
+                buildTimeSeconds,
+                functionPath,
+            }));
+        }
     }
     catch (e) {
-        SpinniesManager.fail('loading', {
-            text: i18n('commands.function.subcommands.deploy.loadingFailed', {
-                account: uiAccountDescription(derivedAccountId),
+        SpinniesManager_1.default.fail('loading', {
+            text: (0, lang_1.i18n)('commands.function.subcommands.deploy.loadingFailed', {
+                account: (0, ui_1.uiAccountDescription)(derivedAccountId),
                 functionPath,
             }),
         });
-        if (isHubSpotHttpError(e) && e.status === 404) {
-            logger.error(i18n('commands.function.subcommands.deploy.errors.noPackageJson', {
+        if ((0, index_1.isHubSpotHttpError)(e) && e.status === 404) {
+            logger_1.logger.error((0, lang_1.i18n)('commands.function.subcommands.deploy.errors.noPackageJson', {
                 functionPath,
             }));
         }
-        else if (e.status === 'ERROR') {
-            await outputBuildLog(e.cdnUrl);
-            logger.error(i18n('commands.function.subcommands.deploy.errors.buildError', {
-                details: e.errorReason,
+        else if (isFunctionBuildError(e)) {
+            await (0, serverlessLogs_1.outputBuildLog)(e.cdnUrl);
+            logger_1.logger.error((0, lang_1.i18n)('commands.function.subcommands.deploy.errors.buildError', {
+                details: String(e.errorReason),
             }));
         }
         else {
-            logError(e, new ApiErrorContext({
+            (0, index_2.logError)(e, new index_2.ApiErrorContext({
                 accountId: derivedAccountId,
                 request: functionPath,
             }));
         }
     }
-};
-exports.builder = yargs => {
+}
+function functionDeployBuilder(yargs) {
     yargs.positional('path', {
-        describe: i18n('commands.function.subcommands.deploy.positionals.path.describe'),
+        describe: (0, lang_1.i18n)('commands.function.subcommands.deploy.positionals.path.describe'),
         type: 'string',
     });
     yargs.example([
         [
             '$0 functions deploy myFunctionFolder.functions',
-            i18n('commands.function.subcommands.deploy.examples.default'),
+            (0, lang_1.i18n)('commands.function.subcommands.deploy.examples.default'),
         ],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(functionDeployBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const functionDeployCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = functionDeployCommand;

package/commands/function/list.d.ts

@@ -1 +1,6 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type FunctionListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    json?: boolean;
+};
+declare const functionListCommand: YargsCommandModule<unknown, FunctionListArgs>;
+export default functionListCommand;

package/commands/function/list.js

@@ -1,30 +1,32 @@
 "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 moment = require('moment');
-const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { i18n } = require('../../lib/lang');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = ['list', 'ls'];
-exports.describe = i18n('commands.function.subcommands.list.describe');
-exports.handler = async (options) => {
-    const { derivedAccountId } = options;
-    trackCommandUsage('functions-list', null, derivedAccountId);
-    logger.debug(i18n('commands.function.subcommands.list.debug.gettingFunctions'));
-    const { data: routesResp } = await getRoutes(derivedAccountId).catch(async (e) => {
-        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
-        process.exit(EXIT_CODES.SUCCESS);
+const moment_1 = __importDefault(require("moment"));
+const functions_1 = require("@hubspot/local-dev-lib/api/functions");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const index_1 = require("../../lib/errorHandlers/index");
+const table_1 = require("../../lib/ui/table");
+const usageTracking_1 = require("../../lib/usageTracking");
+const lang_1 = require("../../lib/lang");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = ['list', 'ls'];
+const describe = (0, lang_1.i18n)('commands.function.subcommands.list.describe');
+async function handler(args) {
+    const { derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('function-list', undefined, derivedAccountId);
+    logger_1.logger.debug((0, lang_1.i18n)('commands.function.subcommands.list.debug.gettingFunctions'));
+    const { data: routesResp } = await (0, functions_1.getRoutes)(derivedAccountId).catch(async (e) => {
+        (0, index_1.logError)(e, new index_1.ApiErrorContext({ accountId: derivedAccountId }));
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     });
     if (!routesResp.objects.length) {
-        return logger.info(i18n('commands.function.subcommands.list.info.noFunctions'));
+        return logger_1.logger.info((0, lang_1.i18n)('commands.function.subcommands.list.info.noFunctions'));
     }
-    if (options.json) {
-        return logger.log(routesResp.objects);
+    if (args.json) {
+        return logger_1.logger.log(routesResp.objects);
     }
     const functionsAsArrays = routesResp.objects.map(func => {
         const { route, method, created, updated, secretNames } = func;
@@ -32,21 +34,31 @@ exports.handler = async (options) => {
             route,
             method,
             secretNames.join(', '),
-            moment(created).format(),
-            moment(updated).format(),
+            (0, moment_1.default)(created).format(),
+            (0, moment_1.default)(updated).format(),
         ];
     });
-    functionsAsArrays.unshift(getTableHeader(['Route', 'Method', 'Secrets', 'Created', 'Updated']));
-    return logger.log(getTableContents(functionsAsArrays));
-};
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
+    functionsAsArrays.unshift((0, table_1.getTableHeader)(['Route', 'Method', 'Secrets', 'Created', 'Updated']));
+    return logger_1.logger.log((0, table_1.getTableContents)(functionsAsArrays));
+}
+function functionListBuilder(yargs) {
     yargs.options({
         json: {
-            describe: i18n('commands.function.subcommands.list.options.json.describe'),
+            describe: (0, lang_1.i18n)('commands.function.subcommands.list.options.json.describe'),
             type: 'boolean',
         },
     });
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(functionListBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const functionListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = functionListCommand;

package/commands/function/server.d.ts

@@ -1 +1,10 @@
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type FunctionServerArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    path: string;
+    port?: string;
+    contact?: boolean;
+    watch?: boolean;
+    'log-output'?: boolean;
+};
+declare const functionServerCommand: YargsCommandModule<unknown, FunctionServerArgs>;
+export default functionServerCommand;

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,15 +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');
+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(`commands.function.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,18 +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");
-exports.command = 'clear [table-id]';
-exports.describe = (0, lang_1.i18n)('commands.hubdb.subcommands.clear.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);
@@ -45,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)('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,11 +11,11 @@ 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");
-exports.command = 'create';
-exports.describe = (0, lang_1.i18n)(`commands.hubdb.subcommands.create.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)([
         {
@@ -66,13 +63,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 hubdbCreateBuilder(yargs) {
     yargs.options('path', {
         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;