@hubspot/cli 7.4.6-experimental.0 → 7.4.7-beta.0

package/lib/app/migrate.js

@@ -3,10 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadProjectFiles = downloadProjectFiles;
 exports.migrateApp2025_2 = migrateApp2025_2;
 exports.logInvalidAccountError = logInvalidAccountError;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const archive_1 = require("@hubspot/local-dev-lib/archive");
@@ -16,51 +14,88 @@ const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const transform_1 = require("@hubspot/project-parsing-lib/src/lib/transform");
 const Migration_1 = require("@hubspot/local-dev-lib/types/Migration");
 const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const inquirer = require('inquirer');
 const promptUtils_1 = require("../prompts/promptUtils");
 const ui_1 = require("../ui");
-const lang_1 = require("../lang");
-const projects_3 = require("../projects");
+const ensureProjectExists_1 = require("../projects/ensureProjectExists");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const polling_1 = require("../polling");
 const migrate_1 = require("../../api/migrate");
-function getUnmigratableReason(reasonCode) {
+const fs_1 = __importDefault(require("fs"));
+const en_1 = require("../../lang/en");
+const hasFeature_1 = require("../hasFeature");
+const constants_1 = require("../constants");
+const urls_1 = require("../projects/urls");
+const logger_1 = require("../ui/logger");
+function getUnmigratableReason(reasonCode, projectName, accountId) {
     switch (reasonCode) {
         case projects_1.UNMIGRATABLE_REASONS.UP_TO_DATE:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.upToDate');
+            return en_1.lib.migrate.errors.unmigratableReasons.upToDate;
         case projects_1.UNMIGRATABLE_REASONS.IS_A_PRIVATE_APP:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.isPrivateApp');
+            return en_1.lib.migrate.errors.unmigratableReasons.isPrivateApp;
         case projects_1.UNMIGRATABLE_REASONS.LISTED_IN_MARKETPLACE:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.listedInMarketplace');
+            return en_1.lib.migrate.errors.unmigratableReasons.listedInMarketplace;
+        case projects_1.UNMIGRATABLE_REASONS.PROJECT_CONNECTED_TO_GITHUB:
+            return en_1.lib.migrate.errors.unmigratableReasons.projectConnectedToGitHub(projectName, accountId);
+        case migrate_1.CLI_UNMIGRATABLE_REASONS.PART_OF_PROJECT_ALREADY:
+            return en_1.lib.migrate.errors.unmigratableReasons.partOfProjectAlready;
         default:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.generic', {
-                reasonCode,
-            });
+            return en_1.lib.migrate.errors.unmigratableReasons.generic(reasonCode);
     }
 }
-async function handleMigrationSetup(derivedAccountId, options) {
-    const { name, dest, appId } = options;
-    const { data } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
-    const { migratableApps, unmigratableApps } = data;
-    const allApps = [...migratableApps, ...unmigratableApps].filter(app => !app.projectName);
-    if (allApps.length === 0) {
-        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noApps`, {
-            accountId: derivedAccountId,
-        }));
+function filterAppsByProjectName(projectConfig) {
+    return (app) => {
+        if (projectConfig) {
+            return app.projectName === projectConfig?.projectConfig?.name;
+        }
+        return true;
+    };
+}
+function buildErrorMessageFromMigrationStatus(error) {
+    const { componentErrors, projectErrorDetail } = error;
+    if (!componentErrors || !componentErrors.length) {
+        return projectErrorDetail;
+    }
+    return `${projectErrorDetail}: \n\t- ${componentErrors
+        .map(componentError => {
+        const { componentType, errorMessage, developerSymbol: uid, } = componentError;
+        return `${componentType}${uid ? ` (${uid})` : ''}: ${errorMessage}`;
+    })
+        .join('\n\t- ')}`;
+}
+async function fetchMigrationApps(appId, derivedAccountId, platformVersion, projectConfig) {
+    const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId, platformVersion);
+    const filteredMigratableApps = migratableApps.filter(filterAppsByProjectName(projectConfig));
+    const filteredUnmigratableApps = unmigratableApps.filter(filterAppsByProjectName(projectConfig));
+    const allApps = [...filteredMigratableApps, ...filteredUnmigratableApps];
+    if (allApps.length > 1 && projectConfig) {
+        throw new Error(en_1.lib.migrate.errors.project.multipleApps);
     }
-    if (migratableApps.length === 0) {
-        const reasons = unmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
-        throw new Error(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noAppsEligible`, {
-            accountId: derivedAccountId,
-        })} \n  - ${reasons.join('\n  - ')}`);
+    if (!projectConfig?.projectConfig) {
+        allApps.forEach(app => {
+            if (app.projectName) {
+                app.isMigratable = false;
+                app.unmigratableReason =
+                    migrate_1.CLI_UNMIGRATABLE_REASONS.PART_OF_PROJECT_ALREADY;
+            }
+        });
+    }
+    if (allApps.length === 0 && projectConfig) {
+        throw new Error(en_1.lib.migrate.errors.noAppsForProject(projectConfig?.projectConfig?.name || ''));
+    }
+    if (allApps.length === 0 || !allApps.some(app => app.isMigratable)) {
+        const reasons = filteredUnmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason, app.projectName, derivedAccountId)}`);
+        throw new Error(en_1.lib.migrate.errors.noAppsEligible((0, ui_1.uiAccountDescription)(derivedAccountId), reasons));
     }
     if (appId &&
         !allApps.some(app => {
             return app.appId === appId;
         })) {
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp', {
-            appId,
-        }));
+        throw new Error(en_1.lib.migrate.errors.appWithAppIdNotFound(appId));
     }
+    return allApps;
+}
+async function promptForAppToMigrate(allApps, derivedAccountId) {
     const appChoices = allApps.map(app => ({
         name: app.isMigratable
             ? app.appName
@@ -68,82 +103,138 @@ async function handleMigrationSetup(derivedAccountId, options) {
         value: app,
         disabled: app.isMigratable
             ? false
-            : getUnmigratableReason(app.unmigratableReason),
+            : getUnmigratableReason(app.unmigratableReason, app.projectName, derivedAccountId),
     }));
+    const enabledChoices = appChoices.filter(app => !app.disabled);
+    const disabledChoices = appChoices.filter(app => app.disabled);
+    const { appId: selectedAppId } = await (0, promptUtils_1.listPrompt)(en_1.lib.migrate.prompt.chooseApp, {
+        choices: [
+            ...enabledChoices,
+            new inquirer.Separator(),
+            ...disabledChoices,
+        ],
+    });
+    return selectedAppId;
+}
+async function selectAppToMigrate(allApps, derivedAccountId, appId) {
+    if (appId &&
+        !allApps.some(app => {
+            return app.appId === appId;
+        })) {
+        throw new Error(en_1.lib.migrate.errors.appWithAppIdNotFound(appId));
+    }
     let appIdToMigrate = appId;
     if (!appIdToMigrate) {
-        const { appId: selectedAppId } = await (0, promptUtils_1.listPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp'), {
-            choices: appChoices,
-        });
-        appIdToMigrate = selectedAppId;
+        appIdToMigrate = await promptForAppToMigrate(allApps, derivedAccountId);
     }
     const selectedApp = allApps.find(app => app.appId === appIdToMigrate);
-    const migratableComponents = [];
-    const unmigratableComponents = [];
+    const migratableComponents = new Set();
+    const unmigratableComponents = new Set();
     selectedApp?.migrationComponents.forEach(component => {
         if (component.isSupported) {
-            migratableComponents.push((0, transform_1.mapToUserFacingType)(component.componentType));
+            migratableComponents.add((0, transform_1.mapToUserFacingType)(component.componentType));
         }
         else {
-            unmigratableComponents.push((0, transform_1.mapToUserFacingType)(component.componentType));
+            unmigratableComponents.add((0, transform_1.mapToUserFacingType)(component.componentType));
         }
     });
-    if (migratableComponents.length !== 0) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.project.subcommands.migrateApp.componentsToBeMigrated', {
-            components: `\n - ${migratableComponents.join('\n - ')}`,
-        }));
+    if (migratableComponents.size !== 0) {
+        logger_1.uiLogger.log(en_1.lib.migrate.componentsToBeMigrated(`\n - ${[...migratableComponents].join('\n - ')}`));
     }
-    if (unmigratableComponents.length !== 0) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.project.subcommands.migrateApp.componentsThatWillNotBeMigrated', {
-            components: `\n - ${unmigratableComponents.join('\n - ')}`,
-        }));
+    if (unmigratableComponents.size !== 0) {
+        logger_1.uiLogger.log(en_1.lib.migrate.componentsThatWillNotBeMigrated(`\n - ${[...unmigratableComponents].join('\n - ')}`));
     }
-    logger_1.logger.log();
-    const proceed = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.proceed'));
+    logger_1.uiLogger.log('');
+    const proceed = await (0, promptUtils_1.confirmPrompt)(en_1.lib.migrate.prompt.proceed, {
+        defaultAnswer: false,
+    });
+    return {
+        proceed,
+        appIdToMigrate,
+    };
+}
+async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
+    const { name, dest, appId } = options;
+    const allApps = await fetchMigrationApps(appId, derivedAccountId, options.platformVersion, projectConfig);
+    const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, derivedAccountId, appId);
     if (!proceed) {
         return {};
     }
+    // If it's a project we don't want to prompt for dest and name, so just return early
+    if (projectConfig &&
+        projectConfig?.projectConfig &&
+        projectConfig?.projectDir) {
+        return {
+            appIdToMigrate,
+            projectName: projectConfig.projectConfig.name,
+            projectDest: projectConfig.projectDir,
+        };
+    }
     const projectName = name ||
-        (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputName')));
-    const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
-    if (projectExists) {
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.projectAlreadyExists', {
-            projectName,
+        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputName, {
+            validate: async (input) => {
+                const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, input, { allowCreate: false, noLogs: true });
+                if (projectExists) {
+                    return en_1.lib.migrate.errors.project.alreadyExists(input);
+                }
+                return true;
+            },
         }));
+    const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
+    if (projectExists) {
+        throw new Error(en_1.lib.migrate.errors.project.alreadyExists(projectName));
     }
     const projectDest = dest ||
-        (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputDest'), {
+        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputDest, {
             defaultAnswer: path_1.default.resolve((0, path_2.getCwd)(), (0, path_2.sanitizeFileName)(projectName)),
         }));
     return { appIdToMigrate, projectName, projectDest };
 }
 async function beginMigration(derivedAccountId, appId, platformVersion) {
     SpinniesManager_1.default.add('beginningMigration', {
-        text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.beginningMigration'),
+        text: en_1.lib.migrate.spinners.beginningMigration,
     });
     const uidMap = {};
     const { data } = await (0, migrate_1.initializeMigration)(derivedAccountId, appId, platformVersion);
     const { migrationId } = data;
-    const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [Migration_1.MIGRATION_STATUS.INPUT_REQUIRED]);
+    let pollResponse;
+    try {
+        pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [
+            Migration_1.MIGRATION_STATUS.INPUT_REQUIRED,
+        ]);
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('beginningMigration', {
+            text: en_1.lib.migrate.spinners.unableToStartMigration,
+        });
+        if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
+            throw new Error(buildErrorMessageFromMigrationStatus(error));
+        }
+        throw new Error(en_1.lib.migrate.errors.migrationFailed, {
+            cause: error,
+        });
+    }
     if (pollResponse.status !== Migration_1.MIGRATION_STATUS.INPUT_REQUIRED) {
         SpinniesManager_1.default.fail('beginningMigration', {
-            text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.unableToStartMigration'),
+            text: en_1.lib.migrate.spinners.unableToStartMigration,
         });
         return;
     }
     const { componentsRequiringUids } = pollResponse;
-    SpinniesManager_1.default.succeed('beginningMigration', {
-        text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.migrationStarted'),
-    });
+    SpinniesManager_1.default.remove('beginningMigration');
     if (Object.values(componentsRequiringUids).length !== 0) {
         for (const [componentId, component] of Object.entries(componentsRequiringUids)) {
-            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.uidForComponent', {
-                componentName: component.componentHint || component.componentType,
-            }), {
+            const { componentHint, componentType } = component;
+            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.uidForComponent(componentHint
+                ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}'`
+                : (0, transform_1.mapToUserFacingType)(componentType)), {
                 validate: (uid) => {
                     const result = (0, project_parsing_lib_1.validateUid)(uid);
                     return result === undefined ? true : result;
                 },
+                defaultAnswer: componentHint
+                    ? componentHint.replace(/[^A-Za-z0-9_\-.]/g, '')
+                    : undefined,
             });
         }
     }
@@ -159,7 +250,7 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     let pollResponse;
     try {
         SpinniesManager_1.default.add('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.finishingMigration`),
+            text: en_1.lib.migrate.spinners.finishingMigration,
         });
         await (0, migrate_1.continueMigration)(derivedAccountId, migrationId, uidMap, projectName);
         pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [
@@ -168,55 +259,78 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     }
     catch (error) {
         SpinniesManager_1.default.fail('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
+            text: en_1.lib.migrate.spinners.migrationFailed,
         });
-        throw error;
+        if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
+            throw new Error(buildErrorMessageFromMigrationStatus(error));
+        }
+        throw new Error(en_1.lib.migrate.errors.migrationFailed, {
+            cause: error,
+        });
+    }
+    if (pollResponse.status !== Migration_1.MIGRATION_STATUS.SUCCESS) {
+        throw new Error(en_1.lib.migrate.errors.migrationFailed);
     }
     if (pollResponse.status === Migration_1.MIGRATION_STATUS.SUCCESS) {
         SpinniesManager_1.default.succeed('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationComplete`),
+            text: en_1.lib.migrate.spinners.migrationComplete,
         });
-        return pollResponse.buildId;
-    }
-    else {
-        SpinniesManager_1.default.fail('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
-        });
-        if (pollResponse.status === Migration_1.MIGRATION_STATUS.FAILURE) {
-            logger_1.logger.error(pollResponse.componentErrorDetails);
-            throw new Error(pollResponse.projectErrorsDetail);
-        }
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'));
     }
+    return pollResponse.buildId;
 }
-async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest) {
+async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig) {
     try {
         SpinniesManager_1.default.add('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContents`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContents,
         });
         const { data: zippedProject } = await (0, projects_2.downloadProject)(derivedAccountId, projectName, buildId);
-        const absoluteDestPath = projectDest
-            ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
-            : (0, path_2.getCwd)();
+        let absoluteDestPath;
+        if (projectConfig?.projectConfig && projectConfig?.projectDir) {
+            const { projectDir } = projectConfig;
+            absoluteDestPath = projectDir;
+            const { srcDir } = projectConfig.projectConfig;
+            const archiveDest = path_1.default.join(projectDir, 'archive');
+            // Move the existing source directory to archive
+            fs_1.default.renameSync(path_1.default.join(projectDir, srcDir), archiveDest);
+            logger_1.uiLogger.info(en_1.lib.migrate.sourceContentsMoved(archiveDest));
+        }
+        else {
+            absoluteDestPath = projectDest
+                ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
+                : (0, path_2.getCwd)();
+        }
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
             includesRootDir: true,
-            hideLogs: false,
+            hideLogs: true,
         });
         SpinniesManager_1.default.succeed('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsComplete`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContentsComplete,
         });
-        logger_1.logger.success(`Saved ${projectName} to ${projectDest}`);
+        logger_1.uiLogger.success(`Saved ${projectName} to ${projectDest}`);
     }
     catch (error) {
         SpinniesManager_1.default.fail('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsFailed`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContentsFailed,
         });
         throw error;
     }
 }
-async function migrateApp2025_2(derivedAccountId, options) {
+async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
     SpinniesManager_1.default.init();
-    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options);
+    const ungatedForUnifiedApps = await (0, hasFeature_1.hasFeature)(derivedAccountId, constants_1.FEATURES.UNIFIED_APPS);
+    if (!ungatedForUnifiedApps) {
+        throw new Error(en_1.lib.migrate.errors.notUngatedForUnifiedApps((0, ui_1.uiAccountDescription)(derivedAccountId)));
+    }
+    if (projectConfig) {
+        if (!projectConfig?.projectConfig || !projectConfig?.projectDir) {
+            throw new Error(en_1.lib.migrate.errors.project.invalidConfig);
+        }
+        const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectConfig.projectConfig.name, { allowCreate: false, noLogs: true });
+        if (!projectExists) {
+            throw new Error(en_1.lib.migrate.errors.project.doesNotExist(derivedAccountId));
+        }
+    }
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }
@@ -225,15 +339,14 @@ async function migrateApp2025_2(derivedAccountId, options) {
         return;
     }
     const { migrationId, uidMap } = migrationInProgress;
-    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectName);
-    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest);
+    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectConfig?.projectConfig?.name || projectName);
+    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig);
+    logger_1.uiLogger.log((0, ui_1.uiLink)('Project Details', (0, urls_1.getProjectDetailUrl)(projectName, derivedAccountId)));
+    logger_1.uiLogger.log((0, ui_1.uiLink)('Build Details', (0, urls_1.getProjectBuildDetailUrl)(projectName, buildId, derivedAccountId)));
 }
-function logInvalidAccountError(i18nKey) {
+function logInvalidAccountError() {
     (0, ui_1.uiLine)();
-    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAccountTypeTitle`));
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.invalidAccountTypeDescription`, {
-        useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-        authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-    }));
+    logger_1.uiLogger.error(en_1.lib.migrate.errors.invalidAccountTypeTitle);
+    logger_1.uiLogger.log(en_1.lib.migrate.errors.invalidAccountTypeDescription((0, ui_1.uiCommandReference)('hs account use'), (0, ui_1.uiCommandReference)('hs auth')));
     (0, ui_1.uiLine)();
 }

package/lib/app/migrate_legacy.d.ts

@@ -1,4 +1,4 @@
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { ArgumentsCamelCase } from 'yargs';
-import { MigrateAppOptions } from '../../types/Yargs';
-export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, accountConfig: CLIAccount): Promise<void>;
+import { MigrateAppArgs } from './migrate';
+export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppArgs>, accountConfig: CLIAccount): Promise<void>;

package/lib/app/migrate_legacy.js

@@ -19,7 +19,7 @@ const lang_1 = require("../lang");
 const accountTypes_1 = require("../accountTypes");
 const selectPublicAppPrompt_1 = require("../prompts/selectPublicAppPrompt");
 const createProjectPrompt_1 = require("../prompts/createProjectPrompt");
-const projects_2 = require("../projects");
+const ensureProjectExists_1 = require("../projects/ensureProjectExists");
 const usageTracking_1 = require("../usageTracking");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const process_1 = require("../process");
@@ -27,17 +27,20 @@ const polling_1 = require("../polling");
 const migrate_1 = require("./migrate");
 async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
     const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
-    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        (0, migrate_1.logInvalidAccountError)('commands.project.subcommands.migrateApp');
+    const defaultAccountIsUnified = await (0, accountTypes_1.isUnifiedAccount)(accountConfig);
+    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig) && !defaultAccountIsUnified) {
+        (0, migrate_1.logInvalidAccountError)();
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    const { appId } = 'appId' in options
-        ? options
-        : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
+    let appId = options.appId;
+    if (!appId) {
+        const { appId: selectAppId } = await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
             accountId: derivedAccountId,
             accountName,
             isMigratingApp: true,
         });
+        appId = selectAppId;
+    }
     try {
         const { data: selectedApp } = await (0, appsDev_1.fetchPublicAppMetadata)(appId, derivedAccountId);
         // preventProjectMigrations returns true if we have not added app to allowlist config.
@@ -57,7 +60,7 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
     }
     const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
     const { name: projectName, dest: projectDest } = createProjectPromptResponse;
-    const { projectExists } = await (0, projects_2.ensureProjectExists)(derivedAccountId, projectName, {
+    const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectName, {
         allowCreate: false,
         noLogs: true,
     });

package/lib/buildAccount.d.ts

@@ -1,10 +1,9 @@
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
-import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts';
 import { SandboxResponse } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
-export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number): Promise<DeveloperTestAccount>;
+export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number): Promise<number>;
 type SandboxAccount = SandboxResponse & {
     name: string;
 };

package/lib/buildAccount.js

@@ -61,49 +61,50 @@ async function saveAccountToConfig(accountId, accountName, env, personalAccessKe
     return validName;
 }
 async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit) {
-    const i18nKey = 'lib.developerTestAccount.create.loading';
     const id = (0, getAccountIdentifier_1.getAccountIdentifier)(parentAccountConfig);
     const parentAccountId = (0, config_1.getAccountId)(id);
     if (!parentAccountId) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.fail`));
+        throw new Error((0, lang_1.i18n)(`lib.developerTestAccount.create.loading.fail`));
     }
     SpinniesManager_1.default.init({
         succeedColor: 'white',
     });
     logger_1.logger.log('');
     SpinniesManager_1.default.add('buildDeveloperTestAccount', {
-        text: (0, lang_1.i18n)(`${i18nKey}.add`, {
+        text: (0, lang_1.i18n)(`lib.developerTestAccount.create.loading.add`, {
             accountName: testAccountName,
         }),
     });
-    let developerTestAccount;
+    let developerTestAccountId;
+    let developerTestAccountPersonalAccessKey;
     try {
         const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(parentAccountId, testAccountName);
-        developerTestAccount = data;
+        developerTestAccountId = data.id;
+        developerTestAccountPersonalAccessKey = data.personalAccessKey;
         SpinniesManager_1.default.succeed('buildDeveloperTestAccount', {
-            text: (0, lang_1.i18n)(`${i18nKey}.succeed`, {
+            text: (0, lang_1.i18n)(`lib.developerTestAccount.create.loading.succeed`, {
                 accountName: testAccountName,
-                accountId: developerTestAccount.id,
+                accountId: developerTestAccountId,
             }),
         });
     }
     catch (e) {
         (0, index_1.debugError)(e);
         SpinniesManager_1.default.fail('buildDeveloperTestAccount', {
-            text: (0, lang_1.i18n)(`${i18nKey}.fail`, {
+            text: (0, lang_1.i18n)(`lib.developerTestAccount.create.loading.fail`, {
                 accountName: testAccountName,
             }),
         });
         (0, developerTestAccounts_2.handleDeveloperTestAccountCreateError)(e, parentAccountId, env, portalLimit);
     }
     try {
-        await saveAccountToConfig(developerTestAccount.id, testAccountName, env);
+        await saveAccountToConfig(developerTestAccountId, testAccountName, env, developerTestAccountPersonalAccessKey);
     }
     catch (err) {
         (0, index_1.logError)(err);
         throw err;
     }
-    return developerTestAccount;
+    return developerTestAccountId;
 }
 async function buildSandbox(sandboxName, parentAccountConfig, sandboxType, env, force = false) {
     let i18nKey;

package/lib/commonOpts.d.ts

@@ -1,9 +1,7 @@
 import { Argv, Arguments } from 'yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 import { ConfigArgs } from '../types/Yargs';
-export declare function addGlobalOptions(yargs: Argv): Argv<{
-    debug: boolean;
-}>;
+export declare function addGlobalOptions(yargs: Argv): Argv<{}>;
 export declare function addAccountOptions(yargs: Argv): Argv;
 export declare function addConfigOptions(yargs: Argv): Argv<ConfigArgs>;
 export declare function addOverwriteOptions(yargs: Argv): Argv;
@@ -13,9 +11,10 @@ export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
 }): Argv;
 export declare function addTestingOptions(yargs: Argv): Argv;
 export declare function addUseEnvironmentOptions(yargs: Argv): Argv;
-export declare function addCustomHelpOutput(yargs: Argv, command: string, describe: string): Promise<void>;
+export declare function addCustomHelpOutput(yargs: Argv, command: string | string[], describe?: string): Promise<void>;
 export declare function setLogLevel(options: Arguments<{
     debug?: boolean;
+    networkDebug?: boolean;
 }>): void;
 export declare function getCommandName(argv: Arguments<{
     _?: string[];