@hubspot/cli 3.0.10-beta.6 → 3.0.10

package/commands/config/set/httpTimeout.js

@@ -1,33 +1,18 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateHttpTimeout } = require('@hubspot/cli-lib/lib/config');
-const {
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
 
-const { getAccountId, setLogLevel } = require('../../../lib/commonOpts');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { logDebugInfo } = require('../../../lib/debugInfo');
-const { validateAccount } = require('../../../lib/validation');
-
-const loadAndValidateOptions = async options => {
-  setLogLevel(options);
-  logDebugInfo(options);
-  const { config: configPath } = options;
-  loadConfig(configPath, options);
-  checkAndWarnGitInclusion();
-
-  if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
-  }
-};
+const { loadAndValidateOptions } = require('../../../lib/validation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.config.subcommands.set.subcommands.httpTimeout';
 
 exports.command = 'http-timeout [timeout]';
-exports.describe = 'Change http timeout used in config';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  loadAndValidateOptions(options);
+  await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
   const { timeout } = options;
@@ -36,21 +21,18 @@ exports.handler = async options => {
 
   updateHttpTimeout(timeout);
 
-  return logger.log(`The http timeout has been set to: ${timeout}`);
+  return logger.success(i18n(`${i18nKey}.success.timeoutUpdated`, { timeout }));
 };
 
 exports.builder = yargs => {
   yargs.positional('timeout', {
-    describe: 'Set http timeout value (in ms) in the config',
+    describe: i18n(`${i18nKey}.positionals.timeout.describe`),
     type: 'string',
     default: 30000,
   });
 
   yargs.example([
-    [
-      '$0 config set http-timeout 30000',
-      'Set the http timeout value in the config to 30000ms',
-    ],
+    ['$0 config set http-timeout 30000', i18n(`${i18nKey}.examples.default`)],
   ]);
 
   return yargs;

package/commands/config/set.js

@@ -3,9 +3,12 @@ const defaultAccount = require('./set/defaultAccount');
 const defaultMode = require('./set/defaultMode');
 const httpTimeout = require('./set/httpTimeout');
 const allowUsageTracking = require('./set/allowUsageTracking');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.config.subcommands.set';
 
 exports.command = 'set';
-exports.describe = 'Commands for working with the config file';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);

package/commands/config.js

@@ -1,8 +1,11 @@
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const set = require('./config/set');
 
+const i18nKey = 'cli.commands.config';
+
 exports.command = 'config';
-exports.describe = 'Commands for working with the config file';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);

package/commands/create/api-sample.js

@@ -1,5 +1,9 @@
-const { createApiSamplePrompt } = require('../../lib/createApiSamplePrompt');
-const { folderOverwritePrompt } = require('../../lib/prompts');
+const {
+  createApiSamplePrompt,
+} = require('../../lib/prompts/createApiSamplePrompt');
+const {
+  folderOverwritePrompt,
+} = require('../../lib/prompts/folderOverwritePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
@@ -7,15 +11,16 @@ const ora = require('ora');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const { createProject } = require('@hubspot/cli-lib/projects');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.create.subcommands.apiSample';
 
 module.exports = {
   hidden: true,
   dest: ({ dest }) => dest,
   validate: ({ name }) => {
     if (!name) {
-      logger.error(
-        "The 'name' argument is required when creating an API Sample."
-      );
+      logger.error(i18n(`${i18nKey}.errors.nameRequired`));
       return false;
     }
 
@@ -31,7 +36,7 @@ module.exports = {
         return;
       }
     }
-    const downloadSpinner = ora('Loading available API samples');
+    const downloadSpinner = ora(i18n(`${i18nKey}.loading.apiSamples`));
     downloadSpinner.start();
     const samplesConfig = await fetchJsonFromRepository(
       'sample-apps-list',
@@ -39,22 +44,21 @@ module.exports = {
     );
     downloadSpinner.stop();
     if (!samplesConfig) {
-      logger.error(
-        `Currently there are no samples available, please, try again later.`
-      );
+      logger.error(i18n(`${i18nKey}.errors.noSamples`));
       return;
     }
     const { sampleType, sampleLanguage } = await createApiSamplePrompt(
       samplesConfig
     );
     if (!sampleType || !sampleLanguage) {
-      logger.error(
-        `Currently there are no samples available, please, try again later.`
-      );
+      logger.error(i18n(`${i18nKey}.errors.noSamples`));
       return;
     }
     logger.info(
-      `You've chosen ${sampleType} sample written on ${sampleLanguage} language`
+      i18n(`${i18nKey}.info.sampleChosen`, {
+        sampleType,
+        sampleLanguage,
+      })
     );
     const created = await createProject(
       filePath,
@@ -71,7 +75,9 @@ module.exports = {
         fs.copySync(`${filePath}/.env.template`, `${filePath}/.env`);
       }
       logger.success(
-        `Please, follow ${filePath}/README.md to find out how to run the sample`
+        i18n(`${i18nKey}.success.sampleCreated`, {
+          filePath,
+        })
       );
     }
   },

package/commands/create/function.js

@@ -1,5 +1,7 @@
 const { createFunction } = require('@hubspot/cli-lib/functions');
-const { createFunctionPrompt } = require('../../lib/createFunctionPrompt');
+const {
+  createFunctionPrompt,
+} = require('../../lib/prompts/createFunctionPrompt');
 
 module.exports = {
   dest: ({ name }) => name,

package/commands/create/index.js

@@ -3,7 +3,6 @@ module.exports = {
   app: require('./app'),
   function: require('./function'),
   module: require('./module'),
-  project: require('./project'),
   'react-app': require('./react-app'),
   template: require('./template'),
   'vue-app': require('./vue-app'),

package/commands/create/module.js

@@ -1,7 +1,10 @@
 const path = require('path');
-const { createModulePrompt } = require('../../lib/createModulePrompt');
+const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const fs = require('fs-extra');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.create.subcommands.module';
 
 const createModule = (moduleDefinition, name, dest) => {
   const writeModuleMeta = ({ contentTypes, moduleLabel, global }, dest) => {
@@ -44,12 +47,24 @@ const createModule = (moduleDefinition, name, dest) => {
   const folderName = name.endsWith('.module') ? name : `${name}.module`;
   const destPath = path.join(dest, folderName);
   if (fs.existsSync(destPath)) {
-    logger.error(`The ${destPath} path already exists`);
+    logger.error(
+      i18n(`${i18nKey}.errors.pathExists`, {
+        path: destPath,
+      })
+    );
     return;
   }
-  logger.log(`Creating ${destPath}`);
+  logger.log(
+    i18n(`${i18nKey}.creatingPath`, {
+      path: destPath,
+    })
+  );
   fs.mkdirp(destPath);
-  logger.log(`Creating module at ${destPath}`);
+  logger.log(
+    i18n(`${i18nKey}.creatingModule`, {
+      path: destPath,
+    })
+  );
   fs.copySync(assetPath, destPath, { filter: moduleFileFilter });
 };
 
@@ -57,9 +72,7 @@ module.exports = {
   dest: ({ dest }) => dest,
   validate: ({ name }) => {
     if (!name) {
-      logger.error(
-        "The 'name' argument is required when creating a Custom Module."
-      );
+      logger.error(i18n(`${i18nKey}.errors.nameRequired`));
       return false;
     }
 

package/commands/create/template.js

@@ -1,7 +1,12 @@
-const { createTemplatePrompt } = require('../../lib/createTemplatePrompt');
+const {
+  createTemplatePrompt,
+} = require('../../lib/prompts/createTemplatePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.create.subcommands.template';
 
 const ASSET_PATHS = {
   'page-template': path.resolve(__dirname, '../../defaults/page-template.html'),
@@ -33,12 +38,24 @@ const createTemplate = (name, dest, type = 'page-template') => {
   const filename = name.endsWith('.html') ? name : `${name}.html`;
   const filePath = path.join(dest, filename);
   if (fs.existsSync(filePath)) {
-    logger.error(`The ${filePath} path already exists`);
+    logger.error(
+      i18n(`${i18nKey}.errors.pathExists`, {
+        path: filePath,
+      })
+    );
     return;
   }
-  logger.debug(`Making ${dest} if needed`);
+  logger.debug(
+    i18n(`${i18nKey}.debug.creatingPath`, {
+      path: dest,
+    })
+  );
   fs.mkdirp(dest);
-  logger.log(`Creating file at ${filePath}`);
+  logger.log(
+    i18n(`${i18nKey}.log.creatingFile`, {
+      path: filePath,
+    })
+  );
   fs.copySync(assetPath, filePath);
 };
 
@@ -46,7 +63,7 @@ module.exports = {
   dest: ({ dest }) => dest,
   validate: ({ name }) => {
     if (!name) {
-      logger.error("The 'name' argument is required when creating a Template.");
+      logger.error(i18n(`${i18nKey}.errors.nameRequired`));
       return false;
     }
 

package/commands/create/website-theme.js

@@ -1,8 +1,19 @@
 const { createProject } = require('@hubspot/cli-lib/projects');
+const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { getIsInProject } = require('../../lib/projects');
+
+const PROJECT_BOILERPLATE_REF = 'cms-boilerplate-developer-projects';
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
-  execute: ({ dest, assetType, options }) => {
+  execute: async ({ dest, assetType, options }) => {
+    const isInProject = await getIsInProject(dest);
+
+    if (isInProject) {
+      options.ref = PROJECT_BOILERPLATE_REF;
+      // releaseType has to be 'REPOSITORY' to download a specific branch
+      options.releaseType = GITHUB_RELEASE_TYPES.REPOSITORY;
+    }
     createProject(dest, assetType, 'cms-theme-boilerplate', 'src', options);
   },
 };

package/commands/create.js

@@ -31,13 +31,18 @@ const { logDebugInfo } = require('../lib/debugInfo');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.create';
 
 const SUPPORTED_ASSET_TYPES = Object.keys(assets)
   .filter(t => !assets[t].hidden)
   .join(', ');
 
 exports.command = 'create <type> [name] [dest]';
-exports.describe = `Create HubSpot sample apps and CMS assets. Supported assets are ${SUPPORTED_ASSET_TYPES}.`;
+exports.describe = i18n(`${i18nKey}.describe`, {
+  supportedAssetTypes: SUPPORTED_ASSET_TYPES,
+});
 
 exports.handler = async options => {
   let { type: assetType, name, dest } = options;
@@ -48,14 +53,21 @@ exports.handler = async options => {
 
   if (assetType === 'global-partial') {
     logger.error(
-      `The CLI command for asset type ${assetType} has been deprecated in an effort to make it easier to know what asset types can be created. Run the "hs create template" command instead. Then when prompted select "global partial".`
+      i18n(`${i18nKey}.errors.deprecatedAssetType`, {
+        assetType,
+        newCommand: 'hs create template',
+        type: 'global partial',
+      })
     );
     return;
   }
 
   if (!assetType || !assets[assetType]) {
     logger.error(
-      `The asset type ${assetType} is not supported. Supported asset types are ${SUPPORTED_ASSET_TYPES}.`
+      i18n(`${i18nKey}.errors.unsupportedAssetType`, {
+        assetType,
+        supportedAssetTypes: SUPPORTED_ASSET_TYPES,
+      })
     );
     return;
   }
@@ -67,7 +79,11 @@ exports.handler = async options => {
   try {
     await fs.ensureDir(dest);
   } catch (e) {
-    logger.error(`The "${dest}" is not a usable path to a directory`);
+    logger.error(
+      i18n(`${i18nKey}.errors.unusablePath`, {
+        path: dest,
+      })
+    );
     logFileSystemErrorInstance(e, {
       filepath: dest,
       write: true,
@@ -88,16 +104,15 @@ exports.handler = async options => {
 
 exports.builder = yargs => {
   yargs.positional('type', {
-    describe: 'Type of asset',
+    describe: i18n(`${i18nKey}.positionals.type.describe`),
     type: 'string',
   });
   yargs.positional('name', {
-    describe: 'Name of new asset',
+    describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',
   });
   yargs.positional('dest', {
-    describe:
-      'Destination folder for the new asset, relative to your current working directory. If omitted, this argument will default to your current working directory.',
+    describe: i18n(`${i18nKey}.positionals.dest.describe`),
     type: 'string',
   });
 

package/commands/customObject/create.js

@@ -1,58 +1,56 @@
-const {
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
-const { validateAccount, isFileValidJSON } = require('../../lib/validation');
+const {
+  isFileValidJSON,
+  loadAndValidateOptions,
+} = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { setLogLevel, getAccountId } = require('../../lib/commonOpts');
-const { logDebugInfo } = require('../../lib/debugInfo');
+const { getAccountId } = require('../../lib/commonOpts');
 const { batchCreateObjects } = require('@hubspot/cli-lib/api/customObject');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.customObject.subcommands.create';
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'create <name> <definition>';
-exports.describe = 'Create custom object instances';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   const { definition, name } = options;
-  setLogLevel(options);
-  logDebugInfo(options);
-  const { config: configPath } = options;
-  loadConfig(configPath);
-  checkAndWarnGitInclusion();
-
-  if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
-  }
+
+  await loadAndValidateOptions(options);
+
   const accountId = getAccountId(options);
 
   trackCommandUsage('custom-object-batch-create', null, accountId);
 
   const filePath = getAbsoluteFilePath(definition);
   if (!isFileValidJSON(filePath)) {
-    process.exit(1);
+    process.exit(EXIT_CODES.ERROR);
   }
 
   try {
     await batchCreateObjects(accountId, name, filePath);
-    logger.success(`Objects created`);
+    logger.success(i18n(`${i18nKey}.success.objectsCreated`));
   } catch (e) {
     logErrorInstance(e, { accountId });
-    logger.error(`Object creation from ${definition} failed`);
+    logger.error(
+      i18n(`${i18nKey}.errors.creationFailed`, {
+        definition,
+      })
+    );
   }
 };
 
 exports.builder = yargs => {
   yargs.positional('name', {
-    describe: 'Schema name to add the object instance to',
+    describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',
   });
 
   yargs.positional('definition', {
-    describe:
-      'Local path to the JSON file containing an array of object definitions',
+    describe: i18n(`${i18nKey}.positionals.definition.describe`),
     type: 'string',
   });
 };

package/commands/customObject/schema/create.js

@@ -1,65 +1,67 @@
-const {
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
-const { validateAccount, isFileValidJSON } = require('../../../lib/validation');
-const { trackCommandUsage } = require('../../../lib/usageTracking');
 const {
-  addTestingOptions,
-  setLogLevel,
-  getAccountId,
-} = require('../../../lib/commonOpts');
+  isFileValidJSON,
+  loadAndValidateOptions,
+} = require('../../../lib/validation');
+const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
 const { getEnv, isConfigFlagEnabled } = require('@hubspot/cli-lib/');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
-const { logDebugInfo } = require('../../../lib/debugInfo');
 const { createSchema } = require('@hubspot/cli-lib/api/schema');
 const {
   createSchema: createSchemaFromHubFile,
 } = require('@hubspot/cli-lib/api/fileTransport');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey =
+  'cli.commands.customObject.subcommands.schema.subcommands.create';
+const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 
 exports.command = 'create <definition>';
-exports.describe = 'Create a custom object schema';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   const { definition } = options;
-  setLogLevel(options);
-  logDebugInfo(options);
-  const { config: configPath } = options;
-  loadConfig(configPath);
-  checkAndWarnGitInclusion();
 
-  if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
-  }
+  await loadAndValidateOptions(options);
+
   const accountId = getAccountId(options);
 
   trackCommandUsage('custom-object-schema-create', null, accountId);
 
   const filePath = getAbsoluteFilePath(definition);
   if (!isFileValidJSON(filePath)) {
-    process.exit(1);
+    process.exit(EXIT_CODES.ERROR);
   }
 
   try {
     if (isConfigFlagEnabled(ConfigFlags.USE_CUSTOM_OBJECT_HUBFILE)) {
       await createSchemaFromHubFile(accountId, filePath);
-      logger.success(`Your schema has been created in account "${accountId}"`);
+      logger.success(
+        i18n(`${i18nKey}.success.schemaCreated`, {
+          accountId,
+        })
+      );
     } else {
       const res = await createSchema(accountId, filePath);
       logger.success(
-        `Schema can be viewed at ${getHubSpotWebsiteOrigin(
-          getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
-        )}/contacts/${accountId}/objects/${res.objectTypeId}`
+        i18n(`${i18nKey}.success.schemaViewable`, {
+          url: `${getHubSpotWebsiteOrigin(
+            getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+          )}/contacts/${accountId}/objects/${res.objectTypeId}`,
+        })
       );
     }
   } catch (e) {
     logErrorInstance(e, { accountId });
-    logger.error(`Schema creation from ${definition} failed`);
+    logger.error(
+      i18n(`${i18nKey}.errors.creationFailed`, {
+        definition,
+      })
+    );
   }
 };
 
@@ -67,7 +69,7 @@ exports.builder = yargs => {
   addTestingOptions(yargs, true);
 
   yargs.positional('definition', {
-    describe: 'Local path to the JSON file containing the schema definition',
+    describe: i18n(`${i18nKey}.positionals.definition.describe`),
     type: 'string',
   });
 };

package/commands/customObject/schema/delete.js

@@ -1,51 +1,51 @@
-const {
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 
-const { validateAccount } = require('../../../lib/validation');
+const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { setLogLevel, getAccountId } = require('../../../lib/commonOpts');
-const { logDebugInfo } = require('../../../lib/debugInfo');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { deleteSchema } = require('@hubspot/cli-lib/api/schema');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey =
+  'cli.commands.customObject.subcommands.schema.subcommands.delete';
 
 exports.command = 'delete <name>';
-exports.describe = 'Delete a custom object schema';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
   let { name } = options;
 
-  setLogLevel(options);
-  logDebugInfo(options);
-  loadConfig(options.config);
-  checkAndWarnGitInclusion();
+  await loadAndValidateOptions(options);
 
-  if (!(validateConfig() && (await validateAccount(options)))) {
-    process.exit(1);
-  }
   const accountId = getAccountId(options);
 
   trackCommandUsage('custom-object-schema-delete', null, accountId);
 
   try {
     await deleteSchema(accountId, name);
-    logger.success(`Successfully initiated deletion of ${name}`);
+    logger.success(
+      i18n(`${i18nKey}.success.delete`, {
+        name,
+      })
+    );
   } catch (e) {
     logErrorInstance(e);
-    logger.error(`Unable to delete ${name}`);
+    logger.error(
+      i18n(`${i18nKey}.errors.delete`, {
+        name,
+      })
+    );
   }
 };
 
 exports.builder = yargs => {
   yargs.example([
-    ['$0 schema delete schemaName', 'Delete `schemaName` schema'],
+    ['$0 schema delete schemaName', i18n(`${i18nKey}.examples.default`)],
   ]);
 
   yargs.positional('name', {
-    describe: 'Name of the target schema',
+    describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',
   });
 };