@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/lib/{localDev.js → projects/localDev/helpers.js}

@@ -14,7 +14,7 @@ exports.useExistingDevTestAccount = useExistingDevTestAccount;
 exports.createNewProjectForLocalDev = createNewProjectForLocalDev;
 exports.createInitialBuildForNewProject = createInitialBuildForNewProject;
 exports.getAccountHomeUrl = getAccountHomeUrl;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
+exports.hasSandboxes = hasSandboxes;
 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");
@@ -23,70 +23,59 @@ const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const projectDevTargetAccountPrompt_1 = require("./prompts/projectDevTargetAccountPrompt");
-const promptUtils_1 = require("./prompts/promptUtils");
-const sandboxes_1 = require("./sandboxes");
-const sandboxSync_1 = require("./sandboxSync");
-const developerTestAccounts_1 = require("./developerTestAccounts");
-const ui_1 = require("./ui");
-const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
-const lang_1 = require("./lang");
-const exitCodes_1 = require("./enums/exitCodes");
-const usageTracking_1 = require("./usageTracking");
-const accountTypes_1 = require("./accountTypes");
-const upload_1 = require("./projects/upload");
-const buildAndDeploy_1 = require("./projects/buildAndDeploy");
-const constants_1 = require("./constants");
-const index_2 = require("./errorHandlers/index");
-const buildAccount_1 = require("./buildAccount");
-const accountNamePrompt_1 = require("./prompts/accountNamePrompt");
-const i18nKey = 'lib.localDev';
+const sandboxHubs_1 = require("@hubspot/local-dev-lib/api/sandboxHubs");
+const projectDevTargetAccountPrompt_1 = require("../../prompts/projectDevTargetAccountPrompt");
+const promptUtils_1 = require("../../prompts/promptUtils");
+const sandboxes_1 = require("../../sandboxes");
+const sandboxSync_1 = require("../../sandboxSync");
+const developerTestAccounts_1 = require("../../developerTestAccounts");
+const ui_1 = require("../../ui");
+const SpinniesManager_1 = __importDefault(require("../../ui/SpinniesManager"));
+const exitCodes_1 = require("../../enums/exitCodes");
+const usageTracking_1 = require("../../usageTracking");
+const accountTypes_1 = require("../../accountTypes");
+const upload_1 = require("../../projects/upload");
+const buildAndDeploy_1 = require("../../projects/buildAndDeploy");
+const constants_1 = require("../../constants");
+const index_2 = require("../../errorHandlers/index");
+const buildAccount_1 = require("../../buildAccount");
+const accountNamePrompt_1 = require("../../prompts/accountNamePrompt");
+const en_1 = require("../../../lang/en");
+const logger_1 = require("../../ui/logger");
 // If the user passed in the --account flag, confirm they want to use that account as
 // their target account, otherwise exit
 async function confirmDefaultAccountIsTarget(accountConfig) {
     if (!accountConfig.name || !accountConfig.accountType) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.confirmDefaultAccountIsTarget.configError`, {
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget.configError);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.log();
+    logger_1.uiLogger.log('');
     const useDefaultAccount = await (0, projectDevTargetAccountPrompt_1.confirmDefaultAccountPrompt)(accountConfig.name, config_1.HUBSPOT_ACCOUNT_TYPE_STRINGS[accountConfig.accountType]);
     if (!useDefaultAccount) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.confirmDefaultAccountIsTarget.declineDefaultAccountExplanation`, {
-            useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-            devCommand: (0, ui_1.uiCommandReference)('hs project dev'),
-        }));
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
+            .declineDefaultAccountExplanation);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 // Confirm the default account is supported for the type of apps being developed
-function checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps) {
+async function checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps) {
+    const defaultAccountIsUnified = await (0, accountTypes_1.isUnifiedAccount)(accountConfig);
     if (hasPublicApps &&
         !((0, accountTypes_1.isAppDeveloperAccount)(accountConfig) ||
-            (0, accountTypes_1.isDeveloperTestAccount)(accountConfig))) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.checkIfDefaultAccountIsSupported.publicApp`, {
-            useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
+            (0, accountTypes_1.isDeveloperTestAccount)(accountConfig) ||
+            defaultAccountIsUnified)) {
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.publicApp);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     else if (!hasPublicApps && (0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.checkIfDefaultAccountIsSupported.privateApp`, {
-            useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.privateApp);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 function checkIfParentAccountIsAuthed(accountConfig) {
     if (!accountConfig.parentAccountId ||
         !(0, config_2.getAccountConfig)(accountConfig.parentAccountId)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.checkIfParentAccountIsAuthed.notAuthedError`, {
-            accountId: accountConfig.parentAccountId || '',
-            accountIdentifier: (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig)),
-            authCommand: (0, ui_1.uiCommandReference)(`hs auth --account=${accountConfig.parentAccountId}`),
-        }));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig))));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
@@ -94,34 +83,30 @@ function checkIfParentAccountIsAuthed(accountConfig) {
 function checkIfAccountFlagIsSupported(accountConfig, hasPublicApps) {
     if (hasPublicApps) {
         if (!(0, accountTypes_1.isDeveloperTestAccount)(accountConfig)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.validateAccountOption.invalidPublicAppAccount`, {
-                useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-                devCommand: (0, ui_1.uiCommandReference)('hs project dev'),
-            }));
+            logger_1.uiLogger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPublicAppAccount);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         checkIfParentAccountIsAuthed(accountConfig);
     }
     else if ((0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.validateAccountOption.invalidPrivateAppAccount`, {
-            useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-        }));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPrivateAppAccount);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 // If the user isn't using the recommended account type, prompt them to use or create one
 async function suggestRecommendedNestedAccount(accounts, accountConfig, hasPublicApps) {
-    logger_1.logger.log();
+    logger_1.uiLogger.log('');
     (0, ui_1.uiLine)();
     if (hasPublicApps) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validateAccountOption.publicAppNonDeveloperTestAccountWarning`));
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.validateAccountOption
+            .publicAppNonDeveloperTestAccountWarning);
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validateAccountOption.nonSandboxWarning`));
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.validateAccountOption.nonSandboxWarning);
     }
     (0, ui_1.uiLine)();
-    logger_1.logger.log();
-    const targetAccountPrompt = (0, accountTypes_1.isAppDeveloperAccount)(accountConfig)
+    logger_1.uiLogger.log('');
+    const targetAccountPrompt = hasPublicApps
         ? projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt
         : projectDevTargetAccountPrompt_1.selectSandboxTargetAccountPrompt;
     return targetAccountPrompt(accounts, accountConfig);
@@ -133,15 +118,10 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
     }
     catch (err) {
         if ((0, index_1.isMissingScopeError)(err)) {
-            logger_1.logger.error((0, lang_1.i18n)('lib.sandbox.create.failure.scopes.message', {
-                accountName: accountConfig.name || accountId,
-            }));
+            logger_1.uiLogger.error(en_1.lib.sandbox.create.developer.failure.scopes.message);
             const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
             const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-            logger_1.logger.info((0, lang_1.i18n)('lib.sandbox.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || accountId,
-                url,
-            }));
+            logger_1.uiLogger.info(en_1.lib.sandbox.create.developer.failure.scopes.instructions(accountConfig.name || accountId, url));
         }
         else {
             (0, index_2.logError)(err);
@@ -157,7 +137,7 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
         const targetAccountId = result.sandbox.sandboxHubId;
         const sandboxAccountConfig = (0, config_2.getAccountConfig)(result.sandbox.sandboxHubId);
         if (!sandboxAccountConfig) {
-            logger_1.logger.error((0, lang_1.i18n)('lib.sandbox.create.failure.generic'));
+            logger_1.uiLogger.error(en_1.lib.sandbox.create.developer.failure.generic);
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const syncTasks = await (0, sandboxes_1.getAvailableSyncTypes)(accountConfig, sandboxAccountConfig);
@@ -185,15 +165,10 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
     }
     catch (err) {
         if ((0, index_1.isMissingScopeError)(err)) {
-            logger_1.logger.error((0, lang_1.i18n)('lib.developerTestAccount.create.failure.scopes.message', {
-                accountName: accountConfig.name || accountId,
-            }));
+            logger_1.uiLogger.error(en_1.lib.developerTestAccount.create.failure.scopes.message);
             const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
             const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-            logger_1.logger.info((0, lang_1.i18n)('lib.developerTestAccount.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || accountId,
-                url,
-            }));
+            logger_1.uiLogger.info(en_1.lib.developerTestAccount.create.failure.scopes.instructions(accountConfig.name || accountId, url));
         }
         else {
             (0, index_2.logError)(err);
@@ -207,7 +182,7 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
         });
         (0, usageTracking_1.trackCommandMetadataUsage)('developer-test-account-create', { step: 'project-dev' }, accountId);
         const result = await (0, buildAccount_1.buildDeveloperTestAccount)(name, accountConfig, env, maxTestPortals);
-        return result.id;
+        return result;
     }
     catch (err) {
         (0, index_2.logError)(err);
@@ -218,91 +193,85 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
 async function useExistingDevTestAccount(env, account) {
     const useExistingDevTestAcct = await (0, projectDevTargetAccountPrompt_1.confirmUseExistingDeveloperTestAccountPrompt)(account);
     if (!useExistingDevTestAcct) {
-        logger_1.logger.log('');
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.confirmDefaultAccountIsTarget.declineDefaultAccountExplanation`, {
-            useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-            devCommand: (0, ui_1.uiCommandReference)('hs project dev'),
-        }));
-        logger_1.logger.log('');
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
+            .declineDefaultAccountExplanation);
+        logger_1.uiLogger.log('');
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const devTestAcctConfigName = await (0, buildAccount_1.saveAccountToConfig)(account.id, account.accountName, env);
-    logger_1.logger.success((0, lang_1.i18n)(`lib.developerTestAccount.create.success.configFileUpdated`, {
-        accountName: devTestAcctConfigName,
-        authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
-    }));
+    logger_1.uiLogger.success(en_1.lib.developerTestAccount.create.success.configFileUpdated(devTestAcctConfigName, auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name));
 }
 // Prompt the user to create a new project if one doesn't exist on their target account
 async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps) {
     // Create the project without prompting if this is a newly created sandbox
     let shouldCreateProject = shouldCreateWithoutConfirmation;
     if (!shouldCreateProject) {
-        const explanationString = (0, lang_1.i18n)(hasPublicApps
-            ? `${i18nKey}.createNewProjectForLocalDev.publicAppProjectMustExistExplanation`
-            : `${i18nKey}.createNewProjectForLocalDev.projectMustExistExplanation`, {
-            accountIdentifier: (0, ui_1.uiAccountDescription)(targetAccountId),
-            projectName: projectConfig.name,
-        });
-        logger_1.logger.log();
+        const explanationLangFunction = hasPublicApps
+            ? en_1.lib.localDevHelpers.createNewProjectForLocalDev
+                .publicAppProjectMustExistExplanation
+            : en_1.lib.localDevHelpers.createNewProjectForLocalDev
+                .projectMustExistExplanation;
+        const explanationString = explanationLangFunction((0, ui_1.uiAccountDescription)(targetAccountId), projectConfig.name);
+        logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
-        logger_1.logger.log(explanationString);
+        logger_1.uiLogger.log(explanationString);
         (0, ui_1.uiLine)();
-        shouldCreateProject = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`${i18nKey}.createNewProjectForLocalDev.createProject`, {
-            accountIdentifier: (0, ui_1.uiAccountDescription)(targetAccountId),
-            projectName: projectConfig.name,
-        }));
+        shouldCreateProject = await (0, promptUtils_1.confirmPrompt)(en_1.lib.localDevHelpers.createNewProjectForLocalDev.createProject(projectConfig.name, (0, ui_1.uiAccountDescription)(targetAccountId)));
     }
     if (shouldCreateProject) {
         SpinniesManager_1.default.add('createProject', {
-            text: (0, lang_1.i18n)(`${i18nKey}.createNewProjectForLocalDev.creatingProject`, {
-                accountIdentifier: (0, ui_1.uiAccountDescription)(targetAccountId),
-                projectName: projectConfig.name,
-            }),
+            text: en_1.lib.localDevHelpers.createNewProjectForLocalDev.creatingProject(projectConfig.name, (0, ui_1.uiAccountDescription)(targetAccountId)),
         });
         try {
             const { data: project } = await (0, projects_1.createProject)(targetAccountId, projectConfig.name);
             SpinniesManager_1.default.succeed('createProject', {
-                text: (0, lang_1.i18n)(`${i18nKey}.createNewProjectForLocalDev.createdProject`, {
-                    accountIdentifier: (0, ui_1.uiAccountDescription)(targetAccountId),
-                    projectName: projectConfig.name,
-                }),
+                text: en_1.lib.localDevHelpers.createNewProjectForLocalDev.createdProject(projectConfig.name, (0, ui_1.uiAccountDescription)(targetAccountId)),
                 succeedColor: 'white',
             });
             return project;
         }
         catch (err) {
             SpinniesManager_1.default.fail('createProject');
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createNewProjectForLocalDev.failedToCreateProject`));
+            logger_1.uiLogger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.failedToCreateProject);
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     else {
         // We cannot continue if the project does not exist in the target account
-        logger_1.logger.log();
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createNewProjectForLocalDev.choseNotToCreateProject`));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.choseNotToCreateProject);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 function projectUploadCallback(accountId, projectConfig, tempFile, buildId) {
     if (!buildId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.createInitialBuildForNewProject.initialUploadMessage`, {
-            uploadCommand: (0, ui_1.uiCommandReference)('hs project upload'),
-        }));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.genericError);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     return (0, buildAndDeploy_1.pollProjectBuildAndDeploy)(accountId, projectConfig, tempFile, buildId, true);
 }
 // 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) {
-    const { result: initialUploadResult, uploadError } = await (0, upload_1.handleProjectUpload)(targetAccountId, projectConfig, projectDir, projectUploadCallback, (0, lang_1.i18n)(`${i18nKey}.createInitialBuildForNewProject.initialUploadMessage`), sendIr);
+async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIR) {
+    const { result: initialUploadResult, uploadError } = await (0, upload_1.handleProjectUpload)({
+        accountId: targetAccountId,
+        projectConfig,
+        projectDir,
+        callbackFunc: projectUploadCallback,
+        uploadMessage: en_1.lib.localDevHelpers.createInitialBuildForNewProject
+            .initialUploadMessage,
+        forceCreate: true,
+        skipValidation: true,
+        sendIR,
+    });
     if (uploadError) {
         if ((0, index_1.isSpecifiedError)(uploadError, {
             subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
         })) {
-            logger_1.logger.log();
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.createInitialBuildForNewProject.projectLockedError`));
-            logger_1.logger.log();
+            logger_1.uiLogger.log('');
+            logger_1.uiLogger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.projectLockedError);
+            logger_1.uiLogger.log('');
         }
         else {
             (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
@@ -323,11 +292,11 @@ async function createInitialBuildForNewProject(projectConfig, projectDir, target
                 initialUploadResult.deployResult[constants_1.PROJECT_DEPLOY_TEXT.SUBTASK_KEY];
         }
         const failedSubTasks = subTasks.filter(task => task.status === 'FAILURE');
-        logger_1.logger.log();
+        logger_1.uiLogger.log('');
         failedSubTasks.forEach(failedSubTask => {
-            logger_1.logger.error(failedSubTask.errorMessage);
+            logger_1.uiLogger.error(failedSubTask.errorMessage);
         });
-        logger_1.logger.log();
+        logger_1.uiLogger.log('');
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     return initialUploadResult.buildResult;
@@ -336,3 +305,17 @@ function getAccountHomeUrl(accountId) {
     const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_2.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
     return `${baseUrl}/home?portalId=${accountId}`;
 }
+async function hasSandboxes(account) {
+    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(account);
+    if (!accountId) {
+        return false;
+    }
+    try {
+        const { data: { usage }, } = await (0, sandboxHubs_1.getSandboxUsageLimits)(accountId);
+        return usage.STANDARD.limit > 0 || usage.DEVELOPER.limit > 0;
+    }
+    catch (e) {
+        (0, index_2.debugError)(e);
+        return false;
+    }
+}

package/lib/projects/ui.d.ts

@@ -0,0 +1 @@
+export declare function logFeedbackMessage(buildId: number): void;

package/lib/projects/ui.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logFeedbackMessage = logFeedbackMessage;
+const logger_1 = require("../ui/logger");
+const constants_1 = require("../constants");
+const ui_1 = require("../ui");
+const en_1 = require("../../lang/en");
+function logFeedbackMessage(buildId) {
+    if (buildId > 0 && buildId % constants_1.FEEDBACK_INTERVAL === 0) {
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackHeader);
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackMessage);
+    }
+}

package/lib/projects/upload.d.ts

@@ -1,9 +1,20 @@
 import { FileResult } from 'tmp';
 import { ProjectConfig } from '../../types/Projects';
-type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId?: number) => Promise<T>;
+type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
+type HandleProjectUploadArg<T> = {
+    accountId: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    callbackFunc: ProjectUploadCallbackFunction<T>;
+    uploadMessage?: string;
+    forceCreate?: boolean;
+    isUploadCommand?: boolean;
+    sendIR?: boolean;
+    skipValidation?: boolean;
+};
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -10,23 +10,20 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
-const lang_1 = require("../lang");
 const exitCodes_1 = require("../enums/exitCodes");
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const errorHandlers_1 = require("../errorHandlers");
 const node_util_1 = __importDefault(require("node:util"));
-const i18nKey = 'lib.projectUpload';
+const en_1 = require("../../lang/en");
+const ensureProjectExists_1 = require("./ensureProjectExists");
+const logger_1 = require("../ui/logger");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
-        text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.add`, {
-            accountIdentifier,
-            projectName,
-        }),
+        text: en_1.lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
         succeedColor: 'white',
     });
     let buildId;
@@ -35,48 +32,33 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
         const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
         buildId = upload.buildId;
         SpinniesManager_1.default.succeed('upload', {
-            text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.succeed`, {
-                accountIdentifier,
-                projectName,
-            }),
+            text: en_1.lib.projectUpload.uploadProjectFiles.succeed(projectName, accountIdentifier),
         });
         if (buildId) {
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.buildCreated`, {
-                buildId,
-                projectName,
-            }));
+            logger_1.uiLogger.debug(en_1.lib.projectUpload.uploadProjectFiles.buildCreated(projectName, buildId));
         }
     }
     catch (err) {
         SpinniesManager_1.default.fail('upload', {
-            text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.fail`, {
-                accountIdentifier,
-                projectName,
-            }),
+            text: en_1.lib.projectUpload.uploadProjectFiles.fail(projectName, accountIdentifier),
         });
         error = err;
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false, skipValidation = false) {
+async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, 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) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.emptySource`, {
-            srcDir: projectConfig.srcDir,
-        }));
+        logger_1.uiLogger.log(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const tempFile = tmp_1.default.fileSync({ postfix: '.zip' });
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressing`, {
-        path: tempFile.name,
-    }));
+    logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressing(tempFile.name));
     const output = fs_extra_1.default.createWriteStream(tempFile.name);
     const archive = (0, archiver_1.default)('zip');
     const result = new Promise(resolve => output.on('close', async function () {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
-            byteCount: archive.pointer(),
-        }));
+        logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressed(archive.pointer()));
         let intermediateRepresentation;
         if (sendIR) {
             try {
@@ -85,11 +67,11 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                     platformVersion: projectConfig.platformVersion,
                     accountId,
                 }, { skipValidation });
-                logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+                logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
             }
             catch (e) {
                 if ((0, project_parsing_lib_1.isTranslationError)(e)) {
-                    logger_1.logger.error(e.toString());
+                    logger_1.uiLogger.error(e.toString());
                 }
                 else {
                     (0, errorHandlers_1.logError)(e);
@@ -97,6 +79,10 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
+        await (0, ensureProjectExists_1.ensureProjectExists)(accountId, projectConfig.name, {
+            forceCreate,
+            uploadCommand: isUploadCommand,
+        });
         const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             resolve({ uploadError: error });
@@ -113,9 +99,7 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         if (ignored) {
             const isNodeModule = file.name.includes('node_modules');
             if (!isNodeModule || !loggedIgnoredNodeModule) {
-                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.fileFiltered`, {
-                    filename: file.name,
-                }));
+                logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
             }
             if (isNodeModule && !loggedIgnoredNodeModule) {
                 loggedIgnoredNodeModule = true;

package/lib/projects/urls.d.ts

@@ -1,4 +1,5 @@
 export declare function getProjectDetailUrl(projectName: string, accountId: number): string | undefined;
+export declare function getProjectSettingsUrl(projectName: string, accountId: number): string | undefined;
 export declare function getProjectActivityUrl(projectName: string, accountId: number): string;
 export declare function getProjectBuildDetailUrl(projectName: string, buildId: number, accountId: number): string;
 export declare function getProjectDeployDetailUrl(projectName: string, deployId: number, accountId: number): string;

package/lib/projects/urls.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectDetailUrl = getProjectDetailUrl;
+exports.getProjectSettingsUrl = getProjectSettingsUrl;
 exports.getProjectActivityUrl = getProjectActivityUrl;
 exports.getProjectBuildDetailUrl = getProjectBuildDetailUrl;
 exports.getProjectDeployDetailUrl = getProjectDeployDetailUrl;
@@ -16,6 +17,11 @@ function getProjectDetailUrl(projectName, accountId) {
         return;
     return `${getProjectHomeUrl(accountId)}/project/${projectName}`;
 }
+function getProjectSettingsUrl(projectName, accountId) {
+    if (!projectName)
+        return;
+    return `${getProjectDetailUrl(projectName, accountId)}/settings`;
+}
 function getProjectActivityUrl(projectName, accountId) {
     return `${getProjectDetailUrl(projectName, accountId)}/activity`;
 }

package/lib/projects/watch.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfig } from '../../types/Projects';
-type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void>;
+type ProjectWatchHandlerFunction = (accountId: number, projectName: string, currentBuildId: number) => Promise<void> | void;
 export declare function createWatcher(accountId: number, projectConfig: ProjectConfig, projectDir: string, handleBuildStatusFn: ProjectWatchHandlerFunction, handleUserInputFn: ProjectWatchHandlerFunction): Promise<void>;
 export {};