@hubspot/cli 6.2.0 → 6.2.2-experimental.0

package/commands/filemanager/upload.js

@@ -1,152 +1,110 @@
+"use strict";
 const fs = require('fs');
 const path = require('path');
-
 const { uploadFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { uploadFile } = require('@hubspot/local-dev-lib/api/fileManager');
 const { getCwd, convertToUnixPath } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  validateSrcAndDestPaths,
-} = require('@hubspot/local-dev-lib/cms/modules');
+const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
-
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
-
 const i18nKey = 'commands.filemanager.subcommands.upload';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-
 exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  const { src, dest } = options;
-
-  await loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-  const absoluteSrcPath = path.resolve(getCwd(), src);
-
-  let stats;
-  try {
-    stats = fs.statSync(absoluteSrcPath);
-    if (!stats.isFile() && !stats.isDirectory()) {
-      logger.error(
-        i18n(`${i18nKey}.errors.invalidPath`, {
-          path: src,
-        })
-      );
-      return;
+exports.handler = async (options) => {
+    const { src, dest } = options;
+    await loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    const absoluteSrcPath = path.resolve(getCwd(), src);
+    let stats;
+    try {
+        stats = fs.statSync(absoluteSrcPath);
+        if (!stats.isFile() && !stats.isDirectory()) {
+            logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+                path: src,
+            }));
+            return;
+        }
+    }
+    catch (e) {
+        logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+            path: src,
+        }));
+        return;
+    }
+    if (!dest) {
+        logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
+        return;
     }
-  } catch (e) {
-    logger.error(
-      i18n(`${i18nKey}.errors.invalidPath`, {
-        path: src,
-      })
-    );
-    return;
-  }
-
-  if (!dest) {
-    logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
-    return;
-  }
-  const normalizedDest = convertToUnixPath(dest);
-  trackCommandUsage(
-    'filemanager-upload',
-    { type: stats.isFile() ? 'file' : 'folder' },
-    accountId
-  );
-
-  const srcDestIssues = await validateSrcAndDestPaths(
-    { isLocal: true, path: src },
-    { isHubSpot: true, path: dest }
-  );
-  if (srcDestIssues.length) {
-    srcDestIssues.forEach(({ message }) => logger.error(message));
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  if (stats.isFile()) {
-    if (shouldIgnoreFile(absoluteSrcPath)) {
-      logger.error(
-        i18n(`${i18nKey}.errors.fileIgnored`, {
-          path: src,
+    const normalizedDest = convertToUnixPath(dest);
+    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, accountId);
+    const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
+    if (srcDestIssues.length) {
+        srcDestIssues.forEach(({ message }) => logger.error(message));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    if (stats.isFile()) {
+        if (shouldIgnoreFile(absoluteSrcPath)) {
+            logger.error(i18n(`${i18nKey}.errors.fileIgnored`, {
+                path: src,
+            }));
+            return;
+        }
+        uploadFile(accountId, absoluteSrcPath, normalizedDest)
+            .then(() => {
+            logger.success(i18n(`${i18nKey}.success.upload`, {
+                accountId,
+                dest: normalizedDest,
+                src,
+            }));
         })
-      );
-      return;
+            .catch(error => {
+            logger.error(i18n(`${i18nKey}.errors.upload`, {
+                dest: normalizedDest,
+                src,
+            }));
+            logError(error, new ApiErrorContext({
+                accountId,
+                request: normalizedDest,
+                payload: src,
+            }));
+        });
     }
-
-    uploadFile(accountId, absoluteSrcPath, normalizedDest)
-      .then(() => {
-        logger.success(
-          i18n(`${i18nKey}.success.upload`, {
+    else {
+        logger.log(i18n(`${i18nKey}.logs.uploading`, {
             accountId,
-            dest: normalizedDest,
-            src,
-          })
-        );
-      })
-      .catch(error => {
-        logger.error(
-          i18n(`${i18nKey}.errors.upload`, {
-            dest: normalizedDest,
-            src,
-          })
-        );
-        logError(
-          error,
-          new ApiErrorContext({
-            accountId,
-            request: normalizedDest,
-            payload: src,
-          })
-        );
-      });
-  } else {
-    logger.log(
-      i18n(`${i18nKey}.logs.uploading`, {
-        accountId,
-        dest,
-        src,
-      })
-    );
-    uploadFolder(accountId, absoluteSrcPath, dest)
-      .then(() => {
-        logger.success(
-          i18n(`${i18nKey}.success.uploadComplete`, {
             dest,
-          })
-        );
-      })
-      .catch(error => {
-        logger.error(i18n(`${i18nKey}.errors.uploadingFailed`));
-        logError(error, {
-          accountId,
+            src,
+        }));
+        uploadFolder(accountId, absoluteSrcPath, dest)
+            .then(() => {
+            logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
+                dest,
+            }));
+        })
+            .catch(error => {
+            logger.error(i18n(`${i18nKey}.errors.uploadingFailed`));
+            logError(error, {
+                accountId,
+            });
         });
-      });
-  }
+    }
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  yargs.positional('src', {
-    describe: i18n(`${i18nKey}.positionals.src.describe`),
-    type: 'string',
-  });
-  yargs.positional('dest', {
-    describe: i18n(`${i18nKey}.positionals.dest.describe`),
-    type: 'string',
-  });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs.positional('src', {
+        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        type: 'string',
+    });
+    yargs.positional('dest', {
+        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        type: 'string',
+    });
 };

package/commands/filemanager.d.ts

@@ -0,0 +1,3 @@
+export const command: "filemanager";
+export const describe: any;
+export function builder(yargs: any): any;

package/commands/filemanager.js

@@ -1,26 +1,18 @@
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addOverwriteOptions,
-} = require('../lib/commonOpts');
+"use strict";
+const { addConfigOptions, addAccountOptions, addOverwriteOptions, } = require('../lib/commonOpts');
 const upload = require('./filemanager/upload');
 const fetch = require('./filemanager/fetch');
 const { i18n } = require('../lib/lang');
-
 const i18nKey = 'commands.filemanager';
-
 exports.command = 'filemanager';
 exports.describe = i18n(`${i18nKey}.describe`);
-
 exports.builder = yargs => {
-  addOverwriteOptions(yargs);
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-
-  yargs
-    .command(upload)
-    .command(fetch)
-    .demandCommand(1, '');
-
-  return yargs;
+    addOverwriteOptions(yargs);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs
+        .command(upload)
+        .command(fetch)
+        .demandCommand(1, '');
+    return yargs;
 };

package/commands/functions/deploy.d.ts

@@ -0,0 +1,4 @@
+export const command: "deploy <path>";
+export const describe: false;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;

package/commands/functions/deploy.js

@@ -1,115 +1,90 @@
-const ora = require('ora');
-const {
-  addAccountOptions,
-  addConfigOptions,
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../../lib/commonOpts');
+"use strict";
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
+const { addAccountOptions, addConfigOptions, getAccountId, 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 { buildPackage, getBuildStatus, } = require('@hubspot/local-dev-lib/api/functions');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { outputBuildLog } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
-
 const i18nKey = 'commands.functions.subcommands.deploy';
-
 exports.command = 'deploy <path>';
 exports.describe = false;
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const { path: functionPath } = options;
-  const accountId = getAccountId(options);
-  const splitFunctionPath = functionPath.split('.');
-  let spinner;
-
-  trackCommandUsage('functions-deploy', null, accountId);
-
-  if (
-    !splitFunctionPath.length ||
-    splitFunctionPath[splitFunctionPath.length - 1] !== 'functions'
-  ) {
-    logger.error(
-      i18n(`${i18nKey}.errors.notFunctionsFolder`, {
-        functionPath,
-      })
-    );
-    return;
-  }
-
-  logger.debug(
-    i18n(`${i18nKey}.debug.startingBuildAndDeploy`, {
-      functionPath,
-    })
-  );
-
-  try {
-    spinner = ora(
-      i18n(`${i18nKey}.loading`, {
-        accountId,
-        functionPath,
-      })
-    ).start();
-    const { data: buildId } = await buildPackage(accountId, functionPath);
-    const successResp = await poll(getBuildStatus, accountId, buildId);
-    const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
-    spinner.stop();
-    await outputBuildLog(successResp.cdnUrl);
-    logger.success(
-      i18n(`${i18nKey}.success.deployed`, {
-        accountId,
-        buildTimeSeconds,
+exports.handler = async (options) => {
+    await loadAndValidateOptions(options);
+    const { path: functionPath } = options;
+    const accountId = getAccountId(options);
+    const splitFunctionPath = functionPath.split('.');
+    trackCommandUsage('functions-deploy', null, accountId);
+    if (!splitFunctionPath.length ||
+        splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
+        logger.error(i18n(`${i18nKey}.errors.notFunctionsFolder`, {
+            functionPath,
+        }));
+        return;
+    }
+    logger.debug(i18n(`${i18nKey}.debug.startingBuildAndDeploy`, {
         functionPath,
-      })
-    );
-  } catch (e) {
-    spinner && spinner.stop && spinner.stop();
-    if (isHubSpotHttpError(e) && e.status === 404) {
-      logger.error(
-        i18n(`${i18nKey}.errors.noPackageJson`, {
-          functionPath,
-        })
-      );
-    } else if (isHubSpotHttpError(e) && e.status === 400) {
-      logger.error(e.error.message);
-    } else if (e.status === 'ERROR') {
-      await outputBuildLog(e.cdnUrl);
-      logger.error(
-        i18n(`${i18nKey}.errors.buildError`, {
-          details: e.errorReason,
-        })
-      );
-    } else {
-      logError(e, new ApiErrorContext({ accountId, request: functionPath }));
+    }));
+    SpinniesManager.init();
+    SpinniesManager.add('loading', {
+        text: i18n(`${i18nKey}.loading`, {
+            account: uiAccountDescription(accountId),
+            functionPath,
+        }),
+    });
+    try {
+        const { data: buildId } = await buildPackage(accountId, functionPath);
+        const successResp = await poll(getBuildStatus, accountId, buildId);
+        const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
+        SpinniesManager.succeed('loading');
+        await outputBuildLog(successResp.cdnUrl);
+        logger.success(i18n(`${i18nKey}.success.deployed`, {
+            accountId,
+            buildTimeSeconds,
+            functionPath,
+        }));
+    }
+    catch (e) {
+        SpinniesManager.fail('loading', {
+            text: i18n(`${i18nKey}.loadingFailed`, {
+                account: uiAccountDescription(accountId),
+                functionPath,
+            }),
+        });
+        if (isHubSpotHttpError(e) && e.status === 404) {
+            logger.error(i18n(`${i18nKey}.errors.noPackageJson`, {
+                functionPath,
+            }));
+        }
+        else if (e.status === 'ERROR') {
+            await outputBuildLog(e.cdnUrl);
+            logger.error(i18n(`${i18nKey}.errors.buildError`, {
+                details: e.errorReason,
+            }));
+        }
+        else {
+            logError(e, new ApiErrorContext({ accountId, request: functionPath }));
+        }
     }
-  }
 };
-
 exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-
-  yargs.example([
-    [
-      '$0 functions deploy myFunctionFolder.functions',
-      i18n(`${i18nKey}.examples.default`),
-    ],
-  ]);
-
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  return yargs;
+    yargs.positional('path', {
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        type: 'string',
+    });
+    yargs.example([
+        [
+            '$0 functions deploy myFunctionFolder.functions',
+            i18n(`${i18nKey}.examples.default`),
+        ],
+    ]);
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    return yargs;
 };

package/commands/functions/list.d.ts

@@ -0,0 +1,4 @@
+export const command: "list";
+export const describe: any;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): void;

package/commands/functions/list.js

@@ -1,62 +1,44 @@
+"use strict";
 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 { getFunctionArrays } = require('../../lib/getFunctionArrays');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const {
-  addConfigOptions,
-  addAccountOptions,
-  addUseEnvironmentOptions,
-  getAccountId,
-} = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-
 const i18nKey = 'commands.functions.subcommands.list';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
-
-exports.handler = async options => {
-  loadAndValidateOptions(options);
-
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('functions-list', null, accountId);
-
-  logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
-
-  const { data: routesResp } = await getRoutes(accountId).catch(async e => {
-    logError(e, new ApiErrorContext({ accountId }));
-    process.exit(EXIT_CODES.SUCCESS);
-  });
-
-  if (!routesResp.objects.length) {
-    return logger.info(i18n(`${i18nKey}.info.noFunctions`));
-  }
-
-  if (options.json) {
-    return logger.log(routesResp.objects);
-  }
-
-  const functionsAsArrays = getFunctionArrays(routesResp);
-  functionsAsArrays.unshift(
-    getTableHeader(['Route', 'Method', 'Secrets', 'Created', 'Updated'])
-  );
-  return logger.log(getTableContents(functionsAsArrays));
+exports.handler = async (options) => {
+    loadAndValidateOptions(options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('functions-list', null, accountId);
+    logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
+    const { data: routesResp } = await getRoutes(accountId).catch(async (e) => {
+        logError(e, new ApiErrorContext({ accountId }));
+        process.exit(EXIT_CODES.SUCCESS);
+    });
+    if (!routesResp.objects.length) {
+        return logger.info(i18n(`${i18nKey}.info.noFunctions`));
+    }
+    if (options.json) {
+        return logger.log(routesResp.objects);
+    }
+    const functionsAsArrays = getFunctionArrays(routesResp);
+    functionsAsArrays.unshift(getTableHeader(['Route', 'Method', 'Secrets', 'Created', 'Updated']));
+    return logger.log(getTableContents(functionsAsArrays));
 };
-
 exports.builder = yargs => {
-  addConfigOptions(yargs);
-  addAccountOptions(yargs);
-  addUseEnvironmentOptions(yargs);
-
-  yargs.options({
-    json: {
-      describe: i18n(`${i18nKey}.options.json.describe`),
-      type: 'boolean',
-    },
-  });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    yargs.options({
+        json: {
+            describe: i18n(`${i18nKey}.options.json.describe`),
+            type: 'boolean',
+        },
+    });
 };

package/commands/functions/server.d.ts

@@ -0,0 +1,4 @@
+export const command: "server <path>";
+export const describe: false;
+export function handler(options: any): Promise<void>;
+export function builder(yargs: any): any;