@hubspot/cli 7.0.15-experimental.0 → 7.0.16-experimental.0

package/commands/create/api-sample.js

@@ -6,8 +6,11 @@ const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
-const { fetchFileFromRepository, cloneGithubRepo, } = require('@hubspot/local-dev-lib/github');
+const { fetchRepoFile } = require('@hubspot/local-dev-lib/api/github');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 const { i18n } = require('../../lib/lang');
+const { debugError } = require('../../lib/errorHandlers');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.create.subcommands.apiSample';
 module.exports = {
     hidden: true,
@@ -30,15 +33,22 @@ module.exports = {
                 return;
             }
         }
-        const samplesConfig = await fetchFileFromRepository('HubSpot/sample-apps-list', 'samples.json', 'main');
+        let samplesConfig;
+        try {
+            const { data } = await fetchRepoFile('HubSpot/sample-apps-list', 'samples.json', 'main');
+            samplesConfig = data;
+        }
+        catch (err) {
+            debugError(err);
+        }
         if (!samplesConfig) {
             logger.error(i18n(`${i18nKey}.errors.noSamples`));
-            return;
+            process.exit(EXIT_CODES.ERROR);
         }
         const { sampleType, sampleLanguage } = await createApiSamplePrompt(samplesConfig);
         if (!sampleType || !sampleLanguage) {
             logger.error(i18n(`${i18nKey}.errors.noSamples`));
-            return;
+            process.exit(EXIT_CODES.ERROR);
         }
         logger.info(i18n(`${i18nKey}.info.sampleChosen`, {
             sampleType,

package/commands/project/add.js

@@ -1,42 +1,88 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { logError } = require('../../lib/errorHandlers/index');
-const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
+const { cloneGithubRepo, fetchReleaseData, } = require('@hubspot/local-dev-lib/github');
+const { debugError } = require('../../lib/errorHandlers');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { projectAddPrompt } = require('../../lib/prompts/projectAddPrompt');
-const { createProjectComponent, getProjectComponentsByVersion, } = require('../../lib/projects');
+const { getProjectConfig } = require('../../lib/projects');
+const { getProjectComponentListFromRepo, } = require('../../lib/projects/create');
+const { findProjectComponents } = require('../../lib/projects/structure');
+const { ComponentTypes } = require('../../types/Projects');
 const { uiBetaTag } = require('../../lib/ui');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } = require('../../lib/constants');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.project.subcommands.add';
 exports.command = 'add';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     const { derivedAccountId } = options;
+    trackCommandUsage('project-add', null, derivedAccountId);
+    const { projectConfig, projectDir } = await getProjectConfig();
+    if (!projectDir || !projectConfig) {
+        logger.error(i18n(`${i18nKey}.error.locationInProject`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    // We currently only support adding private apps to projects
+    let projectContainsPublicApp = false;
+    try {
+        const components = await findProjectComponents(projectDir);
+        projectContainsPublicApp = components.some(c => c.type === ComponentTypes.PublicApp);
+    }
+    catch (err) {
+        debugError(err);
+    }
+    if (projectContainsPublicApp) {
+        logger.error(i18n(`${i18nKey}.error.projectContainsPublicApp`));
+        process.exit(EXIT_CODES.ERROR);
+    }
     logger.log('');
-    logger.log(i18n(`${i18nKey}.creatingComponent.message`));
+    logger.log(i18n(`${i18nKey}.creatingComponent`, {
+        projectName: projectConfig.name,
+    }));
     logger.log('');
-    const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
-    const projectComponentsVersion = releaseData.tag_name;
-    const components = await getProjectComponentsByVersion(projectComponentsVersion);
-    let { component, name } = await projectAddPrompt(components, options);
-    name = name || options.name;
-    if (!component) {
-        component = components.find(t => t.path === options.type);
+    let latestRepoReleaseTag;
+    try {
+        // We want the tag_name from the latest release of the components repo
+        const repoReleaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
+        if (repoReleaseData) {
+            latestRepoReleaseTag = repoReleaseData.tag_name;
+        }
     }
-    trackCommandUsage('project-add', null, derivedAccountId);
+    catch (err) {
+        debugError(err);
+    }
+    if (!latestRepoReleaseTag) {
+        logger.error(i18n(`${i18nKey}.error.failedToFetchComponentList`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const components = await getProjectComponentListFromRepo(latestRepoReleaseTag);
+    if (!components.length) {
+        logger.error(i18n(`${i18nKey}.error.failedToFetchComponentList`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const projectAddPromptResponse = await projectAddPrompt(components, options);
     try {
-        await createProjectComponent(component, name, projectComponentsVersion);
+        const componentPath = path.join(projectDir, projectConfig.srcDir, projectAddPromptResponse.componentTemplate.insertPath, projectAddPromptResponse.name);
+        await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, componentPath, {
+            sourceDir: projectAddPromptResponse.componentTemplate.path,
+            tag: latestRepoReleaseTag,
+            hideLogs: true,
+        });
         logger.log('');
-        logger.log(i18n(`${i18nKey}.success.message`, {
-            componentName: name,
+        logger.success(i18n(`${i18nKey}.success`, {
+            componentName: projectAddPromptResponse.name,
         }));
     }
     catch (error) {
-        logError(error);
+        debugError(error);
+        logger.error(i18n(`${i18nKey}.error.failedToDownloadComponent`));
+        process.exit(EXIT_CODES.ERROR);
     }
+    process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs.options({

package/commands/project/cloneApp.js

@@ -53,9 +53,9 @@ exports.handler = async (options) => {
             });
             appId = appIdResponse.appId;
         }
-        const { name, dest } = await createProjectPrompt('', options, true);
-        projectName = name;
-        projectDest = options.dest || dest;
+        const createProjectPromptResponse = await createProjectPrompt(options);
+        projectName = createProjectPromptResponse.name;
+        projectDest = createProjectPromptResponse.dest;
     }
     catch (error) {
         logError(error, new ApiErrorContext({ accountId: derivedAccountId }));

package/commands/project/create.js

@@ -1,32 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
 const path = require('path');
+const fs = require('fs-extra');
 const chalk = require('chalk');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { fetchReleaseData, cloneGithubRepo, } = require('@hubspot/local-dev-lib/github');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
 const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
-const { createProjectConfig } = require('../../lib/projects');
+const { writeProjectConfig, getProjectConfig } = require('../../lib/projects');
+const { getProjectTemplateListFromRepo, EMPTY_PROJECT_TEMPLATE_NAME, } = require('../../lib/projects/create');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
-const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } = require('../../lib/constants');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
+const { debugError } = require('../../lib/errorHandlers');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH, } = require('../../lib/constants');
 const i18nKey = 'commands.project.subcommands.create';
 exports.command = 'create';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     const { derivedAccountId } = options;
-    const hasCustomTemplateSource = Boolean(options.templateSource);
-    let githubRef = '';
-    if (!hasCustomTemplateSource) {
-        const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
-        githubRef = releaseData.tag_name;
+    let latestRepoReleaseTag;
+    let templateSource = options.templateSource;
+    if (!templateSource) {
+        templateSource = HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+        try {
+            const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
+            if (releaseData) {
+                latestRepoReleaseTag = releaseData.tag_name;
+            }
+        }
+        catch (err) {
+            logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+            process.exit(EXIT_CODES.ERROR);
+        }
     }
-    const { name, template, dest } = await createProjectPrompt(githubRef, options);
-    trackCommandUsage('project-create', { type: template.name }, derivedAccountId);
-    await createProjectConfig(path.resolve(getCwd(), options.dest || dest), options.name || name, template, options.templateSource, githubRef);
+    const projectTemplates = await getProjectTemplateListFromRepo(templateSource, latestRepoReleaseTag || DEFAULT_PROJECT_TEMPLATE_BRANCH);
+    if (!projectTemplates.length) {
+        logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const createProjectPromptResponse = await createProjectPrompt(options, projectTemplates);
+    const projectDest = path.resolve(getCwd(), createProjectPromptResponse.dest);
+    trackCommandUsage('project-create', { type: createProjectPromptResponse.projectTemplate.name }, derivedAccountId);
+    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
+    // Exit if the target destination is within an existing project
+    if (existingProjectConfig && projectDest.startsWith(existingProjectDir)) {
+        logger.error(i18n(`${i18nKey}.errors.cannotNestProjects`, {
+            projectDir: existingProjectDir,
+        }));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    try {
+        await cloneGithubRepo(templateSource, projectDest, {
+            sourceDir: createProjectPromptResponse.projectTemplate.path,
+            tag: latestRepoReleaseTag,
+            hideLogs: true,
+        });
+    }
+    catch (err) {
+        debugError(err);
+        logger.error(i18n(`${i18nKey}.errors.failedToDownloadProject`));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
+    const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
+    writeProjectConfig(projectConfigPath, {
+        ...parsedConfigFile,
+        name: createProjectPromptResponse.name,
+    });
+    // If the template is 'no-template', we need to manually create a src directory
+    if (createProjectPromptResponse.projectTemplate.name ===
+        EMPTY_PROJECT_TEMPLATE_NAME) {
+        fs.ensureDirSync(path.join(projectDest, 'src'));
+    }
+    logger.log('');
+    logger.success(i18n(`${i18nKey}.logs.success`, {
+        projectName: createProjectPromptResponse.name,
+        projectDest,
+    }));
     logger.log('');
     logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
     uiFeatureHighlight([
@@ -35,6 +89,7 @@ exports.handler = async (options) => {
         'feedbackCommand',
         'sampleProjects',
     ]);
+    process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs.options({

package/commands/project/migrateApp.js

@@ -71,9 +71,9 @@ exports.handler = async (options) => {
     let projectName;
     let projectDest;
     try {
-        const { name, dest } = await createProjectPrompt('', options, true);
-        projectName = options.name || name;
-        projectDest = options.dest || dest;
+        const createProjectPromptResponse = await createProjectPrompt(options);
+        projectName = createProjectPromptResponse.name;
+        projectDest = createProjectPromptResponse.dest;
         const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
             allowCreate: false,
             noLogs: true,

package/commands/project/upload.js

@@ -20,7 +20,7 @@ const i18nKey = 'commands.project.subcommands.upload';
 exports.command = 'upload';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    const { forceCreate, message, derivedAccountId, bypassValidation } = options;
+    const { forceCreate, message, derivedAccountId } = options;
     const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     const { projectConfig, projectDir } = await getProjectConfig();
@@ -31,7 +31,7 @@ exports.handler = async (options) => {
         uploadCommand: true,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, useV3Api(projectConfig?.platformVersion), bypassValidation);
+        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, useV3Api(projectConfig?.platformVersion));
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -81,11 +81,6 @@ exports.builder = yargs => {
             type: 'string',
             default: '',
         },
-        'bypass-validation': {
-            type: 'boolean',
-            hidden: true,
-            default: false,
-        },
     });
     yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);

package/lang/en.lyaml

@@ -530,7 +530,12 @@ en:
             default: "Start local dev for the current project"
         create:
           describe: "Create a new project."
+          errors:
+            failedToDownloadProject: "Failed to download project. Please try again later."
+            failedToFetchProjectList: "Failed to fetch the list of available project templates. Please try again later."
+            cannotNestProjects: "A project already exists at {{ projectDir }}. Projects cannot be nested within other projects. Please choose a different destination and try again."
           logs:
+            success: "Project {{#bold}}{{ projectName }}{{/bold}} was successfully created in {{ projectDest }}"
             welcomeMessage: "Welcome to HubSpot Developer Projects!"
           examples:
             default: "Create a new project"
@@ -603,12 +608,13 @@ en:
               describe: "The name for your newly created component"
             type:
               describe: "The path to the component type's location within the hubspot-project-components Github repo: https://github.com/HubSpot/hubspot-project-components"
-          creatingComponent:
-            message: "Adding a new component to your project"
-          success:
-            message: "{{ componentName }} was added to your project"
+          creatingComponent: "Adding a new component to {{#bold}}{{ projectName }}{{/bold}}"
+          success: "{{ componentName }} was successfully added to your project."
           error:
-            locationInProject: "The component location must be within a project folder"
+            failedToDownloadComponent: "Failed to download project component. Please try again later."
+            locationInProject: "This command must be run from within a project directory."
+            failedToFetchComponentList: "Failed to fetch the list of available components. Please try again later."
+            projectContainsPublicApp: "This project contains a public app. This command is currently only compatible with projects that contain private apps."
           examples:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
@@ -1106,6 +1112,11 @@ en:
       checkIfParentAccountIsAuthed:
         notAuthedError: "To develop this project locally, run {{ authCommand }} to authenticate the App Developer Account {{ accountId }} associated with {{ accountIdentifier }}."
     projects:
+      create:
+        errors:
+          noProjectsInConfig: "Unable to find any projects in the target repository's config.json file. Please ensure that there is a \"projects\" array in the config file."
+          missingConfigFileTemplateSource: "Failed to fetch the config.json file from the target repository. Please ensure that there is a valid config.json file at the root of the repository and try again."
+          missingPropertiesInConfig: "Found misconfigured projects in the target repository's config.json file. Please ensure that each project in the target repository's config.json file contains the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
       validateProjectConfig:
         configNotFound: "Unable to locate a project configuration file. Try running again from a project directory, or run {{ createCommand }} to create a new project."
         configMissingFields: "The project configuruation file is missing required fields."
@@ -1313,12 +1324,9 @@ en:
         errors:
           nameRequired: "A project name is required"
           destRequired: "A project dest is required"
-          invalidDest: "The selected destination already exists. Please provide a new path for this project."
+          invalidDest: "There is an existing project at this destination. Please provide a new path for this project."
           invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again."
-          invalidTemplate: "[--template] Could not find template {{ template }}. Please choose an available template."
-          noProjectsInConfig: "Please ensure that there is a config.json file that contains a \"projects\" field."
-          missingConfigFileTemplateSource: "Please ensure that there is a config.json file in the repository used as the --template-source"
-          missingPropertiesInConfig: "Please ensure that each of the projects in your config.json file contain the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
+          invalidTemplate: "[--template] Could not find template \"{{ template }}\". Please choose an available template:"
       selectPublicAppPrompt:
         selectAppIdMigrate: "[--appId] Choose an app under {{ accountName }} to migrate:"
         selectAppIdClone: "[--appId] Choose an app under {{ accountName }} to clone:"
@@ -1336,11 +1344,11 @@ en:
           projectNotFound: "Your project {{ projectName }} could not be found in {{ accountId }}. Please select a valid project:"
           accountIdRequired: "An account ID is required to download a project."
       projectAddPrompt:
-        selectType: "[--type] Select your component type:"
+        selectType: "[--type] Select a component to add: "
         enterName: "[--name] Give your component a name: "
         errors:
           nameRequired: "A component name is required"
-          invalidType: "[--type] Could not find type {{ type }}. Please choose an available type."
+          invalidType: "[--type] Could not find type \"{{ type }}\". Please choose an available type:"
       secretPrompt:
         enterValue: "Enter a value for your secret: "
         enterName: "Enter a name for your secret: "

package/lib/projects/create.d.ts

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

package/lib/projects/create.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EMPTY_PROJECT_TEMPLATE_NAME = void 0;
+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';
+exports.EMPTY_PROJECT_TEMPLATE_NAME = 'no-template';
+const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path', 'insertPath'];
+async function getProjectComponentListFromRepo(githubRef) {
+    let config;
+    try {
+        const { data } = await (0, github_1.fetchRepoFile)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', githubRef);
+        config = data;
+    }
+    catch (err) {
+        (0, index_1.debugError)(err);
+    }
+    if (config) {
+        return config[constants_1.PROJECT_COMPONENT_TYPES.COMPONENTS] || [];
+    }
+    return [];
+}
+async function getProjectTemplateListFromRepo(templateSource, githubRef) {
+    let config;
+    try {
+        const { data } = await (0, github_1.fetchRepoFile)(templateSource, 'config.json', githubRef);
+        config = data;
+    }
+    catch (e) {
+        (0, index_1.debugError)(e);
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.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`));
+        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`));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    return templates;
+}

package/lib/projects/index.d.ts

@@ -1,13 +1,11 @@
-import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
-import { ProjectTemplate, ProjectConfig, ProjectAddComponentData, ComponentTemplate } from '../../types/Projects';
+import { ProjectConfig } from '../../types/Projects';
 export declare function writeProjectConfig(configPath: string, config: ProjectConfig): boolean;
 export declare function getIsInProject(dir?: string): boolean;
 export declare function getProjectConfig(dir?: string): Promise<{
     projectDir: string | null;
     projectConfig: ProjectConfig | null;
 }>;
-export declare function createProjectConfig(projectPath: string, projectName: string, template: ProjectTemplate, templateSource: RepoPath, githubRef: string): Promise<boolean>;
 export declare function validateProjectConfig(projectConfig: ProjectConfig, projectDir: string): void;
 export declare function ensureProjectExists(accountId: number, projectName: string, { forceCreate, allowCreate, noLogs, withPolling, uploadCommand, }?: {
     forceCreate?: boolean | undefined;
@@ -20,5 +18,3 @@ export declare function ensureProjectExists(accountId: number, projectName: stri
     project?: Project;
 }>;
 export declare function logFeedbackMessage(buildId: number): void;
-export declare function createProjectComponent(component: ProjectAddComponentData, name: string, projectComponentsVersion: string): Promise<void>;
-export declare function getProjectComponentsByVersion(projectComponentsVersion: string): Promise<ComponentTemplate[]>;

package/lib/projects/index.js

@@ -6,17 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeProjectConfig = writeProjectConfig;
 exports.getIsInProject = getIsInProject;
 exports.getProjectConfig = getProjectConfig;
-exports.createProjectConfig = createProjectConfig;
 exports.validateProjectConfig = validateProjectConfig;
 exports.ensureProjectExists = ensureProjectExists;
 exports.logFeedbackMessage = logFeedbackMessage;
-exports.createProjectComponent = createProjectComponent;
-exports.getProjectComponentsByVersion = getProjectComponentsByVersion;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const github_1 = require("@hubspot/local-dev-lib/github");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const path_2 = require("@hubspot/local-dev-lib/path");
@@ -53,7 +49,7 @@ function getProjectConfigPath(dir) {
     return configPath;
 }
 async function getProjectConfig(dir) {
-    const configPath = await getProjectConfigPath(dir);
+    const configPath = getProjectConfigPath(dir);
     if (!configPath) {
         return { projectConfig: null, projectDir: null };
     }
@@ -70,45 +66,6 @@ async function getProjectConfig(dir) {
         return { projectConfig: null, projectDir: null };
     }
 }
-async function createProjectConfig(projectPath, projectName, template, templateSource, githubRef) {
-    const { projectConfig, projectDir } = await getProjectConfig(projectPath);
-    if (projectConfig) {
-        logger_1.logger.warn(projectPath === projectDir
-            ? 'A project already exists in that location.'
-            : `Found an existing project definition in ${projectDir}.`);
-        const { shouldContinue } = await (0, promptUtils_1.promptUser)([
-            {
-                name: 'shouldContinue',
-                message: () => {
-                    return projectPath === projectDir
-                        ? 'Do you want to overwrite the existing project definition with a new one?'
-                        : `Continue creating a new project in ${projectPath}?`;
-                },
-                type: 'confirm',
-                default: false,
-            },
-        ]);
-        if (!shouldContinue) {
-            return false;
-        }
-    }
-    const projectConfigPath = path_1.default.join(projectPath, constants_1.PROJECT_CONFIG_FILE);
-    logger_1.logger.log(`Creating project config in ${projectPath ? projectPath : 'the current folder'}`);
-    const hasCustomTemplateSource = Boolean(templateSource);
-    await (0, github_1.cloneGithubRepo)(templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectPath, {
-        sourceDir: template.path,
-        tag: hasCustomTemplateSource ? undefined : githubRef,
-    });
-    const _config = JSON.parse(fs_extra_1.default.readFileSync(projectConfigPath).toString());
-    writeProjectConfig(projectConfigPath, {
-        ..._config,
-        name: projectName,
-    });
-    if (template.name === 'no-template') {
-        fs_extra_1.default.ensureDirSync(path_1.default.join(projectPath, 'src'));
-    }
-    return true;
-}
 function validateProjectConfig(projectConfig, projectDir) {
     if (!projectConfig) {
         logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.validateProjectConfig.configNotFound`, {
@@ -235,21 +192,3 @@ function logFeedbackMessage(buildId) {
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logFeedbackMessage.feedbackMessage`));
     }
 }
-async function createProjectComponent(component, name, projectComponentsVersion) {
-    const i18nKey = 'commands.project.subcommands.add';
-    const componentName = name;
-    const configInfo = await getProjectConfig();
-    if (!configInfo.projectDir || !configInfo.projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.locationInProject`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    const componentPath = path_1.default.join(configInfo.projectDir, configInfo.projectConfig.srcDir, component.insertPath, componentName);
-    await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, componentPath, {
-        sourceDir: component.path,
-        tag: projectComponentsVersion,
-    });
-}
-async function getProjectComponentsByVersion(projectComponentsVersion) {
-    const config = await (0, github_1.fetchFileFromRepository)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', projectComponentsVersion);
-    return config[constants_1.PROJECT_COMPONENT_TYPES.COMPONENTS] || [];
-}

package/lib/projects/upload.d.ts

@@ -5,5 +5,5 @@ 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>>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

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

package/lib/prompts/createProjectPrompt.d.ts

@@ -1,14 +1,12 @@
-import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
 import { ProjectTemplate } from '../../types/Projects';
 type CreateProjectPromptResponse = {
     name: string;
     dest: string;
-    template: ProjectTemplate;
+    projectTemplate?: ProjectTemplate;
 };
-export declare function createProjectPrompt(githubRef: string, promptOptions: {
-    name: string;
-    dest: string;
-    template: string;
-    templateSource: RepoPath;
-}, skipTemplatePrompt?: boolean): Promise<CreateProjectPromptResponse>;
+export declare function createProjectPrompt(promptOptions: {
+    name?: string;
+    dest?: string;
+    template?: string;
+}, projectTemplates?: ProjectTemplate[]): Promise<CreateProjectPromptResponse>;
 export {};

package/lib/prompts/createProjectPrompt.js

@@ -7,52 +7,17 @@ exports.createProjectPrompt = createProjectPrompt;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
-const github_1 = require("@hubspot/local-dev-lib/github");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const constants_1 = require("../constants");
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
-const exitCodes_1 = require("../enums/exitCodes");
 const i18nKey = 'lib.prompts.createProjectPrompt';
-const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path', 'insertPath'];
-function hasAllProperties(projectList) {
-    return projectList.every(config => PROJECT_TEMPLATE_PROPERTIES.every(p => Object.prototype.hasOwnProperty.call(config, p)));
-}
-async function createTemplateOptions(templateSource, githubRef) {
-    const hasCustomTemplateSource = Boolean(templateSource);
-    const branch = hasCustomTemplateSource
-        ? constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH
-        : githubRef;
-    let config;
-    try {
-        config = await (0, github_1.fetchFileFromRepository)(templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'config.json', branch);
-    }
-    catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.missingConfigFileTemplateSource`));
-        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`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    if (!hasAllProperties(config[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS])) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.missingPropertiesInConfig`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    return config[constants_1.PROJECT_COMPONENT_TYPES.PROJECTS];
-}
-function findTemplate(projectTemplates, templateNameOrLabel) {
+function findTemplateByNameOrLabel(projectTemplates, templateNameOrLabel) {
     return projectTemplates.find(t => t.name === templateNameOrLabel || t.label === templateNameOrLabel);
 }
-async function createProjectPrompt(githubRef, promptOptions, skipTemplatePrompt = false) {
-    let projectTemplates = [];
-    let selectedTemplate;
-    if (!skipTemplatePrompt) {
-        projectTemplates = await createTemplateOptions(promptOptions.templateSource, githubRef);
-        selectedTemplate =
-            promptOptions.template &&
-                findTemplate(projectTemplates, promptOptions.template);
-    }
+async function createProjectPrompt(promptOptions, projectTemplates) {
+    const createProjectFromTemplate = !!projectTemplates && projectTemplates.length > 0;
+    const providedTemplateIsValid = createProjectFromTemplate &&
+        !!promptOptions.template &&
+        !!findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     const result = await (0, promptUtils_1.promptUser)([
         {
             name: 'name',
@@ -70,7 +35,7 @@ async function createProjectPrompt(githubRef, promptOptions, skipTemplatePrompt
             message: (0, lang_1.i18n)(`${i18nKey}.enterDest`),
             when: !promptOptions.dest,
             default: answers => {
-                const projectName = (0, path_2.sanitizeFileName)(answers.name || promptOptions.name);
+                const projectName = (0, path_2.sanitizeFileName)(promptOptions.name || answers.name);
                 return path_1.default.resolve((0, path_2.getCwd)(), projectName);
             },
             validate: (input) => {
@@ -90,27 +55,34 @@ async function createProjectPrompt(githubRef, promptOptions, skipTemplatePrompt
             },
         },
         {
-            name: 'template',
+            name: 'projectTemplate',
             message: () => {
-                return promptOptions.template &&
-                    !findTemplate(projectTemplates, promptOptions.template)
+                return promptOptions.template && !providedTemplateIsValid
                     ? (0, lang_1.i18n)(`${i18nKey}.errors.invalidTemplate`, {
                         template: promptOptions.template,
                     })
                     : (0, lang_1.i18n)(`${i18nKey}.selectTemplate`);
             },
-            when: !skipTemplatePrompt && !selectedTemplate,
+            when: createProjectFromTemplate && !providedTemplateIsValid,
             type: 'list',
-            choices: projectTemplates.map(template => {
-                return {
-                    name: template.label,
-                    value: template,
-                };
-            }),
+            choices: createProjectFromTemplate
+                ? projectTemplates.map(template => {
+                    return {
+                        name: template.label,
+                        value: template,
+                    };
+                })
+                : undefined,
         },
     ]);
-    if (selectedTemplate) {
-        result.template = selectedTemplate;
+    if (!result.name) {
+        result.name = promptOptions.name;
+    }
+    if (!result.dest) {
+        result.dest = promptOptions.dest;
+    }
+    if (providedTemplateIsValid) {
+        result.projectTemplate = findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     }
     return result;
 }

package/lib/prompts/projectAddPrompt.d.ts

@@ -1,9 +1,9 @@
-import { ProjectAddComponentData } from '../../types/Projects';
+import { ComponentTemplate } from '../../types/Projects';
 type ProjectAddPromptResponse = {
-    component: ProjectAddComponentData;
+    componentTemplate: ComponentTemplate;
     name: string;
 };
-export declare function projectAddPrompt(components: ProjectAddComponentData[], promptOptions?: {
+export declare function projectAddPrompt(components: ComponentTemplate[], promptOptions?: {
     name?: string;
     type?: string;
 }): Promise<ProjectAddPromptResponse>;

package/lib/prompts/projectAddPrompt.js

@@ -4,20 +4,23 @@ exports.projectAddPrompt = projectAddPrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const i18nKey = 'lib.prompts.projectAddPrompt';
+function findComponentByPathOrLabel(components, componentPathOrLabel) {
+    return components.find(c => c.path === componentPathOrLabel || c.label === componentPathOrLabel);
+}
 async function projectAddPrompt(components, promptOptions = {}) {
-    return (0, promptUtils_1.promptUser)([
+    const providedTypeIsValid = !!promptOptions.type &&
+        !!findComponentByPathOrLabel(components, promptOptions.type);
+    const result = await (0, promptUtils_1.promptUser)([
         {
-            name: 'component',
+            name: 'componentTemplate',
             message: () => {
-                return promptOptions.type &&
-                    !components.find(t => t.path === promptOptions.type)
+                return promptOptions.type && !providedTypeIsValid
                     ? (0, lang_1.i18n)(`${i18nKey}.errors.invalidType`, {
                         type: promptOptions.type,
                     })
                     : (0, lang_1.i18n)(`${i18nKey}.selectType`);
             },
-            when: !promptOptions.type ||
-                !components.find(t => t.path === promptOptions.type),
+            when: !providedTypeIsValid,
             type: 'list',
             choices: components.map(type => {
                 return {
@@ -38,4 +41,11 @@ async function projectAddPrompt(components, promptOptions = {}) {
             },
         },
     ]);
+    if (!result.name) {
+        result.name = promptOptions.name;
+    }
+    if (providedTypeIsValid) {
+        result.componentTemplate = findComponentByPathOrLabel(components, promptOptions.type);
+    }
+    return result;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.15-experimental.0",
+    "version": "7.0.16-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.3.1",
-        "@hubspot/project-parsing-lib": "0.0.6-beta.0",
+        "@hubspot/project-parsing-lib": "0.0.6-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.42",

package/types/Projects.d.ts

@@ -7,8 +7,8 @@ export type ProjectTemplate = {
     insertPath: string;
 };
 export type ComponentTemplate = {
-    label: string;
     path: string;
+    label: string;
     insertPath: string;
 };
 export type ProjectConfig = {
@@ -32,11 +32,6 @@ export type ProjectPollStatusFunctionText = {
     TYPE_KEY: string;
     SUBTASK_NAME_KEY: string;
 };
-export type ProjectAddComponentData = {
-    path: string;
-    label: string;
-    insertPath: string;
-};
 export type ProjectTemplateRepoConfig = {
     projects?: ProjectTemplate[];
     components?: ComponentTemplate[];