@hubspot/cli 7.11.8-experimental.0 → 8.0.0-beta.1

package/commands/cms/lighthouseScore.js

@@ -1,5 +1,4 @@
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
-import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -9,6 +8,7 @@ import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../../lib/constants.js';
 import { uiLink } from '../../lib/ui/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { renderTable } from '../../ui/render.js';
 const DEFAULT_TABLE_HEADER = [
     'Accessibility',
     'Best practices',
@@ -64,12 +64,12 @@ async function handler(args) {
     const includeMobileScore = target === 'mobile' || !verbose;
     let themeToCheck = theme;
     if (themeToCheck) {
-        let isValidTheme = true;
+        let isValidTheme = false;
         try {
-            const { data: result } = await fetchThemes(derivedAccountId, {
-                name: encodeURIComponent(themeToCheck),
-            });
-            isValidTheme = result && !!result.total;
+            const { data: result } = await fetchThemes(derivedAccountId);
+            if (result && result.objects) {
+                isValidTheme = result.objects.some(({ theme }) => theme.path === themeToCheck);
+            }
         }
         catch (err) {
             isValidTheme = false;
@@ -100,7 +100,6 @@ async function handler(args) {
     }
     // Poll till scoring is finished
     try {
-        SpinniesManager.init();
         SpinniesManager.add('lighthouseScore', {
             text: commands.cms.subcommands.lighthouseScore.info.generatingScore(themeToCheck),
         });
@@ -175,25 +174,21 @@ async function handler(args) {
             process.exit(EXIT_CODES.ERROR);
         }
         uiLogger.log(commands.cms.subcommands.lighthouseScore.info.themeToCheckTitle(themeToCheck, target));
-        const tableHeader = getTableHeader(DEFAULT_TABLE_HEADER);
         const scores = verboseViewAverageScoreResult.scores
             ? verboseViewAverageScoreResult.scores[0]
             : EMPTY_SCORE;
         const averageTableData = [
-            scores.accessibilityScore,
-            scores.bestPracticesScore,
-            scores.performanceScore,
-            scores.pwaScore,
-            scores.seoScore,
+            [
+                scores.accessibilityScore,
+                scores.bestPracticesScore,
+                scores.performanceScore,
+                scores.pwaScore,
+                scores.seoScore,
+            ],
         ];
-        uiLogger.log(getTableContents([tableHeader, averageTableData], {
-            border: { bodyLeft: '  ' },
-        }));
+        renderTable(DEFAULT_TABLE_HEADER, averageTableData);
+        uiLogger.log('');
         uiLogger.log(commands.cms.subcommands.lighthouseScore.info.pageTemplateScoreTitle);
-        const table2Header = getTableHeader([
-            'Template path',
-            ...DEFAULT_TABLE_HEADER,
-        ]);
         const templateTableData = scoreResult.scores.map(score => {
             return [
                 score.templatePath,
@@ -204,9 +199,8 @@ async function handler(args) {
                 score.seoScore,
             ];
         });
-        uiLogger.log(getTableContents([table2Header, ...templateTableData], {
-            border: { bodyLeft: '  ' },
-        }));
+        renderTable(['Template path', ...DEFAULT_TABLE_HEADER], templateTableData);
+        uiLogger.log('');
         uiLogger.log(commands.cms.subcommands.lighthouseScore.info.lighthouseLinksTitle);
         scoreResult.scores.forEach(score => {
             if (score.templatePath && score.link) {
@@ -225,7 +219,6 @@ async function handler(args) {
     }
     else {
         uiLogger.log(commands.cms.subcommands.lighthouseScore.info.themeTitle(themeToCheck));
-        const tableHeader = getTableHeader(['Target', ...DEFAULT_TABLE_HEADER]);
         const getTableData = (target, scoreResult) => {
             const scores = scoreResult?.scores ? scoreResult.scores[0] : EMPTY_SCORE;
             return [
@@ -241,9 +234,8 @@ async function handler(args) {
             getTableData('desktop', desktopScoreResult),
             getTableData('mobile', mobileScoreResult),
         ];
-        uiLogger.log(getTableContents([tableHeader, ...tableData], {
-            border: { bodyLeft: '  ' },
-        }));
+        renderTable(['Target', ...DEFAULT_TABLE_HEADER], tableData);
+        uiLogger.log('');
         uiLogger.info(commands.cms.subcommands.lighthouseScore.info.verboseOptionNote);
     }
     uiLogger.log('');

package/commands/cms/module/marketplace-validate.js

@@ -9,7 +9,6 @@ const describe = commands.cms.subcommands.module.subcommands.marketplaceValidate
 async function handler(args) {
     const { src, derivedAccountId } = args;
     trackCommandUsage('validate', undefined, derivedAccountId);
-    SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: commands.cms.subcommands.module.subcommands.marketplaceValidate.logs.validatingModule(src),
     });

package/commands/cms/theme/__tests__/preview.test.js

@@ -29,12 +29,6 @@ describe('commands/theme/preview', () => {
                 type: 'string',
                 requiresArg: true,
             });
-            expect(optionSpy).toHaveBeenCalledWith('notify', {
-                describe: expect.any(String),
-                alias: 'n',
-                type: 'string',
-                requiresArg: true,
-            });
             expect(optionSpy).toHaveBeenCalledWith('no-ssl', {
                 describe: expect.any(String),
                 type: 'boolean',
@@ -43,11 +37,11 @@ describe('commands/theme/preview', () => {
                 describe: expect.any(String),
                 type: 'number',
             });
-            expect(optionSpy).toHaveBeenCalledWith('resetSession', {
+            expect(optionSpy).toHaveBeenCalledWith('reset-session', {
                 hidden: true,
                 type: 'boolean',
             });
-            expect(optionSpy).toHaveBeenCalledWith('generateFieldsTypes', {
+            expect(optionSpy).toHaveBeenCalledWith('generate-fields-types', {
                 hidden: true,
                 type: 'boolean',
             });

package/commands/cms/theme/create.js

@@ -7,7 +7,7 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import assets from '../../../lib/cmsAssets/index.js';
-const command = 'create';
+const command = 'create [dest]';
 const describe = commands.cms.subcommands.theme.subcommands.create.describe;
 async function handler(args) {
     const { derivedAccountId, dest } = args;

package/commands/cms/theme/marketplace-validate.js

@@ -8,7 +8,6 @@ const describe = commands.cms.subcommands.theme.subcommands.marketplaceValidate.
 async function handler(args) {
     const { path, derivedAccountId } = args;
     trackCommandUsage('validate', {}, derivedAccountId);
-    SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: commands.cms.subcommands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
     });

package/commands/cms/theme/preview.d.ts

@@ -2,7 +2,6 @@ import { CommonArgs, ConfigArgs, AccountArgs, YargsCommandModule } from '../../.
 export type ThemePreviewArgs = CommonArgs & ConfigArgs & AccountArgs & {
     src: string;
     dest: string;
-    notify: string;
     'no-ssl'?: boolean;
     port?: number;
     resetSession?: boolean;

package/commands/cms/theme/preview.js

@@ -5,13 +5,12 @@ import { commands } from '../../../lang/en.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { FILE_UPLOAD_RESULT_TYPES } from '@hubspot/local-dev-lib/constants/files';
 import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
-import { preview } from '@hubspot/theme-preview-dev-server';
+import { createDevServer } from '@hubspot/cms-dev-server';
 import { getUploadableFileList } from '../../../lib/upload.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { previewPrompt, previewProjectPrompt, } from '../../../lib/prompts/previewPrompt.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../../lib/errorHandlers/index.js';
-import { handleExit, handleKeypress } from '../../../lib/process.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { findProjectComponents } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
@@ -36,18 +35,6 @@ function validateSrcPath(src) {
     }
     return true;
 }
-function handleUserInput() {
-    const onTerminate = () => {
-        uiLogger.log(commands.cms.subcommands.theme.subcommands.preview.logs.processExited);
-        process.exit(EXIT_CODES.SUCCESS);
-    };
-    handleExit(onTerminate);
-    handleKeypress(key => {
-        if ((key.ctrl && key.name === 'c') || key.name === 'q') {
-            onTerminate();
-        }
-    });
-}
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
@@ -84,7 +71,7 @@ async function determineSrcAndDest(args) {
     return { absoluteSrc, dest };
 }
 async function handler(args) {
-    const { derivedAccountId, notify, noSsl, resetSession, port, generateFieldsTypes, } = args;
+    const { derivedAccountId, noSsl, resetSession, port, generateFieldsTypes } = args;
     const { absoluteSrc, dest } = await determineSrcAndDest(args);
     const filePaths = await getUploadableFileList(absoluteSrc, false);
     function startProgressBar(numFiles) {
@@ -140,36 +127,15 @@ async function handler(args) {
         return uploadOptions;
     }
     trackCommandUsage('preview', {}, derivedAccountId);
-    let createUnifiedDevServer;
-    try {
-        const { createDevServer } = await import('@hubspot/cms-dev-server');
-        createUnifiedDevServer = createDevServer;
-    }
-    catch (e) {
-        uiLogger.warn('Error loading unified dev server. Defaulting to legacy preview.');
-    }
-    if (createUnifiedDevServer) {
-        if (port) {
-            process.env['PORT'] = port.toString();
-        }
-        createUnifiedDevServer(absoluteSrc, false, '', '', !noSsl, generateFieldsTypes, {
-            filePaths,
-            resetSession: resetSession || false,
-            startProgressBar,
-            dest,
-        });
-    }
-    else {
-        preview(derivedAccountId, absoluteSrc, dest, {
-            notify,
-            filePaths,
-            noSsl,
-            port,
-            resetSession: resetSession || false,
-            startProgressBar,
-            handleUserInput,
-        });
+    if (port) {
+        process.env['PORT'] = port.toString();
     }
+    createDevServer(absoluteSrc, false, '', '', !noSsl, generateFieldsTypes, {
+        filePaths,
+        resetSession: resetSession || false,
+        startProgressBar,
+        dest,
+    });
 }
 function themePreviewBuilder(yargs) {
     yargs
@@ -182,12 +148,6 @@ function themePreviewBuilder(yargs) {
         describe: commands.cms.subcommands.theme.subcommands.preview.positionals.dest,
         type: 'string',
         requiresArg: true,
-    })
-        .option('notify', {
-        alias: 'n',
-        describe: commands.cms.subcommands.theme.subcommands.preview.options.notify,
-        type: 'string',
-        requiresArg: true,
     })
         .option('no-ssl', {
         describe: commands.cms.subcommands.theme.subcommands.preview.options.noSsl,
@@ -197,11 +157,11 @@ function themePreviewBuilder(yargs) {
         describe: commands.cms.subcommands.theme.subcommands.preview.options.port,
         type: 'number',
     })
-        .option('resetSession', {
+        .option('reset-session', {
         hidden: true,
         type: 'boolean',
     })
-        .option('generateFieldsTypes', {
+        .option('generate-fields-types', {
         hidden: true,
         type: 'boolean',
     });

package/commands/cms/upload.js

@@ -168,18 +168,18 @@ function uploadBuilder(yargs) {
         describe: commands.cms.subcommands.upload.positionals.dest,
         type: 'string',
     });
-    yargs.option('fieldOptions', {
+    yargs.option('field-options', {
         describe: commands.cms.subcommands.upload.options.options,
         type: 'array',
         default: [''],
         hidden: true,
     });
-    yargs.option('saveOutput', {
+    yargs.option('save-output', {
         describe: commands.cms.subcommands.upload.options.saveOutput,
         type: 'boolean',
         default: false,
     });
-    yargs.option('convertFields', {
+    yargs.option('convert-fields', {
         describe: commands.cms.subcommands.upload.options.convertFields,
         type: 'boolean',
         default: false,

package/commands/cms/watch.js

@@ -83,7 +83,7 @@ function watchBuilder(yargs) {
         describe: commands.cms.subcommands.watch.positionals.dest,
         type: 'string',
     });
-    yargs.option('fieldOptions', {
+    yargs.option('field-options', {
         describe: commands.cms.subcommands.watch.options.options,
         type: 'array',
         default: [''],
@@ -110,12 +110,12 @@ function watchBuilder(yargs) {
         type: 'string',
         requiresArg: true,
     });
-    yargs.option('convertFields', {
+    yargs.option('convert-fields', {
         describe: commands.cms.subcommands.watch.options.convertFields,
         type: 'boolean',
         default: false,
     });
-    yargs.option('saveOutput', {
+    yargs.option('save-output', {
         describe: commands.cms.subcommands.watch.options.saveOutput,
         type: 'boolean',
         default: false,

package/commands/customObject.js

@@ -1,4 +1,3 @@
-import schemaCommand from './customObject/schema.js';
 import createCommand from './customObject/create.js';
 import createSchemaCommand from './customObject/createSchema.js';
 import deleteSchemaCommand from './customObject/deleteSchema.js';
@@ -19,7 +18,6 @@ function logBetaMessage() {
 function customObjectBuilder(yargs) {
     yargs.middleware([logBetaMessage]);
     yargs
-        .command(schemaCommand)
         .command(createCommand)
         .command(createSchemaCommand)
         .command(deleteSchemaCommand)

package/commands/doctor.js

@@ -6,7 +6,9 @@ import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { uiLogger } from '../lib/ui/logger.js';
+import { removeAnsiCodes } from '../lib/ui/removeAnsiCodes.js';
 import { commands } from '../lang/en.js';
+import { getErrorMessage } from '../lib/errorHandlers/index.js';
 const command = 'doctor';
 const describe = commands.doctor.describe;
 const handler = async (args) => {
@@ -34,11 +36,17 @@ const handler = async (args) => {
     }
     const outputFile = path.join(outputDirPath, `hubspot-doctor-${new Date().toISOString()}.json`);
     try {
-        fs.writeFileSync(outputFile, JSON.stringify(output, null, 4));
+        const cleanedOutput = {
+            ...output,
+            diagnosis: output?.diagnosis
+                ? removeAnsiCodes(output.diagnosis)
+                : undefined,
+        };
+        fs.writeFileSync(outputFile, JSON.stringify(cleanedOutput, null, 4));
         uiLogger.success(commands.doctor.outputWritten(outputFile));
     }
     catch (e) {
-        uiLogger.error(commands.doctor.errors.unableToWriteOutputFile(outputFile, e instanceof Error ? e.message : e));
+        uiLogger.error(commands.doctor.errors.unableToWriteOutputFile(outputFile, getErrorMessage(e)));
         return process.exit(EXIT_CODES.ERROR);
     }
     return process.exit(EXIT_CODES.SUCCESS);

package/commands/filemanager/__tests__/upload.test.js

@@ -1,9 +1,49 @@
 import yargs from 'yargs';
+import fs from 'fs';
+import path from 'path';
+import * as fileManagerLib from '@hubspot/local-dev-lib/fileManager';
+import * as fileManagerApiLib from '@hubspot/local-dev-lib/api/fileManager';
+import * as pathLib from '@hubspot/local-dev-lib/path';
+import * as modulesLib from '@hubspot/local-dev-lib/cms/modules';
+import * as ignoreRulesLib from '@hubspot/local-dev-lib/ignoreRules';
+import * as configLib from '@hubspot/local-dev-lib/config';
 import { addGlobalOptions, addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
+import { uiLogger } from '../../../lib/ui/logger.js';
+import * as errorHandlers from '../../../lib/errorHandlers/index.js';
+import * as usageTrackingLib from '../../../lib/usageTracking.js';
+import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import fileManagerUploadCommand from '../upload.js';
 vi.mock('../../../lib/commonOpts');
+vi.mock('fs');
+vi.mock('@hubspot/local-dev-lib/fileManager');
+vi.mock('@hubspot/local-dev-lib/api/fileManager');
+vi.mock('@hubspot/local-dev-lib/path');
+vi.mock('@hubspot/local-dev-lib/cms/modules');
+vi.mock('@hubspot/local-dev-lib/ignoreRules');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../lib/errorHandlers/index.js');
+const uploadFolderSpy = vi.spyOn(fileManagerLib, 'uploadFolder');
+const uploadFileSpy = vi.spyOn(fileManagerApiLib, 'uploadFile');
+const statSyncSpy = vi.spyOn(fs, 'statSync');
+const validateSrcAndDestPathsSpy = vi.spyOn(modulesLib, 'validateSrcAndDestPaths');
+const shouldIgnoreFileSpy = vi.spyOn(ignoreRulesLib, 'shouldIgnoreFile');
+const getCwdSpy = vi.spyOn(pathLib, 'getCwd');
+const convertToUnixPathSpy = vi.spyOn(pathLib, 'convertToUnixPath');
+const trackCommandUsageSpy = vi.spyOn(usageTrackingLib, 'trackCommandUsage');
+const processExitSpy = vi.spyOn(process, 'exit');
+const logErrorSpy = vi.spyOn(errorHandlers, 'logError');
+const getConfigAccountIfExistsSpy = vi.spyOn(configLib, 'getConfigAccountIfExists');
 describe('commands/filemanager/upload', () => {
     const yargsMock = yargs;
+    beforeEach(() => {
+        // @ts-expect-error Mock implementation
+        processExitSpy.mockImplementation(() => { });
+        getCwdSpy.mockReturnValue('/test/cwd');
+        convertToUnixPathSpy.mockImplementation(p => p.replace(/\\/g, '/'));
+        validateSrcAndDestPathsSpy.mockResolvedValue([]);
+        // Mock config to prevent reading actual config file in CI
+        getConfigAccountIfExistsSpy.mockReturnValue(undefined);
+    });
     describe('command', () => {
         it('should have the correct command structure', () => {
             expect(fileManagerUploadCommand.command).toEqual('upload <src> <dest>');
@@ -27,4 +67,125 @@ describe('commands/filemanager/upload', () => {
             expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargsMock);
         });
     });
+    describe('handler', () => {
+        let args;
+        beforeEach(() => {
+            args = {
+                src: 'test.js',
+                dest: '/dest/test.js',
+                derivedAccountId: 123456,
+                d: false,
+                debug: false,
+            };
+        });
+        describe('validation', () => {
+            it('should error if src path is invalid', async () => {
+                statSyncSpy.mockImplementation(() => {
+                    throw new Error('File not found');
+                });
+                await fileManagerUploadCommand.handler(args);
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('path to a file or folder'));
+            });
+            it('should error if src path is not a file or directory', async () => {
+                statSyncSpy.mockReturnValue({
+                    isFile: () => false,
+                    isDirectory: () => false,
+                });
+                await fileManagerUploadCommand.handler(args);
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('path to a file or folder'));
+            });
+            it('should error if dest is not provided', async () => {
+                args.dest = '';
+                statSyncSpy.mockReturnValue({
+                    isFile: () => true,
+                    isDirectory: () => false,
+                });
+                await fileManagerUploadCommand.handler(args);
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('destination'));
+            });
+            it('should exit if src/dest validation fails', async () => {
+                statSyncSpy.mockReturnValue({
+                    isFile: () => true,
+                    isDirectory: () => false,
+                });
+                validateSrcAndDestPathsSpy.mockResolvedValue([
+                    { id: '1', message: 'Invalid path' },
+                ]);
+                // @ts-expect-error Mock return value doesn't need full type implementation
+                uploadFileSpy.mockResolvedValue({});
+                await fileManagerUploadCommand.handler(args);
+                expect(uiLogger.error).toHaveBeenCalledWith('Invalid path');
+                expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+            });
+        });
+        describe('file upload', () => {
+            beforeEach(() => {
+                statSyncSpy.mockReturnValue({
+                    isFile: () => true,
+                    isDirectory: () => false,
+                });
+                shouldIgnoreFileSpy.mockReturnValue(false);
+            });
+            it('should track command usage for file uploads', async () => {
+                // @ts-expect-error Mock return value doesn't need full type implementation
+                uploadFileSpy.mockResolvedValue({});
+                await fileManagerUploadCommand.handler(args);
+                expect(trackCommandUsageSpy).toHaveBeenCalledWith('filemanager-upload', { type: 'file' }, 123456);
+            });
+            it('should upload a file successfully', async () => {
+                // @ts-expect-error Mock return value doesn't need full type implementation
+                uploadFileSpy.mockResolvedValue({});
+                await fileManagerUploadCommand.handler(args);
+                expect(uploadFileSpy).toHaveBeenCalledWith(123456, path.resolve('/test/cwd', 'test.js'), '/dest/test.js');
+                expect(uiLogger.success).toHaveBeenCalledWith(expect.stringContaining('test.js'));
+            });
+            it('should error if file is ignored', async () => {
+                shouldIgnoreFileSpy.mockReturnValue(true);
+                await fileManagerUploadCommand.handler(args);
+                expect(uploadFileSpy).not.toHaveBeenCalled();
+                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('ignored'));
+            });
+            it('should handle upload errors', async () => {
+                vi.useFakeTimers();
+                const error = new Error('Upload failed');
+                uploadFileSpy.mockRejectedValue(error);
+                await fileManagerUploadCommand.handler(args);
+                await vi.runAllTimersAsync();
+                expect(uiLogger.error).toHaveBeenCalled();
+                expect(logErrorSpy).toHaveBeenCalledWith(error, expect.any(errorHandlers.ApiErrorContext));
+                vi.useRealTimers();
+            });
+        });
+        describe('folder upload', () => {
+            beforeEach(() => {
+                statSyncSpy.mockReturnValue({
+                    isFile: () => false,
+                    isDirectory: () => true,
+                });
+                // @ts-expect-error Mock return value doesn't need full type implementation
+                uploadFolderSpy.mockResolvedValue({});
+            });
+            it('should track command usage for folder uploads', async () => {
+                await fileManagerUploadCommand.handler(args);
+                expect(trackCommandUsageSpy).toHaveBeenCalledWith('filemanager-upload', { type: 'folder' }, 123456);
+            });
+            it('should upload a folder successfully', async () => {
+                await fileManagerUploadCommand.handler(args);
+                expect(uploadFolderSpy).toHaveBeenCalledWith(123456, path.resolve('/test/cwd', 'test.js'), '/dest/test.js');
+                expect(uiLogger.success).toHaveBeenCalledWith(expect.stringContaining('complete'));
+            });
+            it('should handle folder upload errors', async () => {
+                vi.useFakeTimers();
+                const error = new Error('Folder upload failed');
+                uploadFolderSpy.mockRejectedValue(error);
+                await fileManagerUploadCommand.handler(args);
+                await vi.runAllTimersAsync();
+                expect(uiLogger.error).toHaveBeenCalled();
+                expect(logErrorSpy).toHaveBeenCalledWith(error, {
+                    accountId: 123456,
+                });
+                vi.useRealTimers();
+            });
+        });
+    });
 });

package/commands/getStarted.js

@@ -11,7 +11,8 @@ import { promptUser } from '../lib/prompts/promptUtils.js';
 import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { debugError, logError } from '../lib/errorHandlers/index.js';
+import { debugError } from '../lib/errorHandlers/index.js';
+import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
 import { handleProjectUpload } from '../lib/projects/upload.js';
 import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
 import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
@@ -165,8 +166,17 @@ async function handler(args) {
                     validateProjectConfig(newProjectConfig, newProjectDir);
                 }
                 catch (error) {
-                    logError(error);
-                    process.exit(EXIT_CODES.ERROR);
+                    if (error instanceof ProjectValidationError) {
+                        // Track validation error
+                        await trackCommandMetadataUsage('get-started', {
+                            successful: false,
+                            step: 'project-validation-failed',
+                        }, derivedAccountId);
+                        uiLogger.log(' ');
+                        uiLogger.error(error.message);
+                        process.exit(EXIT_CODES.ERROR);
+                    }
+                    throw error;
                 }
                 uiLogger.log(' ');
                 uiLogger.log(commands.getStarted.logs.uploadingProject);

package/commands/hubdb/__tests__/list.test.js

@@ -8,16 +8,7 @@ import hubdbListCommand from '../list.js';
 vi.mock('../../../lib/commonOpts');
 vi.mock('@hubspot/local-dev-lib/api/hubdb');
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('../../../lib/ui/logger', () => ({
-    uiLogger: {
-        success: vi.fn(),
-        log: vi.fn(),
-        error: vi.fn(),
-        exit: vi.fn(),
-    },
-}));
 vi.mock('../../../lib/errorHandlers');
-vi.mock('../../../lib/usageTracking');
 const mockExit = vi
     .spyOn(process, 'exit')
     .mockImplementation(() => undefined);

package/commands/hubdb/list.js

@@ -1,13 +1,12 @@
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
-import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
-import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
+import { renderTable } from '../../ui/render.js';
+import { getBaseHubSpotUrlForAccount } from '../../lib/projects/urls.js';
 const command = ['list', 'ls'];
 const describe = commands.hubdb.subcommands.list.describe;
 async function getTableData(accountId) {
@@ -35,18 +34,17 @@ async function handler(args) {
     trackCommandUsage('hubdb-list', {}, derivedAccountId);
     const { results: tables, total } = await getTableData(derivedAccountId);
     const tableUIData = mapTablesToUI(tables);
-    tableUIData.unshift(getTableHeader([
+    const tableHeader = [
         commands.hubdb.subcommands.list.labels.id,
         commands.hubdb.subcommands.list.labels.label,
         commands.hubdb.subcommands.list.labels.name,
         commands.hubdb.subcommands.list.labels.columns,
         commands.hubdb.subcommands.list.labels.rows,
-    ]));
+    ];
     uiLogger.success(commands.hubdb.subcommands.list.success(derivedAccountId));
     uiLogger.log(' ');
     // link devs to the hubdb page in hubspot for easy access
-    // TODO: This is hacky, we should make a util like getBaseUrl()
-    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId));
+    const baseUrl = getBaseHubSpotUrlForAccount(derivedAccountId);
     uiLogger.log(commands.hubdb.subcommands.list.viewTablesLink(baseUrl, derivedAccountId));
     // don't bother showing an empty list of tables
     if (tables.length > 0) {
@@ -55,7 +53,7 @@ async function handler(args) {
         uiLogger.log(commands.hubdb.subcommands.list.tablesDisplayed(tables.length, total, truncated));
         uiLogger.log('--------------------------------');
         uiLogger.log(commands.hubdb.subcommands.list.tables);
-        uiLogger.log(getTableContents(tableUIData, { border: { bodyLeft: '  ' } }));
+        renderTable(tableHeader, tableUIData);
     }
     else {
         uiLogger.log(commands.hubdb.subcommands.list.noTables(derivedAccountId));