@hubspot/cli 7.4.9-experimental.0 → 7.4.10-beta.0

package/lib/sandboxSync.js

@@ -17,7 +17,6 @@ const index_2 = require("./errorHandlers/index");
 const sandboxes_2 = require("./sandboxes");
 const ui_1 = require("./ui");
 const accountTypes_1 = require("./accountTypes");
-const i18nKey = 'lib.sandbox.sync';
 async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, slimInfoMessage = false) {
     const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
     const accountId = (0, config_1.getAccountId)(id);
@@ -25,7 +24,7 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
     const parentAccountId = (0, config_1.getAccountId)(parentId);
     const isDevSandbox = (0, accountTypes_1.isDevelopmentSandbox)(accountConfig);
     if (!accountId || !parentAccountId) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
+        throw new Error((0, lang_1.i18n)(`lib.sandbox.sync.failure.invalidUser`, {
             accountName: accountId
                 ? (0, ui_1.uiAccountDescription)(accountId)
                 : id.toString(),
@@ -48,23 +47,25 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
             availableSyncTasks = await (0, sandboxes_1.getAvailableSyncTypes)(parentAccountConfig, accountConfig);
         }
         SpinniesManager_1.default.add('sandboxSync', {
-            text: (0, lang_1.i18n)(`${i18nKey}.loading.startSync`),
+            text: (0, lang_1.i18n)(`lib.sandbox.sync.loading.startSync`),
         });
         await (0, sandboxSync_1.initiateSync)(parentAccountId, accountId, availableSyncTasks, accountId);
         const spinniesText = isDevSandbox
-            ? `${i18nKey}.loading.succeedDevSb`
-            : `${i18nKey}.loading.succeed`;
+            ? `lib.sandbox.sync.loading.succeedDevSb`
+            : `lib.sandbox.sync.loading.succeed`;
         SpinniesManager_1.default.succeed('sandboxSync', {
-            text: (0, lang_1.i18n)(slimInfoMessage ? `${i18nKey}.loading.successDevSbInfo` : spinniesText, {
+            text: (0, lang_1.i18n)(slimInfoMessage
+                ? `lib.sandbox.sync.loading.successDevSbInfo`
+                : spinniesText, {
                 accountName: (0, ui_1.uiAccountDescription)(accountId),
-                url: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.info.syncStatusDetailsLinkText`), syncStatusUrl),
+                url: (0, ui_1.uiLink)((0, lang_1.i18n)(`lib.sandbox.sync.info.syncStatusDetailsLinkText`), syncStatusUrl),
             }),
         });
     }
     catch (err) {
         (0, index_2.debugError)(err);
         SpinniesManager_1.default.fail('sandboxSync', {
-            text: (0, lang_1.i18n)(`${i18nKey}.loading.fail`),
+            text: (0, lang_1.i18n)(`lib.sandbox.sync.loading.fail`),
         });
         logger_1.logger.log('');
         if ((0, index_1.isSpecifiedError)(err, {
@@ -72,7 +73,7 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
             category: 'BANNED',
             subCategory: 'sandboxes-sync-api.SYNC_NOT_ALLOWED_INVALID_USER',
         })) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
+            logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.sync.failure.invalidUser`, {
                 accountName: (0, ui_1.uiAccountDescription)(accountId),
                 parentAccountName: (0, ui_1.uiAccountDescription)(parentAccountId),
             }));
@@ -82,7 +83,7 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
             category: 'RATE_LIMITS',
             subCategory: 'sandboxes-sync-api.SYNC_IN_PROGRESS',
         })) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.syncInProgress`, {
+            logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.sync.failure.syncInProgress`, {
                 url: `${baseUrl}/sandboxes-developer/${parentAccountId}/syncactivitylog`,
             }));
         }
@@ -92,7 +93,7 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
             subCategory: 'sandboxes-sync-api.SYNC_NOT_ALLOWED_INVALID_USERID',
         })) {
             // This will only trigger if a user is not a super admin of the target account.
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.notSuperAdmin`, {
+            logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.sync.failure.notSuperAdmin`, {
                 account: (0, ui_1.uiAccountDescription)(accountId),
             }));
         }
@@ -101,7 +102,7 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
             category: 'OBJECT_NOT_FOUND',
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.objectNotFound`, {
+            logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.sync.failure.objectNotFound`, {
                 account: (0, ui_1.uiAccountDescription)(accountId),
             }));
         }
@@ -122,8 +123,8 @@ async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, s
     if (!slimInfoMessage) {
         logger_1.logger.log();
         (0, ui_1.uiLine)();
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.info.${isDevSandbox ? 'syncMessageDevSb' : 'syncMessage'}`, {
-            url: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.info.syncStatusDetailsLinkText`), syncStatusUrl),
+        logger_1.logger.info((0, lang_1.i18n)(`lib.sandbox.sync.info.${isDevSandbox ? 'syncMessageDevSb' : 'syncMessage'}`, {
+            url: (0, ui_1.uiLink)((0, lang_1.i18n)(`lib.sandbox.sync.info.syncStatusDetailsLinkText`), syncStatusUrl),
         }));
         (0, ui_1.uiLine)();
         logger_1.logger.log();

package/lib/sandboxes.js

@@ -17,7 +17,6 @@ const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const lang_1 = require("./lang");
 const ui_1 = require("./ui");
 const index_2 = require("./errorHandlers/index");
-const i18nKey = 'lib.sandbox';
 exports.SYNC_TYPES = {
     OBJECT_RECORDS: 'object-records',
 };
@@ -59,11 +58,11 @@ async function getAvailableSyncTypes(parentAccountConfig, config) {
     const id = (0, getAccountIdentifier_1.getAccountIdentifier)(config);
     const portalId = (0, config_1.getAccountId)(id);
     if (!parentPortalId || !portalId) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.sync.failure.syncTypeFetch`));
+        throw new Error((0, lang_1.i18n)(`lib.sandbox.sync.failure.syncTypeFetch`));
     }
     const { data: { results: syncTypes }, } = await (0, sandboxSync_1.fetchTypes)(parentPortalId, portalId);
     if (!syncTypes) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.sync.failure.syncTypeFetch`));
+        throw new Error((0, lang_1.i18n)(`lib.sandbox.sync.failure.syncTypeFetch`));
     }
     return syncTypes.map(t => ({ type: t.name }));
 }
@@ -71,11 +70,11 @@ async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
     const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
     const accountId = (0, config_1.getAccountId)(id);
     if (!accountId) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.usageLimitFetch`));
+        throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.usageLimitFetch`));
     }
     const { data: { usage }, } = await (0, sandboxHubs_1.getSandboxUsageLimits)(accountId);
     if (!usage) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.usageLimitFetch`));
+        throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.usageLimitFetch`));
     }
     if (sandboxType === config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
         if (usage['DEVELOPER'].available === 0) {
@@ -83,14 +82,14 @@ async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
             const plural = devSandboxLimit !== 1;
             const hasDevelopmentSandboxes = getHasSandboxesByType(accountConfig, config_2.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
             if (hasDevelopmentSandboxes) {
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.alreadyInConfig.developer.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.alreadyInConfig.developer.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: devSandboxLimit,
                 }));
             }
             else {
                 const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.limit.developer.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.limit.developer.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: devSandboxLimit,
                     link: `${baseUrl}/sandboxes-developer/${accountId}/development`,
@@ -104,14 +103,14 @@ async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
             const plural = standardSandboxLimit !== 1;
             const hasStandardSandboxes = getHasSandboxesByType(accountConfig, config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX);
             if (hasStandardSandboxes) {
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.alreadyInConfig.standard.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.alreadyInConfig.standard.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: standardSandboxLimit,
                 }));
             }
             else {
                 const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.create.failure.limit.standard.${plural ? 'other' : 'one'}`, {
+                throw new Error((0, lang_1.i18n)(`lib.sandbox.create.failure.limit.standard.${plural ? 'other' : 'one'}`, {
                     accountName: accountConfig.name || accountId,
                     limit: standardSandboxLimit,
                     link: `${baseUrl}/sandboxes-developer/${accountId}/standard`,
@@ -122,12 +121,12 @@ async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
 }
 function handleSandboxCreateError(err, env, name, accountId) {
     if ((0, index_1.isMissingScopeError)(err)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.scopes.message`, {
+        logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.create.failure.scopes.message`, {
             accountName: (0, ui_1.uiAccountDescription)(accountId),
         }));
         const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.create.failure.scopes.instructions`, {
+        logger_1.logger.info((0, lang_1.i18n)(`lib.sandbox.create.failure.scopes.instructions`, {
             accountName: (0, ui_1.uiAccountDescription)(accountId),
             url,
         }));
@@ -138,7 +137,7 @@ function handleSandboxCreateError(err, env, name, accountId) {
         subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
     })) {
         logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.invalidUser`, {
+        logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.create.failure.invalidUser`, {
             accountName: name,
             parentAccountName: (0, ui_1.uiAccountDescription)(accountId),
         }));
@@ -150,7 +149,7 @@ function handleSandboxCreateError(err, env, name, accountId) {
         subCategory: 'SandboxErrors.DEVELOPMENT_SANDBOX_ACCESS_NOT_ALLOWED',
     })) {
         logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.create.failure.403Gating`, {
+        logger_1.logger.error((0, lang_1.i18n)(`lib.sandbox.create.failure.403Gating`, {
             accountName: name,
             parentAccountName: (0, ui_1.uiAccountDescription)(accountId),
             accountId,

package/lib/serverlessLogs.js

@@ -44,8 +44,6 @@ async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
     if (!accountConfig) {
         return;
     }
-    // TODO[JOE]: Update this i18n key
-    const i18nKey = 'lib.serverless';
     const { authType } = accountConfig;
     if (authType !== auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
         return;
@@ -56,7 +54,7 @@ async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
         scopesData = resp.data;
     }
     catch (e) {
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.fetchScopeDataError`, {
             scopeGroup,
         }));
         logger_1.logger.debug(e);
@@ -64,14 +62,14 @@ async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
     }
     const { portalScopesInGroup, userScopesInGroup } = scopesData;
     if (!portalScopesInGroup.length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.portalMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.portalMissingScope`));
         return;
     }
     if (!portalScopesInGroup.every(s => userScopesInGroup.includes(s))) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.userMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.userMissingScope`));
     }
     else {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.verifyAccessKeyAndUserAccess.genericMissingScope`));
+        logger_1.logger.error((0, lang_1.i18n)(`lib.serverless.verifyAccessKeyAndUserAccess.genericMissingScope`));
     }
 }
 async function tailLogs(accountId, name, fetchLatest, tailCall, compact = false) {

package/lib/testUtils.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
 import { HubSpotHttpError } from '@hubspot/local-dev-lib/models/HubSpotHttpError';
 type MockErrorResponse = {
     status: number;
@@ -9,6 +9,6 @@ type MockErrorResponse = {
         subCategory?: string;
     };
 };
-export declare const mockHubSpotHttpResponse: (data: any) => AxiosResponse;
-export declare const mockHubSpotHttpError: (message: string, response: MockErrorResponse) => HubSpotHttpError;
+export declare function mockHubSpotHttpResponse<T>(data?: any): HubSpotPromise<T>;
+export declare function mockHubSpotHttpError(message: string, response: MockErrorResponse): HubSpotHttpError;
 export {};

package/lib/testUtils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockHubSpotHttpError = exports.mockHubSpotHttpResponse = void 0;
+exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
+exports.mockHubSpotHttpError = mockHubSpotHttpError;
 const axios_1 = require("axios");
 const HubSpotHttpError_1 = require("@hubspot/local-dev-lib/models/HubSpotHttpError");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mockHubSpotHttpResponse = (data) => {
-    return {
+function mockHubSpotHttpResponse(data) {
+    return Promise.resolve({
         data,
         status: 200,
         statusText: 'OK',
@@ -13,12 +14,10 @@ const mockHubSpotHttpResponse = (data) => {
         config: {
             headers: new axios_1.AxiosHeaders(),
         },
-    };
-};
-exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
-const mockHubSpotHttpError = (message, response) => {
+    });
+}
+function mockHubSpotHttpError(message, response) {
     return new HubSpotHttpError_1.HubSpotHttpError(message, {
         cause: { isAxiosError: true, response },
     });
-};
-exports.mockHubSpotHttpError = mockHubSpotHttpError;
+}

package/lib/ui/SpinniesManager.d.ts

@@ -22,7 +22,7 @@ declare class SpinniesManager {
     succeed(name: string, options?: Partial<SpinnerState>): SpinnerState;
     fail(name: string, options?: Partial<SpinnerState>): SpinnerState;
     remove(name: string): SpinnerState;
-    stopAll(newStatus?: typeof VALID_STATUSES[number]): {
+    stopAll(newStatus?: (typeof VALID_STATUSES)[number]): {
         [key: string]: SpinnerState;
     };
     private hasAnySpinners;

package/lib/ui/boxen.d.ts

@@ -0,0 +1,5 @@
+import { Options } from 'boxen';
+export declare function logInBox({ contents, options, }: {
+    contents: string;
+    options?: Options;
+}): Promise<void>;

package/lib/ui/boxen.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logInBox = logInBox;
+const logger_1 = require("./logger");
+const index_1 = require("./index");
+const logger_2 = require("@hubspot/local-dev-lib/logger");
+const en_1 = require("../../lang/en");
+const defaultOptions = {
+    titleAlignment: 'left',
+    borderColor: index_1.UI_COLORS.MARIGOLD,
+    margin: 1,
+    padding: 1,
+    textAlignment: 'left',
+    borderStyle: 'round',
+};
+async function logInBox({ contents, options, }) {
+    try {
+        const boxen = (await import('boxen')).default;
+        logger_1.uiLogger.log(boxen(contents, { ...defaultOptions, ...options }));
+        return;
+    }
+    catch (error) {
+        logger_2.logger.debug(en_1.lib.boxen.failedToLoad);
+        if (options?.title) {
+            logger_1.uiLogger.log(options.title);
+            logger_1.uiLogger.log('');
+        }
+        logger_1.uiLogger.log(contents);
+    }
+}

package/lib/ui/git.js

@@ -8,22 +8,21 @@ const os_1 = __importDefault(require("os"));
 const gitignore_1 = require("@hubspot/local-dev-lib/gitignore");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.ui.git';
 function checkAndWarnGitInclusion(configPath) {
     try {
         const { inGit, configIgnored } = (0, gitignore_1.checkGitInclusion)(configPath);
         if (!inGit || configIgnored)
             return;
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.securityIssue`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.configFileTracked`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.fileName`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.remediate`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.moveConfig`, { homeDir: os_1.default.homedir() }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.addGitignore`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.noRemote`));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.securityIssue`));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.configFileTracked`));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.fileName`, { configPath }));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.remediate`));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.moveConfig`, { homeDir: os_1.default.homedir() }));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.addGitignore`, { configPath }));
+        logger_1.logger.warn((0, lang_1.i18n)(`lib.ui.git.noRemote`));
     }
     catch (e) {
         // fail silently
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.checkFailed`));
+        logger_1.logger.debug((0, lang_1.i18n)(`lib.ui.git.checkFailed`));
     }
 }

package/lib/ui/index.d.ts

@@ -11,7 +11,9 @@ export declare function uiCommandReference(command: string, withQuotes?: boolean
 export declare function uiFeatureHighlight(features: string[], title?: string): void;
 export declare function uiBetaTag(message: string, log?: true): undefined;
 export declare function uiBetaTag(message: string, log: false): string;
-export declare function uiDeprecatedTag(message: string, log?: boolean): string | undefined;
+export declare function uiDeprecatedTag(message: string, log?: true): undefined;
+export declare function uiDeprecatedTag(message: string, log: false): string;
 export declare function uiCommandDisabledBanner(command: string, url?: string, message?: string): void;
-export declare function uiDeprecatedDescription(message: string, command: string, url?: string): string | undefined;
+export declare function uiDeprecatedDescription(message: string, command: string, url?: string): undefined;
 export declare function uiDeprecatedMessage(command: string, url?: string, message?: string): void;
+export declare function indent(level: number): string;

package/lib/ui/index.js

@@ -15,6 +15,7 @@ exports.uiDeprecatedTag = uiDeprecatedTag;
 exports.uiCommandDisabledBanner = uiCommandDisabledBanner;
 exports.uiDeprecatedDescription = uiDeprecatedDescription;
 exports.uiDeprecatedMessage = uiDeprecatedMessage;
+exports.indent = indent;
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("@hubspot/local-dev-lib/config");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -60,7 +61,10 @@ function uiAccountDescription(accountId, bold = true) {
     if (account && account.accountType) {
         message = `${account.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]}] (${accountId})`;
     }
-    return bold ? chalk_1.default.bold(message) : message || '';
+    else {
+        message = accountId ? accountId.toString() : '';
+    }
+    return bold ? chalk_1.default.bold(message) : message;
 }
 function uiInfoSection(title, logContent) {
     uiLine();
@@ -78,10 +82,9 @@ function uiCommandReference(command, withQuotes = true) {
         : commandReference);
 }
 function uiFeatureHighlight(features, title) {
-    const i18nKey = 'lib.ui.featureHighlight';
-    uiInfoSection(title ? title : (0, lang_1.i18n)(`${i18nKey}.defaultTitle`), () => {
+    uiInfoSection(title ? title : (0, lang_1.i18n)(`lib.ui.featureHighlight.defaultTitle`), () => {
         features.forEach((c, i) => {
-            const featureKey = `${i18nKey}.featureKeys.${c}`;
+            const featureKey = `lib.ui.featureHighlight.featureKeys.${c}`;
             const message = (0, lang_1.i18n)(`${featureKey}.message`, {
                 command: uiCommandReference((0, lang_1.i18n)(`${featureKey}.command`)),
                 link: uiLink((0, lang_1.i18n)(`${featureKey}.linkText`), (0, lang_1.i18n)(`${featureKey}.url`)),
@@ -94,9 +97,8 @@ function uiFeatureHighlight(features, title) {
     });
 }
 function uiBetaTag(message, log = true) {
-    const i18nKey = 'lib.ui';
     const terminalUISupport = getTerminalUISupport();
-    const tag = (0, lang_1.i18n)(`${i18nKey}.betaTag`);
+    const tag = (0, lang_1.i18n)(`lib.ui.betaTag`);
     const result = `${terminalUISupport.color ? chalk_1.default.hex(exports.UI_COLORS.SORBET)(tag) : tag} ${message}`;
     if (log) {
         logger_1.logger.log(result);
@@ -105,21 +107,20 @@ function uiBetaTag(message, log = true) {
     return result;
 }
 function uiDeprecatedTag(message, log = true) {
-    const i18nKey = 'lib.ui';
     const terminalUISupport = getTerminalUISupport();
-    const tag = (0, lang_1.i18n)(`${i18nKey}.deprecatedTag`);
+    const tag = (0, lang_1.i18n)(`lib.ui.deprecatedTag`);
     const result = `${terminalUISupport.color ? chalk_1.default.yellow(tag) : tag} ${message}`;
     if (log) {
         logger_1.logger.log(result);
+        return;
     }
     return result;
 }
 function uiCommandDisabledBanner(command, url, message) {
-    const i18nKey = 'lib.ui';
     const tag = message ||
-        (0, lang_1.i18n)(`${i18nKey}.disabledMessage`, {
+        (0, lang_1.i18n)(`lib.ui.disabledMessage`, {
             command: uiCommandReference(command),
-            url: url ? uiLink((0, lang_1.i18n)(`${i18nKey}.disabledUrlText`), url) : '',
+            url: url ? uiLink((0, lang_1.i18n)(`lib.ui.disabledUrlText`), url) : '',
             npmCommand: uiCommandReference('npm i -g @hubspot/cli@latest'),
         });
     logger_1.logger.log();
@@ -129,22 +130,24 @@ function uiCommandDisabledBanner(command, url, message) {
     logger_1.logger.log();
 }
 function uiDeprecatedDescription(message, command, url) {
-    const i18nKey = 'lib.ui';
-    const tag = (0, lang_1.i18n)(`${i18nKey}.deprecatedDescription`, {
+    const tag = (0, lang_1.i18n)(`lib.ui.deprecatedDescription`, {
         message,
         command: uiCommandReference(command),
-        url: url ? uiLink((0, lang_1.i18n)(`${i18nKey}.deprecatedUrlText`), url) : '',
+        url: url ? uiLink((0, lang_1.i18n)(`lib.ui.deprecatedUrlText`), url) : '',
     });
     return uiDeprecatedTag(tag);
 }
 function uiDeprecatedMessage(command, url, message) {
-    const i18nKey = 'lib.ui';
     const tag = message ||
-        (0, lang_1.i18n)(`${i18nKey}.deprecatedMessage`, {
+        (0, lang_1.i18n)(`lib.ui.deprecatedMessage`, {
             command: uiCommandReference(command),
-            url: url ? uiLink((0, lang_1.i18n)(`${i18nKey}.deprecatedUrlText`), url) : '',
+            url: url ? uiLink((0, lang_1.i18n)(`lib.ui.deprecatedUrlText`), url) : '',
         });
     logger_1.logger.log();
     uiDeprecatedTag(tag);
     logger_1.logger.log();
 }
+function indent(level) {
+    const indentation = '  ';
+    return indentation.repeat(level);
+}

package/lib/ui/logger.d.ts

@@ -0,0 +1,10 @@
+export declare const uiLogger: {
+    log: (message: string) => void;
+    error: (message: string) => void;
+    warn: (message: string) => void;
+    success: (message: string) => void;
+    info: (message: string) => void;
+    debug: (...args: any[]) => void;
+    group: (message: string) => void;
+    groupEnd: () => void;
+};

package/lib/ui/logger.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uiLogger = void 0;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+// Wrapper around LDL logger to provide type checking
+exports.uiLogger = {
+    log: (message) => logger_1.logger.log(message),
+    error: (message) => logger_1.logger.error(message),
+    warn: (message) => logger_1.logger.warn(message),
+    success: (message) => logger_1.logger.success(message),
+    info: (message) => logger_1.logger.info(message),
+    debug: logger_1.logger.debug,
+    group: (message) => logger_1.logger.group(message),
+    groupEnd: () => logger_1.logger.groupEnd(),
+};

package/lib/ui/serverlessFunctionLogs.js

@@ -8,7 +8,6 @@ const moment_1 = __importDefault(require("moment"));
 const chalk_1 = __importDefault(require("chalk"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.ui.serverlessFunctionLogs';
 const SEPARATOR = ' - ';
 const LOG_STATUS_COLORS = {
     SUCCESS: logger_1.Styles.success,
@@ -63,7 +62,7 @@ function processLog(log, options) {
         return logHandler[log.status](log, options);
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.unableToProcessLog`, {
+        logger_1.logger.error((0, lang_1.i18n)(`lib.ui.serverlessFunctionLogs.unableToProcessLog`, {
             log: JSON.stringify(log),
         }));
     }
@@ -77,7 +76,7 @@ function isLogsResponse(logsResp) {
 function processLogs(logsResp, options) {
     const isLogsResp = isLogsResponse(logsResp);
     if (!logsResp || (isLogsResp && logsResp.results.length === 0)) {
-        return (0, lang_1.i18n)(`${i18nKey}.noLogsFound`);
+        return (0, lang_1.i18n)(`lib.ui.serverlessFunctionLogs.noLogsFound`);
     }
     else if (isLogsResp) {
         return logsResp

package/lib/ui/spinniesUtils.d.ts

@@ -6,14 +6,14 @@ export type Spinner = {
 };
 export type SpinnerOptions = {
     text?: string;
-    status?: typeof VALID_STATUSES[number];
+    status?: (typeof VALID_STATUSES)[number];
     indent?: number;
     spinner?: Partial<Spinner>;
     disableSpins?: boolean;
-    color?: typeof VALID_COLORS[number];
-    spinnerColor?: typeof VALID_COLORS[number];
-    succeedColor?: typeof VALID_COLORS[number];
-    failColor?: typeof VALID_COLORS[number];
+    color?: (typeof VALID_COLORS)[number];
+    spinnerColor?: (typeof VALID_COLORS)[number];
+    succeedColor?: (typeof VALID_COLORS)[number];
+    failColor?: (typeof VALID_COLORS)[number];
     succeedPrefix?: string;
     failPrefix?: string;
 };

package/lib/upload.d.ts

@@ -1 +1 @@
-export declare function getUploadableFileList(src: string, convertFields: boolean): Promise<string[]>;
+export declare function getUploadableFileList(src: string, convertFields?: boolean): Promise<string[]>;

package/lib/validation.js

@@ -145,28 +145,27 @@ function validateCmsPublishMode(options) {
     return false;
 }
 function fileExists(_path) {
-    let isFile;
     try {
         const absoluteSrcPath = path.resolve((0, path_1.getCwd)(), _path);
         if (!absoluteSrcPath)
             return false;
         const stats = fs.statSync(absoluteSrcPath);
-        isFile = stats.isFile();
+        const isFile = stats.isFile();
         if (!isFile) {
-            logger_1.logger.error(`The path "${_path}" is not a path to a file`);
             return false;
         }
     }
     catch (e) {
-        logger_1.logger.error(`The path "${_path}" is not a path to a file`);
         return false;
     }
     return true;
 }
 function checkAndConvertToJson(_path) {
     const filePath = (0, path_1.getAbsoluteFilePath)(_path);
-    if (!fileExists(filePath))
+    if (!fileExists(filePath)) {
+        logger_1.logger.error(`The path "${_path}" is not a path to a file`);
         return null;
+    }
     if ((0, path_1.getExt)(_path) !== 'json') {
         logger_1.logger.error(`The file "${_path}" must be a valid JSON file`);
         return null;

package/lib/yargsUtils.d.ts

@@ -1,9 +1,13 @@
 import { Argv } from 'yargs';
 export declare function hasFlag(flag: string, argv?: string[]): boolean;
-export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>, command: string, describe: string, options?: {
+export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>, command: string | string[], describe?: string, options?: {
     useGlobalOptions?: boolean;
     useAccountOptions?: boolean;
     useConfigOptions?: boolean;
     useEnvironmentOptions?: boolean;
     useTestingOptions?: boolean;
+    useCmsPublishModeOptions?: boolean | {
+        read?: boolean;
+        write?: boolean;
+    };
 }): (yargs: Argv) => Promise<Argv<T>>;

package/lib/yargsUtils.js

@@ -32,6 +32,12 @@ function makeYargsBuilder(callback, command, describe, options = {}) {
         if (options.useTestingOptions) {
             (0, commonOpts_1.addTestingOptions)(yargs);
         }
+        if (options.useCmsPublishModeOptions) {
+            const opts = typeof options.useCmsPublishModeOptions === 'object'
+                ? options.useCmsPublishModeOptions
+                : { write: true };
+            (0, commonOpts_1.addCmsPublishModeOptions)(yargs, opts);
+        }
         const result = callback(yargs);
         // Must go last to pick up available options
         await (0, commonOpts_1.addCustomHelpOutput)(result, command, describe);