@hubspot/cli 7.4.2 → 7.4.3-beta.0

package/api/migrate.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
@@ -10,8 +7,6 @@ exports.continueMigration = continueMigration;
 exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const util_1 = __importDefault(require("util"));
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
 function isMigrationStatus(error) {
     return (typeof error === 'object' &&
@@ -53,9 +48,7 @@ async function continueMigration(portalId, migrationId, componentUids, projectNa
     });
 }
 async function checkMigrationStatusV2(accountId, id) {
-    const response = await http_1.http.get(accountId, {
+    return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/migrations/${id}/status`,
     });
-    logger_1.logger.debug(util_1.default.inspect(response.data, { depth: null }));
-    return response;
 }

package/lang/en.d.ts

@@ -2795,6 +2795,8 @@ export declare const lib: {
     migrate: {
         componentsToBeMigrated: (components: any) => string;
         componentsThatWillNotBeMigrated: (components: any) => string;
+        sourceContentsMoved: (newLocation: string) => string;
+        projectMigrationWarning: string;
         errors: {
             project: {
                 invalidConfig: string;

package/lang/en.js

@@ -2754,6 +2754,8 @@ exports.lib = {
     migrate: {
         componentsToBeMigrated: components => `The following component types will be migrated: ${components}`,
         componentsThatWillNotBeMigrated: components => `[NOTE] These component types are not yet supported for migration but will be available later: ${components}`,
+        sourceContentsMoved: (newLocation) => `The contents of your old source directory have been moved to ${newLocation}, move any required files to the new source directory.`,
+        projectMigrationWarning: `Migrating a project is irreversible and cannot be undone.`,
         errors: {
             project: {
                 invalidConfig: 'The project configuration file is invalid. Please check the config file and try again.',

package/lib/app/migrate.js

@@ -23,7 +23,6 @@ const polling_1 = require("../polling");
 const migrate_1 = require("../../api/migrate");
 const fs_1 = __importDefault(require("fs"));
 const en_1 = require("../../lang/en");
-const util_1 = __importDefault(require("util"));
 const hasFeature_1 = require("../hasFeature");
 function getUnmigratableReason(reasonCode) {
     switch (reasonCode) {
@@ -69,7 +68,7 @@ async function fetchMigrationApps(appId, derivedAccountId, platformVersion, proj
     }
     return allApps;
 }
-async function selectAppToMigrate(allApps, appId) {
+async function selectAppToMigrate(allApps, appId, projectConfig) {
     if (appId &&
         !allApps.some(app => {
             return app.appId === appId;
@@ -93,24 +92,27 @@ async function selectAppToMigrate(allApps, appId) {
         appIdToMigrate = selectedAppId;
     }
     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(en_1.lib.migrate.componentsToBeMigrated(`\n - ${migratableComponents.join('\n - ')}`));
+    if (migratableComponents.size !== 0) {
+        logger_1.logger.log(en_1.lib.migrate.componentsToBeMigrated(`\n - ${[...migratableComponents].join('\n - ')}`));
     }
-    if (unmigratableComponents.length !== 0) {
-        logger_1.logger.log(en_1.lib.migrate.componentsThatWillNotBeMigrated(`\n - ${unmigratableComponents.join('\n - ')}`));
+    if (unmigratableComponents.size !== 0) {
+        logger_1.logger.log(en_1.lib.migrate.componentsThatWillNotBeMigrated(`\n - ${[...unmigratableComponents].join('\n - ')}`));
     }
     logger_1.logger.log();
-    const proceed = await (0, promptUtils_1.confirmPrompt)(en_1.lib.migrate.prompt.proceed);
+    const promptMessage = projectConfig?.projectConfig
+        ? `${en_1.lib.migrate.projectMigrationWarning} ${en_1.lib.migrate.prompt.proceed}`
+        : en_1.lib.migrate.prompt.proceed;
+    const proceed = await (0, promptUtils_1.confirmPrompt)(promptMessage);
     return {
         proceed,
         appIdToMigrate,
@@ -119,7 +121,7 @@ async function selectAppToMigrate(allApps, appId) {
 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, appId);
+    const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, appId, projectConfig);
     if (!proceed) {
         return {};
     }
@@ -133,9 +135,16 @@ async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
             projectDest: projectConfig.projectDir,
         };
     }
-    const projectName = projectConfig?.projectConfig?.name ||
-        name ||
-        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputName));
+    const projectName = name ||
+        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputName, {
+            validate: async (input) => {
+                const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, input, { allowCreate: false, noLogs: true });
+                if (projectExists) {
+                    return en_1.lib.migrate.errors.project.alreadyExists(input);
+                }
+                return true;
+            },
+        }));
     const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
     if (projectExists) {
         throw new Error(en_1.lib.migrate.errors.project.alreadyExists(projectName));
@@ -211,7 +220,6 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     if (pollResponse.status !== Migration_1.MIGRATION_STATUS.SUCCESS) {
         throw new Error(en_1.lib.migrate.errors.migrationFailed);
     }
-    logger_1.logger.debug(util_1.default.inspect(pollResponse, { depth: null }));
     if (pollResponse.status === Migration_1.MIGRATION_STATUS.SUCCESS) {
         SpinniesManager_1.default.succeed('finishingMigration', {
             text: en_1.lib.migrate.spinners.migrationComplete,
@@ -233,6 +241,7 @@ async function downloadProjectFiles(derivedAccountId, projectName, buildId, proj
             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.logger.info(en_1.lib.migrate.sourceContentsMoved(archiveDest));
         }
         else {
             absoluteDestPath = projectDest

package/lib/prompts/promptUtils.d.ts

@@ -10,6 +10,6 @@ export declare function listPrompt<T = string>(message: string, { choices, when,
 }): Promise<T>;
 export declare function inputPrompt(message: string, { when, validate, defaultAnswer, }?: {
     when?: boolean | (() => boolean);
-    validate?: (input: string) => boolean | string;
+    validate?: (input: string) => (boolean | string) | Promise<boolean | string>;
     defaultAnswer?: string;
 }): Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.4.2",
+    "version": "7.4.3-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",