@hubspot/cli 7.7.19-experimental.3 → 7.7.21-experimental.0

package/lib/oauth.js

@@ -1,33 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.authenticateWithOauth = authenticateWithOauth;
-const express_1 = __importDefault(require("express"));
-const open_1 = __importDefault(require("open"));
-const OAuth2Manager_1 = require("@hubspot/local-dev-lib/models/OAuth2Manager");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const oauth_1 = require("@hubspot/local-dev-lib/oauth");
-const urls_1 = require("@hubspot/local-dev-lib/urls");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const process_1 = require("./process");
-const lang_1 = require("./lang");
-const exitCodes_1 = require("./enums/exitCodes");
+import express from 'express';
+import open from 'open';
+import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
+import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
+import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { DEFAULT_OAUTH_SCOPES } from '@hubspot/local-dev-lib/constants/auth';
+import { handleExit } from './process.js';
+import { i18n } from './lang.js';
+import { EXIT_CODES } from './enums/exitCodes.js';
 const PORT = 3000;
 const redirectUri = `http://localhost:${PORT}/oauth-callback`;
 function buildAuthUrl(oauthManager) {
     const { env: accountEnv, clientId, scopes: accountScopes, } = oauthManager.account;
-    const env = accountEnv || environments_1.ENVIRONMENTS.PROD;
-    const scopes = accountScopes || auth_1.DEFAULT_OAUTH_SCOPES;
+    const env = accountEnv || ENVIRONMENTS.PROD;
+    const scopes = accountScopes || DEFAULT_OAUTH_SCOPES;
     if (!clientId) {
-        logger_1.logger.error((0, lang_1.i18n)(`lib.oauth.missingClientId`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.error(i18n(`lib.oauth.missingClientId`));
+        process.exit(EXIT_CODES.ERROR);
     }
-    return (`${(0, urls_1.getHubSpotWebsiteOrigin)(env)}/oauth/${oauthManager.account.accountId}/authorize` +
+    return (`${getHubSpotWebsiteOrigin(env)}/oauth/${oauthManager.account.accountId}/authorize` +
         `?client_id=${encodeURIComponent(clientId)}` + // app's client ID
         `&scope=${encodeURIComponent(scopes.join(' '))}` + // scopes being requested by the app
         `&redirect_uri=${encodeURIComponent(redirectUri)}` // where to send the user after the consent page
@@ -37,16 +31,16 @@ function handleServerOnProcessEnd(server) {
     const shutdownServerIfRunning = () => {
         server?.close();
     };
-    (0, process_1.handleExit)(shutdownServerIfRunning);
+    handleExit(shutdownServerIfRunning);
 }
 async function authorize(oauthManager) {
     if (process.env.BROWSER !== 'none') {
-        (0, open_1.default)(buildAuthUrl(oauthManager), { url: true });
+        open(buildAuthUrl(oauthManager), { url: true });
     }
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
         let server;
-        const app = (0, express_1.default)();
+        const app = express();
         app.get('/oauth-callback', async (req, res) => {
             if (req.query.code) {
                 const authCodeProof = {
@@ -83,21 +77,21 @@ async function authorize(oauthManager) {
                 reject();
             }
         });
-        server = app.listen(PORT, () => logger_1.logger.log(`Waiting for authorization...`));
+        server = app.listen(PORT, () => logger.log(`Waiting for authorization...`));
         handleServerOnProcessEnd(server);
     });
 }
 function setupOauth(accountConfig) {
-    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
-    const config = (0, config_1.getAccountConfig)(accountId);
-    return new OAuth2Manager_1.OAuth2Manager({
+    const accountId = getAccountIdentifier(accountConfig);
+    const config = getAccountConfig(accountId);
+    return new OAuth2Manager({
         ...accountConfig,
-        env: accountConfig.env || config?.env || environments_1.ENVIRONMENTS.PROD,
+        env: accountConfig.env || config?.env || ENVIRONMENTS.PROD,
     });
 }
-async function authenticateWithOauth(accountConfig) {
+export async function authenticateWithOauth(accountConfig) {
     const oauthManager = setupOauth(accountConfig);
-    logger_1.logger.log('Authorizing');
+    logger.log('Authorizing');
     await authorize(oauthManager);
-    (0, oauth_1.addOauthToAccountConfig)(oauthManager);
+    addOauthToAccountConfig(oauthManager);
 }

package/lib/parsing.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseStringToNumber = parseStringToNumber;
-const en_1 = require("../lang/en");
-function parseStringToNumber(maybeNumber) {
+import { lib } from '../lang/en.js';
+export function parseStringToNumber(maybeNumber) {
     const result = parseInt(maybeNumber, 10);
     if (Number.isNaN(result) || !/^-?\d+$/.test(maybeNumber)) {
-        throw new Error(en_1.lib.parsing.unableToParseStringToNumber);
+        throw new Error(lib.parsing.unableToParseStringToNumber);
     }
     return result;
 }

package/lib/polling.js

@@ -1,25 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_POLLING_STATUS_LOOKUP = exports.DEFAULT_POLLING_STATES = void 0;
-exports.poll = poll;
-const constants_1 = require("./constants");
-const en_1 = require("../lang/en");
-exports.DEFAULT_POLLING_STATES = {
+import { DEFAULT_POLLING_DELAY } from './constants.js';
+import { lib } from '../lang/en.js';
+export const DEFAULT_POLLING_STATES = {
     STARTED: 'STARTED',
     SUCCESS: 'SUCCESS',
     ERROR: 'ERROR',
     REVERTED: 'REVERTED',
     FAILURE: 'FAILURE',
 };
-exports.DEFAULT_POLLING_STATUS_LOOKUP = {
-    successStates: [exports.DEFAULT_POLLING_STATES.SUCCESS],
+export const DEFAULT_POLLING_STATUS_LOOKUP = {
+    successStates: [DEFAULT_POLLING_STATES.SUCCESS],
     errorStates: [
-        exports.DEFAULT_POLLING_STATES.ERROR,
-        exports.DEFAULT_POLLING_STATES.REVERTED,
-        exports.DEFAULT_POLLING_STATES.FAILURE,
+        DEFAULT_POLLING_STATES.ERROR,
+        DEFAULT_POLLING_STATES.REVERTED,
+        DEFAULT_POLLING_STATES.FAILURE,
     ],
 };
-function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP, timeoutMs = 60000 // Default 60 second timeout
+export function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP, timeoutMs = 60000 // Default 60 second timeout
 ) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
@@ -42,11 +38,11 @@ function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP, ti
                 clearTimeout(timeoutId);
                 reject(error);
             }
-        }, constants_1.DEFAULT_POLLING_DELAY);
+        }, DEFAULT_POLLING_DELAY);
         // Set a timeout to stop polling after specified duration
         const timeoutId = setTimeout(() => {
             clearInterval(pollInterval);
-            reject(new Error(en_1.lib.polling.timeoutError(timeoutMs)));
+            reject(new Error(lib.polling.timeoutError(timeoutMs)));
         }, timeoutMs);
     });
 }

package/lib/process.js

@@ -1,15 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TERMINATION_SIGNALS = void 0;
-exports.handleExit = handleExit;
-exports.handleKeypress = handleKeypress;
-const readline_1 = __importDefault(require("readline"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const lang_1 = require("./lang");
-exports.TERMINATION_SIGNALS = [
+import readline from 'readline';
+import { logger, setLogLevel, LOG_LEVEL } from '@hubspot/local-dev-lib/logger';
+import { i18n } from './lang.js';
+export const TERMINATION_SIGNALS = [
     'beforeExit',
     'SIGINT', // Terminal trying to interrupt (Ctrl + C)
     'SIGUSR1', // Start Debugger User-defined signal 1
@@ -18,9 +10,9 @@ exports.TERMINATION_SIGNALS = [
     'SIGTERM', // Represents a graceful termination
     'SIGHUP', // Parent terminal has been closed
 ];
-function handleExit(callback) {
+export function handleExit(callback) {
     let exitInProgress = false;
-    exports.TERMINATION_SIGNALS.forEach(signal => {
+    TERMINATION_SIGNALS.forEach(signal => {
         process.removeAllListeners(signal);
         process.on(signal, async () => {
             // Prevent duplicate exit handling
@@ -29,17 +21,17 @@ function handleExit(callback) {
                 const isSIGHUP = signal === 'SIGHUP';
                 // Prevent logs when terminal closes
                 if (isSIGHUP) {
-                    (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.NONE);
+                    setLogLevel(LOG_LEVEL.NONE);
                 }
-                logger_1.logger.debug((0, lang_1.i18n)(`lib.process.exitDebug`, { signal }));
+                logger.debug(i18n(`lib.process.exitDebug`, { signal }));
                 await callback({ isSIGHUP });
             }
         });
     });
 }
-function handleKeypress(callback) {
-    readline_1.default.createInterface(process.stdin, process.stdout);
-    readline_1.default.emitKeypressEvents(process.stdin);
+export function handleKeypress(callback) {
+    readline.createInterface(process.stdin, process.stdout);
+    readline.emitKeypressEvents(process.stdin);
     if (process.stdin.isTTY) {
         process.stdin.setRawMode(true);
     }

package/lib/projectProfiles.d.ts

@@ -1,5 +1,5 @@
-import { HsProfileFile } from '@hubspot/project-parsing-lib/src/lib/types';
-import { ProjectConfig } from '../types/Projects';
+import { HsProfileFile } from '@hubspot/project-parsing-lib/src/lib/types.js';
+import { ProjectConfig } from '../types/Projects.js';
 export declare function logProfileHeader(profileName: string): void;
 export declare function logProfileFooter(profile: HsProfileFile, includeVariables?: boolean): void;
 export declare function loadProfile(projectConfig: ProjectConfig | null, projectDir: string | null, profileName: string): HsProfileFile | undefined;

package/lib/projectProfiles.js

@@ -1,76 +1,66 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logProfileHeader = logProfileHeader;
-exports.logProfileFooter = logProfileFooter;
-exports.loadProfile = loadProfile;
-exports.exitIfUsingProfiles = exitIfUsingProfiles;
-exports.loadAndValidateProfile = loadAndValidateProfile;
-const path_1 = __importDefault(require("path"));
-const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
-const en_1 = require("../lang/en");
-const ui_1 = require("./ui");
-const logger_1 = require("./ui/logger");
-const exitCodes_1 = require("./enums/exitCodes");
-function logProfileHeader(profileName) {
-    (0, ui_1.uiLine)();
-    (0, ui_1.uiBetaTag)(en_1.lib.projectProfiles.logs.usingProfile((0, project_parsing_lib_1.getHsProfileFilename)(profileName)));
-    logger_1.uiLogger.log('');
+import path from 'path';
+import { loadHsProfileFile, getHsProfileFilename, getAllHsProfiles, } from '@hubspot/project-parsing-lib';
+import { lib } from '../lang/en.js';
+import { uiBetaTag, uiLine } from './ui/index.js';
+import { uiLogger } from './ui/logger.js';
+import { EXIT_CODES } from './enums/exitCodes.js';
+export function logProfileHeader(profileName) {
+    uiLine();
+    uiBetaTag(lib.projectProfiles.logs.usingProfile(getHsProfileFilename(profileName)));
+    uiLogger.log('');
 }
-function logProfileFooter(profile, includeVariables = false) {
-    logger_1.uiLogger.log(en_1.lib.projectProfiles.logs.profileTargetAccount(profile.accountId));
+export function logProfileFooter(profile, includeVariables = false) {
+    uiLogger.log(lib.projectProfiles.logs.profileTargetAccount(profile.accountId));
     if (includeVariables) {
-        logger_1.uiLogger.log('');
-        logger_1.uiLogger.log(en_1.lib.projectProfiles.logs.profileVariables);
+        uiLogger.log('');
+        uiLogger.log(lib.projectProfiles.logs.profileVariables);
         Object.entries(profile.variables ?? {}).forEach(([key, value]) => {
-            logger_1.uiLogger.log(`  ${key}: ${value}`);
+            uiLogger.log(`  ${key}: ${value}`);
         });
     }
-    (0, ui_1.uiLine)();
-    logger_1.uiLogger.log('');
+    uiLine();
+    uiLogger.log('');
 }
-function loadProfile(projectConfig, projectDir, profileName) {
+export function loadProfile(projectConfig, projectDir, profileName) {
     if (!projectConfig || !projectDir) {
-        logger_1.uiLogger.error(en_1.lib.projectProfiles.loadProfile.errors.noProjectConfig);
+        uiLogger.error(lib.projectProfiles.loadProfile.errors.noProjectConfig);
         return;
     }
-    const projectSourceDir = path_1.default.join(projectDir, projectConfig.srcDir);
-    const profileFilename = (0, project_parsing_lib_1.getHsProfileFilename)(profileName);
+    const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
+    const profileFilename = getHsProfileFilename(profileName);
     try {
-        const profile = (0, project_parsing_lib_1.loadHsProfileFile)(projectSourceDir, profileName);
+        const profile = loadHsProfileFile(projectSourceDir, profileName);
         if (!profile) {
-            logger_1.uiLogger.error(en_1.lib.projectProfiles.loadProfile.errors.profileNotFound(profileFilename));
+            uiLogger.error(lib.projectProfiles.loadProfile.errors.profileNotFound(profileFilename));
             return;
         }
         if (!profile.accountId) {
-            logger_1.uiLogger.error(en_1.lib.projectProfiles.loadProfile.errors.missingAccountId(profileFilename));
+            uiLogger.error(lib.projectProfiles.loadProfile.errors.missingAccountId(profileFilename));
             return;
         }
         return profile;
     }
     catch (e) {
-        logger_1.uiLogger.error(en_1.lib.projectProfiles.loadProfile.errors.failedToLoadProfile(profileFilename));
+        uiLogger.error(lib.projectProfiles.loadProfile.errors.failedToLoadProfile(profileFilename));
         return;
     }
 }
-async function exitIfUsingProfiles(projectConfig, projectDir) {
+export async function exitIfUsingProfiles(projectConfig, projectDir) {
     if (projectConfig && projectDir) {
-        const existingProfiles = await (0, project_parsing_lib_1.getAllHsProfiles)(path_1.default.join(projectDir, projectConfig.srcDir));
+        const existingProfiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
         if (existingProfiles.length > 0) {
-            logger_1.uiLogger.error(en_1.lib.projectProfiles.exitIfUsingProfiles.errors.noProfileSpecified);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            uiLogger.error(lib.projectProfiles.exitIfUsingProfiles.errors.noProfileSpecified);
+            process.exit(EXIT_CODES.ERROR);
         }
     }
 }
-async function loadAndValidateProfile(projectConfig, projectDir, argsProfile) {
+export async function loadAndValidateProfile(projectConfig, projectDir, argsProfile) {
     if (argsProfile) {
         logProfileHeader(argsProfile);
         const profile = loadProfile(projectConfig, projectDir, argsProfile);
         if (!profile) {
-            (0, ui_1.uiLine)();
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            uiLine();
+            process.exit(EXIT_CODES.ERROR);
         }
         logProfileFooter(profile, true);
         return profile.accountId;

package/lib/projects/ProjectLogsManager.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectLogsManager = void 0;
-const config_1 = require("./config");
-const ensureProjectExists_1 = require("./ensureProjectExists");
-const projects_1 = require("@hubspot/local-dev-lib/api/projects");
-const logger_1 = require("../ui/logger");
-const en_1 = require("../../lang/en");
+import { getProjectConfig } from './config.js';
+import { ensureProjectExists } from './ensureProjectExists.js';
+import { fetchProjectComponentsMetadata } from '@hubspot/local-dev-lib/api/projects';
+import { uiLogger } from '../ui/logger.js';
+import { commands } from '../../lang/en.js';
 class _ProjectLogsManager {
     projectName;
     projectId;
@@ -31,34 +28,34 @@ class _ProjectLogsManager {
         this.functions = [];
     }
     async init(accountId) {
-        const { projectConfig } = await (0, config_1.getProjectConfig)();
+        const { projectConfig } = await getProjectConfig();
         if (!projectConfig || !projectConfig.name) {
-            throw new Error(en_1.commands.project.logs.errors.noProjectConfig);
+            throw new Error(commands.project.logs.errors.noProjectConfig);
         }
         const { name: projectName } = projectConfig;
         this.projectName = projectName;
         this.accountId = accountId;
         this.functions = [];
-        const { project } = await (0, ensureProjectExists_1.ensureProjectExists)(this.accountId, this.projectName, {
+        const { project } = await ensureProjectExists(this.accountId, this.projectName, {
             allowCreate: false,
         });
         if (!project ||
             !project.deployedBuild ||
             !project.deployedBuild.subbuildStatuses) {
-            throw new Error(en_1.commands.project.logs.errors.failedToFetchProjectDetails);
+            throw new Error(commands.project.logs.errors.failedToFetchProjectDetails);
         }
         this.projectId = project.id;
         await this.fetchFunctionDetails();
     }
     async fetchFunctionDetails() {
         if (!this.projectId) {
-            throw new Error(en_1.commands.project.logs.errors.noProjectConfig);
+            throw new Error(commands.project.logs.errors.noProjectConfig);
         }
         if (!this.accountId) {
-            logger_1.uiLogger.debug(en_1.commands.project.logs.errors.projectLogsManagerNotInitialized);
-            throw new Error(en_1.commands.project.logs.errors.generic);
+            uiLogger.debug(commands.project.logs.errors.projectLogsManagerNotInitialized);
+            throw new Error(commands.project.logs.errors.generic);
         }
-        const { data: { topLevelComponentMetadata }, } = await (0, projects_1.fetchProjectComponentsMetadata)(this.accountId, this.projectId);
+        const { data: { topLevelComponentMetadata }, } = await fetchProjectComponentsMetadata(this.accountId, this.projectId);
         const apps = topLevelComponentMetadata.filter(componentMetadata => {
             const { type } = componentMetadata;
             return type && type.name === 'PRIVATE_APP';
@@ -69,7 +66,7 @@ class _ProjectLogsManager {
             ...app.featureComponents.filter(component => component.type.name === 'APP_FUNCTION'));
         });
         if (this.functions.length === 0) {
-            throw new Error(en_1.commands.project.logs.errors.noFunctionsInProject);
+            throw new Error(commands.project.logs.errors.noFunctionsInProject);
         }
     }
     getFunctionNames() {
@@ -77,15 +74,15 @@ class _ProjectLogsManager {
     }
     setFunction(functionName) {
         if (!functionName || this.functions.length === 0) {
-            throw new Error(en_1.commands.project.logs.errors.noFunctionsInProject);
+            throw new Error(commands.project.logs.errors.noFunctionsInProject);
         }
         this.selectedFunction = this.functions.find(serverlessFunction => serverlessFunction.componentName === functionName);
         if (!this.selectedFunction) {
-            throw new Error(en_1.commands.project.logs.errors.noFunctionWithName(functionName));
+            throw new Error(commands.project.logs.errors.noFunctionWithName(functionName));
         }
         this.functionName = functionName;
         if (!this.selectedFunction.deployOutput) {
-            throw new Error(en_1.commands.project.logs.errors.functionNotDeployed(functionName));
+            throw new Error(commands.project.logs.errors.functionNotDeployed(functionName));
         }
         this.appId = this.selectedFunction.deployOutput.appId;
         if (this.selectedFunction.deployOutput.endpoint) {
@@ -97,4 +94,4 @@ class _ProjectLogsManager {
         }
     }
 }
-exports.ProjectLogsManager = new _ProjectLogsManager();
+export const ProjectLogsManager = new _ProjectLogsManager();

package/lib/projects/__tests__/AppDevModeInterface.test.d.ts

@@ -0,0 +1 @@
+export {};