@hubspot/cli 7.4.8 → 7.4.9-beta.1

package/commands/customObject/schema.d.ts

@@ -1,5 +1,3 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function handler(): void;
-export declare function builder(yargs: Argv): Argv;
+import { YargsCommandModuleBucket } from '../../types/Yargs';
+declare const customObjectSchemaCommand: YargsCommandModuleBucket;
+export default customObjectSchemaCommand;

package/commands/customObject/schema.js

@@ -1,61 +1,34 @@
 "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.handler = handler;
-exports.builder = builder;
-const createCommand = __importStar(require("./schema/create"));
-const fetchCommand = __importStar(require("./schema/fetch"));
-const fetchAllCommand = __importStar(require("./schema/fetch-all"));
-const deleteCommand = __importStar(require("./schema/delete"));
-const listCommand = __importStar(require("./schema/list"));
-const updateSchema = __importStar(require("./schema/update"));
+const create_1 = __importDefault(require("./schema/create"));
+const fetch_1 = __importDefault(require("./schema/fetch"));
+const fetch_all_1 = __importDefault(require("./schema/fetch-all"));
+const delete_1 = __importDefault(require("./schema/delete"));
+const list_1 = __importDefault(require("./schema/list"));
+const update_1 = __importDefault(require("./schema/update"));
 const lang_1 = require("../../lib/lang");
-exports.command = ['schema', 'schemas'];
-exports.describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.describe`);
-function handler() {
-    // No specific handler needed for the schema command
-}
-function builder(yargs) {
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = ['schema', 'schemas'];
+const describe = (0, lang_1.i18n)(`commands.customObject.subcommands.schema.describe`);
+function customObjectSchemaBuilder(yargs) {
     yargs
-        .command(listCommand)
-        .command(fetchCommand)
-        .command(fetchAllCommand)
-        .command(createCommand)
-        .command(updateSchema)
-        .command(deleteCommand)
+        .command(list_1.default)
+        .command(fetch_1.default)
+        .command(fetch_all_1.default)
+        .command(create_1.default)
+        .command(update_1.default)
+        .command(delete_1.default)
         .demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(customObjectSchemaBuilder, command, describe);
+const customObjectSchemaCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = customObjectSchemaCommand;

package/commands/customObject.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 customObjectCommand: YargsCommandModuleBucket;
+export default customObjectCommand;

package/commands/customObject.js

@@ -1,58 +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 schemaCommand = __importStar(require("./customObject/schema"));
-const createCommand = __importStar(require("./customObject/create"));
+const schema_1 = __importDefault(require("./customObject/schema"));
+const create_1 = __importDefault(require("./customObject/create"));
 const lang_1 = require("../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const ui_1 = require("../lib/ui");
-exports.command = ['custom-object', 'custom-objects', 'co'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.customObject.describe`), false);
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['custom-object', 'custom-objects', 'co'];
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.customObject.describe`), false);
 function logBetaMessage() {
     (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.customObject.betaMessage`));
     logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.customObject.seeMoreLink`), 'https://developers.hubspot.com/docs/api/crm/crm-custom-objects'));
     logger_1.logger.log();
 }
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+function customObjectBuilder(yargs) {
     yargs.middleware([logBetaMessage]);
-    yargs.command(schemaCommand);
-    yargs.command(createCommand);
-    yargs.demandCommand(1, '');
+    yargs.command(schema_1.default).command(create_1.default).demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(customObjectBuilder, command, describe);
+const customObjectCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = customObjectCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = customObjectCommand;

package/commands/feedback.d.ts

@@ -1 +1,4 @@
-export {};
+import { CommonArgs, YargsCommandModule } from '../types/Yargs';
+type FeedbackArgs = CommonArgs;
+declare const feedbackCommand: YargsCommandModule<unknown, FeedbackArgs>;
+export default feedbackCommand;

package/commands/feedback.js

@@ -1,51 +1,44 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const open = require('open');
-const { i18n } = require('../lib/lang');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { confirmPrompt, listPrompt } = require('../lib/prompts/promptUtils');
-const { addGlobalOptions } = require('../lib/commonOpts');
-const FEEDBACK_OPTIONS = {
-    BUG: 'bug',
-    GENERAL: 'general',
-};
-const FEEDBACK_URLS = {
-    BUG: 'https://github.com/HubSpot/hubspot-cli/issues/new',
-    GENERAL: 'https://docs.google.com/forms/d/e/1FAIpQLSejZZewYzuH3oKBU01tseX-cSWOUsTHLTr-YsiMGpzwcvgIMg/viewform?usp=sf_link',
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.command = 'feedback';
-exports.describe = i18n(`commands.project.subcommands.feedback.describe`);
-exports.handler = async (options) => {
-    const { bug: bugFlag, general: generalFlag } = options;
-    const usedTypeFlag = bugFlag !== generalFlag;
-    await listPrompt(i18n(`commands.project.subcommands.feedback.feedbackType.prompt`), {
-        choices: Object.values(FEEDBACK_OPTIONS).map(option => ({
-            name: i18n(`commands.project.subcommands.feedback.feedbackType.${option}`),
-            value: option,
-        })),
-        when: !usedTypeFlag,
-    });
-    const shouldOpen = await confirmPrompt(i18n(`commands.project.subcommands.feedback.openPrompt`), {
-        when: !usedTypeFlag,
-    });
-    if (shouldOpen || usedTypeFlag) {
-        // NOTE: for now, all feedback should go to the hubspot-cli repository
-        const url = FEEDBACK_URLS.BUG;
-        open(url, { url: true });
-        logger.success(i18n(`commands.project.subcommands.feedback.success`, { url }));
+Object.defineProperty(exports, "__esModule", { value: true });
+const open_1 = __importDefault(require("open"));
+const lang_1 = require("../lib/lang");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const ui_1 = require("../lib/ui");
+const FEEDBACK_URL = 'https://developers.hubspot.com/feedback';
+const command = 'feedback';
+const describe = (0, lang_1.i18n)(`commands.project.subcommands.feedback.describe`);
+async function handler() {
+    const shouldOpen = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`commands.project.subcommands.feedback.openPrompt`));
+    if (!shouldOpen) {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.feedback.error`, {
+            url: (0, ui_1.uiLink)('the developer feedback form', FEEDBACK_URL),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    (0, open_1.default)(FEEDBACK_URL, { url: true });
+    logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.feedback.success`, {
+        url: (0, ui_1.uiLink)('the developer feedback form', FEEDBACK_URL),
+    }));
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function feedbackBuilder(yargs) {
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(feedbackBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const feedbackCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
-exports.builder = yargs => {
-    yargs.options({
-        bug: {
-            describe: i18n(`commands.project.subcommands.feedback.options.bug.describe`),
-            type: 'boolean',
-        },
-        general: {
-            describe: i18n(`commands.project.subcommands.feedback.options.general.describe`),
-            type: 'boolean',
-        },
-    });
-    addGlobalOptions(yargs);
-};
+exports.default = feedbackCommand;
+// TODO remove this after cli.ts is ported to TS
+module.exports = feedbackCommand;

package/commands/fetch.d.ts

@@ -1 +1,12 @@
-export {};
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs';
+type FetchCommandArgs = {
+    src: string;
+    dest?: string;
+    cmsPublishMode?: CmsPublishMode;
+    staging?: boolean;
+    assetVersion?: number;
+    overwrite?: boolean;
+} & ConfigArgs & AccountArgs & EnvironmentArgs & CommonArgs;
+declare const fetchCommand: YargsCommandModule<unknown, FetchCommandArgs>;
+export default fetchCommand;

package/commands/fetch.js

@@ -1,50 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addConfigOptions, addAccountOptions, addOverwriteOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, getCmsPublishMode, addGlobalOptions, } = require('../lib/commonOpts');
-const { resolveLocalPath } = require('../lib/filesystem');
-const { validateCmsPublishMode } = require('../lib/validation');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { i18n } = require('../lib/lang');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { logError } = require('../lib/errorHandlers/index');
-exports.command = 'fetch <src> [dest]';
-exports.describe = i18n('commands.fetch.describe');
-exports.handler = async (options) => {
+const fileMapper_1 = require("@hubspot/local-dev-lib/fileMapper");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const commonOpts_1 = require("../lib/commonOpts");
+const filesystem_1 = require("../lib/filesystem");
+const validation_1 = require("../lib/validation");
+const usageTracking_1 = require("../lib/usageTracking");
+const lang_1 = require("../lib/lang");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const index_1 = require("../lib/errorHandlers/index");
+const command = 'fetch <src> [dest]';
+const describe = (0, lang_1.i18n)('commands.fetch.describe');
+const handler = async (options) => {
     const { src, dest } = options;
-    if (!validateCmsPublishMode(options)) {
-        process.exit(EXIT_CODES.ERROR);
+    if (!(0, validation_1.validateCmsPublishMode)(options)) {
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (typeof src !== 'string') {
-        logger.error(i18n('commands.fetch.errors.sourceRequired'));
-        process.exit(EXIT_CODES.ERROR);
+        logger_1.logger.error((0, lang_1.i18n)('commands.fetch.errors.sourceRequired'));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const { derivedAccountId } = options;
-    const cmsPublishMode = getCmsPublishMode(options);
-    trackCommandUsage('fetch', { mode: cmsPublishMode }, derivedAccountId);
+    const cmsPublishMode = (0, commonOpts_1.getCmsPublishMode)(options);
+    (0, usageTracking_1.trackCommandUsage)('fetch', { mode: cmsPublishMode }, derivedAccountId);
+    const { assetVersion, staging, overwrite } = options;
     try {
         // Fetch and write file/folder.
-        await downloadFileOrFolder(derivedAccountId, src, resolveLocalPath(dest), cmsPublishMode, options);
+        await (0, fileMapper_1.downloadFileOrFolder)(derivedAccountId, src, (0, filesystem_1.resolveLocalPath)(dest), cmsPublishMode, {
+            assetVersion: assetVersion !== undefined ? `${assetVersion}` : assetVersion,
+            staging,
+            overwrite,
+        });
     }
     catch (err) {
-        logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        (0, index_1.logError)(err);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 };
-exports.builder = yargs => {
+const fetchBuilder = (yargs) => {
     yargs.positional('src', {
-        describe: i18n('commands.fetch.positionals.src.describe'),
+        describe: (0, lang_1.i18n)('commands.fetch.positionals.src.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n('commands.fetch.positionals.dest.describe'),
+        describe: (0, lang_1.i18n)('commands.fetch.positionals.dest.describe'),
         type: 'string',
     });
     yargs.options({
         staging: {
-            describe: i18n('commands.fetch.options.staging.describe'),
+            describe: (0, lang_1.i18n)('commands.fetch.options.staging.describe'),
             type: 'boolean',
             default: false,
             hidden: true,
@@ -53,14 +58,25 @@ exports.builder = yargs => {
     yargs.options({
         assetVersion: {
             type: 'number',
-            describe: i18n('commands.fetch.options.assetVersion.describe'),
+            describe: (0, lang_1.i18n)('commands.fetch.options.assetVersion.describe'),
         },
     });
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addOverwriteOptions(yargs);
-    addCmsPublishModeOptions(yargs, { read: true });
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
+    (0, commonOpts_1.addCmsPublishModeOptions)(yargs, { read: true });
+    (0, commonOpts_1.addOverwriteOptions)(yargs);
     return yargs;
 };
+const builder = (0, yargsUtils_1.makeYargsBuilder)(fetchBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useGlobalOptions: true,
+    useEnvironmentOptions: true,
+    useTestingOptions: false,
+});
+const fetchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = fetchCommand;
+module.exports = fetchCommand;

package/commands/filemanager/fetch.d.ts

@@ -1,13 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, OverwriteArgs } from '../../types/Yargs';
-export declare const command = "fetch <src> [dest]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & OverwriteArgs;
-type FileManagerFetchArgs = CombinedArgs & {
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, OverwriteArgs, YargsCommandModule } from '../../types/Yargs';
+type FileManagerFetchArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & OverwriteArgs & {
     src: string;
     dest: string;
     includeArchived?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<FileManagerFetchArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<FileManagerFetchArgs>;
-export {};
+declare const fileManagerFetchCommand: YargsCommandModule<unknown, FileManagerFetchArgs>;
+export default fileManagerFetchCommand;

package/commands/filemanager/fetch.js

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const fileManager_1 = require("@hubspot/local-dev-lib/fileManager");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const filesystem_1 = require("../../lib/filesystem");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
-exports.command = 'fetch <src> [dest]';
-exports.describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.describe`);
+const commonOpts_1 = require("../../lib/commonOpts");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'fetch <src> [dest]';
+const describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.describe`);
 async function handler(args) {
     const { src, includeArchived, derivedAccountId, overwrite } = args;
     if (typeof src !== 'string') {
@@ -30,12 +28,8 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
+function fileManagerFetchBuilder(yargs) {
     (0, commonOpts_1.addOverwriteOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('src', {
         describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.positionals.src.describe`),
         type: 'string',
@@ -51,3 +45,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerFetchBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const fileManagerFetchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = fileManagerFetchCommand;

package/commands/filemanager/upload.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "upload <src> <dest>";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type FileManagerUploadArgs = CombinedArgs & {
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type FileManagerUploadArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     src: string;
     dest: string;
 };
-export declare function handler(args: ArgumentsCamelCase<FileManagerUploadArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<FileManagerUploadArgs>;
-export {};
+declare const fileManagerUploadCommand: YargsCommandModule<unknown, FileManagerUploadArgs>;
+export default fileManagerUploadCommand;

package/commands/filemanager/upload.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 fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fileManager_1 = require("@hubspot/local-dev-lib/fileManager");
@@ -15,12 +12,12 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const modules_1 = require("@hubspot/local-dev-lib/cms/modules");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
 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 exitCodes_1 = require("../../lib/enums/exitCodes");
-exports.command = 'upload <src> <dest>';
-exports.describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'upload <src> <dest>';
+const describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.describe`);
 async function handler(args) {
     const { src, dest, derivedAccountId } = args;
     const absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
@@ -98,11 +95,7 @@ async function handler(args) {
         });
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function fileManagerUploadBuilder(yargs) {
     yargs.positional('src', {
         describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.positionals.src.describe`),
         type: 'string',
@@ -113,3 +106,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerUploadBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const fileManagerUploadCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = fileManagerUploadCommand;

package/commands/filemanager.d.ts

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

package/commands/filemanager.js

@@ -1,46 +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 upload = __importStar(require("./filemanager/upload"));
-const fetch = __importStar(require("./filemanager/fetch"));
+const upload_1 = __importDefault(require("./filemanager/upload"));
+const fetch_1 = __importDefault(require("./filemanager/fetch"));
 const lang_1 = require("../lib/lang");
-exports.command = 'filemanager';
-exports.describe = (0, lang_1.i18n)(`commands.filemanager.describe`);
-function builder(yargs) {
-    yargs.command(upload).command(fetch).demandCommand(1, '');
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'filemanager';
+const describe = (0, lang_1.i18n)(`commands.filemanager.describe`);
+function fileManagerBuilder(yargs) {
+    yargs.command(upload_1.default).command(fetch_1.default).demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerBuilder, command, describe);
+const fileManagerCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = fileManagerCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = fileManagerCommand;