@hubspot/cli 7.9.0-experimental.0 → 7.9.1-experimental.0

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

@@ -12,7 +12,7 @@ vi.mock('@hubspot/ui-extensions-dev-server', () => {
 });
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchAppMetadataByUid, fetchPublicAppProductionInstallCounts, installStaticAuthAppOnTestAccount, } from '@hubspot/local-dev-lib/api/appsDev';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import AppDevModeInterface from '../localDev/AppDevModeInterface.js';
 import LocalDevState from '../localDev/LocalDevState.js';
 import LocalDevLogger from '../localDev/LocalDevLogger.js';
@@ -121,7 +121,7 @@ describe('AppDevModeInterface', () => {
                 previouslyAuthorizedScopeGroups: [],
             },
         });
-        getAccountConfig.mockReturnValue({
+        getConfigAccountById.mockReturnValue({
             parentAccountId: 12345,
         });
         isDeveloperTestAccount.mockReturnValue(true);
@@ -290,13 +290,14 @@ describe('AppDevModeInterface', () => {
         });
         it('should handle app reinstallation', async () => {
             // Set up conditions for non-automatic installation
-            getAccountConfig.mockReturnValue(null);
             fetchAppInstallationData.mockResolvedValue({
                 data: {
                     isInstalledWithScopeGroups: false,
                     previouslyAuthorizedScopeGroups: ['old-scope'],
                 },
             });
+            // Make it not automatically installable by making it not a test account
+            isDeveloperTestAccount.mockReturnValue(false);
             await appDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalledWith('http://static-install-url', true);
         });
@@ -308,7 +309,7 @@ describe('AppDevModeInterface', () => {
         });
         it('should exit if user declines auto-install', async () => {
             // Set up conditions for automatic installation
-            getAccountConfig.mockReturnValue({
+            getConfigAccountById.mockReturnValue({
                 parentAccountId: 12345, // matches targetProjectAccountId
             });
             isDeveloperTestAccount.mockReturnValue(true);
@@ -375,6 +376,15 @@ describe('AppDevModeInterface', () => {
                 data: { uniquePortalInstallCount: 5 },
             });
             getStaticAuthAppInstallUrl.mockReturnValue('http://static-install-url');
+            getConfigAccountById.mockReturnValue({
+                parentAccountId: 12345,
+            });
+            isDeveloperTestAccount.mockReturnValue(true);
+            isSandbox.mockReturnValue(false);
+            installAppAutoPrompt.mockResolvedValue(true);
+            confirmPrompt.mockResolvedValue(true);
+            installStaticAuthAppOnTestAccount.mockResolvedValue(undefined);
+            isServerRunningAtUrl.mockResolvedValue(true);
             installAppBrowserPrompt.mockImplementation(async () => {
                 const addListenerCall = mockLocalDevState.addListener.mock.calls.find(call => call[0] === 'devServerMessage');
                 if (addListenerCall) {
@@ -387,8 +397,8 @@ describe('AppDevModeInterface', () => {
             mockLocalDevState.getAppDataByUid = vi.fn().mockReturnValue(mockAppData);
             mockLocalDevState.setAppDataForUid = vi.fn();
             mockLocalDevState.addListener = vi.fn();
-            // Target account config is missing
-            getAccountConfig.mockReturnValue(null);
+            // Target account config is missing - make it not a test account so isAutomaticallyInstallable returns false
+            isDeveloperTestAccount.mockReturnValue(false);
             // App is not installed
             fetchAppInstallationData.mockResolvedValue({
                 data: {
@@ -401,6 +411,7 @@ describe('AppDevModeInterface', () => {
                 localDevState: mockLocalDevState,
                 localDevLogger: mockLocalDevLogger,
             });
+            // Remove the spy to see if that's causing the timeout
             await newAppDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalled();
         });

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

@@ -28,6 +28,7 @@ vi.mock('@hubspot/local-dev-lib/config', () => ({
     getAccountId: vi.fn().mockReturnValue(123),
     hasLocalStateFlag: vi.fn().mockReturnValue(false),
     getConfigDefaultAccount: vi.fn().mockReturnValue({ accountId: 123 }),
+    globalConfigFileExists: vi.fn().mockReturnValue(true),
 }));
 vi.mock('@hubspot/local-dev-lib/urls', () => ({
     getHubSpotApiOrigin: vi.fn().mockReturnValue('https://api.hubspot.com'),

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

@@ -26,6 +26,7 @@ vi.mock('../deploy');
 vi.mock('../config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../localDev/LocalDevLogger');
 vi.mock('../localDev/DevServerManager');
 // Tests for LocalDevProcess and LocalDevState

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

@@ -2,8 +2,10 @@ import fs from 'fs';
 import { handleComponentCollision, updateHsMetaFilesWithAutoGeneratedFields, } from '../components.js';
 import { uiLogger } from '../../ui/logger.js';
 import { coerceToValidUid } from '@hubspot/project-parsing-lib';
+import { fileExists } from '../../validation.js';
 vi.mock('fs');
 vi.mock('../../ui/logger.js');
+vi.mock('../../validation.js');
 vi.mock('@hubspot/project-parsing-lib', () => ({
     coerceToValidUid: vi.fn(),
     metafileExtension: '.module.meta.json',
@@ -19,11 +21,15 @@ vi.mock('../../../lang/en.js', () => ({
                 applicationLog: (type, uid, name) => `Updated ${type} component with uid: ${uid} and name: ${name}`,
                 componentLog: (type, uid) => `Updated ${type} component with uid: ${uid}`,
             },
+            generateSafeFilenameDifferentiator: {
+                failedToCheckFiles: 'Failed to check files for filename differentiator. Falling back to timestamp.',
+            },
         },
     },
 }));
 const mockedFs = vi.mocked(fs);
 const mockCoerceToValidUid = vi.mocked(coerceToValidUid);
+const mockedFileExists = vi.mocked(fileExists);
 describe('lib/projects/components', () => {
     describe('handleComponentCollision()', () => {
         const mockCollision = {
@@ -33,13 +39,13 @@ describe('lib/projects/components', () => {
         };
         beforeEach(() => {
             vi.resetAllMocks();
-            // Mock Date.now to return consistent values for testing
-            vi.spyOn(Date, 'now').mockReturnValue(1234567890);
+            // Default: fileExists returns false (file doesn't exist)
+            mockedFileExists.mockReturnValue(false);
         });
         afterEach(() => {
             vi.restoreAllMocks();
         });
-        it('handles source file collisions by renaming them with timestamps', () => {
+        it('handles source file collisions by renaming them with sequential numbers', () => {
             const collision = {
                 ...mockCollision,
                 collisions: ['component.js', 'utils.ts'],
@@ -47,8 +53,8 @@ describe('lib/projects/components', () => {
             mockedFs.copyFileSync.mockImplementation(() => { });
             handleComponentCollision(collision);
             expect(mockedFs.copyFileSync).toHaveBeenCalledTimes(2);
-            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', '/dest/path/component-1234567890.js');
-            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/utils.ts', '/dest/path/utils-1234567890.ts');
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', '/dest/path/component-2.js');
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/utils.ts', '/dest/path/utils-2.ts');
         });
         it('handles metafile collisions by renaming and updating references', () => {
             const collision = {
@@ -69,8 +75,8 @@ describe('lib/projects/components', () => {
             });
             handleComponentCollision(collision);
             expect(mockedFs.readFileSync).toHaveBeenCalledWith('/src/path/component.module.meta.json', 'utf-8');
-            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/dest/path/component-1234567890.module.meta.json', expect.stringContaining('source-1234567890.js'));
-            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/source.js', '/dest/path/source-1234567890.js');
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/dest/path/component-2.module.meta.json', expect.stringContaining('source-2.js'));
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/source.js', '/dest/path/source-2.js');
         });
         it('handles package.json collisions by merging dependencies', () => {
             const collision = {
@@ -150,10 +156,10 @@ describe('lib/projects/components', () => {
             const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
             handleComponentCollision(collision);
             // Verify source files are copied with new names
-            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', '/dest/path/component-1234567890.js');
-            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/utils.ts', '/dest/path/utils-1234567890.ts');
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', '/dest/path/component-2.js');
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/utils.ts', '/dest/path/utils-2.ts');
             // Verify metafile is updated and written with new name
-            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/dest/path/component-1234567890.module.meta.json', expect.stringContaining('component-1234567890.js'));
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/dest/path/component-2.module.meta.json', expect.stringContaining('component-2.js'));
             // Verify package.json is merged
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/dest/path/package.json', expect.stringContaining('"dependencies"'));
             consoleSpy.mockRestore();
@@ -198,6 +204,47 @@ describe('lib/projects/components', () => {
             expect(mockedFs.readFileSync).toHaveBeenCalledWith('/src/path/package.json', 'utf-8');
             consoleSpy.mockRestore();
         });
+        it('falls back to timestamp when maxAttempts is exhausted', () => {
+            const collision = {
+                ...mockCollision,
+                collisions: ['component.js'],
+            };
+            // Mock Date.now to return a consistent timestamp
+            const mockTimestamp = 1234567890;
+            vi.spyOn(Date, 'now').mockReturnValue(mockTimestamp);
+            // Mock fileExists to return true 10 times (exhausting maxAttempts)
+            // The function starts with differentiator = 1, then increments to 2, 3, etc.
+            // It will try 10 times (differentiators 2-11), and if all return true,
+            // maxAttempts will be 0 and it will fall back to timestamp
+            mockedFileExists.mockReturnValue(true);
+            mockedFs.copyFileSync.mockImplementation(() => { });
+            handleComponentCollision(collision);
+            // Should use timestamp as differentiator
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', `/dest/path/component-${mockTimestamp}.js`);
+            vi.restoreAllMocks();
+        });
+        it('falls back to timestamp when fileExists throws an error', () => {
+            const collision = {
+                ...mockCollision,
+                collisions: ['component.js'],
+            };
+            // Mock Date.now to return a consistent timestamp
+            const mockTimestamp = 9876543210;
+            vi.spyOn(Date, 'now').mockReturnValue(mockTimestamp);
+            // Mock fileExists to throw an error
+            const mockError = new Error('File system error');
+            mockedFileExists.mockImplementation(() => {
+                throw mockError;
+            });
+            mockedFs.copyFileSync.mockImplementation(() => { });
+            const mockUiLogger = vi.mocked(uiLogger);
+            handleComponentCollision(collision);
+            // Should log debug message about the error
+            expect(mockUiLogger.debug).toHaveBeenCalledWith('Failed to check files for filename differentiator. Falling back to timestamp.');
+            // Should use timestamp as differentiator
+            expect(mockedFs.copyFileSync).toHaveBeenCalledWith('/src/path/component.js', `/dest/path/component-${mockTimestamp}.js`);
+            vi.restoreAllMocks();
+        });
     });
     describe('updateHsMetaFilesWithAutoGeneratedFields()', () => {
         const mockUiLogger = vi.mocked(uiLogger);
@@ -233,20 +280,22 @@ describe('lib/projects/components', () => {
                 .mockReturnValueOnce('card-my-project')
                 .mockReturnValueOnce('function-my-project');
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_card');
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_function');
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component1.meta.json', JSON.stringify({
                 type: 'card',
-                uid: 'card-my-project',
+                uid: 'card_my_project',
                 config: {
                     name: 'Old Name',
                 },
             }, null, 2));
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component2.meta.json', JSON.stringify({
                 type: 'function',
-                uid: 'function-my-project',
+                uid: 'function_my_project',
             }, null, 2));
             expect(mockUiLogger.log).toHaveBeenCalledWith('Updating component metadata files...');
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated card component with uid: card-my-project');
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated function component with uid: function-my-project');
+            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated card component with uid: card_my_project');
+            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated function component with uid: function_my_project');
         });
         it('handles app components by updating both uid and config.name', () => {
             const projectName = 'test-app';
@@ -263,32 +312,36 @@ describe('lib/projects/components', () => {
             mockedFs.writeFileSync.mockImplementation(() => { });
             mockCoerceToValidUid.mockReturnValue('app-test-app');
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('test-app_app');
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/app.meta.json', JSON.stringify({
                 type: 'app',
-                uid: 'app-test-app',
+                uid: 'app_test_app',
                 config: {
                     name: 'test-app-Application',
                     other: 'property',
                 },
             }, null, 2));
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app-test-app and name: test-app-Application');
+            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app_test_app and name: test-app-Application');
         });
-        it('handles UID collisions by using timestamps', () => {
+        it('handles UID collisions by using differentiators', () => {
             const projectName = 'collision-project';
             const hsMetaFilePaths = ['/path/to/component1.meta.json'];
-            const existingUids = ['card-collision-project'];
+            const existingUids = ['card_collision_project'];
             const component1 = { type: 'card', uid: 'old-uid-1' };
             mockedFs.readFileSync.mockReturnValue(JSON.stringify(component1));
             mockedFs.writeFileSync.mockImplementation(() => { });
-            // Mock Date.now to return consistent value for testing
-            vi.spyOn(Date, 'now').mockReturnValue(1234567890);
+            // First call for getBaseUid() check, second call when adding differentiator
             mockCoerceToValidUid
                 .mockReturnValueOnce('card-collision-project')
-                .mockReturnValueOnce('card-1234567890-collision-project');
+                .mockReturnValueOnce('card-collision-project');
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths, existingUids);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('collision-project_card');
+            // getBaseUid() is called twice - once for initial check, once when adding differentiator
+            expect(mockCoerceToValidUid).toHaveBeenCalledTimes(2);
+            // The differentiator is appended with a hyphen, so the final UID has a hyphen before the number
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component1.meta.json', JSON.stringify({
                 type: 'card',
-                uid: 'card-1234567890-collision-project',
+                uid: 'card_collision_project_2',
             }, null, 2));
         });
         it('falls back to original uid when coerceToValidUid returns null', () => {
@@ -328,11 +381,82 @@ describe('lib/projects/components', () => {
             mockedFs.writeFileSync.mockImplementation(() => { });
             mockCoerceToValidUid.mockReturnValue('app-no-config-project');
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('no-config-project_app');
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/app.meta.json', JSON.stringify({
                 type: 'app',
-                uid: 'app-no-config-project',
+                uid: 'app_no_config_project',
+            }, null, 2));
+            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app_no_config_project');
+        });
+        it('replaces hyphens with underscores in coerced UIDs', () => {
+            const projectName = 'my-project';
+            const hsMetaFilePaths = ['/path/to/component.meta.json'];
+            const component = {
+                type: 'card',
+                uid: 'old-uid',
+            };
+            mockedFs.readFileSync.mockReturnValue(JSON.stringify(component));
+            mockedFs.writeFileSync.mockImplementation(() => { });
+            // coerceToValidUid returns a value with hyphens that should be converted to underscores
+            mockCoerceToValidUid.mockReturnValue('my-project-card-with-hyphens');
+            updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_card');
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component.meta.json', JSON.stringify({
+                type: 'card',
+                uid: 'my_project_card_with_hyphens',
+            }, null, 2));
+        });
+        it('handles UIDs with multiple hyphens correctly', () => {
+            const projectName = 'test-project';
+            const hsMetaFilePaths = ['/path/to/component.meta.json'];
+            const component = {
+                type: 'custom-object',
+                uid: 'old-uid',
+            };
+            mockedFs.readFileSync.mockReturnValue(JSON.stringify(component));
+            mockedFs.writeFileSync.mockImplementation(() => { });
+            mockCoerceToValidUid.mockReturnValue('test-project-custom-object-type');
+            updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('test-project_custom-object');
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component.meta.json', JSON.stringify({
+                type: 'custom-object',
+                uid: 'test_project_custom_object_type',
+            }, null, 2));
+        });
+        it('preserves UIDs without hyphens unchanged', () => {
+            const projectName = 'simpleproject';
+            const hsMetaFilePaths = ['/path/to/component.meta.json'];
+            const component = {
+                type: 'card',
+                uid: 'old-uid',
+            };
+            mockedFs.readFileSync.mockReturnValue(JSON.stringify(component));
+            mockedFs.writeFileSync.mockImplementation(() => { });
+            // coerceToValidUid returns a value without hyphens
+            mockCoerceToValidUid.mockReturnValue('simpleprojectcard');
+            updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('simpleproject_card');
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component.meta.json', JSON.stringify({
+                type: 'card',
+                uid: 'simpleprojectcard',
+            }, null, 2));
+        });
+        it('handles project names with hyphens in UID generation', () => {
+            const projectName = 'my-super-project';
+            const hsMetaFilePaths = ['/path/to/component.meta.json'];
+            const component = {
+                type: 'function',
+                uid: 'old-uid',
+            };
+            mockedFs.readFileSync.mockReturnValue(JSON.stringify(component));
+            mockedFs.writeFileSync.mockImplementation(() => { });
+            mockCoerceToValidUid.mockReturnValue('my-super-project-function');
+            updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-super-project_function');
+            expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component.meta.json', JSON.stringify({
+                type: 'function',
+                uid: 'my_super_project_function',
             }, null, 2));
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app-no-config-project');
         });
     });
 });

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

@@ -8,6 +8,7 @@ import { pollDeployStatus } from '../pollProjectBuildAndDeploy.js';
 // Mock external dependencies
 vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/projects');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../pollProjectBuildAndDeploy.js');
 const mockUiLogger = vi.mocked(uiLogger);
 const mockDeployProject = vi.mocked(deployProject);

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

@@ -1,83 +1,54 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { validateProjectConfig } from '../../projects/config.js';
-import { uiLogger } from '../../ui/logger.js';
+import ProjectValidationError from '../../errors/ProjectValidationError.js';
 vi.mock('../../ui/logger.js');
 describe('lib/projects', () => {
     describe('validateProjectConfig()', () => {
         let projectDir;
-        let exitMock;
         beforeAll(() => {
             projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'projects-'));
             fs.mkdirSync(path.join(projectDir, 'src'));
         });
-        beforeEach(() => {
-            // @ts-expect-error - Mocking process.exit
-            exitMock = vi
-                .spyOn(process, 'exit')
-                .mockImplementation(() => undefined);
-        });
-        afterEach(() => {
-            exitMock.mockRestore();
-        });
         it('rejects undefined configuration', () => {
             // @ts-ignore Testing invalid input
-            validateProjectConfig(null, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/));
+            expect(() => validateProjectConfig(null, projectDir)).toThrow(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/);
         });
         it('rejects configuration with missing name', () => {
             // @ts-ignore Testing invalid input
-            validateProjectConfig({ srcDir: '.' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields*/));
+            expect(() => validateProjectConfig({ srcDir: '.' }, projectDir)).toThrow(/.*missing required fields*/);
         });
         it('rejects configuration with missing srcDir', () => {
+            expect(() => 
             // @ts-ignore Testing invalid input
-            validateProjectConfig({ name: 'hello' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields.*/));
+            validateProjectConfig({ name: 'hello' }, projectDir)).toThrow(/.*missing required fields.*/);
         });
         describe('rejects configuration with srcDir outside project directory', () => {
             it('for parent directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '..', platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: ".."'));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '..', platformVersion: '' }, projectDir)).toThrow(/srcDir: "\.\."/);
             });
             it('for root directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '/', platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: "/"'));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '/', platformVersion: '' }, projectDir)).toThrow(/srcDir: "\/"/);
             });
             it('for complicated directory', () => {
                 const srcDir = './src/././../src/../../src';
-                validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining(`srcDir: "${srcDir}"`));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir)).toThrow(ProjectValidationError);
+                expect(() => validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir)).toThrow(/srcDir:/);
             });
         });
         it('rejects configuration with srcDir that does not exist', () => {
-            validateProjectConfig({ name: 'hello', srcDir: 'foo', platformVersion: '' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*could not be found in.*/));
+            expect(() => validateProjectConfig({ name: 'hello', srcDir: 'foo', platformVersion: '' }, projectDir)).toThrow(/.*could not be found in.*/);
         });
         describe('accepts configuration with valid srcDir', () => {
             it('for current directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '.', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '.', platformVersion: '' }, projectDir)).not.toThrow();
             });
             it('for relative directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: './src', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: './src', platformVersion: '' }, projectDir)).not.toThrow();
             });
             it('for implied relative directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: 'src', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: 'src', platformVersion: '' }, projectDir)).not.toThrow();
             });
         });
     });

package/lib/projects/components.js

@@ -1,9 +1,51 @@
 import path from 'path';
 import fs from 'fs';
 import { coerceToValidUid, metafileExtension, } from '@hubspot/project-parsing-lib';
+import { fileExists } from '../validation.js';
 import { uiLogger } from '../ui/logger.js';
 import { AppKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
 import { lib } from '../../lang/en.js';
+import { debugError } from '../errorHandlers/index.js';
+// Prefix for the metafile extension
+const metafileExtensionPrefix = path.parse(metafileExtension).name;
+function applyDifferentiatorToFilename(filename, differentiator, isHsMetaFile) {
+    const { name, ext, dir } = path.parse(filename);
+    if (isHsMetaFile) {
+        return path.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${differentiator}${metafileExtension}`);
+    }
+    return path.join(dir, `${name}-${differentiator}${ext}`);
+}
+// Generates safe filename differentiators, avoiding collisions with existing filenames
+// E.x. "NewCard.tsx" -> "NewCard-1.tsx"
+function generateSafeFilenameDifferentiator(sourceFiles, hsMetaFiles) {
+    let differentiator = 1;
+    let isDifferentiatorUnique = false;
+    let maxAttempts = 10;
+    while (!isDifferentiatorUnique) {
+        differentiator++;
+        maxAttempts--;
+        try {
+            const isDifferentiatorUniqueForSourceFiles = sourceFiles.every(file => {
+                return !fileExists(applyDifferentiatorToFilename(file, differentiator, false));
+            });
+            const isDifferentiatorUniqueForHsMetaFiles = hsMetaFiles.every(file => {
+                return !fileExists(applyDifferentiatorToFilename(file, differentiator, true));
+            });
+            isDifferentiatorUnique =
+                isDifferentiatorUniqueForSourceFiles &&
+                    isDifferentiatorUniqueForHsMetaFiles;
+        }
+        catch (error) {
+            uiLogger.debug(lib.projects.generateSafeFilenameDifferentiator.failedToCheckFiles);
+            maxAttempts = 0;
+        }
+        // If we've tried too many times, just use a timestamp
+        if (maxAttempts <= 0) {
+            return Date.now();
+        }
+    }
+    return differentiator;
+}
 // Handles a collision between component source files
 export function handleComponentCollision({ dest, src, collisions }) {
     const hsMetaFiles = [];
@@ -20,19 +62,20 @@ export function handleComponentCollision({ dest, src, collisions }) {
             sourceFiles.push(collision);
         }
     });
-    const sourceFilenameMapping = sourceFiles.reduce((acc, filename) => {
-        const { name, ext, dir } = path.parse(filename);
+    const filenameDifferentiator = generateSafeFilenameDifferentiator(sourceFiles, hsMetaFiles);
+    // Exclude markdown files fromthe rename process because they should not be duplicated
+    const sourceFilenameMapping = sourceFiles
+        .filter(filename => !filename.endsWith('.md'))
+        .reduce((acc, filename) => {
         return {
             ...acc,
-            [filename]: path.join(dir, `${name}-${Date.now()}${ext}`),
+            [filename]: applyDifferentiatorToFilename(filename, filenameDifferentiator, false),
         };
     }, {});
-    const metafileExtensionPrefix = path.parse(metafileExtension).name;
     const metaFilenameMapping = hsMetaFiles.reduce((acc, filename) => {
-        const { name, dir } = path.parse(filename);
         return {
             ...acc,
-            [filename]: path.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${Date.now()}${metafileExtension}`),
+            [filename]: applyDifferentiatorToFilename(filename, filenameDifferentiator, true),
         };
     }, {});
     // Update the metafiles that might contain references to the old filenames
@@ -81,22 +124,35 @@ export function updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFile
     uiLogger.log('');
     uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.header);
     for (const hsMetaFile of hsMetaFilePaths) {
-        const component = JSON.parse(fs.readFileSync(hsMetaFile).toString());
-        let uid = coerceToValidUid(`${component.type}-${projectName}`) || component.uid;
-        if (existingUids.includes(uid)) {
-            uid =
-                coerceToValidUid(`${component.type}-${Date.now()}-${projectName}`) ||
-                    component.uid;
+        try {
+            const component = JSON.parse(fs.readFileSync(hsMetaFile).toString());
+            const getBaseUid = () => {
+                const customUid = coerceToValidUid(`${projectName}_${component.type}`);
+                if (customUid) {
+                    return customUid.replace(/-/g, '_');
+                }
+                return component.uid;
+            };
+            let uid = getBaseUid();
+            let differentiator = 1;
+            while (existingUids.includes(uid)) {
+                differentiator++;
+                uid = `${getBaseUid()}_${differentiator}`;
+            }
+            component.uid = uid;
+            if (component.type === AppKey && component.config) {
+                component.config.name = `${projectName}-Application`;
+                uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.applicationLog(component.type, component.uid, component.config.name));
+            }
+            else {
+                uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.componentLog(component.type, component.uid));
+            }
+            fs.writeFileSync(hsMetaFile, JSON.stringify(component, null, 2));
         }
-        component.uid = uid;
-        if (component.type === AppKey && component.config) {
-            component.config.name = `${projectName}-Application`;
-            uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.applicationLog(component.type, component.uid, component.config.name));
-        }
-        else {
-            uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.componentLog(component.type, component.uid));
+        catch (error) {
+            debugError(error);
+            uiLogger.error(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.failedToUpdate(hsMetaFile));
         }
-        fs.writeFileSync(hsMetaFile, JSON.stringify(component, null, 2));
     }
     uiLogger.log('');
 }