@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/auth.js

@@ -8,13 +8,13 @@ const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments
 const { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, } = require('@hubspot/local-dev-lib/config');
+const { updateAccountConfig, writeConfig, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues, toKebabCase, } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/personalAccessKeyPrompt');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { setAsDefaultAccountPrompt, } = require('../lib/prompts/setAsDefaultAccountPrompt');
-const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, } = require('../lib/commonOpts');
+const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -31,21 +31,23 @@ const ALLOWED_AUTH_METHODS = [
     PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUTH_METHODS);
-exports.command = 'auth [type] [--account]';
+exports.command = 'auth';
 exports.describe = i18n(`${i18nKey}.describe`, {
     supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
 });
 exports.handler = async (options) => {
-    const { type, config: c, qa, account } = options;
-    const authType = (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = options;
+    const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
+        PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     setLogLevel(options);
-    if (!getConfigPath(c)) {
+    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    // Needed to load deprecated config
+    loadConfig(configFlagValue);
+    checkAndWarnGitInclusion(getConfigPath());
+    if (!getConfigPath(configFlagValue)) {
         logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
         process.exit(EXIT_CODES.ERROR);
     }
-    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    loadConfig(c);
-    checkAndWarnGitInclusion(getConfigPath());
     trackCommandUsage('auth');
     trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
     let configData;
@@ -64,7 +66,10 @@ exports.handler = async (options) => {
             successAuthMethod = OAUTH_AUTH_METHOD.name;
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            configData = await personalAccessKeyPrompt({ env, account });
+            configData = await personalAccessKeyPrompt({
+                env,
+                account: providedAccountId,
+            });
             try {
                 token = await getAccessToken(configData.personalAccessKey, env);
                 defaultName = toKebabCase(token.hubName);
@@ -110,9 +115,8 @@ exports.handler = async (options) => {
         }));
     }
     else {
-        const config = getConfig();
         logger.info(i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-            accountName: config.defaultPortal,
+            accountName: getConfigDefaultAccount(),
         }));
     }
     logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {
@@ -130,25 +134,27 @@ exports.handler = async (options) => {
     process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
-    yargs.positional('type', {
-        describe: i18n(`${i18nKey}.positionals.type.describe`),
-        type: 'string',
-        choices: [
-            `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
-            `${OAUTH_AUTH_METHOD.value}`,
-        ],
-        default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-        defaultDescription: i18n(`${i18nKey}.positionals.type.defaultDescription`, {
-            authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-        }),
-    });
     yargs.options({
+        'auth-type': {
+            describe: i18n(`${i18nKey}.options.authType.describe`),
+            type: 'string',
+            choices: [
+                `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
+                `${OAUTH_AUTH_METHOD.value}`,
+            ],
+            default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            defaultDescription: i18n(`${i18nKey}.options.authType.defaultDescription`, {
+                authMethod: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+            }),
+        },
         account: {
             describe: i18n(`${i18nKey}.options.account.describe`),
             type: 'string',
+            alias: 'a',
         },
     });
     addConfigOptions(yargs);
     addTestingOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/cms/getReactModule.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const fs = require('fs');
+const path = require('path');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { retrieveDefaultModule } = require('@hubspot/local-dev-lib/cms/modules');
+const { i18n } = require('../../lib/lang');
+const { logError } = require('../../lib/errorHandlers/index');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { listPrompt } = require('../../lib/prompts/promptUtils');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const i18nKey = 'commands.cms.subcommands.getReactModule';
+exports.command = 'get-react-module [name] [dest]';
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.handler = async (options) => {
+    const { name, dest } = options;
+    trackCommandUsage('get-react-modules');
+    let moduleToRetrieve = name;
+    if (!moduleToRetrieve) {
+        let availableModules;
+        try {
+            availableModules = await retrieveDefaultModule(null, '');
+        }
+        catch (e) {
+            logError(e);
+        }
+        const moduleChoice = await listPrompt(i18n(`${i18nKey}.selectModulePrompt`), {
+            choices: availableModules.map(module => module.name),
+        });
+        moduleToRetrieve = moduleChoice;
+    }
+    const destPath = dest
+        ? path.join(path.resolve(getCwd(), dest), `${moduleToRetrieve}`)
+        : path.join(getCwd(), `${moduleToRetrieve}`);
+    if (fs.existsSync(destPath)) {
+        logger.error(i18n(`${i18nKey}.errors.pathExists`, {
+            path: destPath,
+        }));
+        return;
+    }
+    try {
+        await retrieveDefaultModule(moduleToRetrieve, destPath);
+        logger.success(i18n(`${i18nKey}.success.moduleDownloaded`, {
+            moduleName: moduleToRetrieve,
+            path: destPath,
+        }));
+    }
+    catch (e) {
+        if (e.cause && e.cause.code === 'ERR_BAD_REQUEST') {
+            logger.error(i18n(`${i18nKey}.errors.invalidName`));
+        }
+        else {
+            logError(e);
+        }
+    }
+    process.exit(EXIT_CODES.SUCCESS);
+};
+exports.builder = yargs => {
+    yargs.positional('name', {
+        describe: i18n(`${i18nKey}.positionals.name.describe`),
+        type: 'string',
+    });
+    yargs.positional('dest', {
+        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        type: 'string',
+    });
+    return yargs;
+};

package/commands/cms/lighthouseScore.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
 const { fetchThemes } = require('@hubspot/local-dev-lib/api/designManager');
@@ -53,15 +52,14 @@ const selectTheme = async (accountId) => {
     return selectedTheme;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const includeDesktopScore = options.target === 'desktop' || !options.verbose;
-    const includeMobileScore = options.target === 'mobile' || !options.verbose;
-    let themeToCheck = options.theme;
+    const { target, verbose, theme, derivedAccountId } = options;
+    const includeDesktopScore = target === 'desktop' || !verbose;
+    const includeMobileScore = target === 'mobile' || !verbose;
+    let themeToCheck = theme;
     if (themeToCheck) {
         let isValidTheme = true;
         try {
-            const { data: result } = await fetchThemes(accountId, {
+            const { data: result } = await fetchThemes(derivedAccountId, {
                 name: encodeURIComponent(themeToCheck),
             });
             isValidTheme = result && result.total;
@@ -75,13 +73,13 @@ exports.handler = async (options) => {
         }
     }
     else {
-        themeToCheck = await selectTheme(accountId);
+        themeToCheck = await selectTheme(derivedAccountId);
         logger.log();
     }
     // Kick off the scoring
     let requestResult;
     try {
-        const { data } = await requestLighthouseScore(accountId, {
+        const { data } = await requestLighthouseScore(derivedAccountId, {
             themePath: themeToCheck,
         });
         requestResult = data;
@@ -102,14 +100,14 @@ exports.handler = async (options) => {
         const checkScoreStatus = async () => {
             let desktopScoreStatus = 'COMPLETED';
             if (includeDesktopScore) {
-                const { data } = await getLighthouseScoreStatus(accountId, {
+                const { data } = await getLighthouseScoreStatus(derivedAccountId, {
                     themeId: requestResult.desktopId,
                 });
                 desktopScoreStatus = data;
             }
             let mobileScoreStatus = 'COMPLETED';
             if (includeDesktopScore) {
-                const { data } = await getLighthouseScoreStatus(accountId, {
+                const { data } = await getLighthouseScoreStatus(derivedAccountId, {
                     themeId: requestResult.mobileId,
                 });
                 mobileScoreStatus = data;
@@ -132,24 +130,24 @@ exports.handler = async (options) => {
     let mobileScoreResult = {};
     let verboseViewAverageScoreResult = {};
     try {
-        const params = { isAverage: !options.verbose };
+        const params = { isAverage: !verbose };
         if (includeDesktopScore) {
-            const { data } = await getLighthouseScore(accountId, {
+            const { data } = await getLighthouseScore(derivedAccountId, {
                 ...params,
                 desktopId: requestResult.desktopId,
             });
             desktopScoreResult = data;
         }
         if (includeMobileScore) {
-            const { data } = await getLighthouseScore(accountId, {
+            const { data } = await getLighthouseScore(derivedAccountId, {
                 ...params,
                 mobileId: requestResult.mobileId,
             });
             mobileScoreResult = data;
         }
         // This is needed to show the average scores above the verbose output
-        if (options.verbose) {
-            const { data } = await getLighthouseScore(accountId, {
+        if (verbose) {
+            const { data } = await getLighthouseScore(derivedAccountId, {
                 ...params,
                 isAverage: true,
                 desktopId: includeDesktopScore ? requestResult.desktopId : null,
@@ -162,8 +160,8 @@ exports.handler = async (options) => {
         logger.error(i18n(`${i18nKey}.errors.failedToGetLighthouseScore`));
         process.exit(EXIT_CODES.ERROR);
     }
-    if (options.verbose) {
-        logger.log(`${themeToCheck} ${options.target} scores`);
+    if (verbose) {
+        logger.log(`${themeToCheck} ${target} scores`);
         const tableHeader = getTableHeader(DEFAULT_TABLE_HEADER);
         const scores = verboseViewAverageScoreResult.scores
             ? verboseViewAverageScoreResult.scores[0]
@@ -183,7 +181,7 @@ exports.handler = async (options) => {
             'Template path',
             ...DEFAULT_TABLE_HEADER,
         ]);
-        const scoreResult = options.target === 'desktop' ? desktopScoreResult : mobileScoreResult;
+        const scoreResult = target === 'desktop' ? desktopScoreResult : mobileScoreResult;
         const templateTableData = scoreResult.scores.map(score => {
             return [
                 score.templatePath,
@@ -209,7 +207,7 @@ exports.handler = async (options) => {
             });
         }
         logger.log();
-        logger.info(i18n(`${i18nKey}.info.targetDeviceNote`, { target: options.target }));
+        logger.info(i18n(`${i18nKey}.info.targetDeviceNote`, { target }));
     }
     else {
         logger.log(`Theme: ${themeToCheck}`);

package/commands/cms.js

@@ -2,20 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { i18n } = require('../lib/lang');
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const lighthouseScore = require('./cms/lighthouseScore');
 const convertFields = require('./cms/convertFields');
-const reactModules = require('./cms/reactModules');
+const getReactModule = require('./cms/getReactModule');
 const i18nKey = 'commands.cms';
 exports.command = 'cms';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs
         .command(lighthouseScore)
         .command(convertFields)
-        .command(reactModules)
+        .command(getReactModule)
         .demandCommand(1, '');
     return yargs;
 };

package/commands/completion.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const yargsParser = require('yargs-parser');
+const { i18n } = require('../lib/lang');
+const { trackCommandUsage } = require('../lib/usageTracking');
+const i18nKey = 'commands.completion';
+exports.command = 'completion';
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.handler = async () => {
+    await trackCommandUsage('completion');
+};
+exports.builder = yargs => {
+    const { help } = yargsParser(process.argv.slice(2));
+    if (!help) {
+        yargs.completion();
+    }
+    yargs.example([
+        ['$0 completion >> ~/.zshrc', i18n(`${i18nKey}.examples.default`)],
+    ]);
+    return yargs;
+};

package/commands/config/set.js

@@ -1,37 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const { getAccountId } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { setDefaultMode, setHttpTimeout, setAllowUsageTracking, } = require('../../lib/configOptions');
+const { setDefaultCmsPublishMode, setHttpTimeout, setAllowUsageTracking, } = require('../../lib/configOptions');
 const i18nKey = 'commands.config.subcommands.set';
 exports.command = 'set';
 exports.describe = i18n(`${i18nKey}.describe`);
 const selectOptions = async () => {
-    const { mode } = await promptUser([
+    const { cmsPublishMode } = await promptUser([
         {
             type: 'list',
             look: false,
-            name: 'mode',
+            name: 'cmsPublishMode',
             pageSize: 20,
             message: i18n(`${i18nKey}.promptMessage`),
             choices: [
-                { name: 'Default mode', value: { defaultMode: '' } },
+                {
+                    name: 'Default CMS publish mode',
+                    value: { defaultCmsPublishMode: '' },
+                },
                 { name: 'Allow usage tracking', value: { allowUsageTracking: '' } },
                 { name: 'HTTP timeout', value: { httpTimeout: '' } },
             ],
         },
     ]);
-    return mode;
+    return cmsPublishMode;
 };
 const handleConfigUpdate = async (accountId, options) => {
-    const { allowUsageTracking, defaultMode, httpTimeout } = options;
-    if (typeof defaultMode !== 'undefined') {
-        await setDefaultMode({ defaultMode, accountId });
+    const { allowUsageTracking, defaultCmsPublishMode, httpTimeout } = options;
+    if (typeof defaultCmsPublishMode !== 'undefined') {
+        await setDefaultCmsPublishMode({ defaultCmsPublishMode, accountId });
         return true;
     }
     else if (typeof httpTimeout !== 'undefined') {
@@ -45,37 +46,34 @@ const handleConfigUpdate = async (accountId, options) => {
     return false;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('config-set', null, accountId);
-    const configUpdated = await handleConfigUpdate(accountId, options);
+    const { derivedAccountId } = options;
+    trackCommandUsage('config-set', null, derivedAccountId);
+    const configUpdated = await handleConfigUpdate(derivedAccountId, options);
     if (!configUpdated) {
         const selectedOptions = await selectOptions();
-        await handleConfigUpdate(accountId, selectedOptions);
+        await handleConfigUpdate(derivedAccountId, selectedOptions);
     }
     process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs
         .options({
-        defaultMode: {
+        'default-cms-publish-mode': {
             describe: i18n(`${i18nKey}.options.defaultMode.describe`),
             type: 'string',
         },
-        allowUsageTracking: {
+        'allow-usage-tracking': {
             describe: i18n(`${i18nKey}.options.allowUsageTracking.describe`),
             type: 'boolean',
         },
-        httpTimeout: {
+        'http-timeout': {
             describe: i18n(`${i18nKey}.options.httpTimeout.describe`),
             type: 'string',
         },
     })
-        .conflicts('defaultMode', 'allowUsageTracking')
-        .conflicts('defaultMode', 'httpTimeout')
-        .conflicts('allowUsageTracking', 'httpTimeout');
-    yargs.example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
-    //TODO remove this when "hs accounts use" is fully rolled out
-    yargs.strict(false);
+        .conflicts('defaultCmsPublishMode', 'allowUsageTracking')
+        .conflicts('defaultCmsPublishMode', 'httpTimeout')
+        .conflicts('allowUsageTracking', 'httpTimeout')
+        .example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
     return yargs;
 };

package/commands/config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addConfigOptions, addGlobalOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const set = require('./config/set');
 const i18nKey = 'commands.config';
@@ -9,7 +9,7 @@ exports.command = 'config';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
     addConfigOptions(yargs);
-    addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs.command(set).demandCommand(1, '');
     return yargs;
 };

package/commands/create.js

@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs-extra');
 const { logError } = require('../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel, getAccountId } = require('../lib/commonOpts');
+const { setLogLevel, addGlobalOptions, addConfigOptions, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
@@ -36,7 +36,7 @@ const i18nKey = 'commands.create';
 const SUPPORTED_ASSET_TYPES = Object.keys(assets)
     .filter(t => !assets[t].hidden)
     .join(', ');
-exports.command = 'create <type> [name] [dest] [--internal]';
+exports.command = 'create <type> [name] [dest]';
 exports.describe = i18n(`${i18nKey}.describe`, {
     supportedAssetTypes: SUPPORTED_ASSET_TYPES,
 });
@@ -63,7 +63,8 @@ exports.handler = async (options) => {
     const asset = assets[assetType];
     const argsToPass = { assetType, name, dest, getInternalVersion, options };
     dest = argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
-    trackCommandUsage('create', { assetType }, getAccountId(options));
+    const { derivedAccountId } = options;
+    trackCommandUsage('create', { assetType }, derivedAccountId);
     try {
         await fs.ensureDir(dest);
     }
@@ -99,5 +100,7 @@ exports.builder = yargs => {
         type: 'boolean',
         hidden: true,
     });
+    addConfigOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/customObject/create.js

@@ -1,46 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../lib/validation');
+const { checkAndConvertToJson } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { getAccountId } = require('../../lib/commonOpts');
 const { batchCreateObjects, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.create';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = 'create <name> <definition>';
+exports.command = 'create [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition, name } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-batch-create', null, accountId);
-    const filePath = getAbsoluteFilePath(definition);
+    const { path, name: providedName, derivedAccountId } = options;
+    let definitionPath = path;
+    trackCommandUsage('custom-object-batch-create', null, derivedAccountId);
+    if (!definitionPath) {
+        definitionPath = await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputPath`));
+    }
+    const filePath = getAbsoluteFilePath(definitionPath);
     const objectJson = checkAndConvertToJson(filePath);
     if (!objectJson) {
         process.exit(EXIT_CODES.ERROR);
     }
+    const name = providedName || (await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputSchema`)));
     try {
-        await batchCreateObjects(accountId, name, objectJson);
+        await batchCreateObjects(derivedAccountId, name, objectJson);
         logger.success(i18n(`${i18nKey}.success.objectsCreated`));
     }
     catch (e) {
-        logError(e, { accountId });
+        logError(e, { accountId: derivedAccountId });
         logger.error(i18n(`${i18nKey}.errors.creationFailed`, {
-            definition,
+            definition: definitionPath,
         }));
     }
 };
 exports.builder = yargs => {
-    yargs.positional('name', {
+    yargs
+        .positional('name', {
         describe: i18n(`${i18nKey}.positionals.name.describe`),
         type: 'string',
-    });
-    yargs.positional('definition', {
-        describe: i18n(`${i18nKey}.positionals.definition.describe`),
+    })
+        .option('path', {
+        describe: i18n(`${i18nKey}.options.path.describe`),
         type: 'string',
     });
 };

package/commands/customObject/schema/create.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../../lib/validation');
+const { checkAndConvertToJson } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
+const { addTestingOptions } = require('../../../lib/commonOpts');
 const { getEnv, isConfigFlagEnabled, } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
 const { CONFIG_FLAGS } = require('../../../lib/constants');
@@ -16,43 +16,42 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.create';
 const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
-exports.command = 'create <definition>';
+exports.command = 'create';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-create', null, accountId);
-    const filePath = getAbsoluteFilePath(definition);
+    const { path, derivedAccountId } = options;
+    trackCommandUsage('custom-object-schema-create', null, derivedAccountId);
+    const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!schemaJson) {
         process.exit(EXIT_CODES.ERROR);
     }
     try {
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
-            await createSchemaFromHubFile(accountId, filePath);
+            await createSchemaFromHubFile(derivedAccountId, filePath);
             logger.success(i18n(`${i18nKey}.success.schemaCreated`, {
-                accountId,
+                accountId: derivedAccountId,
             }));
         }
         else {
-            const { data } = await createObjectSchema(accountId, schemaJson);
+            const { data } = await createObjectSchema(derivedAccountId, schemaJson);
             logger.success(i18n(`${i18nKey}.success.schemaViewable`, {
-                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${accountId}/objects/${data.objectTypeId}`,
+                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`,
             }));
         }
     }
     catch (e) {
-        logError(e, { accountId });
+        logError(e, { accountId: derivedAccountId });
         logger.error(i18n(`${i18nKey}.errors.creationFailed`, {
-            definition,
+            definition: path,
         }));
     }
 };
 exports.builder = yargs => {
     addTestingOptions(yargs);
-    yargs.positional('definition', {
-        describe: i18n(`${i18nKey}.positionals.definition.describe`),
+    yargs.option('path', {
+        describe: i18n(`${i18nKey}.options.definition.describe`),
         type: 'string',
+        required: true,
     });
 };