@hubspot/cli 7.5.1-beta.0 → 7.5.2-beta.0

package/lib/projects/localDev/LocalDevProcess.d.ts

@@ -8,6 +8,10 @@ declare class LocalDevProcess {
     private devServerManager;
     constructor(options: LocalDevStateConstructorOptions);
     get projectDir(): string;
+    get projectId(): number;
+    get projectName(): string;
+    get targetProjectAccountId(): number;
+    get targetTestingAccountId(): number;
     get projectNodes(): {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     };

package/lib/projects/localDev/LocalDevProcess.js

@@ -28,6 +28,18 @@ class LocalDevProcess {
     get projectDir() {
         return this.state.projectDir;
     }
+    get projectId() {
+        return this.state.projectId;
+    }
+    get projectName() {
+        return this.state.projectName;
+    }
+    get targetProjectAccountId() {
+        return this.state.targetProjectAccountId;
+    }
+    get targetTestingAccountId() {
+        return this.state.targetTestingAccountId;
+    }
     get projectNodes() {
         return this.state.projectNodes;
     }

package/lib/projects/localDev/LocalDevState.d.ts

@@ -2,13 +2,14 @@ import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { ProjectConfig } from '../../../types/Projects';
-import { LocalDevStateConstructorOptions, LocalDevStateListener } from '../../../types/LocalDev';
+import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData } from '../../../types/LocalDev';
 declare class LocalDevState {
     private _targetProjectAccountId;
     private _targetTestingAccountId;
     private _projectConfig;
     private _projectDir;
     private _projectId;
+    private _projectName;
     private _debug;
     private _deployedBuild?;
     private _isGithubLinked;
@@ -16,13 +17,15 @@ declare class LocalDevState {
     private _env;
     private _listeners;
     private _configFilesUpdatedSinceLastUpload;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }: LocalDevStateConstructorOptions);
+    private _appData;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }: LocalDevStateConstructorOptions);
     private runListeners;
     get targetProjectAccountId(): number;
     get targetTestingAccountId(): number;
     get projectConfig(): ProjectConfig;
     get projectDir(): string;
     get projectId(): number;
+    get projectName(): string;
     get debug(): boolean;
     get deployedBuild(): Build | undefined;
     get isGithubLinked(): boolean;
@@ -36,6 +39,9 @@ declare class LocalDevState {
     get configFilesUpdatedSinceLastUpload(): Set<string>;
     addUpdatedConfigFileUpdatedSinceLastUpload(filePath: string): void;
     resetConfigFilesUpdatedSinceLastUpload(): void;
+    get appData(): Record<string, AppLocalDevData>;
+    getAppDataByUid(uid: string): AppLocalDevData | undefined;
+    setAppDataForUid(uid: string, appData: AppLocalDevData): void;
     addListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>, callOnInit?: boolean): void;
 }
 export default LocalDevState;

package/lib/projects/localDev/LocalDevState.js

@@ -6,6 +6,7 @@ class LocalDevState {
     _projectConfig;
     _projectDir;
     _projectId;
+    _projectName;
     _debug;
     _deployedBuild;
     _isGithubLinked;
@@ -13,18 +14,21 @@ class LocalDevState {
     _env;
     _listeners;
     _configFilesUpdatedSinceLastUpload;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }) {
+    _appData;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }) {
         this._targetProjectAccountId = targetProjectAccountId;
         this._targetTestingAccountId = targetTestingAccountId;
         this._projectConfig = projectConfig;
         this._projectDir = projectDir;
         this._projectId = projectId;
+        this._projectName = projectName;
         this._debug = debug || false;
         this._deployedBuild = deployedBuild;
         this._isGithubLinked = isGithubLinked;
         this._projectNodes = initialProjectNodes;
         this._env = env;
         this._configFilesUpdatedSinceLastUpload = new Set();
+        this._appData = {};
         this._listeners = {};
     }
     runListeners(key) {
@@ -49,6 +53,9 @@ class LocalDevState {
     get projectId() {
         return this._projectId;
     }
+    get projectName() {
+        return this._projectName;
+    }
     get debug() {
         return this._debug;
     }
@@ -79,6 +86,16 @@ class LocalDevState {
     resetConfigFilesUpdatedSinceLastUpload() {
         this._configFilesUpdatedSinceLastUpload.clear();
     }
+    get appData() {
+        return { ...this._appData };
+    }
+    getAppDataByUid(uid) {
+        return { ...this._appData[uid] };
+    }
+    setAppDataForUid(uid, appData) {
+        this._appData[uid] = appData;
+        this.runListeners('appData');
+    }
     addListener(key, listener, callOnInit = false) {
         if (!this._listeners[key]) {
             this._listeners[key] = [];

package/lib/projects/localDev/LocalDevWebsocketServer.d.ts

@@ -12,6 +12,7 @@ declare class LocalDevWebsocketServer {
     private sendMessage;
     private handleUpload;
     private setupMessageHandlers;
+    private sendProjectData;
     private setupStateListeners;
     start(): Promise<void>;
     shutdown(): void;

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -75,6 +75,17 @@ class LocalDevWebsocketServer {
             }
         });
     }
+    sendProjectData() {
+        this.sendMessage({
+            type: constants_1.LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPDATE_PROJECT_DATA,
+            data: {
+                projectName: this.localDevProcess.projectName,
+                projectId: this.localDevProcess.projectId,
+                targetProjectAccountId: this.localDevProcess.targetProjectAccountId,
+                targetTestingAccountId: this.localDevProcess.targetTestingAccountId,
+            },
+        });
+    }
     setupStateListeners() {
         this.localDevProcess.addStateListener('projectNodes', nodes => {
             this.sendMessage({
@@ -82,6 +93,12 @@ class LocalDevWebsocketServer {
                 data: nodes,
             });
         }, true);
+        this.localDevProcess.addStateListener('appData', appData => {
+            this.sendMessage({
+                type: constants_1.LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPDATE_APP_DATA,
+                data: appData,
+            });
+        }, true);
     }
     async start() {
         const portManagerIsRunning = await (0, portManager_1.isPortManagerServerRunning)();
@@ -99,6 +116,7 @@ class LocalDevWebsocketServer {
                 return;
             }
             this._websocket = ws;
+            this.sendProjectData();
             this.setupMessageHandlers();
             this.setupStateListeners();
         });

package/lib/prompts/createProjectPrompt.d.ts

@@ -1,19 +1,28 @@
-import { ProjectTemplate } from '../../types/Projects';
-type CreateProjectPromptResponseWithTemplate = {
+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 CreateProjectPromptResponseWithoutTemplate = {
+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[]): Promise<CreateProjectPromptResponseWithTemplate>;
-export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined): Promise<CreateProjectPromptResponseWithoutTemplate>;
+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 {};

package/lib/prompts/createProjectPrompt.js

@@ -8,43 +8,58 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const promptUtils_1 = require("./promptUtils");
-const lang_1 = require("../lang");
 const constants_1 = require("../constants");
+const en_1 = require("../../lang/en");
 function validateProjectDirectory(input) {
     if (!input) {
-        return (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.destRequired`);
+        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 (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.invalidDest`);
+        return en_1.lib.prompts.createProjectPrompt.errors.invalidDest;
     }
     if (!(0, path_2.isValidPath)(input)) {
-        return (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.invalidCharacters`);
+        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) {
+async function createProjectPrompt(promptOptions, projectTemplates, componentTemplates) {
     const createProjectFromTemplate = !!projectTemplates && projectTemplates.length > 0;
+    const createProjectFromComponents = Array.isArray(componentTemplates) && componentTemplates?.length > 0;
+    const selectedComponents = [];
+    if (createProjectFromComponents && promptOptions.features) {
+        componentTemplates.forEach(template => {
+            if (!template.value) {
+                return;
+            }
+            if (promptOptions.features?.includes(template.value.type)) {
+                if (template.disabled) {
+                    throw new Error(`Cannot create project with template '${template.value.type}'. Reasons: ${template.disabled}`);
+                }
+                selectedComponents.push(template.value);
+            }
+        });
+    }
     const providedTemplateIsValid = createProjectFromTemplate &&
         !!promptOptions.template &&
         !!findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     const result = await (0, promptUtils_1.promptUser)([
         {
             name: 'name',
-            message: (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.enterName`),
+            message: en_1.lib.prompts.createProjectPrompt.enterName,
             when: !promptOptions.name,
             validate: (input) => {
                 if (!input) {
-                    return (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.nameRequired`);
+                    return en_1.lib.prompts.createProjectPrompt.errors.nameRequired;
                 }
                 return true;
             },
         },
         {
             name: 'dest',
-            message: (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.enterDest`),
+            message: en_1.lib.prompts.createProjectPrompt.enterDest,
             when: !promptOptions.dest,
             default: answers => {
                 const projectName = (0, path_2.sanitizeFileName)(promptOptions.name || answers.name);
@@ -59,10 +74,8 @@ async function createProjectPrompt(promptOptions, projectTemplates) {
             name: 'projectTemplate',
             message: () => {
                 return promptOptions.template && !providedTemplateIsValid
-                    ? (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.invalidTemplate`, {
-                        template: promptOptions.template,
-                    })
-                    : (0, lang_1.i18n)(`lib.prompts.createProjectPrompt.selectTemplate`);
+                    ? en_1.lib.prompts.createProjectPrompt.errors.invalidTemplate(promptOptions.template)
+                    : en_1.lib.prompts.createProjectPrompt.selectTemplate;
             },
             when: createProjectFromTemplate && !providedTemplateIsValid,
             type: 'list',
@@ -75,6 +88,13 @@ async function createProjectPrompt(promptOptions, projectTemplates) {
                 })
                 : undefined,
         },
+        {
+            name: 'componentTemplates',
+            message: '[--features] Which features would you like your app to include?',
+            when: createProjectFromComponents && selectedComponents.length === 0,
+            type: 'checkbox',
+            choices: componentTemplates,
+        },
     ]);
     if (!result.name) {
         result.name = promptOptions.name;
@@ -82,12 +102,15 @@ async function createProjectPrompt(promptOptions, projectTemplates) {
     if (!result.dest) {
         result.dest = promptOptions.dest;
     }
+    if (!result.componentTemplates) {
+        result.componentTemplates = selectedComponents;
+    }
     if (providedTemplateIsValid) {
         result.projectTemplate = findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     }
     if (projectTemplates && projectTemplates.length > 0) {
         if (!result.projectTemplate) {
-            throw new Error((0, lang_1.i18n)(`lib.prompts.createProjectPrompt.errors.projectTemplateRequired`));
+            throw new Error(en_1.lib.prompts.createProjectPrompt.errors.projectTemplateRequired);
         }
         return result;
     }

package/lib/prompts/projectAddPrompt.d.ts

@@ -1,10 +1,14 @@
-import { ComponentTemplate } from '../../types/Projects';
+import { ComponentTemplate, ComponentTemplateChoice } from '../../types/Projects';
 type ProjectAddPromptResponse = {
     componentTemplate: ComponentTemplate;
     name: string;
 };
+type ProjectAddPromptResponseV3 = {
+    componentTemplate: ComponentTemplate[];
+};
 export declare function projectAddPrompt(components: ComponentTemplate[], promptOptions?: {
     name?: string;
     type?: string;
 }): Promise<ProjectAddPromptResponse>;
+export declare function projectAddPromptV3(components: ComponentTemplateChoice[], selectedFeatures: string[] | undefined): Promise<ProjectAddPromptResponseV3>;
 export {};

package/lib/prompts/projectAddPrompt.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectAddPrompt = projectAddPrompt;
+exports.projectAddPromptV3 = projectAddPromptV3;
 const promptUtils_1 = require("./promptUtils");
-const lang_1 = require("../lang");
+const en_1 = require("../../lang/en");
 function findComponentByPathOrLabel(components, componentPathOrLabel) {
     return components.find(c => c.path === componentPathOrLabel || c.label === componentPathOrLabel);
 }
@@ -14,10 +15,8 @@ async function projectAddPrompt(components, promptOptions = {}) {
             name: 'componentTemplate',
             message: () => {
                 return promptOptions.type && !providedTypeIsValid
-                    ? (0, lang_1.i18n)(`lib.prompts.projectAddPrompt.errors.invalidType`, {
-                        type: promptOptions.type,
-                    })
-                    : (0, lang_1.i18n)(`lib.prompts.projectAddPrompt.selectType`);
+                    ? en_1.lib.prompts.projectAddPrompt.errors.invalidType(promptOptions.type)
+                    : en_1.lib.prompts.projectAddPrompt.selectType;
             },
             when: !providedTypeIsValid,
             type: 'list',
@@ -30,11 +29,11 @@ async function projectAddPrompt(components, promptOptions = {}) {
         },
         {
             name: 'name',
-            message: (0, lang_1.i18n)(`lib.prompts.projectAddPrompt.enterName`),
+            message: en_1.lib.prompts.projectAddPrompt.enterName,
             when: !promptOptions.name,
             validate: (input) => {
                 if (!input) {
-                    return (0, lang_1.i18n)(`lib.prompts.projectAddPrompt.errors.nameRequired`);
+                    return en_1.lib.prompts.projectAddPrompt.errors.nameRequired;
                 }
                 return true;
             },
@@ -48,3 +47,32 @@ async function projectAddPrompt(components, promptOptions = {}) {
     }
     return result;
 }
+async function projectAddPromptV3(components, selectedFeatures) {
+    const selectedComponents = [];
+    if (selectedFeatures) {
+        components.forEach(template => {
+            if (!template.value) {
+                return;
+            }
+            if (selectedFeatures?.includes(template.value.type)) {
+                if (template.disabled) {
+                    throw new Error(en_1.lib.prompts.projectAddPrompt.errors.cannotAddFeature(template.value.type, template.disabled));
+                }
+                selectedComponents.push(template.value);
+            }
+        });
+    }
+    const result = await (0, promptUtils_1.promptUser)([
+        {
+            name: 'componentTemplate',
+            message: en_1.lib.prompts.projectAddPrompt.selectType,
+            when: selectedComponents.length === 0,
+            type: 'checkbox',
+            choices: components,
+        },
+    ]);
+    if (!result.componentTemplate) {
+        result.componentTemplate = selectedComponents;
+    }
+    return result;
+}

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.5.1-beta.0",
+    "version": "7.5.2-beta.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.7.0",
+        "@hubspot/local-dev-lib": "3.7.1",
         "@hubspot/project-parsing-lib": "0.3.0",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
@@ -80,7 +80,8 @@
         "release": "yarn ts-node ./scripts/release.ts release",
         "hs": "yarn build && node ./dist/bin/hs",
         "hs-debug": "yarn build && NODE_DEBUG=http* node --inspect-brk ./dist/bin/hs",
-        "update-ldl": "yarn add --exact @hubspot/local-dev-lib@latest"
+        "update-ldl": "yarn add --exact @hubspot/local-dev-lib@latest",
+        "view-unreleased-changes": "node ./scripts/unreleasedChanges.js"
     },
     "lint-staged": {
         "**/*.{js,ts,scss,css}": [

package/types/LocalDev.d.ts

@@ -1,14 +1,17 @@
 import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
 import { ProjectConfig } from './Projects';
 import LocalDevState from '../lib/projects/localDev/LocalDevState';
+import { APP_INSTALLATION_STATES } from '../lib/constants';
 export type LocalDevStateConstructorOptions = {
     targetProjectAccountId: number;
     targetTestingAccountId: number;
     projectConfig: ProjectConfig;
     projectDir: string;
     projectId: number;
+    projectName: string;
     debug?: boolean;
     deployedBuild?: Build;
     isGithubLinked: boolean;
@@ -22,3 +25,9 @@ export type LocalDevWebsocketMessage = {
     data?: unknown;
 };
 export type LocalDevStateListener<K extends keyof LocalDevState> = (value: LocalDevState[K]) => void;
+export type AppLocalDevData = {
+    id: number;
+    clientId: string;
+    name: string;
+    installationState: ValueOf<typeof APP_INSTALLATION_STATES>;
+};

package/types/Projects.d.ts

@@ -1,15 +1,23 @@
 import { Build, SubbuildStatus } from '@hubspot/local-dev-lib/types/Build';
 import { Deploy, SubdeployStatus } from '@hubspot/local-dev-lib/types/Deploy';
+import { appComponent, marketplaceDistribution, oAuth, privateDistribution, staticAuth } from '../lib/constants';
 export type ProjectTemplate = {
     name: string;
     label: string;
     path: string;
-    insertPath: string;
 };
 export type ComponentTemplate = {
     path: string;
     label: string;
-    insertPath: string;
+    type: string;
+    parentComponent?: string;
+    supportedAuthTypes?: string[];
+    supportedDistributions?: string[];
+};
+export type ComponentTemplateChoice = {
+    name: string;
+    value: ComponentTemplate;
+    disabled?: string | boolean;
 };
 export type ProjectConfig = {
     name: string;
@@ -32,9 +40,18 @@ export type ProjectPollStatusFunctionText = {
     TYPE_KEY: string;
     SUBTASK_NAME_KEY: string;
 };
+export type ParentComponent = {
+    label: string;
+    type: typeof appComponent;
+    authType: typeof staticAuth | typeof oAuth;
+    distribution: typeof privateDistribution | typeof marketplaceDistribution;
+    path: string;
+};
 export type ProjectTemplateRepoConfig = {
     projects?: ProjectTemplate[];
     components?: ComponentTemplate[];
+    defaultFiles?: string;
+    parentComponents?: ParentComponent[];
 };
 export type ProjectPollResult = {
     succeeded: boolean;

package/lib/projects/create.d.ts

@@ -1,5 +0,0 @@
-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[]>;