@hubspot/local-dev-lib 3.1.3 → 3.2.0-beta.0

package/api/github.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { GithubReleaseData, GithubRepoFile, RepoPath } from '../types/Github';
 import { HubSpotPromise } from '../types/Http';
 declare global {

package/api/projects.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { HubSpotPromise, QueryParams } from '../types/Http';
 import { Project, FetchProjectResponse, UploadProjectResponse, ProjectSettings, FetchPlatformVersionResponse, WarnLogsResponse, UploadIRResponse } from '../types/Project';
 import { Build, FetchProjectBuildsResponse } from '../types/Build';
@@ -16,7 +17,7 @@ export declare function fetchPlatformVersions(accountId: number): HubSpotPromise
 export declare function fetchProjectBuilds(accountId: number, projectName: string, params?: QueryParams): HubSpotPromise<FetchProjectBuildsResponse>;
 export declare function getBuildStatus(accountId: number, projectName: string, buildId: number): HubSpotPromise<Build>;
 export declare function getBuildStructure(accountId: number, projectName: string, buildId: number): HubSpotPromise<ComponentStructureResponse>;
-export declare function deployProject(accountId: number, projectName: string, buildId: number): HubSpotPromise<ProjectDeployResponse>;
+export declare function deployProject(accountId: number, projectName: string, buildId: number, useNewDeployApi?: boolean): HubSpotPromise<ProjectDeployResponse>;
 export declare function getDeployStatus(accountId: number, projectName: string, deployId: number): HubSpotPromise<Deploy>;
 export declare function getDeployStructure(accountId: number, projectName: string, deployId: number): HubSpotPromise<ComponentStructureResponse>;
 export declare function fetchProjectSettings(accountId: number, projectName: string): HubSpotPromise<ProjectSettings>;

package/api/projects.js

@@ -9,6 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const PROJECTS_API_PATH = 'dfs/v1/projects';
 const DEVELOPER_FILE_SYSTEM_PATH = 'dfs/v1';
 const PROJECTS_DEPLOY_API_PATH = 'dfs/deploy/v1';
+const PROJECTS_DEPLOY_API_PATH_V3 = 'dfs/deploy/v3';
 const PROJECTS_LOGS_API_PATH = 'dfs/logging/v1';
 const DEVELOPER_PROJECTS_API_PATH = 'developer/projects/v1';
 const MIGRATIONS_API_PATH = 'dfs/migrations/v1';
@@ -115,7 +116,16 @@ function getBuildStructure(accountId, projectName, buildId) {
     });
 }
 exports.getBuildStructure = getBuildStructure;
-function deployProject(accountId, projectName, buildId) {
+function deployProject(accountId, projectName, buildId, useNewDeployApi = false) {
+    if (useNewDeployApi) {
+        return http_1.http.post(accountId, {
+            url: `${PROJECTS_DEPLOY_API_PATH_V3}/deploys/queue/async`,
+            data: {
+                projectName,
+                targetBuildId: buildId,
+            },
+        });
+    }
     return http_1.http.post(accountId, {
         url: `${PROJECTS_DEPLOY_API_PATH}/deploys/queue/async`,
         data: {

package/config/CLIConfiguration.d.ts

@@ -20,7 +20,8 @@ declare class _CLIConfiguration {
     isConfigFlagEnabled(flag: keyof CLIConfig_NEW, defaultValue?: boolean): boolean;
     getAccountId(nameOrId?: string | number): number | null;
     getDefaultAccount(): string | number | null;
-    getResolvedDefaultAccountForCWD(nameOrId: string | number): CLIAccount_NEW | null;
+    getDefaultAccountOverrideFilePath(): string | null;
+    getCWDAccountOverride(): string | number | null;
     getAccountIndex(accountId: number): number;
     getConfigForAccount(accountId?: number): CLIAccount_NEW | null;
     getConfigAccounts(): Array<CLIAccount_NEW> | null;

package/config/CLIConfiguration.js

@@ -1,6 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLIConfiguration = void 0;
+const fs_1 = __importDefault(require("fs"));
+const findup_sync_1 = __importDefault(require("findup-sync"));
+const path_1 = require("../lib/path");
 const logger_1 = require("../lib/logger");
 const environment_1 = require("./environment");
 const environment_2 = require("../lib/environment");
@@ -179,20 +185,47 @@ class _CLIConfiguration {
         return account ? account.accountId : null;
     }
     getDefaultAccount() {
-        return this.config && this.config.defaultAccount
-            ? this.config.defaultAccount
-            : null;
+        return this.getCWDAccountOverride() || this.config?.defaultAccount || null;
     }
-    // TODO a util that returns the account to use, respecting the values set in
-    // "defaultAccountOverrides"
-    // Example "defaultAccountOverrides":
-    //  - /src/brodgers/customer-project-1: customer-account1
-    //  - /src/brodgers/customer-project-2: customer-account2
-    // "/src/brodgers/customer-project-1" is the path to the project dir
-    // "customer-account1" is the name of the account to use as the default for the specified dir
-    // These defaults take precedence over the standard default account specified in the config
-    getResolvedDefaultAccountForCWD(nameOrId) {
-        return this.getAccount(nameOrId);
+    getDefaultAccountOverrideFilePath() {
+        return (0, findup_sync_1.default)([config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME], {
+            cwd: (0, path_1.getCwd)(),
+        });
+    }
+    getCWDAccountOverride() {
+        const defaultOverrideFile = this.getDefaultAccountOverrideFilePath();
+        if (!defaultOverrideFile) {
+            return null;
+        }
+        let source;
+        try {
+            source = fs_1.default.readFileSync(defaultOverrideFile, 'utf8');
+        }
+        catch (e) {
+            if (e instanceof Error) {
+                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.getCWDAccountOverride.readFileError`, {
+                    error: e.message,
+                }));
+            }
+            return null;
+        }
+        const accountId = Number(source);
+        if (isNaN(accountId)) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.getCWDAccountOverride.errorHeader`, {
+                hsAccountFile: defaultOverrideFile,
+            }), {
+                cause: config_1.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID,
+            });
+        }
+        const account = this.config?.accounts?.find(account => account.accountId === accountId);
+        if (!account) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.getCWDAccountOverride.errorHeader`, {
+                hsAccountFile: defaultOverrideFile,
+            }), {
+                cause: config_1.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND,
+            });
+        }
+        return account.name || account.accountId;
     }
     getAccountIndex(accountId) {
         return this.config

package/config/index.d.ts

@@ -33,6 +33,8 @@ export declare function getAccountType(accountType?: AccountType, sandboxAccount
 export declare function getConfigDefaultAccount(): string | number | null | undefined;
 export declare function getConfigAccounts(): Array<CLIAccount_NEW> | Array<CLIAccount_DEPRECATED> | null | undefined;
 export declare function updateDefaultCmsPublishMode(cmsPublishMode: CmsPublishMode): void | CLIConfig_NEW | null;
+export declare function getCWDAccountOverride(): string | number | null | undefined;
+export declare function getDefaultAccountOverrideFilePath(): string | null | undefined;
 export declare const getConfigAccountId: typeof config_DEPRECATED.getConfigAccountId;
 export declare const getOrderedAccount: typeof config_DEPRECATED.getOrderedAccount;
 export declare const getOrderedConfig: typeof config_DEPRECATED.getOrderedConfig;

package/config/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.updateDefaultCmsPublishMode = exports.getConfigAccounts = exports.getConfigDefaultAccount = 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.configFileExists = exports.getConfigPath = exports.writeConfig = exports.getConfig = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.loadConfigFromEnvironment = exports.validateConfig = exports.getAndLoadConfigIfNeeded = exports.loadConfig = void 0;
+exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getDefaultAccountOverrideFilePath = exports.getCWDAccountOverride = exports.updateDefaultCmsPublishMode = exports.getConfigAccounts = exports.getConfigDefaultAccount = 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.configFileExists = 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 = require("./CLIConfiguration");
 const configFile_1 = require("./configFile");
@@ -251,6 +251,18 @@ function updateDefaultCmsPublishMode(cmsPublishMode) {
     return config_DEPRECATED.updateDefaultCmsPublishMode(cmsPublishMode);
 }
 exports.updateDefaultCmsPublishMode = updateDefaultCmsPublishMode;
+function getCWDAccountOverride() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getCWDAccountOverride();
+    }
+}
+exports.getCWDAccountOverride = getCWDAccountOverride;
+function getDefaultAccountOverrideFilePath() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getDefaultAccountOverrideFilePath();
+    }
+}
+exports.getDefaultAccountOverrideFilePath = getDefaultAccountOverrideFilePath;
 // These functions are not supported with the new config setup
 exports.getConfigAccountId = config_DEPRECATED.getConfigAccountId;
 exports.getOrderedAccount = config_DEPRECATED.getOrderedAccount;

package/constants/config.d.ts

@@ -1,6 +1,9 @@
 export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml";
-export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hubspot-cli";
+export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hscli";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
+export declare const DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = ".hsaccount";
+export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID";
+export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND";
 export declare const MIN_HTTP_TIMEOUT = 3000;
 export declare const HUBSPOT_ACCOUNT_TYPES: {
     readonly DEVELOPMENT_SANDBOX: "DEVELOPMENT_SANDBOX";

package/constants/config.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = 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.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 const lang_1 = require("../utils/lang");
 exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
-exports.HUBSPOT_CONFIGURATION_FOLDER = '.hubspot-cli';
+exports.HUBSPOT_CONFIGURATION_FOLDER = '.hscli';
 exports.HUBSPOT_CONFIGURATION_FILE = 'config.yml';
+exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = '.hsaccount';
+exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID';
+exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND';
 exports.MIN_HTTP_TIMEOUT = 3000;
 exports.HUBSPOT_ACCOUNT_TYPES = {
     DEVELOPMENT_SANDBOX: 'DEVELOPMENT_SANDBOX',

package/lang/en.json

@@ -263,6 +263,10 @@
           "invalidInput": "A 'defaultAccount' with value of number or string is required to update the config."
         }
       },
+      "getCWDAccountOverride": {
+        "errorHeader": "Error in {{ hsAccountFile }}",
+        "readFileError": "Error reading account override file."
+      },
       "renameAccount": {
         "errors": {
           "invalidName": "Cannot find account with identifier {{ currentName }}"

package/lib/archive.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { CopySourceToDestOptions } from '../types/Archive';
 export declare function extractZipArchive(zip: Buffer, name: string, dest: string, { sourceDir, includesRootDir, hideLogs }?: CopySourceToDestOptions): Promise<boolean>;

package/lib/github.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { GithubReleaseData, GithubRepoFile, RepoPath, CloneGithubRepoOptions } from '../types/Github';
 export declare function fetchFileFromRepository<T = Buffer>(repoPath: RepoPath, filePath: string, ref: string): Promise<T>;
 export declare function fetchReleaseData(repoPath: RepoPath, tag?: string): Promise<GithubReleaseData>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "3.1.3",
+    "version": "3.2.0-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {
@@ -57,24 +57,24 @@
         "./types/*": "./types/*.d.ts"
     },
     "dependencies": {
-        "address": "^2.0.1",
-        "axios": "^1.3.5",
-        "chalk": "^2.4.2",
-        "chokidar": "^3.5.3",
-        "content-disposition": "^0.5.4",
-        "cors": "^2.8.5",
-        "debounce": "^1.2.0",
-        "express": "^4.18.2",
-        "extract-zip": "^2.0.1",
-        "findup-sync": "^5.0.0",
-        "fs-extra": "^11.1.0",
-        "ignore": "^5.1.4",
-        "js-yaml": "^4.1.0",
-        "moment": "^2.29.4",
-        "p-queue": "^6.0.2",
-        "prettier": "^3.3.0",
-        "semver": "^6.3.0",
-        "unixify": "^1.0.0"
+        "address": "2.0.2",
+        "axios": "1.7.2",
+        "chalk": "2.4.2",
+        "chokidar": "3.6.0",
+        "content-disposition": "0.5.4",
+        "cors": "2.8.5",
+        "debounce": "1.2.1",
+        "express": "4.19.2",
+        "extract-zip": "2.0.1",
+        "findup-sync": "5.0.0",
+        "fs-extra": "11.2.0",
+        "ignore": "5.3.1",
+        "js-yaml": "4.1.0",
+        "moment": "2.30.1",
+        "p-queue": "6.6.2",
+        "prettier": "3.3.1",
+        "semver": "6.3.1",
+        "unixify": "1.0.0"
     },
     "engines": {
         "node": ">=16.20.0"

package/types/Http.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { AxiosPromise, ResponseType } from 'axios';
 import { ReadStream } from 'fs';
 import { Stream } from 'stream';