@hubspot/cli 6.2.0 → 6.2.2-experimental.0

package/lib/projectsWatch.d.ts

@@ -0,0 +1 @@
+export function createWatcher(accountId: any, projectConfig: any, projectDir: any, handleBuildStatusFn: any, handleUserInputFn: any): Promise<void>;

package/lib/projectsWatch.js

@@ -1,3 +1,4 @@
+"use strict";
 const chokidar = require('chokidar');
 const path = require('path');
 const chalk = require('chalk');
@@ -7,255 +8,148 @@ const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
-const {
-  cancelStagedBuild,
-  provisionBuild,
-  uploadFileToBuild,
-  deleteFileFromBuild,
-  queueBuild,
-} = require('@hubspot/local-dev-lib/api/projects');
+const { cancelStagedBuild, provisionBuild, uploadFileToBuild, deleteFileFromBuild, queueBuild, } = require('@hubspot/local-dev-lib/api/projects');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { PROJECT_ERROR_TYPES } = require('./constants');
-
 const i18nKey = 'commands.project.subcommands.watch';
-
 const queue = new PQueue({
-  concurrency: 10,
+    concurrency: 10,
 });
 const standbyeQueue = [];
 let currentBuildId = null;
 let handleBuildStatus, handleUserInput;
 let timer;
-
 const processStandByQueue = async (accountId, projectName, platformVersion) => {
-  queue.addAll(
-    standbyeQueue.map(({ filePath, remotePath, action }) => {
-      return async () => {
-        queueFileOrFolder(
-          accountId,
-          projectName,
-          platformVersion,
-          filePath,
-          remotePath,
-          action
-        );
-      };
-    })
-  );
-  standbyeQueue.length = 0;
-  debounceQueueBuild(accountId, projectName, platformVersion);
+    queue.addAll(standbyeQueue.map(({ filePath, remotePath, action }) => {
+        return async () => {
+            queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action);
+        };
+    }));
+    standbyeQueue.length = 0;
+    debounceQueueBuild(accountId, projectName, platformVersion);
 };
-
-const createNewStagingBuild = async (
-  accountId,
-  projectName,
-  platformVersion
-) => {
-  currentBuildId = await createNewBuild(
-    accountId,
-    projectName,
-    platformVersion
-  );
-
-  handleUserInput(accountId, projectName, currentBuildId);
+const createNewStagingBuild = async (accountId, projectName, platformVersion) => {
+    currentBuildId = await createNewBuild(accountId, projectName, platformVersion);
+    handleUserInput(accountId, projectName, currentBuildId);
 };
-
 const debounceQueueBuild = (accountId, projectName, platformVersion) => {
-  if (timer) {
-    clearTimeout(timer);
-  }
-
-  timer = setTimeout(async () => {
-    logger.debug(i18n(`${i18nKey}.debug.pause`, { projectName }));
-    queue.pause();
-    await queue.onIdle();
-
-    try {
-      await queueBuild(accountId, projectName, platformVersion);
-      logger.debug(i18n(`${i18nKey}.debug.buildStarted`, { projectName }));
-    } catch (err) {
-      if (
-        isSpecifiedError(err, {
-          subCategory: PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
-        })
-      ) {
-        logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
-        process.exit(0);
-      } else {
-        logError(err, new ApiErrorContext({ accountId }));
-      }
-
-      return;
-    }
-
-    await handleBuildStatus(accountId, projectName, currentBuildId);
-
-    await createNewStagingBuild(accountId, projectName, platformVersion);
-
-    if (standbyeQueue.length > 0) {
-      await processStandByQueue(accountId, projectName, platformVersion);
+    if (timer) {
+        clearTimeout(timer);
     }
-
-    queue.start();
-    logger.log(i18n(`${i18nKey}.logs.resuming`));
-    logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
-  }, 2000);
+    timer = setTimeout(async () => {
+        logger.debug(i18n(`${i18nKey}.debug.pause`, { projectName }));
+        queue.pause();
+        await queue.onIdle();
+        try {
+            await queueBuild(accountId, projectName, platformVersion);
+            logger.debug(i18n(`${i18nKey}.debug.buildStarted`, { projectName }));
+        }
+        catch (err) {
+            if (isSpecifiedError(err, {
+                subCategory: PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
+            })) {
+                logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
+                process.exit(0);
+            }
+            else {
+                logError(err, new ApiErrorContext({ accountId }));
+            }
+            return;
+        }
+        await handleBuildStatus(accountId, projectName, currentBuildId);
+        await createNewStagingBuild(accountId, projectName, platformVersion);
+        if (standbyeQueue.length > 0) {
+            await processStandByQueue(accountId, projectName, platformVersion);
+        }
+        queue.start();
+        logger.log(i18n(`${i18nKey}.logs.resuming`));
+        logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
+    }, 2000);
 };
-
-const queueFileOrFolder = async (
-  accountId,
-  projectName,
-  platformVersion,
-  filePath,
-  remotePath,
-  action
-) => {
-  if (action === 'upload' && !isAllowedExtension(filePath)) {
-    logger.debug(i18n(`${i18nKey}.debug.extensionNotAllowed`, { filePath }));
-    return;
-  }
-  if (shouldIgnoreFile(filePath, true)) {
-    logger.debug(i18n(`${i18nKey}.debug.ignored`, { filePath }));
-    return;
-  }
-  if (!queue.isPaused) {
-    debounceQueueBuild(accountId, projectName, platformVersion);
-  }
-
-  logger.debug(i18n(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
-
-  return queue.add(async () => {
-    try {
-      if (action === 'upload') {
-        await uploadFileToBuild(accountId, projectName, filePath, remotePath);
-      } else if (action === 'deleteFile' || action === 'deleteFolder') {
-        await deleteFileFromBuild(accountId, projectName, remotePath);
-      }
-      logger.log(
-        i18n(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath })
-      );
-    } catch (err) {
-      logger.debug(
-        i18n(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath })
-      );
+const queueFileOrFolder = async (accountId, projectName, platformVersion, filePath, remotePath, action) => {
+    if (action === 'upload' && !isAllowedExtension(filePath)) {
+        logger.debug(i18n(`${i18nKey}.debug.extensionNotAllowed`, { filePath }));
+        return;
+    }
+    if (shouldIgnoreFile(filePath, true)) {
+        logger.debug(i18n(`${i18nKey}.debug.ignored`, { filePath }));
+        return;
     }
-  });
+    if (!queue.isPaused) {
+        debounceQueueBuild(accountId, projectName, platformVersion);
+    }
+    logger.debug(i18n(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
+    return queue.add(async () => {
+        try {
+            if (action === 'upload') {
+                await uploadFileToBuild(accountId, projectName, filePath, remotePath);
+            }
+            else if (action === 'deleteFile' || action === 'deleteFolder') {
+                await deleteFileFromBuild(accountId, projectName, remotePath);
+            }
+            logger.log(i18n(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath }));
+        }
+        catch (err) {
+            logger.debug(i18n(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath }));
+        }
+    });
 };
-
 const createNewBuild = async (accountId, projectName, platformVersion) => {
-  try {
-    logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
-    const {
-      data: { buildId },
-    } = await provisionBuild(accountId, projectName, platformVersion);
-    return buildId;
-  } catch (err) {
-    logError(err, new ApiErrorContext({ accountId }));
-    if (
-      isSpecifiedError(err, { subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED })
-    ) {
-      await cancelStagedBuild(accountId, projectName);
-      logger.log(i18n(`${i18nKey}.logs.previousStagingBuildCancelled`));
+    try {
+        logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
+        const { data: { buildId }, } = await provisionBuild(accountId, projectName, platformVersion);
+        return buildId;
+    }
+    catch (err) {
+        logError(err, new ApiErrorContext({ accountId }));
+        if (isSpecifiedError(err, { subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED })) {
+            await cancelStagedBuild(accountId, projectName);
+            logger.log(i18n(`${i18nKey}.logs.previousStagingBuildCancelled`));
+        }
+        process.exit(1);
     }
-    process.exit(1);
-  }
 };
-
-const handleWatchEvent = async (
-  accountId,
-  projectName,
-  platformVersion,
-  projectSourceDir,
-  filePath,
-  action = 'upload'
-) => {
-  const remotePath = path.relative(projectSourceDir, filePath);
-  if (queue.isPaused) {
-    standbyeQueue.find(file => file.filePath === filePath)
-      ? logger.debug(i18n(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }))
-      : standbyeQueue.push({
-          filePath,
-          remotePath,
-          action,
-        });
-  } else {
-    await queueFileOrFolder(
-      accountId,
-      projectName,
-      platformVersion,
-      filePath,
-      remotePath,
-      action
-    );
-  }
+const handleWatchEvent = async (accountId, projectName, platformVersion, projectSourceDir, filePath, action = 'upload') => {
+    const remotePath = path.relative(projectSourceDir, filePath);
+    if (queue.isPaused) {
+        standbyeQueue.find(file => file.filePath === filePath)
+            ? logger.debug(i18n(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }))
+            : standbyeQueue.push({
+                filePath,
+                remotePath,
+                action,
+            });
+    }
+    else {
+        await queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action);
+    }
 };
-
-const createWatcher = async (
-  accountId,
-  projectConfig,
-  projectDir,
-  handleBuildStatusFn,
-  handleUserInputFn
-) => {
-  const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
-
-  handleBuildStatus = handleBuildStatusFn;
-  handleUserInput = handleUserInputFn;
-
-  await createNewStagingBuild(
-    accountId,
-    projectConfig.name,
-    projectConfig.platformVersion
-  );
-
-  const watcher = chokidar.watch(projectSourceDir, {
-    ignoreInitial: true,
-    ignored: file => shouldIgnoreFile(file),
-  });
-  watcher.on('ready', async () => {
-    logger.log(i18n(`${i18nKey}.logs.watching`, { projectDir }));
-    logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
-  });
-  watcher.on('add', async path => {
-    handleWatchEvent(
-      accountId,
-      projectConfig.name,
-      projectConfig.platformVersion,
-      projectSourceDir,
-      path
-    );
-  });
-  watcher.on('change', async path => {
-    handleWatchEvent(
-      accountId,
-      projectConfig.name,
-      projectConfig.platformVersion,
-      projectSourceDir,
-      path
-    );
-  });
-  watcher.on('unlink', async path => {
-    handleWatchEvent(
-      accountId,
-      projectConfig.name,
-      projectConfig.platformVersion,
-      projectSourceDir,
-      path,
-      'deleteFile'
-    );
-  });
-  watcher.on('unlinkDir', async path => {
-    handleWatchEvent(
-      accountId,
-      projectConfig.name,
-      projectConfig.platformVersion,
-      projectSourceDir,
-      path,
-      'deleteFolder'
-    );
-  });
+const createWatcher = async (accountId, projectConfig, projectDir, handleBuildStatusFn, handleUserInputFn) => {
+    const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
+    handleBuildStatus = handleBuildStatusFn;
+    handleUserInput = handleUserInputFn;
+    await createNewStagingBuild(accountId, projectConfig.name, projectConfig.platformVersion);
+    const watcher = chokidar.watch(projectSourceDir, {
+        ignoreInitial: true,
+        ignored: file => shouldIgnoreFile(file),
+    });
+    watcher.on('ready', async () => {
+        logger.log(i18n(`${i18nKey}.logs.watching`, { projectDir }));
+        logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
+    });
+    watcher.on('add', async (path) => {
+        handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path);
+    });
+    watcher.on('change', async (path) => {
+        handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path);
+    });
+    watcher.on('unlink', async (path) => {
+        handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path, 'deleteFile');
+    });
+    watcher.on('unlinkDir', async (path) => {
+        handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path, 'deleteFolder');
+    });
 };
-
 module.exports = {
-  createWatcher,
+    createWatcher,
 };

package/lib/prompts/accountNamePrompt.d.ts

@@ -0,0 +1,11 @@
+export function getCliAccountNamePromptConfig(defaultName: any): {
+    name: string;
+    message: any;
+    default: any;
+    validate(val: any): any;
+};
+export function cliAccountNamePrompt(defaultName: any): Promise<any>;
+export function hubspotAccountNamePrompt({ accountType, currentPortalCount }: {
+    accountType: any;
+    currentPortalCount?: number | undefined;
+}): Promise<any>;

package/lib/prompts/accountNamePrompt.js

@@ -1,78 +1,71 @@
+"use strict";
 const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const {
-  HUBSPOT_ACCOUNT_TYPES,
-} = require('@hubspot/local-dev-lib/constants/config');
-
+const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
 const i18nKey = 'lib.prompts.accountNamePrompt';
-
 const getCliAccountNamePromptConfig = defaultName => ({
-  name: 'name',
-  message: i18n(`${i18nKey}.enterAccountName`),
-  default: defaultName,
-  validate(val) {
-    if (typeof val !== 'string') {
-      return i18n(`${i18nKey}.errors.invalidName`);
-    } else if (!val.length) {
-      return i18n(`${i18nKey}.errors.nameRequired`);
-    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return i18n(`${i18nKey}.errors.spacesInName`);
-    }
-    return accountNameExistsInConfig(val)
-      ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
-      : true;
-  },
-});
-
-const cliAccountNamePrompt = defaultName => {
-  return promptUser(getCliAccountNamePromptConfig(defaultName));
-};
-
-const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
-  const isDevelopmentSandbox =
-    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
-  const isSandbox =
-    accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
-    isDevelopmentSandbox;
-  const isDeveloperTestAccount =
-    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
-
-  let promptMessageString;
-  let defaultName;
-  if (isSandbox) {
-    promptMessageString = isDevelopmentSandbox
-      ? i18n(`${i18nKey}.enterDevelopmentSandboxName`)
-      : i18n(`${i18nKey}.enterStandardSandboxName`);
-  } else if (isDeveloperTestAccount) {
-    promptMessageString = i18n(`${i18nKey}.enterDeveloperTestAccountName`);
-    defaultName = i18n(`${i18nKey}.developerTestAccountDefaultName`, {
-      count: currentPortalCount + 1,
-    });
-  }
-
-  return promptUser([
-    {
-      name: 'name',
-      message: promptMessageString,
-      validate(val) {
+    name: 'name',
+    message: i18n(`${i18nKey}.enterAccountName`),
+    default: defaultName,
+    validate(val) {
         if (typeof val !== 'string') {
-          return i18n(`${i18nKey}.errors.invalidName`);
-        } else if (!val.trim().length) {
-          return i18n(`${i18nKey}.errors.nameRequired`);
+            return i18n(`${i18nKey}.errors.invalidName`);
+        }
+        else if (!val.length) {
+            return i18n(`${i18nKey}.errors.nameRequired`);
+        }
+        else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+            return i18n(`${i18nKey}.errors.spacesInName`);
         }
         return accountNameExistsInConfig(val)
-          ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
-          : true;
-      },
-      default: defaultName,
+            ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+            : true;
     },
-  ]);
+});
+const cliAccountNamePrompt = defaultName => {
+    return promptUser(getCliAccountNamePromptConfig(defaultName));
+};
+const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
+    const isDevelopmentSandbox = accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+    const isSandbox = accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+        isDevelopmentSandbox;
+    const isDeveloperTestAccount = accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+    let promptMessageString;
+    let defaultName;
+    if (isSandbox) {
+        promptMessageString = isDevelopmentSandbox
+            ? i18n(`${i18nKey}.enterDevelopmentSandboxName`)
+            : i18n(`${i18nKey}.enterStandardSandboxName`);
+    }
+    else if (isDeveloperTestAccount) {
+        promptMessageString = i18n(`${i18nKey}.enterDeveloperTestAccountName`);
+        defaultName = i18n(`${i18nKey}.developerTestAccountDefaultName`, {
+            count: currentPortalCount + 1,
+        });
+    }
+    return promptUser([
+        {
+            name: 'name',
+            message: promptMessageString,
+            validate(val) {
+                if (typeof val !== 'string') {
+                    return i18n(`${i18nKey}.errors.invalidName`);
+                }
+                else if (!val.trim().length) {
+                    return i18n(`${i18nKey}.errors.nameRequired`);
+                }
+                return accountNameExistsInConfig(val)
+                    ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+                    : true;
+            },
+            default: defaultName,
+        },
+    ]);
 };
-
 module.exports = {
-  getCliAccountNamePromptConfig,
-  cliAccountNamePrompt,
-  hubspotAccountNamePrompt,
+    getCliAccountNamePromptConfig,
+    cliAccountNamePrompt,
+    hubspotAccountNamePrompt,
 };

package/lib/prompts/accountsPrompt.d.ts

@@ -0,0 +1,3 @@
+export function selectAndSetAsDefaultAccountPrompt(config: any): Promise<void>;
+export function selectAccountFromConfig(config: any, prompt: any): Promise<any>;
+export function mapAccountChoices(portals: any): any;

package/lib/prompts/accountsPrompt.js

@@ -1,49 +1,43 @@
+"use strict";
 const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription } = require('../ui');
-
-const mapAccountChoices = portals =>
-  portals.map(p => ({
+const mapAccountChoices = portals => portals.map(p => ({
     name: uiAccountDescription(p.portalId, false),
     value: p.name || p.portalId,
-  }));
-
+}));
 const i18nKey = 'commands.accounts.subcommands.use';
-
 const selectAccountFromConfig = async (config, prompt) => {
-  const { default: selectedDefault } = await promptUser([
-    {
-      type: 'list',
-      look: false,
-      name: 'default',
-      pageSize: 20,
-      message: prompt || i18n(`${i18nKey}.promptMessage`),
-      choices: mapAccountChoices(config.portals),
-      default: config.defaultPortal,
-    },
-  ]);
-
-  return selectedDefault;
+    const { default: selectedDefault } = await promptUser([
+        {
+            type: 'list',
+            look: false,
+            name: 'default',
+            pageSize: 20,
+            message: prompt || i18n(`${i18nKey}.promptMessage`),
+            choices: mapAccountChoices(config.portals),
+            default: config.defaultPortal,
+        },
+    ]);
+    return selectedDefault;
 };
-
-const selectAndSetAsDefaultAccountPrompt = async config => {
-  const { default: selectedDefault } = await promptUser([
-    {
-      type: 'list',
-      look: false,
-      name: 'default',
-      pageSize: 20,
-      message: i18n(`${i18nKey}.promptMessage`),
-      choices: mapAccountChoices(config.portals),
-      default: config.defaultPortal,
-    },
-  ]);
-  updateDefaultAccount(selectedDefault);
+const selectAndSetAsDefaultAccountPrompt = async (config) => {
+    const { default: selectedDefault } = await promptUser([
+        {
+            type: 'list',
+            look: false,
+            name: 'default',
+            pageSize: 20,
+            message: i18n(`${i18nKey}.promptMessage`),
+            choices: mapAccountChoices(config.portals),
+            default: config.defaultPortal,
+        },
+    ]);
+    updateDefaultAccount(selectedDefault);
 };
-
 module.exports = {
-  selectAndSetAsDefaultAccountPrompt,
-  selectAccountFromConfig,
-  mapAccountChoices,
+    selectAndSetAsDefaultAccountPrompt,
+    selectAccountFromConfig,
+    mapAccountChoices,
 };

package/lib/prompts/activeInstallConfirmationPrompt.d.ts

@@ -0,0 +1 @@
+export function activeInstallConfirmationPrompt(): Promise<any>;

package/lib/prompts/activeInstallConfirmationPrompt.js

@@ -1,20 +1,18 @@
+"use strict";
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-
 const i18nKey = 'lib.prompts.activeInstallConfirmationPrompt';
-
 const activeInstallConfirmationPrompt = async () => {
-  const { proceed } = await promptUser([
-    {
-      name: 'proceed',
-      message: i18n(`${i18nKey}.message`),
-      type: 'confirm',
-      default: false,
-    },
-  ]);
-  return proceed;
+    const { proceed } = await promptUser([
+        {
+            name: 'proceed',
+            message: i18n(`${i18nKey}.message`),
+            type: 'confirm',
+            default: false,
+        },
+    ]);
+    return proceed;
 };
-
 module.exports = {
-  activeInstallConfirmationPrompt,
+    activeInstallConfirmationPrompt,
 };

package/lib/prompts/cleanUploadPrompt.d.ts

@@ -0,0 +1 @@
+export function cleanUploadPrompt(accountId: any, filePath: any): Promise<any>;