@hubspot/cli 7.0.0-beta.0 → 7.0.0-beta.1

package/README.md

@@ -1,6 +1,6 @@
 # @hubspot/cli
 
-[![Official Release](https://img.shields.io/npm/v/@hubspot/cli/latest?label=Official%20Release)](https://www.npmjs.com/package/@hubspot/cli) [![Latest Version](https://img.shields.io/github/v/tag/hubspot/hubspot-cli?label=Latest%20Version)](https://www.npmjs.com/package/@hubspot/cli?activeTab=versions)
+[![Official Release](https://img.shields.io/npm/v/@hubspot/cli/latest?label=Official%20Release)](https://www.npmjs.com/package/@hubspot/cli) [![Latest Beta Version](https://img.shields.io/npm/v/@hubspot/cli/next?label=Latest%20Beta%20Version)](https://www.npmjs.com/package/@hubspot/cli?activeTab=versions)
 
 A CLI for HubSpot developers to enable local development and automation. [Learn more about building on HubSpot](https://developers.hubspot.com).
 
@@ -58,14 +58,15 @@ There are two ways that the tools can authenticate with HubSpot.
 3. Select `OAuth2` and follow the steps
 
 _**Note:** The Account ID used should be the Test Account ID (not the developer app ID). Client ID and Client Secret are from the developer app._
+
 ### Exit Codes
 
 The CLI will exit with one of the following exit codes:
+
 - `0`: A successful run
 - `1`: There was a config problem or an internal error
 - `2`: There are warnings or validation issues
 
-
 ## Changelog
 
 The best way to stay up to date is to check out the [Github Releases](https://github.com/HubSpot/hubspot-cli/releases) and also follow our [developer changelog posts](https://developers.hubspot.com/changelog) for an easier to read breakdown of major changes.

package/commands/customObject/create.js

@@ -16,7 +16,11 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { path, name: providedName, derivedAccountId } = options;
     let definitionPath = path;
+    let name = providedName;
     trackCommandUsage('custom-object-batch-create', null, derivedAccountId);
+    if (!name) {
+        name = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputName`));
+    }
     if (!definitionPath) {
         definitionPath = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputPath`));
     }
@@ -25,7 +29,6 @@ exports.handler = async (options) => {
     if (!objectJson) {
         process.exit(EXIT_CODES.ERROR);
     }
-    const name = providedName || (await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputSchema`)));
     try {
         await batchCreateObjects(derivedAccountId, name, objectJson);
         logger.success(i18n(`${i18nKey}.success.objectsCreated`));

package/lang/en.lyaml

@@ -214,8 +214,8 @@ en:
               describe: "Schema name to add the object instance to"
           success:
             objectsCreated: "Objects created"
-          inputSchema: "What would you like to name the schema?"
-          inputPath: "[--path] Where is the JSON file containing the object definitions?"
+          inputName: "[--name] Enter the name of the schema for the custom object(s) you'd like to create:"
+          inputPath: "[--path] Enter the path to the JSON file containing the object definitions:"
         schema:
           describe: "Commands for managing custom object schemas."
           subcommands:

package/lib/projects/watch.d.ts

@@ -1 +1,4 @@
+import { ProjectConfig } from '../../types/Projects';
+type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void>;
+export declare function createWatcher(accountId: number, projectConfig: ProjectConfig, projectDir: string, handleBuildStatusFn: ProjectWatchHandlerFunction, handleUserInputFn: ProjectWatchHandlerFunction): Promise<void>;
 export {};

package/lib/projects/watch.js

@@ -1,124 +1,130 @@
 "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 chokidar = require('chokidar');
-const path = require('path');
-const chalk = require('chalk');
-const { default: PQueue } = require('p-queue');
-const { logError, ApiErrorContext } = require('../errorHandlers/index');
-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 { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const { PROJECT_ERROR_TYPES } = require('../constants');
+exports.createWatcher = createWatcher;
+const chokidar_1 = __importDefault(require("chokidar"));
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const p_queue_1 = __importDefault(require("p-queue"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const extensions_1 = require("@hubspot/local-dev-lib/constants/extensions");
+const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const errorHandlers_1 = require("../errorHandlers");
+const lang_1 = require("../lang");
+const constants_1 = require("../constants");
 const i18nKey = 'commands.project.subcommands.watch';
-const queue = new PQueue({
+const queue = new p_queue_1.default({
     concurrency: 10,
 });
-const standbyeQueue = [];
-let currentBuildId = null;
-let handleBuildStatus, handleUserInput;
+const standbyQueue = [];
+let currentBuildId;
+let handleBuildStatus;
+let handleUserInput;
 let timer;
-const processStandByQueue = async (accountId, projectName, platformVersion) => {
-    queue.addAll(standbyeQueue.map(({ filePath, remotePath, action }) => {
+async function processStandByQueue(accountId, projectName, platformVersion) {
+    queue.addAll(standbyQueue.map(({ filePath, remotePath, action }) => {
         return async () => {
             queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action);
         };
     }));
-    standbyeQueue.length = 0;
+    standbyQueue.length = 0;
     debounceQueueBuild(accountId, projectName, platformVersion);
-};
-const createNewStagingBuild = async (accountId, projectName, platformVersion) => {
+}
+async function createNewStagingBuild(accountId, projectName, platformVersion) {
     currentBuildId = await createNewBuild(accountId, projectName, platformVersion);
     handleUserInput(accountId, projectName, currentBuildId);
-};
-const debounceQueueBuild = (accountId, projectName, platformVersion) => {
+}
+function debounceQueueBuild(accountId, projectName, platformVersion) {
     if (timer) {
         clearTimeout(timer);
     }
     timer = setTimeout(async () => {
-        logger.debug(i18n(`${i18nKey}.debug.pause`, { projectName }));
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.pause`, { projectName }));
         queue.pause();
         await queue.onIdle();
         try {
-            await queueBuild(accountId, projectName, platformVersion);
-            logger.debug(i18n(`${i18nKey}.debug.buildStarted`, { projectName }));
+            await (0, projects_1.queueBuild)(accountId, projectName, platformVersion);
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.buildStarted`, { projectName }));
         }
         catch (err) {
-            if (isSpecifiedError(err, {
-                subCategory: PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
+            if ((0, index_1.isSpecifiedError)(err, {
+                subCategory: constants_1.PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
             })) {
-                logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.watchCancelledFromUi`));
                 process.exit(0);
             }
             else {
-                logError(err, new ApiErrorContext({ accountId }));
+                (0, errorHandlers_1.logError)(err, new errorHandlers_1.ApiErrorContext({ accountId }));
             }
             return;
         }
         await handleBuildStatus(accountId, projectName, currentBuildId);
         await createNewStagingBuild(accountId, projectName, platformVersion);
-        if (standbyeQueue.length > 0) {
+        if (standbyQueue.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`);
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.resuming`));
+        logger_1.logger.log(`\n> Press ${chalk_1.default.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 }));
+}
+async function queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action) {
+    if (action === 'upload' &&
+        !(0, path_2.isAllowedExtension)(filePath, Array.from(extensions_1.JSR_ALLOWED_EXTENSIONS))) {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.extensionNotAllowed`, { filePath }));
         return;
     }
-    if (shouldIgnoreFile(filePath, true)) {
-        logger.debug(i18n(`${i18nKey}.debug.ignored`, { filePath }));
+    if ((0, ignoreRules_1.shouldIgnoreFile)(filePath, true)) {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.ignored`, { filePath }));
         return;
     }
     if (!queue.isPaused) {
         debounceQueueBuild(accountId, projectName, platformVersion);
     }
-    logger.debug(i18n(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
     return queue.add(async () => {
         try {
             if (action === 'upload') {
-                await uploadFileToBuild(accountId, projectName, filePath, remotePath);
+                await (0, projects_1.uploadFileToBuild)(accountId, projectName, filePath, remotePath);
             }
             else if (action === 'deleteFile' || action === 'deleteFolder') {
-                await deleteFileFromBuild(accountId, projectName, remotePath);
+                await (0, projects_1.deleteFileFromBuild)(accountId, projectName, remotePath);
             }
-            logger.log(i18n(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath }));
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.${action}Succeeded`, { filePath, remotePath }));
         }
         catch (err) {
-            logger.debug(i18n(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath }));
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.errors.${action}Failed`, { filePath, remotePath }));
         }
     });
-};
-const createNewBuild = async (accountId, projectName, platformVersion) => {
+}
+async function createNewBuild(accountId, projectName, platformVersion) {
     try {
-        logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
-        const { data: { buildId }, } = await provisionBuild(accountId, projectName, platformVersion);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.attemptNewBuild`));
+        const { data: { buildId }, } = await (0, projects_1.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`));
+        (0, errorHandlers_1.logError)(err, new errorHandlers_1.ApiErrorContext({ accountId }));
+        if ((0, index_1.isSpecifiedError)(err, { subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED })) {
+            await (0, projects_1.cancelStagedBuild)(accountId, projectName);
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.previousStagingBuildCancelled`));
         }
         process.exit(1);
     }
-};
-const handleWatchEvent = async (accountId, projectName, platformVersion, projectSourceDir, filePath, action = 'upload') => {
-    const remotePath = path.relative(projectSourceDir, filePath);
+}
+async function handleWatchEvent(accountId, projectName, platformVersion, projectSourceDir, filePath, action = 'upload') {
+    const remotePath = path_1.default.relative(projectSourceDir, filePath);
     if (queue.isPaused) {
-        if (standbyeQueue.find(file => file.filePath === filePath)) {
-            logger.debug(i18n(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }));
+        if (standbyQueue.find(file => file.filePath === filePath)) {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.fileAlreadyQueued`, { filePath }));
         }
         else {
-            standbyeQueue.push({
+            standbyQueue.push({
                 filePath,
                 remotePath,
                 action,
@@ -128,19 +134,19 @@ const handleWatchEvent = async (accountId, projectName, platformVersion, project
     else {
         await queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action);
     }
-};
-const createWatcher = async (accountId, projectConfig, projectDir, handleBuildStatusFn, handleUserInputFn) => {
-    const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
+}
+async function createWatcher(accountId, projectConfig, projectDir, handleBuildStatusFn, handleUserInputFn) {
+    const projectSourceDir = path_1.default.join(projectDir, projectConfig.srcDir);
     handleBuildStatus = handleBuildStatusFn;
     handleUserInput = handleUserInputFn;
     await createNewStagingBuild(accountId, projectConfig.name, projectConfig.platformVersion);
-    const watcher = chokidar.watch(projectSourceDir, {
+    const watcher = chokidar_1.default.watch(projectSourceDir, {
         ignoreInitial: true,
-        ignored: file => shouldIgnoreFile(file),
+        ignored: file => (0, ignoreRules_1.shouldIgnoreFile)(file),
     });
     watcher.on('ready', async () => {
-        logger.log(i18n(`${i18nKey}.logs.watching`, { projectDir }));
-        logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
+        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.watching`, { projectDir }));
+        logger_1.logger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
     });
     watcher.on('add', async (path) => {
         handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path);
@@ -154,7 +160,4 @@ const createWatcher = async (accountId, projectConfig, projectDir, handleBuildSt
     watcher.on('unlinkDir', async (path) => {
         handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path, 'deleteFolder');
     });
-};
-module.exports = {
-    createWatcher,
-};
+}

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.0-beta.0",
+    "version": "7.0.0-beta.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.1.0",
-        "@hubspot/serverless-dev-runtime": "7.0.0",
+        "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.8.33",
+        "@hubspot/ui-extensions-dev-server": "0.8.40",
         "archiver": "^7.0.1",
         "chalk": "^4.1.2",
         "chokidar": "^3.0.1",