@hubspot/cli 8.1.0 → 8.2.0

package/ui/components/getStarted/reducer.js

@@ -17,6 +17,13 @@ export function flowReducer(state, action) {
             return {
                 ...state,
                 project: { ...state.project, destination: action.payload },
+                destError: undefined,
+            };
+        case 'SET_DEST_ERROR':
+            return {
+                ...state,
+                step: GET_STARTED_FLOW_STEPS.DEST_INPUT,
+                destError: action.payload,
             };
         case 'SET_ERROR':
             return { ...state, error: action.payload };
@@ -66,6 +73,35 @@ export function flowReducer(state, action) {
                 statuses: { ...state.statuses, upload: ACTION_STATUSES.ERROR },
                 error: action.payload,
             };
+        case 'START_INSTALL_APP':
+            return {
+                ...state,
+                step: GET_STARTED_FLOW_STEPS.INSTALLING_APP,
+                statuses: { ...state.statuses, installApp: ACTION_STATUSES.RUNNING },
+                error: undefined,
+                pollingTimedOut: false,
+            };
+        case 'INSTALL_APP_DONE':
+            return {
+                ...state,
+                statuses: { ...state.statuses, installApp: ACTION_STATUSES.DONE },
+            };
+        case 'INSTALL_APP_ERROR':
+            return {
+                ...state,
+                statuses: { ...state.statuses, installApp: ACTION_STATUSES.ERROR },
+                error: action.payload,
+            };
+        case 'SET_BROWSER_FAILED_URL':
+            return {
+                ...state,
+                browserFailedUrl: action.payload,
+            };
+        case 'SET_POLLING_TIMED_OUT':
+            return {
+                ...state,
+                pollingTimedOut: action.payload,
+            };
         default:
             return state;
     }

package/ui/components/getStarted/screens/InstallationScreen.d.ts

@@ -0,0 +1,7 @@
+import { FlowState } from '../reducer.js';
+type InstallationScreenProps = {
+    state: FlowState;
+    accountName: string;
+};
+export declare function InstallationScreen({ state, accountName, }: InstallationScreenProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/ui/components/getStarted/screens/InstallationScreen.js

@@ -0,0 +1,16 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import { commands } from '../../../../lang/en.js';
+import { ActionSection } from '../../ActionSection.js';
+import { BoxWithTitle } from '../../BoxWithTitle.js';
+import { INK_COLORS } from '../../../styles.js';
+import { getProject } from '../selectors.js';
+import { ACTION_STATUSES, GET_STARTED_FLOW_STEPS, } from '../../../lib/constants.js';
+export function InstallationScreen({ state, accountName, }) {
+    const project = getProject(state);
+    const titleText = commands.getStarted.v2.startTitle;
+    // If we get to the installation screen, the app is uploaded and we have the name
+    const appName = project.uploadResult?.app?.config.name;
+    return (_jsx(BoxWithTitle, { flexGrow: 1, title: "hs get-started", borderColor: INK_COLORS.HUBSPOT_ORANGE, titleBackgroundColor: INK_COLORS.HUBSPOT_ORANGE, children: _jsxs(Box, { flexDirection: "column", rowGap: 1, children: [_jsx(Text, { bold: true, children: titleText }), _jsx(Text, { children: commands.getStarted.v2.installInstructions }), _jsx(ActionSection, { status: state.statuses.installApp, statusText: commands.getStarted.v2.installingApp(appName, accountName) }), state.browserFailedUrl && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: INK_COLORS.WARNING_YELLOW, children: commands.getStarted.v2.browserFailedToOpen(state.browserFailedUrl) }) })), state.pollingTimedOut && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: INK_COLORS.WARNING_YELLOW, children: commands.getStarted.v2.pollingTimeout(2) }) })), state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP &&
+                    state.statuses.installApp === ACTION_STATUSES.DONE && (_jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueSetup }))] }) }));
+}

package/ui/components/getStarted/screens/ProjectSetupScreen.js

@@ -35,5 +35,6 @@ export function ProjectSetupScreen({ state, onSelectOption, onNameChange, onName
     return (_jsx(BoxWithTitle, { flexGrow: 1, title: "hs get-started", borderColor: INK_COLORS.HUBSPOT_ORANGE, titleBackgroundColor: INK_COLORS.HUBSPOT_ORANGE, children: _jsxs(Box, { flexDirection: "column", rowGap: 1, children: [_jsx(Text, { bold: true, children: titleText }), state.step === GET_STARTED_FLOW_STEPS.SELECT ? (_jsxs(_Fragment, { children: [_jsx(Text, { children: overviewText }), _jsx(Text, { children: projectsText }), _jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: selectPrompt })] }), _jsx(SelectInput, { items: GET_STARTED_FLOW_OPTIONS, onSelect: onSelectOption })] })) : (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: `${selectPrompt}` }), _jsx(Text, { color: INK_COLORS.INFO_BLUE, children: state.app.selectedLabel })] })), _jsxs(ActionSection, { status: state.statuses.create, statusText: runningProjectCreateText, errorMessage: state.statuses.create === ACTION_STATUSES.ERROR
                         ? `${state.error}\n\n${commands.getStarted.v2.pressKeyToExit}`
                         : undefined, children: [state.step !== GET_STARTED_FLOW_STEPS.SELECT && (_jsx(InputField, { flag: "name", prompt: "Enter your project name", value: project.name, isEditing: state.step === GET_STARTED_FLOW_STEPS.NAME_INPUT, onChange: onNameChange, onSubmit: onNameSubmit })), state.step !== GET_STARTED_FLOW_STEPS.SELECT &&
-                            state.step !== GET_STARTED_FLOW_STEPS.NAME_INPUT && (_jsx(InputField, { flag: "dest", prompt: "Choose where to create the project", value: project.destination, isEditing: state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT, onChange: onDestChange, onSubmit: onDestSubmit }))] }), state.step === GET_STARTED_FLOW_STEPS.COMPLETE && (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueDeploy(state.app.selectedLabel) })] }))] }) }));
+                            state.step !== GET_STARTED_FLOW_STEPS.NAME_INPUT && (_jsxs(_Fragment, { children: [_jsx(InputField, { flag: "dest", prompt: "Choose where to create the project", value: project.destination, isEditing: state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT, onChange: onDestChange, onSubmit: onDestSubmit }), state.destError &&
+                                    state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT && (_jsx(Text, { color: INK_COLORS.ALERT_RED, children: state.destError }))] }))] }), state.step === GET_STARTED_FLOW_STEPS.COMPLETE && (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueDeploy(state.app.selectedLabel) })] }))] }) }));
 }

package/ui/lib/constants.d.ts

@@ -12,5 +12,6 @@ export declare const GET_STARTED_FLOW_STEPS: {
     readonly INSTALLING: "installing";
     readonly UPLOADING: "uploading";
     readonly OPEN_APP_PROMPT: "open-app-prompt";
+    readonly INSTALLING_APP: "installing-app";
     readonly COMPLETE: "complete";
 };

package/ui/lib/constants.js

@@ -12,5 +12,6 @@ export const GET_STARTED_FLOW_STEPS = {
     INSTALLING: 'installing',
     UPLOADING: 'uploading',
     OPEN_APP_PROMPT: 'open-app-prompt',
+    INSTALLING_APP: 'installing-app',
     COMPLETE: 'complete',
 };

package/mcp-server/utils/__tests__/project.test.d.ts

@@ -1 +0,0 @@
-export {};

package/mcp-server/utils/__tests__/project.test.js

@@ -1,140 +0,0 @@
-import { runCommandInDir } from '../project.js';
-import { execAsync } from '../command.js';
-import fs from 'fs';
-import path from 'path';
-vi.mock('../command', () => ({
-    execAsync: vi.fn(),
-    addFlag: vi.fn((command, flagName, value) => {
-        if (Array.isArray(value)) {
-            return `${command} --${flagName} ${value.map(item => `"${item}"`).join(' ')}`;
-        }
-        return `${command} --${flagName} "${value}"`;
-    }),
-}));
-vi.mock('fs');
-vi.mock('path');
-const mockExecAsync = execAsync;
-const mockExistsSync = fs.existsSync;
-const mockMkdirSync = fs.mkdirSync;
-const mockResolve = path.resolve;
-describe('mcp-server/utils/project', () => {
-    describe('runCommandInDir', () => {
-        const mockDirectory = '/test/directory';
-        const mockCommand = 'npm install';
-        const mockResolvedPath = '/resolved/test/directory';
-        beforeEach(() => {
-            mockResolve.mockReturnValue(mockResolvedPath);
-        });
-        it('should run command in existing directory', async () => {
-            const expectedResult = {
-                stdout: 'command output',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockMkdirSync).not.toHaveBeenCalled();
-            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            expect(result).toEqual(expectedResult);
-        });
-        it('should create directory if it does not exist', async () => {
-            const expectedResult = {
-                stdout: 'command output',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(false);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockMkdirSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            expect(result).toEqual(expectedResult);
-        });
-        it('should propagate execAsync errors', async () => {
-            const error = new Error('Command failed');
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockRejectedValue(error);
-            await expect(runCommandInDir(mockDirectory, mockCommand)).rejects.toThrow('Command failed');
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should handle stderr in results', async () => {
-            const expectedResult = {
-                stdout: 'some output',
-                stderr: 'warning message',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(result.stdout).toBe('some output');
-            expect(result.stderr).toBe('warning message');
-        });
-        it('should add --disable-usage-tracking flag to hs commands', async () => {
-            const hsCommand = 'hs project upload';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should not add --disable-usage-tracking flag to non-hs commands', async () => {
-            const nonHsCommand = 'npm install';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, nonHsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('npm install', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should add --disable-usage-tracking flag to hs commands with existing flags', async () => {
-            const hsCommand = 'hs project upload --profile prod';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --profile prod --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should handle hs commands that start with whitespace', async () => {
-            const hsCommand = 'hs init';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs init --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-    });
-});

package/mcp-server/utils/project.d.ts

@@ -1,5 +0,0 @@
-export interface CommandResults {
-    stderr: string;
-    stdout: string;
-}
-export declare function runCommandInDir(directory: string, command: string): Promise<CommandResults>;

package/mcp-server/utils/project.js

@@ -1,18 +0,0 @@
-import { addFlag, execAsync } from './command.js';
-import path from 'path';
-import fs from 'fs';
-export async function runCommandInDir(directory, command) {
-    if (!fs.existsSync(directory)) {
-        fs.mkdirSync(directory);
-    }
-    let finalCommand = command;
-    if (command.startsWith('hs ')) {
-        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
-    }
-    return execAsync(finalCommand, {
-        cwd: path.resolve(directory),
-        env: {
-            ...process.env,
-        },
-    });
-}