@hubspot/cli 7.5.11-experimental.0 → 7.7.0-experimental.0

package/lib/projects/localDev/LocalDevWatcher.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const chokidar_1 = __importDefault(require("chokidar"));
+const constants_1 = require("../../constants");
+const WATCH_EVENTS = {
+    add: 'add',
+    change: 'change',
+    unlink: 'unlink',
+    unlinkDir: 'unlinkDir',
+};
+class LocalDevWatcher {
+    localDevProcess;
+    watcher;
+    constructor(localDevProcess) {
+        this.localDevProcess = localDevProcess;
+        this.watcher = null;
+    }
+    async handleWatchEvent(filePath, event, configPaths) {
+        await this.localDevProcess.updateProjectNodes();
+        if (configPaths.includes(filePath)) {
+            this.localDevProcess.logger.uploadWarning();
+        }
+        else {
+            this.localDevProcess.handleFileChange(filePath, event);
+        }
+    }
+    start() {
+        this.watcher = chokidar_1.default.watch(this.localDevProcess.projectDir, {
+            ignoreInitial: true,
+            ignored: ['**/dist'],
+        });
+        const configPaths = Object.values(this.localDevProcess.projectNodes).map(component => component.localDev.componentConfigPath);
+        const projectConfigPath = path_1.default.join(this.localDevProcess.projectDir, constants_1.PROJECT_CONFIG_FILE);
+        configPaths.push(projectConfigPath);
+        this.watcher.on('add', filePath => {
+            this.handleWatchEvent(filePath, WATCH_EVENTS.add, configPaths);
+        });
+        this.watcher.on('change', filePath => {
+            this.handleWatchEvent(filePath, WATCH_EVENTS.change, configPaths);
+        });
+        this.watcher.on('unlink', filePath => {
+            this.handleWatchEvent(filePath, WATCH_EVENTS.unlink, configPaths);
+        });
+        this.watcher.on('unlinkDir', filePath => {
+            this.handleWatchEvent(filePath, WATCH_EVENTS.unlinkDir, configPaths);
+        });
+    }
+    async stop() {
+        await this.watcher?.close();
+    }
+}
+exports.default = LocalDevWatcher;

package/lib/projects/localDev/LocalDevWebsocketServer.d.ts

@@ -0,0 +1,17 @@
+import LocalDevProcess from './LocalDevProcess';
+declare class LocalDevWebsocketServer {
+    private server?;
+    private _websocket?;
+    private debug?;
+    private localDevProcess;
+    constructor(localDevProcess: LocalDevProcess, debug?: boolean);
+    private websocket;
+    private log;
+    private logError;
+    private sendMessage;
+    private setupMessageHandlers;
+    private setupStateListeners;
+    start(): Promise<void>;
+    shutdown(): void;
+}
+export default LocalDevWebsocketServer;

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ws_1 = require("ws");
+const portManager_1 = require("@hubspot/local-dev-lib/portManager");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const constants_1 = require("../../constants");
+const en_1 = require("../../../lang/en");
+const SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
+const LOG_PREFIX = '[LocalDevWebsocketServer]';
+class LocalDevWebsocketServer {
+    server;
+    _websocket;
+    debug;
+    localDevProcess;
+    constructor(localDevProcess, debug) {
+        this.localDevProcess = localDevProcess;
+        this.debug = debug;
+    }
+    websocket() {
+        if (!this._websocket) {
+            throw new Error(en_1.lib.LocalDevWebsocketServer.errors.notInitialized(LOG_PREFIX));
+        }
+        return this._websocket;
+    }
+    log(message) {
+        if (this.debug) {
+            logger_1.logger.log(LOG_PREFIX, message);
+        }
+    }
+    logError(message) {
+        if (this.debug) {
+            logger_1.logger.error(LOG_PREFIX, message);
+        }
+    }
+    sendMessage(message) {
+        this.websocket().send(JSON.stringify(message));
+    }
+    setupMessageHandlers() {
+        this.websocket().on('message', data => {
+            try {
+                const message = JSON.parse(data.toString());
+                if (!message.type) {
+                    this.logError(en_1.lib.LocalDevWebsocketServer.errors.missingTypeField(data.toString()));
+                    return;
+                }
+                switch (message.type) {
+                    case constants_1.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES.UPLOAD:
+                        this.localDevProcess.uploadProject();
+                        break;
+                    case constants_1.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES.INSTALL_DEPS:
+                        break;
+                    case constants_1.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES.APP_INSTALLED:
+                        break;
+                    default:
+                        this.logError(en_1.lib.LocalDevWebsocketServer.errors.unknownMessageType(message.type));
+                }
+            }
+            catch (e) {
+                this.logError(en_1.lib.LocalDevWebsocketServer.errors.invalidJSON(data.toString()));
+            }
+        });
+    }
+    setupStateListeners() {
+        this.localDevProcess.addStateListener('projectNodes', nodes => {
+            this.sendMessage({
+                type: constants_1.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES.UPDATE_PROJECT_NODES,
+                data: nodes,
+            });
+        });
+    }
+    async start() {
+        const portManagerIsRunning = await (0, portManager_1.isPortManagerServerRunning)();
+        if (!portManagerIsRunning) {
+            throw new Error(en_1.lib.LocalDevWebsocketServer.errors.portManagerNotRunning(LOG_PREFIX));
+        }
+        const portData = await (0, portManager_1.requestPorts)([{ instanceId: SERVER_INSTANCE_ID }]);
+        const port = portData[SERVER_INSTANCE_ID];
+        this.server = new ws_1.WebSocketServer({ port });
+        this.log(en_1.lib.LocalDevWebsocketServer.logs.startup(port));
+        this.server.on('connection', ws => {
+            this._websocket = ws;
+            this.setupMessageHandlers();
+            this.setupStateListeners();
+        });
+    }
+    shutdown() {
+        this.server?.close();
+        this.server = undefined;
+        this._websocket = undefined;
+    }
+}
+exports.default = LocalDevWebsocketServer;

package/lib/projects/localDev/helpers.d.ts

@@ -4,7 +4,7 @@ import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTest
 import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { ProjectConfig } from '../../../types/Projects';
-import { ProjectDevTargetAccountPromptResponse } from '../../../types/Prompts';
+import { ProjectDevTargetAccountPromptResponse } from '../../prompts/projectDevTargetAccountPrompt';
 export declare function confirmDefaultAccountIsTarget(accountConfig: CLIAccount): Promise<void>;
 export declare function checkIfDefaultAccountIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): Promise<void>;
 export declare function checkIfParentAccountIsAuthed(accountConfig: CLIAccount): void;
@@ -14,6 +14,7 @@ export declare function createSandboxForLocalDev(accountId: number, accountConfi
 export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
 export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<void>;
 export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean): Promise<Project>;
-export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, sendIR?: boolean): Promise<Build>;
+export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, sendIR?: boolean, profile?: string): Promise<Build>;
 export declare function getAccountHomeUrl(accountId: number): string;
 export declare function hasSandboxes(account: CLIAccount): Promise<boolean>;
+export declare function selectAccountTypePrompt(accountConfig: CLIAccount): Promise<string | null>;

package/lib/projects/localDev/helpers.js

@@ -15,6 +15,7 @@ exports.createNewProjectForLocalDev = createNewProjectForLocalDev;
 exports.createInitialBuildForNewProject = createInitialBuildForNewProject;
 exports.getAccountHomeUrl = getAccountHomeUrl;
 exports.hasSandboxes = hasSandboxes;
+exports.selectAccountTypePrompt = selectAccountTypePrompt;
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
@@ -212,7 +213,7 @@ async function createNewProjectForLocalDev(projectConfig, targetAccountId, shoul
                 .publicAppProjectMustExistExplanation
             : en_1.lib.localDevHelpers.createNewProjectForLocalDev
                 .projectMustExistExplanation;
-        const explanationString = explanationLangFunction((0, ui_1.uiAccountDescription)(targetAccountId), projectConfig.name);
+        const explanationString = explanationLangFunction(projectConfig.name, targetAccountId);
         logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
         logger_1.uiLogger.log(explanationString);
@@ -253,7 +254,7 @@ function projectUploadCallback(accountId, projectConfig, tempFile, buildId) {
 }
 // Create an initial build if the project was newly created in the account
 // Return the newly deployed build
-async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIR) {
+async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIR, profile) {
     const { result: initialUploadResult, uploadError } = await (0, upload_1.handleProjectUpload)({
         accountId: targetAccountId,
         projectConfig,
@@ -264,6 +265,7 @@ async function createInitialBuildForNewProject(projectConfig, projectDir, target
         forceCreate: true,
         skipValidation: true,
         sendIR,
+        profile,
     });
     if (uploadError) {
         if ((0, index_1.isSpecifiedError)(uploadError, {
@@ -319,3 +321,31 @@ async function hasSandboxes(account) {
         return false;
     }
 }
+// Top level prompt to choose the type of account to test on
+async function selectAccountTypePrompt(accountConfig) {
+    const hasAccessToSandboxes = await hasSandboxes(accountConfig);
+    const result = await (0, promptUtils_1.listPrompt)(en_1.lib.localDevHelpers.selectAccountTypePrompt.message, {
+        choices: [
+            {
+                name: en_1.lib.localDevHelpers.selectAccountTypePrompt
+                    .developerTestAccountOption,
+                value: config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
+            },
+            {
+                name: en_1.lib.localDevHelpers.selectAccountTypePrompt
+                    .sandboxAccountOption,
+                value: config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+                disabled: !hasAccessToSandboxes
+                    ? en_1.lib.localDevHelpers.selectAccountTypePrompt
+                        .sandboxAccountOptionDisabled
+                    : false,
+            },
+            {
+                name: en_1.lib.localDevHelpers.selectAccountTypePrompt
+                    .productionAccountOption,
+                value: null,
+            },
+        ],
+    });
+    return result;
+}

package/lib/projects/upload.d.ts

@@ -15,6 +15,7 @@ type HandleProjectUploadArg<T> = {
     isUploadCommand?: boolean;
     sendIR?: boolean;
     skipValidation?: boolean;
+    profile?: string;
 };
-export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -46,7 +46,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
+async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -66,7 +66,7 @@ async function handleProjectUpload({ accountId, projectConfig, projectDir, callb
                     projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
                     platformVersion: projectConfig.platformVersion,
                     accountId,
-                }, { skipValidation });
+                }, { skipValidation, profile });
                 logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
             }
             catch (e) {

package/lib/prompts/createApiSamplePrompt.d.ts

@@ -1,12 +1,4 @@
-type SampleChoice = {
-    name: string;
-    description: string;
-    id: string;
-    languages: string[];
-};
-type SampleConfig = {
-    samples: SampleChoice[];
-};
+import { ApiSampleConfig } from '../../types/Cms';
 type SampleTypePromptResponse = {
     sampleType?: string;
 };
@@ -14,5 +6,5 @@ type LanguagePromptResponse = {
     sampleLanguage?: string;
 };
 type CreateApiSamplePromptResponse = SampleTypePromptResponse & LanguagePromptResponse;
-export declare function createApiSamplePrompt(samplesConfig: SampleConfig): Promise<CreateApiSamplePromptResponse>;
+export declare function createApiSamplePrompt(samplesConfig: ApiSampleConfig): Promise<CreateApiSamplePromptResponse>;
 export {};

package/lib/prompts/createTemplatePrompt.d.ts

@@ -1,7 +1,25 @@
-declare const templateTypeChoices: {
-    name: string;
-    value: string;
-}[];
+declare const templateTypeChoices: [{
+    readonly name: "page";
+    readonly value: "page-template";
+}, {
+    readonly name: "email";
+    readonly value: "email-template";
+}, {
+    readonly name: "partial";
+    readonly value: "partial";
+}, {
+    readonly name: "global partial";
+    readonly value: "global-partial";
+}, {
+    readonly name: "blog listing";
+    readonly value: "blog-listing-template";
+}, {
+    readonly name: "blog post";
+    readonly value: "blog-post-template";
+}, {
+    readonly name: "search results";
+    readonly value: "search-template";
+}];
 interface CreateTemplatePromptResponse {
     templateType: (typeof templateTypeChoices)[number]['value'];
 }

package/lib/prompts/installAppPrompt.d.ts

@@ -0,0 +1 @@
+export declare function installAppPrompt(installUrl: string, isReinstall?: boolean): Promise<void>;

package/lib/prompts/installAppPrompt.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installAppPrompt = installAppPrompt;
+const open_1 = __importDefault(require("open"));
+const promptUtils_1 = require("./promptUtils");
+const exitCodes_1 = require("../enums/exitCodes");
+const en_1 = require("../../lang/en");
+const logger_1 = require("../ui/logger");
+async function installAppPrompt(installUrl, isReinstall = false) {
+    logger_1.uiLogger.log('');
+    if (isReinstall) {
+        logger_1.uiLogger.log(en_1.lib.prompts.installAppPrompt.reinstallExplanation);
+    }
+    else {
+        logger_1.uiLogger.log(en_1.lib.prompts.installAppPrompt.explanation);
+    }
+    const { shouldOpenBrowser } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldOpenBrowser',
+        type: 'confirm',
+        message: isReinstall
+            ? en_1.lib.prompts.installAppPrompt.reinstallPrompt
+            : en_1.lib.prompts.installAppPrompt.prompt,
+    });
+    if (!isReinstall && !shouldOpenBrowser) {
+        logger_1.uiLogger.log(en_1.lib.prompts.installAppPrompt.decline);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    else if (!shouldOpenBrowser) {
+        return;
+    }
+    (0, open_1.default)(installUrl);
+}

package/lib/prompts/projectDevTargetAccountPrompt.d.ts

@@ -1,6 +1,11 @@
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts';
-import { ProjectDevTargetAccountPromptResponse } from '../../types/Prompts';
+export type ProjectDevTargetAccountPromptResponse = {
+    targetAccountId: number | null;
+    createNestedAccount: boolean;
+    parentAccountId?: number | null;
+    notInConfigAccount?: DeveloperTestAccount | null;
+};
 export declare function selectSandboxTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function selectDeveloperTestTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function confirmDefaultAccountPrompt(accountName: string, accountType: string): Promise<boolean>;

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -4,16 +4,16 @@ exports.selectSandboxTargetAccountPrompt = selectSandboxTargetAccountPrompt;
 exports.selectDeveloperTestTargetAccountPrompt = selectDeveloperTestTargetAccountPrompt;
 exports.confirmDefaultAccountPrompt = confirmDefaultAccountPrompt;
 exports.confirmUseExistingDeveloperTestAccountPrompt = confirmUseExistingDeveloperTestAccountPrompt;
-const promptUtils_1 = require("./promptUtils");
-const lang_1 = require("../lang");
-const ui_1 = require("../ui");
-const accountTypes_1 = require("../accountTypes");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
+const promptUtils_1 = require("./promptUtils");
+const lang_1 = require("../lang");
+const ui_1 = require("../ui");
+const accountTypes_1 = require("../accountTypes");
 const exitCodes_1 = require("../enums/exitCodes");
 function mapNestedAccount(accountConfig) {
     const parentAccountId = accountConfig.parentAccountId ?? null;
@@ -42,7 +42,7 @@ async function selectSandboxTargetAccountPrompt(accounts, defaultAccountConfig)
             sandboxUsage = data.usage;
         }
         else {
-            logger_1.logger.error(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`);
+            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -101,7 +101,7 @@ async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAccountCo
             devTestAccountsResponse = data;
         }
         else {
-            logger_1.logger.error(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`);
+            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }

package/lib/prompts/promptUtils.d.ts

@@ -4,9 +4,10 @@ export declare function confirmPrompt(message: string, options?: {
     defaultAnswer?: boolean;
     when?: PromptWhen;
 }): Promise<boolean>;
-export declare function listPrompt<T = string>(message: string, { choices, when, }: {
+export declare function listPrompt<T = string>(message: string, { choices, when, defaultAnswer, }: {
     choices: PromptChoices<T>;
     when?: PromptWhen;
+    defaultAnswer?: string | number | boolean;
 }): Promise<T>;
 export declare function inputPrompt(message: string, { when, validate, defaultAnswer, }?: {
     when?: boolean | (() => boolean);

package/lib/prompts/promptUtils.js

@@ -22,7 +22,7 @@ async function confirmPrompt(message, options = {}) {
     ]);
     return choice;
 }
-async function listPrompt(message, { choices, when, }) {
+async function listPrompt(message, { choices, when, defaultAnswer, }) {
     const { choice } = await promptUser([
         {
             name: 'choice',
@@ -30,6 +30,7 @@ async function listPrompt(message, { choices, when, }) {
             message,
             choices,
             when,
+            default: defaultAnswer,
         },
     ]);
     return choice;

package/lib/prompts/selectAppPrompt.d.ts

@@ -0,0 +1,2 @@
+import { PublicApp } from '@hubspot/local-dev-lib/types/Apps';
+export declare function selectAppPrompt(accountId: number, appId?: number): Promise<PublicApp | null>;

package/lib/prompts/selectAppPrompt.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectAppPrompt = selectAppPrompt;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
+const index_1 = require("../errorHandlers/index");
+const en_1 = require("../../lang/en");
+const promptUtils_1 = require("../prompts/promptUtils");
+async function selectAppPrompt(accountId, appId) {
+    let availableApps = [];
+    try {
+        const appsResponse = await (0, appsDev_1.fetchPublicAppsForPortal)(accountId);
+        if (appsResponse.data.results) {
+            availableApps = appsResponse.data.results;
+        }
+    }
+    catch (err) {
+        (0, index_1.debugError)(err);
+    }
+    if (availableApps.length === 0) {
+        logger_1.logger.error(en_1.lib.prompts.selectAppPrompt.errors.noApps);
+        return null;
+    }
+    if (appId) {
+        const targetApp = availableApps.find(app => app.id === appId);
+        if (targetApp) {
+            return targetApp;
+        }
+        else {
+            logger_1.logger.error(en_1.lib.prompts.selectAppPrompt.errors.invalidAppId);
+        }
+    }
+    const appPromptValue = await (0, promptUtils_1.listPrompt)(en_1.lib.prompts.selectAppPrompt.selectAppId, {
+        choices: availableApps.map(app => ({
+            name: `${app.name} (${app.id})`,
+            value: app,
+        })),
+    });
+    return appPromptValue;
+}

package/lib/prompts/{selectPublicAppPrompt.d.ts → selectPublicAppForMigrationPrompt.d.ts}

@@ -1,7 +1,7 @@
 type PublicAppPromptResponse = {
     appId: number;
 };
-export declare function selectPublicAppPrompt({ accountId, accountName, isMigratingApp, }: {
+export declare function selectPublicAppForMigrationPrompt({ accountId, accountName, isMigratingApp, }: {
     accountId: number | null;
     accountName: string;
     isMigratingApp?: boolean;

package/lib/prompts/{selectPublicAppPrompt.js → selectPublicAppForMigrationPrompt.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectPublicAppPrompt = selectPublicAppPrompt;
+exports.selectPublicAppForMigrationPrompt = selectPublicAppForMigrationPrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const ui_1 = require("../ui");
@@ -11,7 +11,7 @@ const exitCodes_1 = require("../enums/exitCodes");
 async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = false) {
     try {
         if (!accountId) {
-            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.errors.noAccountId`));
+            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.errors.noAccountId`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const { data: { results: publicApps }, } = await (0, appsDev_1.fetchPublicAppsForPortal)(accountId);
@@ -26,8 +26,8 @@ async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = fa
                 ? 'noAppsMigrationMessage'
                 : 'noAppsCloneMessage';
             (0, ui_1.uiLine)();
-            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.errors.${headerTranslationKey}`));
-            logger_1.logger.log((0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.errors.${messageTranslationKey}`, { accountName }));
+            logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.errors.${headerTranslationKey}`));
+            logger_1.logger.log((0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.errors.${messageTranslationKey}`, { accountName }));
             (0, ui_1.uiLine)();
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
@@ -35,11 +35,11 @@ async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = fa
     }
     catch (error) {
         (0, index_1.logError)(error, accountId ? { accountId } : undefined);
-        logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.errors.errorFetchingApps`));
+        logger_1.logger.error((0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.errors.errorFetchingApps`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-async function selectPublicAppPrompt({ accountId, accountName, isMigratingApp = false, }) {
+async function selectPublicAppForMigrationPrompt({ accountId, accountName, isMigratingApp = false, }) {
     const publicApps = await fetchPublicAppOptions(accountId, accountName, isMigratingApp);
     const translationKey = isMigratingApp
         ? 'selectAppIdMigrate'
@@ -47,7 +47,7 @@ async function selectPublicAppPrompt({ accountId, accountName, isMigratingApp =
     return (0, promptUtils_1.promptUser)([
         {
             name: 'appId',
-            message: (0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.${translationKey}`, {
+            message: (0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.${translationKey}`, {
                 accountName,
             }),
             type: 'list',
@@ -56,7 +56,7 @@ async function selectPublicAppPrompt({ accountId, accountName, isMigratingApp =
                 if (isMigratingApp && preventProjectMigrations && listingInfo) {
                     return {
                         name: `${app.name} (${app.id})`,
-                        disabled: (0, lang_1.i18n)(`lib.prompts.selectPublicAppPrompt.errors.cannotBeMigrated`),
+                        disabled: (0, lang_1.i18n)(`lib.prompts.selectPublicAppForMigrationPrompt.errors.cannotBeMigrated`),
                     };
                 }
                 return {

package/lib/testUtils.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
 import { HubSpotHttpError } from '@hubspot/local-dev-lib/models/HubSpotHttpError';
 type MockErrorResponse = {
     status: number;
@@ -9,6 +9,6 @@ type MockErrorResponse = {
         subCategory?: string;
     };
 };
-export declare const mockHubSpotHttpResponse: (data: any) => AxiosResponse;
-export declare const mockHubSpotHttpError: (message: string, response: MockErrorResponse) => HubSpotHttpError;
+export declare function mockHubSpotHttpResponse<T>(data?: any): HubSpotPromise<T>;
+export declare function mockHubSpotHttpError(message: string, response: MockErrorResponse): HubSpotHttpError;
 export {};

package/lib/testUtils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockHubSpotHttpError = exports.mockHubSpotHttpResponse = void 0;
+exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
+exports.mockHubSpotHttpError = mockHubSpotHttpError;
 const axios_1 = require("axios");
 const HubSpotHttpError_1 = require("@hubspot/local-dev-lib/models/HubSpotHttpError");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mockHubSpotHttpResponse = (data) => {
-    return {
+function mockHubSpotHttpResponse(data) {
+    return Promise.resolve({
         data,
         status: 200,
         statusText: 'OK',
@@ -13,12 +14,10 @@ const mockHubSpotHttpResponse = (data) => {
         config: {
             headers: new axios_1.AxiosHeaders(),
         },
-    };
-};
-exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
-const mockHubSpotHttpError = (message, response) => {
+    });
+}
+function mockHubSpotHttpError(message, response) {
     return new HubSpotHttpError_1.HubSpotHttpError(message, {
         cause: { isAxiosError: true, response },
     });
-};
-exports.mockHubSpotHttpError = mockHubSpotHttpError;
+}

package/lib/ui/index.js

@@ -61,7 +61,10 @@ function uiAccountDescription(accountId, bold = true) {
     if (account && account.accountType) {
         message = `${account.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]}] (${accountId})`;
     }
-    return bold ? chalk_1.default.bold(message) : message || '';
+    else {
+        message = accountId ? accountId.toString() : '';
+    }
+    return bold ? chalk_1.default.bold(message) : message;
 }
 function uiInfoSection(title, logContent) {
     uiLine();

package/lib/upload.d.ts

@@ -1 +1 @@
-export declare function getUploadableFileList(src: string, convertFields: boolean): Promise<string[]>;
+export declare function getUploadableFileList(src: string, convertFields?: boolean): Promise<string[]>;