@hubspot/local-dev-lib 0.2.4 → 0.3.1

package/api/customObjects.d.ts

@@ -1,7 +1,20 @@
 import { FetchSchemasResponse, Schema } from '../types/Schemas';
-export declare function batchCreateObjects(accountId: number, objectTypeId: string, objects: JSON): Promise<void>;
+type CreateObjectsResponse = {
+    status: string;
+    startedAt: string;
+    completedAt: string;
+    results: Array<{
+        id: string;
+        properties: Array<any>;
+        createdAt: string;
+        updatedAt: string;
+        archived: boolean;
+    }>;
+};
+export declare function batchCreateObjects(accountId: number, objectTypeId: string, objects: JSON): Promise<CreateObjectsResponse>;
 export declare function createObjectSchema(accountId: number, schema: JSON): Promise<Schema>;
 export declare function updateObjectSchema(accountId: number, schemaObjectType: string, schema: Schema): Promise<Schema>;
 export declare function fetchObjectSchema(accountId: number, schemaObjectType: string): Promise<Schema>;
 export declare function fetchObjectSchemas(accountId: number): Promise<FetchSchemasResponse>;
 export declare function deleteObjectSchema(accountId: number, schemaObjectType: string): Promise<void>;
+export {};

package/api/customObjects.js

@@ -8,7 +8,7 @@ const http_1 = __importDefault(require("../http"));
 const CUSTOM_OBJECTS_API_PATH = 'crm/v3/objects';
 const SCHEMA_API_PATH = 'crm-object-schemas/v3/schemas';
 async function batchCreateObjects(accountId, objectTypeId, objects) {
-    http_1.default.post(accountId, {
+    return http_1.default.post(accountId, {
         url: `${CUSTOM_OBJECTS_API_PATH}/${objectTypeId}/batch/create`,
         data: objects,
     });

package/api/fileTransport.d.ts

@@ -0,0 +1,3 @@
+export declare function createSchemaFromHubFile(accountId: number, filepath: string): Promise<unknown>;
+export declare function updateSchemaFromHubFile(accountId: number, filepath: string): Promise<unknown>;
+export declare function fetchHubFileSchema(accountId: number, objectName: string, path: string): Promise<import("axios").AxiosResponse<any, any>>;

package/api/fileTransport.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchHubFileSchema = exports.updateSchemaFromHubFile = exports.createSchemaFromHubFile = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("../lib/path");
+const http_1 = __importDefault(require("../http"));
+const HUBFILES_API_PATH = '/file-transport/v1/hubfiles';
+async function createSchemaFromHubFile(accountId, filepath) {
+    const file = fs_1.default.createReadStream(path_1.default.resolve((0, path_2.getCwd)(), filepath));
+    return http_1.default.post(accountId, {
+        url: `${HUBFILES_API_PATH}/object-schemas`,
+        data: {
+            file,
+        },
+        headers: { 'Content-Type': 'multipart/form-data' },
+    });
+}
+exports.createSchemaFromHubFile = createSchemaFromHubFile;
+async function updateSchemaFromHubFile(accountId, filepath) {
+    const file = fs_1.default.createReadStream(path_1.default.resolve((0, path_2.getCwd)(), filepath));
+    return http_1.default.put(accountId, {
+        url: `${HUBFILES_API_PATH}/object-schemas`,
+        data: {
+            file,
+        },
+        headers: { 'Content-Type': 'multipart/form-data' },
+    });
+}
+exports.updateSchemaFromHubFile = updateSchemaFromHubFile;
+async function fetchHubFileSchema(accountId, objectName, path) {
+    return http_1.default.getOctetStream(accountId, {
+        url: `${HUBFILES_API_PATH}/object-schemas/${objectName}`,
+    }, path);
+}
+exports.fetchHubFileSchema = fetchHubFileSchema;

package/api/sandboxHubs.d.ts

@@ -1,6 +1,6 @@
 import { Environment } from '../types/Config';
 import { SandboxHubData, SandboxResponse, SandboxUsageLimitsResponse } from '../types/Sandbox';
-export declare function createSandbox(accountId: number, name: string, type: string): Promise<SandboxResponse>;
+export declare function createSandbox(accountId: number, name: string, type: 1 | 2): Promise<SandboxResponse>;
 export declare function deleteSandbox(parentAccountId: number, sandboxAccountId: number): Promise<void>;
 export declare function getSandboxUsageLimits(parentAccountId: number): Promise<SandboxUsageLimitsResponse>;
 export declare function fetchSandboxHubData(accessToken: string, portalId: number, env?: Environment): Promise<SandboxHubData>;

package/config/CLIConfiguration.d.ts

@@ -1,8 +1,6 @@
 import { CLIConfig_NEW, Environment } from '../types/Config';
-import { CLIAccount_NEW, FlatAccountFields_NEW } from '../types/Accounts';
+import { CLIAccount_NEW, FlatAccountFields_NEW, AccountType } from '../types/Accounts';
 import { CLIOptions } from '../types/CLIOptions';
-import { LogCallbacksArg } from '../types/LogCallbacks';
-declare const validateLogCallbackKeys: readonly ["noConfig", "noConfigAccounts", "emptyAccountConfig", "noAccountId", "duplicateAccountIds", "duplicateAccountNames", "nameContainsSpaces"];
 declare class CLIConfiguration {
     options: CLIOptions;
     useEnvConfig: boolean;
@@ -16,7 +14,7 @@ declare class CLIConfiguration {
     configIsEmpty(): boolean;
     delete(): void;
     write(updatedConfig?: CLIConfig_NEW): CLIConfig_NEW | null;
-    validate(logCallbacks?: LogCallbacksArg<typeof validateLogCallbackKeys>): boolean;
+    validate(): boolean;
     getAccount(nameOrId: string | number | undefined): CLIAccount_NEW | null;
     isConfigFlagEnabled(flag: keyof CLIConfig_NEW, defaultValue?: boolean): boolean;
     getAccountId(nameOrId?: string | number): number | null;
@@ -27,6 +25,7 @@ declare class CLIConfiguration {
     isAccountInConfig(nameOrId: string | number): boolean;
     getAndLoadConfigIfNeeded(options?: CLIOptions): CLIConfig_NEW;
     getEnv(nameOrId?: string | number): Environment;
+    getAccountType(accountType?: AccountType, sandboxAccountType?: string | null): AccountType;
     /**
      * @throws {Error}
      */
@@ -41,6 +40,7 @@ declare class CLIConfiguration {
     renameAccount(currentName: string, newName: string): void;
     /**
      * @throws {Error}
+     * TODO: this does not account for the special handling of sandbox account deletes
      */
     removeAccountFromConfig(nameOrId: string | number): boolean;
     /**

package/config/CLIConfiguration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("../utils/logger");
+const logger_1 = require("../lib/logging/logger");
 const standardErrors_1 = require("../errors/standardErrors");
 const environment_1 = require("./environment");
 const environment_2 = require("../lib/environment");
@@ -10,16 +10,8 @@ const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const config_1 = require("../constants/config");
 const files_1 = require("../constants/files");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'config.cliConfiguration';
-const validateLogCallbackKeys = [
-    'noConfig',
-    'noConfigAccounts',
-    'emptyAccountConfig',
-    'noAccountId',
-    'duplicateAccountIds',
-    'duplicateAccountNames',
-    'nameContainsSpaces',
-];
 class CLIConfiguration {
     options;
     useEnvConfig;
@@ -47,18 +39,18 @@ class CLIConfiguration {
         if (this.options.useEnv) {
             const configFromEnv = (0, environment_1.loadConfigFromEnvironment)();
             if (configFromEnv) {
-                (0, logger_1.debug)(`${i18nKey}.load.configFromEnv`, {
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.load.configFromEnv`, {
                     accountId: configFromEnv.accounts[0].accountId,
-                });
+                }));
                 this.useEnvConfig = true;
                 this.config = configFromEnv;
             }
         }
         else {
             const configFromFile = (0, configFile_1.loadConfigFromFile)();
-            (0, logger_1.debug)(`${i18nKey}.load.configFromFile`);
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.load.configFromFile`));
             if (!configFromFile) {
-                (0, logger_1.debug)(`${i18nKey}.load.empty`);
+                logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.load.empty`));
                 this.config = { accounts: [] };
             }
             this.useEnvConfig = false;
@@ -97,44 +89,43 @@ class CLIConfiguration {
         }
         return this.config;
     }
-    validate(logCallbacks) {
-        const validateLogger = (0, logger_1.makeTypedLogger)(logCallbacks);
+    validate() {
         if (!this.config) {
-            validateLogger('noConfig');
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.noConfig`));
             return false;
         }
         if (!Array.isArray(this.config.accounts)) {
-            validateLogger('noConfigAccounts');
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.noConfigAccounts`));
             return false;
         }
         const accountIdsMap = {};
         const accountNamesMap = {};
         return this.config.accounts.every(accountConfig => {
             if (!accountConfig) {
-                validateLogger('emptyAccountConfig');
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.emptyAccountConfig`));
                 return false;
             }
             if (!accountConfig.accountId) {
-                validateLogger('noAccountId');
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.noAccountId`));
                 return false;
             }
             if (accountIdsMap[accountConfig.accountId]) {
-                validateLogger('duplicateAccountIds', `${i18nKey}.validate.duplicateAccountIds`, {
+                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.duplicateAccountIds`, {
                     accountId: accountConfig.accountId,
-                });
+                }));
                 return false;
             }
             if (accountConfig.name) {
                 if (accountNamesMap[accountConfig.name]) {
-                    validateLogger('duplicateAccountNames', `${i18nKey}.validate.duplicateAccountNames`, {
+                    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.duplicateAccountNames`, {
                         accountName: accountConfig.name,
-                    });
+                    }));
                     return false;
                 }
                 if (/\s+/.test(accountConfig.name)) {
-                    validateLogger('nameContainsSpaces', `${i18nKey}.validate.nameContainsSpaces`, {
+                    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.validate.nameContainsSpaces`, {
                         accountName: accountConfig.name,
-                    });
+                    }));
                     return false;
                 }
                 accountNamesMap[accountConfig.name] = true;
@@ -227,6 +218,21 @@ class CLIConfiguration {
         }
         return environments_1.ENVIRONMENTS.PROD;
     }
+    // Deprecating sandboxAccountType in favor of accountType
+    getAccountType(accountType, sandboxAccountType) {
+        if (accountType) {
+            return accountType;
+        }
+        if (typeof sandboxAccountType === 'string') {
+            if (sandboxAccountType.toUpperCase() === 'DEVELOPER') {
+                return config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX;
+            }
+            if (sandboxAccountType.toUpperCase() === 'STANDARD') {
+                return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+            }
+        }
+        return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD;
+    }
     /*
      * Config Update Utils
      */
@@ -234,12 +240,12 @@ class CLIConfiguration {
      * @throws {Error}
      */
     updateAccount(updatedAccountFields, writeUpdate = true) {
-        const { accountId, apiKey, authType, clientId, clientSecret, defaultMode, env, name, parentAccountId, personalAccessKey, sandboxAccountType, scopes, tokenInfo, } = updatedAccountFields;
+        const { accountId, accountType, apiKey, authType, clientId, clientSecret, defaultMode, env, name, parentAccountId, personalAccessKey, sandboxAccountType, scopes, tokenInfo, } = updatedAccountFields;
         if (!accountId) {
             (0, standardErrors_1.throwErrorWithMessage)(`${i18nKey}.updateAccount.errors.accountIdRequired`);
         }
         if (!this.config) {
-            (0, logger_1.debug)(`${i18nKey}.updateAccount.noConfigToUpdate`);
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateAccount.noConfigToUpdate`));
             return null;
         }
         const currentAccountConfig = this.getAccount(accountId);
@@ -279,18 +285,20 @@ class CLIConfiguration {
             safelyApplyUpdates('defaultMode', files_1.MODE[updatedDefaultMode]);
         }
         safelyApplyUpdates('personalAccessKey', personalAccessKey);
+        // Deprecating sandboxAccountType in favor of the more generic accountType
         safelyApplyUpdates('sandboxAccountType', sandboxAccountType);
+        safelyApplyUpdates('accountType', this.getAccountType(accountType, sandboxAccountType));
         safelyApplyUpdates('parentAccountId', parentAccountId);
         const completedAccountConfig = nextAccountConfig;
         if (currentAccountConfig) {
-            (0, logger_1.debug)(`${i18nKey}.updateAccount.updating`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateAccount.updating`, {
                 accountId,
-            });
+            }));
             const index = this.getConfigAccountIndex(accountId);
             this.config.accounts[index] = completedAccountConfig;
-            (0, logger_1.debug)(`${i18nKey}.updateAccount.addingConfigEntry`, {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.updateAccount.addingConfigEntry`, {
                 accountId,
-            });
+            }));
             if (this.config.accounts) {
                 this.config.accounts.push(completedAccountConfig);
             }
@@ -343,6 +351,7 @@ class CLIConfiguration {
     }
     /**
      * @throws {Error}
+     * TODO: this does not account for the special handling of sandbox account deletes
      */
     removeAccountFromConfig(nameOrId) {
         if (!this.config) {
@@ -355,7 +364,7 @@ class CLIConfiguration {
         let removedAccountIsDefault = false;
         const accountConfig = this.getAccount(accountId);
         if (accountConfig) {
-            (0, logger_1.debug)(`${i18nKey}.removeAccountFromConfig.deleting`, { accountId });
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.removeAccountFromConfig.deleting`, { accountId }));
             const index = this.getConfigAccountIndex(accountId);
             this.config.accounts.splice(index, 1);
             if (this.getDefaultAccount() === accountConfig.name) {

package/config/configFile.js

@@ -8,11 +8,12 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
-const logger_1 = require("../utils/logger");
+const logger_1 = require("../lib/logging/logger");
 const fileSystemErrors_1 = require("../errors/fileSystemErrors");
 const standardErrors_1 = require("../errors/standardErrors");
 const config_1 = require("../constants/config");
 const configUtils_1 = require("./configUtils");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'config.configFile';
 function getConfigFilePath() {
     return path_1.default.join(os_1.default.homedir(), config_1.HUBSPOT_CONFIGURATION_FOLDER, config_1.HUBSPOT_CONFIGURATION_FILE);
@@ -42,7 +43,7 @@ function readConfigFile(configPath) {
         source = fs_extra_1.default.readFileSync(configPath).toString();
     }
     catch (err) {
-        (0, logger_1.debug)(`${i18nKey}.errorReading`, { configPath });
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.errorReading`, { configPath }));
         (0, fileSystemErrors_1.throwFileSystemError)(err, {
             filepath: configPath,
             read: true,
@@ -77,7 +78,7 @@ function loadConfigFromFile() {
         }
         return parseConfig(source);
     }
-    (0, logger_1.debug)(`${i18nKey}.errorLoading`, { configPath });
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.errorLoading`, { configPath }));
     return null;
 }
 exports.loadConfigFromFile = loadConfigFromFile;
@@ -96,7 +97,7 @@ function writeConfigToFile(config) {
     try {
         fs_extra_1.default.ensureFileSync(configPath);
         fs_extra_1.default.writeFileSync(configPath, source);
-        (0, logger_1.debug)(`${i18nKey}.writeSuccess`, { configPath });
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.writeSuccess`, { configPath }));
     }
     catch (err) {
         (0, fileSystemErrors_1.throwFileSystemError)(err, {

package/config/configUtils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateConfig = exports.getOrderedConfig = exports.getOrderedAccount = void 0;
-const logger_1 = require("../utils/logger");
+const logger_1 = require("../lib/logging/logger");
 const auth_1 = require("../constants/auth");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'config.configUtils';
 function getOrderedAccount(unorderedAccount) {
     const { name, accountId, env, authType, ...rest } = unorderedAccount;
@@ -75,7 +76,7 @@ function generateConfig(type, options) {
             configAccount = generateOauthAccountConfig(options);
             break;
         default:
-            (0, logger_1.debug)(`${i18nKey}.unknownType`, { type });
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.unknownType`, { type }));
             return null;
     }
     if (configAccount) {

package/config/config_DEPRECATED.d.ts

@@ -1,5 +1,5 @@
 import { CLIConfig_DEPRECATED, Environment } from '../types/Config';
-import { CLIAccount_DEPRECATED, FlatAccountFields_DEPRECATED } from '../types/Accounts';
+import { AccountType, CLIAccount_DEPRECATED, FlatAccountFields_DEPRECATED } from '../types/Accounts';
 import { Mode } from '../types/Files';
 import { CLIOptions, WriteConfigOptions } from '../types/CLIOptions';
 export declare const getConfig: () => CLIConfig_DEPRECATED | null;
@@ -27,6 +27,7 @@ export declare function isTrackingAllowed(): boolean;
 export declare function getAndLoadConfigIfNeeded(options?: {}): Partial<CLIConfig_DEPRECATED>;
 export declare function findConfig(directory: string): string | null;
 export declare function getEnv(nameOrId?: string | number): Environment;
+export declare function getAccountType(accountType?: AccountType, sandboxAccountType?: string | null): AccountType;
 export declare function getAccountConfig(accountId: number | undefined): CLIAccount_DEPRECATED | undefined;
 export declare function getAccountId(nameOrId?: string | number): number | undefined;
 /**

package/config/config_DEPRECATED.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConfigFlagEnabled = exports.loadConfigFromEnvironment = exports.deleteConfigFile = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.deleteAccount = exports.renameAccount = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.updateDefaultMode = exports.updateDefaultAccount = exports.updateAccountConfig = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.getAccountConfig = exports.getEnv = exports.findConfig = exports.getAndLoadConfigIfNeeded = exports.isTrackingAllowed = exports.loadConfig = exports.writeConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.accountNameExistsInConfig = exports.validateConfig = exports.getConfigPath = exports.setConfigPath = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.setConfig = exports.getConfig = void 0;
+exports.isConfigFlagEnabled = exports.loadConfigFromEnvironment = exports.deleteConfigFile = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.deleteAccount = exports.renameAccount = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.updateDefaultMode = exports.updateDefaultAccount = exports.updateAccountConfig = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.getAccountConfig = exports.getAccountType = exports.getEnv = exports.findConfig = exports.getAndLoadConfigIfNeeded = exports.isTrackingAllowed = exports.loadConfig = exports.writeConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.accountNameExistsInConfig = exports.validateConfig = exports.getConfigPath = exports.setConfigPath = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.setConfig = exports.getConfig = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
@@ -287,6 +287,22 @@ function getEnv(nameOrId) {
     return env;
 }
 exports.getEnv = getEnv;
+// Deprecating sandboxAccountType in favor of accountType
+function getAccountType(accountType, sandboxAccountType) {
+    if (accountType) {
+        return accountType;
+    }
+    if (typeof sandboxAccountType === 'string') {
+        if (sandboxAccountType.toUpperCase() === 'DEVELOPER') {
+            return config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX;
+        }
+        if (sandboxAccountType.toUpperCase() === 'STANDARD') {
+            return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+        }
+    }
+    return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD;
+}
+exports.getAccountType = getAccountType;
 function getAccountConfig(accountId) {
     return getConfigAccounts(getAndLoadConfigIfNeeded())?.find(account => account.portalId === accountId);
 }
@@ -343,7 +359,10 @@ function removeSandboxAccountFromConfig(nameOrId) {
         throw new Error(`Unable to find account for ${nameOrId}.`);
     }
     const accountConfig = getAccountConfig(accountId);
-    if (accountConfig?.sandboxAccountType === null)
+    const accountType = getAccountType(accountConfig?.accountType, accountConfig?.sandboxAccountType);
+    const isSandboxAccount = accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX ||
+        accountType === config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
+    if (!isSandboxAccount)
         return promptDefaultAccount;
     if (config.defaultPortal === accountConfig?.name) {
         promptDefaultAccount = true;
@@ -362,7 +381,7 @@ exports.removeSandboxAccountFromConfig = removeSandboxAccountFromConfig;
  * @throws {Error}
  */
 function updateAccountConfig(configOptions) {
-    const { portalId, authType, environment, clientId, clientSecret, scopes, tokenInfo, defaultMode, name, apiKey, personalAccessKey, sandboxAccountType, parentAccountId, } = configOptions;
+    const { accountType, apiKey, authType, clientId, clientSecret, defaultMode, environment, name, parentAccountId, personalAccessKey, portalId, sandboxAccountType, scopes, tokenInfo, } = configOptions;
     if (!portalId) {
         throw new Error('A portalId is required to update the config');
     }
@@ -389,6 +408,7 @@ function updateAccountConfig(configOptions) {
         ...(portalId && { portalId }),
         authType,
         auth,
+        accountType: getAccountType(accountType, sandboxAccountType),
         apiKey,
         defaultMode: mode && Object.hasOwn(files_1.MODE, mode) ? mode : undefined,
         personalAccessKey,

package/config/environment.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigFromEnvironment = void 0;
-const logger_1 = require("../utils/logger");
+const logger_1 = require("../lib/logging/logger");
 const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const configUtils_1 = require("./configUtils");
 const environment_1 = require("../lib/environment");
+const lang_1 = require("../utils/lang");
 const i18nKey = 'config.environment';
 function getConfigVariablesFromEnv() {
     const env = process.env;
@@ -22,11 +23,11 @@ function getConfigVariablesFromEnv() {
 function loadConfigFromEnvironment() {
     const { apiKey, clientId, clientSecret, personalAccessKey, accountId, refreshToken, env, } = getConfigVariablesFromEnv();
     if (!accountId) {
-        (0, logger_1.debug)(`${i18nKey}.loadConfig.missingAccountId`);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.loadConfig.missingAccountId`));
         return null;
     }
     if (!env) {
-        (0, logger_1.debug)(`${i18nKey}.loadConfig.missingEnv`);
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.loadConfig.missingEnv`));
         return null;
     }
     if (personalAccessKey) {
@@ -53,7 +54,7 @@ function loadConfigFromEnvironment() {
             env,
         });
     }
-    (0, logger_1.debug)(`${i18nKey}.loadConfig.unknownAuthType`);
+    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.loadConfig.unknownAuthType`));
     return null;
 }
 exports.loadConfigFromEnvironment = loadConfigFromEnvironment;

package/config/index.d.ts

@@ -1,7 +1,7 @@
 import * as config_DEPRECATED from './config_DEPRECATED';
 import { CLIConfig } from '../types/Config';
 import { CLIOptions, WriteConfigOptions } from '../types/CLIOptions';
-import { CLIAccount, FlatAccountFields } from '../types/Accounts';
+import { AccountType, CLIAccount, FlatAccountFields } from '../types/Accounts';
 export declare function loadConfig(path: string, options?: CLIOptions): CLIConfig | null;
 export declare function getAndLoadConfigIfNeeded(options?: CLIOptions): Partial<CLIConfig> | null;
 export declare function validateConfig(): boolean;
@@ -27,6 +27,7 @@ export declare function deleteConfigFile(): void;
 export declare function isConfigFlagEnabled(flag: keyof CLIConfig): boolean;
 export declare function isTrackingAllowed(): boolean;
 export declare function getEnv(nameOrId?: string | number): import("../types/Config").Environment;
+export declare function getAccountType(accountType?: AccountType, sandboxAccountType?: string | null): AccountType;
 export declare const getConfigAccounts: typeof config_DEPRECATED.getConfigAccounts;
 export declare const getConfigDefaultAccount: typeof config_DEPRECATED.getConfigDefaultAccount;
 export declare const getConfigAccountId: typeof config_DEPRECATED.getConfigAccountId;

package/config/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDefaultMode = exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.getEnv = exports.isTrackingAllowed = exports.isConfigFlagEnabled = exports.deleteConfigFile = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.deleteAccount = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.renameAccount = exports.updateDefaultAccount = exports.updateAccountConfig = exports.accountNameExistsInConfig = exports.getAccountConfig = exports.getConfigPath = exports.writeConfig = exports.getConfig = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.loadConfigFromEnvironment = exports.validateConfig = exports.getAndLoadConfigIfNeeded = exports.loadConfig = void 0;
+exports.updateDefaultMode = exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.getAccountType = exports.getEnv = exports.isTrackingAllowed = exports.isConfigFlagEnabled = exports.deleteConfigFile = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.deleteAccount = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.renameAccount = exports.updateDefaultAccount = exports.updateAccountConfig = exports.accountNameExistsInConfig = exports.getAccountConfig = exports.getConfigPath = exports.writeConfig = exports.getConfig = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.loadConfigFromEnvironment = exports.validateConfig = exports.getAndLoadConfigIfNeeded = exports.loadConfig = void 0;
 const config_DEPRECATED = __importStar(require("./config_DEPRECATED"));
 const CLIConfiguration_1 = __importDefault(require("./CLIConfiguration"));
 const configFile_1 = require("./configFile");
@@ -220,6 +220,13 @@ function getEnv(nameOrId) {
     return config_DEPRECATED.getEnv(nameOrId);
 }
 exports.getEnv = getEnv;
+function getAccountType(accountType, sandboxAccountType) {
+    if (CLIConfiguration_1.default.isActive()) {
+        return CLIConfiguration_1.default.getAccountType(accountType, sandboxAccountType);
+    }
+    return config_DEPRECATED.getAccountType(accountType, sandboxAccountType);
+}
+exports.getAccountType = getAccountType;
 // These functions are either not supported or have breaking changes with the new config setup
 exports.getConfigAccounts = config_DEPRECATED.getConfigAccounts;
 exports.getConfigDefaultAccount = config_DEPRECATED.getConfigDefaultAccount;

package/constants/config.d.ts

@@ -2,3 +2,10 @@ export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml
 export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hubspot";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
 export declare const MIN_HTTP_TIMEOUT = 3000;
+export declare const HUBSPOT_ACCOUNT_TYPES: {
+    readonly DEVELOPER_SANDBOX: "DEVELOPER_SANDBOX";
+    readonly DEVELOPER_TEST: "DEVELOPER_TEST";
+    readonly DEVELOPER: "DEVELOPER";
+    readonly STANDARD_SANDBOX: "STANDARD_SANDBOX";
+    readonly STANDARD: "STANDARD";
+};

package/constants/config.js

@@ -1,8 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIN_HTTP_TIMEOUT = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
-// NOTE this is the legacy config file name (We still need to keep it around though)
+exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
 exports.HUBSPOT_CONFIGURATION_FOLDER = '.hubspot';
 exports.HUBSPOT_CONFIGURATION_FILE = 'config.yml';
 exports.MIN_HTTP_TIMEOUT = 3000;
+exports.HUBSPOT_ACCOUNT_TYPES = {
+    DEVELOPER_SANDBOX: 'DEVELOPER_SANDBOX',
+    DEVELOPER_TEST: 'DEVELOPER_TEST',
+    DEVELOPER: 'DEVELOPER',
+    STANDARD_SANDBOX: 'STANDARD_SANDBOX',
+    STANDARD: 'STANDARD',
+};

package/errors/apiErrors.d.ts

@@ -1,8 +1,13 @@
 import { AxiosError } from 'axios';
 import { GenericError, AxiosErrorContext } from '../types/Error';
 import { HubSpotAuthError } from '../models/HubSpotAuthError';
-export declare function isMissingScopeError(err: AxiosError<any>): boolean;
-export declare function isGatingError(err: AxiosError<any>): boolean;
+export declare function isSpecifiedError(err: Error | AxiosError, { statusCode, category, subCategory, }: {
+    statusCode?: number;
+    category?: string;
+    subCategory?: string;
+}): boolean;
+export declare function isMissingScopeError(err: Error | AxiosError): boolean;
+export declare function isGatingError(err: Error | AxiosError): boolean;
 export declare function isApiUploadValidationError(err: AxiosError<any>): boolean;
 export declare function isSpecifiedHubSpotAuthError(err: GenericError, { status, category, subCategory }: Partial<HubSpotAuthError>): boolean;
 export declare function getAxiosErrorWithContext(error: AxiosError<any>, context?: AxiosErrorContext): Error;

package/errors/apiErrors.js

@@ -1,24 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwApiUploadError = exports.throwApiError = exports.getAxiosErrorWithContext = exports.isSpecifiedHubSpotAuthError = exports.isApiUploadValidationError = exports.isGatingError = exports.isMissingScopeError = void 0;
+exports.throwApiUploadError = exports.throwApiError = exports.getAxiosErrorWithContext = exports.isSpecifiedHubSpotAuthError = exports.isApiUploadValidationError = exports.isGatingError = exports.isMissingScopeError = exports.isSpecifiedError = void 0;
 const api_1 = require("../constants/api");
 const lang_1 = require("../utils/lang");
 const standardErrors_1 = require("./standardErrors");
 const i18nKey = 'errors.apiErrors';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isSpecifiedError(err, { statusCode, category, subCategory, }) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const error = (err && err.cause) || err;
+    const statusCodeErr = !statusCode || error.response?.status === statusCode;
+    const categoryErr = !category || error.response?.data?.category === category;
+    const subCategoryErr = !subCategory || error.response?.data?.subCategory === subCategory;
+    return error.isAxiosError && statusCodeErr && categoryErr && subCategoryErr;
+}
+exports.isSpecifiedError = isSpecifiedError;
 function isMissingScopeError(err) {
-    return (err.isAxiosError &&
-        err.status === 403 &&
-        !!err.response &&
-        err.response.data.category === 'MISSING_SCOPES');
+    return isSpecifiedError(err, { statusCode: 403, category: 'MISSING_SCOPES' });
 }
 exports.isMissingScopeError = isMissingScopeError;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isGatingError(err) {
-    return (err.isAxiosError &&
-        err.status === 403 &&
-        !!err.response &&
-        err.response.data.category === 'GATED');
+    return isSpecifiedError(err, { statusCode: 403, category: 'GATED' });
 }
 exports.isGatingError = isGatingError;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/errors/standardErrors.d.ts

@@ -8,7 +8,7 @@ export declare function isFatalError(err: BaseError): boolean;
  */
 export declare function throwErrorWithMessage(identifier: LangKey, interpolation?: {
     [key: string]: string | number;
-}, cause?: BaseError): never;
+}, cause?: BaseError | AxiosError): never;
 /**
  * @throws
  */

package/http/index.d.ts

@@ -1,18 +1,16 @@
-import { LogCallbacksArg } from '../types/LogCallbacks';
-import { HttpOptions } from '../types/Http';
 import { AxiosResponse } from 'axios';
+import { HttpOptions } from '../types/Http';
 declare function getRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function postRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function putRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function patchRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function deleteRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
-declare const getRequestStreamCallbackKeys: readonly ["onWrite"];
 declare const http: {
     get: typeof getRequest;
     post: typeof postRequest;
     put: typeof putRequest;
     patch: typeof patchRequest;
     delete: typeof deleteRequest;
-    getOctetStream: (accountId: number, options: HttpOptions, destPath: string, logCallbacks?: LogCallbacksArg<typeof getRequestStreamCallbackKeys>) => Promise<AxiosResponse>;
+    getOctetStream: (accountId: number, options: HttpOptions, destPath: string) => Promise<AxiosResponse>;
 };
 export default http;