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

package/commands/fetch.js

@@ -1,51 +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 i18nKey = 'commands.fetch';
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { logError } = require('../lib/errorHandlers/index');
-exports.command = 'fetch <src> [dest]';
-exports.describe = i18n(`${i18nKey}.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(`${i18nKey}.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(`${i18nKey}.positionals.src.describe`),
+        describe: (0, lang_1.i18n)('commands.fetch.positionals.src.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: (0, lang_1.i18n)('commands.fetch.positionals.dest.describe'),
         type: 'string',
     });
     yargs.options({
         staging: {
-            describe: i18n(`${i18nKey}.options.staging.describe`),
+            describe: (0, lang_1.i18n)('commands.fetch.options.staging.describe'),
             type: 'boolean',
             default: false,
             hidden: true,
@@ -54,14 +58,25 @@ exports.builder = yargs => {
     yargs.options({
         assetVersion: {
             type: 'number',
-            describe: i18n(`${i18nKey}.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,47 +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");
-const i18nKey = 'commands.filemanager';
-exports.command = 'filemanager';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.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;

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;