@hubspot/cli 7.7.35-experimental.0 → 7.8.1-experimental.0

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

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

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

@@ -0,0 +1,110 @@
+import { getAccountIdFromCliConfig } from '../cliConfig.js';
+import { configFileExists, findConfig, getAccountId, loadConfig, } from '@hubspot/local-dev-lib/config';
+vi.mock('@hubspot/local-dev-lib/config');
+const mockConfigFileExists = configFileExists;
+const mockFindConfig = findConfig;
+const mockGetAccountId = getAccountId;
+const mockLoadConfig = loadConfig;
+describe('mcp-server/utils/cliConfig', () => {
+    const mockWorkingDirectory = '/test/working/directory';
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('getAccountIdFromCliConfig', () => {
+        it('should load global config when it exists and return account ID', () => {
+            const expectedAccountId = 12345;
+            mockConfigFileExists.mockReturnValue(true);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockLoadConfig).toHaveBeenCalledWith('');
+            expect(mockFindConfig).not.toHaveBeenCalled();
+            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should load local config when global config does not exist and return account ID', () => {
+            const expectedAccountId = 67890;
+            const localConfigPath = '/path/to/local/config';
+            mockConfigFileExists.mockReturnValue(false);
+            mockFindConfig.mockReturnValue(localConfigPath);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
+            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should pass accountNameOrId parameter to getAccountId when provided as string', () => {
+            const expectedAccountId = 11111;
+            const accountName = 'test-account';
+            mockConfigFileExists.mockReturnValue(true);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountName);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockLoadConfig).toHaveBeenCalledWith('');
+            expect(mockGetAccountId).toHaveBeenCalledWith(accountName);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should pass accountNameOrId parameter to getAccountId when provided as number', () => {
+            const expectedAccountId = 22222;
+            const accountId = 22222;
+            mockConfigFileExists.mockReturnValue(true);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountId);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockLoadConfig).toHaveBeenCalledWith('');
+            expect(mockGetAccountId).toHaveBeenCalledWith(accountId);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should return null when getAccountId returns null', () => {
+            mockConfigFileExists.mockReturnValue(true);
+            mockGetAccountId.mockReturnValue(null);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockLoadConfig).toHaveBeenCalledWith('');
+            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
+            expect(result).toBeNull();
+        });
+        it('should handle findConfig returning null by passing null to loadConfig', () => {
+            const expectedAccountId = 33333;
+            mockConfigFileExists.mockReturnValue(false);
+            mockFindConfig.mockReturnValue(null);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            expect(mockLoadConfig).toHaveBeenCalledWith(null);
+            expect(mockGetAccountId).toHaveBeenCalledWith(undefined);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should work with local config when provided with account name parameter', () => {
+            const expectedAccountId = 44444;
+            const accountName = 'local-test-account';
+            const localConfigPath = '/path/to/local/config';
+            mockConfigFileExists.mockReturnValue(false);
+            mockFindConfig.mockReturnValue(localConfigPath);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountName);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
+            expect(mockGetAccountId).toHaveBeenCalledWith(accountName);
+            expect(result).toBe(expectedAccountId);
+        });
+        it('should work with local config when provided with account ID parameter', () => {
+            const expectedAccountId = 55555;
+            const accountId = 55555;
+            const localConfigPath = '/path/to/local/config';
+            mockConfigFileExists.mockReturnValue(false);
+            mockFindConfig.mockReturnValue(localConfigPath);
+            mockGetAccountId.mockReturnValue(expectedAccountId);
+            const result = getAccountIdFromCliConfig(mockWorkingDirectory, accountId);
+            expect(mockConfigFileExists).toHaveBeenCalledWith(true);
+            expect(mockFindConfig).toHaveBeenCalledWith(mockWorkingDirectory);
+            expect(mockLoadConfig).toHaveBeenCalledWith(localConfigPath);
+            expect(mockGetAccountId).toHaveBeenCalledWith(accountId);
+            expect(result).toBe(expectedAccountId);
+        });
+    });
+});

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

@@ -0,0 +1 @@
+export declare function getAccountIdFromCliConfig(absolutePathToWorkingDirectory: string, accountNameOrId?: string | number): number | null;

package/mcp-server/utils/cliConfig.js

@@ -0,0 +1,12 @@
+import { configFileExists, findConfig, getAccountId, loadConfig, } from '@hubspot/local-dev-lib/config';
+export function getAccountIdFromCliConfig(absolutePathToWorkingDirectory, accountNameOrId) {
+    const globalConfigExists = configFileExists(true);
+    if (globalConfigExists) {
+        loadConfig('');
+    }
+    else {
+        const configPath = findConfig(absolutePathToWorkingDirectory);
+        loadConfig(configPath);
+    }
+    return getAccountId(accountNameOrId);
+}

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.35-experimental.0",
+    "version": "7.8.1-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.18.0",
-        "@hubspot/project-parsing-lib": "0.8.3",
+        "@hubspot/project-parsing-lib": "0.8.5-beta.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.8",