@hubspot/cli 7.7.16-experimental.1 → 7.7.16-experimental.10

package/lib/prompts/selectProjectTemplatePrompt.d.ts

@@ -0,0 +1,26 @@
+import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplate } from '../../types/Projects';
+export type SelectProjectTemplatePromptResponse = {
+    projectTemplate?: ProjectTemplate;
+    componentTemplates?: ComponentTemplate[];
+};
+type SelectProjectTemplatePromptResponseProjectTemplate = {
+    projectTemplate: ProjectTemplate;
+    componentTemplates: undefined;
+};
+type SelectProjectTemplatePromptResponseComponentTemplates = {
+    projectTemplate?: undefined;
+    componentTemplates?: ComponentTemplate[];
+};
+export type ProjectNameAndDestPromptResponse = {
+    name: string;
+    dest: string;
+};
+export type PromptOptionsArg = {
+    name?: string;
+    dest?: string;
+    template?: string;
+    features?: string[];
+};
+export declare function selectProjectTemplatePrompt(promptOptions: PromptOptionsArg, projectTemplates?: ProjectTemplate[], componentTemplates?: undefined): Promise<SelectProjectTemplatePromptResponseProjectTemplate>;
+export declare function selectProjectTemplatePrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined, componentTemplates?: ComponentTemplateChoice[]): Promise<SelectProjectTemplatePromptResponseComponentTemplates>;
+export {};

package/lib/prompts/{createProjectPrompt.js → selectProjectTemplatePrompt.js}

@@ -1,31 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectPrompt = createProjectPrompt;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const path_2 = require("@hubspot/local-dev-lib/path");
+exports.selectProjectTemplatePrompt = selectProjectTemplatePrompt;
 const promptUtils_1 = require("./promptUtils");
-const constants_1 = require("../constants");
 const en_1 = require("../../lang/en");
-function validateProjectDirectory(input) {
-    if (!input) {
-        return en_1.lib.prompts.createProjectPrompt.errors.destRequired;
-    }
-    if (fs_1.default.existsSync(path_1.default.resolve((0, path_2.getCwd)(), path_1.default.join(input, constants_1.PROJECT_CONFIG_FILE)))) {
-        return en_1.lib.prompts.createProjectPrompt.errors.invalidDest;
-    }
-    if (!(0, path_2.isValidPath)(input)) {
-        return en_1.lib.prompts.createProjectPrompt.errors.invalidCharacters;
-    }
-    return true;
-}
 function findTemplateByNameOrLabel(projectTemplates, templateNameOrLabel) {
     return projectTemplates.find(t => t.name === templateNameOrLabel || t.label === templateNameOrLabel);
 }
-async function createProjectPrompt(promptOptions, projectTemplates, componentTemplates) {
+async function selectProjectTemplatePrompt(promptOptions, projectTemplates, componentTemplates) {
     const createProjectFromTemplate = !!projectTemplates && projectTemplates.length > 0;
     const createProjectFromComponents = Array.isArray(componentTemplates) && componentTemplates?.length > 0;
     const selectedComponents = [];
@@ -46,36 +27,12 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
         !!promptOptions.template &&
         !!findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     const result = await (0, promptUtils_1.promptUser)([
-        {
-            name: 'name',
-            message: en_1.lib.prompts.createProjectPrompt.enterName,
-            when: !promptOptions.name,
-            validate: (input) => {
-                if (!input) {
-                    return en_1.lib.prompts.createProjectPrompt.errors.nameRequired;
-                }
-                return true;
-            },
-        },
-        {
-            name: 'dest',
-            message: en_1.lib.prompts.createProjectPrompt.enterDest,
-            when: !promptOptions.dest,
-            default: answers => {
-                const projectName = (0, path_2.sanitizeFileName)(promptOptions.name || answers.name);
-                return path_1.default.resolve((0, path_2.getCwd)(), projectName);
-            },
-            validate: validateProjectDirectory,
-            filter: input => {
-                return (0, path_2.untildify)(input);
-            },
-        },
         {
             name: 'projectTemplate',
             message: () => {
                 return promptOptions.template && !providedTemplateIsValid
-                    ? en_1.lib.prompts.createProjectPrompt.errors.invalidTemplate(promptOptions.template)
-                    : en_1.lib.prompts.createProjectPrompt.selectTemplate;
+                    ? en_1.lib.prompts.selectProjectTemplatePrompt.errors.invalidTemplate(promptOptions.template)
+                    : en_1.lib.prompts.selectProjectTemplatePrompt.selectTemplate;
             },
             when: createProjectFromTemplate && !providedTemplateIsValid,
             type: 'list',
@@ -90,7 +47,7 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
         },
         {
             name: 'componentTemplates',
-            message: en_1.lib.prompts.createProjectPrompt.features,
+            message: en_1.lib.prompts.selectProjectTemplatePrompt.features,
             when: !promptOptions.features &&
                 createProjectFromComponents &&
                 selectedComponents.length === 0,
@@ -98,12 +55,6 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
             choices: componentTemplates,
         },
     ]);
-    if (!result.name) {
-        result.name = promptOptions.name;
-    }
-    if (!result.dest) {
-        result.dest = promptOptions.dest;
-    }
     if (!result.componentTemplates) {
         result.componentTemplates = selectedComponents;
     }
@@ -112,7 +63,7 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
     }
     if (projectTemplates && projectTemplates.length > 0) {
         if (!result.projectTemplate) {
-            throw new Error(en_1.lib.prompts.createProjectPrompt.errors.projectTemplateRequired);
+            throw new Error(en_1.lib.prompts.selectProjectTemplatePrompt.errors.projectTemplateRequired);
         }
         return result;
     }

package/lib/validation.d.ts

@@ -4,7 +4,7 @@ export declare function validateAccount(options: Arguments<{
     account?: string;
     accountId?: string;
     derivedAccountId?: number;
-    providedAccountId?: string;
+    userProvidedAccount?: string;
 }>): Promise<boolean>;
 export declare function validateCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;

package/lib/validation.js

@@ -50,18 +50,18 @@ const path_1 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("./commonOpts");
 const index_1 = require("./errorHandlers/index");
 async function validateAccount(options) {
-    const { derivedAccountId, providedAccountId } = options;
+    const { derivedAccountId, userProvidedAccount } = options;
     const accountId = (0, config_1.getAccountId)(derivedAccountId);
     if (!accountId) {
-        if (providedAccountId) {
-            logger_1.logger.error(`The account "${providedAccountId}" could not be found in the config`);
+        if (userProvidedAccount) {
+            logger_1.logger.error(`The account "${userProvidedAccount}" could not be found in the config`);
         }
         else {
             logger_1.logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
         }
         return false;
     }
-    if (providedAccountId && (0, config_1.loadConfigFromEnvironment)()) {
+    if (userProvidedAccount && (0, config_1.loadConfigFromEnvironment)()) {
         throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
     }
     const accountConfig = (0, config_1.getAccountConfig)(accountId);

package/mcp-server/tools/project/CreateProjectTool.d.ts

@@ -14,17 +14,17 @@ declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.16-experimental.1",
+    "version": "7.7.16-experimental.10",
     "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.10.0-beta.0",
-        "@hubspot/project-parsing-lib": "0.3.2",
+        "@hubspot/local-dev-lib": "3.13.0",
+        "@hubspot/project-parsing-lib": "0.5.1",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",

package/types/LocalDev.d.ts

@@ -8,6 +8,7 @@ import { APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/
 export type LocalDevStateConstructorOptions = {
     targetProjectAccountId: number;
     targetTestingAccountId: number;
+    profile?: string;
     projectConfig: ProjectConfig;
     projectDir: string;
     projectId: number;

package/types/Yargs.d.ts

@@ -2,7 +2,7 @@ import { Options, CommandModule, Argv } from 'yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 export type CommonArgs = {
     derivedAccountId: number;
-    providedAccountId?: number;
+    userProvidedAccount?: string;
     d: boolean;
     debug: boolean;
 };

package/lib/prompts/createProjectPrompt.d.ts

@@ -1,28 +0,0 @@
-import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplate } from '../../types/Projects';
-export type CreateProjectPromptResponse = {
-    name: string;
-    dest: string;
-    projectTemplate?: ProjectTemplate;
-    componentTemplates?: ComponentTemplate[];
-};
-type CreateProjectPromptResponseProjectTemplate = {
-    name: string;
-    dest: string;
-    projectTemplate: ProjectTemplate;
-    componentTemplates: undefined;
-};
-type CreateProjectPromptResponseComponentTemplates = {
-    name: string;
-    dest: string;
-    projectTemplate?: undefined;
-    componentTemplates?: ComponentTemplate[];
-};
-type PromptOptionsArg = {
-    name?: string;
-    dest?: string;
-    template?: string;
-    features?: string[];
-};
-export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: ProjectTemplate[], componentTemplates?: undefined): Promise<CreateProjectPromptResponseProjectTemplate>;
-export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined, componentTemplates?: ComponentTemplateChoice[]): Promise<CreateProjectPromptResponseComponentTemplates>;
-export {};