@hubspot/cli 6.4.0 → 7.0.0-experimental.0

package/lib/prompts/selectHubDBTablePrompt.d.ts

@@ -0,0 +1,8 @@
+export declare function selectHubDBTablePrompt({ accountId, options, skipDestPrompt, }: {
+    accountId: number;
+    options: {
+        tableId?: number;
+        dest?: string;
+    };
+    skipDestPrompt?: boolean;
+}): Promise<any>;

package/lib/prompts/selectHubDBTablePrompt.js

@@ -0,0 +1,69 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectHubDBTablePrompt = selectHubDBTablePrompt;
+const fs_1 = __importDefault(require("fs"));
+const promptUtils_1 = require("./promptUtils");
+const lang_1 = require("../lang");
+const index_1 = require("../errorHandlers/index");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const hubdb_1 = require("@hubspot/local-dev-lib/api/hubdb");
+const exitCodes_1 = require("../enums/exitCodes");
+const path_1 = require("@hubspot/local-dev-lib/path");
+const i18nKey = 'lib.prompts.selectHubDBTablePrompt';
+async function fetchHubDBOptions(accountId) {
+    try {
+        const { data: { results: tables }, } = await (0, hubdb_1.fetchTables)(accountId);
+        if (tables.length === 0) {
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.noTables`, { accountId }));
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        return tables;
+    }
+    catch (error) {
+        (0, index_1.debugError)(error, { accountId });
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.errorFetchingTables`, { accountId }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+async function selectHubDBTablePrompt({ accountId, options, skipDestPrompt = true, }) {
+    const hubdbTables = (await fetchHubDBOptions(accountId)) || [];
+    const id = options.tableId?.toString();
+    const isValidTable = options.tableId && hubdbTables.find(table => table.id === id);
+    return (0, promptUtils_1.promptUser)([
+        {
+            name: 'tableId',
+            message: (0, lang_1.i18n)(`${i18nKey}.selectTable`),
+            when: !id && !isValidTable,
+            type: 'list',
+            choices: hubdbTables.map(table => {
+                return {
+                    name: `${table.label} (${table.id})`,
+                    value: table.id,
+                };
+            }),
+        },
+        {
+            name: 'dest',
+            message: (0, lang_1.i18n)(`${i18nKey}.enterDest`),
+            when: !options.dest && !skipDestPrompt,
+            validate: (input) => {
+                if (!input) {
+                    return (0, lang_1.i18n)(`${i18nKey}.errors.destRequired`);
+                }
+                if (fs_1.default.existsSync(input)) {
+                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidDest`);
+                }
+                if (!(0, path_1.isValidPath)(input)) {
+                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidCharacters`);
+                }
+                return true;
+            },
+            filter: (input) => {
+                return (0, path_1.untildify)(input);
+            },
+        },
+    ]);
+}

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { getConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { getConfig, updateDefaultAccount, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const i18nKey = 'lib.prompts.setAsDefaultAccountPrompt';
 const setAsDefaultAccountPrompt = async (accountName) => {
     const config = getConfig();
+    // Accounts for deprecated and new config
+    const defaultAccount = getConfigDefaultAccount(config);
     const { setAsDefault } = await promptUser([
         {
             name: 'setAsDefault',
             type: 'confirm',
-            when: config.defaultPortal !== accountName,
+            when: defaultAccount !== accountName,
             message: i18n(`${i18nKey}.setAsDefaultAccountMessage`),
         },
     ]);

package/lib/sandboxSync.js

@@ -11,6 +11,7 @@ const { debugError, logError, ApiErrorContext, } = require('./errorHandlers/inde
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription, uiLine, uiLink, uiCommandDisabledBanner, } = require('./ui');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const i18nKey = 'lib.sandbox.sync';
@@ -22,8 +23,10 @@ const i18nKey = 'lib.sandbox.sync';
  * @returns
  */
 const syncSandbox = async ({ accountConfig, parentAccountConfig, env, syncTasks, slimInfoMessage = false, }) => {
-    const accountId = getAccountId(accountConfig.portalId);
-    const parentAccountId = getAccountId(parentAccountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
+    const parentId = getAccountIdentifier(parentAccountConfig);
+    const parentAccountId = getAccountId(parentId);
     const isDevSandbox = isDevelopmentSandbox(accountConfig);
     SpinniesManager.init({
         succeedColor: 'white',

package/lib/sandboxes.js

@@ -5,11 +5,12 @@ const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { fetchTypes } = require('@hubspot/local-dev-lib/api/sandboxSync');
-const { getConfig, getAccountId, getEnv, } = require('@hubspot/local-dev-lib/config');
+const { getAccountId, getEnv, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./prompts/promptUtils');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription } = require('./ui');
 const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
@@ -34,9 +35,10 @@ const getSandboxTypeAsString = accountType => {
     return 'standard';
 };
 function getHasSandboxesByType(parentAccountConfig, type) {
-    const config = getConfig();
-    const parentPortalId = getAccountId(parentAccountConfig.portalId);
-    for (const portal of config.portals) {
+    const id = getAccountIdentifier(parentAccountConfig);
+    const parentPortalId = getAccountId(id);
+    const accountsList = getConfigAccounts();
+    for (const portal of accountsList) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
             portal.parentAccountId === parentPortalId &&
@@ -54,8 +56,10 @@ function getSandboxLimit(error) {
 }
 // Fetches available sync types for a given sandbox portal
 async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentPortalId = getAccountId(parentAccountConfig.portalId);
-    const portalId = getAccountId(config.portalId);
+    const parentId = getAccountIdentifier(parentAccountConfig);
+    const parentPortalId = getAccountId(parentId);
+    const id = getAccountIdentifier(config);
+    const portalId = getAccountId(id);
     const { data: { results: syncTypes }, } = await fetchTypes(parentPortalId, portalId);
     if (!syncTypes) {
         throw new Error('Unable to fetch available sandbox sync types. Please try again.');
@@ -98,7 +102,8 @@ const getSyncTypesWithContactRecordsPrompt = async (accountConfig, syncTasks, sk
  * @returns {null}
  */
 const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
-    const accountId = getAccountId(accountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
     const { data: { usage }, } = await getSandboxUsageLimits(accountId);
     if (!usage) {
         throw new Error('Unable to fetch sandbox usage limits. Please try again.');

package/lib/validation.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { MODE } = require('@hubspot/local-dev-lib/constants/files');
+const { CMS_PUBLISH_MODE } = require('@hubspot/local-dev-lib/constants/files');
 const { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } = require('@hubspot/local-dev-lib/constants/auth');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { loadConfig, getConfigPath, validateConfig, getAccountConfig, loadConfigFromEnvironment, } = require('@hubspot/local-dev-lib/config');
 const { getOauthManager } = require('@hubspot/local-dev-lib/oauth');
 const { accessTokenForPersonalAccessKey, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { getAbsoluteFilePath, getCwd, getExt, } = require('@hubspot/local-dev-lib/path');
-const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
+const { getAccountId, getCmsPublishMode, setLogLevel, } = require('./commonOpts');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { checkAndWarnGitInclusion } = require('./ui/git');
 const { logError } = require('./errorHandlers/index');
@@ -37,9 +37,7 @@ async function loadAndValidateOptions(options, shouldValidateAccount = true) {
  */
 async function validateAccount(options) {
     const accountId = getAccountId(options);
-    const { portalId: portalIdOption, portal: portalOption, accountId: _accountIdOption, account: _accountOption, } = options;
-    const accountOption = portalOption || _accountOption;
-    const accountIdOption = portalIdOption || _accountIdOption;
+    const { accountId: accountIdOption, account: accountOption } = options;
     if (!accountId) {
         if (accountOption) {
             logger.error(`The account "${accountOption}" could not be found in the config`);
@@ -119,17 +117,20 @@ async function validateAccount(options) {
  * @param {object} command options
  * @returns {boolean}
  */
-function validateMode(options) {
-    const mode = getMode(options);
-    if (MODE[mode]) {
+function validateCmsPublishMode(options) {
+    const cmsPublishMode = getCmsPublishMode(options);
+    if (CMS_PUBLISH_MODE[cmsPublishMode]) {
         return true;
     }
-    const modesMessage = `Available modes are: ${Object.values(MODE).join(', ')}.`;
-    if (mode != null) {
-        logger.error([`The mode "${mode}" is invalid.`, modesMessage].join(' '));
+    const modesMessage = `Available CMS publish modes are: ${Object.values(CMS_PUBLISH_MODE).join(', ')}.`;
+    if (cmsPublishMode != null) {
+        logger.error([
+            `The CMS publish mode "${cmsPublishMode}" is invalid.`,
+            modesMessage,
+        ].join(' '));
     }
     else {
-        logger.error(['The mode option is missing.', modesMessage].join(' '));
+        logger.error(['The CMS publish mode option is missing.', modesMessage].join(' '));
     }
     return false;
 }
@@ -171,7 +172,7 @@ const checkAndConvertToJson = _path => {
     return result;
 };
 module.exports = {
-    validateMode,
+    validateCmsPublishMode,
     validateAccount,
     checkAndConvertToJson,
     fileExists,

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "6.4.0",
+    "version": "7.0.0-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "2.3.0",
+        "@hubspot/local-dev-lib": "3.0.0",
         "@hubspot/serverless-dev-runtime": "7.0.0",
         "@hubspot/theme-preview-dev-server": "0.0.9",
         "@hubspot/ui-extensions-dev-server": "0.8.33",
@@ -26,7 +26,8 @@
         "table": "^6.6.0",
         "tmp": "^0.2.1",
         "update-notifier": "^5.1.0",
-        "yargs": "17.7.2"
+        "yargs": "17.7.2",
+        "yargs-parser": "^21.1.1"
     },
     "devDependencies": {
         "@types/fs-extra": "^11.0.4",
@@ -51,7 +52,7 @@
         "typescript": "^5.6.2"
     },
     "optionalDependencies": {
-        "@hubspot/cms-dev-server": "^0.18.10"
+        "@hubspot/cms-dev-server": "^0.18.9"
     },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",

package/commands/accounts.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const { i18n } = require('../lib/lang');
-const list = require('./accounts/list');
-const rename = require('./accounts/rename');
-const use = require('./accounts/use');
-const info = require('./accounts/info');
-const remove = require('./accounts/remove');
-const clean = require('./accounts/clean');
-const i18nKey = 'commands.accounts';
-exports.command = 'accounts';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    yargs
-        .command({
-        ...list,
-        aliases: 'ls',
-    })
-        .command(rename)
-        .command(use)
-        .command(info)
-        .command(remove)
-        .command(clean)
-        .demandCommand(1, '');
-    return yargs;
-};

package/commands/cms/reactModules.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const fs = require('fs');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { retrieveDefaultModule } = require('@hubspot/local-dev-lib/cms/modules');
-const { i18n } = require('../../lib/lang');
-const path = require('path');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const i18nKey = 'commands.cms.subcommands.reactModule';
-exports.command = 'get-react-module [--name] [--dest]';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.handler = async (options) => {
-    const { name, dest } = options;
-    trackCommandUsage('get-react-modules');
-    const destPath = dest
-        ? path.join(dest, `${name}`)
-        : path.join(process.cwd(), `${name}`);
-    if (fs.existsSync(destPath)) {
-        logger.error(i18n(`${i18nKey}.errors.pathExists`, {
-            path: destPath,
-        }));
-        return;
-    }
-    try {
-        const modules = await retrieveDefaultModule(name, destPath);
-        if (!name) {
-            logger.group(i18n(`${i18nKey}.groupLabel`));
-            modules.forEach(module => {
-                logger.log(module.name);
-            });
-            logger.groupEnd(i18n(`${i18nKey}.groupLabel`));
-        }
-        else {
-            logger.success(i18n(`${i18nKey}.success.moduleDownloaded`, {
-                moduleName: name,
-                path: destPath,
-            }));
-        }
-    }
-    catch (e) {
-        if (e.cause && e.cause.code === 'ERR_BAD_REQUEST') {
-            logger.error(i18n(`${i18nKey}.errors.invalidName`));
-        }
-        else {
-            logger.error(e);
-        }
-    }
-};
-exports.builder = yargs => {
-    yargs.option('name', {
-        describe: i18n(`${i18nKey}.options.name.describe`),
-        type: 'string',
-    });
-    yargs.option('dest', {
-        describe: i18n(`${i18nKey}.options.dest.describe`),
-        type: 'string',
-    });
-    return yargs;
-};

package/commands/functions.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const list = require('./functions/list');
-const deploy = require('./functions/deploy');
-const server = require('./functions/server');
-const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.functions';
-exports.command = 'functions';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    yargs
-        .command({
-        ...list,
-        aliases: 'ls',
-    })
-        .command(deploy)
-        .command(server)
-        .demandCommand(1, '');
-    return yargs;
-};

package/commands/secrets/deleteSecret.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
-const { deleteSecret } = require('@hubspot/local-dev-lib/api/secrets');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
-const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.secrets.subcommands.delete';
-exports.command = 'delete <name>';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.handler = async (options) => {
-    const { name: secretName } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-delete', null, accountId);
-    try {
-        await deleteSecret(accountId, secretName);
-        logger.success(i18n(`${i18nKey}.success.delete`, {
-            accountIdentifier: uiAccountDescription(accountId),
-            secretName,
-        }));
-    }
-    catch (err) {
-        logger.error(i18n(`${i18nKey}.errors.delete`, {
-            secretName,
-        }));
-        logError(err, new ApiErrorContext({
-            request: 'delete a secret',
-            accountId,
-        }));
-    }
-};
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
-    yargs.positional('name', {
-        describe: i18n(`${i18nKey}.positionals.name.describe`),
-        type: 'string',
-    });
-    return yargs;
-};

package/commands/secrets.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const addSecretCommand = require('./secrets/addSecret');
-const listSecretsCommand = require('./secrets/listSecrets');
-const deleteSecretCommand = require('./secrets/deleteSecret');
-const updateSecretCommand = require('./secrets/updateSecret');
-const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.secrets';
-exports.command = 'secrets';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    yargs
-        .command(listSecretsCommand)
-        .command(addSecretCommand)
-        .command(updateSecretCommand)
-        .command(deleteSecretCommand)
-        .demandCommand(1, '');
-    return yargs;
-};