@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/customObject/schema/delete.js

@@ -1,23 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const exitCodes_1 = require("../../../lib/enums/exitCodes");
+const promptUtils_1 = require("../../../lib/prompts/promptUtils");
+const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { getAccountId } = require('../../../lib/commonOpts');
 const { deleteObjectSchema, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
 const { logError } = require('../../../lib/errorHandlers');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.delete';
-exports.command = 'delete <name>';
+exports.command = 'delete [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-delete', null, accountId);
+    const { name: providedName, force, derivedAccountId } = options;
+    trackCommandUsage('custom-object-schema-delete', null, derivedAccountId);
+    let name;
     try {
-        await deleteObjectSchema(accountId, name);
+        const { data: { results }, } = await (0, customObjects_1.fetchObjectSchemas)(derivedAccountId);
+        const schemaNames = results?.map(({ name: schemaName }) => schemaName);
+        name =
+            providedName ||
+                (await (0, promptUtils_1.listPrompt)(i18n(`${i18nKey}.selectSchema`), {
+                    choices: schemaNames,
+                }));
+        const shouldDelete = force ||
+            (await (0, promptUtils_1.confirmPrompt)(i18n(`${i18nKey}.confirmDelete`, { name })));
+        if (!shouldDelete) {
+            logger.info(i18n(`${i18nKey}.deleteCancelled`, { name }));
+            return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        await deleteObjectSchema(derivedAccountId, name);
         logger.success(i18n(`${i18nKey}.success.delete`, {
             name,
         }));
@@ -30,11 +43,16 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs.example([
+    yargs
+        .example([
         ['$0 schema delete schemaName', i18n(`${i18nKey}.examples.default`)],
-    ]);
-    yargs.positional('name', {
+    ])
+        .positional('name', {
         describe: i18n(`${i18nKey}.positionals.name.describe`),
         type: 'string',
+    })
+        .option('force', {
+        describe: i18n(`${i18nKey}.options.force.describe`),
+        type: 'boolean',
     });
 };

package/commands/customObject/schema/fetch-all.js

@@ -1,10 +1,9 @@
 "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 { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { getAccountId } = require('../../../lib/commonOpts');
 const { downloadSchemas, getResolvedPath, } = require('@hubspot/local-dev-lib/customObjects');
 const { i18n } = require('../../../lib/lang');
 const { logSchemas } = require('../../../lib/schema');
@@ -13,14 +12,14 @@ const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetchAll';
 exports.command = 'fetch-all [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-fetch-all', null, accountId);
+    const { derivedAccountId, dest: providedDest } = options;
+    trackCommandUsage('custom-object-schema-fetch-all', null, derivedAccountId);
     try {
-        const schemas = await downloadSchemas(accountId, options.dest);
+        const dest = providedDest || (await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputDest`)));
+        const schemas = await downloadSchemas(derivedAccountId, dest);
         logSchemas(schemas);
         logger.success(i18n(`${i18nKey}.success.fetch`, {
-            path: getResolvedPath(options.dest),
+            path: getResolvedPath(dest),
         }));
     }
     catch (e) {
@@ -29,14 +28,18 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs.example([
-        ['$0 custom-object schema fetch-all', i18n(`${i18nKey}.examples.default`)],
+    yargs
+        .example([
+        [
+            '$0 custom-object schema fetch-all',
+            i18n(`${i18nKey}.examples.default`),
+        ],
         [
             '$0 custom-object schema fetch-all my/folder',
             i18n(`${i18nKey}.examples.specifyPath`),
         ],
-    ]);
-    yargs.positional('dest', {
+    ])
+        .positional('dest', {
         describe: i18n(`${i18nKey}.positionals.dest.describe`),
         type: 'string',
     });

package/commands/customObject/schema/fetch.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const promptUtils_1 = require("../../../lib/prompts/promptUtils");
+const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
 const path = require('path');
 const { isConfigFlagEnabled } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
@@ -8,30 +10,35 @@ const { CONFIG_FLAGS } = require('../../../lib/constants');
 const { downloadSchema, getResolvedPath, } = require('@hubspot/local-dev-lib/customObjects');
 const { fetchSchema } = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { getAccountId } = require('../../../lib/commonOpts');
 const { i18n } = require('../../../lib/lang');
 const { logError } = require('../../../lib/errorHandlers');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetch';
-exports.command = 'fetch <name> [dest]';
+exports.command = 'fetch [name] [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name, dest } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-fetch', null, accountId);
+    const { name: providedName, dest: providedDest, derivedAccountId } = options;
+    trackCommandUsage('custom-object-schema-fetch', null, derivedAccountId);
+    let name;
     try {
+        const { data: { results }, } = await (0, customObjects_1.fetchObjectSchemas)(derivedAccountId);
+        const schemaNames = results?.map(({ name: schemaName }) => schemaName);
+        name =
+            providedName ||
+                (await (0, promptUtils_1.listPrompt)(i18n(`${i18nKey}.selectSchema`), {
+                    choices: schemaNames,
+                }));
+        const dest = providedDest || (await (0, promptUtils_1.inputPrompt)(i18n(`${i18nKey}.inputDest`)));
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
             const fullpath = path.resolve(getCwd(), dest);
-            await fetchSchema(accountId, name, fullpath);
+            await fetchSchema(derivedAccountId, name, fullpath);
             logger.success(i18n(`${i18nKey}.success.save`, {
                 name,
                 path: fullpath,
             }));
         }
         else {
-            await downloadSchema(accountId, name, dest);
+            await downloadSchema(derivedAccountId, name, dest);
             logger.success(i18n(`${i18nKey}.success.savedToPath`, {
                 path: getResolvedPath(dest, name),
             }));
@@ -45,7 +52,8 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    yargs.example([
+    yargs
+        .example([
         [
             '$0 custom-object schema fetch schemaName',
             i18n(`${i18nKey}.examples.default`),
@@ -54,12 +62,12 @@ exports.builder = yargs => {
             '$0 custom-object schema fetch schemaName my/folder',
             i18n(`${i18nKey}.examples.specifyPath`),
         ],
-    ]);
-    yargs.positional('name', {
+    ])
+        .positional('name', {
         describe: i18n(`${i18nKey}.positionals.name.describe`),
         type: 'string',
-    });
-    yargs.positional('dest', {
+    })
+        .positional('dest', {
         describe: i18n(`${i18nKey}.positionals.dest.describe`),
         type: 'string',
     });

package/commands/customObject/schema/list.js

@@ -3,20 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
-const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { getAccountId } = require('../../../lib/commonOpts');
 const { listSchemas } = require('../../../lib/schema');
 const { i18n } = require('../../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.list';
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-list', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('custom-object-schema-list', null, derivedAccountId);
     try {
-        await listSchemas(accountId);
+        await listSchemas(derivedAccountId);
     }
     catch (e) {
         logError(e);

package/commands/customObject/schema/update.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const customObjects_1 = require("@hubspot/local-dev-lib/api/customObjects");
+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 { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
-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 { CONFIG_FLAGS } = require('../../../lib/constants');
 const { getEnv, isConfigFlagEnabled, } = require('@hubspot/local-dev-lib/config');
 const { updateObjectSchema, } = require('@hubspot/local-dev-lib/api/customObjects');
@@ -16,47 +18,55 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.update';
 const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
-exports.command = 'update <name> <definition>';
+exports.command = 'update [name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition, name } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('custom-object-schema-update', null, accountId);
-    const filePath = getAbsoluteFilePath(definition);
+    const { path, name: providedName, derivedAccountId } = options;
+    trackCommandUsage('custom-object-schema-update', null, derivedAccountId);
+    const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!schemaJson) {
         process.exit(EXIT_CODES.ERROR);
     }
+    let name = providedName;
     try {
+        const { data: { results }, } = await (0, customObjects_1.fetchObjectSchemas)(derivedAccountId);
+        const schemaNames = results?.map(({ name: schemaName }) => schemaName);
+        name =
+            providedName ||
+                (await (0, promptUtils_1.listPrompt)(i18n(`${i18nKey}.selectSchema`), {
+                    choices: schemaNames,
+                }));
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
-            await updateSchemaFromHubFile(accountId, filePath);
+            await updateSchemaFromHubFile(derivedAccountId, filePath);
             logger.success(i18n(`${i18nKey}.success.update`, {
-                accountId,
+                accountId: derivedAccountId,
             }));
         }
         else {
-            const { data } = await updateObjectSchema(accountId, name, schemaJson);
+            const { data } = await updateObjectSchema(derivedAccountId, name, schemaJson);
             logger.success(i18n(`${i18nKey}.success.viewAtUrl`, {
-                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.update`, {
-            definition,
+            definition: path,
         }));
     }
 };
 exports.builder = yargs => {
     addTestingOptions(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',
+        required: true,
     });
 };

package/commands/customObject/schema.js

@@ -9,7 +9,7 @@ const listCommand = require('./schema/list');
 const updateSchema = require('./schema/update');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.schema';
-exports.command = 'schema';
+exports.command = ['schema', 'schemas'];
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
     yargs

package/commands/customObject.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const schemaCommand = require('./customObject/schema');
 const createCommand = require('./customObject/create');
 const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiLink } = require('../lib/ui');
 const i18nKey = 'commands.customObject';
-exports.command = ['custom-object', 'custom', 'co'];
+exports.command = ['custom-object', 'custom-objects', 'co'];
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 const logBetaMessage = () => {
     uiBetaTag(i18n(`${i18nKey}.betaMessage`));
@@ -16,8 +16,7 @@ const logBetaMessage = () => {
     logger.log();
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs
         .middleware([logBetaMessage])
         .command(schemaCommand)

package/commands/doctor.js

@@ -11,17 +11,18 @@ const Doctor_1 = require("../lib/doctor/Doctor");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
+const commonOpts_1 = require("../lib/commonOpts");
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.doctor';
 exports.command = 'doctor';
 exports.describe = i18n(`${i18nKey}.describe`);
 const handler = async ({ outputDir, }) => {
     const doctor = new Doctor_1.Doctor();
-    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId);
+    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId || undefined);
     const output = await doctor.diagnose();
     const totalCount = (output?.errorCount || 0) + (output?.warningCount || 0);
     if (totalCount > 0) {
-        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { success: false, type: totalCount }, doctor.accountId);
+        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { successful: false, type: totalCount }, doctor.accountId || undefined);
     }
     if (!outputDir) {
         if (output?.diagnosis) {
@@ -56,5 +57,6 @@ const builder = yargs => {
         describe: i18n(`${i18nKey}.options.outputDir`),
         type: 'string',
     });
+    (0, commonOpts_1.addGlobalOptions)(yargs);
 };
 exports.builder = builder;

package/commands/feedback.js

@@ -5,6 +5,7 @@ const open = require('open');
 const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { confirmPrompt, listPrompt } = require('../lib/prompts/promptUtils');
+const { addGlobalOptions } = require('../lib/commonOpts');
 const i18nKey = 'commands.project.subcommands.feedback';
 const FEEDBACK_OPTIONS = {
     BUG: 'bug',
@@ -47,4 +48,5 @@ exports.builder = yargs => {
             type: 'boolean',
         },
     });
+    addGlobalOptions(yargs);
 };

package/commands/fetch.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addConfigOptions, addAccountOptions, addOverwriteOptions, addModeOptions, addUseEnvironmentOptions, getAccountId, getMode, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addOverwriteOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, getCmsPublishMode, addGlobalOptions, } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
-const { validateMode, loadAndValidateOptions } = require('../lib/validation');
+const { validateCmsPublishMode } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const i18nKey = 'commands.fetch';
@@ -15,20 +15,19 @@ exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { src, dest } = options;
-    await loadAndValidateOptions(options);
-    if (!validateMode(options)) {
+    if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.ERROR);
     }
     if (typeof src !== 'string') {
         logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
         process.exit(EXIT_CODES.ERROR);
     }
-    const accountId = getAccountId(options);
-    const mode = getMode(options);
-    trackCommandUsage('fetch', { mode }, accountId);
+    const { derivedAccountId } = options;
+    const cmsPublishMode = getCmsPublishMode(options);
+    trackCommandUsage('fetch', { mode: cmsPublishMode }, derivedAccountId);
     try {
         // Fetch and write file/folder.
-        await downloadFileOrFolder(accountId, src, resolveLocalPath(dest), mode, options);
+        await downloadFileOrFolder(derivedAccountId, src, resolveLocalPath(dest), cmsPublishMode, options);
     }
     catch (err) {
         logError(err);
@@ -36,11 +35,6 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addOverwriteOptions(yargs);
-    addModeOptions(yargs, { read: true });
-    addUseEnvironmentOptions(yargs);
     yargs.positional('src', {
         describe: i18n(`${i18nKey}.positionals.src.describe`),
         type: 'string',
@@ -63,5 +57,11 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.assetVersion.describe`),
         },
     });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addOverwriteOptions(yargs);
+    addCmsPublishModeOptions(yargs, { read: true });
+    addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/filemanager/fetch.js

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileManager');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { resolveLocalPath } = require('../../lib/filesystem');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { addConfigOptions, addAccountOptions, addOverwriteOptions, addGlobalOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.filemanager.subcommands.fetch';
@@ -14,18 +13,16 @@ const { logError } = require('../../lib/errorHandlers/index');
 exports.command = 'fetch <src> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, includeArchived } = options;
-    await loadAndValidateOptions(options);
+    const { src, includeArchived, derivedAccountId, overwrite } = options;
     if (typeof src !== 'string') {
         logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
         process.exit(EXIT_CODES.ERROR);
     }
     const dest = resolveLocalPath(options.dest);
-    const accountId = getAccountId(options);
-    trackCommandUsage('filemanager-fetch', null, accountId);
+    trackCommandUsage('filemanager-fetch', null, derivedAccountId);
     try {
         // Fetch and write file/folder.
-        await downloadFileOrFolder(accountId, src, dest, false, includeArchived || false);
+        await downloadFileOrFolder(derivedAccountId, src, dest, overwrite, includeArchived || false);
     }
     catch (err) {
         logError(err);
@@ -33,8 +30,10 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
+    addGlobalOptions(yargs);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
+    addOverwriteOptions(yargs);
     addUseEnvironmentOptions(yargs);
     yargs.positional('src', {
         describe: i18n(`${i18nKey}.positionals.src.describe`),

package/commands/filemanager/upload.js

@@ -10,8 +10,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
-const { loadAndValidateOptions } = require('../../lib/validation');
+const { addConfigOptions, addGlobalOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.filemanager.subcommands.upload';
@@ -19,9 +18,7 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 exports.command = 'upload <src> <dest>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src, dest } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
+    const { src, dest, derivedAccountId } = options;
     const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {
@@ -44,7 +41,7 @@ exports.handler = async (options) => {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, accountId);
+    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => logger.error(message));
@@ -57,10 +54,10 @@ exports.handler = async (options) => {
             }));
             return;
         }
-        uploadFile(accountId, absoluteSrcPath, normalizedDest)
+        uploadFile(derivedAccountId, absoluteSrcPath, normalizedDest)
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.upload`, {
-                accountId,
+                accountId: derivedAccountId,
                 dest: normalizedDest,
                 src,
             }));
@@ -71,7 +68,7 @@ exports.handler = async (options) => {
                 src,
             }));
             logError(error, new ApiErrorContext({
-                accountId,
+                accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
@@ -79,11 +76,11 @@ exports.handler = async (options) => {
     }
     else {
         logger.log(i18n(`${i18nKey}.logs.uploading`, {
-            accountId,
+            accountId: derivedAccountId,
             dest,
             src,
         }));
-        uploadFolder(accountId, absoluteSrcPath, dest)
+        uploadFolder(derivedAccountId, absoluteSrcPath, dest)
             .then(() => {
             logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
                 dest,
@@ -92,12 +89,13 @@ exports.handler = async (options) => {
             .catch(error => {
             logger.error(i18n(`${i18nKey}.errors.uploadingFailed`));
             logError(error, {
-                accountId,
+                accountId: derivedAccountId,
             });
         });
     }
 };
 exports.builder = yargs => {
+    addGlobalOptions(yargs);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);

package/commands/filemanager.js

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