@hubspot/cli 7.4.9-beta.1 → 7.4.10-beta.0

package/bin/cli.js

@@ -7,7 +7,7 @@ const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { loadConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } = require('../lib/middleware/configMiddleware');
-const { notifyAboutUpdates, } = require('../lib/middleware/notificationsMiddleware');
+const { autoUpdateCLI } = require('../lib/middleware/autoUpdateMiddleware');
 const { checkAndWarnGitInclusionMiddleware, } = require('../lib/middleware/gitMiddleware');
 const { performChecks } = require('../lib/middleware/yargsChecksMiddleware');
 const { setRequestHeaders } = require('../lib/middleware/requestMiddleware');
@@ -40,7 +40,6 @@ const feedbackCommand = require('../commands/feedback');
 const doctorCommand = require('../commands/doctor');
 const completionCommand = require('../commands/completion');
 const appCommand = require('../commands/app');
-notifyAboutUpdates();
 const getTerminalWidth = () => {
     const width = yargs.terminalWidth();
     if (width >= 100)
@@ -71,6 +70,7 @@ const argv = yargs
     handleDeprecatedEnvVariables,
     loadConfigMiddleware,
     injectAccountIdMiddleware,
+    autoUpdateCLI,
     checkAndWarnGitInclusionMiddleware,
     validateAccountOptions,
     checkFireAlarms,
@@ -105,10 +105,7 @@ const argv = yargs
     .command(secretCommands)
     .command(customObjectCommand)
     .command(functionCommands)
-    .command({
-    ...listCommand,
-    aliases: 'ls',
-})
+    .command(listCommand)
     .command(openCommand)
     .command(mvCommand)
     .command(projectCommands)

package/commands/app/migrate.d.ts

@@ -1,7 +1,6 @@
 import { ArgumentsCamelCase } from 'yargs';
 import { YargsCommandModule } from '../../types/Yargs';
 import { MigrateAppArgs } from '../../lib/app/migrate';
-export declare function handlerGenerator(commandTrackingName: string): (options: ArgumentsCamelCase<MigrateAppArgs>) => Promise<void>;
-export declare const handler: (options: ArgumentsCamelCase<MigrateAppArgs>) => Promise<void>;
+export declare function handlerGenerator(commandTrackingName: string): (args: ArgumentsCamelCase<MigrateAppArgs>) => Promise<void>;
 declare const migrateCommand: YargsCommandModule<unknown, MigrateAppArgs>;
 export default migrateCommand;

package/commands/app/migrate.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handler = void 0;
 exports.handlerGenerator = handlerGenerator;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -18,8 +17,8 @@ const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
 function handlerGenerator(commandTrackingName) {
-    return async function handler(options) {
-        const { derivedAccountId, platformVersion, unstable } = options;
+    return async function handler(args) {
+        const { derivedAccountId, platformVersion, unstable } = args;
         await (0, usageTracking_1.trackCommandUsage)(commandTrackingName, {}, derivedAccountId);
         const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
         if (!accountConfig) {
@@ -36,13 +35,13 @@ function handlerGenerator(commandTrackingName) {
                     logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.notAllowedWithinProject`, { command: (0, ui_1.uiCommandReference)('hs project migrate') }));
                     return process.exit(exitCodes_1.EXIT_CODES.ERROR);
                 }
-                options.platformVersion = unstable
+                args.platformVersion = unstable
                     ? projects_1.PLATFORM_VERSIONS.unstable
                     : platformVersion;
-                await (0, migrate_1.migrateApp2025_2)(derivedAccountId, options);
+                await (0, migrate_1.migrateApp2025_2)(derivedAccountId, args);
             }
             else {
-                await (0, migrate_legacy_1.migrateApp2023_2)(derivedAccountId, options, accountConfig);
+                await (0, migrate_legacy_1.migrateApp2023_2)(derivedAccountId, args, accountConfig);
             }
         }
         catch (error) {
@@ -62,7 +61,7 @@ function handlerGenerator(commandTrackingName) {
         return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
 }
-exports.handler = handlerGenerator('app-migrate');
+const handler = handlerGenerator('app-migrate');
 function appMigrateBuilder(yargs) {
     yargs.options({
         name: {
@@ -106,7 +105,7 @@ const builder = (0, yargsUtils_1.makeYargsBuilder)(appMigrateBuilder, command, (
 const migrateCommand = {
     command,
     describe,
-    handler: exports.handler,
+    handler,
     builder,
 };
 exports.default = migrateCommand;

package/commands/app.d.ts

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

package/commands/app.js

@@ -3,19 +3,21 @@ 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 yargsUtils_1 = require("../lib/yargsUtils");
 const migrate_1 = __importDefault(require("./app/migrate"));
-exports.command = ['app', 'apps'];
+const command = ['app', 'apps'];
 // Keep the command hidden for now
-exports.describe = undefined;
-function builder(yargs) {
+const describe = undefined;
+function appBuilder(yargs) {
     return yargs.command(migrate_1.default).demandCommand(1, '');
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(appBuilder, command, describe);
 const appCommand = {
-    command: exports.command,
-    describe: exports.describe,
+    command,
+    describe,
     builder,
     handler: () => { },
 };
 exports.default = appCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = appCommand;

package/commands/auth.d.ts

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

package/commands/auth.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const git_1 = require("../lib/ui/git");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
@@ -32,8 +30,8 @@ const ALLOWED_AUTH_METHODS = [
     auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
-exports.command = 'auth';
-exports.describe = (0, lang_1.i18n)('commands.auth.describe');
+const command = 'auth';
+const describe = (0, lang_1.i18n)('commands.auth.describe');
 async function handler(args) {
     const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -159,7 +157,7 @@ function authBuilder(yargs) {
     });
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
     authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
     configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 }), {
@@ -167,3 +165,12 @@ exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.comman
     useConfigOptions: true,
     useTestingOptions: true,
 });
+const authCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = authCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = authCommand;

package/commands/config/migrate.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "migrate";
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type ConfigMigrateArgs = CommonArgs & ConfigArgs & {
     force?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<ConfigMigrateArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ConfigMigrateArgs>>;
-export {};
+declare const configMigrateCommand: YargsCommandModule<unknown, ConfigMigrateArgs>;
+export default configMigrateCommand;

package/commands/config/migrate.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.command = exports.describe = void 0;
-exports.handler = handler;
 const fs_1 = __importDefault(require("fs"));
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
@@ -15,11 +13,11 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const index_1 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-exports.describe = (0, lang_1.i18n)('commands.config.subcommands.migrate.describe', {
+const describe = (0, lang_1.i18n)('commands.config.subcommands.migrate.describe', {
     deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
     globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
 });
-exports.command = 'migrate';
+const command = 'migrate';
 async function handler(args) {
     const { config: configPath, force, derivedAccountId } = args;
     if (configPath && !fs_1.default.existsSync(configPath)) {
@@ -81,8 +79,16 @@ function configMigrateBuilder(yargs) {
         ],
     ]);
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(configMigrateBuilder, exports.command, (0, lang_1.i18n)('commands.config.subcommands.migrate.verboseDescribe', {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(configMigrateBuilder, command, (0, lang_1.i18n)('commands.config.subcommands.migrate.verboseDescribe', {
     archivedConfigPath: config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME,
 }), {
+    useGlobalOptions: true,
     useConfigOptions: true,
 });
+const configMigrateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = configMigrateCommand;

package/commands/config/set.d.ts

@@ -1,11 +1,10 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
-type ConfigSetArgs = CommonArgs & {
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
+type ConfigSetArgs = CommonArgs & ConfigArgs & {
     defaultCmsPublishMode: CmsPublishMode;
     allowUsageTracking?: boolean;
     httpTimeout?: string;
+    allowAutoUpdates?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<ConfigSetArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ConfigSetArgs>;
-export {};
+declare const configSetCommand: YargsCommandModule<unknown, ConfigSetArgs>;
+export default configSetCommand;

package/commands/config/set.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handler = handler;
-exports.builder = builder;
 const lang_1 = require("../../lib/lang");
 const usageTracking_1 = require("../../lib/usageTracking");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const configOptions_1 = require("../../lib/configOptions");
-exports.command = 'set';
-exports.describe = (0, lang_1.i18n)(`commands.config.subcommands.set.describe`);
+const en_1 = require("../../lang/en");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'set';
+const describe = en_1.commands.config.subcommands.set.describe;
 async function selectOptions() {
-    const { cmsPublishMode } = await (0, promptUtils_1.promptUser)([
+    const { configOption } = await (0, promptUtils_1.promptUser)([
         {
             type: 'list',
-            name: 'cmsPublishMode',
+            name: 'configOption',
             pageSize: 20,
-            message: (0, lang_1.i18n)(`commands.config.subcommands.set.promptMessage`),
+            message: en_1.commands.config.subcommands.set.promptMessage,
             choices: [
                 {
                     name: 'Default CMS publish mode',
@@ -23,13 +23,14 @@ async function selectOptions() {
                 },
                 { name: 'Allow usage tracking', value: { allowUsageTracking: '' } },
                 { name: 'HTTP timeout', value: { httpTimeout: '' } },
+                // TODO enable when we unhide this option { name: 'Allow auto updates', value: { allowAutoUpdates: '' } },
             ],
         },
     ]);
-    return cmsPublishMode;
+    return configOption;
 }
-async function handleConfigUpdate(accountId, options) {
-    const { allowUsageTracking, defaultCmsPublishMode, httpTimeout } = options;
+async function handleConfigUpdate(accountId, args) {
+    const { allowAutoUpdates, allowUsageTracking, defaultCmsPublishMode, httpTimeout, } = args;
     if (typeof defaultCmsPublishMode !== 'undefined') {
         await (0, configOptions_1.setDefaultCmsPublishMode)({ defaultCmsPublishMode, accountId });
         return true;
@@ -42,6 +43,10 @@ async function handleConfigUpdate(accountId, options) {
         await (0, configOptions_1.setAllowUsageTracking)({ allowUsageTracking, accountId });
         return true;
     }
+    else if (typeof allowAutoUpdates !== 'undefined') {
+        await (0, configOptions_1.setAllowAutoUpdates)({ allowAutoUpdates, accountId });
+        return true;
+    }
     return false;
 }
 async function handler(args) {
@@ -54,25 +59,33 @@ async function handler(args) {
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
+function configSetBuilder(yargs) {
     yargs
         .options({
         'default-cms-publish-mode': {
-            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.describe`),
+            describe: en_1.commands.config.subcommands.set.options.defaultMode.describe,
             type: 'string',
         },
         'allow-usage-tracking': {
-            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.describe`),
+            describe: en_1.commands.config.subcommands.set.options.allowUsageTracking.describe,
             type: 'boolean',
         },
         'http-timeout': {
-            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.describe`),
+            describe: en_1.commands.config.subcommands.set.options.httpTimeout.describe,
             type: 'string',
         },
+        'allow-auto-updates': {
+            describe: en_1.commands.config.subcommands.set.options.allowAutoUpdates.describe,
+            type: 'boolean',
+            hidden: true,
+        },
     })
         .conflicts('defaultCmsPublishMode', 'allowUsageTracking')
         .conflicts('defaultCmsPublishMode', 'httpTimeout')
         .conflicts('allowUsageTracking', 'httpTimeout')
+        .conflicts('allowAutoUpdates', 'defaultCmsPublishMode')
+        .conflicts('allowAutoUpdates', 'allowUsageTracking')
+        .conflicts('allowAutoUpdates', 'httpTimeout')
         .example([
         [
             '$0 config set',
@@ -81,3 +94,14 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(configSetBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const configSetCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = configSetCommand;

package/commands/config.d.ts

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

package/commands/config.js

@@ -1,49 +1,25 @@
 "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 set = __importStar(require("./config/set"));
-const migrate = __importStar(require("./config/migrate"));
-exports.command = 'config';
-exports.describe = (0, lang_1.i18n)('commands.config.describe');
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addGlobalOptions)(yargs);
-    yargs.command(set).command(migrate).demandCommand(1, '');
+const set_1 = __importDefault(require("./config/set"));
+const migrate_1 = __importDefault(require("./config/migrate"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'config';
+const describe = (0, lang_1.i18n)('commands.config.describe');
+function configBuilder(yargs) {
+    yargs.command(set_1.default).command(migrate_1.default).demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(configBuilder, command, describe);
+const configCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = configCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = configCommand;

package/commands/create.js

@@ -91,4 +91,5 @@ const createCommand = {
     handler,
 };
 exports.default = createCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
 module.exports = createCommand;

package/commands/doctor.d.ts

@@ -1,8 +1,6 @@
-import { ArgumentsCamelCase, BuilderCallback } from 'yargs';
-export interface DoctorOptions {
-    'output-dir'?: string;
-}
-export declare const command = "doctor";
-export declare const describe: any;
-export declare const handler: ({ outputDir, }: ArgumentsCamelCase<DoctorOptions>) => Promise<never>;
-export declare const builder: BuilderCallback<DoctorOptions, DoctorOptions>;
+import { CommonArgs, YargsCommandModule } from '../types/Yargs';
+export type DoctorArgs = CommonArgs & {
+    outputDir?: string;
+};
+declare const doctorCommand: YargsCommandModule<unknown, DoctorArgs>;
+export default doctorCommand;

package/commands/doctor.js

@@ -3,46 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.handler = exports.describe = exports.command = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const usageTracking_1 = require("../lib/usageTracking");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const fs_1 = __importDefault(require("fs"));
 const Doctor_1 = require("../lib/doctor/Doctor");
 const exitCodes_1 = require("../lib/enums/exitCodes");
-const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
-const commonOpts_1 = require("../lib/commonOpts");
-const { i18n } = require('../lib/lang');
-exports.command = 'doctor';
-exports.describe = i18n(`commands.doctor.describe`);
-const handler = async ({ outputDir, }) => {
+const yargsUtils_1 = require("../lib/yargsUtils");
+const lang_1 = require("../lib/lang");
+const command = 'doctor';
+const describe = (0, lang_1.i18n)(`commands.doctor.describe`);
+const handler = async (args) => {
+    const { outputDir } = args;
     const doctor = new Doctor_1.Doctor();
-    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId || undefined);
+    (0, usageTracking_1.trackCommandUsage)(command, undefined, doctor.accountId || undefined);
     const output = await doctor.diagnose();
     const totalCount = (output?.errorCount || 0) + (output?.warningCount || 0);
     if (totalCount > 0) {
-        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { successful: false, type: totalCount }, doctor.accountId || undefined);
+        (0, usageTracking_1.trackCommandMetadataUsage)(command, { successful: false, type: totalCount }, doctor.accountId || undefined);
     }
     if (!outputDir) {
         if (output?.diagnosis) {
             logger_1.logger.log(output.diagnosis);
         }
         else {
-            logger_1.logger.error(i18n(`commands.doctor.errors.generatingDiagnosis`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.doctor.errors.generatingDiagnosis`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    if (!path_1.default.isAbsolute(outputDir)) {
-        outputDir = path_1.default.join((0, path_2.getCwd)(), outputDir);
+    let outputDirPath = outputDir;
+    if (!path_1.default.isAbsolute(outputDirPath)) {
+        outputDirPath = path_1.default.join((0, path_2.getCwd)(), outputDirPath);
     }
-    const outputFile = path_1.default.join(outputDir, `hubspot-doctor-${new Date().toISOString()}.json`);
+    const outputFile = path_1.default.join(outputDirPath, `hubspot-doctor-${new Date().toISOString()}.json`);
     try {
         fs_1.default.writeFileSync(outputFile, JSON.stringify(output, null, 4));
-        logger_1.logger.success(i18n(`commands.doctor.outputWritten`, { filename: outputFile }));
+        logger_1.logger.success((0, lang_1.i18n)(`commands.doctor.outputWritten`, { filename: outputFile }));
     }
     catch (e) {
-        logger_1.logger.error(i18n(`commands.doctor.errors.unableToWriteOutputFile`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.doctor.errors.unableToWriteOutputFile`, {
             file: outputFile,
             errorMessage: e instanceof Error ? e.message : e,
         }));
@@ -50,12 +51,22 @@ const handler = async ({ outputDir, }) => {
     }
     return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 };
-exports.handler = handler;
-const builder = yargs => {
+function doctorBuilder(yargs) {
     yargs.option('output-dir', {
-        describe: i18n(`commands.doctor.options.outputDir`),
+        describe: (0, lang_1.i18n)(`commands.doctor.options.outputDir`),
         type: 'string',
     });
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(doctorBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const doctorCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
-exports.builder = builder;
+exports.default = doctorCommand;
+// TODO Remove this after cli.ts is ported to TS
+module.exports = doctorCommand;

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;

package/commands/init.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -62,8 +60,8 @@ const AUTH_TYPE_NAMES = {
     [auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
     [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
 };
-exports.command = 'init';
-exports.describe = (0, lang_1.i18n)(`commands.init.describe`);
+const command = 'init';
+const describe = (0, lang_1.i18n)(`commands.init.describe`);
 async function handler(args) {
     const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -174,7 +172,7 @@ function initBuilder(yargs) {
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
     command: (0, ui_1.uiCommandReference)('hs auth'),
     configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
     authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
@@ -183,3 +181,12 @@ exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.comman
     useConfigOptions: true,
     useTestingOptions: true,
 });
+const initCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = initCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = initCommand;

package/commands/list.d.ts

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