@hubspot/cli 7.4.8 → 7.4.9-beta.0

package/commands/account/createOverride.js

@@ -12,18 +12,27 @@ const path_2 = require("@hubspot/local-dev-lib/path");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const config_2 = require("@hubspot/local-dev-lib/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const lang_1 = require("../../lib/lang");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const index_1 = require("../../lib/errorHandlers/index");
+const ui_1 = require("../../lib/ui");
 exports.describe = (0, lang_1.i18n)('commands.account.subcommands.createOverride.describe', {
     hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
 });
 exports.command = 'create-override [account]';
 async function handler(args) {
     let overrideDefaultAccount = args.account;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const accountOverride = (0, config_2.getCWDAccountOverride)();
     const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
     if (accountOverride && overrideFilePath) {

package/commands/account/remove.js

@@ -59,7 +59,12 @@ async function handler(args) {
     }));
     // Get updated version of the config
     (0, config_1.loadConfig)((0, config_1.getConfigPath)());
-    if (accountToRemove === currentDefaultAccount) {
+    const accountToRemoveId = (0, config_1.getAccountId)(accountToRemove);
+    let defaultAccountId;
+    if (currentDefaultAccount) {
+        defaultAccountId = (0, config_1.getAccountId)(currentDefaultAccount);
+    }
+    if (accountToRemoveId === defaultAccountId) {
         logger_1.logger.log();
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
         const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();

package/commands/account/removeOverride.js

@@ -10,17 +10,26 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const lang_1 = require("../../lib/lang");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const usageTracking_1 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
+const ui_1 = require("../../lib/ui");
 exports.describe = (0, lang_1.i18n)('commands.account.subcommands.removeOverride.describe', {
     overrideFile: config_2.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
 });
 exports.command = 'remove-override';
 async function handler(args) {
     const { force } = args;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const accountOverride = (0, config_1.getCWDAccountOverride)();
     const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
     if (accountOverride && overrideFilePath) {

package/commands/cms/convertFields.d.ts

@@ -1 +1,7 @@
-export {};
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type ConvertFieldsArgs = CommonArgs & {
+    src: string;
+    fieldOptions: string[];
+};
+declare const convertFieldsCommand: YargsCommandModule<unknown, ConvertFieldsArgs>;
+export default convertFieldsCommand;

package/commands/cms/convertFields.js

@@ -1,88 +1,104 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const path = require('path');
-const fs = require('fs');
-const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
-const { isAllowedExtension, getCwd } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { walk } = require('@hubspot/local-dev-lib/fs');
-const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
-const { i18n } = require('../../lib/lang');
-const { FieldsJs, isConvertableFieldJs, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
-const { logError } = require('../../lib/errorHandlers/index');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = 'convert-fields';
-exports.describe = i18n(`commands.convertFields.describe`);
-const invalidPath = src => {
-    logger.error(i18n(`commands.convertFields.errors.invalidPath`, {
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const fs_2 = require("@hubspot/local-dev-lib/fs");
+const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
+const lang_1 = require("../../lib/lang");
+const handleFieldsJS_1 = require("@hubspot/local-dev-lib/cms/handleFieldsJS");
+const usageTracking_1 = require("../../lib/usageTracking");
+const index_1 = require("../../lib/errorHandlers/index");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'convert-fields';
+const describe = (0, lang_1.i18n)(`commands.convertFields.describe`);
+function invalidPath(src) {
+    logger_1.logger.error((0, lang_1.i18n)(`commands.convertFields.errors.invalidPath`, {
         path: src,
     }));
-    process.exit(EXIT_CODES.ERROR);
-};
-exports.handler = async (options) => {
+    process.exit(exitCodes_1.EXIT_CODES.ERROR);
+}
+async function handler(args) {
     let stats;
     let projectRoot;
     let src;
     try {
-        src = path.resolve(getCwd(), options.src);
-        const themeJSONPath = getThemeJSONPath(options.src);
+        src = path_1.default.resolve((0, path_2.getCwd)(), args.src);
+        const themeJSONPath = (0, themes_1.getThemeJSONPath)(args.src);
         projectRoot = themeJSONPath
-            ? path.dirname(themeJSONPath)
-            : path.dirname(getCwd());
-        stats = fs.statSync(src);
+            ? path_1.default.dirname(themeJSONPath)
+            : path_1.default.dirname((0, path_2.getCwd)());
+        stats = fs_1.default.statSync(src);
         if (!stats.isFile() && !stats.isDirectory()) {
-            invalidPath(options.src);
+            invalidPath(args.src);
             return;
         }
     }
     catch (e) {
-        invalidPath(options.src);
+        invalidPath(args.src);
+    }
+    (0, usageTracking_1.trackConvertFieldsUsage)('process');
+    if (!src || !stats || !projectRoot) {
+        invalidPath(args.src);
+        return;
     }
-    trackConvertFieldsUsage('process');
     if (stats.isFile()) {
-        const fieldsJs = await new FieldsJs(projectRoot, src, undefined, options.fieldOptions).init();
+        const fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, src, undefined, args.fieldOptions).init();
         if (fieldsJs.rejected)
             return;
         fieldsJs.saveOutput();
     }
-    else if (stats.isDirectory()) {
+    else if (stats && stats.isDirectory()) {
         let filePaths = [];
         try {
-            filePaths = await walk(src);
+            filePaths = await (0, fs_2.walk)(src);
         }
         catch (e) {
-            logError(e);
+            (0, index_1.logError)(e);
         }
         const allowedFilePaths = filePaths
             .filter(file => {
-            if (!isAllowedExtension(file)) {
+            if (!(0, path_2.isAllowedExtension)(file)) {
                 return false;
             }
             return true;
         })
-            .filter(createIgnoreFilter());
+            .filter((0, ignoreRules_1.createIgnoreFilter)(false));
         for (const filePath of allowedFilePaths) {
-            if (isConvertableFieldJs(projectRoot, filePath, true)) {
-                const fieldsJs = await new FieldsJs(projectRoot, filePath, undefined, options.fieldOptions).init();
+            if ((0, handleFieldsJS_1.isConvertableFieldJs)(projectRoot, filePath, true)) {
+                const fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, filePath, undefined, args.fieldOptions).init();
                 if (fieldsJs.rejected)
                     return;
                 fieldsJs.saveOutput();
             }
         }
     }
-};
-exports.builder = yargs => {
+}
+function convertFieldsBuilder(yargs) {
     yargs.option('src', {
-        describe: i18n(`commands.convertFields.positionals.src.describe`),
+        describe: (0, lang_1.i18n)(`commands.convertFields.positionals.src.describe`),
         type: 'string',
-        demandOption: i18n(`commands.convertFields.errors.missingSrc`),
+        required: true,
+        demandOption: (0, lang_1.i18n)(`commands.convertFields.errors.missingSrc`),
     });
     yargs.option('fieldOptions', {
-        describe: i18n(`commands.convertFields.options.options.describe`),
+        describe: (0, lang_1.i18n)(`commands.convertFields.options.options.describe`),
         type: 'array',
         default: [''],
     });
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(convertFieldsBuilder, command, describe);
+const convertFieldsCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = convertFieldsCommand;

package/commands/cms/getReactModule.d.ts

@@ -1 +1,7 @@
-export {};
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type GetReactModuleArgs = CommonArgs & {
+    name?: string;
+    dest?: string;
+};
+declare const cmsGetReactModuleCommand: YargsCommandModule<unknown, GetReactModuleArgs>;
+export default cmsGetReactModuleCommand;

package/commands/cms/getReactModule.js

@@ -1,69 +1,87 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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');
-exports.command = 'get-react-module [name] [dest]';
-exports.describe = i18n(`commands.cms.subcommands.getReactModule.describe`);
-exports.handler = async (options) => {
-    const { name, dest } = options;
-    trackCommandUsage('get-react-modules');
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const modules_1 = require("@hubspot/local-dev-lib/cms/modules");
+const lang_1 = require("../../lib/lang");
+const index_1 = require("../../lib/errorHandlers/index");
+const usageTracking_1 = require("../../lib/usageTracking");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'get-react-module [name] [dest]';
+const describe = (0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.describe`);
+async function handler(args) {
+    const { name, dest } = args;
+    (0, usageTracking_1.trackCommandUsage)('get-react-modules');
     let moduleToRetrieve = name;
     if (!moduleToRetrieve) {
         let availableModules;
         try {
-            availableModules = await retrieveDefaultModule(null, '');
+            availableModules = await (0, modules_1.retrieveDefaultModule)();
         }
         catch (e) {
-            logError(e);
+            (0, index_1.logError)(e);
+        }
+        if (!availableModules) {
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        const moduleChoice = await listPrompt(i18n(`commands.cms.subcommands.getReactModule.selectModulePrompt`), {
+        const moduleChoice = await (0, promptUtils_1.listPrompt)((0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.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(`commands.cms.subcommands.getReactModule.errors.pathExists`, {
+        ? path_1.default.join(path_1.default.resolve((0, path_2.getCwd)(), dest), `${moduleToRetrieve}`)
+        : path_1.default.join((0, path_2.getCwd)(), `${moduleToRetrieve}`);
+    if (fs_1.default.existsSync(destPath)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.errors.pathExists`, {
             path: destPath,
         }));
-        return;
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     try {
-        await retrieveDefaultModule(moduleToRetrieve, destPath);
-        logger.success(i18n(`commands.cms.subcommands.getReactModule.success.moduleDownloaded`, {
+        await (0, modules_1.retrieveDefaultModule)(moduleToRetrieve, destPath);
+        logger_1.logger.success((0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.success.moduleDownloaded`, {
             moduleName: moduleToRetrieve,
             path: destPath,
         }));
     }
     catch (e) {
-        if (e.cause && e.cause.code === 'ERR_BAD_REQUEST') {
-            logger.error(i18n(`commands.cms.subcommands.getReactModule.errors.invalidName`));
+        const isBadRequestError = e?.cause?.code === 'ERR_BAD_REQUEST';
+        if (isBadRequestError) {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.errors.invalidName`));
         }
         else {
-            logError(e);
+            (0, index_1.logError)(e);
         }
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
-};
-exports.builder = yargs => {
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function cmsGetReactModuleBuilder(yargs) {
     yargs.positional('name', {
-        describe: i18n(`commands.cms.subcommands.getReactModule.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.positionals.name.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`commands.cms.subcommands.getReactModule.positionals.dest.describe`),
+        describe: (0, lang_1.i18n)(`commands.cms.subcommands.getReactModule.positionals.dest.describe`),
         type: 'string',
     });
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(cmsGetReactModuleBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const cmsGetReactModuleCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = cmsGetReactModuleCommand;

package/commands/cms/lighthouseScore.d.ts

@@ -1 +1,8 @@
-export {};
+import { AccountArgs, CommonArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type LighthouseScoreArgs = CommonArgs & AccountArgs & EnvironmentArgs & {
+    theme?: string;
+    target: string;
+    verbose: boolean;
+};
+declare const cmslighthouseScoreCommand: YargsCommandModule<unknown, LighthouseScoreArgs>;
+export default cmslighthouseScoreCommand;