@hubspot/cli 7.7.21-experimental.1 → 7.7.23-experimental.0

package/lib/serverlessLogs.js

@@ -1,23 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tailLogs = tailLogs;
-exports.outputBuildLog = outputBuildLog;
-const https_1 = __importDefault(require("https"));
-const chalk_1 = __importDefault(require("chalk"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const index_1 = require("@hubspot/local-dev-lib/errors/index");
-const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
-const serverlessFunctionLogs_1 = require("./ui/serverlessFunctionLogs");
-const index_2 = require("./errorHandlers/index");
-const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
-const process_1 = require("./process");
-const exitCodes_1 = require("./enums/exitCodes");
-const lang_1 = require("./lang");
+import https from 'https';
+import chalk from 'chalk';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { isHubSpotHttpError, isMissingScopeError, } from '@hubspot/local-dev-lib/errors/index';
+import { SCOPE_GROUPS, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
+import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { fetchScopeData } from '@hubspot/local-dev-lib/api/localDevAuth';
+import { outputLogs } from './ui/serverlessFunctionLogs.js';
+import { logError, ApiErrorContext } from './errorHandlers/index.js';
+import SpinniesManager from './ui/SpinniesManager.js';
+import { handleExit, handleKeypress } from './process.js';
+import { EXIT_CODES } from './enums/exitCodes.js';
+import { i18n } from './lang.js';
 const TAIL_DELAY = 5000;
 function base64EncodeString(valueToEncode) {
     if (typeof valueToEncode !== 'string') {
@@ -28,51 +21,51 @@ function base64EncodeString(valueToEncode) {
 }
 function handleUserInput() {
     const onTerminate = async () => {
-        SpinniesManager_1.default.remove('tailLogs');
-        SpinniesManager_1.default.remove('stopMessage');
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        SpinniesManager.remove('tailLogs');
+        SpinniesManager.remove('stopMessage');
+        process.exit(EXIT_CODES.SUCCESS);
     };
-    (0, process_1.handleExit)(onTerminate);
-    (0, process_1.handleKeypress)(key => {
+    handleExit(onTerminate);
+    handleKeypress(key => {
         if ((key.ctrl && key.name == 'c') || key.name === 'q') {
             onTerminate();
         }
     });
 }
 async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-    const accountConfig = (0, config_1.getAccountConfig)(accountId);
+    const accountConfig = getAccountConfig(accountId);
     if (!accountConfig) {
         return;
     }
     const { authType } = accountConfig;
-    if (authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return;
     }
     let scopesData;
     try {
-        const resp = await (0, localDevAuth_1.fetchScopeData)(accountId, scopeGroup);
+        const resp = await fetchScopeData(accountId, scopeGroup);
         scopesData = resp.data;
     }
     catch (e) {
-        logger_1.logger.debug((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
+        logger.debug(i18n(`lib.serverless.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
             scopeGroup,
         }));
-        logger_1.logger.debug(e);
+        logger.debug(e);
         return;
     }
     const { portalScopesInGroup, userScopesInGroup } = scopesData;
     if (!portalScopesInGroup.length) {
-        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.portalMissingScope`));
+        logger.error(i18n(`lib.serverless.verifyAccessKeyAndUserAccess.portalMissingScope`));
         return;
     }
     if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.userMissingScope`));
+        logger.error(i18n(`lib.serverless.verifyAccessKeyAndUserAccess.userMissingScope`));
     }
     else {
-        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.genericMissingScope`));
+        logger.error(i18n(`lib.serverless.verifyAccessKeyAndUserAccess.genericMissingScope`));
     }
 }
-async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false) {
+export async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false) {
     let initialAfter = '';
     try {
         const { data: latestLog } = await fetchLatest();
@@ -80,12 +73,12 @@ async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false)
     }
     catch (e) {
         // A 404 means no latest log exists(never executed)
-        if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
-            if ((0, index_1.isMissingScopeError)(e)) {
-                await verifyAccessKeyAndUserAccess(accountId, auth_1.SCOPE_GROUPS.CMS_FUNCTIONS);
+        if (isHubSpotHttpError(e) && e.status !== 404) {
+            if (isMissingScopeError(e)) {
+                await verifyAccessKeyAndUserAccess(accountId, SCOPE_GROUPS.CMS_FUNCTIONS);
             }
             else {
-                await (0, index_2.logError)(e, new index_2.ApiErrorContext({ accountId }));
+                await logError(e, new ApiErrorContext({ accountId }));
             }
         }
     }
@@ -98,15 +91,15 @@ async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false)
             nextAfter = latestLog.paging.next.after;
         }
         catch (e) {
-            if ((0, index_1.isHubSpotHttpError)(e) && e.status !== 404) {
-                (0, index_2.logError)(e, new index_2.ApiErrorContext({
+            if (isHubSpotHttpError(e) && e.status !== 404) {
+                logError(e, new ApiErrorContext({
                     accountId,
                 }));
             }
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            process.exit(EXIT_CODES.SUCCESS);
         }
         if (latestLog && latestLog.results.length) {
-            (0, serverlessFunctionLogs_1.outputLogs)(latestLog, {
+            outputLogs(latestLog, {
                 compact,
             });
         }
@@ -114,25 +107,25 @@ async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false)
             await tail(nextAfter);
         }, TAIL_DELAY);
     }
-    SpinniesManager_1.default.init();
-    SpinniesManager_1.default.add('tailLogs', {
+    SpinniesManager.init();
+    SpinniesManager.add('tailLogs', {
         text: `Following logs for ${name}`,
     });
-    SpinniesManager_1.default.add('stopMessage', {
-        text: `> Press ${chalk_1.default.bold('q')} to stop following`,
+    SpinniesManager.add('stopMessage', {
+        text: `> Press ${chalk.bold('q')} to stop following`,
         status: 'non-spinnable',
     });
     handleUserInput();
     await tail(initialAfter);
 }
-async function outputBuildLog(buildLogUrl) {
+export async function outputBuildLog(buildLogUrl) {
     if (!buildLogUrl) {
-        logger_1.logger.debug('Unable to display build output. No build log URL was provided.');
+        logger.debug('Unable to display build output. No build log URL was provided.');
         return '';
     }
     return new Promise(resolve => {
         try {
-            https_1.default
+            https
                 .get(buildLogUrl, response => {
                 if (response.statusCode === 404) {
                     resolve('');
@@ -142,16 +135,16 @@ async function outputBuildLog(buildLogUrl) {
                     data += chunk;
                 });
                 response.on('end', () => {
-                    logger_1.logger.log(data);
+                    logger.log(data);
                     resolve(data);
                 });
             })
                 .on('error', () => {
-                logger_1.logger.error('The build log could not be retrieved.');
+                logger.error('The build log could not be retrieved.');
             });
         }
         catch (e) {
-            logger_1.logger.error('The build log could not be retrieved.');
+            logger.error('The build log could not be retrieved.');
             resolve('');
         }
     });

package/lib/testUtils.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
-exports.mockHubSpotHttpError = mockHubSpotHttpError;
-const HubSpotHttpError_1 = require("@hubspot/local-dev-lib/models/HubSpotHttpError");
+import { HubSpotHttpError } from '@hubspot/local-dev-lib/models/HubSpotHttpError';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function mockHubSpotHttpResponse(data) {
+export function mockHubSpotHttpResponse(data) {
     return Promise.resolve({
         data,
         status: 200,
@@ -15,8 +11,8 @@ function mockHubSpotHttpResponse(data) {
         },
     });
 }
-function mockHubSpotHttpError(message, response) {
-    return new HubSpotHttpError_1.HubSpotHttpError(message, {
+export function mockHubSpotHttpError(message, response) {
+    return new HubSpotHttpError(message, {
         cause: { isAxiosError: true, response },
     });
 }

package/lib/ui/SpinniesManager.d.ts

@@ -1,4 +1,4 @@
-import { SpinnerOptions as BaseSpinnerOptions, VALID_STATUSES } from './spinniesUtils';
+import { SpinnerOptions as BaseSpinnerOptions, VALID_STATUSES } from './spinniesUtils.js';
 interface SpinnerState extends BaseSpinnerOptions {
     name?: string;
 }

package/lib/ui/SpinniesManager.js

@@ -1,4 +1,3 @@
-"use strict";
 /*
 https://github.com/jbcarpanelli/spinnies
 
@@ -8,16 +7,12 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 **/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const readline_1 = __importDefault(require("readline"));
-const chalk_1 = __importDefault(require("chalk"));
-const cli_cursor_1 = __importDefault(require("cli-cursor"));
-const spinniesUtils_1 = require("./spinniesUtils");
+import readline from 'readline';
+import chalk from 'chalk';
+import cliCursor from 'cli-cursor';
+import { breakText, cleanStream, colorOptions, getLinesLength, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, prefixOptions, } from './spinniesUtils.js';
 function safeColor(text, color) {
-    const chalkFn = chalk_1.default[color];
+    const chalkFn = chalk[color];
     if (typeof chalkFn === 'function') {
         return chalkFn(text);
     }
@@ -40,9 +35,9 @@ class SpinniesManager {
             spinnerColor: 'greenBright',
             succeedColor: 'green',
             failColor: 'red',
-            spinner: (0, spinniesUtils_1.terminalSupportsUnicode)() ? spinniesUtils_1.SPINNERS.dots : spinniesUtils_1.SPINNERS.dashes,
+            spinner: terminalSupportsUnicode() ? SPINNERS.dots : SPINNERS.dashes,
             disableSpins: false,
-            ...(0, spinniesUtils_1.purgeSpinnersOptions)(options),
+            ...purgeSpinnersOptions(options),
         };
         this.spin =
             !this.options.disableSpins &&
@@ -76,11 +71,11 @@ class SpinniesManager {
             options.text = resolvedName;
         }
         const spinnerProperties = {
-            ...(0, spinniesUtils_1.colorOptions)(this.options),
+            ...colorOptions(this.options),
             succeedPrefix: this.options.succeedPrefix,
             failPrefix: this.options.failPrefix,
             status: 'spinning',
-            ...(0, spinniesUtils_1.purgeSpinnerOptions)(options),
+            ...purgeSpinnerOptions(options),
         };
         this.spinners[resolvedName] = spinnerProperties;
         this.updateSpinnerState();
@@ -142,7 +137,7 @@ class SpinniesManager {
         if (!this.spinners[name]) {
             throw Error(`No spinner initialized with name ${name}`);
         }
-        options = (0, spinniesUtils_1.purgeSpinnerOptions)(options);
+        options = purgeSpinnerOptions(options);
         status = status || 'spinning';
         this.spinners[name] = { ...this.spinners[name], ...options, status };
     }
@@ -153,7 +148,7 @@ class SpinniesManager {
             }
             this.currentInterval = this.loopStream();
             if (!this.isCursorHidden) {
-                cli_cursor_1.default.hide();
+                cliCursor.hide();
             }
             this.isCursorHidden = true;
             this.checkIfActiveSpinners();
@@ -163,8 +158,8 @@ class SpinniesManager {
         }
     }
     loopStream() {
-        const frames = this.options.spinner?.frames || spinniesUtils_1.SPINNERS.dots.frames;
-        const interval = this.options.spinner?.interval || spinniesUtils_1.SPINNERS.dots.interval;
+        const frames = this.options.spinner?.frames || SPINNERS.dots.frames;
+        const interval = this.options.spinner?.interval || SPINNERS.dots.interval;
         return setInterval(() => {
             this.setStreamOutput(frames[this.currentFrameIndex]);
             this.currentFrameIndex =
@@ -179,13 +174,13 @@ class SpinniesManager {
         const hasActiveSpinners = this.hasActiveSpinners();
         Object.values(this.spinners).forEach(spinner => {
             let { text } = spinner;
-            const { status, color, spinnerColor, succeedColor, failColor, indent = 0, succeedPrefix = (0, spinniesUtils_1.prefixOptions)(this.options).succeedPrefix, failPrefix = (0, spinniesUtils_1.prefixOptions)(this.options).failPrefix, } = spinner;
+            const { status, color, spinnerColor, succeedColor, failColor, indent = 0, succeedPrefix = prefixOptions(this.options).succeedPrefix, failPrefix = prefixOptions(this.options).failPrefix, } = spinner;
             let line;
             let prefixLength = indent;
             text = text ?? '';
             if (status === 'spinning') {
                 prefixLength += frame.length + 1;
-                text = (0, spinniesUtils_1.breakText)(text, prefixLength);
+                text = breakText(text, prefixLength);
                 const colorizedFrame = safeColor(frame, spinnerColor);
                 const colorizedText = safeColor(text, color);
                 line = `${colorizedFrame} ${colorizedText}`;
@@ -194,35 +189,35 @@ class SpinniesManager {
                 if (status === 'succeed') {
                     prefixLength += succeedPrefix.length + 1;
                     if (hasActiveSpinners) {
-                        text = (0, spinniesUtils_1.breakText)(text, prefixLength);
+                        text = breakText(text, prefixLength);
                     }
                     const colorizedText = safeColor(text, succeedColor);
-                    line = `${chalk_1.default.green(succeedPrefix)} ${colorizedText}`;
+                    line = `${chalk.green(succeedPrefix)} ${colorizedText}`;
                 }
                 else if (status === 'fail') {
                     prefixLength += failPrefix.length + 1;
                     if (hasActiveSpinners) {
-                        text = (0, spinniesUtils_1.breakText)(text, prefixLength);
+                        text = breakText(text, prefixLength);
                     }
                     const colorizedText = safeColor(text, failColor);
-                    line = `${chalk_1.default.red(failPrefix)} ${colorizedText}`;
+                    line = `${chalk.red(failPrefix)} ${colorizedText}`;
                 }
                 else {
                     if (hasActiveSpinners) {
-                        text = (0, spinniesUtils_1.breakText)(text, prefixLength);
+                        text = breakText(text, prefixLength);
                     }
                     line = safeColor(text, color);
                 }
             }
-            linesLength.push(...(0, spinniesUtils_1.getLinesLength)(text, prefixLength));
+            linesLength.push(...getLinesLength(text, prefixLength));
             output += indent ? `${' '.repeat(indent)}${line}\n` : `${line}\n`;
         });
         if (!hasActiveSpinners) {
-            readline_1.default.clearScreenDown(this.stream);
+            readline.clearScreenDown(this.stream);
         }
-        (0, spinniesUtils_1.writeStream)(this.stream, output, linesLength);
+        writeStream(this.stream, output, linesLength);
         if (hasActiveSpinners) {
-            (0, spinniesUtils_1.cleanStream)(this.stream, linesLength);
+            cleanStream(this.stream, linesLength);
         }
         this.lineCount = linesLength.length;
     }
@@ -235,12 +230,12 @@ class SpinniesManager {
         if (!this.hasActiveSpinners()) {
             if (this.spin) {
                 this.setStreamOutput();
-                readline_1.default.moveCursor(this.stream, 0, this.lineCount);
+                readline.moveCursor(this.stream, 0, this.lineCount);
                 if (this.currentInterval) {
                     clearInterval(this.currentInterval);
                 }
                 this.isCursorHidden = false;
-                cli_cursor_1.default.show();
+                cliCursor.show();
             }
             this.spinners = {};
         }
@@ -248,11 +243,11 @@ class SpinniesManager {
     bindSigint() {
         process.removeAllListeners('SIGINT');
         process.on('SIGINT', () => {
-            cli_cursor_1.default.show();
-            readline_1.default.moveCursor(process.stderr, 0, this.lineCount);
+            cliCursor.show();
+            readline.moveCursor(process.stderr, 0, this.lineCount);
             process.exit(0);
         });
     }
 }
 const toExport = new SpinniesManager();
-exports.default = toExport;
+export default toExport;

package/lib/ui/boxen.js

@@ -1,30 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logInBox = logInBox;
-const logger_1 = require("./logger");
-const index_1 = require("./index");
-const logger_2 = require("@hubspot/local-dev-lib/logger");
-const en_1 = require("../../lang/en");
+import { uiLogger } from './logger.js';
+import { UI_COLORS } from './index.js';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { lib } from '../../lang/en.js';
 const defaultOptions = {
     titleAlignment: 'left',
-    borderColor: index_1.UI_COLORS.MARIGOLD,
+    borderColor: UI_COLORS.MARIGOLD,
     margin: 1,
     padding: 1,
     textAlignment: 'left',
     borderStyle: 'round',
 };
-async function logInBox({ contents, options, }) {
+export async function logInBox({ contents, options, }) {
     try {
         const boxen = (await import('boxen')).default;
-        logger_1.uiLogger.log(boxen(contents, { ...defaultOptions, ...options }));
+        uiLogger.log(boxen(contents, { ...defaultOptions, ...options }));
         return;
     }
     catch (error) {
-        logger_2.logger.debug(en_1.lib.boxen.failedToLoad);
+        logger.debug(lib.boxen.failedToLoad);
         if (options?.title) {
-            logger_1.uiLogger.log(options.title);
-            logger_1.uiLogger.log('');
+            uiLogger.log(options.title);
+            uiLogger.log('');
         }
-        logger_1.uiLogger.log(contents);
+        uiLogger.log(contents);
     }
 }

package/lib/ui/git.js

@@ -1,28 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndWarnGitInclusion = checkAndWarnGitInclusion;
-const os_1 = __importDefault(require("os"));
-const gitignore_1 = require("@hubspot/local-dev-lib/gitignore");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const lang_1 = require("../lang");
-function checkAndWarnGitInclusion(configPath) {
+import os from 'os';
+import { checkGitInclusion } from '@hubspot/local-dev-lib/gitignore';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { i18n } from '../lang.js';
+export function checkAndWarnGitInclusion(configPath) {
     try {
-        const { inGit, configIgnored } = (0, gitignore_1.checkGitInclusion)(configPath);
+        const { inGit, configIgnored } = checkGitInclusion(configPath);
         if (!inGit || configIgnored)
             return;
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.securityIssue`));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.configFileTracked`));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.fileName`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.remediate`));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.moveConfig`, { homeDir: os_1.default.homedir() }));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.addGitignore`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.noRemote`));
+        logger.warn(i18n(`lib.ui.git.securityIssue`));
+        logger.warn(i18n(`lib.ui.git.configFileTracked`));
+        logger.warn(i18n(`lib.ui.git.fileName`, { configPath }));
+        logger.warn(i18n(`lib.ui.git.remediate`));
+        logger.warn(i18n(`lib.ui.git.moveConfig`, { homeDir: os.homedir() }));
+        logger.warn(i18n(`lib.ui.git.addGitignore`, { configPath }));
+        logger.warn(i18n(`lib.ui.git.noRemote`));
     }
     catch (e) {
         // fail silently
-        logger_1.logger.debug((0, lang_1.i18n)(`lib.ui.git.checkFailed`));
+        logger.debug(i18n(`lib.ui.git.checkFailed`));
     }
 }