@hubspot/cli 7.5.4-experimental.0 → 7.5.4

package/lib/projects/buildAndDeploy.js

@@ -8,16 +8,17 @@ exports.useV3Api = useV3Api;
 exports.displayWarnLogs = displayWarnLogs;
 exports.pollProjectBuildAndDeploy = pollProjectBuildAndDeploy;
 const chalk_1 = __importDefault(require("chalk"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const constants_1 = require("../constants");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
-const lang_1 = require("../lang");
 const errorHandlers_1 = require("../errorHandlers");
 const ui_1 = require("../ui");
 const urls_1 = require("./urls");
 const exitCodes_1 = require("../enums/exitCodes");
-const i18nKey = 'lib.projectBuildAndDeploy';
+const en_1 = require("../../lang/en");
+const logger_1 = require("../ui/logger");
+const constants_2 = require("@hubspot/project-parsing-lib/src/lib/constants");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const SPINNER_STATUS = {
     SPINNING: 'spinning',
 };
@@ -50,19 +51,14 @@ function getSubtaskType(task) {
     return task.deployType;
 }
 function handleTaskStatusError(statusText) {
-    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.makePollTaskStatusFunc.errorFetchingTaskStatus`, {
-        taskType: statusText.TYPE_KEY === constants_1.PROJECT_BUILD_TEXT.TYPE_KEY
-            ? 'build'
-            : 'deploy',
-        openCommand: (0, ui_1.uiCommandReference)('hs project open'),
-    }));
+    logger_1.uiLogger.error(en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorFetchingTaskStatus(statusText.TYPE_KEY === constants_1.PROJECT_BUILD_TEXT.TYPE_KEY ? 'build' : 'deploy'));
     process.exit(exitCodes_1.EXIT_CODES.ERROR);
 }
 function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrings, linkToHubSpot, }) {
     return async function (accountId, taskName, taskId, deployedBuildId, silenceLogs = false) {
         const displayId = deployedBuildId || taskId;
         if (linkToHubSpot && !silenceLogs) {
-            logger_1.logger.log(`\n${linkToHubSpot(accountId, taskName, taskId, deployedBuildId)}\n`);
+            logger_1.uiLogger.log(`\n${linkToHubSpot(accountId, taskName, taskId, deployedBuildId)}\n`);
         }
         SpinniesManager_1.default.init();
         const overallTaskSpinniesKey = `overallTaskStatus-${statusText.STATUS_TEXT}`;
@@ -77,14 +73,27 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
             structureFn(accountId, taskName, taskId),
         ]);
         const subtasks = getSubtasks(initialTaskStatus);
-        const tasksById = subtasks.reduce((acc, subtask) => {
+        const hiddenComponentBuildIds = [];
+        const tasksById = subtasks
+            .filter(subtask => {
+            // TODO: Remove this filtering logic when visible=false for SERVERLESS_PACKAGE
+            const shouldBeVisible = getSubtaskType(subtask) !== (0, project_parsing_lib_1.mapToInternalType)(constants_2.AppFunctionsPackageKey);
+            if (!shouldBeVisible) {
+                hiddenComponentBuildIds.push(subtask.id);
+            }
+            return shouldBeVisible;
+        })
+            .reduce((acc, subtask) => {
             const { id, visible } = subtask;
             if (visible) {
                 acc[id] = subtask;
             }
             return acc;
         }, {});
-        const structuredTasks = Object.keys(taskStructure).map(key => {
+        const structuredTasks = Object.keys(taskStructure)
+            // TODO: Remove this filtering logic when visible=false for SERVERLESS_PACKAGE
+            .filter(buildId => !hiddenComponentBuildIds.includes(buildId))
+            .map(key => {
             return {
                 ...tasksById[key],
                 subtasks: taskStructure[key]
@@ -95,9 +104,10 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
         const numComponents = structuredTasks.length;
         const componentCountText = silenceLogs
             ? ''
-            : (0, lang_1.i18n)(numComponents === 1
-                ? `${i18nKey}.makePollTaskStatusFunc.componentCountSingular`
-                : `${i18nKey}.makePollTaskStatusFunc.componentCount`, { numComponents }) + '\n';
+            : numComponents === 1
+                ? en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                    .componentCountSingular
+                : en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.componentCount(numComponents);
         SpinniesManager_1.default.update(overallTaskSpinniesKey, {
             text: `${statusStrings.INITIALIZE(taskName, displayId)}\n${componentCountText}`,
         });
@@ -129,7 +139,7 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                     taskStatus = data;
                 }
                 catch (e) {
-                    logger_1.logger.debug(e);
+                    logger_1.uiLogger.debug(e);
                     (0, errorHandlers_1.logError)(e, new errorHandlers_1.ApiErrorContext({
                         accountId,
                         projectName: taskName,
@@ -152,8 +162,10 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         if (status === statusText.STATES.SUCCESS ||
                             status === statusText.STATES.FAILURE) {
                             const taskStatusText = subtask.status === statusText.STATES.SUCCESS
-                                ? (0, lang_1.i18n)(`${i18nKey}.makePollTaskStatusFunc.successStatusText`)
-                                : (0, lang_1.i18n)(`${i18nKey}.makePollTaskStatusFunc.failedStatusText`);
+                                ? en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                                    .successStatusText
+                                : en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc
+                                    .failedStatusText;
                             const hasNewline = spinner?.text?.includes('\n') || Boolean(topLevelTask);
                             const updatedText = `${spinner?.text?.replace('\n', '')} ${taskStatusText}${hasNewline ? '\n' : ''}`;
                             if (status === statusText.STATES.SUCCESS) {
@@ -181,23 +193,23 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         if (!silenceLogs) {
                             const failedSubtasks = subtasks.filter(subtask => subtask.status === 'FAILURE');
                             (0, ui_1.uiLine)();
-                            logger_1.logger.log(`${statusStrings.SUBTASK_FAIL(failedSubtasks.length === 1
+                            logger_1.uiLogger.log(`${statusStrings.SUBTASK_FAIL(failedSubtasks.length === 1
                                 ? getSubtaskName(failedSubtasks[0])
                                 : failedSubtasks.length + ' components', displayId)}\n`);
-                            logger_1.logger.log('See below for a summary of errors.');
+                            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorSummary);
                             (0, ui_1.uiLine)();
                             const displayErrors = failedSubtasks.filter(subtask => subtask?.standardError?.subCategory !==
                                 constants_1.PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
                                 subtask?.standardError?.subCategory !==
                                     constants_1.PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED);
                             displayErrors.forEach(subTask => {
-                                logger_1.logger.log(`\n--- ${chalk_1.default.bold(getSubtaskName(subTask))} failed with the following error ---`);
-                                logger_1.logger.error(subTask.errorMessage);
+                                logger_1.uiLogger.log(`\n--- ${chalk_1.default.bold(getSubtaskName(subTask))} failed with the following error ---`);
+                                logger_1.uiLogger.error(subTask.errorMessage);
                                 // Log nested errors
                                 if (subTask.standardError && subTask.standardError.errors) {
-                                    logger_1.logger.log();
+                                    logger_1.uiLogger.log('');
                                     subTask.standardError.errors.forEach(error => {
-                                        logger_1.logger.log(error.message);
+                                        logger_1.uiLogger.log(error.message);
                                     });
                                 }
                             });
@@ -216,7 +228,7 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
 }
 function pollBuildAutodeployStatus(accountId, taskName, buildId) {
     return new Promise((resolve, reject) => {
-        let maxIntervals = (30 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~30s
+        let maxIntervals = (15 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~15s
         const pollInterval = setInterval(async () => {
             let build;
             try {
@@ -224,11 +236,11 @@ function pollBuildAutodeployStatus(accountId, taskName, buildId) {
                 build = response.data;
             }
             catch (e) {
-                logger_1.logger.debug(e);
-                return reject(new Error((0, lang_1.i18n)(`${i18nKey}.pollBuildAutodeployStatusError`, { buildId })));
+                logger_1.uiLogger.debug(e);
+                return reject(new Error(en_1.lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
             }
             if (!build || !build.status) {
-                return reject(new Error((0, lang_1.i18n)(`${i18nKey}.pollBuildAutodeployStatusError`, { buildId })));
+                return reject(new Error(en_1.lib.projectBuildAndDeploy.pollBuildAutodeployStatusError(buildId)));
             }
             if (build.deployStatusTaskLocator || maxIntervals <= 0) {
                 clearInterval(pollInterval);
@@ -287,9 +299,9 @@ async function displayWarnLogs(accountId, projectName, taskId, isDeploy = false)
     if (result && result.logs) {
         const logLength = result.logs.length;
         result.logs.forEach((log, i) => {
-            logger_1.logger.warn(log.message);
+            logger_1.uiLogger.warn(log.message);
             if (i < logLength - 1) {
-                logger_1.logger.log('');
+                logger_1.uiLogger.log('');
             }
         });
     }
@@ -311,10 +323,7 @@ async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, bui
     }
     else if (buildStatus.isAutoDeployEnabled) {
         if (!silenceLogs) {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.pollProjectBuildAndDeploy.buildSucceededAutomaticallyDeploying`, {
-                accountIdentifier: (0, ui_1.uiAccountDescription)(accountId),
-                buildId,
-            }));
+            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.buildSucceededAutomaticallyDeploying(buildId, (0, ui_1.uiAccountDescription)(accountId)));
             await displayWarnLogs(accountId, projectConfig.name, buildId);
         }
         // autoDeployId of 0 indicates a skipped deploy
@@ -331,22 +340,17 @@ async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, bui
             }
         }
         else if (!silenceLogs) {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.pollProjectBuildAndDeploy.unableToFindAutodeployStatus`, {
-                buildId,
-                viewDeploysLink: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.pollProjectBuildAndDeploy.viewDeploys`), (0, urls_1.getProjectActivityUrl)(projectConfig.name, accountId)),
-            }));
+            logger_1.uiLogger.log(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.unableToFindAutodeployStatus(buildId, (0, ui_1.uiLink)(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.viewDeploys, (0, urls_1.getProjectActivityUrl)(projectConfig.name, accountId))));
         }
     }
     try {
         if (tempFile) {
             tempFile.removeCallback();
-            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.pollProjectBuildAndDeploy.cleanedUpTempFile`, {
-                path: tempFile.name,
-            }));
+            logger_1.uiLogger.debug(en_1.lib.projectBuildAndDeploy.pollProjectBuildAndDeploy.cleanedUpTempFile(tempFile.name));
         }
     }
     catch (e) {
-        logger_1.logger.error(e);
+        (0, errorHandlers_1.logError)(e);
     }
     if (result && result.deployResult) {
         await displayWarnLogs(accountId, projectConfig.name, result.deployResult.deployId, true);

package/lib/projects/components.d.ts

@@ -0,0 +1,2 @@
+import { Collision } from '@hubspot/local-dev-lib/types/Archive';
+export declare function handleComponentCollision({ dest, src, collisions }: Collision): void;

package/lib/projects/components.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleComponentCollision = handleComponentCollision;
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+// Handles a collision between component source files
+function handleComponentCollision({ dest, src, collisions }) {
+    const hsMetaFiles = [];
+    const packageJsonFiles = [];
+    const sourceFiles = [];
+    collisions.forEach(collision => {
+        if (collision.endsWith(project_parsing_lib_1.metafileExtension)) {
+            hsMetaFiles.push(collision);
+        }
+        else if (path_1.default.parse(collision).base === 'package.json') {
+            packageJsonFiles.push(collision);
+        }
+        else {
+            sourceFiles.push(collision);
+        }
+    });
+    const sourceFilenameMapping = sourceFiles.reduce((acc, filename) => {
+        const { name, ext, dir } = path_1.default.parse(filename);
+        return {
+            ...acc,
+            [filename]: path_1.default.join(dir, `${name}-${Date.now()}${ext}`),
+        };
+    }, {});
+    const metafileExtensionPrefix = path_1.default.parse(project_parsing_lib_1.metafileExtension).name;
+    const metaFilenameMapping = hsMetaFiles.reduce((acc, filename) => {
+        const { name, dir } = path_1.default.parse(filename);
+        return {
+            ...acc,
+            [filename]: path_1.default.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${Date.now()}${project_parsing_lib_1.metafileExtension}`),
+        };
+    }, {});
+    // Update the metafiles that might contain references to the old filenames
+    hsMetaFiles.forEach(file => {
+        updateMetaFile({
+            dest,
+            src,
+            file,
+            sourceFilenameMapping,
+            metaFilenameMapping,
+        });
+    });
+    // Copy the renamed files into their new destination location
+    Object.entries(sourceFilenameMapping).forEach(([key, value]) => {
+        fs_1.default.copyFileSync(path_1.default.join(src, key), path_1.default.join(dest, value));
+    });
+    if (packageJsonFiles.length) {
+        handlePackageJsonCollisions(dest, src, packageJsonFiles);
+    }
+}
+function updateMetaFile({ dest, src, file, sourceFilenameMapping, metaFilenameMapping, }) {
+    let text = fs_1.default.readFileSync(path_1.default.join(src, file), 'utf-8');
+    Object.entries(sourceFilenameMapping).forEach(([key, value]) => {
+        const { base: oldFileName } = path_1.default.parse(key);
+        const { base: newFileName } = path_1.default.parse(value);
+        text = text.replace(oldFileName, newFileName);
+    });
+    fs_1.default.writeFileSync(path_1.default.join(dest, metaFilenameMapping[file]), text);
+}
+function handlePackageJsonCollisions(dest, src, packageJsonFiles) {
+    packageJsonFiles.forEach(file => {
+        const existingPackageJsonContents = JSON.parse(fs_1.default.readFileSync(path_1.default.join(dest, file), 'utf-8'));
+        const newPackageJsonContents = JSON.parse(fs_1.default.readFileSync(path_1.default.join(src, file), 'utf-8'));
+        existingPackageJsonContents.dependencies = {
+            ...newPackageJsonContents.dependencies,
+            ...existingPackageJsonContents.dependencies,
+        };
+        existingPackageJsonContents.devDependencies = {
+            ...newPackageJsonContents.devDependencies,
+            ...existingPackageJsonContents.devDependencies,
+        };
+        fs_1.default.writeFileSync(path_1.default.join(dest, file), JSON.stringify(existingPackageJsonContents, null, 2));
+    });
+}

package/lib/projects/config.d.ts

@@ -0,0 +1,9 @@
+import { ProjectConfig } from '../../types/Projects';
+export declare function writeProjectConfig(configPath: string, config: ProjectConfig): boolean;
+export declare function getIsInProject(dir?: string): boolean;
+export interface LoadedProjectConfig {
+    projectDir: string | null;
+    projectConfig: ProjectConfig | null;
+}
+export declare function getProjectConfig(dir?: string): Promise<LoadedProjectConfig>;
+export declare function validateProjectConfig(projectConfig: ProjectConfig | null, projectDir: string | null): asserts projectConfig is ProjectConfig;

package/lib/projects/config.js

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeProjectConfig = writeProjectConfig;
+exports.getIsInProject = getIsInProject;
+exports.getProjectConfig = getProjectConfig;
+exports.validateProjectConfig = validateProjectConfig;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const findup_sync_1 = __importDefault(require("findup-sync"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const constants_1 = require("../constants");
+const en_1 = require("../../lang/en");
+const exitCodes_1 = require("../enums/exitCodes");
+const logger_1 = require("../ui/logger");
+function writeProjectConfig(configPath, config) {
+    try {
+        fs_extra_1.default.ensureFileSync(configPath);
+        fs_extra_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        logger_1.uiLogger.debug(`Wrote project config at ${configPath}`);
+    }
+    catch (e) {
+        logger_1.uiLogger.debug(e);
+        return false;
+    }
+    return true;
+}
+function getIsInProject(dir) {
+    const configPath = getProjectConfigPath(dir);
+    return !!configPath;
+}
+function getProjectConfigPath(dir) {
+    const projectDir = dir ? (0, path_2.getAbsoluteFilePath)(dir) : (0, path_2.getCwd)();
+    const configPath = (0, findup_sync_1.default)(constants_1.PROJECT_CONFIG_FILE, {
+        cwd: projectDir,
+        nocase: true,
+    });
+    return configPath;
+}
+async function getProjectConfig(dir) {
+    const configPath = getProjectConfigPath(dir);
+    if (!configPath) {
+        return { projectConfig: null, projectDir: null };
+    }
+    try {
+        const config = fs_extra_1.default.readFileSync(configPath);
+        const projectConfig = JSON.parse(config.toString());
+        return {
+            projectDir: path_1.default.dirname(configPath),
+            projectConfig,
+        };
+    }
+    catch (e) {
+        logger_1.uiLogger.error(en_1.lib.projects.getProjectConfig.error);
+        return { projectConfig: null, projectDir: null };
+    }
+}
+function validateProjectConfig(projectConfig, projectDir) {
+    if (!projectConfig || !projectDir) {
+        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.configNotFound);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if (!projectConfig.name || !projectConfig.srcDir) {
+        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.configMissingFields);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const resolvedPath = path_1.default.resolve(projectDir, projectConfig.srcDir);
+    if (!resolvedPath.startsWith(projectDir)) {
+        const projectConfigFile = path_1.default.relative('.', path_1.default.join(projectDir, constants_1.PROJECT_CONFIG_FILE));
+        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.srcOutsideProjectDir(projectConfigFile, projectConfig.srcDir));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if (!fs_extra_1.default.existsSync(resolvedPath)) {
+        logger_1.uiLogger.error(en_1.lib.projects.validateProjectConfig.srcDirNotFound(projectConfig.srcDir, projectDir));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}

package/lib/projects/create/index.d.ts

@@ -0,0 +1,23 @@
+import { ArgumentsCamelCase } from 'yargs';
+import { ProjectTemplateRepoConfig } from '../../../types/Projects';
+import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../../types/Yargs';
+import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
+export type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    name?: string;
+    dest?: string;
+    templateSource?: RepoPath;
+    template?: string;
+    features?: string[];
+    platformVersion: string;
+    projectBase?: string;
+    auth?: string;
+    distribution?: string;
+};
+export declare function handleProjectCreationFlow(args: ArgumentsCamelCase<ProjectCreateArgs>): Promise<{
+    authType?: string;
+    distribution?: string;
+    repoConfig?: ProjectTemplateRepoConfig;
+    projectContents?: string;
+    createProjectPromptResponse: CreateProjectPromptResponse;
+}>;

package/lib/projects/create/index.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleProjectCreationFlow = handleProjectCreationFlow;
+const createProjectPrompt_1 = require("../../prompts/createProjectPrompt");
+const constants_1 = require("../../constants");
+const buildAndDeploy_1 = require("../buildAndDeploy");
+const v3_1 = require("./v3");
+const legacy_1 = require("./legacy");
+const logger_1 = require("../../ui/logger");
+const en_1 = require("../../../lang/en");
+const exitCodes_1 = require("../../enums/exitCodes");
+async function handleProjectCreationFlow(args) {
+    const { platformVersion, templateSource, projectBase, auth: providedAuth, distribution: providedDistribution, } = args;
+    const repo = templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+    if ((0, buildAndDeploy_1.useV3Api)(platformVersion)) {
+        const { componentTemplateChoices, authType, distribution, repoConfig, projectContents, } = await (0, v3_1.v3ComponentFlow)(platformVersion, projectBase, providedAuth, providedDistribution);
+        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, undefined, projectContents !== v3_1.EMPTY_PROJECT ? componentTemplateChoices : undefined);
+        return {
+            authType,
+            distribution,
+            repoConfig,
+            projectContents,
+            createProjectPromptResponse,
+        };
+    }
+    const projectTemplates = await (0, legacy_1.getProjectTemplateListFromRepo)(repo, 'main');
+    if (!projectTemplates.length) {
+        logger_1.uiLogger.error(en_1.commands.project.create.errors.failedToFetchProjectList);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, projectTemplates);
+    return { createProjectPromptResponse };
+}

package/lib/projects/create/legacy.d.ts

@@ -0,0 +1,6 @@
+import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
+import { ProjectTemplate, ComponentTemplate, ProjectTemplateRepoConfig } from '../../../types/Projects';
+export declare const EMPTY_PROJECT_TEMPLATE_NAME = "no-template";
+export declare function getConfigForPlatformVersion(platformVersion: string): Promise<ProjectTemplateRepoConfig> | never;
+export declare function getProjectComponentListFromRepo(platformVersion: string): Promise<ComponentTemplate[]>;
+export declare function getProjectTemplateListFromRepo(templateSource: RepoPath, githubRef: string): Promise<ProjectTemplate[]>;

package/lib/projects/{create.js → create/legacy.js}

@@ -1,25 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EMPTY_PROJECT_TEMPLATE_NAME = void 0;
+exports.getConfigForPlatformVersion = getConfigForPlatformVersion;
 exports.getProjectComponentListFromRepo = getProjectComponentListFromRepo;
 exports.getProjectTemplateListFromRepo = getProjectTemplateListFromRepo;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const github_1 = require("@hubspot/local-dev-lib/api/github");
-const constants_1 = require("../constants");
-const exitCodes_1 = require("../enums/exitCodes");
-const lang_1 = require("../lang");
-const index_1 = require("../errorHandlers/index");
-const i18nKey = 'lib.projects.create';
+const constants_1 = require("../../constants");
+const exitCodes_1 = require("../../enums/exitCodes");
+const errorHandlers_1 = require("../../errorHandlers");
+const logger_1 = require("../../ui/logger");
+const buildAndDeploy_1 = require("../buildAndDeploy");
+const en_1 = require("../../../lang/en");
+const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path'];
 exports.EMPTY_PROJECT_TEMPLATE_NAME = 'no-template';
-const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path', 'insertPath'];
-async function getProjectComponentListFromRepo(githubRef) {
+async function getConfigForPlatformVersion(platformVersion) {
+    let path = '';
+    if ((0, buildAndDeploy_1.useV3Api)(platformVersion)) {
+        path = `${platformVersion}/`;
+    }
+    const { data } = await (0, github_1.fetchRepoFile)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, `${path}config.json`, 'main');
+    return data;
+}
+async function getProjectComponentListFromRepo(platformVersion) {
     let config;
     try {
-        const { data } = await (0, github_1.fetchRepoFile)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', githubRef);
-        config = data;
+        config = await getConfigForPlatformVersion(platformVersion);
     }
     catch (err) {
-        (0, index_1.debugError)(err);
+        (0, errorHandlers_1.debugError)(err);
     }
     if (config) {
         return config[constants_1.PROJECT_COMPONENT_TYPES.COMPONENTS] || [];
@@ -33,18 +41,18 @@ async function getProjectTemplateListFromRepo(templateSource, githubRef) {
         config = data;
     }
     catch (e) {
-        (0, index_1.debugError)(e);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.missingConfigFileTemplateSource`));
+        (0, errorHandlers_1.debugError)(e);
+        logger_1.uiLogger.error(en_1.lib.projects.create.errors.missingConfigFileTemplateSource);
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!config || !config[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS]) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noProjectsInConfig`));
+        logger_1.uiLogger.error(en_1.lib.projects.create.errors.noProjectsInConfig);
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const templates = config[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS];
     const templatesContainAllProperties = templates.every(config => PROJECT_TEMPLATE_PROPERTIES.every(p => Object.prototype.hasOwnProperty.call(config, p)));
     if (!templatesContainAllProperties) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.missingPropertiesInConfig`));
+        logger_1.uiLogger.error(en_1.lib.projects.create.errors.missingPropertiesInConfig);
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     return templates;

package/lib/projects/create/v3.d.ts

@@ -0,0 +1,27 @@
+import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplateRepoConfig } from '../../../types/Projects';
+import { ProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project';
+import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+export declare const EMPTY_PROJECT = "empty";
+export declare const PROJECT_WITH_APP = "app";
+export declare function createV3App(providedAuth: string | undefined, providedDistribution: string | undefined): Promise<{
+    authType: string;
+    distribution: string;
+}>;
+export declare function calculateComponentTemplateChoices(components: ComponentTemplate[], authType: string | undefined, distribution: string | undefined, projectMetadata?: ProjectMetadata): ComponentTemplateChoice[];
+type V3ComponentInfo = {
+    authType?: string;
+    distribution?: string;
+    repoConfig?: ProjectTemplateRepoConfig;
+    projectContents?: string;
+    componentTemplateChoices?: ComponentTemplateChoice[];
+};
+export declare function v3ComponentFlow(platformVersion: string, projectBase: string | undefined, providedAuth: string | undefined, providedDistribution: string | undefined): Promise<V3ComponentInfo>;
+export declare function generateComponentPaths({ createProjectPromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {
+    createProjectPromptResponse: CreateProjectPromptResponse;
+    platformVersion: string;
+    repoConfig?: ProjectTemplateRepoConfig;
+    projectContents?: string;
+    authType?: string;
+    distribution?: string;
+}): string[];
+export {};