@hubspot/cli 7.7.0-experimental.3 → 7.7.0

package/commands/filemanager/__tests__/upload.test.js

@@ -0,0 +1,30 @@
+import yargs from 'yargs';
+import { addGlobalOptions, addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
+import fileManagerUploadCommand from '../upload.js';
+vi.mock('../../../lib/commonOpts');
+describe('commands/filemanager/upload', () => {
+    const yargsMock = yargs;
+    describe('command', () => {
+        it('should have the correct command structure', () => {
+            expect(fileManagerUploadCommand.command).toEqual('upload <src> <dest>');
+        });
+    });
+    describe('describe', () => {
+        it('should provide a description', () => {
+            expect(fileManagerUploadCommand.describe).toBeDefined();
+        });
+    });
+    describe('builder', () => {
+        it('should support the correct options', () => {
+            fileManagerUploadCommand.builder(yargsMock);
+            expect(addGlobalOptions).toHaveBeenCalledTimes(1);
+            expect(addGlobalOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addConfigOptions).toHaveBeenCalledTimes(1);
+            expect(addConfigOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addAccountOptions).toHaveBeenCalledTimes(1);
+            expect(addAccountOptions).toHaveBeenCalledWith(yargsMock);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
+            expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargsMock);
+        });
+    });
+});

package/commands/filemanager/fetch.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, OverwriteArgs, YargsCommandModule } from '../../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, OverwriteArgs, YargsCommandModule } from '../../types/Yargs.js';
 type FileManagerFetchArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & OverwriteArgs & {
     src: string;
     dest: string;

package/commands/filemanager/fetch.js

@@ -1,51 +1,49 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 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");
-const commonOpts_1 = require("../../lib/commonOpts");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import { downloadFileOrFolder } from '@hubspot/local-dev-lib/fileManager';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { resolveLocalPath } from '../../lib/filesystem.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { i18n } from '../../lib/lang.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { addOverwriteOptions } from '../../lib/commonOpts.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch <src> [dest]';
-const describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.describe`);
+const describe = i18n(`commands.filemanager.subcommands.fetch.describe`);
 async function handler(args) {
     const { src, includeArchived, derivedAccountId, overwrite } = args;
     if (typeof src !== 'string') {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.errors.sourceRequired`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.error(i18n(`commands.filemanager.subcommands.fetch.errors.sourceRequired`));
+        process.exit(EXIT_CODES.ERROR);
     }
-    const dest = (0, filesystem_1.resolveLocalPath)(args.dest);
-    (0, usageTracking_1.trackCommandUsage)('filemanager-fetch', {}, derivedAccountId);
+    const dest = resolveLocalPath(args.dest);
+    trackCommandUsage('filemanager-fetch', {}, derivedAccountId);
     try {
         // Fetch and write file/folder.
-        await (0, fileManager_1.downloadFileOrFolder)(derivedAccountId, src, dest, overwrite, includeArchived || false);
+        await downloadFileOrFolder(derivedAccountId, src, dest, overwrite, includeArchived || false);
     }
     catch (err) {
-        (0, index_1.logError)(err);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logError(err);
+        process.exit(EXIT_CODES.ERROR);
     }
 }
 function fileManagerFetchBuilder(yargs) {
-    (0, commonOpts_1.addOverwriteOptions)(yargs);
+    addOverwriteOptions(yargs);
     yargs.positional('src', {
-        describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.positionals.src.describe`),
+        describe: i18n(`commands.filemanager.subcommands.fetch.positionals.src.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.positionals.dest.describe`),
+        describe: i18n(`commands.filemanager.subcommands.fetch.positionals.dest.describe`),
         type: 'string',
     });
     yargs.option('include-archived', {
         alias: ['i'],
-        describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.fetch.options.includeArchived.describe`),
+        describe: i18n(`commands.filemanager.subcommands.fetch.options.includeArchived.describe`),
         type: 'boolean',
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerFetchBuilder, command, describe, {
+const builder = makeYargsBuilder(fileManagerFetchBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -57,4 +55,4 @@ const fileManagerFetchCommand = {
     handler,
     builder,
 };
-exports.default = fileManagerFetchCommand;
+export default fileManagerFetchCommand;

package/commands/filemanager/upload.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 type FileManagerUploadArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     src: string;
     dest: string;

package/commands/filemanager/upload.js

@@ -1,74 +1,69 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fileManager_1 = require("@hubspot/local-dev-lib/fileManager");
-const fileManager_2 = require("@hubspot/local-dev-lib/api/fileManager");
-const path_2 = require("@hubspot/local-dev-lib/path");
-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 usageTracking_1 = require("../../lib/usageTracking");
-const lang_1 = require("../../lib/lang");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const yargsUtils_1 = require("../../lib/yargsUtils");
+import fs from 'fs';
+import path from 'path';
+import { uploadFolder } from '@hubspot/local-dev-lib/fileManager';
+import { uploadFile } from '@hubspot/local-dev-lib/api/fileManager';
+import { getCwd, convertToUnixPath } from '@hubspot/local-dev-lib/path';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { validateSrcAndDestPaths } from '@hubspot/local-dev-lib/cms/modules';
+import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
+import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { i18n } from '../../lib/lang.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'upload <src> <dest>';
-const describe = (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.describe`);
+const describe = 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);
+    const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {
-        stats = fs_1.default.statSync(absoluteSrcPath);
+        stats = fs.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
+            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
                 path: src,
             }));
             return;
         }
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
+        logger.error(i18n(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
             path: src,
         }));
         return;
     }
     if (!dest) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.destinationRequired`));
+        logger.error(i18n(`commands.filemanager.subcommands.upload.errors.destinationRequired`));
         return;
     }
-    const normalizedDest = (0, path_2.convertToUnixPath)(dest);
-    (0, usageTracking_1.trackCommandUsage)('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
-    const srcDestIssues = await (0, modules_1.validateSrcAndDestPaths)({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
+    const normalizedDest = convertToUnixPath(dest);
+    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger_1.logger.error(message));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        srcDestIssues.forEach(({ message }) => logger.error(message));
+        process.exit(EXIT_CODES.ERROR);
     }
     if (stats.isFile()) {
-        if ((0, ignoreRules_1.shouldIgnoreFile)(absoluteSrcPath)) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.fileIgnored`, {
+        if (shouldIgnoreFile(absoluteSrcPath)) {
+            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.fileIgnored`, {
                 path: src,
             }));
             return;
         }
-        (0, fileManager_2.uploadFile)(derivedAccountId, absoluteSrcPath, normalizedDest)
+        uploadFile(derivedAccountId, absoluteSrcPath, normalizedDest)
             .then(() => {
-            logger_1.logger.success((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.success.upload`, {
+            logger.success(i18n(`commands.filemanager.subcommands.upload.success.upload`, {
                 accountId: derivedAccountId,
                 dest: normalizedDest,
                 src,
             }));
         })
             .catch(error => {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.upload`, {
+            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.upload`, {
                 dest: normalizedDest,
                 src,
             }));
-            (0, index_1.logError)(error, new index_1.ApiErrorContext({
+            logError(error, new ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
@@ -76,20 +71,20 @@ async function handler(args) {
         });
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.logs.uploading`, {
+        logger.log(i18n(`commands.filemanager.subcommands.upload.logs.uploading`, {
             accountId: derivedAccountId,
             dest,
             src,
         }));
-        (0, fileManager_1.uploadFolder)(derivedAccountId, absoluteSrcPath, dest)
+        uploadFolder(derivedAccountId, absoluteSrcPath, dest)
             .then(() => {
-            logger_1.logger.success((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.success.uploadComplete`, {
+            logger.success(i18n(`commands.filemanager.subcommands.upload.success.uploadComplete`, {
                 dest,
             }));
         })
             .catch(error => {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.filemanager.subcommands.upload.errors.uploadingFailed`));
-            (0, index_1.logError)(error, {
+            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.uploadingFailed`));
+            logError(error, {
                 accountId: derivedAccountId,
             });
         });
@@ -97,16 +92,16 @@ async function handler(args) {
 }
 function fileManagerUploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.positionals.src.describe`),
+        describe: i18n(`commands.filemanager.subcommands.upload.positionals.src.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)(`commands.filemanager.subcommands.upload.positionals.dest.describe`),
+        describe: i18n(`commands.filemanager.subcommands.upload.positionals.dest.describe`),
         type: 'string',
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerUploadBuilder, command, describe, {
+const builder = makeYargsBuilder(fileManagerUploadBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -118,4 +113,4 @@ const fileManagerUploadCommand = {
     handler,
     builder,
 };
-exports.default = fileManagerUploadCommand;
+export default fileManagerUploadCommand;

package/commands/filemanager.d.ts

@@ -1,3 +1,3 @@
-import { YargsCommandModuleBucket } from '../types/Yargs';
+import { YargsCommandModuleBucket } from '../types/Yargs.js';
 declare const fileManagerCommand: YargsCommandModuleBucket;
 export default fileManagerCommand;

package/commands/filemanager.js

@@ -1,25 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const upload_1 = __importDefault(require("./filemanager/upload"));
-const fetch_1 = __importDefault(require("./filemanager/fetch"));
-const lang_1 = require("../lib/lang");
-const yargsUtils_1 = require("../lib/yargsUtils");
+import upload from './filemanager/upload.js';
+import fetch from './filemanager/fetch.js';
+import { i18n } from '../lib/lang.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = 'filemanager';
-const describe = (0, lang_1.i18n)(`commands.filemanager.describe`);
+const describe = i18n(`commands.filemanager.describe`);
 function fileManagerBuilder(yargs) {
-    yargs.command(upload_1.default).command(fetch_1.default).demandCommand(1, '');
+    yargs.command(upload).command(fetch).demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(fileManagerBuilder, command, describe);
+const builder = 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;
+export default fileManagerCommand;

package/commands/function/deploy.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 type FunctionDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     path: string;
 };

package/commands/function/deploy.js

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

package/commands/function/list.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 type FunctionListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     json?: boolean;
 };

package/commands/function/list.js

@@ -1,32 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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");
+import moment from 'moment';
+import { getRoutes } from '@hubspot/local-dev-lib/api/functions';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
+import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { i18n } from '../../lib/lang.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = ['list', 'ls'];
-const describe = (0, lang_1.i18n)('commands.function.subcommands.list.describe');
+const describe = 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);
+    trackCommandUsage('function-list', undefined, 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);
     });
     if (!routesResp.objects.length) {
-        return logger_1.logger.info((0, lang_1.i18n)('commands.function.subcommands.list.info.noFunctions'));
+        return logger.info(i18n('commands.function.subcommands.list.info.noFunctions'));
     }
     if (args.json) {
-        return logger_1.logger.log(routesResp.objects);
+        return logger.log(routesResp.objects);
     }
     const functionsAsArrays = routesResp.objects.map(func => {
         const { route, method, created, updated, secretNames } = func;
@@ -34,23 +29,23 @@ async function handler(args) {
             route,
             method,
             secretNames.join(', '),
-            (0, moment_1.default)(created).format(),
-            (0, moment_1.default)(updated).format(),
+            moment(created).format(),
+            moment(updated).format(),
         ];
     });
-    functionsAsArrays.unshift((0, table_1.getTableHeader)(['Route', 'Method', 'Secrets', 'Created', 'Updated']));
-    return logger_1.logger.log((0, table_1.getTableContents)(functionsAsArrays));
+    functionsAsArrays.unshift(getTableHeader(['Route', 'Method', 'Secrets', 'Created', 'Updated']));
+    return logger.log(getTableContents(functionsAsArrays));
 }
 function functionListBuilder(yargs) {
     yargs.options({
         json: {
-            describe: (0, lang_1.i18n)('commands.function.subcommands.list.options.json.describe'),
+            describe: i18n('commands.function.subcommands.list.options.json.describe'),
             type: 'boolean',
         },
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(functionListBuilder, command, describe, {
+const builder = makeYargsBuilder(functionListBuilder, command, describe, {
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
@@ -61,4 +56,4 @@ const functionListCommand = {
     handler,
     builder,
 };
-exports.default = functionListCommand;
+export default functionListCommand;

package/commands/function/server.d.ts

@@ -1,4 +1,4 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 type FunctionServerArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     path: string;
     port?: string;