@hubspot/cli 8.0.3-experimental.1 → 8.0.4-experimental.0

package/ui/components/getStarted/GetStartedFlow.js

@@ -1,12 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { sanitizeFileName, untildify } from '@hubspot/local-dev-lib/path';
 import { useApp, useFocus, useInput } from 'ink';
+import open from 'open';
 import { useCallback, useEffect, useReducer } from 'react';
 import { commands } from '../../../lang/en.js';
-import { createProjectAction, trackGetStartedUsage, uploadAndDeployAction, } from '../../../lib/getStartedV2Actions.js';
+import { createProjectAction, pollAppInstallation, trackGetStartedUsage, uploadAndDeployAction, } from '../../../lib/getStartedV2Actions.js';
+import { validateProjectDirectory } from '../../../lib/prompts/projectNameAndDestPrompt.js';
 import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { ACTION_STATUSES, GET_STARTED_FLOW_STEPS, } from '../../lib/constants.js';
 import { flowReducer } from './reducer.js';
+import { InstallationScreen } from './screens/InstallationScreen.js';
 import { ProjectSetupScreen } from './screens/ProjectSetupScreen.js';
 import { UploadScreen } from './screens/UploadScreen.js';
 import { getProject } from './selectors.js';
@@ -44,6 +47,7 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         statuses: {
             create: initialName ? ACTION_STATUSES.RUNNING : ACTION_STATUSES.IDLE,
             upload: ACTION_STATUSES.IDLE,
+            installApp: ACTION_STATUSES.IDLE,
         },
     });
     const [state, dispatch] = useReducer(flowReducer, getInitialState());
@@ -68,6 +72,16 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         dispatch({ type: 'SET_STEP', payload: GET_STARTED_FLOW_STEPS.DEST_INPUT });
     }, []);
     const handleDestSubmit = useCallback(async () => {
+        const validationResult = validateProjectDirectory(project.destination);
+        if (validationResult !== true) {
+            dispatch({
+                type: 'SET_DEST_ERROR',
+                payload: typeof validationResult === 'string'
+                    ? validationResult
+                    : commands.getStarted.v2.unknownError,
+            });
+            return;
+        }
         dispatch({ type: 'SET_STEP', payload: GET_STARTED_FLOW_STEPS.CREATING });
         try {
             await createProjectAction({
@@ -108,6 +122,57 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
             dispatch({ type: 'UPLOAD_ERROR', payload: errorMessage });
         }
     }, [derivedAccountId, project.destination]);
+    const handlePollInstallation = useCallback(async () => {
+        const uploadApp = project.uploadResult?.app;
+        const projectId = project.uploadResult?.projectId;
+        if (!projectId || !uploadApp?.uid) {
+            dispatch({
+                type: 'INSTALL_APP_ERROR',
+                payload: commands.getStarted.v2.unknownError,
+            });
+            return;
+        }
+        try {
+            await pollAppInstallation({
+                accountId: derivedAccountId,
+                projectId,
+                appUid: uploadApp.uid,
+                requiredScopes: uploadApp.config?.auth?.requiredScopes,
+                optionalScopes: uploadApp.config?.auth?.optionalScopes,
+                onTimeout: () => {
+                    dispatch({ type: 'SET_POLLING_TIMED_OUT', payload: true });
+                },
+            });
+            dispatch({ type: 'INSTALL_APP_DONE' });
+        }
+        catch (error) {
+            dispatch({
+                type: 'INSTALL_APP_ERROR',
+                payload: error instanceof Error
+                    ? error.message
+                    : commands.getStarted.v2.unknownError,
+            });
+        }
+    }, [project.uploadResult, derivedAccountId]);
+    const handleBrowserOpen = useCallback(async (shouldOpen) => {
+        await trackGetStartedUsage({
+            step: 'open-install-page',
+            type: shouldOpen ? 'opened' : 'declined',
+        }, derivedAccountId);
+        if (shouldOpen && project.uploadResult?.installUrl) {
+            try {
+                await open(project.uploadResult.installUrl, { url: true });
+            }
+            catch (error) {
+                dispatch({
+                    type: 'SET_BROWSER_FAILED_URL',
+                    payload: project.uploadResult.installUrl,
+                });
+            }
+        }
+        dispatch({ type: 'START_INSTALL_APP' });
+        await handlePollInstallation();
+    }, [project.uploadResult, derivedAccountId, handlePollInstallation]);
     const handleNameChange = useCallback((value) => {
         dispatch({ type: 'SET_PROJECT_NAME', payload: value });
     }, []);
@@ -116,7 +181,8 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
     }, []);
     useInput((_, key) => {
         const hasError = state.statuses.create === ACTION_STATUSES.ERROR ||
-            state.statuses.upload === ACTION_STATUSES.ERROR;
+            state.statuses.upload === ACTION_STATUSES.ERROR ||
+            state.statuses.installApp === ACTION_STATUSES.ERROR;
         if (hasError) {
             exit();
             return;
@@ -126,11 +192,22 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         if (state.step === GET_STARTED_FLOW_STEPS.COMPLETE) {
             handleUploadStart();
         }
+        else if (state.step === GET_STARTED_FLOW_STEPS.OPEN_APP_PROMPT) {
+            handleBrowserOpen(true);
+        }
+        else if (state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP &&
+            state.statuses.installApp === ACTION_STATUSES.DONE) {
+            // Ready for card setup - will be handled in PR3
+            exit();
+        }
     });
     if (state.step === GET_STARTED_FLOW_STEPS.UPLOADING ||
         state.step === GET_STARTED_FLOW_STEPS.OPEN_APP_PROMPT) {
         return _jsx(UploadScreen, { state: state, accountName: accountName });
     }
+    if (state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP) {
+        return _jsx(InstallationScreen, { state: state, accountName: accountName });
+    }
     // Show project setup screen for initial flow
     return (_jsx(ProjectSetupScreen, { state: state, onSelectOption: handleSelect, onNameChange: handleNameChange, onNameSubmit: handleNameSubmit, onDestChange: handleDestChange, onDestSubmit: handleDestSubmit }));
 }

package/ui/components/getStarted/reducer.d.ts

@@ -14,6 +14,7 @@ export type AppState = {
 export type ActionStatuses = {
     create: ActionStatus;
     upload: ActionStatus;
+    installApp: ActionStatus;
 };
 export type FlowState = {
     step: FlowStep;
@@ -21,6 +22,9 @@ export type FlowState = {
     app: AppState;
     statuses: ActionStatuses;
     error?: string;
+    destError?: string;
+    browserFailedUrl?: string;
+    pollingTimedOut?: boolean;
 };
 type FlowAction = {
     type: 'SET_STEP';
@@ -37,6 +41,9 @@ type FlowAction = {
 } | {
     type: 'SET_ERROR';
     payload: string;
+} | {
+    type: 'SET_DEST_ERROR';
+    payload: string;
 } | {
     type: 'CLEAR_ERROR';
 } | {
@@ -54,6 +61,19 @@ type FlowAction = {
 } | {
     type: 'UPLOAD_ERROR';
     payload: string;
+} | {
+    type: 'START_INSTALL_APP';
+} | {
+    type: 'INSTALL_APP_DONE';
+} | {
+    type: 'INSTALL_APP_ERROR';
+    payload: string;
+} | {
+    type: 'SET_BROWSER_FAILED_URL';
+    payload: string;
+} | {
+    type: 'SET_POLLING_TIMED_OUT';
+    payload: boolean;
 };
 export declare function flowReducer(state: FlowState, action: FlowAction): FlowState;
 export {};

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/lib/projects/__tests__/workspaceArchive.test.d.ts

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

package/lib/projects/__tests__/workspaceArchive.test.js

@@ -1,207 +0,0 @@
-import { describe, it, expect, vi } from 'vitest';
-import path from 'path';
-import fs from 'fs-extra';
-import { computeExternalArchivePath, shortHash, updatePackageJsonInArchive, } from '../workspaces.js';
-describe('computeExternalArchivePath', () => {
-    it('places external workspace in _workspaces/ with basename-hash', () => {
-        const localPath = '/Users/test/company-libs/utils';
-        const result = computeExternalArchivePath(localPath);
-        const expectedHash = shortHash(path.resolve(localPath));
-        expect(result).toBe(path.join('_workspaces', `utils-${expectedHash}`));
-    });
-    it('does not include an external/ subdirectory', () => {
-        const result = computeExternalArchivePath('/Users/test/libs/utils');
-        expect(result).not.toContain('external');
-        expect(result.startsWith('_workspaces')).toBe(true);
-    });
-    it('produces different paths for different directories with same basename', () => {
-        const path1 = computeExternalArchivePath('/Users/test/project-a/utils');
-        const path2 = computeExternalArchivePath('/Users/test/project-b/utils');
-        expect(path1).not.toBe(path2);
-        expect(path1).toContain('utils-');
-        expect(path2).toContain('utils-');
-    });
-    it('is deterministic', () => {
-        const localPath = '/Users/test/libs/utils';
-        expect(computeExternalArchivePath(localPath)).toBe(computeExternalArchivePath(localPath));
-    });
-    it('produces paths matching _workspaces/<name>-[8 hex chars]', () => {
-        const result = computeExternalArchivePath('/Users/test/libs/utils');
-        // Normalize path separators for cross-platform compatibility
-        const normalized = result.replace(/\\/g, '/');
-        expect(normalized).toMatch(/_workspaces\/utils-[a-f0-9]{8}$/);
-    });
-    it('uses the last path segment as basename', () => {
-        const result = computeExternalArchivePath('/Users/test/libs/@company/shared-utils');
-        expect(result).toContain('shared-utils-');
-        const normalized = result.replace(/\\/g, '/');
-        expect(normalized).toMatch(/_workspaces\/shared-utils-[a-f0-9]{8}$/);
-    });
-    it('never produces paths with .. segments', () => {
-        const testCases = [
-            '/Users/other/libs/utils',
-            '/completely/different/path',
-            '/Users/test/other-project/shared',
-        ];
-        testCases.forEach(localPath => {
-            expect(computeExternalArchivePath(localPath)).not.toContain('..');
-        });
-    });
-});
-describe('shortHash', () => {
-    it('produces 8-character hex string', () => {
-        const hash = shortHash('/some/path');
-        expect(hash).toMatch(/^[a-f0-9]{8}$/);
-    });
-    it('is deterministic', () => {
-        const input = '/Users/test/workspace';
-        expect(shortHash(input)).toBe(shortHash(input));
-    });
-    it('produces different hashes for different inputs', () => {
-        const hash1 = shortHash('/path/a');
-        const hash2 = shortHash('/path/b');
-        expect(hash1).not.toBe(hash2);
-    });
-});
-describe('updatePackageJsonInArchive', () => {
-    const srcDir = '/project/src';
-    function createMockArchive() {
-        const appended = [];
-        const mock = {
-            append: (content, opts) => {
-                appended.push({ content, name: opts.name });
-                return mock;
-            },
-        };
-        return {
-            archive: mock,
-            getAppended: () => appended,
-        };
-    }
-    it('writes external workspace entries as absolute archive paths', async () => {
-        const packageJsonPath = '/project/src/app/functions/package.json';
-        const originalPackageJson = {
-            name: 'my-app',
-            workspaces: ['../../packages/utils'],
-            dependencies: {},
-        };
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(originalPackageJson));
-        const { archive, getAppended } = createMockArchive();
-        const packageWorkspaces = new Map();
-        packageWorkspaces.set(packageJsonPath, [
-            '/_workspaces/packages-utils-a1b2c3d4',
-            '/_workspaces/packages-core-e5f6a7b8',
-        ]);
-        await updatePackageJsonInArchive(archive, srcDir, packageWorkspaces, new Map());
-        const appended = getAppended();
-        expect(appended).toHaveLength(1);
-        const written = JSON.parse(appended[0].content);
-        expect(written.workspaces).toEqual([
-            '/_workspaces/packages-utils-a1b2c3d4',
-            '/_workspaces/packages-core-e5f6a7b8',
-        ]);
-        vi.restoreAllMocks();
-    });
-    it('preserves internal workspace entries as relative paths', async () => {
-        const packageJsonPath = '/project/src/app/functions/package.json';
-        const originalPackageJson = {
-            name: 'my-app',
-            workspaces: ['../packages/utils'],
-        };
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(originalPackageJson));
-        const { archive, getAppended } = createMockArchive();
-        const packageWorkspaces = new Map();
-        packageWorkspaces.set(packageJsonPath, ['../packages/utils']);
-        await updatePackageJsonInArchive(archive, srcDir, packageWorkspaces, new Map());
-        const written = JSON.parse(getAppended()[0].content);
-        expect(written.workspaces).toEqual(['../packages/utils']);
-        vi.restoreAllMocks();
-    });
-    it('writes mixed internal and external workspace entries', async () => {
-        const packageJsonPath = '/project/src/app/functions/package.json';
-        const originalPackageJson = {
-            name: 'my-app',
-            workspaces: ['../packages/utils', '/_workspaces/logger-a1b2c3d4'],
-        };
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(originalPackageJson));
-        const { archive, getAppended } = createMockArchive();
-        const packageWorkspaces = new Map();
-        packageWorkspaces.set(packageJsonPath, [
-            '../packages/utils',
-            '/_workspaces/logger-a1b2c3d4',
-        ]);
-        await updatePackageJsonInArchive(archive, srcDir, packageWorkspaces, new Map());
-        const written = JSON.parse(getAppended()[0].content);
-        expect(written.workspaces).toEqual([
-            '../packages/utils',
-            '/_workspaces/logger-a1b2c3d4',
-        ]);
-        vi.restoreAllMocks();
-    });
-    it('rewrites external file: dependencies as absolute archive paths', async () => {
-        const packageJsonPath = '/project/src/app/functions/package.json';
-        const originalPackageJson = {
-            name: 'my-app',
-            dependencies: {
-                '@company/logger': 'file:../../external/logger',
-                react: '^18.0.0',
-            },
-        };
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(originalPackageJson));
-        const { archive, getAppended } = createMockArchive();
-        const packageFileDeps = new Map();
-        packageFileDeps.set(packageJsonPath, new Map([['@company/logger', '_workspaces/logger-a1b2c3d4']]));
-        await updatePackageJsonInArchive(archive, srcDir, new Map(), packageFileDeps);
-        const appended = getAppended();
-        expect(appended).toHaveLength(1);
-        const written = JSON.parse(appended[0].content);
-        expect(written.dependencies['@company/logger']).toBe('file:/_workspaces/logger-a1b2c3d4');
-        expect(written.dependencies['react']).toBe('^18.0.0');
-        vi.restoreAllMocks();
-    });
-    it('leaves internal file: dependencies untouched when not in packageFileDeps', async () => {
-        const originalPackageJson = {
-            name: 'my-app',
-            dependencies: {
-                '@internal/utils': 'file:../packages/utils',
-                react: '^18.0.0',
-            },
-        };
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(originalPackageJson));
-        const { archive, getAppended } = createMockArchive();
-        await updatePackageJsonInArchive(archive, srcDir, new Map(), new Map());
-        // Nothing to update, so no package.json should be appended
-        expect(getAppended()).toHaveLength(0);
-        vi.restoreAllMocks();
-    });
-    it('uses same absolute path regardless of package.json depth', async () => {
-        const shallowPath = '/project/src/package.json';
-        const deepPath = '/project/src/app/functions/nested/package.json';
-        const archivePath = '/_workspaces/utils-a1b2c3d4';
-        const makePackageJson = () => ({
-            name: 'test',
-            workspaces: ['placeholder'],
-        });
-        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-        const { archive: archive1, getAppended: getAppended1 } = createMockArchive();
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(makePackageJson()));
-        const workspaces1 = new Map();
-        workspaces1.set(shallowPath, [archivePath]);
-        await updatePackageJsonInArchive(archive1, srcDir, workspaces1, new Map());
-        const { archive: archive2, getAppended: getAppended2 } = createMockArchive();
-        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(makePackageJson()));
-        const workspaces2 = new Map();
-        workspaces2.set(deepPath, [archivePath]);
-        await updatePackageJsonInArchive(archive2, srcDir, workspaces2, new Map());
-        const written1 = JSON.parse(getAppended1()[0].content);
-        const written2 = JSON.parse(getAppended2()[0].content);
-        expect(written1.workspaces).toEqual(['/_workspaces/utils-a1b2c3d4']);
-        expect(written2.workspaces).toEqual(['/_workspaces/utils-a1b2c3d4']);
-        vi.restoreAllMocks();
-    });
-});

package/lib/projects/workspaces.d.ts

@@ -1,36 +0,0 @@
-import archiver from 'archiver';
-import { WorkspaceMapping, FileDependencyMapping } from '@hubspot/project-parsing-lib/workspaces';
-/**
- * Result of archiving workspaces and file dependencies
- */
-export type WorkspaceArchiveResult = {
-    packageWorkspaces: Map<string, string[]>;
-    packageFileDeps: Map<string, Map<string, string>>;
-};
-/**
- * Generates a short hash of the input string for use in workspace paths.
- * Uses SHA256 truncated to 8 hex characters (4 billion possibilities).
- */
-export declare function shortHash(input: string): string;
-/**
- * Determines the archive path for an external workspace or file: dependency.
- * Produces `_workspaces/<basename>-<hash>` with no subdirectory.
- * The hash prevents collisions between different directories with the same basename.
- */
-export declare function computeExternalArchivePath(absolutePath: string): string;
-/**
- * Updates package.json files in the archive to reflect new workspace and file: dependency paths.
- *
- * Workspace entries in packageWorkspaces are already in final form:
- * - Internal workspaces: relative paths (e.g. "../packages/utils")
- * - External workspaces: absolute paths (e.g. "/_workspaces/logger-abc")
- *
- * Only external file: dependencies appear in packageFileDeps; internal ones
- * keep their original file: references and are left untouched.
- */
-export declare function updatePackageJsonInArchive(archive: archiver.Archiver, srcDir: string, packageWorkspaces: Map<string, string[]>, packageFileDeps: Map<string, Map<string, string>>): Promise<void>;
-/**
- * Main orchestration function that handles archiving of workspaces and file dependencies.
- * This is the clean integration point for upload.ts.
- */
-export declare function archiveWorkspacesAndDependencies(archive: archiver.Archiver, srcDir: string, projectDir: string, workspaceMappings: WorkspaceMapping[], fileDependencyMappings: FileDependencyMapping[]): Promise<WorkspaceArchiveResult>;